From 21cac2d9bac5a57c7dddad5fc3ce00e80629d868 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 28 Feb 2026 00:09:35 +0700
Subject: [PATCH 001/781] fix: Use contains operator for merchant filter in
 advanced search

Switch merchant filter from : (eq) to *: (contains) operator to preserve
partial-matching UX when backend starts respecting eq vs contains distinction.

Changes:
- Add *: operator support to parser grammar (baseRules.peggy)
- Regenerate searchParser.js and autocompleteParser.js
- Update buildQueryStringFromFilterFormValues to use *: for merchant
- Update unit test expectations

Fixes https://github.com/Expensify/App/issues/80823
---
 src/libs/SearchParser/autocompleteParser.js | 3269 ++++++-------------
 src/libs/SearchParser/baseRules.peggy       |    5 +-
 src/libs/SearchParser/searchParser.js       | 1706 +++++-----
 src/libs/SearchQueryUtils.ts                |    6 +-
 tests/unit/Search/SearchQueryUtilsTest.ts   |    4 +-
 5 files changed, 1828 insertions(+), 3162 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index e70056f0d519..aed140261dfa 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,7 +1,7 @@
 'worklet'
 
 class peg$SyntaxError{}
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -11,598 +11,494 @@ class peg$SyntaxError{}
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function temporary(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
-
-
-
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
-
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      any() {
+        return "any character";
+      },
 
-    any: function() {
-      return "any character";
-    },
+      end() {
+        return "end of input";
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-    other: function(expectation) {
-      return expectation.description;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
     }
-  };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
-
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r1 = /^[:=]/;
-  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r3 = /^[ \t\r\n\xA0]/;
-  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r5 = /^["\u201C-\u201D]/;
-  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r8 = /^[a-zA-Z0-9]/;
-  var peg$r9 = /^[ \t\n\r\xA0]/;
-  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r11 = /^[,]/;
-  var peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$literalExpectation("-", false);
-  var peg$e1 = peg$literalExpectation("report-field", true);
-  var peg$e2 = peg$literalExpectation("reportfield", true);
-  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e4 = peg$anyExpectation();
-  var peg$e5 = peg$literalExpectation(",", false);
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$literalExpectation("date", true);
-  var peg$e8 = peg$literalExpectation("amount", true);
-  var peg$e9 = peg$literalExpectation("merchant", true);
-  var peg$e10 = peg$literalExpectation("description", true);
-  var peg$e11 = peg$literalExpectation("reportid", true);
-  var peg$e12 = peg$literalExpectation("report-id", true);
-  var peg$e13 = peg$literalExpectation("keyword", true);
-  var peg$e14 = peg$literalExpectation("in", true);
-  var peg$e15 = peg$literalExpectation("currency", true);
-  var peg$e16 = peg$literalExpectation("groupCurrency", false);
-  var peg$e17 = peg$literalExpectation("group-currency", true);
-  var peg$e18 = peg$literalExpectation("tag", true);
-  var peg$e19 = peg$literalExpectation("category", true);
-  var peg$e20 = peg$literalExpectation("to", true);
-  var peg$e21 = peg$literalExpectation("exporter", true);
-  var peg$e22 = peg$literalExpectation("payer", true);
-  var peg$e23 = peg$literalExpectation("taxRate", true);
-  var peg$e24 = peg$literalExpectation("tax-rate", true);
-  var peg$e25 = peg$literalExpectation("cardID", false);
-  var peg$e26 = peg$literalExpectation("card", true);
-  var peg$e27 = peg$literalExpectation("from", true);
-  var peg$e28 = peg$literalExpectation("attendee", true);
-  var peg$e29 = peg$literalExpectation("expenseType", false);
-  var peg$e30 = peg$literalExpectation("expense-type", true);
-  var peg$e31 = peg$literalExpectation("withdrawalType", false);
-  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalID", true);
-  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e35 = peg$literalExpectation("billable", true);
-  var peg$e36 = peg$literalExpectation("reimbursable", true);
-  var peg$e37 = peg$literalExpectation("type", true);
-  var peg$e38 = peg$literalExpectation("status", true);
-  var peg$e39 = peg$literalExpectation("sortBy", false);
-  var peg$e40 = peg$literalExpectation("sort-by", true);
-  var peg$e41 = peg$literalExpectation("sortOrder", false);
-  var peg$e42 = peg$literalExpectation("sort-order", true);
-  var peg$e43 = peg$literalExpectation("policyID", false);
-  var peg$e44 = peg$literalExpectation("workspace", true);
-  var peg$e45 = peg$literalExpectation("submitted", true);
-  var peg$e46 = peg$literalExpectation("approved", true);
-  var peg$e47 = peg$literalExpectation("paid", true);
-  var peg$e48 = peg$literalExpectation("exported", true);
-  var peg$e49 = peg$literalExpectation("posted", true);
-  var peg$e50 = peg$literalExpectation("withdrawn", true);
-  var peg$e51 = peg$literalExpectation("groupBy", true);
-  var peg$e52 = peg$literalExpectation("group-by", true);
-  var peg$e53 = peg$literalExpectation("limit", true);
-  var peg$e54 = peg$literalExpectation("feed", true);
-  var peg$e55 = peg$literalExpectation("title", true);
-  var peg$e56 = peg$literalExpectation("assignee", true);
-  var peg$e57 = peg$literalExpectation("createdBy", true);
-  var peg$e58 = peg$literalExpectation("created-by", true);
-  var peg$e59 = peg$literalExpectation("action", true);
-  var peg$e60 = peg$literalExpectation("total", true);
-  var peg$e61 = peg$literalExpectation("has", true);
-  var peg$e62 = peg$literalExpectation("is", true);
-  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e64 = peg$literalExpectation("purchase-amount", true);
-  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e66 = peg$literalExpectation("purchase-currency", true);
-  var peg$e67 = peg$literalExpectation("columns", true);
-  var peg$e68 = peg$literalExpectation("view", true);
-  var peg$e69 = peg$literalExpectation("per-diem", true);
-  var peg$e70 = peg$literalExpectation("drafts", true);
-  var peg$e71 = peg$literalExpectation("draft", true);
-  var peg$e72 = peg$literalExpectation("original-amount", true);
-  var peg$e73 = peg$literalExpectation("tax", true);
-  var peg$e74 = peg$literalExpectation("policy-name", true);
-  var peg$e75 = peg$literalExpectation("bank-account", true);
-  var peg$e76 = peg$literalExpectation("long-report-id", true);
-  var peg$e77 = peg$literalExpectation("exported-to", true);
-  var peg$e78 = peg$classExpectation([":", "="], false, false);
-  var peg$e79 = peg$literalExpectation("exportedTo", true);
-  var peg$e80 = peg$literalExpectation("exchange-rate", true);
-  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e83 = peg$literalExpectation("group-from", true);
-  var peg$e84 = peg$literalExpectation("group-expenses", true);
-  var peg$e85 = peg$literalExpectation("group-total", true);
-  var peg$e86 = peg$literalExpectation("group-card", true);
-  var peg$e87 = peg$literalExpectation("group-feed", true);
-  var peg$e88 = peg$literalExpectation("group-bank-account", true);
-  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e91 = peg$literalExpectation("group-category", true);
-  var peg$e92 = peg$literalExpectation("group-tag", true);
-  var peg$e93 = peg$literalExpectation("group-merchant", true);
-  var peg$e94 = peg$literalExpectation("group-month", true);
-  var peg$e95 = peg$literalExpectation("group-week", true);
-  var peg$e96 = peg$literalExpectation("group-year", true);
-  var peg$e97 = peg$literalExpectation("group-quarter", true);
-  var peg$e98 = peg$otherExpectation("operator");
-  var peg$e99 = peg$literalExpectation("!=", false);
-  var peg$e100 = peg$literalExpectation(">=", false);
-  var peg$e101 = peg$literalExpectation(">", false);
-  var peg$e102 = peg$literalExpectation("<=", false);
-  var peg$e103 = peg$literalExpectation("<", false);
-  var peg$e104 = peg$otherExpectation("word");
-  var peg$e105 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e106 = peg$otherExpectation("whitespace");
-  var peg$e107 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e108 = peg$otherExpectation("quote");
-  var peg$e109 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e110 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e111 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e112 = peg$literalExpectation("\u201C", false);
-  var peg$e113 = peg$literalExpectation("\u201D", false);
-  var peg$e114 = peg$literalExpectation("\"", false);
-  var peg$e115 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e116 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e119 = peg$classExpectation([","], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
-  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
-  var peg$f2 = function(neg, key, op, value) {
-      expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-      const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-      if (!value) {
-        autocomplete = {
-          key,
-          negated: isNegated,
-          value: "",
-          start: location().end.offset,
-          length: 0,
-        };
-        return;
-      }
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "in";
+  const peg$c11 = "currency";
+  const peg$c12 = "groupCurrency";
+  const peg$c13 = "group-currency";
+  const peg$c14 = "tag";
+  const peg$c15 = "category";
+  const peg$c16 = "to";
+  const peg$c17 = "exporter";
+  const peg$c18 = "payer";
+  const peg$c19 = "taxrate";
+  const peg$c20 = "tax-rate";
+  const peg$c21 = "cardID";
+  const peg$c22 = "card";
+  const peg$c23 = "from";
+  const peg$c24 = "attendee";
+  const peg$c25 = "expenseType";
+  const peg$c26 = "expense-type";
+  const peg$c27 = "withdrawalType";
+  const peg$c28 = "withdrawal-type";
+  const peg$c29 = "withdrawalid";
+  const peg$c30 = "withdrawal-id";
+  const peg$c31 = "billable";
+  const peg$c32 = "reimbursable";
+  const peg$c33 = "type";
+  const peg$c34 = "status";
+  const peg$c35 = "policyID";
+  const peg$c36 = "workspace";
+  const peg$c37 = "submitted";
+  const peg$c38 = "approved";
+  const peg$c39 = "paid";
+  const peg$c40 = "exported";
+  const peg$c41 = "posted";
+  const peg$c42 = "withdrawn";
+  const peg$c43 = "groupby";
+  const peg$c44 = "group-by";
+  const peg$c45 = "limit";
+  const peg$c46 = "feed";
+  const peg$c47 = "title";
+  const peg$c48 = "assignee";
+  const peg$c49 = "createdby";
+  const peg$c50 = "created-by";
+  const peg$c51 = "action";
+  const peg$c52 = "total";
+  const peg$c53 = "has";
+  const peg$c54 = "is";
+  const peg$c55 = "purchaseamount";
+  const peg$c56 = "purchase-amount";
+  const peg$c57 = "purchasecurrency";
+  const peg$c58 = "purchase-currency";
+  const peg$c59 = "columns";
+  const peg$c60 = "view";
+  const peg$c61 = "exportedto";
+  const peg$c62 = "exported-to";
+  const peg$c63 = "*:";
+  const peg$c64 = "!=";
+  const peg$c65 = ">=";
+  const peg$c66 = ">";
+  const peg$c67 = "<=";
+  const peg$c68 = "<";
+  const peg$c69 = "\u201C";
+  const peg$c70 = "\u201D";
+  const peg$c71 = "\"";
+
+  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r1 = /^[:=]/;
+  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r3 = /^[ \t\r\n\xA0]/;
+  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r5 = /^["\u201C-\u201D]/;
+  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r8 = /^[a-zA-Z0-9]/;
+  const peg$r9 = /^[ \t\n\r\xA0]/;
+  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r11 = /^[,]/;
+  const peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$literalExpectation("-", false);
+  const peg$e1 = peg$literalExpectation("report-field", true);
+  const peg$e2 = peg$literalExpectation("reportfield", true);
+  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e4 = peg$anyExpectation();
+  const peg$e5 = peg$literalExpectation(",", false);
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$literalExpectation("date", true);
+  const peg$e8 = peg$literalExpectation("amount", true);
+  const peg$e9 = peg$literalExpectation("merchant", true);
+  const peg$e10 = peg$literalExpectation("description", true);
+  const peg$e11 = peg$literalExpectation("reportid", true);
+  const peg$e12 = peg$literalExpectation("report-id", true);
+  const peg$e13 = peg$literalExpectation("in", true);
+  const peg$e14 = peg$literalExpectation("currency", true);
+  const peg$e15 = peg$literalExpectation("groupCurrency", false);
+  const peg$e16 = peg$literalExpectation("group-currency", true);
+  const peg$e17 = peg$literalExpectation("tag", true);
+  const peg$e18 = peg$literalExpectation("category", true);
+  const peg$e19 = peg$literalExpectation("to", true);
+  const peg$e20 = peg$literalExpectation("exporter", true);
+  const peg$e21 = peg$literalExpectation("payer", true);
+  const peg$e22 = peg$literalExpectation("taxRate", true);
+  const peg$e23 = peg$literalExpectation("tax-rate", true);
+  const peg$e24 = peg$literalExpectation("cardID", false);
+  const peg$e25 = peg$literalExpectation("card", true);
+  const peg$e26 = peg$literalExpectation("from", true);
+  const peg$e27 = peg$literalExpectation("attendee", true);
+  const peg$e28 = peg$literalExpectation("expenseType", false);
+  const peg$e29 = peg$literalExpectation("expense-type", true);
+  const peg$e30 = peg$literalExpectation("withdrawalType", false);
+  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e32 = peg$literalExpectation("withdrawalID", true);
+  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e34 = peg$literalExpectation("billable", true);
+  const peg$e35 = peg$literalExpectation("reimbursable", true);
+  const peg$e36 = peg$literalExpectation("type", true);
+  const peg$e37 = peg$literalExpectation("status", true);
+  const peg$e38 = peg$literalExpectation("policyID", false);
+  const peg$e39 = peg$literalExpectation("workspace", true);
+  const peg$e40 = peg$literalExpectation("submitted", true);
+  const peg$e41 = peg$literalExpectation("approved", true);
+  const peg$e42 = peg$literalExpectation("paid", true);
+  const peg$e43 = peg$literalExpectation("exported", true);
+  const peg$e44 = peg$literalExpectation("posted", true);
+  const peg$e45 = peg$literalExpectation("withdrawn", true);
+  const peg$e46 = peg$literalExpectation("groupBy", true);
+  const peg$e47 = peg$literalExpectation("group-by", true);
+  const peg$e48 = peg$literalExpectation("limit", true);
+  const peg$e49 = peg$literalExpectation("feed", true);
+  const peg$e50 = peg$literalExpectation("title", true);
+  const peg$e51 = peg$literalExpectation("assignee", true);
+  const peg$e52 = peg$literalExpectation("createdBy", true);
+  const peg$e53 = peg$literalExpectation("created-by", true);
+  const peg$e54 = peg$literalExpectation("action", true);
+  const peg$e55 = peg$literalExpectation("total", true);
+  const peg$e56 = peg$literalExpectation("has", true);
+  const peg$e57 = peg$literalExpectation("is", true);
+  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e59 = peg$literalExpectation("purchase-amount", true);
+  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e61 = peg$literalExpectation("purchase-currency", true);
+  const peg$e62 = peg$literalExpectation("columns", true);
+  const peg$e63 = peg$literalExpectation("view", true);
+  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e65 = peg$literalExpectation("exportedTo", true);
+  const peg$e66 = peg$literalExpectation("exported-to", true);
+  const peg$e67 = peg$otherExpectation("operator");
+  const peg$e68 = peg$literalExpectation("*:", false);
+  const peg$e69 = peg$literalExpectation("!=", false);
+  const peg$e70 = peg$literalExpectation(">=", false);
+  const peg$e71 = peg$literalExpectation(">", false);
+  const peg$e72 = peg$literalExpectation("<=", false);
+  const peg$e73 = peg$literalExpectation("<", false);
+  const peg$e74 = peg$otherExpectation("word");
+  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e77 = peg$otherExpectation("quote");
+  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e81 = peg$literalExpectation("\u201C", false);
+  const peg$e82 = peg$literalExpectation("\u201D", false);
+  const peg$e83 = peg$literalExpectation("\"", false);
+  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e88 = peg$classExpectation([","], false, false, false);
+  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(ranges) {    return { autocomplete, ranges };  }
+  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
+  function peg$f2(neg, key, op, value) {
+    expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+    const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        ...value[value.length - 1],
+        value: "",
+        start: location().end.offset,
+        length: 0,
       };
-      return value
-        .filter((v) => v.length > 0)
-        .map((v) => ({
-          key,
-          negated: isNegated,
-          ...v,
-        }));
-    };
-  var peg$f3 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f4 = function() { autocomplete = null; };
-  var peg$f5 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
+      return;
+    }
+
+    autocomplete = {
+      key,
+      negated: isNegated,
+      ...value[value.length - 1],
     };
-  var peg$f6 = function(parts, empty) {
-      const ends = location();
-      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-      if (empty) {
-        value.push("");
-      }
-      let count = ends.start.offset;
-      const result = [];
-      value.forEach((filter) => {
-        let word = filter;
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          word = word.slice(1, -1);
-        }
-        result.push({
-          value: word,
-          start: count,
-          length: filter.length,
-        });
-        count += filter.length + 1;
+    return value
+      .filter((v) => v.length > 0)
+      .map((v) => ({
+        key,
+        negated: isNegated,
+        ...v,
+      }));
+  }
+  function peg$f3(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f4() {    autocomplete = null;  }
+  function peg$f5(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f6(parts, empty) {
+    const ends = location();
+    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+    if (empty) {
+      value.push("");
+    }
+    let count = ends.start.offset;
+    const result = [];
+    value.forEach((filter) => {
+      let word = filter;
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        word = word.slice(1, -1);
+      }
+      result.push({
+        value: word,
+        start: count,
+        length: filter.length,
       });
-      return result;
-    };
-  var peg$f7 = function() { return "date"; };
-  var peg$f8 = function() { return "amount"; };
-  var peg$f9 = function() { return "merchant"; };
-  var peg$f10 = function() { return "description"; };
-  var peg$f11 = function() { return "reportID"; };
-  var peg$f12 = function() { return "keyword"; };
-  var peg$f13 = function() { return "in"; };
-  var peg$f14 = function() { return "currency"; };
-  var peg$f15 = function() { return "groupCurrency"; };
-  var peg$f16 = function() { return "tag"; };
-  var peg$f17 = function() { return "category"; };
-  var peg$f18 = function() { return "to"; };
-  var peg$f19 = function() { return "exporter"; };
-  var peg$f20 = function() { return "payer"; };
-  var peg$f21 = function() { return "taxRate"; };
-  var peg$f22 = function() { return "cardID"; };
-  var peg$f23 = function() { return "from"; };
-  var peg$f24 = function() {return "attendee"};
-  var peg$f25 = function() { return "expenseType"; };
-  var peg$f26 = function() { return "withdrawalType"; };
-  var peg$f27 = function() { return "withdrawalID"; };
-  var peg$f28 = function() { return "billable"; };
-  var peg$f29 = function() { return "reimbursable"; };
-  var peg$f30 = function() { return "type"; };
-  var peg$f31 = function() { return "status"; };
-  var peg$f32 = function() { return "sortBy"; };
-  var peg$f33 = function() { return "sortOrder"; };
-  var peg$f34 = function() { return "policyID"; };
-  var peg$f35 = function() { return "submitted"; };
-  var peg$f36 = function() { return "approved"; };
-  var peg$f37 = function() { return "paid"; };
-  var peg$f38 = function() { return "exported"; };
-  var peg$f39 = function() { return "posted"; };
-  var peg$f40 = function() { return "withdrawn"; };
-  var peg$f41 = function() { return "groupBy"; };
-  var peg$f42 = function() { return "limit"; };
-  var peg$f43 = function() { return "feed"; };
-  var peg$f44 = function() { return "title"; };
-  var peg$f45 = function() { return "assignee"; };
-  var peg$f46 = function() { return "createdBy"; };
-  var peg$f47 = function() { return "action"; };
-  var peg$f48 = function() {return "total"; };
-  var peg$f49 = function() {return "has"; };
-  var peg$f50 = function() {return "is"; };
-  var peg$f51 = function() {return "purchaseAmount"};
-  var peg$f52 = function() {return "purchaseCurrency"};
-  var peg$f53 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f54 = function() {return "view"};
-  var peg$f55 = function() { return isColumnsContext; };
-  var peg$f56 = function() { return "perDiem"; };
-  var peg$f57 = function() { return "drafts"; };
-  var peg$f58 = function() { return "originalamount"; };
-  var peg$f59 = function() { return "taxAmount"; };
-  var peg$f60 = function() { return "taxrate"; };
-  var peg$f61 = function() { return "policyname"; };
-  var peg$f62 = function() { return "withdrawalID"; };
-  var peg$f63 = function() { return "bankAccount"; };
-  var peg$f64 = function() { return "reportID"; };
-  var peg$f65 = function() { return "base62ReportID"; };
-  var peg$f66 = function() { return "exportedto"; };
-  var peg$f67 = function() { return "exportedTo"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exchangeRate"; };
-  var peg$f70 = function() { return "reimbursableTotal"; };
-  var peg$f71 = function() { return "nonReimbursableTotal"; };
-  var peg$f72 = function() { return "groupFrom"; };
-  var peg$f73 = function() { return "groupExpenses"; };
-  var peg$f74 = function() { return "groupTotal"; };
-  var peg$f75 = function() { return "groupCard"; };
-  var peg$f76 = function() { return "groupFeed"; };
-  var peg$f77 = function() { return "groupBankAccount"; };
-  var peg$f78 = function() { return "groupWithdrawn"; };
-  var peg$f79 = function() { return "groupWithdrawalID"; };
-  var peg$f80 = function() { return "groupCategory"; };
-  var peg$f81 = function() { return "groupTag"; };
-  var peg$f82 = function() { return "groupMerchant"; };
-  var peg$f83 = function() { return "groupmonth"; };
-  var peg$f84 = function() { return "groupweek"; };
-  var peg$f85 = function() { return "groupyear"; };
-  var peg$f86 = function() { return "groupquarter"; };
-  var peg$f87 = function() { return "eq"; };
-  var peg$f88 = function() { return "neq"; };
-  var peg$f89 = function() { return "gte"; };
-  var peg$f90 = function() { return "gt"; };
-  var peg$f91 = function() { return "lte"; };
-  var peg$f92 = function() { return "lt"; };
-  var peg$f93 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f94 = function(chars) { return chars.join("").trim(); };
-  var peg$f95 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f96 = function() { return expectingNestedQuote; };
-  var peg$f97 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f98 = function(start) {return "“"};
-  var peg$f99 = function(start) {return "”"};
-  var peg$f100 = function(start) {return "\""};
-  var peg$f101 = function(start, inner, end) {
+      count += filter.length + 1;
+    });
+    return result;
+  }
+  function peg$f7() {    return "date";  }
+  function peg$f8() {    return "amount";  }
+  function peg$f9() {    return "merchant";  }
+  function peg$f10() {    return "description";  }
+  function peg$f11() {    return "reportID";  }
+  function peg$f12() {    return "in";  }
+  function peg$f13() {    return "currency";  }
+  function peg$f14() {    return "groupCurrency";  }
+  function peg$f15() {    return "tag";  }
+  function peg$f16() {    return "category";  }
+  function peg$f17() {    return "to";  }
+  function peg$f18() {    return "exporter";  }
+  function peg$f19() {    return "payer";  }
+  function peg$f20() {    return "taxRate";  }
+  function peg$f21() {    return "cardID";  }
+  function peg$f22() {    return "from";  }
+  function peg$f23() {return "attendee"  }
+  function peg$f24() {    return "expenseType";  }
+  function peg$f25() {    return "withdrawalType";  }
+  function peg$f26() {    return "withdrawalID";  }
+  function peg$f27() {    return "billable";  }
+  function peg$f28() {    return "reimbursable";  }
+  function peg$f29() {    return "type";  }
+  function peg$f30() {    return "status";  }
+  function peg$f31() {    return "policyID";  }
+  function peg$f32() {    return "submitted";  }
+  function peg$f33() {    return "approved";  }
+  function peg$f34() {    return "paid";  }
+  function peg$f35() {    return "exported";  }
+  function peg$f36() {    return "posted";  }
+  function peg$f37() {    return "withdrawn";  }
+  function peg$f38() {    return "groupBy";  }
+  function peg$f39() {    return "limit";  }
+  function peg$f40() {    return "feed";  }
+  function peg$f41() {    return "title";  }
+  function peg$f42() {    return "assignee";  }
+  function peg$f43() {    return "createdBy";  }
+  function peg$f44() {    return "action";  }
+  function peg$f45() {return "total";  }
+  function peg$f46() {return "has";  }
+  function peg$f47() {return "is";  }
+  function peg$f48() {return "purchaseAmount"  }
+  function peg$f49() {return "purchaseCurrency"  }
+  function peg$f50() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f51() {return "view"  }
+  function peg$f52() {    return "exportedTo";  }
+  function peg$f53() {    return "exportedTo";  }
+  function peg$f54() {    return "contains";  }
+  function peg$f55() {    return "eq";  }
+  function peg$f56() {    return "neq";  }
+  function peg$f57() {    return "gte";  }
+  function peg$f58() {    return "gt";  }
+  function peg$f59() {    return "lte";  }
+  function peg$f60() {    return "lt";  }
+  function peg$f61(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f62(chars) {    return chars.join("").trim();  }
+  function peg$f63() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f64() {    return expectingNestedQuote;  }
+  function peg$f65(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f66(start) {return "“"  }
+  function peg$f67(start) {return "”"  }
+  function peg$f68(start) {return "\""  }
+  function peg$f69(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -624,7 +520,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -652,12 +548,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -669,12 +573,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -689,7 +593,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -710,21 +614,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -758,7 +662,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -771,7 +675,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -796,7 +700,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -814,7 +718,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -853,12 +757,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -866,7 +770,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -974,7 +878,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -1001,7 +905,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1160,7 +1064,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1174,7 +1078,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1236,12 +1140,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1256,12 +1160,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1276,12 +1180,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1296,12 +1200,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1316,11 +1220,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1329,7 +1233,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1344,13 +1248,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsekeyword() {
-    var s0, s1;
+  function peg$parsein() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1364,13 +1268,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    var s0, s1;
+  function peg$parsecurrency() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1384,48 +1288,28 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f14();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c13) {
-      s0 = peg$c13;
+    if (input.substr(peg$currPos, 13) === peg$c12) {
+      s0 = peg$c12;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+      if (s1.toLowerCase() === peg$c13) {
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f14();
       }
       s0 = s1;
     }
@@ -1434,19 +1318,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+    if (s1.toLowerCase() === peg$c14) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f15();
     }
     s0 = s1;
 
@@ -1454,19 +1338,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1474,19 +1358,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1494,19 +1378,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1514,19 +1398,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1534,27 +1418,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c19) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c20) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f20();
       }
       s0 = s1;
     }
@@ -1563,27 +1447,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c22) {
-      s0 = peg$c22;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+      if (s1.toLowerCase() === peg$c22) {
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1592,19 +1476,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c23) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f22();
     }
     s0 = s1;
 
@@ -1612,19 +1496,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1632,27 +1516,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+      if (s1.toLowerCase() === peg$c26) {
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1661,27 +1545,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c28) {
-      s0 = peg$c28;
+    if (input.substr(peg$currPos, 14) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+      if (s1.toLowerCase() === peg$c28) {
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1690,27 +1574,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+    if (s0.toLowerCase() === peg$c29) {
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+      if (s1.toLowerCase() === peg$c30) {
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f27();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1719,19 +1603,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1739,19 +1623,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1759,19 +1643,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1779,105 +1663,47 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f30();
     }
     s0 = s1;
 
     return s0;
   }
 
-  function peg$parsesortBy() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 6) === peg$c36) {
-      s0 = peg$c36;
-      peg$currPos += 6;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f32();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsesortOrder() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 9) === peg$c38) {
-      s0 = peg$c38;
-      peg$currPos += 9;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f33();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 8) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+      if (s1.toLowerCase() === peg$c36) {
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -1886,19 +1712,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c37) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f32();
     }
     s0 = s1;
 
@@ -1906,19 +1732,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c38) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f33();
     }
     s0 = s1;
 
@@ -1926,19 +1752,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c39) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f34();
     }
     s0 = s1;
 
@@ -1946,19 +1772,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c40) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1966,19 +1792,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c41) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1986,19 +1812,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2006,27 +1832,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c43) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c44) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f38();
       }
       s0 = s1;
     }
@@ -2035,19 +1861,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2055,19 +1881,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -2075,19 +1901,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f41();
     }
     s0 = s1;
 
@@ -2095,19 +1921,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c48) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -2115,27 +1941,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+    if (s0.toLowerCase() === peg$c49) {
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+      if (s1.toLowerCase() === peg$c50) {
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f46();
+        s1 = peg$f43();
       }
       s0 = s1;
     }
@@ -2144,19 +1970,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2164,1438 +1990,204 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f48();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsehas() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f49();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseis() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsepurchaseAmount() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f51();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepurchaseCurrency() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f52();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumns() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f53();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseview() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f54();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsevalues() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    peg$savedPos = peg$currPos;
-    s1 = peg$f55();
-    if (s1) {
-      s1 = undefined;
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsecolumnsValues();
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseperDiem();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsedraft();
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumnsValues() {
-    var s0;
-
-    s0 = peg$parseoriginalAmount();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsetaxRateValue();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsetaxAmount();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parsepolicyName();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parsewithdrawalId();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parsebankAccount();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parsereportId();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsebase62ReportId();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parseexportedToColumnValue();
-                    if (s0 === peg$FAILED) {
-                      s0 = peg$parseexchangeRate();
-                      if (s0 === peg$FAILED) {
-                        s0 = peg$parsereimbursableTotal();
-                        if (s0 === peg$FAILED) {
-                          s0 = peg$parsenonReimbursableTotal();
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$parsegroupFrom();
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$parsegroupExpenses();
-                              if (s0 === peg$FAILED) {
-                                s0 = peg$parsegroupTotal();
-                                if (s0 === peg$FAILED) {
-                                  s0 = peg$parsegroupCard();
-                                  if (s0 === peg$FAILED) {
-                                    s0 = peg$parsegroupFeed();
-                                    if (s0 === peg$FAILED) {
-                                      s0 = peg$parsegroupBankAccount();
-                                      if (s0 === peg$FAILED) {
-                                        s0 = peg$parsegroupWithdrawn();
-                                        if (s0 === peg$FAILED) {
-                                          s0 = peg$parsegroupWithdrawalId();
-                                          if (s0 === peg$FAILED) {
-                                            s0 = peg$parsegroupCategory();
-                                            if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupTag();
-                                              if (s0 === peg$FAILED) {
-                                                s0 = peg$parsegroupMerchant();
-                                                if (s0 === peg$FAILED) {
-                                                  s0 = peg$parsegroupMonth();
-                                                  if (s0 === peg$FAILED) {
-                                                    s0 = peg$parsegroupWeek();
-                                                    if (s0 === peg$FAILED) {
-                                                      s0 = peg$parsegroupYear();
-                                                      if (s0 === peg$FAILED) {
-                                                        s0 = peg$parsegroupQuarter();
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseperDiem() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f56();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsedraft() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
-    }
-    if (s1 === peg$FAILED) {
-      s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f57();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f58();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f59();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f60();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f61();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f62();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f63();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f64();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f65();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f66();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
-      }
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f67();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e77); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f68();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f69();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f70();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f71();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f72();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f73();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f74();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f75();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f76();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f77();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f78();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f79();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s1 = peg$f45();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+  function peg$parsehas() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f80();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f46();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+  function peg$parseis() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c54) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f81();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f47();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseAmount() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c55) {
+      peg$currPos += (14);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c56) {
+        peg$currPos += (15);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f48();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseCurrency() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c57) {
+      peg$currPos += (16);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c58) {
+        peg$currPos += (17);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f49();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+  function peg$parsecolumns() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f84();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f50();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+  function peg$parseview() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c60) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+      peg$savedPos = s0;
+      s1 = peg$f51();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    let s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
       } else {
         s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f85();
+        s1 = [s1, s2];
+        s0 = s1;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+  function peg$parseexportedTo() {
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c61) {
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parsewordBoundary();
+      s3 = peg$parseexportedToKeyEnd();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -3605,7 +2197,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f52();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3614,97 +2206,144 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += (11);
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f53();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r1.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c63) {
+      s1 = peg$c63;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87();
+      s1 = peg$f54();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r1.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e99); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f88();
+        s1 = peg$f55();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c95) {
-          s1 = peg$c95;
+        if (input.substr(peg$currPos, 2) === peg$c64) {
+          s1 = peg$c64;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e100); }
+          if (peg$silentFails === 0) { peg$fail(peg$e69); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f89();
+          s1 = peg$f56();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c96;
-            peg$currPos++;
+          if (input.substr(peg$currPos, 2) === peg$c65) {
+            s1 = peg$c65;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e101); }
+            if (peg$silentFails === 0) { peg$fail(peg$e70); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f90();
+            s1 = peg$f57();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
-              s1 = peg$c97;
-              peg$currPos += 2;
+            if (input.charCodeAt(peg$currPos) === 62) {
+              s1 = peg$c66;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e102); }
+              if (peg$silentFails === 0) { peg$fail(peg$e71); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f91();
+              s1 = peg$f58();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c98;
-                peg$currPos++;
+              if (input.substr(peg$currPos, 2) === peg$c67) {
+                s1 = peg$c67;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e103); }
+                if (peg$silentFails === 0) { peg$fail(peg$e72); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f92();
+                s1 = peg$f59();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c68;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f60();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3713,20 +2352,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93(s1);
+      s1 = peg$f61(s1);
     }
     s0 = s1;
 
@@ -3734,7 +2373,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3744,7 +2383,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3754,7 +2393,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
     } else {
@@ -3762,32 +2401,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f95();
+    s1 = peg$f63();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3796,7 +2435,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3805,22 +2444,20 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e106); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f96();
+    s1 = peg$f64();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3847,7 +2484,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3857,7 +2494,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3866,7 +2503,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3874,7 +2511,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3883,7 +2520,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3892,7 +2529,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3900,7 +2537,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e110); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3909,7 +2546,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3918,11 +2555,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e105); }
+            if (peg$silentFails === 0) { peg$fail(peg$e75); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f97(s1, s3, s5);
+        s0 = peg$f65(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3934,14 +2571,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3951,7 +2588,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3960,7 +2597,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3968,7 +2605,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3977,7 +2614,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3993,15 +2630,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c69;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e112); }
+            if (peg$silentFails === 0) { peg$fail(peg$e81); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f98(s1);
+            s4 = peg$f66(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4024,15 +2661,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c70;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e113); }
+              if (peg$silentFails === 0) { peg$fail(peg$e82); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4055,15 +2692,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c71;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                if (peg$silentFails === 0) { peg$fail(peg$e83); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4082,7 +2719,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4098,15 +2735,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c69;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e112); }
+              if (peg$silentFails === 0) { peg$fail(peg$e81); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f98(s1);
+              s4 = peg$f66(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4129,15 +2766,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c70;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e113); }
+                if (peg$silentFails === 0) { peg$fail(peg$e82); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f99(s1);
+                s4 = peg$f67(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4160,15 +2797,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c71;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f100(s1);
+                  s4 = peg$f68(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4184,7 +2821,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101(s1, s3, s4);
+        s0 = peg$f69(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4196,14 +2833,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4211,7 +2848,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4240,7 +2877,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4249,7 +2886,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4258,7 +2895,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
     }
     s2 = [];
@@ -4267,7 +2904,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4276,7 +2913,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e116); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s3 = [];
@@ -4285,7 +2922,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4294,7 +2931,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e86); }
       }
     }
     s4 = peg$parseoperator();
@@ -4313,7 +2950,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4322,7 +2959,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e118); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
       }
       s2 = peg$currPos;
@@ -4369,7 +3006,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e88); }
         }
       }
     }
@@ -4378,14 +3015,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4424,30 +3061,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index cc6f3e9fbfcb..ad60a1a0959d 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -157,7 +157,8 @@ groupQuarter            = "group-quarter"i &wordBoundary            { return "gr
 
 
 operator "operator"
-  = (":" / "=") { return "eq"; }
+  = "*:" { return "contains"; }
+  / (":" / "=") { return "eq"; }
   / "!=" { return "neq"; }
   / ">=" { return "gte"; }
   / ">" { return "gt"; }
@@ -167,7 +168,7 @@ operator "operator"
 filterOperator
   = o:operator {
       if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
+        expectingNestedQuote = (o === "eq" || o === "contains");
       }
       isColumnsContext = false;
       return o;
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index de8fe4c0aebe..86fef05c3b2f 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -12,624 +12,615 @@
     return { operator, left, right };
   }
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function peg$SyntaxError(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
 
-peg$subclass(peg$SyntaxError, Error);
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-    any: function() {
-      return "any character";
-    },
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      any() {
+        return "any character";
+      },
 
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
+      end() {
+        return "end of input";
+      },
 
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
 
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[^ \t\r\n\xA0]/;
-  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r2 = /^[:=]/;
-  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r4 = /^[ \t\r\n\xA0]/;
-  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r6 = /^["\u201C-\u201D]/;
-  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r9 = /^[a-zA-Z0-9]/;
-  var peg$r10 = /^[ \t\n\r\xA0]/;
-  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r12 = /^[,]/;
-  var peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
-  var peg$e1 = peg$literalExpectation("-", false);
-  var peg$e2 = peg$literalExpectation("report-field", true);
-  var peg$e3 = peg$literalExpectation("reportfield", true);
-  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e5 = peg$anyExpectation();
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$otherExpectation("default key");
-  var peg$e8 = peg$literalExpectation(",", false);
-  var peg$e9 = peg$literalExpectation("date", true);
-  var peg$e10 = peg$literalExpectation("amount", true);
-  var peg$e11 = peg$literalExpectation("merchant", true);
-  var peg$e12 = peg$literalExpectation("description", true);
-  var peg$e13 = peg$literalExpectation("reportid", true);
-  var peg$e14 = peg$literalExpectation("report-id", true);
-  var peg$e15 = peg$literalExpectation("keyword", true);
-  var peg$e16 = peg$literalExpectation("in", true);
-  var peg$e17 = peg$literalExpectation("currency", true);
-  var peg$e18 = peg$literalExpectation("groupCurrency", false);
-  var peg$e19 = peg$literalExpectation("group-currency", true);
-  var peg$e20 = peg$literalExpectation("tag", true);
-  var peg$e21 = peg$literalExpectation("category", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("exporter", true);
-  var peg$e24 = peg$literalExpectation("payer", true);
-  var peg$e25 = peg$literalExpectation("taxRate", true);
-  var peg$e26 = peg$literalExpectation("tax-rate", true);
-  var peg$e27 = peg$literalExpectation("cardID", false);
-  var peg$e28 = peg$literalExpectation("card", true);
-  var peg$e29 = peg$literalExpectation("from", true);
-  var peg$e30 = peg$literalExpectation("attendee", true);
-  var peg$e31 = peg$literalExpectation("expenseType", false);
-  var peg$e32 = peg$literalExpectation("expense-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalType", false);
-  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e35 = peg$literalExpectation("withdrawalID", true);
-  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e37 = peg$literalExpectation("billable", true);
-  var peg$e38 = peg$literalExpectation("reimbursable", true);
-  var peg$e39 = peg$literalExpectation("type", true);
-  var peg$e40 = peg$literalExpectation("status", true);
-  var peg$e41 = peg$literalExpectation("sortBy", false);
-  var peg$e42 = peg$literalExpectation("sort-by", true);
-  var peg$e43 = peg$literalExpectation("sortOrder", false);
-  var peg$e44 = peg$literalExpectation("sort-order", true);
-  var peg$e45 = peg$literalExpectation("policyID", false);
-  var peg$e46 = peg$literalExpectation("workspace", true);
-  var peg$e47 = peg$literalExpectation("submitted", true);
-  var peg$e48 = peg$literalExpectation("approved", true);
-  var peg$e49 = peg$literalExpectation("paid", true);
-  var peg$e50 = peg$literalExpectation("exported", true);
-  var peg$e51 = peg$literalExpectation("posted", true);
-  var peg$e52 = peg$literalExpectation("withdrawn", true);
-  var peg$e53 = peg$literalExpectation("groupBy", true);
-  var peg$e54 = peg$literalExpectation("group-by", true);
-  var peg$e55 = peg$literalExpectation("limit", true);
-  var peg$e56 = peg$literalExpectation("feed", true);
-  var peg$e57 = peg$literalExpectation("title", true);
-  var peg$e58 = peg$literalExpectation("assignee", true);
-  var peg$e59 = peg$literalExpectation("createdBy", true);
-  var peg$e60 = peg$literalExpectation("created-by", true);
-  var peg$e61 = peg$literalExpectation("action", true);
-  var peg$e62 = peg$literalExpectation("total", true);
-  var peg$e63 = peg$literalExpectation("has", true);
-  var peg$e64 = peg$literalExpectation("is", true);
-  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e66 = peg$literalExpectation("purchase-amount", true);
-  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e68 = peg$literalExpectation("purchase-currency", true);
-  var peg$e69 = peg$literalExpectation("columns", true);
-  var peg$e70 = peg$literalExpectation("view", true);
-  var peg$e71 = peg$literalExpectation("per-diem", true);
-  var peg$e72 = peg$literalExpectation("drafts", true);
-  var peg$e73 = peg$literalExpectation("draft", true);
-  var peg$e74 = peg$literalExpectation("original-amount", true);
-  var peg$e75 = peg$literalExpectation("tax", true);
-  var peg$e76 = peg$literalExpectation("policy-name", true);
-  var peg$e77 = peg$literalExpectation("bank-account", true);
-  var peg$e78 = peg$literalExpectation("long-report-id", true);
-  var peg$e79 = peg$literalExpectation("exported-to", true);
-  var peg$e80 = peg$classExpectation([":", "="], false, false);
-  var peg$e81 = peg$literalExpectation("exportedTo", true);
-  var peg$e82 = peg$literalExpectation("exchange-rate", true);
-  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e85 = peg$literalExpectation("group-from", true);
-  var peg$e86 = peg$literalExpectation("group-expenses", true);
-  var peg$e87 = peg$literalExpectation("group-total", true);
-  var peg$e88 = peg$literalExpectation("group-card", true);
-  var peg$e89 = peg$literalExpectation("group-feed", true);
-  var peg$e90 = peg$literalExpectation("group-bank-account", true);
-  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e93 = peg$literalExpectation("group-category", true);
-  var peg$e94 = peg$literalExpectation("group-tag", true);
-  var peg$e95 = peg$literalExpectation("group-merchant", true);
-  var peg$e96 = peg$literalExpectation("group-month", true);
-  var peg$e97 = peg$literalExpectation("group-week", true);
-  var peg$e98 = peg$literalExpectation("group-year", true);
-  var peg$e99 = peg$literalExpectation("group-quarter", true);
-  var peg$e100 = peg$otherExpectation("operator");
-  var peg$e101 = peg$literalExpectation("!=", false);
-  var peg$e102 = peg$literalExpectation(">=", false);
-  var peg$e103 = peg$literalExpectation(">", false);
-  var peg$e104 = peg$literalExpectation("<=", false);
-  var peg$e105 = peg$literalExpectation("<", false);
-  var peg$e106 = peg$otherExpectation("word");
-  var peg$e107 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e108 = peg$otherExpectation("whitespace");
-  var peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e110 = peg$otherExpectation("quote");
-  var peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e114 = peg$literalExpectation("\u201C", false);
-  var peg$e115 = peg$literalExpectation("\u201D", false);
-  var peg$e116 = peg$literalExpectation("\"", false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e121 = peg$classExpectation([","], false, false);
-  var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(filters) { return applyDefaults(filters); };
-  var peg$f1 = function(head, tail) {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter(Boolean)
-        .filter((filter) => filter.right);
-      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-      if (!filtersWithoutDefaults.length) {
-        return null;
-      }
-
-      const keywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      const keywordFilter = buildFilter(
-        "eq",
-        "keyword",
-        keywords
-          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-          .flat()
-      );
-      if (keywordFilter.right.length > 0) {
-        nonKeywords.push(keywordFilter);
-      }
-      return nonKeywords.reduce((result, filter) =>
-        buildFilter("and", result, filter)
-      );
-    };
-  var peg$f2 = function(key, op, value) {
-      updateDefaultValues(key, value);
-      return {...buildFilter(op, key, value), isDefault: true};
-    };
-  var peg$f3 = function(value) {
-      //handle no-breaking space
-      let word;
-      if (Array.isArray(value)) {
-        word = value.join("");
-      } else {
-        word = value;
-      }
-      return buildFilter("eq", "keyword", word);
-    };
-  var peg$f4 = function(neg, field, op, values) {
-      expectingNestedQuote = false; nameOperator = false;
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
-      const key = field;
-      let operator = op;
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "keyword";
+  const peg$c11 = "in";
+  const peg$c12 = "currency";
+  const peg$c13 = "groupCurrency";
+  const peg$c14 = "group-currency";
+  const peg$c15 = "tag";
+  const peg$c16 = "category";
+  const peg$c17 = "to";
+  const peg$c18 = "exporter";
+  const peg$c19 = "payer";
+  const peg$c20 = "taxrate";
+  const peg$c21 = "tax-rate";
+  const peg$c22 = "cardID";
+  const peg$c23 = "card";
+  const peg$c24 = "from";
+  const peg$c25 = "attendee";
+  const peg$c26 = "expenseType";
+  const peg$c27 = "expense-type";
+  const peg$c28 = "withdrawalType";
+  const peg$c29 = "withdrawal-type";
+  const peg$c30 = "withdrawalid";
+  const peg$c31 = "withdrawal-id";
+  const peg$c32 = "billable";
+  const peg$c33 = "reimbursable";
+  const peg$c34 = "type";
+  const peg$c35 = "status";
+  const peg$c36 = "sortBy";
+  const peg$c37 = "sort-by";
+  const peg$c38 = "sortOrder";
+  const peg$c39 = "sort-order";
+  const peg$c40 = "policyID";
+  const peg$c41 = "workspace";
+  const peg$c42 = "submitted";
+  const peg$c43 = "approved";
+  const peg$c44 = "paid";
+  const peg$c45 = "exported";
+  const peg$c46 = "posted";
+  const peg$c47 = "withdrawn";
+  const peg$c48 = "groupby";
+  const peg$c49 = "group-by";
+  const peg$c50 = "limit";
+  const peg$c51 = "feed";
+  const peg$c52 = "title";
+  const peg$c53 = "assignee";
+  const peg$c54 = "createdby";
+  const peg$c55 = "created-by";
+  const peg$c56 = "action";
+  const peg$c57 = "total";
+  const peg$c58 = "has";
+  const peg$c59 = "is";
+  const peg$c60 = "purchaseamount";
+  const peg$c61 = "purchase-amount";
+  const peg$c62 = "purchasecurrency";
+  const peg$c63 = "purchase-currency";
+  const peg$c64 = "columns";
+  const peg$c65 = "view";
+  const peg$c66 = "per-diem";
+  const peg$c67 = "drafts";
+  const peg$c68 = "draft";
+  const peg$c69 = "original-amount";
+  const peg$c70 = "tax";
+  const peg$c71 = "policy-name";
+  const peg$c72 = "bank-account";
+  const peg$c73 = "long-report-id";
+  const peg$c74 = "exported-to";
+  const peg$c75 = "exportedto";
+  const peg$c76 = "exchange-rate";
+  const peg$c77 = "reimbursable-total";
+  const peg$c78 = "non-reimbursable-total";
+  const peg$c79 = "group-from";
+  const peg$c80 = "group-expenses";
+  const peg$c81 = "group-total";
+  const peg$c82 = "group-card";
+  const peg$c83 = "group-feed";
+  const peg$c84 = "group-bank-account";
+  const peg$c85 = "group-withdrawn";
+  const peg$c86 = "group-withdrawal-id";
+  const peg$c87 = "group-category";
+  const peg$c88 = "group-tag";
+  const peg$c89 = "group-merchant";
+  const peg$c90 = "group-month";
+  const peg$c91 = "group-week";
+  const peg$c92 = "group-year";
+  const peg$c93 = "group-quarter";
+  const peg$c94 = "*:";
+  const peg$c95 = "!=";
+  const peg$c96 = ">=";
+  const peg$c97 = ">";
+  const peg$c98 = "<=";
+  const peg$c99 = "<";
+  const peg$c100 = "\u201C";
+  const peg$c101 = "\u201D";
+  const peg$c102 = "\"";
+
+  const peg$r0 = /^[^ \t\r\n\xA0]/;
+  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r2 = /^[:=]/;
+  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r4 = /^[ \t\r\n\xA0]/;
+  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r6 = /^["\u201C-\u201D]/;
+  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r9 = /^[a-zA-Z0-9]/;
+  const peg$r10 = /^[ \t\n\r\xA0]/;
+  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r12 = /^[,]/;
+  const peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
+  const peg$e1 = peg$literalExpectation("-", false);
+  const peg$e2 = peg$literalExpectation("report-field", true);
+  const peg$e3 = peg$literalExpectation("reportfield", true);
+  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e5 = peg$anyExpectation();
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$otherExpectation("default key");
+  const peg$e8 = peg$literalExpectation(",", false);
+  const peg$e9 = peg$literalExpectation("date", true);
+  const peg$e10 = peg$literalExpectation("amount", true);
+  const peg$e11 = peg$literalExpectation("merchant", true);
+  const peg$e12 = peg$literalExpectation("description", true);
+  const peg$e13 = peg$literalExpectation("reportid", true);
+  const peg$e14 = peg$literalExpectation("report-id", true);
+  const peg$e15 = peg$literalExpectation("keyword", true);
+  const peg$e16 = peg$literalExpectation("in", true);
+  const peg$e17 = peg$literalExpectation("currency", true);
+  const peg$e18 = peg$literalExpectation("groupCurrency", false);
+  const peg$e19 = peg$literalExpectation("group-currency", true);
+  const peg$e20 = peg$literalExpectation("tag", true);
+  const peg$e21 = peg$literalExpectation("category", true);
+  const peg$e22 = peg$literalExpectation("to", true);
+  const peg$e23 = peg$literalExpectation("exporter", true);
+  const peg$e24 = peg$literalExpectation("payer", true);
+  const peg$e25 = peg$literalExpectation("taxRate", true);
+  const peg$e26 = peg$literalExpectation("tax-rate", true);
+  const peg$e27 = peg$literalExpectation("cardID", false);
+  const peg$e28 = peg$literalExpectation("card", true);
+  const peg$e29 = peg$literalExpectation("from", true);
+  const peg$e30 = peg$literalExpectation("attendee", true);
+  const peg$e31 = peg$literalExpectation("expenseType", false);
+  const peg$e32 = peg$literalExpectation("expense-type", true);
+  const peg$e33 = peg$literalExpectation("withdrawalType", false);
+  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e35 = peg$literalExpectation("withdrawalID", true);
+  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e37 = peg$literalExpectation("billable", true);
+  const peg$e38 = peg$literalExpectation("reimbursable", true);
+  const peg$e39 = peg$literalExpectation("type", true);
+  const peg$e40 = peg$literalExpectation("status", true);
+  const peg$e41 = peg$literalExpectation("sortBy", false);
+  const peg$e42 = peg$literalExpectation("sort-by", true);
+  const peg$e43 = peg$literalExpectation("sortOrder", false);
+  const peg$e44 = peg$literalExpectation("sort-order", true);
+  const peg$e45 = peg$literalExpectation("policyID", false);
+  const peg$e46 = peg$literalExpectation("workspace", true);
+  const peg$e47 = peg$literalExpectation("submitted", true);
+  const peg$e48 = peg$literalExpectation("approved", true);
+  const peg$e49 = peg$literalExpectation("paid", true);
+  const peg$e50 = peg$literalExpectation("exported", true);
+  const peg$e51 = peg$literalExpectation("posted", true);
+  const peg$e52 = peg$literalExpectation("withdrawn", true);
+  const peg$e53 = peg$literalExpectation("groupBy", true);
+  const peg$e54 = peg$literalExpectation("group-by", true);
+  const peg$e55 = peg$literalExpectation("limit", true);
+  const peg$e56 = peg$literalExpectation("feed", true);
+  const peg$e57 = peg$literalExpectation("title", true);
+  const peg$e58 = peg$literalExpectation("assignee", true);
+  const peg$e59 = peg$literalExpectation("createdBy", true);
+  const peg$e60 = peg$literalExpectation("created-by", true);
+  const peg$e61 = peg$literalExpectation("action", true);
+  const peg$e62 = peg$literalExpectation("total", true);
+  const peg$e63 = peg$literalExpectation("has", true);
+  const peg$e64 = peg$literalExpectation("is", true);
+  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e66 = peg$literalExpectation("purchase-amount", true);
+  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e68 = peg$literalExpectation("purchase-currency", true);
+  const peg$e69 = peg$literalExpectation("columns", true);
+  const peg$e70 = peg$literalExpectation("view", true);
+  const peg$e71 = peg$literalExpectation("per-diem", true);
+  const peg$e72 = peg$literalExpectation("drafts", true);
+  const peg$e73 = peg$literalExpectation("draft", true);
+  const peg$e74 = peg$literalExpectation("original-amount", true);
+  const peg$e75 = peg$literalExpectation("tax", true);
+  const peg$e76 = peg$literalExpectation("policy-name", true);
+  const peg$e77 = peg$literalExpectation("bank-account", true);
+  const peg$e78 = peg$literalExpectation("long-report-id", true);
+  const peg$e79 = peg$literalExpectation("exported-to", true);
+  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e81 = peg$literalExpectation("exportedTo", true);
+  const peg$e82 = peg$literalExpectation("exchange-rate", true);
+  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  const peg$e85 = peg$literalExpectation("group-from", true);
+  const peg$e86 = peg$literalExpectation("group-expenses", true);
+  const peg$e87 = peg$literalExpectation("group-total", true);
+  const peg$e88 = peg$literalExpectation("group-card", true);
+  const peg$e89 = peg$literalExpectation("group-feed", true);
+  const peg$e90 = peg$literalExpectation("group-bank-account", true);
+  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  const peg$e93 = peg$literalExpectation("group-category", true);
+  const peg$e94 = peg$literalExpectation("group-tag", true);
+  const peg$e95 = peg$literalExpectation("group-merchant", true);
+  const peg$e96 = peg$literalExpectation("group-month", true);
+  const peg$e97 = peg$literalExpectation("group-week", true);
+  const peg$e98 = peg$literalExpectation("group-year", true);
+  const peg$e99 = peg$literalExpectation("group-quarter", true);
+  const peg$e100 = peg$otherExpectation("operator");
+  const peg$e101 = peg$literalExpectation("*:", false);
+  const peg$e102 = peg$literalExpectation("!=", false);
+  const peg$e103 = peg$literalExpectation(">=", false);
+  const peg$e104 = peg$literalExpectation(">", false);
+  const peg$e105 = peg$literalExpectation("<=", false);
+  const peg$e106 = peg$literalExpectation("<", false);
+  const peg$e107 = peg$otherExpectation("word");
+  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e110 = peg$otherExpectation("quote");
+  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e114 = peg$literalExpectation("\u201C", false);
+  const peg$e115 = peg$literalExpectation("\u201D", false);
+  const peg$e116 = peg$literalExpectation("\"", false);
+  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e121 = peg$classExpectation([","], false, false, false);
+  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(filters) {    return applyDefaults(filters);  }
+  function peg$f1(head, tail) {
+    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+      .filter(Boolean)
+      .filter((filter) => filter.right);
+    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+    if (!filtersWithoutDefaults.length) {
+      return null;
+    }
 
-      // Apply negation only when "-" is present and the key can be negated
-      if (neg && !nonNegatableKeys.has(key)) {
-        if (operator === "eq") {
-          operator = "neq";
-        }
+    const keywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left === "keyword" || filter.right?.left === "keyword"
+    );
+    const nonKeywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left !== "keyword" && filter.right?.left !== "keyword"
+    );
+
+    const keywordFilter = buildFilter(
+      "eq",
+      "keyword",
+      keywords
+        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+        .flat()
+    );
+    if (keywordFilter.right.length > 0) {
+      nonKeywords.push(keywordFilter);
+    }
+    return nonKeywords.reduce((result, filter) =>
+      buildFilter("and", result, filter)
+    );
+  }
+  function peg$f2(key, op, value) {
+    updateDefaultValues(key, value);
+    return {...buildFilter(op, key, value), isDefault: true};
+  }
+  function peg$f3(value) {
+    //handle no-breaking space
+    let word;
+    if (Array.isArray(value)) {
+      word = value.join("");
+    } else {
+      word = value;
+    }
+    return buildFilter("eq", "keyword", word);
+  }
+  function peg$f4(neg, field, op, values) {
+    expectingNestedQuote = false; nameOperator = false;
+
+    const key = field;
+    let operator = op;
+
+    // Apply negation only when "-" is present and the key can be negated
+    if (neg && !nonNegatableKeys.has(key)) {
+      if (operator === "eq") {
+        operator = "neq";
       }
+    }
 
-      return buildFilter(operator, key, values);
-    };
-  var peg$f5 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f6 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
-    };
-  var peg$f7 = function(parts, empty) {
-      const value = parts.flat().filter(Boolean).map((word) => {
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          return word.slice(1, -1);
-        }
-        return word;
-      });
-      if (value.length > 1) {
-        return value.filter((word) => word.length > 0);
+    return buildFilter(operator, key, values);
+  }
+  function peg$f5(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f6(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f7(parts, empty) {
+    const value = parts.flat().filter(Boolean).map((word) => {
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        return word.slice(1, -1);
       }
-      return value[0];
-    };
-  var peg$f8 = function() { return "date"; };
-  var peg$f9 = function() { return "amount"; };
-  var peg$f10 = function() { return "merchant"; };
-  var peg$f11 = function() { return "description"; };
-  var peg$f12 = function() { return "reportID"; };
-  var peg$f13 = function() { return "keyword"; };
-  var peg$f14 = function() { return "in"; };
-  var peg$f15 = function() { return "currency"; };
-  var peg$f16 = function() { return "groupCurrency"; };
-  var peg$f17 = function() { return "tag"; };
-  var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "taxRate"; };
-  var peg$f23 = function() { return "cardID"; };
-  var peg$f24 = function() { return "from"; };
-  var peg$f25 = function() {return "attendee"};
-  var peg$f26 = function() { return "expenseType"; };
-  var peg$f27 = function() { return "withdrawalType"; };
-  var peg$f28 = function() { return "withdrawalID"; };
-  var peg$f29 = function() { return "billable"; };
-  var peg$f30 = function() { return "reimbursable"; };
-  var peg$f31 = function() { return "type"; };
-  var peg$f32 = function() { return "status"; };
-  var peg$f33 = function() { return "sortBy"; };
-  var peg$f34 = function() { return "sortOrder"; };
-  var peg$f35 = function() { return "policyID"; };
-  var peg$f36 = function() { return "submitted"; };
-  var peg$f37 = function() { return "approved"; };
-  var peg$f38 = function() { return "paid"; };
-  var peg$f39 = function() { return "exported"; };
-  var peg$f40 = function() { return "posted"; };
-  var peg$f41 = function() { return "withdrawn"; };
-  var peg$f42 = function() { return "groupBy"; };
-  var peg$f43 = function() { return "limit"; };
-  var peg$f44 = function() { return "feed"; };
-  var peg$f45 = function() { return "title"; };
-  var peg$f46 = function() { return "assignee"; };
-  var peg$f47 = function() { return "createdBy"; };
-  var peg$f48 = function() { return "action"; };
-  var peg$f49 = function() {return "total"; };
-  var peg$f50 = function() {return "has"; };
-  var peg$f51 = function() {return "is"; };
-  var peg$f52 = function() {return "purchaseAmount"};
-  var peg$f53 = function() {return "purchaseCurrency"};
-  var peg$f54 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f55 = function() {return "view"};
-  var peg$f56 = function() { return isColumnsContext; };
-  var peg$f57 = function() { return "perDiem"; };
-  var peg$f58 = function() { return "drafts"; };
-  var peg$f59 = function() { return "originalamount"; };
-  var peg$f60 = function() { return "taxAmount"; };
-  var peg$f61 = function() { return "taxrate"; };
-  var peg$f62 = function() { return "policyname"; };
-  var peg$f63 = function() { return "withdrawalID"; };
-  var peg$f64 = function() { return "bankAccount"; };
-  var peg$f65 = function() { return "reportID"; };
-  var peg$f66 = function() { return "base62ReportID"; };
-  var peg$f67 = function() { return "exportedto"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exportedTo"; };
-  var peg$f70 = function() { return "exchangeRate"; };
-  var peg$f71 = function() { return "reimbursableTotal"; };
-  var peg$f72 = function() { return "nonReimbursableTotal"; };
-  var peg$f73 = function() { return "groupFrom"; };
-  var peg$f74 = function() { return "groupExpenses"; };
-  var peg$f75 = function() { return "groupTotal"; };
-  var peg$f76 = function() { return "groupCard"; };
-  var peg$f77 = function() { return "groupFeed"; };
-  var peg$f78 = function() { return "groupBankAccount"; };
-  var peg$f79 = function() { return "groupWithdrawn"; };
-  var peg$f80 = function() { return "groupWithdrawalID"; };
-  var peg$f81 = function() { return "groupCategory"; };
-  var peg$f82 = function() { return "groupTag"; };
-  var peg$f83 = function() { return "groupMerchant"; };
-  var peg$f84 = function() { return "groupmonth"; };
-  var peg$f85 = function() { return "groupweek"; };
-  var peg$f86 = function() { return "groupyear"; };
-  var peg$f87 = function() { return "groupquarter"; };
-  var peg$f88 = function() { return "eq"; };
-  var peg$f89 = function() { return "neq"; };
-  var peg$f90 = function() { return "gte"; };
-  var peg$f91 = function() { return "gt"; };
-  var peg$f92 = function() { return "lte"; };
-  var peg$f93 = function() { return "lt"; };
-  var peg$f94 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f95 = function(chars) { return chars.join("").trim(); };
-  var peg$f96 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f97 = function() { return expectingNestedQuote; };
-  var peg$f98 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f99 = function(start) {return "“"};
-  var peg$f100 = function(start) {return "”"};
-  var peg$f101 = function(start) {return "\""};
-  var peg$f102 = function(start, inner, end) {
+      return word;
+    });
+    if (value.length > 1) {
+      return value.filter((word) => word.length > 0);
+    }
+    return value[0];
+  }
+  function peg$f8() {    return "date";  }
+  function peg$f9() {    return "amount";  }
+  function peg$f10() {    return "merchant";  }
+  function peg$f11() {    return "description";  }
+  function peg$f12() {    return "reportID";  }
+  function peg$f13() {    return "keyword";  }
+  function peg$f14() {    return "in";  }
+  function peg$f15() {    return "currency";  }
+  function peg$f16() {    return "groupCurrency";  }
+  function peg$f17() {    return "tag";  }
+  function peg$f18() {    return "category";  }
+  function peg$f19() {    return "to";  }
+  function peg$f20() {    return "exporter";  }
+  function peg$f21() {    return "payer";  }
+  function peg$f22() {    return "taxRate";  }
+  function peg$f23() {    return "cardID";  }
+  function peg$f24() {    return "from";  }
+  function peg$f25() {return "attendee"  }
+  function peg$f26() {    return "expenseType";  }
+  function peg$f27() {    return "withdrawalType";  }
+  function peg$f28() {    return "withdrawalID";  }
+  function peg$f29() {    return "billable";  }
+  function peg$f30() {    return "reimbursable";  }
+  function peg$f31() {    return "type";  }
+  function peg$f32() {    return "status";  }
+  function peg$f33() {    return "sortBy";  }
+  function peg$f34() {    return "sortOrder";  }
+  function peg$f35() {    return "policyID";  }
+  function peg$f36() {    return "submitted";  }
+  function peg$f37() {    return "approved";  }
+  function peg$f38() {    return "paid";  }
+  function peg$f39() {    return "exported";  }
+  function peg$f40() {    return "posted";  }
+  function peg$f41() {    return "withdrawn";  }
+  function peg$f42() {    return "groupBy";  }
+  function peg$f43() {    return "limit";  }
+  function peg$f44() {    return "feed";  }
+  function peg$f45() {    return "title";  }
+  function peg$f46() {    return "assignee";  }
+  function peg$f47() {    return "createdBy";  }
+  function peg$f48() {    return "action";  }
+  function peg$f49() {return "total";  }
+  function peg$f50() {return "has";  }
+  function peg$f51() {return "is";  }
+  function peg$f52() {return "purchaseAmount"  }
+  function peg$f53() {return "purchaseCurrency"  }
+  function peg$f54() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f55() {return "view"  }
+  function peg$f56() {    return isColumnsContext;  }
+  function peg$f57() {    return "perDiem";  }
+  function peg$f58() {    return "drafts";  }
+  function peg$f59() {    return "originalamount";  }
+  function peg$f60() {    return "taxAmount";  }
+  function peg$f61() {    return "taxrate";  }
+  function peg$f62() {    return "policyname";  }
+  function peg$f63() {    return "withdrawalID";  }
+  function peg$f64() {    return "bankAccount";  }
+  function peg$f65() {    return "reportID";  }
+  function peg$f66() {    return "base62ReportID";  }
+  function peg$f67() {    return "exportedto";  }
+  function peg$f68() {    return "exportedTo";  }
+  function peg$f69() {    return "exportedTo";  }
+  function peg$f70() {    return "exchangeRate";  }
+  function peg$f71() {    return "reimbursableTotal";  }
+  function peg$f72() {    return "nonReimbursableTotal";  }
+  function peg$f73() {    return "groupFrom";  }
+  function peg$f74() {    return "groupExpenses";  }
+  function peg$f75() {    return "groupTotal";  }
+  function peg$f76() {    return "groupCard";  }
+  function peg$f77() {    return "groupFeed";  }
+  function peg$f78() {    return "groupBankAccount";  }
+  function peg$f79() {    return "groupWithdrawn";  }
+  function peg$f80() {    return "groupWithdrawalID";  }
+  function peg$f81() {    return "groupCategory";  }
+  function peg$f82() {    return "groupTag";  }
+  function peg$f83() {    return "groupMerchant";  }
+  function peg$f84() {    return "groupmonth";  }
+  function peg$f85() {    return "groupweek";  }
+  function peg$f86() {    return "groupyear";  }
+  function peg$f87() {    return "groupquarter";  }
+  function peg$f88() {    return "contains";  }
+  function peg$f89() {    return "eq";  }
+  function peg$f90() {    return "neq";  }
+  function peg$f91() {    return "gte";  }
+  function peg$f92() {    return "gt";  }
+  function peg$f93() {    return "lte";  }
+  function peg$f94() {    return "lt";  }
+  function peg$f95(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f96(chars) {    return chars.join("").trim();  }
+  function peg$f97() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f98() {    return expectingNestedQuote;  }
+  function peg$f99(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f100(start) {return "“"  }
+  function peg$f101(start) {return "”"  }
+  function peg$f102(start) {return "\""  }
+  function peg$f103(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -651,7 +642,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -679,12 +670,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -696,12 +695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -716,7 +715,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -737,21 +736,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -785,7 +784,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -801,7 +800,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -841,7 +840,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -862,7 +861,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -893,7 +892,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -935,7 +934,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -976,12 +975,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -989,7 +988,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1097,7 +1096,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1238,7 +1237,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1252,7 +1251,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1297,7 +1296,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1420,12 +1419,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1440,12 +1439,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1460,12 +1459,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1480,12 +1479,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1500,11 +1499,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1513,7 +1512,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1529,12 +1528,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1549,12 +1548,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1569,12 +1568,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1589,7 +1588,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1602,7 +1601,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1618,12 +1617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1638,12 +1637,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1658,12 +1657,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1678,12 +1677,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1698,12 +1697,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1718,11 +1717,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1731,7 +1730,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1747,7 +1746,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1760,7 +1759,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1776,12 +1775,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1796,12 +1795,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1816,7 +1815,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1829,7 +1828,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1845,7 +1844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1858,7 +1857,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1874,11 +1873,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1887,7 +1886,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1903,12 +1902,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1923,12 +1922,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1943,12 +1942,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1963,12 +1962,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1983,7 +1982,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1996,7 +1995,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
+        peg$currPos += (7);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2012,7 +2011,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2025,7 +2024,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2041,7 +2040,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2054,7 +2053,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2070,12 +2069,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2090,12 +2089,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2110,12 +2109,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2130,12 +2129,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2150,12 +2149,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2170,12 +2169,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2190,11 +2189,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2203,7 +2202,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2219,12 +2218,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2239,12 +2238,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2259,12 +2258,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2279,12 +2278,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2299,11 +2298,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2312,7 +2311,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2328,12 +2327,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2348,12 +2347,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2368,12 +2367,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2388,12 +2387,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2408,11 +2407,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2421,7 +2420,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2437,11 +2436,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
+      peg$currPos += (16);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2450,7 +2449,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
+        peg$currPos += (17);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2466,12 +2465,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2486,12 +2485,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2506,7 +2505,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2540,7 +2539,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    var s0;
+    let s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2626,12 +2625,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2663,12 +2662,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2676,7 +2675,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
+        peg$currPos += (5);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2709,12 +2708,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2746,12 +2745,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2783,12 +2782,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2820,12 +2819,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2857,12 +2856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2894,12 +2893,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2931,12 +2930,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2968,12 +2967,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3005,12 +3004,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3042,7 +3041,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3068,12 +3067,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3104,7 +3103,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3137,12 +3136,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3174,12 +3173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3211,12 +3210,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
+      peg$currPos += (22);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3248,12 +3247,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3285,12 +3284,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3322,12 +3321,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3359,12 +3358,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3396,12 +3395,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3433,12 +3432,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3470,12 +3469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3507,12 +3506,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
+      peg$currPos += (19);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3544,12 +3543,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3581,12 +3580,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3618,12 +3617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3655,12 +3654,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3692,12 +3691,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3729,12 +3728,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3766,12 +3765,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3803,16 +3802,16 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r2.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -3821,12 +3820,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r2.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -3849,9 +3848,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
+          if (input.substr(peg$currPos, 2) === peg$c96) {
             s1 = peg$c96;
-            peg$currPos++;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e103); }
@@ -3863,9 +3862,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
+            if (input.charCodeAt(peg$currPos) === 62) {
               s1 = peg$c97;
-              peg$currPos += 2;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e104); }
@@ -3877,9 +3876,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
+              if (input.substr(peg$currPos, 2) === peg$c98) {
                 s1 = peg$c98;
-                peg$currPos++;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e105); }
@@ -3889,6 +3888,21 @@ function peg$parse(input, options) {
                 s1 = peg$f93();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c99;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e106); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f94();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3904,13 +3918,13 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
 
@@ -3918,7 +3932,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3928,7 +3942,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3938,7 +3952,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
       }
     } else {
@@ -3946,32 +3960,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95(s1);
+      s1 = peg$f96(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f96();
+    s1 = peg$f97();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3993,18 +4007,16 @@ function peg$parse(input, options) {
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e108); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f97();
+    s1 = peg$f98();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4031,7 +4043,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4093,7 +4105,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4102,11 +4114,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e107); }
+            if (peg$silentFails === 0) { peg$fail(peg$e108); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f98(s1, s3, s5);
+        s0 = peg$f99(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,7 +4137,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4177,7 +4189,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
@@ -4185,7 +4197,7 @@ function peg$parse(input, options) {
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f99(s1);
+            s4 = peg$f100(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4208,7 +4220,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4216,7 +4228,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f100(s1);
+              s4 = peg$f101(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4239,7 +4251,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4247,7 +4259,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f101(s1);
+                s4 = peg$f102(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4282,7 +4294,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4290,7 +4302,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4313,7 +4325,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4321,7 +4333,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4344,7 +4356,7 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
@@ -4352,7 +4364,7 @@ function peg$parse(input, options) {
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f101(s1);
+                  s4 = peg$f102(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4368,7 +4380,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102(s1, s3, s4);
+        s0 = peg$f103(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4387,7 +4399,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4424,7 +4436,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4562,7 +4574,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
@@ -4715,30 +4727,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 75d2f61423d8..52d485bebc19 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -713,7 +713,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeSearchValue(filterValue as string)}`;
+                    const operator =
+                        filterKey === FILTER_KEYS.MERCHANT
+                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 7aac5ba59619..adc8cd651b8c 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -180,7 +180,7 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('sortBy:date sortOrder:desc type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('sortBy:date sortOrder:desc type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
         test('currencies and categories', () => {
@@ -323,7 +323,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc', limit: 25});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {

From 167132a0739222b199831bf52bf96bb7df34ff16 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 10 Mar 2026 18:16:00 +0700
Subject: [PATCH 002/781] fix: Use contains operator for merchant filter in
 advanced search

Switch merchant filter from : (eq) to *: (contains) operator to preserve
partial-matching UX when backend starts respecting eq vs contains distinction.

- Add *: operator support to parser grammar
- Update buildQueryStringFromFilterFormValues to use *: for merchant
- Update unit test expectations

Fixes https://github.com/Expensify/App/issues/80823
---
 src/libs/SearchParser/autocompleteParser.js | 3270 ++++++-------------
 src/libs/SearchParser/baseRules.peggy       |    5 +-
 src/libs/SearchParser/searchParser.js       | 1706 +++++-----
 src/libs/SearchQueryUtils.ts                |    9 +-
 tests/unit/Search/SearchQueryUtilsTest.ts   |    4 +-
 5 files changed, 1831 insertions(+), 3163 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index e70056f0d519..8bbd481fb0ab 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,7 +1,6 @@
 'worklet'
 
-class peg$SyntaxError{}
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -11,598 +10,494 @@ class peg$SyntaxError{}
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function temporary(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
-
-
-
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
-
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      any() {
+        return "any character";
+      },
 
-    any: function() {
-      return "any character";
-    },
+      end() {
+        return "end of input";
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-    other: function(expectation) {
-      return expectation.description;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
     }
-  };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
-
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r1 = /^[:=]/;
-  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r3 = /^[ \t\r\n\xA0]/;
-  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r5 = /^["\u201C-\u201D]/;
-  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r8 = /^[a-zA-Z0-9]/;
-  var peg$r9 = /^[ \t\n\r\xA0]/;
-  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r11 = /^[,]/;
-  var peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$literalExpectation("-", false);
-  var peg$e1 = peg$literalExpectation("report-field", true);
-  var peg$e2 = peg$literalExpectation("reportfield", true);
-  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e4 = peg$anyExpectation();
-  var peg$e5 = peg$literalExpectation(",", false);
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$literalExpectation("date", true);
-  var peg$e8 = peg$literalExpectation("amount", true);
-  var peg$e9 = peg$literalExpectation("merchant", true);
-  var peg$e10 = peg$literalExpectation("description", true);
-  var peg$e11 = peg$literalExpectation("reportid", true);
-  var peg$e12 = peg$literalExpectation("report-id", true);
-  var peg$e13 = peg$literalExpectation("keyword", true);
-  var peg$e14 = peg$literalExpectation("in", true);
-  var peg$e15 = peg$literalExpectation("currency", true);
-  var peg$e16 = peg$literalExpectation("groupCurrency", false);
-  var peg$e17 = peg$literalExpectation("group-currency", true);
-  var peg$e18 = peg$literalExpectation("tag", true);
-  var peg$e19 = peg$literalExpectation("category", true);
-  var peg$e20 = peg$literalExpectation("to", true);
-  var peg$e21 = peg$literalExpectation("exporter", true);
-  var peg$e22 = peg$literalExpectation("payer", true);
-  var peg$e23 = peg$literalExpectation("taxRate", true);
-  var peg$e24 = peg$literalExpectation("tax-rate", true);
-  var peg$e25 = peg$literalExpectation("cardID", false);
-  var peg$e26 = peg$literalExpectation("card", true);
-  var peg$e27 = peg$literalExpectation("from", true);
-  var peg$e28 = peg$literalExpectation("attendee", true);
-  var peg$e29 = peg$literalExpectation("expenseType", false);
-  var peg$e30 = peg$literalExpectation("expense-type", true);
-  var peg$e31 = peg$literalExpectation("withdrawalType", false);
-  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalID", true);
-  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e35 = peg$literalExpectation("billable", true);
-  var peg$e36 = peg$literalExpectation("reimbursable", true);
-  var peg$e37 = peg$literalExpectation("type", true);
-  var peg$e38 = peg$literalExpectation("status", true);
-  var peg$e39 = peg$literalExpectation("sortBy", false);
-  var peg$e40 = peg$literalExpectation("sort-by", true);
-  var peg$e41 = peg$literalExpectation("sortOrder", false);
-  var peg$e42 = peg$literalExpectation("sort-order", true);
-  var peg$e43 = peg$literalExpectation("policyID", false);
-  var peg$e44 = peg$literalExpectation("workspace", true);
-  var peg$e45 = peg$literalExpectation("submitted", true);
-  var peg$e46 = peg$literalExpectation("approved", true);
-  var peg$e47 = peg$literalExpectation("paid", true);
-  var peg$e48 = peg$literalExpectation("exported", true);
-  var peg$e49 = peg$literalExpectation("posted", true);
-  var peg$e50 = peg$literalExpectation("withdrawn", true);
-  var peg$e51 = peg$literalExpectation("groupBy", true);
-  var peg$e52 = peg$literalExpectation("group-by", true);
-  var peg$e53 = peg$literalExpectation("limit", true);
-  var peg$e54 = peg$literalExpectation("feed", true);
-  var peg$e55 = peg$literalExpectation("title", true);
-  var peg$e56 = peg$literalExpectation("assignee", true);
-  var peg$e57 = peg$literalExpectation("createdBy", true);
-  var peg$e58 = peg$literalExpectation("created-by", true);
-  var peg$e59 = peg$literalExpectation("action", true);
-  var peg$e60 = peg$literalExpectation("total", true);
-  var peg$e61 = peg$literalExpectation("has", true);
-  var peg$e62 = peg$literalExpectation("is", true);
-  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e64 = peg$literalExpectation("purchase-amount", true);
-  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e66 = peg$literalExpectation("purchase-currency", true);
-  var peg$e67 = peg$literalExpectation("columns", true);
-  var peg$e68 = peg$literalExpectation("view", true);
-  var peg$e69 = peg$literalExpectation("per-diem", true);
-  var peg$e70 = peg$literalExpectation("drafts", true);
-  var peg$e71 = peg$literalExpectation("draft", true);
-  var peg$e72 = peg$literalExpectation("original-amount", true);
-  var peg$e73 = peg$literalExpectation("tax", true);
-  var peg$e74 = peg$literalExpectation("policy-name", true);
-  var peg$e75 = peg$literalExpectation("bank-account", true);
-  var peg$e76 = peg$literalExpectation("long-report-id", true);
-  var peg$e77 = peg$literalExpectation("exported-to", true);
-  var peg$e78 = peg$classExpectation([":", "="], false, false);
-  var peg$e79 = peg$literalExpectation("exportedTo", true);
-  var peg$e80 = peg$literalExpectation("exchange-rate", true);
-  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e83 = peg$literalExpectation("group-from", true);
-  var peg$e84 = peg$literalExpectation("group-expenses", true);
-  var peg$e85 = peg$literalExpectation("group-total", true);
-  var peg$e86 = peg$literalExpectation("group-card", true);
-  var peg$e87 = peg$literalExpectation("group-feed", true);
-  var peg$e88 = peg$literalExpectation("group-bank-account", true);
-  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e91 = peg$literalExpectation("group-category", true);
-  var peg$e92 = peg$literalExpectation("group-tag", true);
-  var peg$e93 = peg$literalExpectation("group-merchant", true);
-  var peg$e94 = peg$literalExpectation("group-month", true);
-  var peg$e95 = peg$literalExpectation("group-week", true);
-  var peg$e96 = peg$literalExpectation("group-year", true);
-  var peg$e97 = peg$literalExpectation("group-quarter", true);
-  var peg$e98 = peg$otherExpectation("operator");
-  var peg$e99 = peg$literalExpectation("!=", false);
-  var peg$e100 = peg$literalExpectation(">=", false);
-  var peg$e101 = peg$literalExpectation(">", false);
-  var peg$e102 = peg$literalExpectation("<=", false);
-  var peg$e103 = peg$literalExpectation("<", false);
-  var peg$e104 = peg$otherExpectation("word");
-  var peg$e105 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e106 = peg$otherExpectation("whitespace");
-  var peg$e107 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e108 = peg$otherExpectation("quote");
-  var peg$e109 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e110 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e111 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e112 = peg$literalExpectation("\u201C", false);
-  var peg$e113 = peg$literalExpectation("\u201D", false);
-  var peg$e114 = peg$literalExpectation("\"", false);
-  var peg$e115 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e116 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e119 = peg$classExpectation([","], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
-  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
-  var peg$f2 = function(neg, key, op, value) {
-      expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-      const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-      if (!value) {
-        autocomplete = {
-          key,
-          negated: isNegated,
-          value: "",
-          start: location().end.offset,
-          length: 0,
-        };
-        return;
-      }
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "in";
+  const peg$c11 = "currency";
+  const peg$c12 = "groupCurrency";
+  const peg$c13 = "group-currency";
+  const peg$c14 = "tag";
+  const peg$c15 = "category";
+  const peg$c16 = "to";
+  const peg$c17 = "exporter";
+  const peg$c18 = "payer";
+  const peg$c19 = "taxrate";
+  const peg$c20 = "tax-rate";
+  const peg$c21 = "cardID";
+  const peg$c22 = "card";
+  const peg$c23 = "from";
+  const peg$c24 = "attendee";
+  const peg$c25 = "expenseType";
+  const peg$c26 = "expense-type";
+  const peg$c27 = "withdrawalType";
+  const peg$c28 = "withdrawal-type";
+  const peg$c29 = "withdrawalid";
+  const peg$c30 = "withdrawal-id";
+  const peg$c31 = "billable";
+  const peg$c32 = "reimbursable";
+  const peg$c33 = "type";
+  const peg$c34 = "status";
+  const peg$c35 = "policyID";
+  const peg$c36 = "workspace";
+  const peg$c37 = "submitted";
+  const peg$c38 = "approved";
+  const peg$c39 = "paid";
+  const peg$c40 = "exported";
+  const peg$c41 = "posted";
+  const peg$c42 = "withdrawn";
+  const peg$c43 = "groupby";
+  const peg$c44 = "group-by";
+  const peg$c45 = "limit";
+  const peg$c46 = "feed";
+  const peg$c47 = "title";
+  const peg$c48 = "assignee";
+  const peg$c49 = "createdby";
+  const peg$c50 = "created-by";
+  const peg$c51 = "action";
+  const peg$c52 = "total";
+  const peg$c53 = "has";
+  const peg$c54 = "is";
+  const peg$c55 = "purchaseamount";
+  const peg$c56 = "purchase-amount";
+  const peg$c57 = "purchasecurrency";
+  const peg$c58 = "purchase-currency";
+  const peg$c59 = "columns";
+  const peg$c60 = "view";
+  const peg$c61 = "exportedto";
+  const peg$c62 = "exported-to";
+  const peg$c63 = "*:";
+  const peg$c64 = "!=";
+  const peg$c65 = ">=";
+  const peg$c66 = ">";
+  const peg$c67 = "<=";
+  const peg$c68 = "<";
+  const peg$c69 = "\u201C";
+  const peg$c70 = "\u201D";
+  const peg$c71 = "\"";
+
+  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r1 = /^[:=]/;
+  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r3 = /^[ \t\r\n\xA0]/;
+  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r5 = /^["\u201C-\u201D]/;
+  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r8 = /^[a-zA-Z0-9]/;
+  const peg$r9 = /^[ \t\n\r\xA0]/;
+  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r11 = /^[,]/;
+  const peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$literalExpectation("-", false);
+  const peg$e1 = peg$literalExpectation("report-field", true);
+  const peg$e2 = peg$literalExpectation("reportfield", true);
+  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e4 = peg$anyExpectation();
+  const peg$e5 = peg$literalExpectation(",", false);
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$literalExpectation("date", true);
+  const peg$e8 = peg$literalExpectation("amount", true);
+  const peg$e9 = peg$literalExpectation("merchant", true);
+  const peg$e10 = peg$literalExpectation("description", true);
+  const peg$e11 = peg$literalExpectation("reportid", true);
+  const peg$e12 = peg$literalExpectation("report-id", true);
+  const peg$e13 = peg$literalExpectation("in", true);
+  const peg$e14 = peg$literalExpectation("currency", true);
+  const peg$e15 = peg$literalExpectation("groupCurrency", false);
+  const peg$e16 = peg$literalExpectation("group-currency", true);
+  const peg$e17 = peg$literalExpectation("tag", true);
+  const peg$e18 = peg$literalExpectation("category", true);
+  const peg$e19 = peg$literalExpectation("to", true);
+  const peg$e20 = peg$literalExpectation("exporter", true);
+  const peg$e21 = peg$literalExpectation("payer", true);
+  const peg$e22 = peg$literalExpectation("taxRate", true);
+  const peg$e23 = peg$literalExpectation("tax-rate", true);
+  const peg$e24 = peg$literalExpectation("cardID", false);
+  const peg$e25 = peg$literalExpectation("card", true);
+  const peg$e26 = peg$literalExpectation("from", true);
+  const peg$e27 = peg$literalExpectation("attendee", true);
+  const peg$e28 = peg$literalExpectation("expenseType", false);
+  const peg$e29 = peg$literalExpectation("expense-type", true);
+  const peg$e30 = peg$literalExpectation("withdrawalType", false);
+  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e32 = peg$literalExpectation("withdrawalID", true);
+  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e34 = peg$literalExpectation("billable", true);
+  const peg$e35 = peg$literalExpectation("reimbursable", true);
+  const peg$e36 = peg$literalExpectation("type", true);
+  const peg$e37 = peg$literalExpectation("status", true);
+  const peg$e38 = peg$literalExpectation("policyID", false);
+  const peg$e39 = peg$literalExpectation("workspace", true);
+  const peg$e40 = peg$literalExpectation("submitted", true);
+  const peg$e41 = peg$literalExpectation("approved", true);
+  const peg$e42 = peg$literalExpectation("paid", true);
+  const peg$e43 = peg$literalExpectation("exported", true);
+  const peg$e44 = peg$literalExpectation("posted", true);
+  const peg$e45 = peg$literalExpectation("withdrawn", true);
+  const peg$e46 = peg$literalExpectation("groupBy", true);
+  const peg$e47 = peg$literalExpectation("group-by", true);
+  const peg$e48 = peg$literalExpectation("limit", true);
+  const peg$e49 = peg$literalExpectation("feed", true);
+  const peg$e50 = peg$literalExpectation("title", true);
+  const peg$e51 = peg$literalExpectation("assignee", true);
+  const peg$e52 = peg$literalExpectation("createdBy", true);
+  const peg$e53 = peg$literalExpectation("created-by", true);
+  const peg$e54 = peg$literalExpectation("action", true);
+  const peg$e55 = peg$literalExpectation("total", true);
+  const peg$e56 = peg$literalExpectation("has", true);
+  const peg$e57 = peg$literalExpectation("is", true);
+  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e59 = peg$literalExpectation("purchase-amount", true);
+  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e61 = peg$literalExpectation("purchase-currency", true);
+  const peg$e62 = peg$literalExpectation("columns", true);
+  const peg$e63 = peg$literalExpectation("view", true);
+  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e65 = peg$literalExpectation("exportedTo", true);
+  const peg$e66 = peg$literalExpectation("exported-to", true);
+  const peg$e67 = peg$otherExpectation("operator");
+  const peg$e68 = peg$literalExpectation("*:", false);
+  const peg$e69 = peg$literalExpectation("!=", false);
+  const peg$e70 = peg$literalExpectation(">=", false);
+  const peg$e71 = peg$literalExpectation(">", false);
+  const peg$e72 = peg$literalExpectation("<=", false);
+  const peg$e73 = peg$literalExpectation("<", false);
+  const peg$e74 = peg$otherExpectation("word");
+  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e77 = peg$otherExpectation("quote");
+  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e81 = peg$literalExpectation("\u201C", false);
+  const peg$e82 = peg$literalExpectation("\u201D", false);
+  const peg$e83 = peg$literalExpectation("\"", false);
+  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e88 = peg$classExpectation([","], false, false, false);
+  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(ranges) {    return { autocomplete, ranges };  }
+  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
+  function peg$f2(neg, key, op, value) {
+    expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+    const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        ...value[value.length - 1],
+        value: "",
+        start: location().end.offset,
+        length: 0,
       };
-      return value
-        .filter((v) => v.length > 0)
-        .map((v) => ({
-          key,
-          negated: isNegated,
-          ...v,
-        }));
-    };
-  var peg$f3 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f4 = function() { autocomplete = null; };
-  var peg$f5 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
+      return;
+    }
+
+    autocomplete = {
+      key,
+      negated: isNegated,
+      ...value[value.length - 1],
     };
-  var peg$f6 = function(parts, empty) {
-      const ends = location();
-      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-      if (empty) {
-        value.push("");
-      }
-      let count = ends.start.offset;
-      const result = [];
-      value.forEach((filter) => {
-        let word = filter;
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          word = word.slice(1, -1);
-        }
-        result.push({
-          value: word,
-          start: count,
-          length: filter.length,
-        });
-        count += filter.length + 1;
+    return value
+      .filter((v) => v.length > 0)
+      .map((v) => ({
+        key,
+        negated: isNegated,
+        ...v,
+      }));
+  }
+  function peg$f3(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f4() {    autocomplete = null;  }
+  function peg$f5(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f6(parts, empty) {
+    const ends = location();
+    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+    if (empty) {
+      value.push("");
+    }
+    let count = ends.start.offset;
+    const result = [];
+    value.forEach((filter) => {
+      let word = filter;
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        word = word.slice(1, -1);
+      }
+      result.push({
+        value: word,
+        start: count,
+        length: filter.length,
       });
-      return result;
-    };
-  var peg$f7 = function() { return "date"; };
-  var peg$f8 = function() { return "amount"; };
-  var peg$f9 = function() { return "merchant"; };
-  var peg$f10 = function() { return "description"; };
-  var peg$f11 = function() { return "reportID"; };
-  var peg$f12 = function() { return "keyword"; };
-  var peg$f13 = function() { return "in"; };
-  var peg$f14 = function() { return "currency"; };
-  var peg$f15 = function() { return "groupCurrency"; };
-  var peg$f16 = function() { return "tag"; };
-  var peg$f17 = function() { return "category"; };
-  var peg$f18 = function() { return "to"; };
-  var peg$f19 = function() { return "exporter"; };
-  var peg$f20 = function() { return "payer"; };
-  var peg$f21 = function() { return "taxRate"; };
-  var peg$f22 = function() { return "cardID"; };
-  var peg$f23 = function() { return "from"; };
-  var peg$f24 = function() {return "attendee"};
-  var peg$f25 = function() { return "expenseType"; };
-  var peg$f26 = function() { return "withdrawalType"; };
-  var peg$f27 = function() { return "withdrawalID"; };
-  var peg$f28 = function() { return "billable"; };
-  var peg$f29 = function() { return "reimbursable"; };
-  var peg$f30 = function() { return "type"; };
-  var peg$f31 = function() { return "status"; };
-  var peg$f32 = function() { return "sortBy"; };
-  var peg$f33 = function() { return "sortOrder"; };
-  var peg$f34 = function() { return "policyID"; };
-  var peg$f35 = function() { return "submitted"; };
-  var peg$f36 = function() { return "approved"; };
-  var peg$f37 = function() { return "paid"; };
-  var peg$f38 = function() { return "exported"; };
-  var peg$f39 = function() { return "posted"; };
-  var peg$f40 = function() { return "withdrawn"; };
-  var peg$f41 = function() { return "groupBy"; };
-  var peg$f42 = function() { return "limit"; };
-  var peg$f43 = function() { return "feed"; };
-  var peg$f44 = function() { return "title"; };
-  var peg$f45 = function() { return "assignee"; };
-  var peg$f46 = function() { return "createdBy"; };
-  var peg$f47 = function() { return "action"; };
-  var peg$f48 = function() {return "total"; };
-  var peg$f49 = function() {return "has"; };
-  var peg$f50 = function() {return "is"; };
-  var peg$f51 = function() {return "purchaseAmount"};
-  var peg$f52 = function() {return "purchaseCurrency"};
-  var peg$f53 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f54 = function() {return "view"};
-  var peg$f55 = function() { return isColumnsContext; };
-  var peg$f56 = function() { return "perDiem"; };
-  var peg$f57 = function() { return "drafts"; };
-  var peg$f58 = function() { return "originalamount"; };
-  var peg$f59 = function() { return "taxAmount"; };
-  var peg$f60 = function() { return "taxrate"; };
-  var peg$f61 = function() { return "policyname"; };
-  var peg$f62 = function() { return "withdrawalID"; };
-  var peg$f63 = function() { return "bankAccount"; };
-  var peg$f64 = function() { return "reportID"; };
-  var peg$f65 = function() { return "base62ReportID"; };
-  var peg$f66 = function() { return "exportedto"; };
-  var peg$f67 = function() { return "exportedTo"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exchangeRate"; };
-  var peg$f70 = function() { return "reimbursableTotal"; };
-  var peg$f71 = function() { return "nonReimbursableTotal"; };
-  var peg$f72 = function() { return "groupFrom"; };
-  var peg$f73 = function() { return "groupExpenses"; };
-  var peg$f74 = function() { return "groupTotal"; };
-  var peg$f75 = function() { return "groupCard"; };
-  var peg$f76 = function() { return "groupFeed"; };
-  var peg$f77 = function() { return "groupBankAccount"; };
-  var peg$f78 = function() { return "groupWithdrawn"; };
-  var peg$f79 = function() { return "groupWithdrawalID"; };
-  var peg$f80 = function() { return "groupCategory"; };
-  var peg$f81 = function() { return "groupTag"; };
-  var peg$f82 = function() { return "groupMerchant"; };
-  var peg$f83 = function() { return "groupmonth"; };
-  var peg$f84 = function() { return "groupweek"; };
-  var peg$f85 = function() { return "groupyear"; };
-  var peg$f86 = function() { return "groupquarter"; };
-  var peg$f87 = function() { return "eq"; };
-  var peg$f88 = function() { return "neq"; };
-  var peg$f89 = function() { return "gte"; };
-  var peg$f90 = function() { return "gt"; };
-  var peg$f91 = function() { return "lte"; };
-  var peg$f92 = function() { return "lt"; };
-  var peg$f93 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f94 = function(chars) { return chars.join("").trim(); };
-  var peg$f95 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f96 = function() { return expectingNestedQuote; };
-  var peg$f97 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f98 = function(start) {return "“"};
-  var peg$f99 = function(start) {return "”"};
-  var peg$f100 = function(start) {return "\""};
-  var peg$f101 = function(start, inner, end) {
+      count += filter.length + 1;
+    });
+    return result;
+  }
+  function peg$f7() {    return "date";  }
+  function peg$f8() {    return "amount";  }
+  function peg$f9() {    return "merchant";  }
+  function peg$f10() {    return "description";  }
+  function peg$f11() {    return "reportID";  }
+  function peg$f12() {    return "in";  }
+  function peg$f13() {    return "currency";  }
+  function peg$f14() {    return "groupCurrency";  }
+  function peg$f15() {    return "tag";  }
+  function peg$f16() {    return "category";  }
+  function peg$f17() {    return "to";  }
+  function peg$f18() {    return "exporter";  }
+  function peg$f19() {    return "payer";  }
+  function peg$f20() {    return "taxRate";  }
+  function peg$f21() {    return "cardID";  }
+  function peg$f22() {    return "from";  }
+  function peg$f23() {return "attendee"  }
+  function peg$f24() {    return "expenseType";  }
+  function peg$f25() {    return "withdrawalType";  }
+  function peg$f26() {    return "withdrawalID";  }
+  function peg$f27() {    return "billable";  }
+  function peg$f28() {    return "reimbursable";  }
+  function peg$f29() {    return "type";  }
+  function peg$f30() {    return "status";  }
+  function peg$f31() {    return "policyID";  }
+  function peg$f32() {    return "submitted";  }
+  function peg$f33() {    return "approved";  }
+  function peg$f34() {    return "paid";  }
+  function peg$f35() {    return "exported";  }
+  function peg$f36() {    return "posted";  }
+  function peg$f37() {    return "withdrawn";  }
+  function peg$f38() {    return "groupBy";  }
+  function peg$f39() {    return "limit";  }
+  function peg$f40() {    return "feed";  }
+  function peg$f41() {    return "title";  }
+  function peg$f42() {    return "assignee";  }
+  function peg$f43() {    return "createdBy";  }
+  function peg$f44() {    return "action";  }
+  function peg$f45() {return "total";  }
+  function peg$f46() {return "has";  }
+  function peg$f47() {return "is";  }
+  function peg$f48() {return "purchaseAmount"  }
+  function peg$f49() {return "purchaseCurrency"  }
+  function peg$f50() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f51() {return "view"  }
+  function peg$f52() {    return "exportedTo";  }
+  function peg$f53() {    return "exportedTo";  }
+  function peg$f54() {    return "contains";  }
+  function peg$f55() {    return "eq";  }
+  function peg$f56() {    return "neq";  }
+  function peg$f57() {    return "gte";  }
+  function peg$f58() {    return "gt";  }
+  function peg$f59() {    return "lte";  }
+  function peg$f60() {    return "lt";  }
+  function peg$f61(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f62(chars) {    return chars.join("").trim();  }
+  function peg$f63() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f64() {    return expectingNestedQuote;  }
+  function peg$f65(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f66(start) {return "“"  }
+  function peg$f67(start) {return "”"  }
+  function peg$f68(start) {return "\""  }
+  function peg$f69(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -624,7 +519,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -652,12 +547,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -669,12 +572,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -689,7 +592,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -710,21 +613,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -758,7 +661,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -771,7 +674,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -796,7 +699,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -814,7 +717,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -853,12 +756,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -866,7 +769,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -974,7 +877,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -1001,7 +904,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1160,7 +1063,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1174,7 +1077,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1236,12 +1139,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1256,12 +1159,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1276,12 +1179,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1296,12 +1199,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1316,11 +1219,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1329,7 +1232,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1344,13 +1247,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsekeyword() {
-    var s0, s1;
+  function peg$parsein() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1364,13 +1267,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    var s0, s1;
+  function peg$parsecurrency() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1384,48 +1287,28 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f14();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c13) {
-      s0 = peg$c13;
+    if (input.substr(peg$currPos, 13) === peg$c12) {
+      s0 = peg$c12;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+      if (s1.toLowerCase() === peg$c13) {
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f14();
       }
       s0 = s1;
     }
@@ -1434,19 +1317,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+    if (s1.toLowerCase() === peg$c14) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f15();
     }
     s0 = s1;
 
@@ -1454,19 +1337,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1474,19 +1357,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1494,19 +1377,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1514,19 +1397,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1534,27 +1417,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c19) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c20) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f20();
       }
       s0 = s1;
     }
@@ -1563,27 +1446,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c22) {
-      s0 = peg$c22;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+      if (s1.toLowerCase() === peg$c22) {
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1592,19 +1475,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c23) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f22();
     }
     s0 = s1;
 
@@ -1612,19 +1495,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1632,27 +1515,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+      if (s1.toLowerCase() === peg$c26) {
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1661,27 +1544,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c28) {
-      s0 = peg$c28;
+    if (input.substr(peg$currPos, 14) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+      if (s1.toLowerCase() === peg$c28) {
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1690,27 +1573,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+    if (s0.toLowerCase() === peg$c29) {
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+      if (s1.toLowerCase() === peg$c30) {
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f27();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1719,19 +1602,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1739,19 +1622,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1759,19 +1642,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1779,105 +1662,47 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f30();
     }
     s0 = s1;
 
     return s0;
   }
 
-  function peg$parsesortBy() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 6) === peg$c36) {
-      s0 = peg$c36;
-      peg$currPos += 6;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f32();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsesortOrder() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 9) === peg$c38) {
-      s0 = peg$c38;
-      peg$currPos += 9;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f33();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 8) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+      if (s1.toLowerCase() === peg$c36) {
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -1886,19 +1711,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c37) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f32();
     }
     s0 = s1;
 
@@ -1906,19 +1731,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c38) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f33();
     }
     s0 = s1;
 
@@ -1926,19 +1751,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c39) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f34();
     }
     s0 = s1;
 
@@ -1946,19 +1771,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c40) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1966,19 +1791,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c41) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1986,19 +1811,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2006,27 +1831,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c43) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c44) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f38();
       }
       s0 = s1;
     }
@@ -2035,19 +1860,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2055,19 +1880,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -2075,19 +1900,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f41();
     }
     s0 = s1;
 
@@ -2095,19 +1920,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c48) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -2115,27 +1940,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+    if (s0.toLowerCase() === peg$c49) {
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+      if (s1.toLowerCase() === peg$c50) {
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f46();
+        s1 = peg$f43();
       }
       s0 = s1;
     }
@@ -2144,19 +1969,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2164,1438 +1989,204 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f48();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsehas() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f49();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseis() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsepurchaseAmount() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f51();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepurchaseCurrency() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f52();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumns() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f53();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseview() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f54();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsevalues() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    peg$savedPos = peg$currPos;
-    s1 = peg$f55();
-    if (s1) {
-      s1 = undefined;
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsecolumnsValues();
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseperDiem();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsedraft();
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumnsValues() {
-    var s0;
-
-    s0 = peg$parseoriginalAmount();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsetaxRateValue();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsetaxAmount();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parsepolicyName();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parsewithdrawalId();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parsebankAccount();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parsereportId();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsebase62ReportId();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parseexportedToColumnValue();
-                    if (s0 === peg$FAILED) {
-                      s0 = peg$parseexchangeRate();
-                      if (s0 === peg$FAILED) {
-                        s0 = peg$parsereimbursableTotal();
-                        if (s0 === peg$FAILED) {
-                          s0 = peg$parsenonReimbursableTotal();
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$parsegroupFrom();
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$parsegroupExpenses();
-                              if (s0 === peg$FAILED) {
-                                s0 = peg$parsegroupTotal();
-                                if (s0 === peg$FAILED) {
-                                  s0 = peg$parsegroupCard();
-                                  if (s0 === peg$FAILED) {
-                                    s0 = peg$parsegroupFeed();
-                                    if (s0 === peg$FAILED) {
-                                      s0 = peg$parsegroupBankAccount();
-                                      if (s0 === peg$FAILED) {
-                                        s0 = peg$parsegroupWithdrawn();
-                                        if (s0 === peg$FAILED) {
-                                          s0 = peg$parsegroupWithdrawalId();
-                                          if (s0 === peg$FAILED) {
-                                            s0 = peg$parsegroupCategory();
-                                            if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupTag();
-                                              if (s0 === peg$FAILED) {
-                                                s0 = peg$parsegroupMerchant();
-                                                if (s0 === peg$FAILED) {
-                                                  s0 = peg$parsegroupMonth();
-                                                  if (s0 === peg$FAILED) {
-                                                    s0 = peg$parsegroupWeek();
-                                                    if (s0 === peg$FAILED) {
-                                                      s0 = peg$parsegroupYear();
-                                                      if (s0 === peg$FAILED) {
-                                                        s0 = peg$parsegroupQuarter();
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseperDiem() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f56();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsedraft() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
-    }
-    if (s1 === peg$FAILED) {
-      s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f57();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f58();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f59();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f60();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f61();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f62();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f63();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f64();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f65();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f66();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
-      }
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f67();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e77); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f68();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f69();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f70();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f71();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f72();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f73();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f74();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f75();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f76();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f77();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f78();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f79();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s1 = peg$f45();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+  function peg$parsehas() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f80();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f46();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+  function peg$parseis() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c54) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f81();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f47();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseAmount() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c55) {
+      peg$currPos += (14);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c56) {
+        peg$currPos += (15);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f48();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseCurrency() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c57) {
+      peg$currPos += (16);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c58) {
+        peg$currPos += (17);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f49();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+  function peg$parsecolumns() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f84();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f50();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+  function peg$parseview() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c60) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+      peg$savedPos = s0;
+      s1 = peg$f51();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    let s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
       } else {
         s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f85();
+        s1 = [s1, s2];
+        s0 = s1;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+  function peg$parseexportedTo() {
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c61) {
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parsewordBoundary();
+      s3 = peg$parseexportedToKeyEnd();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -3605,7 +2196,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f52();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3614,97 +2205,144 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += (11);
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f53();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r1.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c63) {
+      s1 = peg$c63;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87();
+      s1 = peg$f54();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r1.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e99); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f88();
+        s1 = peg$f55();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c95) {
-          s1 = peg$c95;
+        if (input.substr(peg$currPos, 2) === peg$c64) {
+          s1 = peg$c64;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e100); }
+          if (peg$silentFails === 0) { peg$fail(peg$e69); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f89();
+          s1 = peg$f56();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c96;
-            peg$currPos++;
+          if (input.substr(peg$currPos, 2) === peg$c65) {
+            s1 = peg$c65;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e101); }
+            if (peg$silentFails === 0) { peg$fail(peg$e70); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f90();
+            s1 = peg$f57();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
-              s1 = peg$c97;
-              peg$currPos += 2;
+            if (input.charCodeAt(peg$currPos) === 62) {
+              s1 = peg$c66;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e102); }
+              if (peg$silentFails === 0) { peg$fail(peg$e71); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f91();
+              s1 = peg$f58();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c98;
-                peg$currPos++;
+              if (input.substr(peg$currPos, 2) === peg$c67) {
+                s1 = peg$c67;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e103); }
+                if (peg$silentFails === 0) { peg$fail(peg$e72); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f92();
+                s1 = peg$f59();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c68;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f60();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3713,20 +2351,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93(s1);
+      s1 = peg$f61(s1);
     }
     s0 = s1;
 
@@ -3734,7 +2372,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3744,7 +2382,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3754,7 +2392,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
     } else {
@@ -3762,32 +2400,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f95();
+    s1 = peg$f63();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3796,7 +2434,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3805,22 +2443,20 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e106); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f96();
+    s1 = peg$f64();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3847,7 +2483,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3857,7 +2493,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3866,7 +2502,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3874,7 +2510,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3883,7 +2519,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3892,7 +2528,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3900,7 +2536,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e110); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3909,7 +2545,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3918,11 +2554,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e105); }
+            if (peg$silentFails === 0) { peg$fail(peg$e75); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f97(s1, s3, s5);
+        s0 = peg$f65(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3934,14 +2570,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3951,7 +2587,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3960,7 +2596,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3968,7 +2604,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3977,7 +2613,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3993,15 +2629,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c69;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e112); }
+            if (peg$silentFails === 0) { peg$fail(peg$e81); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f98(s1);
+            s4 = peg$f66(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4024,15 +2660,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c70;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e113); }
+              if (peg$silentFails === 0) { peg$fail(peg$e82); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4055,15 +2691,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c71;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                if (peg$silentFails === 0) { peg$fail(peg$e83); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4082,7 +2718,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4098,15 +2734,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c69;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e112); }
+              if (peg$silentFails === 0) { peg$fail(peg$e81); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f98(s1);
+              s4 = peg$f66(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4129,15 +2765,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c70;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e113); }
+                if (peg$silentFails === 0) { peg$fail(peg$e82); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f99(s1);
+                s4 = peg$f67(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4160,15 +2796,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c71;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f100(s1);
+                  s4 = peg$f68(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4184,7 +2820,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101(s1, s3, s4);
+        s0 = peg$f69(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4196,14 +2832,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4211,7 +2847,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4240,7 +2876,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4249,7 +2885,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4258,7 +2894,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
     }
     s2 = [];
@@ -4267,7 +2903,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4276,7 +2912,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e116); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s3 = [];
@@ -4285,7 +2921,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4294,7 +2930,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e86); }
       }
     }
     s4 = peg$parseoperator();
@@ -4313,7 +2949,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4322,7 +2958,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e118); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
       }
       s2 = peg$currPos;
@@ -4369,7 +3005,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e88); }
         }
       }
     }
@@ -4378,14 +3014,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4424,30 +3060,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index cc6f3e9fbfcb..ad60a1a0959d 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -157,7 +157,8 @@ groupQuarter            = "group-quarter"i &wordBoundary            { return "gr
 
 
 operator "operator"
-  = (":" / "=") { return "eq"; }
+  = "*:" { return "contains"; }
+  / (":" / "=") { return "eq"; }
   / "!=" { return "neq"; }
   / ">=" { return "gte"; }
   / ">" { return "gt"; }
@@ -167,7 +168,7 @@ operator "operator"
 filterOperator
   = o:operator {
       if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
+        expectingNestedQuote = (o === "eq" || o === "contains");
       }
       isColumnsContext = false;
       return o;
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 897055c3bebd..f38d92cffd86 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -12,624 +12,615 @@
     return { operator, left, right };
   }
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function peg$SyntaxError(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
 
-peg$subclass(peg$SyntaxError, Error);
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-    any: function() {
-      return "any character";
-    },
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      any() {
+        return "any character";
+      },
 
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
+      end() {
+        return "end of input";
+      },
 
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
 
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[^ \t\r\n\xA0]/;
-  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r2 = /^[:=]/;
-  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r4 = /^[ \t\r\n\xA0]/;
-  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r6 = /^["\u201C-\u201D]/;
-  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r9 = /^[a-zA-Z0-9]/;
-  var peg$r10 = /^[ \t\n\r\xA0]/;
-  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r12 = /^[,]/;
-  var peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
-  var peg$e1 = peg$literalExpectation("-", false);
-  var peg$e2 = peg$literalExpectation("report-field", true);
-  var peg$e3 = peg$literalExpectation("reportfield", true);
-  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e5 = peg$anyExpectation();
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$otherExpectation("default key");
-  var peg$e8 = peg$literalExpectation(",", false);
-  var peg$e9 = peg$literalExpectation("date", true);
-  var peg$e10 = peg$literalExpectation("amount", true);
-  var peg$e11 = peg$literalExpectation("merchant", true);
-  var peg$e12 = peg$literalExpectation("description", true);
-  var peg$e13 = peg$literalExpectation("reportid", true);
-  var peg$e14 = peg$literalExpectation("report-id", true);
-  var peg$e15 = peg$literalExpectation("keyword", true);
-  var peg$e16 = peg$literalExpectation("in", true);
-  var peg$e17 = peg$literalExpectation("currency", true);
-  var peg$e18 = peg$literalExpectation("groupCurrency", false);
-  var peg$e19 = peg$literalExpectation("group-currency", true);
-  var peg$e20 = peg$literalExpectation("tag", true);
-  var peg$e21 = peg$literalExpectation("category", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("exporter", true);
-  var peg$e24 = peg$literalExpectation("payer", true);
-  var peg$e25 = peg$literalExpectation("taxRate", true);
-  var peg$e26 = peg$literalExpectation("tax-rate", true);
-  var peg$e27 = peg$literalExpectation("cardID", false);
-  var peg$e28 = peg$literalExpectation("card", true);
-  var peg$e29 = peg$literalExpectation("from", true);
-  var peg$e30 = peg$literalExpectation("attendee", true);
-  var peg$e31 = peg$literalExpectation("expenseType", false);
-  var peg$e32 = peg$literalExpectation("expense-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalType", false);
-  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e35 = peg$literalExpectation("withdrawalID", true);
-  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e37 = peg$literalExpectation("billable", true);
-  var peg$e38 = peg$literalExpectation("reimbursable", true);
-  var peg$e39 = peg$literalExpectation("type", true);
-  var peg$e40 = peg$literalExpectation("status", true);
-  var peg$e41 = peg$literalExpectation("sortBy", false);
-  var peg$e42 = peg$literalExpectation("sort-by", true);
-  var peg$e43 = peg$literalExpectation("sortOrder", false);
-  var peg$e44 = peg$literalExpectation("sort-order", true);
-  var peg$e45 = peg$literalExpectation("policyID", false);
-  var peg$e46 = peg$literalExpectation("workspace", true);
-  var peg$e47 = peg$literalExpectation("submitted", true);
-  var peg$e48 = peg$literalExpectation("approved", true);
-  var peg$e49 = peg$literalExpectation("paid", true);
-  var peg$e50 = peg$literalExpectation("exported", true);
-  var peg$e51 = peg$literalExpectation("posted", true);
-  var peg$e52 = peg$literalExpectation("withdrawn", true);
-  var peg$e53 = peg$literalExpectation("groupBy", true);
-  var peg$e54 = peg$literalExpectation("group-by", true);
-  var peg$e55 = peg$literalExpectation("limit", true);
-  var peg$e56 = peg$literalExpectation("feed", true);
-  var peg$e57 = peg$literalExpectation("title", true);
-  var peg$e58 = peg$literalExpectation("assignee", true);
-  var peg$e59 = peg$literalExpectation("createdBy", true);
-  var peg$e60 = peg$literalExpectation("created-by", true);
-  var peg$e61 = peg$literalExpectation("action", true);
-  var peg$e62 = peg$literalExpectation("total", true);
-  var peg$e63 = peg$literalExpectation("has", true);
-  var peg$e64 = peg$literalExpectation("is", true);
-  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e66 = peg$literalExpectation("purchase-amount", true);
-  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e68 = peg$literalExpectation("purchase-currency", true);
-  var peg$e69 = peg$literalExpectation("columns", true);
-  var peg$e70 = peg$literalExpectation("view", true);
-  var peg$e71 = peg$literalExpectation("per-diem", true);
-  var peg$e72 = peg$literalExpectation("drafts", true);
-  var peg$e73 = peg$literalExpectation("draft", true);
-  var peg$e74 = peg$literalExpectation("original-amount", true);
-  var peg$e75 = peg$literalExpectation("tax", true);
-  var peg$e76 = peg$literalExpectation("policy-name", true);
-  var peg$e77 = peg$literalExpectation("bank-account", true);
-  var peg$e78 = peg$literalExpectation("long-report-id", true);
-  var peg$e79 = peg$literalExpectation("exported-to", true);
-  var peg$e80 = peg$classExpectation([":", "="], false, false);
-  var peg$e81 = peg$literalExpectation("exportedTo", true);
-  var peg$e82 = peg$literalExpectation("exchange-rate", true);
-  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e85 = peg$literalExpectation("group-from", true);
-  var peg$e86 = peg$literalExpectation("group-expenses", true);
-  var peg$e87 = peg$literalExpectation("group-total", true);
-  var peg$e88 = peg$literalExpectation("group-card", true);
-  var peg$e89 = peg$literalExpectation("group-feed", true);
-  var peg$e90 = peg$literalExpectation("group-bank-account", true);
-  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e93 = peg$literalExpectation("group-category", true);
-  var peg$e94 = peg$literalExpectation("group-tag", true);
-  var peg$e95 = peg$literalExpectation("group-merchant", true);
-  var peg$e96 = peg$literalExpectation("group-month", true);
-  var peg$e97 = peg$literalExpectation("group-week", true);
-  var peg$e98 = peg$literalExpectation("group-year", true);
-  var peg$e99 = peg$literalExpectation("group-quarter", true);
-  var peg$e100 = peg$otherExpectation("operator");
-  var peg$e101 = peg$literalExpectation("!=", false);
-  var peg$e102 = peg$literalExpectation(">=", false);
-  var peg$e103 = peg$literalExpectation(">", false);
-  var peg$e104 = peg$literalExpectation("<=", false);
-  var peg$e105 = peg$literalExpectation("<", false);
-  var peg$e106 = peg$otherExpectation("word");
-  var peg$e107 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e108 = peg$otherExpectation("whitespace");
-  var peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e110 = peg$otherExpectation("quote");
-  var peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e114 = peg$literalExpectation("\u201C", false);
-  var peg$e115 = peg$literalExpectation("\u201D", false);
-  var peg$e116 = peg$literalExpectation("\"", false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e121 = peg$classExpectation([","], false, false);
-  var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(filters) { return applyDefaults(filters); };
-  var peg$f1 = function(head, tail) {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter(Boolean)
-        .filter((filter) => filter.right);
-      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-      if (!filtersWithoutDefaults.length) {
-        return null;
-      }
-
-      const keywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      const keywordFilter = buildFilter(
-        "eq",
-        "keyword",
-        keywords
-          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-          .flat()
-      );
-      if (keywordFilter.right.length > 0) {
-        nonKeywords.push(keywordFilter);
-      }
-      return nonKeywords.reduce((result, filter) =>
-        buildFilter("and", result, filter)
-      );
-    };
-  var peg$f2 = function(key, op, value) {
-      updateDefaultValues(key, value);
-      return {...buildFilter(op, key, value), isDefault: true};
-    };
-  var peg$f3 = function(value) {
-      //handle no-breaking space
-      let word;
-      if (Array.isArray(value)) {
-        word = value.join("");
-      } else {
-        word = value;
-      }
-      return buildFilter("eq", "keyword", word);
-    };
-  var peg$f4 = function(neg, field, op, values) {
-      expectingNestedQuote = false; nameOperator = false;
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
-      const key = field;
-      let operator = op;
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "keyword";
+  const peg$c11 = "in";
+  const peg$c12 = "currency";
+  const peg$c13 = "groupCurrency";
+  const peg$c14 = "group-currency";
+  const peg$c15 = "tag";
+  const peg$c16 = "category";
+  const peg$c17 = "to";
+  const peg$c18 = "exporter";
+  const peg$c19 = "payer";
+  const peg$c20 = "taxrate";
+  const peg$c21 = "tax-rate";
+  const peg$c22 = "cardID";
+  const peg$c23 = "card";
+  const peg$c24 = "from";
+  const peg$c25 = "attendee";
+  const peg$c26 = "expenseType";
+  const peg$c27 = "expense-type";
+  const peg$c28 = "withdrawalType";
+  const peg$c29 = "withdrawal-type";
+  const peg$c30 = "withdrawalid";
+  const peg$c31 = "withdrawal-id";
+  const peg$c32 = "billable";
+  const peg$c33 = "reimbursable";
+  const peg$c34 = "type";
+  const peg$c35 = "status";
+  const peg$c36 = "sortBy";
+  const peg$c37 = "sort-by";
+  const peg$c38 = "sortOrder";
+  const peg$c39 = "sort-order";
+  const peg$c40 = "policyID";
+  const peg$c41 = "workspace";
+  const peg$c42 = "submitted";
+  const peg$c43 = "approved";
+  const peg$c44 = "paid";
+  const peg$c45 = "exported";
+  const peg$c46 = "posted";
+  const peg$c47 = "withdrawn";
+  const peg$c48 = "groupby";
+  const peg$c49 = "group-by";
+  const peg$c50 = "limit";
+  const peg$c51 = "feed";
+  const peg$c52 = "title";
+  const peg$c53 = "assignee";
+  const peg$c54 = "createdby";
+  const peg$c55 = "created-by";
+  const peg$c56 = "action";
+  const peg$c57 = "total";
+  const peg$c58 = "has";
+  const peg$c59 = "is";
+  const peg$c60 = "purchaseamount";
+  const peg$c61 = "purchase-amount";
+  const peg$c62 = "purchasecurrency";
+  const peg$c63 = "purchase-currency";
+  const peg$c64 = "columns";
+  const peg$c65 = "view";
+  const peg$c66 = "per-diem";
+  const peg$c67 = "drafts";
+  const peg$c68 = "draft";
+  const peg$c69 = "original-amount";
+  const peg$c70 = "tax";
+  const peg$c71 = "policy-name";
+  const peg$c72 = "bank-account";
+  const peg$c73 = "long-report-id";
+  const peg$c74 = "exported-to";
+  const peg$c75 = "exportedto";
+  const peg$c76 = "exchange-rate";
+  const peg$c77 = "reimbursable-total";
+  const peg$c78 = "non-reimbursable-total";
+  const peg$c79 = "group-from";
+  const peg$c80 = "group-expenses";
+  const peg$c81 = "group-total";
+  const peg$c82 = "group-card";
+  const peg$c83 = "group-feed";
+  const peg$c84 = "group-bank-account";
+  const peg$c85 = "group-withdrawn";
+  const peg$c86 = "group-withdrawal-id";
+  const peg$c87 = "group-category";
+  const peg$c88 = "group-tag";
+  const peg$c89 = "group-merchant";
+  const peg$c90 = "group-month";
+  const peg$c91 = "group-week";
+  const peg$c92 = "group-year";
+  const peg$c93 = "group-quarter";
+  const peg$c94 = "*:";
+  const peg$c95 = "!=";
+  const peg$c96 = ">=";
+  const peg$c97 = ">";
+  const peg$c98 = "<=";
+  const peg$c99 = "<";
+  const peg$c100 = "\u201C";
+  const peg$c101 = "\u201D";
+  const peg$c102 = "\"";
+
+  const peg$r0 = /^[^ \t\r\n\xA0]/;
+  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r2 = /^[:=]/;
+  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r4 = /^[ \t\r\n\xA0]/;
+  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r6 = /^["\u201C-\u201D]/;
+  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r9 = /^[a-zA-Z0-9]/;
+  const peg$r10 = /^[ \t\n\r\xA0]/;
+  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r12 = /^[,]/;
+  const peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
+  const peg$e1 = peg$literalExpectation("-", false);
+  const peg$e2 = peg$literalExpectation("report-field", true);
+  const peg$e3 = peg$literalExpectation("reportfield", true);
+  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e5 = peg$anyExpectation();
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$otherExpectation("default key");
+  const peg$e8 = peg$literalExpectation(",", false);
+  const peg$e9 = peg$literalExpectation("date", true);
+  const peg$e10 = peg$literalExpectation("amount", true);
+  const peg$e11 = peg$literalExpectation("merchant", true);
+  const peg$e12 = peg$literalExpectation("description", true);
+  const peg$e13 = peg$literalExpectation("reportid", true);
+  const peg$e14 = peg$literalExpectation("report-id", true);
+  const peg$e15 = peg$literalExpectation("keyword", true);
+  const peg$e16 = peg$literalExpectation("in", true);
+  const peg$e17 = peg$literalExpectation("currency", true);
+  const peg$e18 = peg$literalExpectation("groupCurrency", false);
+  const peg$e19 = peg$literalExpectation("group-currency", true);
+  const peg$e20 = peg$literalExpectation("tag", true);
+  const peg$e21 = peg$literalExpectation("category", true);
+  const peg$e22 = peg$literalExpectation("to", true);
+  const peg$e23 = peg$literalExpectation("exporter", true);
+  const peg$e24 = peg$literalExpectation("payer", true);
+  const peg$e25 = peg$literalExpectation("taxRate", true);
+  const peg$e26 = peg$literalExpectation("tax-rate", true);
+  const peg$e27 = peg$literalExpectation("cardID", false);
+  const peg$e28 = peg$literalExpectation("card", true);
+  const peg$e29 = peg$literalExpectation("from", true);
+  const peg$e30 = peg$literalExpectation("attendee", true);
+  const peg$e31 = peg$literalExpectation("expenseType", false);
+  const peg$e32 = peg$literalExpectation("expense-type", true);
+  const peg$e33 = peg$literalExpectation("withdrawalType", false);
+  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e35 = peg$literalExpectation("withdrawalID", true);
+  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e37 = peg$literalExpectation("billable", true);
+  const peg$e38 = peg$literalExpectation("reimbursable", true);
+  const peg$e39 = peg$literalExpectation("type", true);
+  const peg$e40 = peg$literalExpectation("status", true);
+  const peg$e41 = peg$literalExpectation("sortBy", false);
+  const peg$e42 = peg$literalExpectation("sort-by", true);
+  const peg$e43 = peg$literalExpectation("sortOrder", false);
+  const peg$e44 = peg$literalExpectation("sort-order", true);
+  const peg$e45 = peg$literalExpectation("policyID", false);
+  const peg$e46 = peg$literalExpectation("workspace", true);
+  const peg$e47 = peg$literalExpectation("submitted", true);
+  const peg$e48 = peg$literalExpectation("approved", true);
+  const peg$e49 = peg$literalExpectation("paid", true);
+  const peg$e50 = peg$literalExpectation("exported", true);
+  const peg$e51 = peg$literalExpectation("posted", true);
+  const peg$e52 = peg$literalExpectation("withdrawn", true);
+  const peg$e53 = peg$literalExpectation("groupBy", true);
+  const peg$e54 = peg$literalExpectation("group-by", true);
+  const peg$e55 = peg$literalExpectation("limit", true);
+  const peg$e56 = peg$literalExpectation("feed", true);
+  const peg$e57 = peg$literalExpectation("title", true);
+  const peg$e58 = peg$literalExpectation("assignee", true);
+  const peg$e59 = peg$literalExpectation("createdBy", true);
+  const peg$e60 = peg$literalExpectation("created-by", true);
+  const peg$e61 = peg$literalExpectation("action", true);
+  const peg$e62 = peg$literalExpectation("total", true);
+  const peg$e63 = peg$literalExpectation("has", true);
+  const peg$e64 = peg$literalExpectation("is", true);
+  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e66 = peg$literalExpectation("purchase-amount", true);
+  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e68 = peg$literalExpectation("purchase-currency", true);
+  const peg$e69 = peg$literalExpectation("columns", true);
+  const peg$e70 = peg$literalExpectation("view", true);
+  const peg$e71 = peg$literalExpectation("per-diem", true);
+  const peg$e72 = peg$literalExpectation("drafts", true);
+  const peg$e73 = peg$literalExpectation("draft", true);
+  const peg$e74 = peg$literalExpectation("original-amount", true);
+  const peg$e75 = peg$literalExpectation("tax", true);
+  const peg$e76 = peg$literalExpectation("policy-name", true);
+  const peg$e77 = peg$literalExpectation("bank-account", true);
+  const peg$e78 = peg$literalExpectation("long-report-id", true);
+  const peg$e79 = peg$literalExpectation("exported-to", true);
+  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e81 = peg$literalExpectation("exportedTo", true);
+  const peg$e82 = peg$literalExpectation("exchange-rate", true);
+  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  const peg$e85 = peg$literalExpectation("group-from", true);
+  const peg$e86 = peg$literalExpectation("group-expenses", true);
+  const peg$e87 = peg$literalExpectation("group-total", true);
+  const peg$e88 = peg$literalExpectation("group-card", true);
+  const peg$e89 = peg$literalExpectation("group-feed", true);
+  const peg$e90 = peg$literalExpectation("group-bank-account", true);
+  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  const peg$e93 = peg$literalExpectation("group-category", true);
+  const peg$e94 = peg$literalExpectation("group-tag", true);
+  const peg$e95 = peg$literalExpectation("group-merchant", true);
+  const peg$e96 = peg$literalExpectation("group-month", true);
+  const peg$e97 = peg$literalExpectation("group-week", true);
+  const peg$e98 = peg$literalExpectation("group-year", true);
+  const peg$e99 = peg$literalExpectation("group-quarter", true);
+  const peg$e100 = peg$otherExpectation("operator");
+  const peg$e101 = peg$literalExpectation("*:", false);
+  const peg$e102 = peg$literalExpectation("!=", false);
+  const peg$e103 = peg$literalExpectation(">=", false);
+  const peg$e104 = peg$literalExpectation(">", false);
+  const peg$e105 = peg$literalExpectation("<=", false);
+  const peg$e106 = peg$literalExpectation("<", false);
+  const peg$e107 = peg$otherExpectation("word");
+  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e110 = peg$otherExpectation("quote");
+  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e114 = peg$literalExpectation("\u201C", false);
+  const peg$e115 = peg$literalExpectation("\u201D", false);
+  const peg$e116 = peg$literalExpectation("\"", false);
+  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e121 = peg$classExpectation([","], false, false, false);
+  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(filters) {    return applyDefaults(filters);  }
+  function peg$f1(head, tail) {
+    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+      .filter(Boolean)
+      .filter((filter) => filter.right);
+    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+    if (!filtersWithoutDefaults.length) {
+      return null;
+    }
 
-      // Apply negation only when "-" is present and the key can be negated
-      if (neg && !nonNegatableKeys.has(key)) {
-        if (operator === "eq") {
-          operator = "neq";
-        }
+    const keywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left === "keyword" || filter.right?.left === "keyword"
+    );
+    const nonKeywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left !== "keyword" && filter.right?.left !== "keyword"
+    );
+
+    const keywordFilter = buildFilter(
+      "eq",
+      "keyword",
+      keywords
+        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+        .flat()
+    );
+    if (keywordFilter.right.length > 0) {
+      nonKeywords.push(keywordFilter);
+    }
+    return nonKeywords.reduce((result, filter) =>
+      buildFilter("and", result, filter)
+    );
+  }
+  function peg$f2(key, op, value) {
+    updateDefaultValues(key, value);
+    return {...buildFilter(op, key, value), isDefault: true};
+  }
+  function peg$f3(value) {
+    //handle no-breaking space
+    let word;
+    if (Array.isArray(value)) {
+      word = value.join("");
+    } else {
+      word = value;
+    }
+    return buildFilter("eq", "keyword", word);
+  }
+  function peg$f4(neg, field, op, values) {
+    expectingNestedQuote = false; nameOperator = false;
+
+    const key = field;
+    let operator = op;
+
+    // Apply negation only when "-" is present and the key can be negated
+    if (neg && !nonNegatableKeys.has(key)) {
+      if (operator === "eq") {
+        operator = "neq";
       }
+    }
 
-      return buildFilter(operator, key, values);
-    };
-  var peg$f5 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f6 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
-    };
-  var peg$f7 = function(parts, empty) {
-      const value = parts.flat().filter(Boolean).map((word) => {
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          return word.slice(1, -1);
-        }
-        return word;
-      });
-      if (value.length > 1) {
-        return value.filter((word) => word.length > 0);
+    return buildFilter(operator, key, values);
+  }
+  function peg$f5(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f6(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f7(parts, empty) {
+    const value = parts.flat().filter(Boolean).map((word) => {
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        return word.slice(1, -1);
       }
-      return value[0];
-    };
-  var peg$f8 = function() { return "date"; };
-  var peg$f9 = function() { return "amount"; };
-  var peg$f10 = function() { return "merchant"; };
-  var peg$f11 = function() { return "description"; };
-  var peg$f12 = function() { return "reportID"; };
-  var peg$f13 = function() { return "keyword"; };
-  var peg$f14 = function() { return "in"; };
-  var peg$f15 = function() { return "currency"; };
-  var peg$f16 = function() { return "groupCurrency"; };
-  var peg$f17 = function() { return "tag"; };
-  var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "taxRate"; };
-  var peg$f23 = function() { return "cardID"; };
-  var peg$f24 = function() { return "from"; };
-  var peg$f25 = function() {return "attendee"};
-  var peg$f26 = function() { return "expenseType"; };
-  var peg$f27 = function() { return "withdrawalType"; };
-  var peg$f28 = function() { return "withdrawalID"; };
-  var peg$f29 = function() { return "billable"; };
-  var peg$f30 = function() { return "reimbursable"; };
-  var peg$f31 = function() { return "type"; };
-  var peg$f32 = function() { return "status"; };
-  var peg$f33 = function() { return "sortBy"; };
-  var peg$f34 = function() { return "sortOrder"; };
-  var peg$f35 = function() { return "policyID"; };
-  var peg$f36 = function() { return "submitted"; };
-  var peg$f37 = function() { return "approved"; };
-  var peg$f38 = function() { return "paid"; };
-  var peg$f39 = function() { return "exported"; };
-  var peg$f40 = function() { return "posted"; };
-  var peg$f41 = function() { return "withdrawn"; };
-  var peg$f42 = function() { return "groupBy"; };
-  var peg$f43 = function() { return "limit"; };
-  var peg$f44 = function() { return "feed"; };
-  var peg$f45 = function() { return "title"; };
-  var peg$f46 = function() { return "assignee"; };
-  var peg$f47 = function() { return "createdBy"; };
-  var peg$f48 = function() { return "action"; };
-  var peg$f49 = function() {return "total"; };
-  var peg$f50 = function() {return "has"; };
-  var peg$f51 = function() {return "is"; };
-  var peg$f52 = function() {return "purchaseAmount"};
-  var peg$f53 = function() {return "purchaseCurrency"};
-  var peg$f54 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f55 = function() {return "view"};
-  var peg$f56 = function() { return isColumnsContext; };
-  var peg$f57 = function() { return "perDiem"; };
-  var peg$f58 = function() { return "drafts"; };
-  var peg$f59 = function() { return "originalamount"; };
-  var peg$f60 = function() { return "taxAmount"; };
-  var peg$f61 = function() { return "taxrate"; };
-  var peg$f62 = function() { return "policyname"; };
-  var peg$f63 = function() { return "withdrawalID"; };
-  var peg$f64 = function() { return "bankAccount"; };
-  var peg$f65 = function() { return "reportID"; };
-  var peg$f66 = function() { return "base62ReportID"; };
-  var peg$f67 = function() { return "exportedto"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exportedTo"; };
-  var peg$f70 = function() { return "exchangeRate"; };
-  var peg$f71 = function() { return "reimbursableTotal"; };
-  var peg$f72 = function() { return "nonReimbursableTotal"; };
-  var peg$f73 = function() { return "groupFrom"; };
-  var peg$f74 = function() { return "groupExpenses"; };
-  var peg$f75 = function() { return "groupTotal"; };
-  var peg$f76 = function() { return "groupCard"; };
-  var peg$f77 = function() { return "groupFeed"; };
-  var peg$f78 = function() { return "groupBankAccount"; };
-  var peg$f79 = function() { return "groupWithdrawn"; };
-  var peg$f80 = function() { return "groupWithdrawalID"; };
-  var peg$f81 = function() { return "groupCategory"; };
-  var peg$f82 = function() { return "groupTag"; };
-  var peg$f83 = function() { return "groupMerchant"; };
-  var peg$f84 = function() { return "groupmonth"; };
-  var peg$f85 = function() { return "groupweek"; };
-  var peg$f86 = function() { return "groupyear"; };
-  var peg$f87 = function() { return "groupquarter"; };
-  var peg$f88 = function() { return "eq"; };
-  var peg$f89 = function() { return "neq"; };
-  var peg$f90 = function() { return "gte"; };
-  var peg$f91 = function() { return "gt"; };
-  var peg$f92 = function() { return "lte"; };
-  var peg$f93 = function() { return "lt"; };
-  var peg$f94 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f95 = function(chars) { return chars.join("").trim(); };
-  var peg$f96 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f97 = function() { return expectingNestedQuote; };
-  var peg$f98 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f99 = function(start) {return "“"};
-  var peg$f100 = function(start) {return "”"};
-  var peg$f101 = function(start) {return "\""};
-  var peg$f102 = function(start, inner, end) {
+      return word;
+    });
+    if (value.length > 1) {
+      return value.filter((word) => word.length > 0);
+    }
+    return value[0];
+  }
+  function peg$f8() {    return "date";  }
+  function peg$f9() {    return "amount";  }
+  function peg$f10() {    return "merchant";  }
+  function peg$f11() {    return "description";  }
+  function peg$f12() {    return "reportID";  }
+  function peg$f13() {    return "keyword";  }
+  function peg$f14() {    return "in";  }
+  function peg$f15() {    return "currency";  }
+  function peg$f16() {    return "groupCurrency";  }
+  function peg$f17() {    return "tag";  }
+  function peg$f18() {    return "category";  }
+  function peg$f19() {    return "to";  }
+  function peg$f20() {    return "exporter";  }
+  function peg$f21() {    return "payer";  }
+  function peg$f22() {    return "taxRate";  }
+  function peg$f23() {    return "cardID";  }
+  function peg$f24() {    return "from";  }
+  function peg$f25() {return "attendee"  }
+  function peg$f26() {    return "expenseType";  }
+  function peg$f27() {    return "withdrawalType";  }
+  function peg$f28() {    return "withdrawalID";  }
+  function peg$f29() {    return "billable";  }
+  function peg$f30() {    return "reimbursable";  }
+  function peg$f31() {    return "type";  }
+  function peg$f32() {    return "status";  }
+  function peg$f33() {    return "sortBy";  }
+  function peg$f34() {    return "sortOrder";  }
+  function peg$f35() {    return "policyID";  }
+  function peg$f36() {    return "submitted";  }
+  function peg$f37() {    return "approved";  }
+  function peg$f38() {    return "paid";  }
+  function peg$f39() {    return "exported";  }
+  function peg$f40() {    return "posted";  }
+  function peg$f41() {    return "withdrawn";  }
+  function peg$f42() {    return "groupBy";  }
+  function peg$f43() {    return "limit";  }
+  function peg$f44() {    return "feed";  }
+  function peg$f45() {    return "title";  }
+  function peg$f46() {    return "assignee";  }
+  function peg$f47() {    return "createdBy";  }
+  function peg$f48() {    return "action";  }
+  function peg$f49() {return "total";  }
+  function peg$f50() {return "has";  }
+  function peg$f51() {return "is";  }
+  function peg$f52() {return "purchaseAmount"  }
+  function peg$f53() {return "purchaseCurrency"  }
+  function peg$f54() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f55() {return "view"  }
+  function peg$f56() {    return isColumnsContext;  }
+  function peg$f57() {    return "perDiem";  }
+  function peg$f58() {    return "drafts";  }
+  function peg$f59() {    return "originalamount";  }
+  function peg$f60() {    return "taxAmount";  }
+  function peg$f61() {    return "taxrate";  }
+  function peg$f62() {    return "policyname";  }
+  function peg$f63() {    return "withdrawalID";  }
+  function peg$f64() {    return "bankAccount";  }
+  function peg$f65() {    return "reportID";  }
+  function peg$f66() {    return "base62ReportID";  }
+  function peg$f67() {    return "exportedto";  }
+  function peg$f68() {    return "exportedTo";  }
+  function peg$f69() {    return "exportedTo";  }
+  function peg$f70() {    return "exchangeRate";  }
+  function peg$f71() {    return "reimbursableTotal";  }
+  function peg$f72() {    return "nonReimbursableTotal";  }
+  function peg$f73() {    return "groupFrom";  }
+  function peg$f74() {    return "groupExpenses";  }
+  function peg$f75() {    return "groupTotal";  }
+  function peg$f76() {    return "groupCard";  }
+  function peg$f77() {    return "groupFeed";  }
+  function peg$f78() {    return "groupBankAccount";  }
+  function peg$f79() {    return "groupWithdrawn";  }
+  function peg$f80() {    return "groupWithdrawalID";  }
+  function peg$f81() {    return "groupCategory";  }
+  function peg$f82() {    return "groupTag";  }
+  function peg$f83() {    return "groupMerchant";  }
+  function peg$f84() {    return "groupmonth";  }
+  function peg$f85() {    return "groupweek";  }
+  function peg$f86() {    return "groupyear";  }
+  function peg$f87() {    return "groupquarter";  }
+  function peg$f88() {    return "contains";  }
+  function peg$f89() {    return "eq";  }
+  function peg$f90() {    return "neq";  }
+  function peg$f91() {    return "gte";  }
+  function peg$f92() {    return "gt";  }
+  function peg$f93() {    return "lte";  }
+  function peg$f94() {    return "lt";  }
+  function peg$f95(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f96(chars) {    return chars.join("").trim();  }
+  function peg$f97() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f98() {    return expectingNestedQuote;  }
+  function peg$f99(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f100(start) {return "“"  }
+  function peg$f101(start) {return "”"  }
+  function peg$f102(start) {return "\""  }
+  function peg$f103(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -651,7 +642,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -679,12 +670,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -696,12 +695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -716,7 +715,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -737,21 +736,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -785,7 +784,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -801,7 +800,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -841,7 +840,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -862,7 +861,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -893,7 +892,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -935,7 +934,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -976,12 +975,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -989,7 +988,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1097,7 +1096,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1238,7 +1237,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1252,7 +1251,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1297,7 +1296,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1420,12 +1419,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1440,12 +1439,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1460,12 +1459,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1480,12 +1479,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1500,11 +1499,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1513,7 +1512,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1529,12 +1528,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1549,12 +1548,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1569,12 +1568,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1589,7 +1588,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1602,7 +1601,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1618,12 +1617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1638,12 +1637,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1658,12 +1657,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1678,12 +1677,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1698,12 +1697,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1718,11 +1717,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1731,7 +1730,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1747,7 +1746,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1760,7 +1759,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1776,12 +1775,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1796,12 +1795,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1816,7 +1815,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1829,7 +1828,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1845,7 +1844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1858,7 +1857,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1874,11 +1873,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1887,7 +1886,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1903,12 +1902,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1923,12 +1922,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1943,12 +1942,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1963,12 +1962,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1983,7 +1982,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1996,7 +1995,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
+        peg$currPos += (7);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2012,7 +2011,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2025,7 +2024,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2041,7 +2040,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2054,7 +2053,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2070,12 +2069,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2090,12 +2089,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2110,12 +2109,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2130,12 +2129,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2150,12 +2149,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2170,12 +2169,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2190,11 +2189,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2203,7 +2202,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2219,12 +2218,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2239,12 +2238,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2259,12 +2258,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2279,12 +2278,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2299,11 +2298,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2312,7 +2311,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2328,12 +2327,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2348,12 +2347,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2368,12 +2367,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2388,12 +2387,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2408,11 +2407,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2421,7 +2420,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2437,11 +2436,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
+      peg$currPos += (16);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2450,7 +2449,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
+        peg$currPos += (17);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2466,12 +2465,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2486,12 +2485,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2506,7 +2505,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2540,7 +2539,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    var s0;
+    let s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2626,12 +2625,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2663,12 +2662,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2676,7 +2675,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
+        peg$currPos += (5);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2709,12 +2708,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2746,12 +2745,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2783,12 +2782,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2820,12 +2819,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2857,12 +2856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2894,12 +2893,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2931,12 +2930,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2968,12 +2967,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3005,12 +3004,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3042,7 +3041,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3068,12 +3067,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3104,7 +3103,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3137,12 +3136,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3174,12 +3173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3211,12 +3210,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
+      peg$currPos += (22);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3248,12 +3247,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3285,12 +3284,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3322,12 +3321,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3359,12 +3358,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3396,12 +3395,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3433,12 +3432,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3470,12 +3469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3507,12 +3506,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
+      peg$currPos += (19);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3544,12 +3543,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3581,12 +3580,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3618,12 +3617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3655,12 +3654,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3692,12 +3691,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3729,12 +3728,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3766,12 +3765,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3803,16 +3802,16 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r2.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -3821,12 +3820,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r2.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -3849,9 +3848,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
+          if (input.substr(peg$currPos, 2) === peg$c96) {
             s1 = peg$c96;
-            peg$currPos++;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e103); }
@@ -3863,9 +3862,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
+            if (input.charCodeAt(peg$currPos) === 62) {
               s1 = peg$c97;
-              peg$currPos += 2;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e104); }
@@ -3877,9 +3876,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
+              if (input.substr(peg$currPos, 2) === peg$c98) {
                 s1 = peg$c98;
-                peg$currPos++;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e105); }
@@ -3889,6 +3888,21 @@ function peg$parse(input, options) {
                 s1 = peg$f93();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c99;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e106); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f94();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3904,13 +3918,13 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
 
@@ -3918,7 +3932,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3928,7 +3942,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3938,7 +3952,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
       }
     } else {
@@ -3946,32 +3960,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95(s1);
+      s1 = peg$f96(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f96();
+    s1 = peg$f97();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3993,18 +4007,16 @@ function peg$parse(input, options) {
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e108); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f97();
+    s1 = peg$f98();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4031,7 +4043,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4093,7 +4105,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4102,11 +4114,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e107); }
+            if (peg$silentFails === 0) { peg$fail(peg$e108); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f98(s1, s3, s5);
+        s0 = peg$f99(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,7 +4137,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4177,7 +4189,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
@@ -4185,7 +4197,7 @@ function peg$parse(input, options) {
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f99(s1);
+            s4 = peg$f100(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4208,7 +4220,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4216,7 +4228,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f100(s1);
+              s4 = peg$f101(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4239,7 +4251,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4247,7 +4259,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f101(s1);
+                s4 = peg$f102(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4282,7 +4294,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4290,7 +4302,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4313,7 +4325,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4321,7 +4333,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4344,7 +4356,7 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
@@ -4352,7 +4364,7 @@ function peg$parse(input, options) {
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f101(s1);
+                  s4 = peg$f102(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4368,7 +4380,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102(s1, s3, s4);
+        s0 = peg$f103(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4387,7 +4399,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4424,7 +4436,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4562,7 +4574,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
@@ -4749,30 +4761,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index c8971df55ea6..ec4f17efa6f2 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -688,7 +688,14 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeSearchValue(filterValue as string)}`;
+                    // For merchant filters:
+                    // - Non-negated: use *: (contains) for partial matching
+                    // - Negated: use : (eq) so parser correctly converts to neq operator
+                    const operator =
+                        filterKey === FILTER_KEYS.MERCHANT && !isNegated
+                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 444323137e27..9cc14a24a681 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -182,7 +182,7 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
         test('currencies and categories', () => {
@@ -323,7 +323,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc', limit: 25});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {

From 390eed169ff76619626343b14b98caabf10cd0c8 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 20 Mar 2026 00:56:35 +0700
Subject: [PATCH 003/781] Regenerate parser files with Peggy 4.0.3 to match
 package.json

Previously generated with Peggy 5.0.6 which caused AssertionError
on compile. Regenerated using npm run generate-search-parser and
generate-autocomplete-parser with installed Peggy 4.0.3.
---
 src/libs/SearchParser/autocompleteParser.js | 3232 +++++++++++++------
 src/libs/SearchParser/searchParser.js       | 1684 +++++-----
 2 files changed, 3146 insertions(+), 1770 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 8bbd481fb0ab..ff2b2ebe4878 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,6 +1,7 @@
 'worklet'
 
-// @generated by Peggy 5.0.6.
+class peg$SyntaxError{}
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -10,494 +11,601 @@
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-class peg$SyntaxError extends SyntaxError {
-  constructor(message, expected, found, location) {
-    super(message);
-    this.expected = expected;
-    this.found = found;
-    this.location = location;
-    this.name = "SyntaxError";
-  }
-
-  format(sources) {
-    let str = "Error: " + this.message;
-    if (this.location) {
-      let src = null;
-      const st = sources.find(s => s.source === this.location.source);
-      if (st) {
-        src = st.text.split(/\r\n|\n|\r/g);
-      }
-      const s = this.location.start;
-      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-        ? this.location.source.offset(s)
-        : s;
-      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-      if (src) {
-        const e = this.location.end;
-        const filler = "".padEnd(offset_s.line.toString().length, " ");
-        const line = src[s.line - 1];
-        const last = s.line === e.line ? e.column : line.length + 1;
-        const hatLen = (last - s.column) || 1;
-        str += "\n --> " + loc + "\n"
-            + filler + " |\n"
-            + offset_s.line + " | " + line + "\n"
-            + filler + " | " + "".padEnd(s.column - 1, " ")
-            + "".padEnd(hatLen, "^");
-      } else {
-        str += "\n at " + loc;
-      }
-    }
-    return str;
-  }
-
-  static buildMessage(expected, found) {
-    function hex(ch) {
-      return ch.codePointAt(0).toString(16).toUpperCase();
-    }
-
-    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
-      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
-      : null;
-    function unicodeEscape(s) {
-      if (nonPrintable) {
-        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
-      }
-      return s;
-    }
-
-    function literalEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
-
-    function classEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/\]/g, "\\]")
-        .replace(/\^/g, "\\^")
-        .replace(/-/g,  "\\-")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
-
-    const DESCRIBE_EXPECTATION_FNS = {
-      literal(expectation) {
-        return "\"" + literalEscape(expectation.text) + "\"";
-      },
+function peg$subclass(child, parent) {
+  function C() { this.constructor = child; }
+  C.prototype = parent.prototype;
+  child.prototype = new C();
+}
 
-      class(expectation) {
-        const escapedParts = expectation.parts.map(
-          part => (Array.isArray(part)
-            ? classEscape(part[0]) + "-" + classEscape(part[1])
-            : classEscape(part))
-        );
+function temporary(message, expected, found, location) {
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+  self.expected = expected;
+  self.found = found;
+  self.location = location;
+  self.name = "SyntaxError";
+  return self;
+}
 
-        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
-      },
 
-      any() {
-        return "any character";
-      },
 
-      end() {
-        return "end of input";
-      },
+function peg$padEnd(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) { return str; }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
 
-      other(expectation) {
-        return expectation.description;
-      },
-    };
+peg$SyntaxError.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0; k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
+      str += "\n --> " + loc + "\n"
+          + filler + " |\n"
+          + offset_s.line + " | " + line + "\n"
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
+    } else {
+      str += "\n at " + loc;
+    }
+  }
+  return str;
+};
 
-    function describeExpectation(expectation) {
-      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
+
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part)
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+          : classEscape(part);
+      });
+
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
+
+    any: function() {
+      return "any character";
+    },
+
+    end: function() {
+      return "end of input";
+    },
+
+    other: function(expectation) {
+      return expectation.description;
     }
+  };
 
-    function describeExpected(expected) {
-      const descriptions = expected.map(describeExpectation);
-      descriptions.sort();
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
 
-      if (descriptions.length > 0) {
-        let j = 1;
-        for (let i = 1; i < descriptions.length; i++) {
-          if (descriptions[i - 1] !== descriptions[i]) {
-            descriptions[j] = descriptions[i];
-            j++;
-          }
-        }
-        descriptions.length = j;
-      }
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g,  "\\\"")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/\]/g, "\\]")
+      .replace(/\^/g, "\\^")
+      .replace(/-/g,  "\\-")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
 
-      switch (descriptions.length) {
-        case 1:
-          return descriptions[0];
+  function describeExpected(expected) {
+    var descriptions = expected.map(describeExpectation);
+    var i, j;
 
-        case 2:
-          return descriptions[0] + " or " + descriptions[1];
+    descriptions.sort();
 
-        default:
-          return descriptions.slice(0, -1).join(", ")
-            + ", or "
-            + descriptions[descriptions.length - 1];
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
       }
+      descriptions.length = j;
     }
 
-    function describeFound(found) {
-      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
     }
+  }
 
-    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
   }
-}
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  const peg$FAILED = {};
-  const peg$source = options.grammarSource;
+  var peg$FAILED = {};
+  var peg$source = options.grammarSource;
+
+  var peg$startRuleFunctions = { query: peg$parsequery };
+  var peg$startRuleFunction = peg$parsequery;
+
+  var peg$c0 = "-";
+  var peg$c1 = "report-field";
+  var peg$c2 = "reportfield";
+  var peg$c3 = ",";
+  var peg$c4 = "date";
+  var peg$c5 = "amount";
+  var peg$c6 = "merchant";
+  var peg$c7 = "description";
+  var peg$c8 = "reportid";
+  var peg$c9 = "report-id";
+  var peg$c10 = "keyword";
+  var peg$c11 = "in";
+  var peg$c12 = "currency";
+  var peg$c13 = "groupCurrency";
+  var peg$c14 = "group-currency";
+  var peg$c15 = "tag";
+  var peg$c16 = "category";
+  var peg$c17 = "to";
+  var peg$c18 = "exporter";
+  var peg$c19 = "payer";
+  var peg$c20 = "taxrate";
+  var peg$c21 = "tax-rate";
+  var peg$c22 = "cardID";
+  var peg$c23 = "card";
+  var peg$c24 = "from";
+  var peg$c25 = "attendee";
+  var peg$c26 = "expenseType";
+  var peg$c27 = "expense-type";
+  var peg$c28 = "withdrawalType";
+  var peg$c29 = "withdrawal-type";
+  var peg$c30 = "withdrawalid";
+  var peg$c31 = "withdrawal-id";
+  var peg$c32 = "billable";
+  var peg$c33 = "reimbursable";
+  var peg$c34 = "type";
+  var peg$c35 = "status";
+  var peg$c36 = "sortBy";
+  var peg$c37 = "sort-by";
+  var peg$c38 = "sortOrder";
+  var peg$c39 = "sort-order";
+  var peg$c40 = "policyID";
+  var peg$c41 = "workspace";
+  var peg$c42 = "submitted";
+  var peg$c43 = "approved";
+  var peg$c44 = "paid";
+  var peg$c45 = "exported";
+  var peg$c46 = "posted";
+  var peg$c47 = "withdrawn";
+  var peg$c48 = "groupby";
+  var peg$c49 = "group-by";
+  var peg$c50 = "limit";
+  var peg$c51 = "feed";
+  var peg$c52 = "title";
+  var peg$c53 = "assignee";
+  var peg$c54 = "createdby";
+  var peg$c55 = "created-by";
+  var peg$c56 = "action";
+  var peg$c57 = "total";
+  var peg$c58 = "has";
+  var peg$c59 = "is";
+  var peg$c60 = "purchaseamount";
+  var peg$c61 = "purchase-amount";
+  var peg$c62 = "purchasecurrency";
+  var peg$c63 = "purchase-currency";
+  var peg$c64 = "columns";
+  var peg$c65 = "view";
+  var peg$c66 = "per-diem";
+  var peg$c67 = "drafts";
+  var peg$c68 = "draft";
+  var peg$c69 = "original-amount";
+  var peg$c70 = "tax";
+  var peg$c71 = "policy-name";
+  var peg$c72 = "bank-account";
+  var peg$c73 = "long-report-id";
+  var peg$c74 = "exported-to";
+  var peg$c75 = "exportedto";
+  var peg$c76 = "exchange-rate";
+  var peg$c77 = "reimbursable-total";
+  var peg$c78 = "non-reimbursable-total";
+  var peg$c79 = "group-from";
+  var peg$c80 = "group-expenses";
+  var peg$c81 = "group-total";
+  var peg$c82 = "group-card";
+  var peg$c83 = "group-feed";
+  var peg$c84 = "group-bank-account";
+  var peg$c85 = "group-withdrawn";
+  var peg$c86 = "group-withdrawal-id";
+  var peg$c87 = "group-category";
+  var peg$c88 = "group-tag";
+  var peg$c89 = "group-merchant";
+  var peg$c90 = "group-month";
+  var peg$c91 = "group-week";
+  var peg$c92 = "group-year";
+  var peg$c93 = "group-quarter";
+  var peg$c94 = "*:";
+  var peg$c95 = "!=";
+  var peg$c96 = ">=";
+  var peg$c97 = ">";
+  var peg$c98 = "<=";
+  var peg$c99 = "<";
+  var peg$c100 = "\u201C";
+  var peg$c101 = "\u201D";
+  var peg$c102 = "\"";
+
+  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  var peg$r1 = /^[:=]/;
+  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r3 = /^[ \t\r\n\xA0]/;
+  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  var peg$r5 = /^["\u201C-\u201D]/;
+  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  var peg$r8 = /^[a-zA-Z0-9]/;
+  var peg$r9 = /^[ \t\n\r\xA0]/;
+  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  var peg$r11 = /^[,]/;
+  var peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  var peg$e0 = peg$literalExpectation("-", false);
+  var peg$e1 = peg$literalExpectation("report-field", true);
+  var peg$e2 = peg$literalExpectation("reportfield", true);
+  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
+  var peg$e4 = peg$anyExpectation();
+  var peg$e5 = peg$literalExpectation(",", false);
+  var peg$e6 = peg$otherExpectation("key");
+  var peg$e7 = peg$literalExpectation("date", true);
+  var peg$e8 = peg$literalExpectation("amount", true);
+  var peg$e9 = peg$literalExpectation("merchant", true);
+  var peg$e10 = peg$literalExpectation("description", true);
+  var peg$e11 = peg$literalExpectation("reportid", true);
+  var peg$e12 = peg$literalExpectation("report-id", true);
+  var peg$e13 = peg$literalExpectation("keyword", true);
+  var peg$e14 = peg$literalExpectation("in", true);
+  var peg$e15 = peg$literalExpectation("currency", true);
+  var peg$e16 = peg$literalExpectation("groupCurrency", false);
+  var peg$e17 = peg$literalExpectation("group-currency", true);
+  var peg$e18 = peg$literalExpectation("tag", true);
+  var peg$e19 = peg$literalExpectation("category", true);
+  var peg$e20 = peg$literalExpectation("to", true);
+  var peg$e21 = peg$literalExpectation("exporter", true);
+  var peg$e22 = peg$literalExpectation("payer", true);
+  var peg$e23 = peg$literalExpectation("taxRate", true);
+  var peg$e24 = peg$literalExpectation("tax-rate", true);
+  var peg$e25 = peg$literalExpectation("cardID", false);
+  var peg$e26 = peg$literalExpectation("card", true);
+  var peg$e27 = peg$literalExpectation("from", true);
+  var peg$e28 = peg$literalExpectation("attendee", true);
+  var peg$e29 = peg$literalExpectation("expenseType", false);
+  var peg$e30 = peg$literalExpectation("expense-type", true);
+  var peg$e31 = peg$literalExpectation("withdrawalType", false);
+  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e33 = peg$literalExpectation("withdrawalID", true);
+  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e35 = peg$literalExpectation("billable", true);
+  var peg$e36 = peg$literalExpectation("reimbursable", true);
+  var peg$e37 = peg$literalExpectation("type", true);
+  var peg$e38 = peg$literalExpectation("status", true);
+  var peg$e39 = peg$literalExpectation("sortBy", false);
+  var peg$e40 = peg$literalExpectation("sort-by", true);
+  var peg$e41 = peg$literalExpectation("sortOrder", false);
+  var peg$e42 = peg$literalExpectation("sort-order", true);
+  var peg$e43 = peg$literalExpectation("policyID", false);
+  var peg$e44 = peg$literalExpectation("workspace", true);
+  var peg$e45 = peg$literalExpectation("submitted", true);
+  var peg$e46 = peg$literalExpectation("approved", true);
+  var peg$e47 = peg$literalExpectation("paid", true);
+  var peg$e48 = peg$literalExpectation("exported", true);
+  var peg$e49 = peg$literalExpectation("posted", true);
+  var peg$e50 = peg$literalExpectation("withdrawn", true);
+  var peg$e51 = peg$literalExpectation("groupBy", true);
+  var peg$e52 = peg$literalExpectation("group-by", true);
+  var peg$e53 = peg$literalExpectation("limit", true);
+  var peg$e54 = peg$literalExpectation("feed", true);
+  var peg$e55 = peg$literalExpectation("title", true);
+  var peg$e56 = peg$literalExpectation("assignee", true);
+  var peg$e57 = peg$literalExpectation("createdBy", true);
+  var peg$e58 = peg$literalExpectation("created-by", true);
+  var peg$e59 = peg$literalExpectation("action", true);
+  var peg$e60 = peg$literalExpectation("total", true);
+  var peg$e61 = peg$literalExpectation("has", true);
+  var peg$e62 = peg$literalExpectation("is", true);
+  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e64 = peg$literalExpectation("purchase-amount", true);
+  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e66 = peg$literalExpectation("purchase-currency", true);
+  var peg$e67 = peg$literalExpectation("columns", true);
+  var peg$e68 = peg$literalExpectation("view", true);
+  var peg$e69 = peg$literalExpectation("per-diem", true);
+  var peg$e70 = peg$literalExpectation("drafts", true);
+  var peg$e71 = peg$literalExpectation("draft", true);
+  var peg$e72 = peg$literalExpectation("original-amount", true);
+  var peg$e73 = peg$literalExpectation("tax", true);
+  var peg$e74 = peg$literalExpectation("policy-name", true);
+  var peg$e75 = peg$literalExpectation("bank-account", true);
+  var peg$e76 = peg$literalExpectation("long-report-id", true);
+  var peg$e77 = peg$literalExpectation("exported-to", true);
+  var peg$e78 = peg$classExpectation([":", "="], false, false);
+  var peg$e79 = peg$literalExpectation("exportedTo", true);
+  var peg$e80 = peg$literalExpectation("exchange-rate", true);
+  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e83 = peg$literalExpectation("group-from", true);
+  var peg$e84 = peg$literalExpectation("group-expenses", true);
+  var peg$e85 = peg$literalExpectation("group-total", true);
+  var peg$e86 = peg$literalExpectation("group-card", true);
+  var peg$e87 = peg$literalExpectation("group-feed", true);
+  var peg$e88 = peg$literalExpectation("group-bank-account", true);
+  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e91 = peg$literalExpectation("group-category", true);
+  var peg$e92 = peg$literalExpectation("group-tag", true);
+  var peg$e93 = peg$literalExpectation("group-merchant", true);
+  var peg$e94 = peg$literalExpectation("group-month", true);
+  var peg$e95 = peg$literalExpectation("group-week", true);
+  var peg$e96 = peg$literalExpectation("group-year", true);
+  var peg$e97 = peg$literalExpectation("group-quarter", true);
+  var peg$e98 = peg$otherExpectation("operator");
+  var peg$e99 = peg$literalExpectation("*:", false);
+  var peg$e100 = peg$literalExpectation("!=", false);
+  var peg$e101 = peg$literalExpectation(">=", false);
+  var peg$e102 = peg$literalExpectation(">", false);
+  var peg$e103 = peg$literalExpectation("<=", false);
+  var peg$e104 = peg$literalExpectation("<", false);
+  var peg$e105 = peg$otherExpectation("word");
+  var peg$e106 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e107 = peg$otherExpectation("whitespace");
+  var peg$e108 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e109 = peg$otherExpectation("quote");
+  var peg$e110 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e111 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e112 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e113 = peg$literalExpectation("\u201C", false);
+  var peg$e114 = peg$literalExpectation("\u201D", false);
+  var peg$e115 = peg$literalExpectation("\"", false);
+  var peg$e116 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e117 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e120 = peg$classExpectation([","], false, false);
+  var peg$e121 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+
+  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
+  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
+  var peg$f2 = function(neg, key, op, value) {
+      expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+      const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+      if (!value) {
+        autocomplete = {
+          key,
+          negated: isNegated,
+          value: "",
+          start: location().end.offset,
+          length: 0,
+        };
+        return;
+      }
 
-  const peg$startRuleFunctions = {
-    query: peg$parsequery,
-  };
-  let peg$startRuleFunction = peg$parsequery;
-
-  const peg$c0 = "-";
-  const peg$c1 = "report-field";
-  const peg$c2 = "reportfield";
-  const peg$c3 = ",";
-  const peg$c4 = "date";
-  const peg$c5 = "amount";
-  const peg$c6 = "merchant";
-  const peg$c7 = "description";
-  const peg$c8 = "reportid";
-  const peg$c9 = "report-id";
-  const peg$c10 = "in";
-  const peg$c11 = "currency";
-  const peg$c12 = "groupCurrency";
-  const peg$c13 = "group-currency";
-  const peg$c14 = "tag";
-  const peg$c15 = "category";
-  const peg$c16 = "to";
-  const peg$c17 = "exporter";
-  const peg$c18 = "payer";
-  const peg$c19 = "taxrate";
-  const peg$c20 = "tax-rate";
-  const peg$c21 = "cardID";
-  const peg$c22 = "card";
-  const peg$c23 = "from";
-  const peg$c24 = "attendee";
-  const peg$c25 = "expenseType";
-  const peg$c26 = "expense-type";
-  const peg$c27 = "withdrawalType";
-  const peg$c28 = "withdrawal-type";
-  const peg$c29 = "withdrawalid";
-  const peg$c30 = "withdrawal-id";
-  const peg$c31 = "billable";
-  const peg$c32 = "reimbursable";
-  const peg$c33 = "type";
-  const peg$c34 = "status";
-  const peg$c35 = "policyID";
-  const peg$c36 = "workspace";
-  const peg$c37 = "submitted";
-  const peg$c38 = "approved";
-  const peg$c39 = "paid";
-  const peg$c40 = "exported";
-  const peg$c41 = "posted";
-  const peg$c42 = "withdrawn";
-  const peg$c43 = "groupby";
-  const peg$c44 = "group-by";
-  const peg$c45 = "limit";
-  const peg$c46 = "feed";
-  const peg$c47 = "title";
-  const peg$c48 = "assignee";
-  const peg$c49 = "createdby";
-  const peg$c50 = "created-by";
-  const peg$c51 = "action";
-  const peg$c52 = "total";
-  const peg$c53 = "has";
-  const peg$c54 = "is";
-  const peg$c55 = "purchaseamount";
-  const peg$c56 = "purchase-amount";
-  const peg$c57 = "purchasecurrency";
-  const peg$c58 = "purchase-currency";
-  const peg$c59 = "columns";
-  const peg$c60 = "view";
-  const peg$c61 = "exportedto";
-  const peg$c62 = "exported-to";
-  const peg$c63 = "*:";
-  const peg$c64 = "!=";
-  const peg$c65 = ">=";
-  const peg$c66 = ">";
-  const peg$c67 = "<=";
-  const peg$c68 = "<";
-  const peg$c69 = "\u201C";
-  const peg$c70 = "\u201D";
-  const peg$c71 = "\"";
-
-  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  const peg$r1 = /^[:=]/;
-  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  const peg$r3 = /^[ \t\r\n\xA0]/;
-  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  const peg$r5 = /^["\u201C-\u201D]/;
-  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  const peg$r8 = /^[a-zA-Z0-9]/;
-  const peg$r9 = /^[ \t\n\r\xA0]/;
-  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  const peg$r11 = /^[,]/;
-  const peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  const peg$e0 = peg$literalExpectation("-", false);
-  const peg$e1 = peg$literalExpectation("report-field", true);
-  const peg$e2 = peg$literalExpectation("reportfield", true);
-  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
-  const peg$e4 = peg$anyExpectation();
-  const peg$e5 = peg$literalExpectation(",", false);
-  const peg$e6 = peg$otherExpectation("key");
-  const peg$e7 = peg$literalExpectation("date", true);
-  const peg$e8 = peg$literalExpectation("amount", true);
-  const peg$e9 = peg$literalExpectation("merchant", true);
-  const peg$e10 = peg$literalExpectation("description", true);
-  const peg$e11 = peg$literalExpectation("reportid", true);
-  const peg$e12 = peg$literalExpectation("report-id", true);
-  const peg$e13 = peg$literalExpectation("in", true);
-  const peg$e14 = peg$literalExpectation("currency", true);
-  const peg$e15 = peg$literalExpectation("groupCurrency", false);
-  const peg$e16 = peg$literalExpectation("group-currency", true);
-  const peg$e17 = peg$literalExpectation("tag", true);
-  const peg$e18 = peg$literalExpectation("category", true);
-  const peg$e19 = peg$literalExpectation("to", true);
-  const peg$e20 = peg$literalExpectation("exporter", true);
-  const peg$e21 = peg$literalExpectation("payer", true);
-  const peg$e22 = peg$literalExpectation("taxRate", true);
-  const peg$e23 = peg$literalExpectation("tax-rate", true);
-  const peg$e24 = peg$literalExpectation("cardID", false);
-  const peg$e25 = peg$literalExpectation("card", true);
-  const peg$e26 = peg$literalExpectation("from", true);
-  const peg$e27 = peg$literalExpectation("attendee", true);
-  const peg$e28 = peg$literalExpectation("expenseType", false);
-  const peg$e29 = peg$literalExpectation("expense-type", true);
-  const peg$e30 = peg$literalExpectation("withdrawalType", false);
-  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
-  const peg$e32 = peg$literalExpectation("withdrawalID", true);
-  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
-  const peg$e34 = peg$literalExpectation("billable", true);
-  const peg$e35 = peg$literalExpectation("reimbursable", true);
-  const peg$e36 = peg$literalExpectation("type", true);
-  const peg$e37 = peg$literalExpectation("status", true);
-  const peg$e38 = peg$literalExpectation("policyID", false);
-  const peg$e39 = peg$literalExpectation("workspace", true);
-  const peg$e40 = peg$literalExpectation("submitted", true);
-  const peg$e41 = peg$literalExpectation("approved", true);
-  const peg$e42 = peg$literalExpectation("paid", true);
-  const peg$e43 = peg$literalExpectation("exported", true);
-  const peg$e44 = peg$literalExpectation("posted", true);
-  const peg$e45 = peg$literalExpectation("withdrawn", true);
-  const peg$e46 = peg$literalExpectation("groupBy", true);
-  const peg$e47 = peg$literalExpectation("group-by", true);
-  const peg$e48 = peg$literalExpectation("limit", true);
-  const peg$e49 = peg$literalExpectation("feed", true);
-  const peg$e50 = peg$literalExpectation("title", true);
-  const peg$e51 = peg$literalExpectation("assignee", true);
-  const peg$e52 = peg$literalExpectation("createdBy", true);
-  const peg$e53 = peg$literalExpectation("created-by", true);
-  const peg$e54 = peg$literalExpectation("action", true);
-  const peg$e55 = peg$literalExpectation("total", true);
-  const peg$e56 = peg$literalExpectation("has", true);
-  const peg$e57 = peg$literalExpectation("is", true);
-  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
-  const peg$e59 = peg$literalExpectation("purchase-amount", true);
-  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
-  const peg$e61 = peg$literalExpectation("purchase-currency", true);
-  const peg$e62 = peg$literalExpectation("columns", true);
-  const peg$e63 = peg$literalExpectation("view", true);
-  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
-  const peg$e65 = peg$literalExpectation("exportedTo", true);
-  const peg$e66 = peg$literalExpectation("exported-to", true);
-  const peg$e67 = peg$otherExpectation("operator");
-  const peg$e68 = peg$literalExpectation("*:", false);
-  const peg$e69 = peg$literalExpectation("!=", false);
-  const peg$e70 = peg$literalExpectation(">=", false);
-  const peg$e71 = peg$literalExpectation(">", false);
-  const peg$e72 = peg$literalExpectation("<=", false);
-  const peg$e73 = peg$literalExpectation("<", false);
-  const peg$e74 = peg$otherExpectation("word");
-  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
-  const peg$e77 = peg$otherExpectation("quote");
-  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
-  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
-  const peg$e81 = peg$literalExpectation("\u201C", false);
-  const peg$e82 = peg$literalExpectation("\u201D", false);
-  const peg$e83 = peg$literalExpectation("\"", false);
-  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
-  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e88 = peg$classExpectation([","], false, false, false);
-  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
-
-  function peg$f0(ranges) {    return { autocomplete, ranges };  }
-  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
-  function peg$f2(neg, key, op, value) {
-    expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-    const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        value: "",
-        start: location().end.offset,
-        length: 0,
+        ...value[value.length - 1],
       };
-      return;
-    }
-
-    autocomplete = {
-      key,
-      negated: isNegated,
-      ...value[value.length - 1],
+      return value
+        .filter((v) => v.length > 0)
+        .map((v) => ({
+          key,
+          negated: isNegated,
+          ...v,
+        }));
     };
-    return value
-      .filter((v) => v.length > 0)
-      .map((v) => ({
-        key,
-        negated: isNegated,
-        ...v,
-      }));
-  }
-  function peg$f3(rest) {
-    const suffix = rest.replaceAll(/^-+/g, "");
-    return "reportField-" + (suffix ? suffix : "");
-  }
-  function peg$f4() {    autocomplete = null;  }
-  function peg$f5(k) {
-    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-    return k;
-  }
-  function peg$f6(parts, empty) {
-    const ends = location();
-    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-    if (empty) {
-      value.push("");
-    }
-    let count = ends.start.offset;
-    const result = [];
-    value.forEach((filter) => {
-      let word = filter;
-      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-        word = word.slice(1, -1);
-      }
-      result.push({
-        value: word,
-        start: count,
-        length: filter.length,
+  var peg$f3 = function(rest) {
+      const suffix = rest.replaceAll(/^-+/g, "");
+      return "reportField-" + (suffix ? suffix : "");
+    };
+  var peg$f4 = function() { autocomplete = null; };
+  var peg$f5 = function(k) {
+      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+      return k;
+    };
+  var peg$f6 = function(parts, empty) {
+      const ends = location();
+      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+      if (empty) {
+        value.push("");
+      }
+      let count = ends.start.offset;
+      const result = [];
+      value.forEach((filter) => {
+        let word = filter;
+        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+          word = word.slice(1, -1);
+        }
+        result.push({
+          value: word,
+          start: count,
+          length: filter.length,
+        });
+        count += filter.length + 1;
       });
-      count += filter.length + 1;
-    });
-    return result;
-  }
-  function peg$f7() {    return "date";  }
-  function peg$f8() {    return "amount";  }
-  function peg$f9() {    return "merchant";  }
-  function peg$f10() {    return "description";  }
-  function peg$f11() {    return "reportID";  }
-  function peg$f12() {    return "in";  }
-  function peg$f13() {    return "currency";  }
-  function peg$f14() {    return "groupCurrency";  }
-  function peg$f15() {    return "tag";  }
-  function peg$f16() {    return "category";  }
-  function peg$f17() {    return "to";  }
-  function peg$f18() {    return "exporter";  }
-  function peg$f19() {    return "payer";  }
-  function peg$f20() {    return "taxRate";  }
-  function peg$f21() {    return "cardID";  }
-  function peg$f22() {    return "from";  }
-  function peg$f23() {return "attendee"  }
-  function peg$f24() {    return "expenseType";  }
-  function peg$f25() {    return "withdrawalType";  }
-  function peg$f26() {    return "withdrawalID";  }
-  function peg$f27() {    return "billable";  }
-  function peg$f28() {    return "reimbursable";  }
-  function peg$f29() {    return "type";  }
-  function peg$f30() {    return "status";  }
-  function peg$f31() {    return "policyID";  }
-  function peg$f32() {    return "submitted";  }
-  function peg$f33() {    return "approved";  }
-  function peg$f34() {    return "paid";  }
-  function peg$f35() {    return "exported";  }
-  function peg$f36() {    return "posted";  }
-  function peg$f37() {    return "withdrawn";  }
-  function peg$f38() {    return "groupBy";  }
-  function peg$f39() {    return "limit";  }
-  function peg$f40() {    return "feed";  }
-  function peg$f41() {    return "title";  }
-  function peg$f42() {    return "assignee";  }
-  function peg$f43() {    return "createdBy";  }
-  function peg$f44() {    return "action";  }
-  function peg$f45() {return "total";  }
-  function peg$f46() {return "has";  }
-  function peg$f47() {return "is";  }
-  function peg$f48() {return "purchaseAmount"  }
-  function peg$f49() {return "purchaseCurrency"  }
-  function peg$f50() {
-    isColumnsContext = true;
-    return "columns";
-  }
-  function peg$f51() {return "view"  }
-  function peg$f52() {    return "exportedTo";  }
-  function peg$f53() {    return "exportedTo";  }
-  function peg$f54() {    return "contains";  }
-  function peg$f55() {    return "eq";  }
-  function peg$f56() {    return "neq";  }
-  function peg$f57() {    return "gte";  }
-  function peg$f58() {    return "gt";  }
-  function peg$f59() {    return "lte";  }
-  function peg$f60() {    return "lt";  }
-  function peg$f61(o) {
-    if (nameOperator) {
-      expectingNestedQuote = (o === "eq" || o === "contains");
-    }
-    isColumnsContext = false;
-    return o;
-  }
-  function peg$f62(chars) {    return chars.join("").trim();  }
-  function peg$f63() {    
-     isColumnsContext = false;
-     return "and";
-  }
-  function peg$f64() {    return expectingNestedQuote;  }
-  function peg$f65(start, inner, end) {    //handle no-breaking space
-         return [...start, '"', ...inner, '"', ...end].join("");
-  }
-  function peg$f66(start) {return "“"  }
-  function peg$f67(start) {return "”"  }
-  function peg$f68(start) {return "\""  }
-  function peg$f69(start, inner, end) {
+      return result;
+    };
+  var peg$f7 = function() { return "date"; };
+  var peg$f8 = function() { return "amount"; };
+  var peg$f9 = function() { return "merchant"; };
+  var peg$f10 = function() { return "description"; };
+  var peg$f11 = function() { return "reportID"; };
+  var peg$f12 = function() { return "keyword"; };
+  var peg$f13 = function() { return "in"; };
+  var peg$f14 = function() { return "currency"; };
+  var peg$f15 = function() { return "groupCurrency"; };
+  var peg$f16 = function() { return "tag"; };
+  var peg$f17 = function() { return "category"; };
+  var peg$f18 = function() { return "to"; };
+  var peg$f19 = function() { return "exporter"; };
+  var peg$f20 = function() { return "payer"; };
+  var peg$f21 = function() { return "taxRate"; };
+  var peg$f22 = function() { return "cardID"; };
+  var peg$f23 = function() { return "from"; };
+  var peg$f24 = function() {return "attendee"};
+  var peg$f25 = function() { return "expenseType"; };
+  var peg$f26 = function() { return "withdrawalType"; };
+  var peg$f27 = function() { return "withdrawalID"; };
+  var peg$f28 = function() { return "billable"; };
+  var peg$f29 = function() { return "reimbursable"; };
+  var peg$f30 = function() { return "type"; };
+  var peg$f31 = function() { return "status"; };
+  var peg$f32 = function() { return "sortBy"; };
+  var peg$f33 = function() { return "sortOrder"; };
+  var peg$f34 = function() { return "policyID"; };
+  var peg$f35 = function() { return "submitted"; };
+  var peg$f36 = function() { return "approved"; };
+  var peg$f37 = function() { return "paid"; };
+  var peg$f38 = function() { return "exported"; };
+  var peg$f39 = function() { return "posted"; };
+  var peg$f40 = function() { return "withdrawn"; };
+  var peg$f41 = function() { return "groupBy"; };
+  var peg$f42 = function() { return "limit"; };
+  var peg$f43 = function() { return "feed"; };
+  var peg$f44 = function() { return "title"; };
+  var peg$f45 = function() { return "assignee"; };
+  var peg$f46 = function() { return "createdBy"; };
+  var peg$f47 = function() { return "action"; };
+  var peg$f48 = function() {return "total"; };
+  var peg$f49 = function() {return "has"; };
+  var peg$f50 = function() {return "is"; };
+  var peg$f51 = function() {return "purchaseAmount"};
+  var peg$f52 = function() {return "purchaseCurrency"};
+  var peg$f53 = function() {
+  isColumnsContext = true;
+  return "columns";
+};
+  var peg$f54 = function() {return "view"};
+  var peg$f55 = function() { return isColumnsContext; };
+  var peg$f56 = function() { return "perDiem"; };
+  var peg$f57 = function() { return "drafts"; };
+  var peg$f58 = function() { return "originalamount"; };
+  var peg$f59 = function() { return "taxAmount"; };
+  var peg$f60 = function() { return "taxrate"; };
+  var peg$f61 = function() { return "policyname"; };
+  var peg$f62 = function() { return "withdrawalID"; };
+  var peg$f63 = function() { return "bankAccount"; };
+  var peg$f64 = function() { return "reportID"; };
+  var peg$f65 = function() { return "base62ReportID"; };
+  var peg$f66 = function() { return "exportedto"; };
+  var peg$f67 = function() { return "exportedTo"; };
+  var peg$f68 = function() { return "exportedTo"; };
+  var peg$f69 = function() { return "exchangeRate"; };
+  var peg$f70 = function() { return "reimbursableTotal"; };
+  var peg$f71 = function() { return "nonReimbursableTotal"; };
+  var peg$f72 = function() { return "groupFrom"; };
+  var peg$f73 = function() { return "groupExpenses"; };
+  var peg$f74 = function() { return "groupTotal"; };
+  var peg$f75 = function() { return "groupCard"; };
+  var peg$f76 = function() { return "groupFeed"; };
+  var peg$f77 = function() { return "groupBankAccount"; };
+  var peg$f78 = function() { return "groupWithdrawn"; };
+  var peg$f79 = function() { return "groupWithdrawalID"; };
+  var peg$f80 = function() { return "groupCategory"; };
+  var peg$f81 = function() { return "groupTag"; };
+  var peg$f82 = function() { return "groupMerchant"; };
+  var peg$f83 = function() { return "groupmonth"; };
+  var peg$f84 = function() { return "groupweek"; };
+  var peg$f85 = function() { return "groupyear"; };
+  var peg$f86 = function() { return "groupquarter"; };
+  var peg$f87 = function() { return "contains"; };
+  var peg$f88 = function() { return "eq"; };
+  var peg$f89 = function() { return "neq"; };
+  var peg$f90 = function() { return "gte"; };
+  var peg$f91 = function() { return "gt"; };
+  var peg$f92 = function() { return "lte"; };
+  var peg$f93 = function() { return "lt"; };
+  var peg$f94 = function(o) {
+      if (nameOperator) {
+        expectingNestedQuote = (o === "eq" || o === "contains");
+      }
+      isColumnsContext = false;
+      return o;
+  };
+  var peg$f95 = function(chars) { return chars.join("").trim(); };
+  var peg$f96 = function() { 
+  isColumnsContext = false;
+  return "and";
+};
+  var peg$f97 = function() { return expectingNestedQuote; };
+  var peg$f98 = function(start, inner, end) { //handle no-breaking space
+      return [...start, '"', ...inner, '"', ...end].join("");
+    };
+  var peg$f99 = function(start) {return "“"};
+  var peg$f100 = function(start) {return "”"};
+  var peg$f101 = function(start) {return "\""};
+  var peg$f102 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-  }
-  let peg$currPos = options.peg$currPos | 0;
-  let peg$savedPos = peg$currPos;
-  const peg$posDetailsCache = [{ line: 1, column: 1 }];
-  let peg$maxFailPos = peg$currPos;
-  let peg$maxFailExpected = options.peg$maxFailExpected || [];
-  let peg$silentFails = options.peg$silentFails | 0;
+};
+  var peg$currPos = options.peg$currPos | 0;
+  var peg$savedPos = peg$currPos;
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+  var peg$maxFailPos = peg$currPos;
+  var peg$maxFailExpected = options.peg$maxFailExpected || [];
+  var peg$silentFails = options.peg$silentFails | 0;
 
-  let peg$result;
+  var peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -519,7 +627,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos,
+      end: peg$currPos
     };
   }
 
@@ -547,20 +655,12 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
-  function peg$getUnicode(pos = peg$currPos) {
-    const cp = input.codePointAt(pos);
-    if (cp === undefined) {
-      return "";
-    }
-    return String.fromCodePoint(cp);
-  }
-
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text, ignoreCase };
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
-    return { type: "class", parts, inverted, ignoreCase, unicode };
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
   }
 
   function peg$anyExpectation() {
@@ -572,12 +672,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description };
+    return { type: "other", description: description };
   }
 
   function peg$computePosDetails(pos) {
-    let details = peg$posDetailsCache[pos];
-    let p;
+    var details = peg$posDetailsCache[pos];
+    var p;
 
     if (details) {
       return details;
@@ -592,7 +692,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column,
+        column: details.column
       };
 
       while (p < pos) {
@@ -613,21 +713,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    const startPosDetails = peg$computePosDetails(startPos);
-    const endPosDetails = peg$computePosDetails(endPos);
+    var startPosDetails = peg$computePosDetails(startPos);
+    var endPosDetails = peg$computePosDetails(endPos);
 
-    const res = {
+    var res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column,
+        column: startPosDetails.column
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column,
-      },
+        column: endPosDetails.column
+      }
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -661,7 +761,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -674,7 +774,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -699,7 +799,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -717,7 +817,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -756,12 +856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -769,7 +869,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -877,7 +977,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -904,7 +1004,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1063,7 +1163,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1077,7 +1177,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1139,12 +1239,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1159,12 +1259,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1179,12 +1279,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1199,12 +1299,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1219,11 +1319,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1232,7 +1332,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1247,13 +1347,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    let s0, s1;
+  function peg$parsekeyword() {
+    var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += (2);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1267,13 +1367,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    let s0, s1;
+  function peg$parsein() {
+    var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += (8);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1287,28 +1387,48 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsecurrency() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c12) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f14();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsegroupCurrency() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c12) {
-      s0 = peg$c12;
+    if (input.substr(peg$currPos, 13) === peg$c13) {
+      s0 = peg$c13;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c13) {
-        peg$currPos += (14);
+      if (s1.toLowerCase() === peg$c14) {
+        peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e16); }
+        if (peg$silentFails === 0) { peg$fail(peg$e17); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f14();
+        s1 = peg$f15();
       }
       s0 = s1;
     }
@@ -1317,19 +1437,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c14) {
-      peg$currPos += (3);
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f15();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1337,19 +1457,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1357,19 +1477,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += (2);
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1377,19 +1497,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1397,19 +1517,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c19) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f20();
     }
     s0 = s1;
 
@@ -1417,27 +1537,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c19) {
-      peg$currPos += (7);
+    if (s0.toLowerCase() === peg$c20) {
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c20) {
-        peg$currPos += (8);
+      if (s1.toLowerCase() === peg$c21) {
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f20();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1446,27 +1566,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 6) === peg$c22) {
+      s0 = peg$c22;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c22) {
-        peg$currPos += (4);
+      if (s1.toLowerCase() === peg$c23) {
+        peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
+        if (peg$silentFails === 0) { peg$fail(peg$e26); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f22();
       }
       s0 = s1;
     }
@@ -1475,19 +1595,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c23) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f22();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1495,19 +1615,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c25) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f24();
     }
     s0 = s1;
 
@@ -1515,27 +1635,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c25) {
-      s0 = peg$c25;
+    if (input.substr(peg$currPos, 11) === peg$c26) {
+      s0 = peg$c26;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c26) {
-        peg$currPos += (12);
+      if (s1.toLowerCase() === peg$c27) {
+        peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f24();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1544,27 +1664,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c27) {
-      s0 = peg$c27;
+    if (input.substr(peg$currPos, 14) === peg$c28) {
+      s0 = peg$c28;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c28) {
-        peg$currPos += (15);
+      if (s1.toLowerCase() === peg$c29) {
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e31); }
+        if (peg$silentFails === 0) { peg$fail(peg$e32); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1573,27 +1693,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c29) {
-      peg$currPos += (12);
+    if (s0.toLowerCase() === peg$c30) {
+      peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c30) {
-        peg$currPos += (13);
+      if (s1.toLowerCase() === peg$c31) {
+        peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e34); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f27();
       }
       s0 = s1;
     }
@@ -1602,19 +1722,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1622,19 +1742,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += (12);
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1642,19 +1762,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f30();
     }
     s0 = s1;
 
@@ -1662,47 +1782,105 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c35) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f31();
     }
     s0 = s1;
 
     return s0;
   }
 
+  function peg$parsesortBy() {
+    var s0, s1;
+
+    if (input.substr(peg$currPos, 6) === peg$c36) {
+      s0 = peg$c36;
+      peg$currPos += 6;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 7);
+      if (s1.toLowerCase() === peg$c37) {
+        peg$currPos += 7;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f32();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsesortOrder() {
+    var s0, s1;
+
+    if (input.substr(peg$currPos, 9) === peg$c38) {
+      s0 = peg$c38;
+      peg$currPos += 9;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 10);
+      if (s1.toLowerCase() === peg$c39) {
+        peg$currPos += 10;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f33();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
   function peg$parsepolicyID() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c35) {
-      s0 = peg$c35;
+    if (input.substr(peg$currPos, 8) === peg$c40) {
+      s0 = peg$c40;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c36) {
-        peg$currPos += (9);
+      if (s1.toLowerCase() === peg$c41) {
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e39); }
+        if (peg$silentFails === 0) { peg$fail(peg$e44); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f34();
       }
       s0 = s1;
     }
@@ -1711,19 +1889,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c37) {
-      peg$currPos += (9);
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f32();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1731,19 +1909,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c38) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c43) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f33();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1751,19 +1929,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c39) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c44) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f34();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -1771,19 +1949,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c40) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f38();
     }
     s0 = s1;
 
@@ -1791,19 +1969,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c41) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -1811,19 +1989,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += (9);
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -1831,27 +2009,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c43) {
-      peg$currPos += (7);
+    if (s0.toLowerCase() === peg$c48) {
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c44) {
-        peg$currPos += (8);
+      if (s1.toLowerCase() === peg$c49) {
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e47); }
+        if (peg$silentFails === 0) { peg$fail(peg$e52); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f38();
+        s1 = peg$f41();
       }
       s0 = s1;
     }
@@ -1860,19 +2038,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c50) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -1880,19 +2058,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f43();
     }
     s0 = s1;
 
@@ -1900,19 +2078,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f41();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -1920,19 +2098,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c48) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f45();
     }
     s0 = s1;
 
@@ -1940,27 +2118,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c49) {
-      peg$currPos += (9);
+    if (s0.toLowerCase() === peg$c54) {
+      peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c50) {
-        peg$currPos += (10);
+      if (s1.toLowerCase() === peg$c55) {
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e53); }
+        if (peg$silentFails === 0) { peg$fail(peg$e58); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f43();
+        s1 = peg$f46();
       }
       s0 = s1;
     }
@@ -1969,19 +2147,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c56) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f47();
     }
     s0 = s1;
 
@@ -1989,204 +2167,1401 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c57) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f48();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsehas() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c58) {
+      peg$currPos += 3;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f49();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseis() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f50();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsepurchaseAmount() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c60) {
+      peg$currPos += 14;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c61) {
+        peg$currPos += 15;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f51();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsepurchaseCurrency() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c62) {
+      peg$currPos += 16;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c63) {
+        peg$currPos += 17;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f52();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsecolumns() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c64) {
+      peg$currPos += 7;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f53();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseview() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c65) {
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f54();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsevalues() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    peg$savedPos = peg$currPos;
+    s1 = peg$f55();
+    if (s1) {
+      s1 = undefined;
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsecolumnsValues();
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseperDiem();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsedraft();
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsecolumnsValues() {
+    var s0;
+
+    s0 = peg$parseoriginalAmount();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsetaxRateValue();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsetaxAmount();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsepolicyName();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsewithdrawalId();
+            if (s0 === peg$FAILED) {
+              s0 = peg$parsebankAccount();
+              if (s0 === peg$FAILED) {
+                s0 = peg$parsereportId();
+                if (s0 === peg$FAILED) {
+                  s0 = peg$parsebase62ReportId();
+                  if (s0 === peg$FAILED) {
+                    s0 = peg$parseexportedToColumnValue();
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$parseexchangeRate();
+                      if (s0 === peg$FAILED) {
+                        s0 = peg$parsereimbursableTotal();
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$parsenonReimbursableTotal();
+                          if (s0 === peg$FAILED) {
+                            s0 = peg$parsegroupFrom();
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$parsegroupExpenses();
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$parsegroupTotal();
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$parsegroupCard();
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$parsegroupFeed();
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$parsegroupBankAccount();
+                                      if (s0 === peg$FAILED) {
+                                        s0 = peg$parsegroupWithdrawn();
+                                        if (s0 === peg$FAILED) {
+                                          s0 = peg$parsegroupWithdrawalId();
+                                          if (s0 === peg$FAILED) {
+                                            s0 = peg$parsegroupCategory();
+                                            if (s0 === peg$FAILED) {
+                                              s0 = peg$parsegroupTag();
+                                              if (s0 === peg$FAILED) {
+                                                s0 = peg$parsegroupMerchant();
+                                                if (s0 === peg$FAILED) {
+                                                  s0 = peg$parsegroupMonth();
+                                                  if (s0 === peg$FAILED) {
+                                                    s0 = peg$parsegroupWeek();
+                                                    if (s0 === peg$FAILED) {
+                                                      s0 = peg$parsegroupYear();
+                                                      if (s0 === peg$FAILED) {
+                                                        s0 = peg$parsegroupQuarter();
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseperDiem() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c66) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f56();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsedraft() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 6);
+    if (s1.toLowerCase() === peg$c67) {
+      peg$currPos += 6;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+    }
+    if (s1 === peg$FAILED) {
+      s1 = input.substr(peg$currPos, 5);
+      if (s1.toLowerCase() === peg$c68) {
+        peg$currPos += 5;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f57();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseoriginalAmount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 15);
+    if (s1.toLowerCase() === peg$c69) {
+      peg$currPos += 15;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f58();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsetaxAmount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c70) {
+      peg$currPos += 3;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f59();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsetaxRateValue() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c21) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f60();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsepolicyName() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c71) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f61();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsewithdrawalId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f62();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsebankAccount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 12);
+    if (s1.toLowerCase() === peg$c72) {
+      peg$currPos += 12;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f63();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsereportId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c73) {
+      peg$currPos += 14;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f64();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsebase62ReportId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 9);
+    if (s1.toLowerCase() === peg$c9) {
+      peg$currPos += 9;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f65();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedToColumnValue() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c74) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f66();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    var s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedTo() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c75) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parseexportedToKeyEnd();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f67();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c74) {
+        peg$currPos += 11;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f68();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseexchangeRate() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c76) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f69();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsereimbursableTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 18);
+    if (s1.toLowerCase() === peg$c77) {
+      peg$currPos += 18;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f70();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsenonReimbursableTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 22);
+    if (s1.toLowerCase() === peg$c78) {
+      peg$currPos += 22;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f71();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupFrom() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c79) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f72();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupExpenses() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c80) {
+      peg$currPos += 14;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f73();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c81) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f74();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupCard() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c82) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f75();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupFeed() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c83) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f76();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupBankAccount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 18);
+    if (s1.toLowerCase() === peg$c84) {
+      peg$currPos += 18;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f77();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupWithdrawn() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 15);
+    if (s1.toLowerCase() === peg$c85) {
+      peg$currPos += 15;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f78();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsehas() {
-    let s0, s1;
+  function peg$parsegroupWithdrawalId() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += (3);
+    s1 = input.substr(peg$currPos, 19);
+    if (s1.toLowerCase() === peg$c86) {
+      peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f46();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f79();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parseis() {
-    let s0, s1;
+  function peg$parsegroupCategory() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c54) {
-      peg$currPos += (2);
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c87) {
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f47();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f80();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsepurchaseAmount() {
-    let s0, s1;
+  function peg$parsegroupTag() {
+    var s0, s1, s2, s3;
 
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c55) {
-      peg$currPos += (14);
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 9);
+    if (s1.toLowerCase() === peg$c88) {
+      peg$currPos += 9;
     } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c56) {
-        peg$currPos += (15);
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e59); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
+      if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f48();
+        s0 = peg$f81();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      s0 = s1;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsepurchaseCurrency() {
-    let s0, s1;
+  function peg$parsegroupMerchant() {
+    var s0, s1, s2, s3;
 
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c57) {
-      peg$currPos += (16);
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c89) {
+      peg$currPos += 14;
     } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c58) {
-        peg$currPos += (17);
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e61); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
+      if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f49();
+        s0 = peg$f82();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      s0 = s1;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsecolumns() {
-    let s0, s1;
+  function peg$parsegroupMonth() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += (7);
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c90) {
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f83();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parseview() {
-    let s0, s1;
+  function peg$parsegroupWeek() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c60) {
-      peg$currPos += (4);
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c91) {
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f51();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    let s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
+        peg$savedPos = s0;
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parseexportedTo() {
-    let s0, s1, s2, s3;
+  function peg$parsegroupYear() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c61) {
-      peg$currPos += (10);
+    if (s1.toLowerCase() === peg$c92) {
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
+      s3 = peg$parsewordBoundary();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -2196,7 +3571,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f52();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2205,57 +3580,62 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c62) {
-        peg$currPos += (11);
+
+    return s0;
+  }
+
+  function peg$parsegroupQuarter() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c93) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f53();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c63) {
-      s1 = peg$c63;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f54();
+      s1 = peg$f87();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2265,81 +3645,81 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f55();
+        s1 = peg$f88();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c64) {
-          s1 = peg$c64;
+        if (input.substr(peg$currPos, 2) === peg$c95) {
+          s1 = peg$c95;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e69); }
+          if (peg$silentFails === 0) { peg$fail(peg$e100); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f56();
+          s1 = peg$f89();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 2) === peg$c65) {
-            s1 = peg$c65;
+          if (input.substr(peg$currPos, 2) === peg$c96) {
+            s1 = peg$c96;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e70); }
+            if (peg$silentFails === 0) { peg$fail(peg$e101); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f57();
+            s1 = peg$f90();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 62) {
-              s1 = peg$c66;
+              s1 = peg$c97;
               peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e71); }
+              if (peg$silentFails === 0) { peg$fail(peg$e102); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f58();
+              s1 = peg$f91();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c67) {
-                s1 = peg$c67;
+              if (input.substr(peg$currPos, 2) === peg$c98) {
+                s1 = peg$c98;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e72); }
+                if (peg$silentFails === 0) { peg$fail(peg$e103); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f59();
+                s1 = peg$f92();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 if (input.charCodeAt(peg$currPos) === 60) {
-                  s1 = peg$c68;
+                  s1 = peg$c99;
                   peg$currPos++;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e104); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f60();
+                  s1 = peg$f93();
                 }
                 s0 = s1;
               }
@@ -2351,20 +3731,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f61(s1);
+      s1 = peg$f94(s1);
     }
     s0 = s1;
 
@@ -2372,7 +3752,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2382,7 +3762,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2392,7 +3772,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
       }
     } else {
@@ -2400,32 +3780,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f62(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f63();
+    s1 = peg$f96();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -2434,7 +3814,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2443,20 +3823,22 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e108); }
       }
     }
     peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e107); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f64();
+    s1 = peg$f97();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2483,7 +3865,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2493,7 +3875,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2502,7 +3884,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2510,7 +3892,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2519,7 +3901,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2528,7 +3910,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e112); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2536,7 +3918,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e111); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2545,7 +3927,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2554,11 +3936,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e75); }
+            if (peg$silentFails === 0) { peg$fail(peg$e106); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f65(s1, s3, s5);
+        s0 = peg$f98(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2570,14 +3952,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2587,7 +3969,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2596,7 +3978,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2604,7 +3986,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2613,7 +3995,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2629,15 +4011,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c69;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e81); }
+            if (peg$silentFails === 0) { peg$fail(peg$e113); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f66(s1);
+            s4 = peg$f99(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -2660,15 +4042,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c70;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e82); }
+              if (peg$silentFails === 0) { peg$fail(peg$e114); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f67(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2691,15 +4073,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c71;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e83); }
+                if (peg$silentFails === 0) { peg$fail(peg$e115); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f68(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2718,7 +4100,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e112); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2734,15 +4116,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c69;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e81); }
+              if (peg$silentFails === 0) { peg$fail(peg$e113); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f66(s1);
+              s4 = peg$f99(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2765,15 +4147,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c70;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e82); }
+                if (peg$silentFails === 0) { peg$fail(peg$e114); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f67(s1);
+                s4 = peg$f100(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2796,15 +4178,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c71;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e115); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f68(s1);
+                  s4 = peg$f101(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -2820,7 +4202,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69(s1, s3, s4);
+        s0 = peg$f102(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2832,14 +4214,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -2847,7 +4229,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2876,7 +4258,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -2885,7 +4267,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e116); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2894,7 +4276,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e116); }
       }
     }
     s2 = [];
@@ -2903,7 +4285,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2912,7 +4294,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e85); }
+        if (peg$silentFails === 0) { peg$fail(peg$e117); }
       }
     }
     s3 = [];
@@ -2921,7 +4303,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2930,7 +4312,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e118); }
       }
     }
     s4 = peg$parseoperator();
@@ -2949,7 +4331,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e87); }
+        if (peg$silentFails === 0) { peg$fail(peg$e119); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2958,7 +4340,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e87); }
+          if (peg$silentFails === 0) { peg$fail(peg$e119); }
         }
       }
       s2 = peg$currPos;
@@ -3005,7 +4387,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e88); }
+          if (peg$silentFails === 0) { peg$fail(peg$e120); }
         }
       }
     }
@@ -3014,14 +4396,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -3060,35 +4442,29 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
-  function peg$throw() {
-    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
-      peg$fail(peg$endExpectation());
-    }
-
-    throw peg$buildStructuredError(
-      peg$maxFailExpected,
-      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
-      peg$maxFailPos < input.length
-        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
-    );
-  }
   if (options.peg$library) {
     return /** @type {any} */ ({
       peg$result,
       peg$currPos,
       peg$FAILED,
       peg$maxFailExpected,
-      peg$maxFailPos,
-      peg$success,
-      peg$throw: peg$success ? undefined : peg$throw,
+      peg$maxFailPos
     });
   }
-  if (peg$success) {
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
     return peg$result;
   } else {
-    peg$throw();
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
   }
 }
 
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index f38d92cffd86..52712ed2731b 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 5.0.6.
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -12,615 +12,627 @@
     return { operator, left, right };
   }
 
-class peg$SyntaxError extends SyntaxError {
-  constructor(message, expected, found, location) {
-    super(message);
-    this.expected = expected;
-    this.found = found;
-    this.location = location;
-    this.name = "SyntaxError";
-  }
-
-  format(sources) {
-    let str = "Error: " + this.message;
-    if (this.location) {
-      let src = null;
-      const st = sources.find(s => s.source === this.location.source);
-      if (st) {
-        src = st.text.split(/\r\n|\n|\r/g);
-      }
-      const s = this.location.start;
-      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-        ? this.location.source.offset(s)
-        : s;
-      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-      if (src) {
-        const e = this.location.end;
-        const filler = "".padEnd(offset_s.line.toString().length, " ");
-        const line = src[s.line - 1];
-        const last = s.line === e.line ? e.column : line.length + 1;
-        const hatLen = (last - s.column) || 1;
-        str += "\n --> " + loc + "\n"
-            + filler + " |\n"
-            + offset_s.line + " | " + line + "\n"
-            + filler + " | " + "".padEnd(s.column - 1, " ")
-            + "".padEnd(hatLen, "^");
-      } else {
-        str += "\n at " + loc;
-      }
-    }
-    return str;
-  }
-
-  static buildMessage(expected, found) {
-    function hex(ch) {
-      return ch.codePointAt(0).toString(16).toUpperCase();
-    }
+function peg$subclass(child, parent) {
+  function C() { this.constructor = child; }
+  C.prototype = parent.prototype;
+  child.prototype = new C();
+}
 
-    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
-      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
-      : null;
-    function unicodeEscape(s) {
-      if (nonPrintable) {
-        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
-      }
-      return s;
-    }
+function peg$SyntaxError(message, expected, found, location) {
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+  self.expected = expected;
+  self.found = found;
+  self.location = location;
+  self.name = "SyntaxError";
+  return self;
+}
 
-    function literalEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
+peg$subclass(peg$SyntaxError, Error);
 
-    function classEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/\]/g, "\\]")
-        .replace(/\^/g, "\\^")
-        .replace(/-/g,  "\\-")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
+function peg$padEnd(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) { return str; }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
 
-    const DESCRIBE_EXPECTATION_FNS = {
-      literal(expectation) {
-        return "\"" + literalEscape(expectation.text) + "\"";
-      },
+peg$SyntaxError.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0; k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
+      str += "\n --> " + loc + "\n"
+          + filler + " |\n"
+          + offset_s.line + " | " + line + "\n"
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
+    } else {
+      str += "\n at " + loc;
+    }
+  }
+  return str;
+};
 
-      class(expectation) {
-        const escapedParts = expectation.parts.map(
-          part => (Array.isArray(part)
-            ? classEscape(part[0]) + "-" + classEscape(part[1])
-            : classEscape(part))
-        );
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
 
-        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
-      },
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part)
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+          : classEscape(part);
+      });
 
-      any() {
-        return "any character";
-      },
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
 
-      end() {
-        return "end of input";
-      },
+    any: function() {
+      return "any character";
+    },
 
-      other(expectation) {
-        return expectation.description;
-      },
-    };
+    end: function() {
+      return "end of input";
+    },
 
-    function describeExpectation(expectation) {
-      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    other: function(expectation) {
+      return expectation.description;
     }
+  };
+
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
 
-    function describeExpected(expected) {
-      const descriptions = expected.map(describeExpectation);
-      descriptions.sort();
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g,  "\\\"")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
 
-      if (descriptions.length > 0) {
-        let j = 1;
-        for (let i = 1; i < descriptions.length; i++) {
-          if (descriptions[i - 1] !== descriptions[i]) {
-            descriptions[j] = descriptions[i];
-            j++;
-          }
-        }
-        descriptions.length = j;
-      }
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/\]/g, "\\]")
+      .replace(/\^/g, "\\^")
+      .replace(/-/g,  "\\-")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
 
-      switch (descriptions.length) {
-        case 1:
-          return descriptions[0];
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+  function describeExpected(expected) {
+    var descriptions = expected.map(describeExpectation);
+    var i, j;
 
-        case 2:
-          return descriptions[0] + " or " + descriptions[1];
+    descriptions.sort();
 
-        default:
-          return descriptions.slice(0, -1).join(", ")
-            + ", or "
-            + descriptions[descriptions.length - 1];
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
       }
+      descriptions.length = j;
     }
 
-    function describeFound(found) {
-      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
     }
+  }
 
-    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
   }
-}
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  const peg$FAILED = {};
-  const peg$source = options.grammarSource;
-
-  const peg$startRuleFunctions = {
-    query: peg$parsequery,
-  };
-  let peg$startRuleFunction = peg$parsequery;
-
-  const peg$c0 = "-";
-  const peg$c1 = "report-field";
-  const peg$c2 = "reportfield";
-  const peg$c3 = ",";
-  const peg$c4 = "date";
-  const peg$c5 = "amount";
-  const peg$c6 = "merchant";
-  const peg$c7 = "description";
-  const peg$c8 = "reportid";
-  const peg$c9 = "report-id";
-  const peg$c10 = "keyword";
-  const peg$c11 = "in";
-  const peg$c12 = "currency";
-  const peg$c13 = "groupCurrency";
-  const peg$c14 = "group-currency";
-  const peg$c15 = "tag";
-  const peg$c16 = "category";
-  const peg$c17 = "to";
-  const peg$c18 = "exporter";
-  const peg$c19 = "payer";
-  const peg$c20 = "taxrate";
-  const peg$c21 = "tax-rate";
-  const peg$c22 = "cardID";
-  const peg$c23 = "card";
-  const peg$c24 = "from";
-  const peg$c25 = "attendee";
-  const peg$c26 = "expenseType";
-  const peg$c27 = "expense-type";
-  const peg$c28 = "withdrawalType";
-  const peg$c29 = "withdrawal-type";
-  const peg$c30 = "withdrawalid";
-  const peg$c31 = "withdrawal-id";
-  const peg$c32 = "billable";
-  const peg$c33 = "reimbursable";
-  const peg$c34 = "type";
-  const peg$c35 = "status";
-  const peg$c36 = "sortBy";
-  const peg$c37 = "sort-by";
-  const peg$c38 = "sortOrder";
-  const peg$c39 = "sort-order";
-  const peg$c40 = "policyID";
-  const peg$c41 = "workspace";
-  const peg$c42 = "submitted";
-  const peg$c43 = "approved";
-  const peg$c44 = "paid";
-  const peg$c45 = "exported";
-  const peg$c46 = "posted";
-  const peg$c47 = "withdrawn";
-  const peg$c48 = "groupby";
-  const peg$c49 = "group-by";
-  const peg$c50 = "limit";
-  const peg$c51 = "feed";
-  const peg$c52 = "title";
-  const peg$c53 = "assignee";
-  const peg$c54 = "createdby";
-  const peg$c55 = "created-by";
-  const peg$c56 = "action";
-  const peg$c57 = "total";
-  const peg$c58 = "has";
-  const peg$c59 = "is";
-  const peg$c60 = "purchaseamount";
-  const peg$c61 = "purchase-amount";
-  const peg$c62 = "purchasecurrency";
-  const peg$c63 = "purchase-currency";
-  const peg$c64 = "columns";
-  const peg$c65 = "view";
-  const peg$c66 = "per-diem";
-  const peg$c67 = "drafts";
-  const peg$c68 = "draft";
-  const peg$c69 = "original-amount";
-  const peg$c70 = "tax";
-  const peg$c71 = "policy-name";
-  const peg$c72 = "bank-account";
-  const peg$c73 = "long-report-id";
-  const peg$c74 = "exported-to";
-  const peg$c75 = "exportedto";
-  const peg$c76 = "exchange-rate";
-  const peg$c77 = "reimbursable-total";
-  const peg$c78 = "non-reimbursable-total";
-  const peg$c79 = "group-from";
-  const peg$c80 = "group-expenses";
-  const peg$c81 = "group-total";
-  const peg$c82 = "group-card";
-  const peg$c83 = "group-feed";
-  const peg$c84 = "group-bank-account";
-  const peg$c85 = "group-withdrawn";
-  const peg$c86 = "group-withdrawal-id";
-  const peg$c87 = "group-category";
-  const peg$c88 = "group-tag";
-  const peg$c89 = "group-merchant";
-  const peg$c90 = "group-month";
-  const peg$c91 = "group-week";
-  const peg$c92 = "group-year";
-  const peg$c93 = "group-quarter";
-  const peg$c94 = "*:";
-  const peg$c95 = "!=";
-  const peg$c96 = ">=";
-  const peg$c97 = ">";
-  const peg$c98 = "<=";
-  const peg$c99 = "<";
-  const peg$c100 = "\u201C";
-  const peg$c101 = "\u201D";
-  const peg$c102 = "\"";
-
-  const peg$r0 = /^[^ \t\r\n\xA0]/;
-  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  const peg$r2 = /^[:=]/;
-  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  const peg$r4 = /^[ \t\r\n\xA0]/;
-  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  const peg$r6 = /^["\u201C-\u201D]/;
-  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  const peg$r9 = /^[a-zA-Z0-9]/;
-  const peg$r10 = /^[ \t\n\r\xA0]/;
-  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  const peg$r12 = /^[,]/;
-  const peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
-  const peg$e1 = peg$literalExpectation("-", false);
-  const peg$e2 = peg$literalExpectation("report-field", true);
-  const peg$e3 = peg$literalExpectation("reportfield", true);
-  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
-  const peg$e5 = peg$anyExpectation();
-  const peg$e6 = peg$otherExpectation("key");
-  const peg$e7 = peg$otherExpectation("default key");
-  const peg$e8 = peg$literalExpectation(",", false);
-  const peg$e9 = peg$literalExpectation("date", true);
-  const peg$e10 = peg$literalExpectation("amount", true);
-  const peg$e11 = peg$literalExpectation("merchant", true);
-  const peg$e12 = peg$literalExpectation("description", true);
-  const peg$e13 = peg$literalExpectation("reportid", true);
-  const peg$e14 = peg$literalExpectation("report-id", true);
-  const peg$e15 = peg$literalExpectation("keyword", true);
-  const peg$e16 = peg$literalExpectation("in", true);
-  const peg$e17 = peg$literalExpectation("currency", true);
-  const peg$e18 = peg$literalExpectation("groupCurrency", false);
-  const peg$e19 = peg$literalExpectation("group-currency", true);
-  const peg$e20 = peg$literalExpectation("tag", true);
-  const peg$e21 = peg$literalExpectation("category", true);
-  const peg$e22 = peg$literalExpectation("to", true);
-  const peg$e23 = peg$literalExpectation("exporter", true);
-  const peg$e24 = peg$literalExpectation("payer", true);
-  const peg$e25 = peg$literalExpectation("taxRate", true);
-  const peg$e26 = peg$literalExpectation("tax-rate", true);
-  const peg$e27 = peg$literalExpectation("cardID", false);
-  const peg$e28 = peg$literalExpectation("card", true);
-  const peg$e29 = peg$literalExpectation("from", true);
-  const peg$e30 = peg$literalExpectation("attendee", true);
-  const peg$e31 = peg$literalExpectation("expenseType", false);
-  const peg$e32 = peg$literalExpectation("expense-type", true);
-  const peg$e33 = peg$literalExpectation("withdrawalType", false);
-  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  const peg$e35 = peg$literalExpectation("withdrawalID", true);
-  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  const peg$e37 = peg$literalExpectation("billable", true);
-  const peg$e38 = peg$literalExpectation("reimbursable", true);
-  const peg$e39 = peg$literalExpectation("type", true);
-  const peg$e40 = peg$literalExpectation("status", true);
-  const peg$e41 = peg$literalExpectation("sortBy", false);
-  const peg$e42 = peg$literalExpectation("sort-by", true);
-  const peg$e43 = peg$literalExpectation("sortOrder", false);
-  const peg$e44 = peg$literalExpectation("sort-order", true);
-  const peg$e45 = peg$literalExpectation("policyID", false);
-  const peg$e46 = peg$literalExpectation("workspace", true);
-  const peg$e47 = peg$literalExpectation("submitted", true);
-  const peg$e48 = peg$literalExpectation("approved", true);
-  const peg$e49 = peg$literalExpectation("paid", true);
-  const peg$e50 = peg$literalExpectation("exported", true);
-  const peg$e51 = peg$literalExpectation("posted", true);
-  const peg$e52 = peg$literalExpectation("withdrawn", true);
-  const peg$e53 = peg$literalExpectation("groupBy", true);
-  const peg$e54 = peg$literalExpectation("group-by", true);
-  const peg$e55 = peg$literalExpectation("limit", true);
-  const peg$e56 = peg$literalExpectation("feed", true);
-  const peg$e57 = peg$literalExpectation("title", true);
-  const peg$e58 = peg$literalExpectation("assignee", true);
-  const peg$e59 = peg$literalExpectation("createdBy", true);
-  const peg$e60 = peg$literalExpectation("created-by", true);
-  const peg$e61 = peg$literalExpectation("action", true);
-  const peg$e62 = peg$literalExpectation("total", true);
-  const peg$e63 = peg$literalExpectation("has", true);
-  const peg$e64 = peg$literalExpectation("is", true);
-  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  const peg$e66 = peg$literalExpectation("purchase-amount", true);
-  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  const peg$e68 = peg$literalExpectation("purchase-currency", true);
-  const peg$e69 = peg$literalExpectation("columns", true);
-  const peg$e70 = peg$literalExpectation("view", true);
-  const peg$e71 = peg$literalExpectation("per-diem", true);
-  const peg$e72 = peg$literalExpectation("drafts", true);
-  const peg$e73 = peg$literalExpectation("draft", true);
-  const peg$e74 = peg$literalExpectation("original-amount", true);
-  const peg$e75 = peg$literalExpectation("tax", true);
-  const peg$e76 = peg$literalExpectation("policy-name", true);
-  const peg$e77 = peg$literalExpectation("bank-account", true);
-  const peg$e78 = peg$literalExpectation("long-report-id", true);
-  const peg$e79 = peg$literalExpectation("exported-to", true);
-  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
-  const peg$e81 = peg$literalExpectation("exportedTo", true);
-  const peg$e82 = peg$literalExpectation("exchange-rate", true);
-  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  const peg$e85 = peg$literalExpectation("group-from", true);
-  const peg$e86 = peg$literalExpectation("group-expenses", true);
-  const peg$e87 = peg$literalExpectation("group-total", true);
-  const peg$e88 = peg$literalExpectation("group-card", true);
-  const peg$e89 = peg$literalExpectation("group-feed", true);
-  const peg$e90 = peg$literalExpectation("group-bank-account", true);
-  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  const peg$e93 = peg$literalExpectation("group-category", true);
-  const peg$e94 = peg$literalExpectation("group-tag", true);
-  const peg$e95 = peg$literalExpectation("group-merchant", true);
-  const peg$e96 = peg$literalExpectation("group-month", true);
-  const peg$e97 = peg$literalExpectation("group-week", true);
-  const peg$e98 = peg$literalExpectation("group-year", true);
-  const peg$e99 = peg$literalExpectation("group-quarter", true);
-  const peg$e100 = peg$otherExpectation("operator");
-  const peg$e101 = peg$literalExpectation("*:", false);
-  const peg$e102 = peg$literalExpectation("!=", false);
-  const peg$e103 = peg$literalExpectation(">=", false);
-  const peg$e104 = peg$literalExpectation(">", false);
-  const peg$e105 = peg$literalExpectation("<=", false);
-  const peg$e106 = peg$literalExpectation("<", false);
-  const peg$e107 = peg$otherExpectation("word");
-  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
-  const peg$e110 = peg$otherExpectation("quote");
-  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
-  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
-  const peg$e114 = peg$literalExpectation("\u201C", false);
-  const peg$e115 = peg$literalExpectation("\u201D", false);
-  const peg$e116 = peg$literalExpectation("\"", false);
-  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
-  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e121 = peg$classExpectation([","], false, false, false);
-  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
-
-  function peg$f0(filters) {    return applyDefaults(filters);  }
-  function peg$f1(head, tail) {
-    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-      .filter(Boolean)
-      .filter((filter) => filter.right);
-    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-    if (!filtersWithoutDefaults.length) {
-      return null;
-    }
-
-    const keywords = filtersWithoutDefaults.filter(
-      (filter) =>
-        filter.left === "keyword" || filter.right?.left === "keyword"
-    );
-    const nonKeywords = filtersWithoutDefaults.filter(
-      (filter) =>
-        filter.left !== "keyword" && filter.right?.left !== "keyword"
-    );
-
-    const keywordFilter = buildFilter(
-      "eq",
-      "keyword",
-      keywords
-        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-        .flat()
-    );
-    if (keywordFilter.right.length > 0) {
-      nonKeywords.push(keywordFilter);
-    }
-    return nonKeywords.reduce((result, filter) =>
-      buildFilter("and", result, filter)
-    );
-  }
-  function peg$f2(key, op, value) {
-    updateDefaultValues(key, value);
-    return {...buildFilter(op, key, value), isDefault: true};
-  }
-  function peg$f3(value) {
-    //handle no-breaking space
-    let word;
-    if (Array.isArray(value)) {
-      word = value.join("");
-    } else {
-      word = value;
-    }
-    return buildFilter("eq", "keyword", word);
-  }
-  function peg$f4(neg, field, op, values) {
-    expectingNestedQuote = false; nameOperator = false;
+  var peg$FAILED = {};
+  var peg$source = options.grammarSource;
+
+  var peg$startRuleFunctions = { query: peg$parsequery };
+  var peg$startRuleFunction = peg$parsequery;
+
+  var peg$c0 = "-";
+  var peg$c1 = "report-field";
+  var peg$c2 = "reportfield";
+  var peg$c3 = ",";
+  var peg$c4 = "date";
+  var peg$c5 = "amount";
+  var peg$c6 = "merchant";
+  var peg$c7 = "description";
+  var peg$c8 = "reportid";
+  var peg$c9 = "report-id";
+  var peg$c10 = "keyword";
+  var peg$c11 = "in";
+  var peg$c12 = "currency";
+  var peg$c13 = "groupCurrency";
+  var peg$c14 = "group-currency";
+  var peg$c15 = "tag";
+  var peg$c16 = "category";
+  var peg$c17 = "to";
+  var peg$c18 = "exporter";
+  var peg$c19 = "payer";
+  var peg$c20 = "taxrate";
+  var peg$c21 = "tax-rate";
+  var peg$c22 = "cardID";
+  var peg$c23 = "card";
+  var peg$c24 = "from";
+  var peg$c25 = "attendee";
+  var peg$c26 = "expenseType";
+  var peg$c27 = "expense-type";
+  var peg$c28 = "withdrawalType";
+  var peg$c29 = "withdrawal-type";
+  var peg$c30 = "withdrawalid";
+  var peg$c31 = "withdrawal-id";
+  var peg$c32 = "billable";
+  var peg$c33 = "reimbursable";
+  var peg$c34 = "type";
+  var peg$c35 = "status";
+  var peg$c36 = "sortBy";
+  var peg$c37 = "sort-by";
+  var peg$c38 = "sortOrder";
+  var peg$c39 = "sort-order";
+  var peg$c40 = "policyID";
+  var peg$c41 = "workspace";
+  var peg$c42 = "submitted";
+  var peg$c43 = "approved";
+  var peg$c44 = "paid";
+  var peg$c45 = "exported";
+  var peg$c46 = "posted";
+  var peg$c47 = "withdrawn";
+  var peg$c48 = "groupby";
+  var peg$c49 = "group-by";
+  var peg$c50 = "limit";
+  var peg$c51 = "feed";
+  var peg$c52 = "title";
+  var peg$c53 = "assignee";
+  var peg$c54 = "createdby";
+  var peg$c55 = "created-by";
+  var peg$c56 = "action";
+  var peg$c57 = "total";
+  var peg$c58 = "has";
+  var peg$c59 = "is";
+  var peg$c60 = "purchaseamount";
+  var peg$c61 = "purchase-amount";
+  var peg$c62 = "purchasecurrency";
+  var peg$c63 = "purchase-currency";
+  var peg$c64 = "columns";
+  var peg$c65 = "view";
+  var peg$c66 = "per-diem";
+  var peg$c67 = "drafts";
+  var peg$c68 = "draft";
+  var peg$c69 = "original-amount";
+  var peg$c70 = "tax";
+  var peg$c71 = "policy-name";
+  var peg$c72 = "bank-account";
+  var peg$c73 = "long-report-id";
+  var peg$c74 = "exported-to";
+  var peg$c75 = "exportedto";
+  var peg$c76 = "exchange-rate";
+  var peg$c77 = "reimbursable-total";
+  var peg$c78 = "non-reimbursable-total";
+  var peg$c79 = "group-from";
+  var peg$c80 = "group-expenses";
+  var peg$c81 = "group-total";
+  var peg$c82 = "group-card";
+  var peg$c83 = "group-feed";
+  var peg$c84 = "group-bank-account";
+  var peg$c85 = "group-withdrawn";
+  var peg$c86 = "group-withdrawal-id";
+  var peg$c87 = "group-category";
+  var peg$c88 = "group-tag";
+  var peg$c89 = "group-merchant";
+  var peg$c90 = "group-month";
+  var peg$c91 = "group-week";
+  var peg$c92 = "group-year";
+  var peg$c93 = "group-quarter";
+  var peg$c94 = "*:";
+  var peg$c95 = "!=";
+  var peg$c96 = ">=";
+  var peg$c97 = ">";
+  var peg$c98 = "<=";
+  var peg$c99 = "<";
+  var peg$c100 = "\u201C";
+  var peg$c101 = "\u201D";
+  var peg$c102 = "\"";
+
+  var peg$r0 = /^[^ \t\r\n\xA0]/;
+  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  var peg$r2 = /^[:=]/;
+  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r4 = /^[ \t\r\n\xA0]/;
+  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  var peg$r6 = /^["\u201C-\u201D]/;
+  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  var peg$r9 = /^[a-zA-Z0-9]/;
+  var peg$r10 = /^[ \t\n\r\xA0]/;
+  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  var peg$r12 = /^[,]/;
+  var peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
+  var peg$e1 = peg$literalExpectation("-", false);
+  var peg$e2 = peg$literalExpectation("report-field", true);
+  var peg$e3 = peg$literalExpectation("reportfield", true);
+  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
+  var peg$e5 = peg$anyExpectation();
+  var peg$e6 = peg$otherExpectation("key");
+  var peg$e7 = peg$otherExpectation("default key");
+  var peg$e8 = peg$literalExpectation(",", false);
+  var peg$e9 = peg$literalExpectation("date", true);
+  var peg$e10 = peg$literalExpectation("amount", true);
+  var peg$e11 = peg$literalExpectation("merchant", true);
+  var peg$e12 = peg$literalExpectation("description", true);
+  var peg$e13 = peg$literalExpectation("reportid", true);
+  var peg$e14 = peg$literalExpectation("report-id", true);
+  var peg$e15 = peg$literalExpectation("keyword", true);
+  var peg$e16 = peg$literalExpectation("in", true);
+  var peg$e17 = peg$literalExpectation("currency", true);
+  var peg$e18 = peg$literalExpectation("groupCurrency", false);
+  var peg$e19 = peg$literalExpectation("group-currency", true);
+  var peg$e20 = peg$literalExpectation("tag", true);
+  var peg$e21 = peg$literalExpectation("category", true);
+  var peg$e22 = peg$literalExpectation("to", true);
+  var peg$e23 = peg$literalExpectation("exporter", true);
+  var peg$e24 = peg$literalExpectation("payer", true);
+  var peg$e25 = peg$literalExpectation("taxRate", true);
+  var peg$e26 = peg$literalExpectation("tax-rate", true);
+  var peg$e27 = peg$literalExpectation("cardID", false);
+  var peg$e28 = peg$literalExpectation("card", true);
+  var peg$e29 = peg$literalExpectation("from", true);
+  var peg$e30 = peg$literalExpectation("attendee", true);
+  var peg$e31 = peg$literalExpectation("expenseType", false);
+  var peg$e32 = peg$literalExpectation("expense-type", true);
+  var peg$e33 = peg$literalExpectation("withdrawalType", false);
+  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e35 = peg$literalExpectation("withdrawalID", true);
+  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e37 = peg$literalExpectation("billable", true);
+  var peg$e38 = peg$literalExpectation("reimbursable", true);
+  var peg$e39 = peg$literalExpectation("type", true);
+  var peg$e40 = peg$literalExpectation("status", true);
+  var peg$e41 = peg$literalExpectation("sortBy", false);
+  var peg$e42 = peg$literalExpectation("sort-by", true);
+  var peg$e43 = peg$literalExpectation("sortOrder", false);
+  var peg$e44 = peg$literalExpectation("sort-order", true);
+  var peg$e45 = peg$literalExpectation("policyID", false);
+  var peg$e46 = peg$literalExpectation("workspace", true);
+  var peg$e47 = peg$literalExpectation("submitted", true);
+  var peg$e48 = peg$literalExpectation("approved", true);
+  var peg$e49 = peg$literalExpectation("paid", true);
+  var peg$e50 = peg$literalExpectation("exported", true);
+  var peg$e51 = peg$literalExpectation("posted", true);
+  var peg$e52 = peg$literalExpectation("withdrawn", true);
+  var peg$e53 = peg$literalExpectation("groupBy", true);
+  var peg$e54 = peg$literalExpectation("group-by", true);
+  var peg$e55 = peg$literalExpectation("limit", true);
+  var peg$e56 = peg$literalExpectation("feed", true);
+  var peg$e57 = peg$literalExpectation("title", true);
+  var peg$e58 = peg$literalExpectation("assignee", true);
+  var peg$e59 = peg$literalExpectation("createdBy", true);
+  var peg$e60 = peg$literalExpectation("created-by", true);
+  var peg$e61 = peg$literalExpectation("action", true);
+  var peg$e62 = peg$literalExpectation("total", true);
+  var peg$e63 = peg$literalExpectation("has", true);
+  var peg$e64 = peg$literalExpectation("is", true);
+  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e66 = peg$literalExpectation("purchase-amount", true);
+  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e68 = peg$literalExpectation("purchase-currency", true);
+  var peg$e69 = peg$literalExpectation("columns", true);
+  var peg$e70 = peg$literalExpectation("view", true);
+  var peg$e71 = peg$literalExpectation("per-diem", true);
+  var peg$e72 = peg$literalExpectation("drafts", true);
+  var peg$e73 = peg$literalExpectation("draft", true);
+  var peg$e74 = peg$literalExpectation("original-amount", true);
+  var peg$e75 = peg$literalExpectation("tax", true);
+  var peg$e76 = peg$literalExpectation("policy-name", true);
+  var peg$e77 = peg$literalExpectation("bank-account", true);
+  var peg$e78 = peg$literalExpectation("long-report-id", true);
+  var peg$e79 = peg$literalExpectation("exported-to", true);
+  var peg$e80 = peg$classExpectation([":", "="], false, false);
+  var peg$e81 = peg$literalExpectation("exportedTo", true);
+  var peg$e82 = peg$literalExpectation("exchange-rate", true);
+  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e85 = peg$literalExpectation("group-from", true);
+  var peg$e86 = peg$literalExpectation("group-expenses", true);
+  var peg$e87 = peg$literalExpectation("group-total", true);
+  var peg$e88 = peg$literalExpectation("group-card", true);
+  var peg$e89 = peg$literalExpectation("group-feed", true);
+  var peg$e90 = peg$literalExpectation("group-bank-account", true);
+  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e93 = peg$literalExpectation("group-category", true);
+  var peg$e94 = peg$literalExpectation("group-tag", true);
+  var peg$e95 = peg$literalExpectation("group-merchant", true);
+  var peg$e96 = peg$literalExpectation("group-month", true);
+  var peg$e97 = peg$literalExpectation("group-week", true);
+  var peg$e98 = peg$literalExpectation("group-year", true);
+  var peg$e99 = peg$literalExpectation("group-quarter", true);
+  var peg$e100 = peg$otherExpectation("operator");
+  var peg$e101 = peg$literalExpectation("*:", false);
+  var peg$e102 = peg$literalExpectation("!=", false);
+  var peg$e103 = peg$literalExpectation(">=", false);
+  var peg$e104 = peg$literalExpectation(">", false);
+  var peg$e105 = peg$literalExpectation("<=", false);
+  var peg$e106 = peg$literalExpectation("<", false);
+  var peg$e107 = peg$otherExpectation("word");
+  var peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e109 = peg$otherExpectation("whitespace");
+  var peg$e110 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e111 = peg$otherExpectation("quote");
+  var peg$e112 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e113 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e114 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e115 = peg$literalExpectation("\u201C", false);
+  var peg$e116 = peg$literalExpectation("\u201D", false);
+  var peg$e117 = peg$literalExpectation("\"", false);
+  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e119 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e121 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e122 = peg$classExpectation([","], false, false);
+  var peg$e123 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+
+  var peg$f0 = function(filters) { return applyDefaults(filters); };
+  var peg$f1 = function(head, tail) {
+      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+        .filter(Boolean)
+        .filter((filter) => filter.right);
+      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+      if (!filtersWithoutDefaults.length) {
+        return null;
+      }
+
+      const keywords = filtersWithoutDefaults.filter(
+        (filter) =>
+          filter.left === "keyword" || filter.right?.left === "keyword"
+      );
+      const nonKeywords = filtersWithoutDefaults.filter(
+        (filter) =>
+          filter.left !== "keyword" && filter.right?.left !== "keyword"
+      );
+
+      const keywordFilter = buildFilter(
+        "eq",
+        "keyword",
+        keywords
+          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+          .flat()
+      );
+      if (keywordFilter.right.length > 0) {
+        nonKeywords.push(keywordFilter);
+      }
+      return nonKeywords.reduce((result, filter) =>
+        buildFilter("and", result, filter)
+      );
+    };
+  var peg$f2 = function(key, op, value) {
+      updateDefaultValues(key, value);
+      return {...buildFilter(op, key, value), isDefault: true};
+    };
+  var peg$f3 = function(value) {
+      //handle no-breaking space
+      let word;
+      if (Array.isArray(value)) {
+        word = value.join("");
+      } else {
+        word = value;
+      }
+      return buildFilter("eq", "keyword", word);
+    };
+  var peg$f4 = function(neg, field, op, values) {
+      expectingNestedQuote = false; nameOperator = false;
 
-    const key = field;
-    let operator = op;
+      const key = field;
+      let operator = op;
 
-    // Apply negation only when "-" is present and the key can be negated
-    if (neg && !nonNegatableKeys.has(key)) {
-      if (operator === "eq") {
-        operator = "neq";
+      // Apply negation only when "-" is present and the key can be negated
+      if (neg && !nonNegatableKeys.has(key)) {
+        if (operator === "eq") {
+          operator = "neq";
+        }
       }
-    }
 
-    return buildFilter(operator, key, values);
-  }
-  function peg$f5(rest) {
-    const suffix = rest.replaceAll(/^-+/g, "");
-    return "reportField-" + (suffix ? suffix : "");
-  }
-  function peg$f6(k) {
-    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-    return k;
-  }
-  function peg$f7(parts, empty) {
-    const value = parts.flat().filter(Boolean).map((word) => {
-      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-        return word.slice(1, -1);
+      return buildFilter(operator, key, values);
+    };
+  var peg$f5 = function(rest) {
+      const suffix = rest.replaceAll(/^-+/g, "");
+      return "reportField-" + (suffix ? suffix : "");
+    };
+  var peg$f6 = function(k) {
+      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+      return k;
+    };
+  var peg$f7 = function(parts, empty) {
+      const value = parts.flat().filter(Boolean).map((word) => {
+        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+          return word.slice(1, -1);
+        }
+        return word;
+      });
+      if (value.length > 1) {
+        return value.filter((word) => word.length > 0);
       }
-      return word;
-    });
-    if (value.length > 1) {
-      return value.filter((word) => word.length > 0);
-    }
-    return value[0];
-  }
-  function peg$f8() {    return "date";  }
-  function peg$f9() {    return "amount";  }
-  function peg$f10() {    return "merchant";  }
-  function peg$f11() {    return "description";  }
-  function peg$f12() {    return "reportID";  }
-  function peg$f13() {    return "keyword";  }
-  function peg$f14() {    return "in";  }
-  function peg$f15() {    return "currency";  }
-  function peg$f16() {    return "groupCurrency";  }
-  function peg$f17() {    return "tag";  }
-  function peg$f18() {    return "category";  }
-  function peg$f19() {    return "to";  }
-  function peg$f20() {    return "exporter";  }
-  function peg$f21() {    return "payer";  }
-  function peg$f22() {    return "taxRate";  }
-  function peg$f23() {    return "cardID";  }
-  function peg$f24() {    return "from";  }
-  function peg$f25() {return "attendee"  }
-  function peg$f26() {    return "expenseType";  }
-  function peg$f27() {    return "withdrawalType";  }
-  function peg$f28() {    return "withdrawalID";  }
-  function peg$f29() {    return "billable";  }
-  function peg$f30() {    return "reimbursable";  }
-  function peg$f31() {    return "type";  }
-  function peg$f32() {    return "status";  }
-  function peg$f33() {    return "sortBy";  }
-  function peg$f34() {    return "sortOrder";  }
-  function peg$f35() {    return "policyID";  }
-  function peg$f36() {    return "submitted";  }
-  function peg$f37() {    return "approved";  }
-  function peg$f38() {    return "paid";  }
-  function peg$f39() {    return "exported";  }
-  function peg$f40() {    return "posted";  }
-  function peg$f41() {    return "withdrawn";  }
-  function peg$f42() {    return "groupBy";  }
-  function peg$f43() {    return "limit";  }
-  function peg$f44() {    return "feed";  }
-  function peg$f45() {    return "title";  }
-  function peg$f46() {    return "assignee";  }
-  function peg$f47() {    return "createdBy";  }
-  function peg$f48() {    return "action";  }
-  function peg$f49() {return "total";  }
-  function peg$f50() {return "has";  }
-  function peg$f51() {return "is";  }
-  function peg$f52() {return "purchaseAmount"  }
-  function peg$f53() {return "purchaseCurrency"  }
-  function peg$f54() {
-    isColumnsContext = true;
-    return "columns";
-  }
-  function peg$f55() {return "view"  }
-  function peg$f56() {    return isColumnsContext;  }
-  function peg$f57() {    return "perDiem";  }
-  function peg$f58() {    return "drafts";  }
-  function peg$f59() {    return "originalamount";  }
-  function peg$f60() {    return "taxAmount";  }
-  function peg$f61() {    return "taxrate";  }
-  function peg$f62() {    return "policyname";  }
-  function peg$f63() {    return "withdrawalID";  }
-  function peg$f64() {    return "bankAccount";  }
-  function peg$f65() {    return "reportID";  }
-  function peg$f66() {    return "base62ReportID";  }
-  function peg$f67() {    return "exportedto";  }
-  function peg$f68() {    return "exportedTo";  }
-  function peg$f69() {    return "exportedTo";  }
-  function peg$f70() {    return "exchangeRate";  }
-  function peg$f71() {    return "reimbursableTotal";  }
-  function peg$f72() {    return "nonReimbursableTotal";  }
-  function peg$f73() {    return "groupFrom";  }
-  function peg$f74() {    return "groupExpenses";  }
-  function peg$f75() {    return "groupTotal";  }
-  function peg$f76() {    return "groupCard";  }
-  function peg$f77() {    return "groupFeed";  }
-  function peg$f78() {    return "groupBankAccount";  }
-  function peg$f79() {    return "groupWithdrawn";  }
-  function peg$f80() {    return "groupWithdrawalID";  }
-  function peg$f81() {    return "groupCategory";  }
-  function peg$f82() {    return "groupTag";  }
-  function peg$f83() {    return "groupMerchant";  }
-  function peg$f84() {    return "groupmonth";  }
-  function peg$f85() {    return "groupweek";  }
-  function peg$f86() {    return "groupyear";  }
-  function peg$f87() {    return "groupquarter";  }
-  function peg$f88() {    return "contains";  }
-  function peg$f89() {    return "eq";  }
-  function peg$f90() {    return "neq";  }
-  function peg$f91() {    return "gte";  }
-  function peg$f92() {    return "gt";  }
-  function peg$f93() {    return "lte";  }
-  function peg$f94() {    return "lt";  }
-  function peg$f95(o) {
-    if (nameOperator) {
-      expectingNestedQuote = (o === "eq" || o === "contains");
-    }
-    isColumnsContext = false;
-    return o;
-  }
-  function peg$f96(chars) {    return chars.join("").trim();  }
-  function peg$f97() {    
-     isColumnsContext = false;
-     return "and";
-  }
-  function peg$f98() {    return expectingNestedQuote;  }
-  function peg$f99(start, inner, end) {    //handle no-breaking space
-         return [...start, '"', ...inner, '"', ...end].join("");
-  }
-  function peg$f100(start) {return "“"  }
-  function peg$f101(start) {return "”"  }
-  function peg$f102(start) {return "\""  }
-  function peg$f103(start, inner, end) {
+      return value[0];
+    };
+  var peg$f8 = function() { return "date"; };
+  var peg$f9 = function() { return "amount"; };
+  var peg$f10 = function() { return "merchant"; };
+  var peg$f11 = function() { return "description"; };
+  var peg$f12 = function() { return "reportID"; };
+  var peg$f13 = function() { return "keyword"; };
+  var peg$f14 = function() { return "in"; };
+  var peg$f15 = function() { return "currency"; };
+  var peg$f16 = function() { return "groupCurrency"; };
+  var peg$f17 = function() { return "tag"; };
+  var peg$f18 = function() { return "category"; };
+  var peg$f19 = function() { return "to"; };
+  var peg$f20 = function() { return "exporter"; };
+  var peg$f21 = function() { return "payer"; };
+  var peg$f22 = function() { return "taxRate"; };
+  var peg$f23 = function() { return "cardID"; };
+  var peg$f24 = function() { return "from"; };
+  var peg$f25 = function() {return "attendee"};
+  var peg$f26 = function() { return "expenseType"; };
+  var peg$f27 = function() { return "withdrawalType"; };
+  var peg$f28 = function() { return "withdrawalID"; };
+  var peg$f29 = function() { return "billable"; };
+  var peg$f30 = function() { return "reimbursable"; };
+  var peg$f31 = function() { return "type"; };
+  var peg$f32 = function() { return "status"; };
+  var peg$f33 = function() { return "sortBy"; };
+  var peg$f34 = function() { return "sortOrder"; };
+  var peg$f35 = function() { return "policyID"; };
+  var peg$f36 = function() { return "submitted"; };
+  var peg$f37 = function() { return "approved"; };
+  var peg$f38 = function() { return "paid"; };
+  var peg$f39 = function() { return "exported"; };
+  var peg$f40 = function() { return "posted"; };
+  var peg$f41 = function() { return "withdrawn"; };
+  var peg$f42 = function() { return "groupBy"; };
+  var peg$f43 = function() { return "limit"; };
+  var peg$f44 = function() { return "feed"; };
+  var peg$f45 = function() { return "title"; };
+  var peg$f46 = function() { return "assignee"; };
+  var peg$f47 = function() { return "createdBy"; };
+  var peg$f48 = function() { return "action"; };
+  var peg$f49 = function() {return "total"; };
+  var peg$f50 = function() {return "has"; };
+  var peg$f51 = function() {return "is"; };
+  var peg$f52 = function() {return "purchaseAmount"};
+  var peg$f53 = function() {return "purchaseCurrency"};
+  var peg$f54 = function() {
+  isColumnsContext = true;
+  return "columns";
+};
+  var peg$f55 = function() {return "view"};
+  var peg$f56 = function() { return isColumnsContext; };
+  var peg$f57 = function() { return "perDiem"; };
+  var peg$f58 = function() { return "drafts"; };
+  var peg$f59 = function() { return "originalamount"; };
+  var peg$f60 = function() { return "taxAmount"; };
+  var peg$f61 = function() { return "taxrate"; };
+  var peg$f62 = function() { return "policyname"; };
+  var peg$f63 = function() { return "withdrawalID"; };
+  var peg$f64 = function() { return "bankAccount"; };
+  var peg$f65 = function() { return "reportID"; };
+  var peg$f66 = function() { return "base62ReportID"; };
+  var peg$f67 = function() { return "exportedto"; };
+  var peg$f68 = function() { return "exportedTo"; };
+  var peg$f69 = function() { return "exportedTo"; };
+  var peg$f70 = function() { return "exchangeRate"; };
+  var peg$f71 = function() { return "reimbursableTotal"; };
+  var peg$f72 = function() { return "nonReimbursableTotal"; };
+  var peg$f73 = function() { return "groupFrom"; };
+  var peg$f74 = function() { return "groupExpenses"; };
+  var peg$f75 = function() { return "groupTotal"; };
+  var peg$f76 = function() { return "groupCard"; };
+  var peg$f77 = function() { return "groupFeed"; };
+  var peg$f78 = function() { return "groupBankAccount"; };
+  var peg$f79 = function() { return "groupWithdrawn"; };
+  var peg$f80 = function() { return "groupWithdrawalID"; };
+  var peg$f81 = function() { return "groupCategory"; };
+  var peg$f82 = function() { return "groupTag"; };
+  var peg$f83 = function() { return "groupMerchant"; };
+  var peg$f84 = function() { return "groupmonth"; };
+  var peg$f85 = function() { return "groupweek"; };
+  var peg$f86 = function() { return "groupyear"; };
+  var peg$f87 = function() { return "groupquarter"; };
+  var peg$f88 = function() { return "contains"; };
+  var peg$f89 = function() { return "eq"; };
+  var peg$f90 = function() { return "neq"; };
+  var peg$f91 = function() { return "gte"; };
+  var peg$f92 = function() { return "gt"; };
+  var peg$f93 = function() { return "lte"; };
+  var peg$f94 = function() { return "lt"; };
+  var peg$f95 = function(o) {
+      if (nameOperator) {
+        expectingNestedQuote = (o === "eq" || o === "contains");
+      }
+      isColumnsContext = false;
+      return o;
+  };
+  var peg$f96 = function(chars) { return chars.join("").trim(); };
+  var peg$f97 = function() { 
+  isColumnsContext = false;
+  return "and";
+};
+  var peg$f98 = function() { return expectingNestedQuote; };
+  var peg$f99 = function(start, inner, end) { //handle no-breaking space
+      return [...start, '"', ...inner, '"', ...end].join("");
+    };
+  var peg$f100 = function(start) {return "“"};
+  var peg$f101 = function(start) {return "”"};
+  var peg$f102 = function(start) {return "\""};
+  var peg$f103 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-  }
-  let peg$currPos = options.peg$currPos | 0;
-  let peg$savedPos = peg$currPos;
-  const peg$posDetailsCache = [{ line: 1, column: 1 }];
-  let peg$maxFailPos = peg$currPos;
-  let peg$maxFailExpected = options.peg$maxFailExpected || [];
-  let peg$silentFails = options.peg$silentFails | 0;
+};
+  var peg$currPos = options.peg$currPos | 0;
+  var peg$savedPos = peg$currPos;
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+  var peg$maxFailPos = peg$currPos;
+  var peg$maxFailExpected = options.peg$maxFailExpected || [];
+  var peg$silentFails = options.peg$silentFails | 0;
 
-  let peg$result;
+  var peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -642,7 +654,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos,
+      end: peg$currPos
     };
   }
 
@@ -670,20 +682,12 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
-  function peg$getUnicode(pos = peg$currPos) {
-    const cp = input.codePointAt(pos);
-    if (cp === undefined) {
-      return "";
-    }
-    return String.fromCodePoint(cp);
-  }
-
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text, ignoreCase };
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
-    return { type: "class", parts, inverted, ignoreCase, unicode };
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
   }
 
   function peg$anyExpectation() {
@@ -695,12 +699,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description };
+    return { type: "other", description: description };
   }
 
   function peg$computePosDetails(pos) {
-    let details = peg$posDetailsCache[pos];
-    let p;
+    var details = peg$posDetailsCache[pos];
+    var p;
 
     if (details) {
       return details;
@@ -715,7 +719,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column,
+        column: details.column
       };
 
       while (p < pos) {
@@ -736,21 +740,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    const startPosDetails = peg$computePosDetails(startPos);
-    const endPosDetails = peg$computePosDetails(endPos);
+    var startPosDetails = peg$computePosDetails(startPos);
+    var endPosDetails = peg$computePosDetails(endPos);
 
-    const res = {
+    var res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column,
+        column: startPosDetails.column
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column,
-      },
+        column: endPosDetails.column
+      }
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -784,7 +788,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -800,7 +804,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    let s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -840,7 +844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -861,7 +865,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -892,7 +896,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -934,7 +938,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -975,12 +979,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -988,7 +992,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1096,7 +1100,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1237,7 +1241,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1251,7 +1255,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1296,7 +1300,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1419,12 +1423,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1439,12 +1443,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1459,12 +1463,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1479,12 +1483,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1499,11 +1503,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1512,7 +1516,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1528,12 +1532,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1548,12 +1552,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1568,12 +1572,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1588,7 +1592,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1601,7 +1605,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += (14);
+        peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1617,12 +1621,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1637,12 +1641,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1657,12 +1661,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1677,12 +1681,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1697,12 +1701,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1717,11 +1721,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1730,7 +1734,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += (8);
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1746,7 +1750,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1759,7 +1763,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += (4);
+        peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1775,12 +1779,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1795,12 +1799,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1815,7 +1819,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1828,7 +1832,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += (12);
+        peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1844,7 +1848,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1857,7 +1861,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += (15);
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1873,11 +1877,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1886,7 +1890,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += (13);
+        peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1902,12 +1906,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1922,12 +1926,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1942,12 +1946,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1962,12 +1966,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1982,7 +1986,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1995,7 +1999,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += (7);
+        peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2011,7 +2015,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2024,7 +2028,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += (10);
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2040,7 +2044,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2053,7 +2057,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2069,12 +2073,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2089,12 +2093,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2109,12 +2113,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2129,12 +2133,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2149,12 +2153,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2169,12 +2173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2189,11 +2193,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2202,7 +2206,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += (8);
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2218,12 +2222,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2238,12 +2242,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2258,12 +2262,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2278,12 +2282,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2298,11 +2302,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2311,7 +2315,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += (10);
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2327,12 +2331,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2347,12 +2351,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2367,12 +2371,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2387,12 +2391,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2407,11 +2411,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2420,7 +2424,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += (15);
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2436,11 +2440,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += (16);
+      peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2449,7 +2453,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += (17);
+        peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2465,12 +2469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2485,12 +2489,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2505,7 +2509,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2539,7 +2543,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    let s0;
+    var s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2625,12 +2629,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2662,12 +2666,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2675,7 +2679,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += (5);
+        peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2708,12 +2712,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += (15);
+      peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2745,12 +2749,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2782,12 +2786,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2819,12 +2823,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2856,12 +2860,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2893,12 +2897,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2930,12 +2934,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2967,12 +2971,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3004,12 +3008,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3041,7 +3045,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3067,12 +3071,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3103,7 +3107,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3136,12 +3140,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3173,12 +3177,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += (18);
+      peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3210,12 +3214,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += (22);
+      peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3247,12 +3251,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3284,12 +3288,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3321,12 +3325,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3358,12 +3362,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3395,12 +3399,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3432,12 +3436,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += (18);
+      peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3469,12 +3473,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += (15);
+      peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3506,12 +3510,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += (19);
+      peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3543,12 +3547,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3580,12 +3584,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3617,12 +3621,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3654,12 +3658,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3691,12 +3695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3728,12 +3732,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3765,12 +3769,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3802,7 +3806,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3918,7 +3922,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
@@ -3932,7 +3936,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3973,7 +3977,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselogicalAnd() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -3985,7 +3989,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parse_() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3994,7 +3998,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -4003,16 +4007,18 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e109); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -4043,7 +4049,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4053,7 +4059,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4062,7 +4068,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4070,7 +4076,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4079,7 +4085,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e114); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -4088,7 +4094,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -4096,7 +4102,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e112); }
+        if (peg$silentFails === 0) { peg$fail(peg$e113); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4130,14 +4136,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4147,7 +4153,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4156,7 +4162,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4164,7 +4170,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4173,7 +4179,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e114); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -4193,7 +4199,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e114); }
+            if (peg$silentFails === 0) { peg$fail(peg$e115); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
@@ -4224,7 +4230,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e115); }
+              if (peg$silentFails === 0) { peg$fail(peg$e116); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -4255,7 +4261,7 @@ function peg$parse(input, options) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e116); }
+                if (peg$silentFails === 0) { peg$fail(peg$e117); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -4278,7 +4284,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4298,7 +4304,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e114); }
+              if (peg$silentFails === 0) { peg$fail(peg$e115); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -4329,7 +4335,7 @@ function peg$parse(input, options) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e115); }
+                if (peg$silentFails === 0) { peg$fail(peg$e116); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -4360,7 +4366,7 @@ function peg$parse(input, options) {
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e116); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e117); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
@@ -4392,14 +4398,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4407,7 +4413,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4436,7 +4442,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4445,7 +4451,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4454,7 +4460,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e118); }
       }
     }
     s2 = [];
@@ -4463,7 +4469,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4472,7 +4478,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e119); }
       }
     }
     s3 = [];
@@ -4481,7 +4487,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e119); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4490,7 +4496,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e119); }
+        if (peg$silentFails === 0) { peg$fail(peg$e120); }
       }
     }
     s4 = peg$parseoperator();
@@ -4509,7 +4515,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e120); }
+        if (peg$silentFails === 0) { peg$fail(peg$e121); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4518,7 +4524,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e120); }
+          if (peg$silentFails === 0) { peg$fail(peg$e121); }
         }
       }
       s2 = peg$currPos;
@@ -4565,7 +4571,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e121); }
+          if (peg$silentFails === 0) { peg$fail(peg$e122); }
         }
       }
     }
@@ -4574,14 +4580,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e122); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4761,35 +4767,29 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
-  function peg$throw() {
-    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
-      peg$fail(peg$endExpectation());
-    }
-
-    throw peg$buildStructuredError(
-      peg$maxFailExpected,
-      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
-      peg$maxFailPos < input.length
-        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
-    );
-  }
   if (options.peg$library) {
     return /** @type {any} */ ({
       peg$result,
       peg$currPos,
       peg$FAILED,
       peg$maxFailExpected,
-      peg$maxFailPos,
-      peg$success,
-      peg$throw: peg$success ? undefined : peg$throw,
+      peg$maxFailPos
     });
   }
-  if (peg$success) {
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
     return peg$result;
   } else {
-    peg$throw();
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
   }
 }
 

From c033992b00661b7c3b78f10f4b44ec59ea11f118 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 21 May 2026 13:47:33 +0700
Subject: [PATCH 004/781] chore(search): fix parser CI checks

---
 src/libs/SearchParser/baseRules.peggy     | 2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 9b7c2dbf5136..27534cf1337c 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -179,7 +179,7 @@ filterOperator
 
 alphanumeric "word" = chars:[^ ,\t\n\r\xA0]+ { return chars.join("").trim(); } //handle no-breaking space
 
-logicalAnd = _ { 
+logicalAnd = _ {
   isColumnsContext = false;
   return "and";
 }
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index d867b2fae82f..a2b2973af823 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2920,7 +2920,7 @@ describe('SearchQueryUtils', () => {
             expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
         });
 
-        it('should preserve group drilldown merchant exact match', () => {
+        it('should preserve group drill-down merchant exact match', () => {
             const queryJSON = buildSearchQueryJSON('type:expense merchant:I');
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');

From 234ff702f184688ad91c126abd43fcdfbebae5bb Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 27 Jun 2026 05:48:16 +0700
Subject: [PATCH 005/781] feat(search): add merchant match type selector

Add an Equal to / Contains match-type selector under the Merchant
advanced filter (RHP page and popover).

- Default Equal to -> serializes as merchant:value; Contains -> merchant*:value
- Restore the operator from the query on reopen so saved searches round-trip
- Preserve negated merchant as eq (-merchant:value -> neq)
- Add dedicated search.filters.merchant translation keys (en source of truth)
- Unit tests for build and round-trip behavior
---
 .../SearchAdvancedFiltersContent.tsx          | 17 ++++--
 .../TextInputFilterContent.tsx                | 56 +++++++++++++++----
 .../TextInputFilterContentPopupWrapper.tsx    |  3 +-
 src/languages/en.ts                           |  5 ++
 src/libs/SearchQueryUtils.ts                  | 29 ++++++++--
 .../TextInputFilterContentPageWrapper.tsx     |  3 +-
 src/types/form/SearchAdvancedFiltersForm.ts   |  8 ++-
 tests/unit/Search/SearchQueryUtilsTest.ts     | 51 ++++++++++++++++-
 8 files changed, 145 insertions(+), 27 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index d4365dbb5518..37792e1245cb 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -3,6 +3,7 @@ import {isAmountFilterKey, isDateFilterKey} from '@libs/SearchUIUtils';
 import type {SearchFilter} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {FilterComponentsProps} from '..';
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {CommonFilterContentProps} from './CommonFilterContent';
@@ -10,7 +11,7 @@ import type {DateFilterContentProps} from './DateFilterContent';
 import type {ReportFieldFilterContentProps} from './ReportFieldFilterContent';
 import type {TextInputFilterContentProps} from './TextInputFilterContent';
 
-type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'filterKey' | 'value' | 'onChange'>;
+type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'filterKey' | 'value' | 'merchantOperator' | 'onChange'>;
 type AmountFilterContentWrapperProps = Pick<AmountFilterContentProps, 'filterKey' | 'value' | 'onChange'>;
 type DateFilterContentWrapperProps = Pick<DateFilterContentProps, 'filterKey' | 'value' | 'hasFeed' | 'onChange'>;
 type ReportFieldFilterContentWrapperProps = Pick<ReportFieldFilterContentProps, 'values' | 'onChange'>;
@@ -38,9 +39,11 @@ function getFilterFormValue<K extends FilterComponentsProps['filterKey']>(filter
 
 function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready, components, onChange}: SearchAdvancedFiltersContentProps) {
     const {Text: TextFilter, Amount: AmountFilter, Date: DateFilter, ReportField: ReportFieldFilter, Common: CommonFilter} = components;
+    const isMerchantFilter = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
 
     if (
-        filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT ||
+        isMerchantFilter ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD ||
@@ -49,10 +52,16 @@ function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready,
     ) {
         return (
             <TextFilter
-                key={filterKey}
+                key={`${filterKey}-${values?.[filterKey] ?? ''}-${isMerchantFilter ? merchantOperator : ''}`}
                 filterKey={filterKey}
                 value={values?.[filterKey]}
-                onChange={(newValue) => onChange({[filterKey]: newValue})}
+                merchantOperator={isMerchantFilter ? merchantOperator : undefined}
+                onChange={(newValue, newMerchantOperator) =>
+                    onChange({
+                        [filterKey]: newValue,
+                        ...(isMerchantFilter ? {[FILTER_KEYS.MERCHANT_OPERATOR]: newMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO} : {}),
+                    })
+                }
             />
         );
     }
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 71082b1d8ad6..a95b43b49c6b 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -2,9 +2,12 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
+import RadioButtonWithLabel from '@components/RadioButtonWithLabel';
+import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type CONST from '@src/CONST';
+import CONST from '@src/CONST';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 import FilterComponents from '..';
 
 type TextInputFilterContentProps = {
@@ -19,31 +22,60 @@ type TextInputFilterContentProps = {
     largeButton?: boolean;
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
-    onChange: (value: string | undefined) => void;
+    merchantOperator?: MerchantMatchType;
+    onChange: (value: string | undefined, merchantOperator?: MerchantMatchType) => void;
 };
 
-function TextInputFilterContent({filterKey, value: initialValue, autoFocus, largeButton, style, onChange}: TextInputFilterContentProps) {
+function TextInputFilterContent({filterKey, value: initialValue, autoFocus, largeButton, style, merchantOperator: initialMerchantOperator, onChange}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
+    const shouldShowMerchantMatchType = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const merchantMatchTypeItems: Array<{value: MerchantMatchType; label: string}> = [
+        {
+            value: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            label: translate('search.filters.merchant.equalTo'),
+        },
+        {
+            value: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            label: translate('search.filters.merchant.contains'),
+        },
+    ];
 
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
-            <FilterComponents
-                value={value}
-                policyIDs={undefined}
-                filterKey={filterKey}
-                policyIDQuery={undefined}
-                autoFocus={autoFocus}
-                onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
-            />
+            <View>
+                <FilterComponents
+                    value={value}
+                    policyIDs={undefined}
+                    filterKey={filterKey}
+                    policyIDQuery={undefined}
+                    autoFocus={autoFocus}
+                    onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
+                />
+                {shouldShowMerchantMatchType && (
+                    <View style={[styles.mt4, styles.ph5]}>
+                        <Text style={[styles.textLabelSupporting, styles.mb2]}>{translate('search.filters.merchant.matchType')}</Text>
+                        {merchantMatchTypeItems.map((item) => (
+                            <RadioButtonWithLabel
+                                key={item.value}
+                                isChecked={item.value === merchantOperator}
+                                style={styles.optionRowCompact}
+                                onPress={() => setMerchantOperator(item.value)}
+                                label={item.label}
+                            />
+                        ))}
+                    </View>
+                )}
+            </View>
             <Button
                 style={[styles.ph5, styles.pb5]}
                 success
                 large={largeButton}
                 text={translate('common.confirm')}
                 pressOnEnter
-                onPress={() => onChange(value)}
+                onPress={() => onChange(value, shouldShowMerchantMatchType ? merchantOperator : undefined)}
             />
         </View>
     );
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
index 3457b897b376..0df2f0712ea3 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
@@ -3,12 +3,13 @@ import type {TextInputFilterContentWrapperProps} from '@components/Search/Filter
 import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-function TextInputFilterContentPopupWrapper({filterKey, value, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPopupWrapper({filterKey, value, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
     const styles = useThemeStyles();
     return (
         <TextInputFilterContent
             filterKey={filterKey}
             value={value}
+            merchantOperator={merchantOperator}
             style={[styles.pt5]}
             onChange={onChange}
         />
diff --git a/src/languages/en.ts b/src/languages/en.ts
index e937737c3ae1..ee5199999f8d 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8371,6 +8371,11 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
+            merchant: {
+                matchType: 'Match type',
+                equalTo: 'Equal to',
+                contains: 'Contains',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Travel invoicing',
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index eb3f62e5c5d2..3415d4f4abff 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -34,7 +34,16 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS, {ALLOWED_TYPE_FILTERS, AMOUNT_FILTER_KEYS, DATE_FILTER_KEYS} from '@src/types/form/SearchAdvancedFiltersForm';
-import type {ExpenseTypeValue, ExpenseTypeValues, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {
+    ExpenseTypeValue,
+    ExpenseTypeValues,
+    HasFilterValue,
+    HasFilterValues,
+    IsFilterValue,
+    IsFilterValues,
+    MerchantMatchType,
+    SearchAdvancedFiltersKey,
+} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SearchDataTypes, SearchResultDataType} from '@src/types/onyx/SearchResults';
 import {getCardFeedsForDisplay} from './CardFeedUtils';
@@ -69,6 +78,12 @@ const operatorToCharMap = {
     [CONST.SEARCH.SYNTAX_OPERATORS.OR]: ' ' as const,
 };
 
+const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+
+function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
+    return operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : DEFAULT_MERCHANT_OPERATOR;
+}
+
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
 const VALID_EXPENSE_TYPES = new Set(Object.values(CONST.SEARCH.TRANSACTION_TYPE));
 const VALID_HAS_TYPES = new Set(Object.values(CONST.SEARCH.HAS_VALUES));
@@ -791,7 +806,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     }
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
-    const {type, status, groupBy, view, columns, limit, ...otherFilters} = supportedFilterValues;
+    const {type, status, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -857,12 +872,9 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    // For merchant filters:
-                    // - Non-negated: use *: (contains) for partial matching
-                    // - Negated: use : (eq) so parser correctly converts to neq operator
                     const operator =
                         filterKey === FILTER_KEYS.MERCHANT && !isNegated
-                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            ? operatorToCharMap[getMerchantOperator(merchantOperator)]
                             : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
@@ -1098,6 +1110,11 @@ function buildFilterFormValuesFromQuery(
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE) {
             filtersForm[key as typeof filterKey] = filterValues.join(',');
+            if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated) {
+                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS)
+                    ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                    : DEFAULT_MERCHANT_OPERATOR;
+            }
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION) {
             const actionValue = filterValues.join(',');
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
index 82eee048b215..4d3aeeff98ef 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
@@ -2,11 +2,12 @@ import React from 'react';
 import type {TextInputFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
 import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
 
-function TextInputFilterContentPageWrapper({filterKey, value, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPageWrapper({filterKey, value, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
     return (
         <TextInputFilterContent
             filterKey={filterKey}
             value={value}
+            merchantOperator={merchantOperator}
             autoFocus
             largeButton
             onChange={onChange}
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 91887f8d83df..c01b3091c657 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -98,6 +98,7 @@ const FILTER_KEYS = {
 
     MERCHANT_NOT: 'merchantNot',
     MERCHANT: 'merchant',
+    MERCHANT_OPERATOR: 'merchantOperator',
 
     DESCRIPTION_NOT: 'descriptionNot',
     DESCRIPTION: 'description',
@@ -200,6 +201,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.EXPENSE_TYPE_NOT,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -373,6 +375,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.POLICY_ID,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -467,6 +470,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.POLICY_ID,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -593,6 +597,7 @@ type IsFilterValues = IsFilterValue[];
 type BooleanValue = ValueOf<typeof CONST.SEARCH.BOOLEAN>;
 type ExpenseTypeValue = ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
 type ExpenseTypeValues = ExpenseTypeValue[];
+type MerchantMatchType = typeof CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO | typeof CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
 
 type SearchAdvancedFiltersForm = Form<
     SearchAdvancedFiltersKey,
@@ -669,6 +674,7 @@ type SearchAdvancedFiltersForm = Form<
 
         [FILTER_KEYS.MERCHANT]: string;
         [FILTER_KEYS.MERCHANT_NOT]: string;
+        [FILTER_KEYS.MERCHANT_OPERATOR]: MerchantMatchType;
 
         [FILTER_KEYS.DESCRIPTION]: string;
         [FILTER_KEYS.DESCRIPTION_NOT]: string;
@@ -758,6 +764,6 @@ type SearchAdvancedFiltersForm = Form<
         Record<ReportFieldNegatedKey, string>
 >;
 
-export type {SearchAdvancedFiltersForm, SearchAdvancedFiltersKey, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, ExpenseTypeValue, ExpenseTypeValues};
+export type {SearchAdvancedFiltersForm, SearchAdvancedFiltersKey, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, ExpenseTypeValue, ExpenseTypeValues, MerchantMatchType};
 export default FILTER_KEYS;
 export {DATE_FILTER_KEYS, ALLOWED_TYPE_FILTERS, AMOUNT_FILTER_KEYS};
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index cd3adbe59668..02a2505a054f 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -226,7 +226,20 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+        });
+
+        test('builds contains merchant query when merchant operator is contains', () => {
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Amazon',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
         test('currencies and categories', () => {
@@ -495,7 +508,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc'});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {
@@ -863,6 +876,40 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterFormValuesFromQuery', () => {
+        test('restores exact merchant operator from query', () => {
+            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant:Uber');
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+
+            expect(result).toEqual({
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            });
+        });
+
+        test('restores contains merchant operator from query', () => {
+            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant*:Uber');
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+
+            expect(result).toEqual({
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            });
+        });
+
         test('category filter includes empty values', () => {
             const policyID = generatePolicyID();
             const queryString = 'sortBy:date sortOrder:desc type:expense category:none,Uncategorized,Maintenance';

From f5b67138ab75cacd65568d33741c15c9ebda55e2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 27 Jun 2026 06:03:27 +0700
Subject: [PATCH 006/781] chore(i18n): generate locale translations for
 merchant match type keys

Translations for search.filters.merchant.{matchType,equalTo,contains}
generated for de, es, fr, it, ja, nl, pl, pt-BR, zh-hans.
---
 src/languages/de.ts      | 1 +
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 4 +++-
 src/languages/it.ts      | 1 +
 src/languages/ja.ts      | 1 +
 src/languages/nl.ts      | 1 +
 src/languages/pl.ts      | 1 +
 src/languages/pt-BR.ts   | 1 +
 src/languages/zh-hans.ts | 1 +
 9 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 27f21933473b..2759feaa5128 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8347,6 +8347,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
+            merchant: {matchType: 'Übereinstimmungstyp', equalTo: 'Gleich wie', contains: 'Enthält'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 8c40e566d5ef..7d1f2d9cccf3 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1763,7 +1763,6 @@ const translations: TranslationDeepObject<typeof en> = {
                 }
             },
             [CONST.NEXT_STEP.MESSAGE_KEY.WAITING_TO_MARK_AS_DONE]: (actor, actorType, _eta, _etaType) => {
-                // eslint-disable-next-line default-case
                 switch (actorType) {
                     case CONST.NEXT_STEP.ACTOR_TYPE.CURRENT_USER:
                         return `Esperando a que <strong>tú</strong> lo marques como listo.`;
@@ -8166,6 +8165,7 @@ ${amount} para ${merchant} - ${date}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
+            merchant: {matchType: 'Tipo de coincidencia', equalTo: 'Igual a', contains: 'Contiene'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5b95484f7ba5..7ee7771f6935 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1,6 +1,7 @@
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
+ * / (_ / -_) _ \/ -_) __/ _ \`/ __/ -_) _  /
  * \___/\__/_//_/\__/_/  \_,_/\__/\__/\_,_/
  *
  * This file was automatically generated. Please consider these alternatives before manually editing it:
@@ -862,7 +863,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'C\u2019est ici que vous suivrez vos dépenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'C’est ici que vous suivrez vos dépenses',
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -8380,6 +8381,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
+            merchant: {matchType: 'Type de correspondance', equalTo: 'Égal à', contains: 'Contient'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index e2e74784ef3d..0e89d5a9a265 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8336,6 +8336,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
+            merchant: {matchType: 'Tipo di corrispondenza', equalTo: 'Uguale a', contains: 'Contiene'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 0e0e69b707b4..d1c6964b0679 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8239,6 +8239,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
+            merchant: {matchType: 'マッチタイプ', equalTo: '等しい', contains: '含む'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index bc07604c0eca..670ec6f3a78f 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8303,6 +8303,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
+            merchant: {matchType: 'Overeenkomsttype', equalTo: 'Gelijk aan', contains: 'Bevat'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 06dceafe2c84..51e6376585a5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8297,6 +8297,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
+            merchant: {matchType: 'Typ dopasowania', equalTo: 'Równe', contains: 'Zawiera'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 772b8bc3d855..07db96301344 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8295,6 +8295,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
+            merchant: {matchType: 'Tipo de correspondência', equalTo: 'Igual a', contains: 'Contém'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 18036ce4bfba..8ed2ff9dbb56 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8076,6 +8076,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
+            merchant: {matchType: '匹配类型', equalTo: '等于', contains: '包含'},
         },
         display: {
             label: '显示',

From 24cc2e10a18508ffd5e827fbee2b8dbc596ab4d6 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 14:46:09 +0700
Subject: [PATCH 007/781] fix: use SingleSelectListItem for merchant match type
 selector

Match the Amount filter pattern by rendering the Equal to / Contains
match-type options with SingleSelectListItem so the selection control
sits on the right side, instead of RadioButtonWithLabel on the left.

Addresses review feedback on PR #83733.
---
 .../TextInputFilterContent.tsx                | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index a95b43b49c6b..0f1bb2b14a5e 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -2,7 +2,8 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
-import RadioButtonWithLabel from '@components/RadioButtonWithLabel';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -32,14 +33,16 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
     const [value, setValue] = useState(initialValue);
     const shouldShowMerchantMatchType = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    const merchantMatchTypeItems: Array<{value: MerchantMatchType; label: string}> = [
+    const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
         {
-            value: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            label: translate('search.filters.merchant.equalTo'),
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('search.filters.merchant.equalTo'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
         {
-            value: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            label: translate('search.filters.merchant.contains'),
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            text: translate('search.filters.merchant.contains'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
     ];
 
@@ -55,15 +58,15 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                     onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
                 />
                 {shouldShowMerchantMatchType && (
-                    <View style={[styles.mt4, styles.ph5]}>
-                        <Text style={[styles.textLabelSupporting, styles.mb2]}>{translate('search.filters.merchant.matchType')}</Text>
+                    <View style={styles.mt4}>
+                        <Text style={[styles.textLabelSupporting, styles.mb2, styles.ph5]}>{translate('search.filters.merchant.matchType')}</Text>
                         {merchantMatchTypeItems.map((item) => (
-                            <RadioButtonWithLabel
-                                key={item.value}
-                                isChecked={item.value === merchantOperator}
-                                style={styles.optionRowCompact}
-                                onPress={() => setMerchantOperator(item.value)}
-                                label={item.label}
+                            <SingleSelectListItem
+                                key={item.keyForList}
+                                item={item}
+                                showTooltip={false}
+                                keyForList={item.keyForList}
+                                onSelectRow={() => setMerchantOperator(item.keyForList)}
                             />
                         ))}
                     </View>

From 3e69172372ee5961133af01c46c29efc131c63ba Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 18:25:40 +0700
Subject: [PATCH 008/781] fix: inline merchant filter input under match type
 option

Follow the Amount filter pattern: render Equal to / Contains as
SingleSelectListItem rows with the merchant text input shown inline
under the selected option, and drop the standalone "Match type" label.
Remove the now-unused merchant.matchType translation key.

Addresses review feedback on PR #83733.
---
 .../TextInputFilterContent.tsx                | 49 ++++++++++---------
 src/languages/de.ts                           |  2 +-
 src/languages/en.ts                           |  1 -
 src/languages/es.ts                           |  2 +-
 src/languages/fr.ts                           |  2 +-
 src/languages/it.ts                           |  2 +-
 src/languages/ja.ts                           |  2 +-
 src/languages/nl.ts                           |  2 +-
 src/languages/pl.ts                           |  2 +-
 src/languages/pt-BR.ts                        |  2 +-
 src/languages/zh-hans.ts                      |  2 +-
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 0f1bb2b14a5e..e177df0e5f63 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,10 +1,9 @@
-import React, {useState} from 'react';
+import React, {Fragment, useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 import type {ListItem} from '@components/SelectionList/types';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
@@ -46,31 +45,33 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
         },
     ];
 
+    const filterInput = (
+        <FilterComponents
+            value={value}
+            policyIDs={undefined}
+            filterKey={filterKey}
+            policyIDQuery={undefined}
+            autoFocus={autoFocus}
+            onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
+        />
+    );
+
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
             <View>
-                <FilterComponents
-                    value={value}
-                    policyIDs={undefined}
-                    filterKey={filterKey}
-                    policyIDQuery={undefined}
-                    autoFocus={autoFocus}
-                    onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
-                />
-                {shouldShowMerchantMatchType && (
-                    <View style={styles.mt4}>
-                        <Text style={[styles.textLabelSupporting, styles.mb2, styles.ph5]}>{translate('search.filters.merchant.matchType')}</Text>
-                        {merchantMatchTypeItems.map((item) => (
-                            <SingleSelectListItem
-                                key={item.keyForList}
-                                item={item}
-                                showTooltip={false}
-                                keyForList={item.keyForList}
-                                onSelectRow={() => setMerchantOperator(item.keyForList)}
-                            />
-                        ))}
-                    </View>
-                )}
+                {shouldShowMerchantMatchType
+                    ? merchantMatchTypeItems.map((item) => (
+                          <Fragment key={item.keyForList}>
+                              <SingleSelectListItem
+                                  item={item}
+                                  showTooltip={false}
+                                  keyForList={item.keyForList}
+                                  onSelectRow={() => setMerchantOperator(item.keyForList)}
+                              />
+                              {item.isSelected && <View style={styles.mt2}>{filterInput}</View>}
+                          </Fragment>
+                      ))
+                    : filterInput}
             </View>
             <Button
                 style={[styles.ph5, styles.pb5]}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index eb4ee80ff668..7f4ffd0a8279 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8547,7 +8547,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
-            merchant: {matchType: 'Übereinstimmungstyp', equalTo: 'Gleich wie', contains: 'Enthält'},
+            merchant: {equalTo: 'Gleich wie', contains: 'Enthält'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 18ed7ca23e9c..f92487527f75 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8586,7 +8586,6 @@ const translations = {
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
             merchant: {
-                matchType: 'Match type',
                 equalTo: 'Equal to',
                 contains: 'Contains',
             },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 65186900943a..718b49d249fc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8363,7 +8363,7 @@ ${amount} para ${merchant} - ${date}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
-            merchant: {matchType: 'Tipo de coincidencia', equalTo: 'Igual a', contains: 'Contiene'},
+            merchant: {equalTo: 'Igual a', contains: 'Contiene'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 3dc46702a1d6..45e629296578 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8581,7 +8581,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
-            merchant: {matchType: 'Type de correspondance', equalTo: 'Égal à', contains: 'Contient'},
+            merchant: {equalTo: 'Égal à', contains: 'Contient'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 4b5f658d614d..64e645496e68 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8536,7 +8536,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
-            merchant: {matchType: 'Tipo di corrispondenza', equalTo: 'Uguale a', contains: 'Contiene'},
+            merchant: {equalTo: 'Uguale a', contains: 'Contiene'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 8fbc9703bfa2..d0bc697694db 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8435,7 +8435,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
-            merchant: {matchType: 'マッチタイプ', equalTo: '等しい', contains: '含む'},
+            merchant: {equalTo: '等しい', contains: '含む'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 239a73f9fc7f..4170c0e00637 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8507,7 +8507,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
-            merchant: {matchType: 'Overeenkomsttype', equalTo: 'Gelijk aan', contains: 'Bevat'},
+            merchant: {equalTo: 'Gelijk aan', contains: 'Bevat'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3cd0f9c476f2..e82b65680c0e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8496,7 +8496,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
-            merchant: {matchType: 'Typ dopasowania', equalTo: 'Równe', contains: 'Zawiera'},
+            merchant: {equalTo: 'Równe', contains: 'Zawiera'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 9963a60b8fd4..18453779e9ae 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8494,7 +8494,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
-            merchant: {matchType: 'Tipo de correspondência', equalTo: 'Igual a', contains: 'Contém'},
+            merchant: {equalTo: 'Igual a', contains: 'Contém'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c965b1cd7a4d..28d92624b72f 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8265,7 +8265,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
-            merchant: {matchType: '匹配类型', equalTo: '等于', contains: '包含'},
+            merchant: {equalTo: '等于', contains: '包含'},
         },
         display: {
             label: '显示',

From d7ae22f03ac2b5bdbb46fa8f93ace45802418a4b Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 18:31:48 +0700
Subject: [PATCH 009/781] fix: match Amount filter spacing for merchant input
 (mv2)

---
 .../FilterComponents/AdvancedFilters/TextInputFilterContent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index e177df0e5f63..60659650c787 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -68,7 +68,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                                   keyForList={item.keyForList}
                                   onSelectRow={() => setMerchantOperator(item.keyForList)}
                               />
-                              {item.isSelected && <View style={styles.mt2}>{filterInput}</View>}
+                              {item.isSelected && <View style={styles.mv2}>{filterInput}</View>}
                           </Fragment>
                       ))
                     : filterInput}

From f4dca8ec1bd5af196768b6c41ec9bb7cd62dd6f2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 21:04:23 +0700
Subject: [PATCH 010/781] refactor: align merchant filter input with Amount via
 containerStyles

Thread an optional containerStyles prop through FilterComponents to the
shared text input instead of wrapping it in a margin View, so the
merchant input uses the exact same [ph4, mv2] container as the Amount
filter input.
---
 .../TextInputFilterContent.tsx                |  3 ++-
 .../Search/FilterComponents/index.tsx         | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 60659650c787..05a01e631d47 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -52,6 +52,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
             filterKey={filterKey}
             policyIDQuery={undefined}
             autoFocus={autoFocus}
+            textInputContainerStyle={shouldShowMerchantMatchType ? [styles.ph4, styles.mv2] : undefined}
             onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
         />
     );
@@ -68,7 +69,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                                   keyForList={item.keyForList}
                                   onSelectRow={() => setMerchantOperator(item.keyForList)}
                               />
-                              {item.isSelected && <View style={styles.mv2}>{filterInput}</View>}
+                              {item.isSelected && filterInput}
                           </Fragment>
                       ))
                     : filterInput}
diff --git a/src/components/Search/FilterComponents/index.tsx b/src/components/Search/FilterComponents/index.tsx
index f3f54af44310..5db4a54c637a 100644
--- a/src/components/Search/FilterComponents/index.tsx
+++ b/src/components/Search/FilterComponents/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchFilterCommonProps} from '@components/Search/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -31,6 +32,7 @@ type FilterComponentsProps = SearchFilterCommonProps<SearchAdvancedFiltersForm[F
     type?: SearchDataTypes;
     policyIDs: string[] | undefined;
     policyIDQuery: string[] | undefined;
+    textInputContainerStyle?: StyleProp<ViewStyle>;
 };
 
 type TextInputFilterComponentsProps = {
@@ -43,6 +45,7 @@ type TextInputFilterComponentsProps = {
         | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_ID;
     value: string | undefined;
     autoFocus?: boolean;
+    containerStyles?: StyleProp<ViewStyle>;
     onChange: (value: string) => void;
 };
 
@@ -63,7 +66,7 @@ type MultiSelectFilterComponentsProps = SearchFilterCommonProps<SearchAdvancedFi
     type: SearchDataTypes | undefined;
 };
 
-function TextInputFilterComponents({filterKey, value, autoFocus, onChange}: TextInputFilterComponentsProps) {
+function TextInputFilterComponents({filterKey, value, autoFocus, containerStyles, onChange}: TextInputFilterComponentsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
@@ -78,7 +81,7 @@ function TextInputFilterComponents({filterKey, value, autoFocus, onChange}: Text
             onChangeText={onChange}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
+            containerStyles={containerStyles ?? [styles.ph5]}
         />
     );
 }
@@ -123,7 +126,20 @@ function MultiSelectFilterComponents({filterKey, value = [], type = CONST.SEARCH
     );
 }
 
-function FilterComponents({filterKey, value, type, policyIDs, policyIDQuery, selectionListTextInputStyle, selectionListStyle, autoFocus, ready, footer, onChange}: FilterComponentsProps) {
+function FilterComponents({
+    filterKey,
+    value,
+    type,
+    policyIDs,
+    policyIDQuery,
+    selectionListTextInputStyle,
+    selectionListStyle,
+    textInputContainerStyle,
+    autoFocus,
+    ready,
+    footer,
+    onChange,
+}: FilterComponentsProps) {
     switch (filterKey) {
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID:
@@ -178,6 +194,7 @@ function FilterComponents({filterKey, value, type, policyIDs, policyIDQuery, sel
                     filterKey={filterKey}
                     value={typeof value === 'string' ? value : undefined}
                     autoFocus={autoFocus}
+                    containerStyles={textInputContainerStyle}
                     onChange={onChange}
                 />
             );

From c8393b960e37039b761240194b943eb2900b2356 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 3 Jul 2026 15:42:23 +0700
Subject: [PATCH 011/781] style: apply oxfmt to merge-resolved search filter
 files

---
 .../AdvancedFilters/SearchAdvancedFiltersContent.tsx  |  2 ++
 .../AdvancedFilters/TextInputFilterContent.tsx        | 11 ++++++++---
 src/components/Search/FilterComponents/index.tsx      |  3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index 06738d67a96f..024954190788 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -4,7 +4,9 @@ import type {SearchFilter} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
 import React from 'react';
+
 import type {FilterComponentsProps} from '..';
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {CommonFilterContentProps} from './CommonFilterContent';
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 05a01e631d47..5b4cac8b4f9c 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,13 +1,18 @@
-import React, {Fragment, useState} from 'react';
-import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 import type {ListItem} from '@components/SelectionList/types';
+
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+
 import CONST from '@src/CONST';
 import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import React, {Fragment, useState} from 'react';
+import {View} from 'react-native';
+
 import FilterComponents from '..';
 
 type TextInputFilterContentProps = {
diff --git a/src/components/Search/FilterComponents/index.tsx b/src/components/Search/FilterComponents/index.tsx
index 92fd5c35e037..6e1bd8456aca 100644
--- a/src/components/Search/FilterComponents/index.tsx
+++ b/src/components/Search/FilterComponents/index.tsx
@@ -1,4 +1,3 @@
-import type {StyleProp, ViewStyle} from 'react-native';
 import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchFilterCommonProps} from '@components/Search/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -14,6 +13,8 @@ import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 
+import type {StyleProp, ViewStyle} from 'react-native';
+
 import React from 'react';
 
 import BankAccountSelector from './BankAccountSelector';

From 30b6796b7f02422341f9b231ce920d86a88d5880 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 14 Jul 2026 12:27:01 +0700
Subject: [PATCH 012/781] fix(search): escape contains operator in keyword
 queries

---
 src/libs/SearchQueryUtils.ts              | 2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 699e556e8760..8765101b3d55 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -176,7 +176,7 @@ function sanitizeSearchValue(str: string) {
     return str;
 }
 
-const syntaxRegex = new RegExp(`^-?(${Object.values(CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS).join('|')}|report-?field(-.+)+)[:><=].+$`);
+const syntaxRegex = new RegExp(`^-?(${Object.values(CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS).join('|')}|report-?field(-.+)+)(?:\\*:|[:><=]).+$`);
 /**
  * Escapes each keyword that would otherwise be re-interpreted as query syntax by wrapping it in quotes.
  * A keyword that looks like a filter (e.g. `type:expense`) becomes `"type:expense"` so it is matched as a
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 1b6ad1542920..917e86bc8b11 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -3564,6 +3564,14 @@ describe('SearchQueryUtils', () => {
             expect(result).toContain('type:trip');
         });
 
+        it('should escape input that uses the contains operator so it is treated as a keyword', () => {
+            const currentQueryJSON = buildSearchQueryJSON('type:trip status:all');
+
+            const result = currentQueryJSON ? getKeywordQueryWithCurrentSearchContext('merchant*:Uber', currentQueryJSON) : '';
+            expect(result).toContain('"merchant*:Uber"');
+            expect(result).toContain('type:trip');
+        });
+
         it('should escape input that uses a comparison operator with a filter key', () => {
             const currentQueryJSON = buildSearchQueryJSON('type:trip status:all');
 

From 95d9396721327850bdce2686e2fb38ed0ae42f65 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 17 Jul 2026 16:37:19 +0700
Subject: [PATCH 013/781] fix(search): reject negated contains filters

---
 src/libs/SearchParser/autocompleteParser.js    |  5 +++++
 src/libs/SearchParser/autocompleteParser.peggy |  5 +++++
 src/libs/SearchParser/searchParser.js          |  4 ++++
 src/libs/SearchParser/searchParser.peggy       |  4 ++++
 tests/unit/Search/SearchQueryUtilsTest.ts      | 10 ++++++++++
 tests/unit/SearchAutocompleteParserTest.ts     |  7 +++++++
 tests/unit/SearchParserTest.ts                 | 14 ++++++++++++++
 7 files changed, 49 insertions(+)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 68cbf57a776b..f48d6ac5fdf9 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -443,6 +443,11 @@ function peg$parse(input, options) {
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
+      if (neg && op === "contains") {
+        autocomplete = null;
+        return;
+      }
+
       if (!value) {
         autocomplete = {
           key,
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 9efaadf55527..b9150c18e3cf 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -40,6 +40,11 @@ defaultFilter
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
+      if (neg && op === "contains") {
+        autocomplete = null;
+        return;
+      }
+
       if (!value) {
         autocomplete = {
           key,
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 5df4f76dc8e3..6fbc2ec6f300 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -496,6 +496,10 @@ function peg$parse(input, options) {
       const key = field;
       let operator = op;
 
+      if (neg && operator === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
+
       // Apply negation only when "-" is present and the key can be negated
       if (neg && !nonNegatableKeys.has(key)) {
         if (operator === "eq") {
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 57389645633f..bfd87038eab8 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -237,6 +237,10 @@ standardFilter
       const key = field;
       let operator = op;
 
+      if (neg && operator === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
+
       // Apply negation only when "-" is present and the key can be negated
       if (neg && !nonNegatableKeys.has(key)) {
         if (operator === "eq") {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index c7ff7e08b476..cfe80c7fc4ca 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2133,6 +2133,16 @@ describe('SearchQueryUtils', () => {
         });
     });
 
+    describe('contains filter parsing', () => {
+        it('treats negated contains as a keyword', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense -merchant*:Uber');
+            const keywordFilter = queryJSON?.flatFilters.find((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD);
+
+            expect(keywordFilter?.filters.some((filter) => filter.value === '-merchant*:Uber')).toBe(true);
+            expect(queryJSON?.flatFilters.some((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT)).toBe(false);
+        });
+    });
+
     describe('getFilterDisplayValue', () => {
         const mockCardList = {};
         const mockCardFeeds = {};
diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
index 4e7184965662..22b8aaabf1a9 100644
--- a/tests/unit/SearchAutocompleteParserTest.ts
+++ b/tests/unit/SearchAutocompleteParserTest.ts
@@ -335,6 +335,13 @@ const tests = [
             ],
         },
     },
+    {
+        query: 'type:expense -merchant*:Uber',
+        expected: {
+            autocomplete: null,
+            ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
+        },
+    },
 ];
 
 const limitAutocompleteTests = [
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index f53542dc1f91..f9fa5ee09cf8 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -999,6 +999,20 @@ const tests = [
  */
 
 const keywordTests = [
+    {
+        query: '-merchant*:Uber',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['-merchant*:Uber'],
+            },
+        },
+    },
     {
         query: '" " "  "', // Multiple whitespaces wrapped in quotes
         expected: {

From b263311678dd70246e309003777f5f486ae49c29 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 00:49:54 +0430
Subject: [PATCH 014/781] Make report, expense, and member values copyable

---
 src/components/AvatarWithDisplayName.tsx      |  7 +++
 .../DisplayNames/DisplayNamesTooltipItem.tsx  | 11 ++++-
 .../DisplayNames/DisplayNamesWithTooltip.tsx  |  8 +++-
 .../DisplayNamesWithoutTooltip.tsx            | 20 +++++++-
 src/components/DisplayNames/index.tsx         |  4 ++
 src/components/DisplayNames/types.ts          |  3 ++
 src/components/MenuItem.tsx                   | 22 ++++++++-
 .../MoneyRequestReportTransactionItem.tsx     | 15 +++++-
 .../ReportActionItem/MoneyRequestView.tsx     |  3 +-
 src/components/ReportSearchHeader/index.tsx   |  5 +-
 src/components/ReportSearchHeader/types.ts    |  3 ++
 .../ListItem/BaseListItemHeader.tsx           |  2 +
 .../ListItem/CardListItemHeader.tsx           |  4 ++
 .../Search/SearchList/ListItem/DateCell.tsx   |  1 +
 .../ExpenseReportListItemRowNarrow.tsx        | 28 +++++++----
 .../SearchList/ListItem/GroupHeader.tsx       | 19 +++++++-
 .../ListItem/MemberListItemHeader.tsx         |  4 ++
 .../ListItem/ReportListItemHeader.tsx         |  2 +
 .../Search/SearchList/ListItem/TextCell.tsx   |  1 +
 .../SearchList/ListItem/TextWithIconCell.tsx  |  1 +
 .../Search/SearchList/ListItem/TotalCell.tsx  |  1 +
 .../ListItem/TransactionGroupListExpanded.tsx | 20 +++++++-
 .../ListItem/TransactionGroupListItem.tsx     | 19 +++++++-
 .../TransactionListItemNarrow.tsx             | 18 ++++++-
 .../TransactionListItemWide.tsx               | 13 ++++-
 .../SearchList/ListItem/UserInfoCell.tsx      | 10 ++--
 .../ListItem/WithdrawalIDListItemHeader.tsx   |  5 ++
 .../SearchList/ListItem/WorkspaceCell.tsx     |  1 +
 .../SelectionList/ListItem/BaseListItem.tsx   | 16 ++++++-
 src/components/Table/TableRow.tsx             | 17 ++++++-
 .../WorkspaceMembersTableRow.tsx              |  4 ++
 src/components/TextWithTooltip/index.tsx      | 12 ++++-
 src/components/TextWithTooltip/selection.ts   | 47 +++++++++++++++++++
 src/components/TextWithTooltip/types.ts       |  3 ++
 .../DataCells/CategoryCell.tsx                |  1 +
 .../DataCells/MerchantCell.tsx                |  1 +
 .../TransactionItemRow/DataCells/TagCell.tsx  |  1 +
 .../TransactionItemRow/DataCells/TaxCell.tsx  |  1 +
 .../DataCells/TotalCell.tsx                   |  1 +
 .../TransactionItemRow/DataCells/TypeCell.tsx |  1 +
 .../TransactionItemRowWide.tsx                |  5 +-
 src/libs/SelectionScraper/index.ts            |  6 +++
 42 files changed, 329 insertions(+), 37 deletions(-)
 create mode 100644 src/components/TextWithTooltip/selection.ts

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index e9a82d30c3b2..c51c6ec288fe 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -93,6 +93,9 @@ type AvatarWithDisplayNameProps = {
     /** The style of the custom display name text */
     customDisplayNameStyle?: TextStyle;
 
+    /** Whether the displayed report title should be directly selectable/copyable */
+    isDisplayNameCopyable?: boolean;
+
     /** The style of the parent navigation subtitle text */
     parentNavigationSubtitleTextStyles?: StyleProp<TextStyle>;
 
@@ -111,6 +114,7 @@ function getCustomDisplayName(
     regularStyle: TextStyle[],
     isAnonymous: boolean,
     isMoneyRequestOrReport: boolean,
+    isCopyable: boolean,
 ): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
     const isIOUOrInvoice = report?.type === CONST.REPORT.TYPE.IOU || report?.type === CONST.REPORT.TYPE.INVOICE;
@@ -172,6 +176,7 @@ function getCustomDisplayName(
             numberOfLines={numberOfLines}
             textStyles={textStyles}
             shouldUseFullTitle={shouldUseFullTitleProp}
+            isCopyable={isCopyable}
         />
     );
 }
@@ -188,6 +193,7 @@ function AvatarWithDisplayName({
     avatarBorderColor: avatarBorderColorProp,
     shouldDisplayStatus = false,
     customDisplayNameStyle = {},
+    isDisplayNameCopyable = false,
     parentNavigationSubtitleTextStyles,
     parentNavigationStatusContainerStyles = {},
 }: AvatarWithDisplayNameProps) {
@@ -290,6 +296,7 @@ function AvatarWithDisplayName({
         [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
         isAnonymous,
         isMoneyRequestOrReport,
+        isDisplayNameCopyable,
     );
 
     const multipleAvatars = (
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 1f67fdd575ef..e0404d09080e 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -35,8 +35,14 @@ type DisplayNamesTooltipItemProps = ForwardedFSClassProps & {
 
     /** Refs to all the names which will be used to correct the horizontal position of the tooltip */
     childRefs: RefObject<RNText[]>;
+
+    /** Whether this display name should be directly selectable/copyable inside pressable rows */
+    isCopyable?: boolean;
 };
 
+// Mark individual participant names when DisplayNames is used as a selectable report title.
+const COPYABLE_TEXT_DATA_SET = {copyableText: true};
+
 function DisplayNamesTooltipItem({
     index = 0,
     getTooltipShiftX = () => 0,
@@ -47,6 +53,7 @@ function DisplayNamesTooltipItem({
     textStyles = [],
     childRefs = {current: []},
     forwardedFSClass,
+    isCopyable = false,
 }: DisplayNamesTooltipItemProps) {
     const styles = useThemeStyles();
     const tooltipIndexBridge = useCallback(() => getTooltipShiftX(index), [getTooltipShiftX, index]);
@@ -71,8 +78,10 @@ function DisplayNamesTooltipItem({
                     // eslint-disable-next-line no-param-reassign
                     childRefs.current[index] = el;
                 }}
-                style={[textStyles, styles.pre]}
+                style={[textStyles, styles.pre, isCopyable && styles.userSelectText]}
                 fsClass={forwardedFSClass}
+                selectable={isCopyable}
+                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
             >
                 {displayName}
             </Text>
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index f56d99f9f08a..3a0b0c22e337 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -16,6 +16,8 @@ import type DisplayNamesProps from './types';
 import DisplayNamesTooltipItem from './DisplayNamesTooltipItem';
 
 type HTMLElementWithText = HTMLElement & RNText;
+// Mark report titles rendered through DisplayNames so grouped search rows can allow native selection.
+const COPYABLE_TEXT_DATA_SET = {copyableText: true};
 
 function DisplayNamesWithToolTip({
     shouldUseFullTitle,
@@ -27,6 +29,7 @@ function DisplayNamesWithToolTip({
     renderAdditionalText,
     forwardedFSClass,
     accessibilityLabel,
+    isCopyable = false,
 }: DisplayNamesProps) {
     const styles = useThemeStyles();
     const containerRef = useRef<HTMLElementWithText>(null);
@@ -67,11 +70,13 @@ function DisplayNamesWithToolTip({
         // Tokenization of string only support prop numberOfLines on Web
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, styles.pRelative]}
+            style={[textStyles, styles.pRelative, isCopyable && styles.userSelectText]}
             numberOfLines={numberOfLines || undefined}
             ref={containerRef}
             testID="DisplayNamesWithToolTip"
             fsClass={forwardedFSClass}
+            selectable={isCopyable}
+            dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
         >
             {shouldUseFullTitle
                 ? formatReportLastMessageText(fullTitle)
@@ -88,6 +93,7 @@ function DisplayNamesWithToolTip({
                               textStyles={textStyles}
                               childRefs={childRefs}
                               forwardedFSClass={forwardedFSClass}
+                              isCopyable={isCopyable}
                           />
                           {index < displayNamesWithTooltips.length - 1 && <Text style={textStyles}>,&nbsp;</Text>}
                           {shouldAddEllipsis && index === displayNamesWithTooltips.length - 1 && <Text style={textStyles}>...</Text>}
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index 57e2315fda22..c00f42085c22 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -23,16 +23,32 @@ type DisplayNamesWithoutTooltipProps = ForwardedFSClassProps & {
 
     /** Overrides the text read by screen readers. */
     accessibilityLabel?: string;
+
+    /** Whether this display name should be directly selectable/copyable inside pressable rows */
+    isCopyable?: boolean;
 };
 
-function DisplayNamesWithoutTooltip({textStyles = [], numberOfLines = 1, fullTitle = '', renderAdditionalText, forwardedFSClass, accessibilityLabel}: DisplayNamesWithoutTooltipProps) {
+// Mark report titles rendered through DisplayNames so grouped search rows can allow native selection.
+const COPYABLE_TEXT_DATA_SET = {copyableText: true};
+
+function DisplayNamesWithoutTooltip({
+    textStyles = [],
+    numberOfLines = 1,
+    fullTitle = '',
+    renderAdditionalText,
+    forwardedFSClass,
+    accessibilityLabel,
+    isCopyable = false,
+}: DisplayNamesWithoutTooltipProps) {
     const styles = useThemeStyles();
     return (
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap]}
+            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap, isCopyable && styles.userSelectText]}
             numberOfLines={numberOfLines}
             fsClass={forwardedFSClass}
+            selectable={isCopyable}
+            dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
         >
             {fullTitle}
             {renderAdditionalText?.()}
diff --git a/src/components/DisplayNames/index.tsx b/src/components/DisplayNames/index.tsx
index c3bb162df6e7..291170f346d4 100644
--- a/src/components/DisplayNames/index.tsx
+++ b/src/components/DisplayNames/index.tsx
@@ -22,6 +22,7 @@ function DisplayNames({
     forwardedFSClass,
     shouldParseFullTitle = true,
     accessibilityLabel,
+    isCopyable = false,
 }: DisplayNamesProps) {
     const {translate} = useLocalize();
     const title = useMemo(() => {
@@ -38,6 +39,7 @@ function DisplayNames({
                 renderAdditionalText={renderAdditionalText}
                 forwardedFSClass={forwardedFSClass}
                 accessibilityLabel={accessibilityLabel}
+                isCopyable={isCopyable}
             />
         );
     }
@@ -52,6 +54,7 @@ function DisplayNames({
                 renderAdditionalText={renderAdditionalText}
                 forwardedFSClass={forwardedFSClass}
                 accessibilityLabel={accessibilityLabel}
+                isCopyable={isCopyable}
             />
         );
     }
@@ -66,6 +69,7 @@ function DisplayNames({
             renderAdditionalText={renderAdditionalText}
             forwardedFSClass={forwardedFSClass}
             accessibilityLabel={accessibilityLabel}
+            isCopyable={isCopyable}
         />
     );
 }
diff --git a/src/components/DisplayNames/types.ts b/src/components/DisplayNames/types.ts
index da9eef83598e..d26178793ddc 100644
--- a/src/components/DisplayNames/types.ts
+++ b/src/components/DisplayNames/types.ts
@@ -53,6 +53,9 @@ type DisplayNamesProps = ForwardedFSClassProps & {
     /** If we should add an ellipsis after the participants list */
     shouldAddEllipsis?: boolean;
 
+    /** Whether this display name should be directly selectable/copyable inside pressable rows */
+    isCopyable?: boolean;
+
     /** Whether to parse HTML in the title */
     shouldParseHtml?: boolean;
 
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index da019c2cd02e..9d8669b870f7 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -59,6 +59,7 @@ import RadioButton from './RadioButton';
 import RenderHTML from './RenderHTML';
 import ReportActionAvatars from './ReportActionAvatars';
 import Text from './Text';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from './TextWithTooltip/selection';
 import EducationalTooltip from './Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from './utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from './utils/getContextMenuAccessibilityProps';
@@ -490,6 +491,9 @@ const getSubscriptAvatarBackgroundColor = (isHovered: boolean, isPressed: boolea
     }
 };
 
+// Mark copyable menu titles so pressable rows and SelectionScraper preserve the selected value.
+const COPYABLE_TEXT_DATA_SET = {copyableText: true};
+
 function MenuItem({
     interactive = true,
     onPress,
@@ -641,6 +645,8 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<View>(null);
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later menu item clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
     useEffect(() => {
         const element = pressableRef.current;
         if (interactive || !element || typeof HTMLElement === 'undefined' || !(element instanceof HTMLElement) || typeof element.onclick === 'undefined') {
@@ -693,6 +699,7 @@ function MenuItem({
             shouldShowBasicTitle ? {} : styles.textStrong,
             numberOfLinesTitle !== 1 ? styles.preWrap : styles.pre,
             interactive && disabled ? {...styles.userSelectNone} : {},
+            copyable ? styles.userSelectText : {},
             styles.ltr,
             isDeleted ? styles.offlineFeedbackDeleted : {},
             shouldBreakWord ? styles.breakWord : {},
@@ -817,6 +824,12 @@ function MenuItem({
             return;
         }
 
+        const shouldSuppressPress = copyable && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         if (event?.type === 'click') {
             (event.currentTarget as HTMLElement).blur();
         }
@@ -879,6 +892,9 @@ function MenuItem({
                         {(isHovered) => (
                             <PressableWithSecondaryInteraction
                                 onPress={shouldCheckActionAllowedOnPress ? callFunctionIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
+                                onMouseDown={(event) => {
+                                    wasMouseDownOnCopyableTextRef.current = copyable && isCopyableTextTarget(event?.target);
+                                }}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
                                 onPressOut={ControlSelection.unblock}
                                 onSecondaryInteraction={copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction}
@@ -1066,7 +1082,11 @@ function MenuItem({
                                                                     <Text
                                                                         style={combinedTitleTextStyle}
                                                                         numberOfLines={numberOfLinesTitle || undefined}
-                                                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled}}
+                                                                        dataSet={{
+                                                                            [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled,
+                                                                            ...(copyable ? COPYABLE_TEXT_DATA_SET : {}),
+                                                                        }}
+                                                                        selectable={copyable}
                                                                         accessibilityRole={titleAccessibilityRole}
                                                                     >
                                                                         {renderTitleContent()}
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 7fcfaccace84..43e0f41d0679 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -2,6 +2,7 @@ import {getButtonRole} from '@components/Button/utils';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
@@ -154,6 +155,8 @@ function MoneyRequestReportTransactionItemBody({
     // keeps the press handler shape identical without ever being mutated on narrow.
     const fallbackEditingOnMouseDownRef = useRef(false);
     const wasEditingOnMouseDownRef = inlineEdit?.wasEditingOnMouseDownRef ?? fallbackEditingOnMouseDownRef;
+    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
 
     useEffect(() => {
         if (!wasRecentlyEditingCell) {
@@ -164,8 +167,10 @@ function MoneyRequestReportTransactionItemBody({
 
     const handleMouseDown = (e?: React.MouseEvent) => {
         wasEditingOnMouseDownRef.current = isEditingCell;
+        const isCopyableTarget = isCopyableTextTarget(e?.target);
+        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
 
-        if (!isEditingCell) {
+        if (!isEditingCell && !isCopyableTarget) {
             e?.preventDefault();
         }
     };
@@ -179,7 +184,13 @@ function MoneyRequestReportTransactionItemBody({
         >
             <PressableWithFeedback
                 key={transaction.transactionID}
-                onPress={() => {
+                onPress={(event) => {
+                    const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+                    wasMouseDownOnCopyableTextRef.current = false;
+                    if (shouldSuppressPress) {
+                        return;
+                    }
+
                     // Prevent row press from firing while a cell is being inline-edited (e.g. pressing Space would otherwise open the expense)
                     // See https://github.com/Expensify/App/issues/88646 for more details
                     if (isEditingCell) {
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index ea759e6ab96c..9f506a8bae33 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -932,7 +932,8 @@ function MoneyRequestView({
 
     const distanceCopyValue = !canEditDistance ? distanceToDisplay : undefined;
     const distanceRateCopyValue = !canEditDistanceRate ? rateToDisplay : undefined;
-    const amountCopyValue = !canEditAmount ? amountTitle : undefined;
+    // Keep the visible amount copyable even when it is editable, so users do not need to open the amount step first.
+    const amountCopyValue = amountTitle || undefined;
     const descriptionHTML = updatedTransactionDescription ?? transactionDescription;
     const descriptionCopyValue = !canEdit && descriptionHTML ? Parser.htmlToText(descriptionHTML) : undefined;
     const merchantCopyValue = !canEditMerchant ? updatedMerchantTitle : undefined;
diff --git a/src/components/ReportSearchHeader/index.tsx b/src/components/ReportSearchHeader/index.tsx
index f6f55518fb32..166d342c7683 100755
--- a/src/components/ReportSearchHeader/index.tsx
+++ b/src/components/ReportSearchHeader/index.tsx
@@ -10,7 +10,7 @@ import {View} from 'react-native';
 
 import type ReportSearchHeaderProps from './types';
 
-function ReportSearchHeader({report, style, transactions, avatarBorderColor}: ReportSearchHeaderProps) {
+function ReportSearchHeader({report, style, transactions, avatarBorderColor, isTitleCopyable = false}: ReportSearchHeaderProps) {
     const styles = useThemeStyles();
     const {isLargeScreenWidth} = useResponsiveLayout();
 
@@ -28,6 +28,8 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor}: Re
                 shouldEnableDetailPageNavigation={false}
                 shouldEnableAvatarNavigation={false}
                 avatarBorderColor={avatarBorderColor}
+                // Keep this opt-in scoped to search rows instead of making all report headers selectable.
+                isDisplayNameCopyable={isTitleCopyable}
                 size={isLargeScreenWidth ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                 customDisplayNameStyle={styles.fontWeightNormal}
                 parentNavigationSubtitleTextStyles={[styles.textLineHeightNormal, styles.minHeight4, styles.mt1, !isLargeScreenWidth && styles.textMicro]}
@@ -38,6 +40,7 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor}: Re
         report,
         transactions,
         avatarBorderColor,
+        isTitleCopyable,
         styles.fontWeightNormal,
         styles.textLineHeightNormal,
         styles.minHeight4,
diff --git a/src/components/ReportSearchHeader/types.ts b/src/components/ReportSearchHeader/types.ts
index 4f13f56947b9..015bf2159253 100644
--- a/src/components/ReportSearchHeader/types.ts
+++ b/src/components/ReportSearchHeader/types.ts
@@ -14,6 +14,9 @@ type ReportSearchHeaderProps = {
 
     /** Color of the secondary avatar border, usually should match the container background */
     avatarBorderColor?: ColorValue;
+
+    /** Whether the displayed report title should be directly selectable/copyable */
+    isTitleCopyable?: boolean;
 };
 
 export default ReportSearchHeaderProps;
diff --git a/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx b/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
index b11cf330ece4..b8c47cfe7c33 100644
--- a/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
@@ -122,6 +122,7 @@ function BaseListItemHeaderImpl({
                     <TextWithTooltip
                         text={displayName}
                         style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                        isCopyable
                     />
                 </View>
             </View>
@@ -168,6 +169,7 @@ function BaseListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={displayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                                    isCopyable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx b/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
index 2d7470ef6d0d..56f353097652 100644
--- a/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
@@ -111,6 +111,7 @@ function CardListItemHeaderImpl({
                         text={cardItem.formattedCardName ?? ''}
                         numberOfLines={2}
                         style={[styles.preWrap]}
+                        isCopyable
                     />
                 </View>
             </View>
@@ -124,6 +125,7 @@ function CardListItemHeaderImpl({
                     text={cardItem.formattedFeedName ?? ''}
                     numberOfLines={2}
                     style={[styles.lineHeightLarge, styles.preWrap]}
+                    isCopyable
                 />
             </View>
         ),
@@ -174,11 +176,13 @@ function CardListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={formattedDisplayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                                    isCopyable
                                 />
                                 <TextWithTooltip
                                     text={cardItem.formattedCardName ?? ''}
                                     numberOfLines={2}
                                     style={[styles.textLabelSupporting, styles.lh16, styles.preWrap]}
+                                    isCopyable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/DateCell.tsx b/src/components/Search/SearchList/ListItem/DateCell.tsx
index 2fb830b873c9..75f805fed389 100644
--- a/src/components/Search/SearchList/ListItem/DateCell.tsx
+++ b/src/components/Search/SearchList/ListItem/DateCell.tsx
@@ -36,6 +36,7 @@ function DateCell({date, showTooltip, isLargeScreenWidth, suffixText, canEdit, o
             text={displayText}
             shouldShowTooltip={showTooltip}
             style={[styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.mutedNormalTextLabel, !!suffixText && styles.flexShrink1]}
+            isCopyable
         />
     );
 
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index cb9f7d1a357a..0bb6edb39d80 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -1,6 +1,6 @@
 import Checkbox from '@components/Checkbox';
 import getExpenseReportRowDisplayValues from '@components/Search/SearchList/ListItem/getExpenseReportRowDisplayValues';
-import Text from '@components/Text';
+import TextWithTooltip from '@components/TextWithTooltip';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
@@ -37,17 +37,29 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
             )}
             <View style={[styles.flexColumn, styles.gap1, styles.flex1]}>
                 <View style={[styles.flexRow, styles.gap2]}>
-                    <Text
+                    <TextWithTooltip
+                        text={item.reportName ?? ''}
                         numberOfLines={2}
                         style={[styles.lh20, styles.flex1]}
-                    >
-                        {item.reportName ?? ''}
-                    </Text>
-                    <Text style={[styles.lh20, styles.flexShrink0, styles.textAlignRight]}>{amountText}</Text>
+                        isCopyable
+                    />
+                    <TextWithTooltip
+                        text={amountText}
+                        style={[styles.lh20, styles.flexShrink0, styles.textAlignRight]}
+                        isCopyable
+                    />
                 </View>
                 <View style={[styles.flexRow, styles.gap2]}>
-                    <Text style={[styles.mutedNormalTextLabel, styles.flex1]}>{formattedDate}</Text>
-                    <Text style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight]}>{expenseCountText}</Text>
+                    <TextWithTooltip
+                        text={formattedDate}
+                        style={[styles.mutedNormalTextLabel, styles.flex1]}
+                        isCopyable
+                    />
+                    <TextWithTooltip
+                        text={expenseCountText}
+                        style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight]}
+                        isCopyable
+                    />
                 </View>
             </View>
         </View>
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index b2d4635acbae..727864ff0441 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -6,6 +6,7 @@ import {useSearchSelectionContext} from '@components/Search/SearchContext';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@components/Search/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -359,6 +360,8 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later group row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -375,6 +378,12 @@ function GroupHeader({
     const shouldDisplayEmptyView = isEmpty && isExpenseReportType;
 
     const handlePress = (event?: ModifiedMouseEvent) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         if (isExpenseReportType) {
             onSelectRow(withOriginalKey(item), transactionPreviewData, event);
         }
@@ -400,7 +409,14 @@ function GroupHeader({
                 isNested
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
-                onMouseDown={(e) => e.preventDefault()}
+                onMouseDown={(e) => {
+                    const isCopyableTarget = isCopyableTextTarget(e?.target);
+                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    if (isCopyableTarget) {
+                        return;
+                    }
+                    e.preventDefault();
+                }}
                 id={item.keyForList ?? ''}
                 onFocus={onFocus}
                 style={[
@@ -410,7 +426,6 @@ function GroupHeader({
                 wrapperStyle={[
                     styles.mh5,
                     animatedHighlightStyle,
-                    styles.userSelectNone,
                     isLargeScreenWidth
                         ? [StyleUtils.getSearchTableGroupRowBorderStyle(isFirstItem, isLastItemCollapsed, isItemSelected), isLastItemCollapsed && styles.overflowHidden]
                         : [
diff --git a/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx b/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
index 2c02b305cfa0..b966e9038c42 100644
--- a/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
@@ -104,10 +104,12 @@ function MemberListItemHeaderImpl({
                     <TextWithTooltip
                         text={formattedDisplayName}
                         style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                        isCopyable
                     />
                     <TextWithTooltip
                         text={formattedLogin || formattedDisplayName}
                         style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                        isCopyable
                     />
                 </View>
             </View>
@@ -163,10 +165,12 @@ function MemberListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={formattedDisplayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                                    isCopyable
                                 />
                                 <TextWithTooltip
                                     text={formattedLogin || formattedDisplayName}
                                     style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                                    isCopyable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
index 86d2419a6baf..547e53df182c 100644
--- a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
@@ -177,6 +177,8 @@ function HeaderFirstRow<TItem extends ListItem>({
                         style={[{maxWidth: 700}]}
                         transactions={reportItem.transactions}
                         avatarBorderColor={avatarBorderColor}
+                        // Grouped report headers sit inside pressable rows, so their title needs the copyable marker too.
+                        isTitleCopyable
                     />
                 </View>
             </View>
diff --git a/src/components/Search/SearchList/ListItem/TextCell.tsx b/src/components/Search/SearchList/ListItem/TextCell.tsx
index 95f1c9cc9e2d..6c92f8c34ca1 100644
--- a/src/components/Search/SearchList/ListItem/TextCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TextCell.tsx
@@ -18,6 +18,7 @@ function TextCell({text = '', isLargeScreenWidth = true}: TextCellProps) {
             shouldShowTooltip
             numberOfLines={isLargeScreenWidth ? 1 : 2}
             style={[isLargeScreenWidth ? styles.lineHeightLarge : styles.lh20, !isLargeScreenWidth && styles.preWrap, styles.justifyContentCenter]}
+            isCopyable
         />
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx b/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
index 727b646638e8..55bf781bad74 100644
--- a/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
@@ -40,6 +40,7 @@ export default function TextWithIconCell({icon, text, showTooltip, textStyle, nu
                 shouldShowTooltip={showTooltip}
                 numberOfLines={numberOfLines}
                 style={[styles.label, numberOfLines > 1 ? styles.preWrap : styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
+                isCopyable
             />
         </View>
     );
diff --git a/src/components/Search/SearchList/ListItem/TotalCell.tsx b/src/components/Search/SearchList/ListItem/TotalCell.tsx
index 9e1d95cd603c..7b76e7cbe397 100644
--- a/src/components/Search/SearchList/ListItem/TotalCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TotalCell.tsx
@@ -23,6 +23,7 @@ function TotalCell({total, currency, isScanning = false}: TotalCellProps) {
             shouldShowTooltip
             text={displayText}
             style={[styles.optionDisplayName, styles.pre, styles.justifyContentCenter, styles.textBold, styles.textAlignRight, styles.fontWeightNormal]}
+            isCopyable
         />
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 47746cb3dc2e..c5baa9187801 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -6,6 +6,7 @@ import ScrollView from '@components/ScrollView';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
@@ -42,7 +43,7 @@ import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
-import React, {useCallback, useMemo} from 'react';
+import React, {useCallback, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 
 import type {TransactionGroupListExpandedProps, TransactionListItemType} from './types';
@@ -157,6 +158,8 @@ function TransactionGroupListExpandedImpl({
     const currentOffset = transactionsSnapshotMetadata?.offset ?? 0;
     const shouldShowLoadingOnSearch = !!(!transactions?.length && transactionsSnapshotMetadata?.isLoading) || currentOffset > 0;
     const shouldDisplayLoadingIndicator = !isExpenseReportType && !!transactionsSnapshotMetadata?.isLoading && shouldShowLoadingOnSearch;
+    // Remember where this mouse sequence started so an old text selection does not block later expanded row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
     const {isLargeScreenWidth} = useResponsiveLayout();
     const StyleUtils = useStyleUtils();
 
@@ -284,6 +287,12 @@ function TransactionGroupListExpandedImpl({
     }
 
     const handleOnPress = (transaction: TransactionListItemType, event?: ModifiedMouseEvent) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         // A deleted transaction has no report to open, so a row press toggles its selection instead of dead-ending in navigation.
         if (isMobileSelectionModeEnabled || isDeletedTransaction(transaction) || isTransactionPendingDelete(transaction)) {
             onSelectionButtonPress?.(transaction as ListItem);
@@ -345,7 +354,14 @@ function TransactionGroupListExpandedImpl({
                             accessibilityRole={CONST.ROLE.BUTTON}
                             accessibilityLabel={transaction.text ?? ''}
                             isNested
-                            onMouseDown={(e) => e.preventDefault()}
+                            onMouseDown={(e) => {
+                                const isCopyableTarget = isCopyableTextTarget(e?.target);
+                                wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                                if (isCopyableTarget) {
+                                    return;
+                                }
+                                e.preventDefault();
+                            }}
                             hoverStyle={[!transaction.isDisabled && styles.hoveredComponentBG, transaction.isSelected && styles.activeComponentBG]}
                             wrapperStyle={isDeletedOrPendingDelete ? styles.cursorDisabled : undefined}
                             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 815c59454775..19738554b0c0 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -6,6 +6,7 @@ import {useSearchResultsContext, useSearchSelectionContext} from '@components/Se
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -251,6 +252,8 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later group row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -309,6 +312,12 @@ function TransactionGroupListItemImpl({
     };
 
     const onPress = (event?: ModifiedMouseEvent) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         if (isExpenseReportType || transactions.length === 0) {
             onSelectRow(item, transactionPreviewData, event);
         }
@@ -568,7 +577,14 @@ function TransactionGroupListItemImpl({
                 isNested
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
-                onMouseDown={(e) => e.preventDefault()}
+                onMouseDown={(e) => {
+                    const isCopyableTarget = isCopyableTextTarget(e?.target);
+                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    if (isCopyableTarget) {
+                        return;
+                    }
+                    e.preventDefault();
+                }}
                 id={item.keyForList ?? ''}
                 style={[
                     pressableStyle,
@@ -578,7 +594,6 @@ function TransactionGroupListItemImpl({
                 wrapperStyle={[
                     styles.mh5,
                     animatedHighlightStyle,
-                    styles.userSelectNone,
                     isLargeScreenWidth
                         ? [StyleUtils.getSearchTableGroupRowBorderStyle(isFirstItem, isLastItem, isItemSelected), isLastItem && styles.overflowHidden]
                         : [
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index 9981a9360482..cd643e7862e6 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -5,6 +5,7 @@ import type {TransactionListItemType} from '@components/Search/SearchList/ListIt
 import UserInfoAndActionButtonRow from '@components/Search/SearchList/ListItem/UserInfoAndActionButtonRow';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -52,12 +53,20 @@ function TransactionListItemNarrow<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
     const {isSelected} = useRowSelection(item.keyForList);
 
     const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         // A deleted transaction has no report to open, so a row press toggles its selection instead of dead-ending in navigation.
         if (isDeletedTransaction) {
             if (canSelectMultiple) {
@@ -127,11 +136,18 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
                 onFocus={onFocus}
+                onMouseDown={(event) => {
+                    const isCopyableTarget = isCopyableTextTarget(event?.target);
+                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    if (isCopyableTarget) {
+                        return;
+                    }
+                    event.preventDefault();
+                }}
                 wrapperStyle={[
                     styles.mh5,
                     styles.flex1,
                     animatedHighlightStyle,
-                    styles.userSelectNone,
                     isFirstItem && styles.tableTopRadius,
                     isLastItem && styles.tableBottomRadius,
                     !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected),
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 5e6d57660470..dc4ce4047c4a 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -4,6 +4,7 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
@@ -54,6 +55,8 @@ function TransactionListItemWide<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -93,6 +96,12 @@ function TransactionListItemWide<TItem extends ListItem>({
     });
 
     const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         // Consume the tap that dismissed an editing cell — a second tap will open the row.
         // We check the ref rather than isEditingCell because blur fires before onPress and resets the state.
         if (wasEditingOnMouseDownRef.current) {
@@ -115,9 +124,11 @@ function TransactionListItemWide<TItem extends ListItem>({
 
     const handleOnMouseDown = (e?: React.MouseEvent) => {
         wasEditingOnMouseDownRef.current = isEditingCell;
+        const isCopyableTarget = isCopyableTextTarget(e?.target);
+        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
 
         // Skip preventDefault when editing so the browser naturally blurs the input (triggering save/cancel).
-        if (!isEditingCell) {
+        if (!isEditingCell && !isCopyableTarget) {
             e?.preventDefault();
         }
     };
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 354dbfe43624..eacfab9ee725 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -1,5 +1,5 @@
 import Avatar from '@components/Avatar';
-import Text from '@components/Text';
+import TextWithTooltip from '@components/TextWithTooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -44,12 +44,12 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
                 avatarID={accountID}
                 containerStyles={[styles.pr2, avatarStyle]}
             />
-            <Text
+            <TextWithTooltip
+                text={displayName}
                 numberOfLines={1}
                 style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle]}
-            >
-                {displayName}
-            </Text>
+                isCopyable
+            />
         </View>
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx b/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
index 7327f9aa8b29..5c87f18d6e22 100644
--- a/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
@@ -134,6 +134,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={accountLabel}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
+                    isCopyable
                 />
             </View>
         ),
@@ -147,6 +148,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={formattedWithdrawalDate}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
+                    isCopyable
                 />
             </View>
         ),
@@ -166,6 +168,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={withdrawalIDItem.entryID?.toString() ?? ''}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
+                    isCopyable
                 />
             </View>
         ),
@@ -216,12 +219,14 @@ function WithdrawalIDListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={`${formattedBankName} xx${withdrawalIDItem.accountNumber.slice(-4)}`}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
+                                    isCopyable
                                 />
                                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}>
                                     {statusBadge}
                                     <TextWithTooltip
                                         text={withdrawalInfoText}
                                         style={[styles.textLabelSupporting, styles.lh16, styles.pre, styles.flexShrink1]}
+                                        isCopyable
                                     />
                                 </View>
                             </View>
diff --git a/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx b/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
index 1a100a323d01..bc0fcc751c9e 100644
--- a/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
+++ b/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
@@ -45,6 +45,7 @@ function WorkspaceCell({policyID, report}: WorkspaceCellProps) {
                 text={name ?? ''}
                 shouldShowTooltip
                 style={[styles.flex1, styles.flexGrow1]}
+                isCopyable
             />
         </View>
     );
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index f14701888c3e..839d8f26165b 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -6,6 +6,7 @@ import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWi
 import getAccessibilityLabel from '@components/SelectionList/utils/getAccessibilityLabel';
 import {getItemRole} from '@components/SelectionList/utils/getItemRole';
 import {getSelectableState} from '@components/SelectionList/utils/getSelectableState';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 
 import useHover from '@hooks/useHover';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -123,6 +124,8 @@ function BaseListItem<TItem extends ListItem>({
     const {setMouseUp} = useMouseActions();
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'Checkmark', 'DotIndicator']);
     const pressableRef = useRef<View>(null);
+    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
 
     // Sync focus on an item
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
@@ -200,6 +203,13 @@ function BaseListItem<TItem extends ListItem>({
                     onLongPressRow?.(item);
                 }}
                 onPress={(e) => {
+                    const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+                    wasMouseDownOnCopyableTextRef.current = false;
+                    if (shouldSuppressPress) {
+                        e?.stopPropagation();
+                        return;
+                    }
+
                     if (isMouseDownOnInput) {
                         e?.stopPropagation(); // Preventing the click action
                         return;
@@ -217,7 +227,11 @@ function BaseListItem<TItem extends ListItem>({
                 hoverStyle={!shouldDisableHoverStyle ? [(!item.isDisabled || isRowSelected) && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle] : undefined}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus}}
                 onMouseDown={(e) => {
-                    if ((e?.target as HTMLElement)?.tagName === CONST.ELEMENT_NAME.INPUT) {
+                    const target = e?.target;
+                    const isCopyableTarget = isCopyableTextTarget(target);
+                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+
+                    if ((target as HTMLElement)?.tagName === CONST.ELEMENT_NAME.INPUT || isCopyableTarget) {
                         return;
                     }
                     e.preventDefault();
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 9e90e2366e11..a9acebdd9a7d 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -4,6 +4,7 @@ import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useLocalize from '@hooks/useLocalize';
@@ -19,7 +20,7 @@ import CONST from '@src/CONST';
 
 import type {GestureResponderEvent, PressableStateCallbackType} from 'react-native';
 
-import React from 'react';
+import React, {useRef} from 'react';
 import {View} from 'react-native';
 import Animated from 'react-native-reanimated';
 
@@ -67,6 +68,8 @@ export default function TableRow({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth, shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
     const {processedData, columns, shouldUseNarrowTableLayout, tableMethods, selectionEnabled, isMobileSelectionEnabled, shouldEnableSelectionInNarrowPaneModal = false} = useTableContext();
+    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
+    const wasMouseDownOnCopyableTextRef = useRef(false);
 
     // Tables inside a narrow pane modal (RHP) opt into keying the selection UX off the real screen size (isSmallScreenWidth),
     // because shouldUseNarrowLayout is always true in an RHP and would otherwise suppress selection entirely. All other
@@ -155,6 +158,12 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
         if (isDisabled || !interactive) {
             return;
         }
@@ -199,6 +208,12 @@ export default function TableRow({
                 role={interactive ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
                 onMouseDown={(e) => {
                     const target = e?.target;
+                    const isCopyableTarget = isCopyableTextTarget(target);
+                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+
+                    if (isCopyableTarget) {
+                        return;
+                    }
 
                     if (!(target instanceof HTMLElement)) {
                         e.preventDefault();
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index 402270404874..957c1c84e973 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -82,12 +82,14 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
                                 text={item.name}
                                 style={[styles.optionDisplayName, styles.pre]}
                                 numberOfLines={1}
+                                isCopyable
                             />
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={memberSubtitle}
                                 style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
                                 numberOfLines={1}
+                                isCopyable
                             />
                         </View>
                     </View>
@@ -100,6 +102,7 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
                                     numberOfLines={1}
                                     text={item.employeeUserID}
                                     style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                                    isCopyable
                                 />
                             )}
                         </View>
@@ -113,6 +116,7 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
                                     numberOfLines={1}
                                     text={item.employeePayrollID}
                                     style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                                    isCopyable
                                 />
                             )}
                         </View>
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index d591bdb3c16a..71198f8bafa2 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -1,6 +1,8 @@
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
+import useThemeStyles from '@hooks/useThemeStyles';
+
 import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
@@ -9,7 +11,11 @@ type LayoutChangeEvent = {
     target: HTMLElement;
 };
 
-function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass}: TextWithTooltipProps) {
+// This marker lets pressable rows and SelectionScraper preserve explicitly copyable values inside otherwise non-selectable rows.
+const COPYABLE_TEXT_DATA_SET = {copyableText: true};
+
+function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
+    const styles = useThemeStyles();
     const [showTooltip, setShowTooltip] = useState(false);
 
     return (
@@ -19,8 +25,9 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
         >
             <Text
                 testID={testID}
-                style={style}
+                style={[style, isCopyable && styles.userSelectText]}
                 numberOfLines={numberOfLines}
+                selectable={isCopyable}
                 onLayout={(e) => {
                     const target = (e.nativeEvent as unknown as LayoutChangeEvent).target;
                     if (!shouldShowTooltip) {
@@ -33,6 +40,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
                     setShowTooltip(false);
                 }}
                 fsClass={forwardedFSClass}
+                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
             >
                 {text}
             </Text>
diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
new file mode 100644
index 000000000000..2176f45464da
--- /dev/null
+++ b/src/components/TextWithTooltip/selection.ts
@@ -0,0 +1,47 @@
+const COPYABLE_TEXT_SELECTOR = '[data-copyable-text=true]';
+
+function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
+    if (typeof HTMLElement === 'undefined') {
+        return null;
+    }
+
+    try {
+        if (target instanceof HTMLElement) {
+            return target.closest(COPYABLE_TEXT_SELECTOR);
+        }
+
+        if (typeof Node !== 'undefined' && target instanceof Node) {
+            return target.parentElement?.closest(COPYABLE_TEXT_SELECTOR) ?? null;
+        }
+    } catch {
+        return null;
+    }
+
+    return null;
+}
+
+function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
+    return !!getCopyableTextElement(target);
+}
+
+// Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
+function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
+    if (!didMouseDownStartOnCopyableText) {
+        return false;
+    }
+
+    if (typeof window === 'undefined' || typeof window.getSelection !== 'function') {
+        return false;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.isCollapsed || selection.toString().length === 0) {
+        return false;
+    }
+
+    const anchorCopyableElement = getCopyableTextElement(selection.anchorNode);
+    const focusCopyableElement = getCopyableTextElement(selection.focusNode);
+    return !!anchorCopyableElement || !!focusCopyableElement;
+}
+
+export {isCopyableTextTarget, shouldSuppressCopyableTextPress};
diff --git a/src/components/TextWithTooltip/types.ts b/src/components/TextWithTooltip/types.ts
index c55e27f97c93..d01d0199db27 100644
--- a/src/components/TextWithTooltip/types.ts
+++ b/src/components/TextWithTooltip/types.ts
@@ -17,6 +17,9 @@ type TextWithTooltipProps = ForwardedFSClassProps & {
 
     /** TestID of the Text component */
     testID?: string;
+
+    /** Whether this value should be directly selectable/copyable inside pressable rows */
+    isCopyable?: boolean;
 };
 
 export default TextWithTooltipProps;
diff --git a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
index adbe8c041f89..e3d1175b1fa6 100644
--- a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
@@ -52,6 +52,7 @@ function CategoryCell({shouldUseNarrowLayout, shouldShowTooltip, transactionItem
             text={categoryForDisplay}
             numberOfLines={1}
             style={[styles.lineHeightLarge, styles.justifyContentCenter]}
+            isCopyable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
index e0a7242f70e2..9a262d2b4551 100644
--- a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
@@ -112,6 +112,7 @@ function MerchantOrDescriptionCell({merchantOrDescription, shouldShowTooltip, sh
                 text={localValue}
                 numberOfLines={1}
                 style={shouldUseNarrowLayout ? [styles.lh20, styles.pre, styles.justifyContentCenter, styles.flex1] : [styles.lineHeightXLarge]}
+                isCopyable
             />
         </EditableCell>
     );
diff --git a/src/components/TransactionItemRow/DataCells/TagCell.tsx b/src/components/TransactionItemRow/DataCells/TagCell.tsx
index 7e3da502412a..1cb2c8fde36c 100644
--- a/src/components/TransactionItemRow/DataCells/TagCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TagCell.tsx
@@ -54,6 +54,7 @@ function TagCell({canEdit, onSave, shouldUseNarrowLayout, shouldShowTooltip, tra
             text={tagForDisplay}
             numberOfLines={1}
             style={[styles.lineHeightLarge, styles.justifyContentCenter]}
+            isCopyable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/TaxCell.tsx b/src/components/TransactionItemRow/DataCells/TaxCell.tsx
index 36950112a47b..037d785ffa47 100644
--- a/src/components/TransactionItemRow/DataCells/TaxCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TaxCell.tsx
@@ -21,6 +21,7 @@ function TaxCell({transactionItem, shouldShowTooltip}: TransactionDataCellProps)
             shouldShowTooltip={shouldShowTooltip}
             text={convertToDisplayString(taxAmount, currency)}
             style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, styles.textAlignRight]}
+            isCopyable
         />
     );
 }
diff --git a/src/components/TransactionItemRow/DataCells/TotalCell.tsx b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
index f396e9641ad8..b7d4aa7d2a72 100644
--- a/src/components/TransactionItemRow/DataCells/TotalCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
@@ -144,6 +144,7 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
             shouldShowTooltip={shouldShowTooltip}
             text={amountToDisplay}
             style={[styles.optionDisplayName, styles.justifyContentCenter, styles.flexShrink1, styles.textAlignRight]}
+            isCopyable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/TypeCell.tsx b/src/components/TransactionItemRow/DataCells/TypeCell.tsx
index c71bbceec86a..7e89105b71e8 100644
--- a/src/components/TransactionItemRow/DataCells/TypeCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TypeCell.tsx
@@ -114,6 +114,7 @@ function TypeCell({transactionItem, shouldUseNarrowLayout, shouldShowTooltip}: T
             shouldShowTooltip={shouldShowTooltip}
             text={translate(typeText)}
             style={[styles.mutedNormalTextLabel, styles.pre, styles.justifyContentCenter, styles.flexShrink0]}
+            isCopyable
         />
     ) : (
         <Tooltip text={getTooltipText()}>
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index c6a3cf92ba82..5fd36abc1748 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -12,7 +12,6 @@ import AmountCell from '@components/Search/SearchList/ListItem/TotalCell';
 import UserInfoCell from '@components/Search/SearchList/ListItem/UserInfoCell';
 import WorkspaceCell from '@components/Search/SearchList/ListItem/WorkspaceCell';
 import type {SearchColumnType} from '@components/Search/types';
-import Text from '@components/Text';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -306,7 +305,7 @@ function TransactionItemRowWide({
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE)]}
                     >
-                        <Text>{getReimbursable(transactionItem) ? translate('common.yes') : translate('common.no')}</Text>
+                        <TextCell text={getReimbursable(transactionItem) ? translate('common.yes') : translate('common.no')} />
                     </View>
                 );
             case CONST.SEARCH.TABLE_COLUMNS.BILLABLE:
@@ -315,7 +314,7 @@ function TransactionItemRowWide({
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.BILLABLE)]}
                     >
-                        <Text>{transactionItem.billable ? translate('common.yes') : translate('common.no')}</Text>
+                        <TextCell text={transactionItem.billable ? translate('common.yes') : translate('common.no')} />
                     </View>
                 );
             case CONST.SEARCH.TABLE_COLUMNS.ACTION:
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index d7c1e6b13afe..c64ad2631126 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -11,6 +11,7 @@ import type GetCurrentSelection from './types';
 
 const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user']);
 const tagAttribute = 'data-testid';
+const copyableTextSelector = '[data-copyable-text=true]';
 
 /**
  * Reads html of selection. If browser doesn't support Selection API, returns empty string.
@@ -95,6 +96,11 @@ const getHTMLOfSelection = (): string => {
 
     if (divsToRemove && divsToRemove.length > 0) {
         for (const element of divsToRemove) {
+            // Keep explicitly copyable values even when their parent row is hidden from the selection scraper.
+            if (element.matches(copyableTextSelector) || element.querySelector(copyableTextSelector)) {
+                element.removeAttribute(`data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`);
+                continue;
+            }
             element.remove();
         }
     }

From 358e890e41590d0f0531995377eecdc6dc96f47c Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 08:57:09 +0430
Subject: [PATCH 015/781] Fix copyable expense row compiler regression

---
 .../MoneyRequestReportTransactionItem.tsx     | 70 ++++++++++---------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 43e0f41d0679..005a3b753afa 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -151,10 +151,8 @@ function MoneyRequestReportTransactionItemBody({
     const isPendingDelete = isTransactionPendingDelete(transaction);
     const pendingAction = getTransactionPendingAction(transaction);
 
-    // On narrow layouts `inlineEdit` is undefined (the parent skips the hook). The fallback ref
-    // keeps the press handler shape identical without ever being mutated on narrow.
-    const fallbackEditingOnMouseDownRef = useRef(false);
-    const wasEditingOnMouseDownRef = inlineEdit?.wasEditingOnMouseDownRef ?? fallbackEditingOnMouseDownRef;
+    // Keep this ref local so React Compiler can prove the after-render event mutations are safe.
+    const wasEditingOnMouseDownRef = useRef(false);
     // Remember where this mouse sequence started so an old text selection does not block later row clicks.
     const wasMouseDownOnCopyableTextRef = useRef(false);
 
@@ -177,6 +175,38 @@ function MoneyRequestReportTransactionItemBody({
 
     const handleHoverIn = () => setShouldDisableHoverStyle(false);
 
+    const handlePress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = () => {
+        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        if (shouldSuppressPress) {
+            return;
+        }
+
+        // Prevent row press from firing while a cell is being inline-edited (e.g. pressing Space would otherwise open the expense)
+        // See https://github.com/Expensify/App/issues/88646 for more details
+        if (isEditingCell) {
+            return;
+        }
+        // If a cell was being edited when the user tapped the row, suppress navigation
+        // so the second tap doesn't immediately open the transaction detail.
+        if (wasEditingOnMouseDownRef.current) {
+            wasEditingOnMouseDownRef.current = false;
+            return;
+        }
+        handleOnPress(transaction.transactionID);
+    };
+
+    const handlePressIn = () => {
+        wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
+        if (canUseTouchScreen()) {
+            ControlSelection.block();
+        }
+    };
+
+    const handlePressableLongPress = () => {
+        handleLongPress(transaction.transactionID);
+    };
+
     return (
         <OfflineWithFeedback
             pendingAction={pendingAction}
@@ -184,26 +214,7 @@ function MoneyRequestReportTransactionItemBody({
         >
             <PressableWithFeedback
                 key={transaction.transactionID}
-                onPress={(event) => {
-                    const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-                    wasMouseDownOnCopyableTextRef.current = false;
-                    if (shouldSuppressPress) {
-                        return;
-                    }
-
-                    // Prevent row press from firing while a cell is being inline-edited (e.g. pressing Space would otherwise open the expense)
-                    // See https://github.com/Expensify/App/issues/88646 for more details
-                    if (isEditingCell) {
-                        return;
-                    }
-                    // If a cell was being edited when the user tapped the row, suppress navigation
-                    // so the second tap doesn't immediately open the transaction detail.
-                    if (wasEditingOnMouseDownRef.current) {
-                        wasEditingOnMouseDownRef.current = false;
-                        return;
-                    }
-                    handleOnPress(transaction.transactionID);
-                }}
+                onPress={handlePress}
                 accessibilityLabel={translate('iou.viewDetails')}
                 sentryLabel={CONST.SENTRY_LABEL.REPORT.MONEY_REQUEST_REPORT_TRANSACTION_ITEM}
                 role={getButtonRole(true)}
@@ -214,16 +225,9 @@ function MoneyRequestReportTransactionItemBody({
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 onMouseDown={handleMouseDown}
                 onHoverIn={handleHoverIn}
-                onPressIn={() => {
-                    wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
-                    if (canUseTouchScreen()) {
-                        ControlSelection.block();
-                    }
-                }}
+                onPressIn={handlePressIn}
                 onPressOut={() => ControlSelection.unblock()}
-                onLongPress={() => {
-                    handleLongPress(transaction.transactionID);
-                }}
+                onLongPress={handlePressableLongPress}
                 disabled={isTransactionPendingDelete(transaction)}
                 wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}
             >

From 2b6ff4f686609a972be1030dcdf68499ba88499f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 09:08:05 +0430
Subject: [PATCH 016/781] Fix copyable row lint regressions

---
 src/components/AvatarWithDisplayName.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index c51c6ec288fe..acbe1ee05965 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -112,8 +112,6 @@ function getCustomDisplayName(
     shouldUseFullTitle: boolean,
     customSearchDisplayStyle: TextStyle[],
     regularStyle: TextStyle[],
-    isAnonymous: boolean,
-    isMoneyRequestOrReport: boolean,
     isCopyable: boolean,
 ): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
@@ -161,7 +159,7 @@ function getCustomDisplayName(
         return {
             fullTitle: title,
             textStyles: regularStyle,
-            shouldUseFullTitle: isMoneyRequestOrReport || isAnonymous,
+            shouldUseFullTitle,
             ...baseProps,
         };
     }
@@ -294,8 +292,6 @@ function AvatarWithDisplayName({
         shouldUseFullTitle,
         [styles.headerText, styles.pre, customDisplayNameStyle],
         [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
-        isAnonymous,
-        isMoneyRequestOrReport,
         isDisplayNameCopyable,
     );
 

From 1f17abd2ff5c4c0203e7438d60cf0cae13b42084 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 18:16:23 +0430
Subject: [PATCH 017/781] Document copyable text selection helpers

---
 src/components/TextWithTooltip/selection.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index 2176f45464da..252e33316281 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -1,3 +1,7 @@
+/**
+ * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
+ * native text selection without triggering row navigation after drag-select.
+ */
 const COPYABLE_TEXT_SELECTOR = '[data-copyable-text=true]';
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {

From d7a86b1cda43758f55fb2f72640f1bf697384a01 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 18:20:12 +0430
Subject: [PATCH 018/781] Centralize copyable text DOM marker

---
 src/CONST/index.ts                                         | 1 +
 src/components/DisplayNames/DisplayNamesTooltipItem.tsx    | 4 +---
 src/components/DisplayNames/DisplayNamesWithTooltip.tsx    | 3 +--
 src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx | 4 +---
 src/components/MenuItem.tsx                                | 5 +----
 src/components/TextWithTooltip/index.tsx                   | 5 ++---
 src/components/TextWithTooltip/selection.ts                | 7 +++++--
 src/libs/SelectionScraper/index.ts                         | 5 +++--
 8 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 2f7aa394f413..acf0fd254794 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -5883,6 +5883,7 @@ const CONST = {
     // that should be removed from the copied contents in the getHTMLOfSelection() method
     SELECTION_SCRAPER_HIDDEN_ELEMENT: 'selection-scrapper-hidden-element',
     INNER_BOX_SHADOW_ELEMENT: 'inner-box-shadow-element',
+    COPYABLE_TEXT_ELEMENT: 'copyable-text',
     MODERATION: {
         MODERATOR_DECISION_PENDING: 'pending',
         MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index e0404d09080e..a217b0660be9 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -1,4 +1,5 @@
 import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 import UserDetailsTooltip from '@components/UserDetailsTooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -40,9 +41,6 @@ type DisplayNamesTooltipItemProps = ForwardedFSClassProps & {
     isCopyable?: boolean;
 };
 
-// Mark individual participant names when DisplayNames is used as a selectable report title.
-const COPYABLE_TEXT_DATA_SET = {copyableText: true};
-
 function DisplayNamesTooltipItem({
     index = 0,
     getTooltipShiftX = () => 0,
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index 3a0b0c22e337..a7d0e6143cb2 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -1,4 +1,5 @@
 import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 import Tooltip from '@components/Tooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -16,8 +17,6 @@ import type DisplayNamesProps from './types';
 import DisplayNamesTooltipItem from './DisplayNamesTooltipItem';
 
 type HTMLElementWithText = HTMLElement & RNText;
-// Mark report titles rendered through DisplayNames so grouped search rows can allow native selection.
-const COPYABLE_TEXT_DATA_SET = {copyableText: true};
 
 function DisplayNamesWithToolTip({
     shouldUseFullTitle,
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index c00f42085c22..ff102b7e359e 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -1,4 +1,5 @@
 import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -28,9 +29,6 @@ type DisplayNamesWithoutTooltipProps = ForwardedFSClassProps & {
     isCopyable?: boolean;
 };
 
-// Mark report titles rendered through DisplayNames so grouped search rows can allow native selection.
-const COPYABLE_TEXT_DATA_SET = {copyableText: true};
-
 function DisplayNamesWithoutTooltip({
     textStyles = [],
     numberOfLines = 1,
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index 9d8669b870f7..a0d5e8d8a827 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -59,7 +59,7 @@ import RadioButton from './RadioButton';
 import RenderHTML from './RenderHTML';
 import ReportActionAvatars from './ReportActionAvatars';
 import Text from './Text';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from './TextWithTooltip/selection';
+import {COPYABLE_TEXT_DATA_SET, isCopyableTextTarget, shouldSuppressCopyableTextPress} from './TextWithTooltip/selection';
 import EducationalTooltip from './Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from './utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from './utils/getContextMenuAccessibilityProps';
@@ -491,9 +491,6 @@ const getSubscriptAvatarBackgroundColor = (isHovered: boolean, isPressed: boolea
     }
 };
 
-// Mark copyable menu titles so pressable rows and SelectionScraper preserve the selected value.
-const COPYABLE_TEXT_DATA_SET = {copyableText: true};
-
 function MenuItem({
     interactive = true,
     onPress,
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 71198f8bafa2..c160b55f0365 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -7,13 +7,12 @@ import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
 
+import {COPYABLE_TEXT_DATA_SET} from './selection';
+
 type LayoutChangeEvent = {
     target: HTMLElement;
 };
 
-// This marker lets pressable rows and SelectionScraper preserve explicitly copyable values inside otherwise non-selectable rows.
-const COPYABLE_TEXT_DATA_SET = {copyableText: true};
-
 function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
     const styles = useThemeStyles();
     const [showTooltip, setShowTooltip] = useState(false);
diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index 252e33316281..2a60f2c7645d 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -1,8 +1,11 @@
+import CONST from '@src/CONST';
+
 /**
  * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
  * native text selection without triggering row navigation after drag-select.
  */
-const COPYABLE_TEXT_SELECTOR = '[data-copyable-text=true]';
+const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
+const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
@@ -48,4 +51,4 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
     return !!anchorCopyableElement || !!focusCopyableElement;
 }
 
-export {isCopyableTextTarget, shouldSuppressCopyableTextPress};
+export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isCopyableTextTarget, shouldSuppressCopyableTextPress};
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index c64ad2631126..6b856caace3d 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -1,3 +1,5 @@
+import {COPYABLE_TEXT_SELECTOR} from '@components/TextWithTooltip/selection';
+
 import CONST from '@src/CONST';
 
 import type {ChildNode} from 'domhandler';
@@ -11,7 +13,6 @@ import type GetCurrentSelection from './types';
 
 const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user']);
 const tagAttribute = 'data-testid';
-const copyableTextSelector = '[data-copyable-text=true]';
 
 /**
  * Reads html of selection. If browser doesn't support Selection API, returns empty string.
@@ -97,7 +98,7 @@ const getHTMLOfSelection = (): string => {
     if (divsToRemove && divsToRemove.length > 0) {
         for (const element of divsToRemove) {
             // Keep explicitly copyable values even when their parent row is hidden from the selection scraper.
-            if (element.matches(copyableTextSelector) || element.querySelector(copyableTextSelector)) {
+            if (element.matches(COPYABLE_TEXT_SELECTOR) || element.querySelector(COPYABLE_TEXT_SELECTOR)) {
                 element.removeAttribute(`data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`);
                 continue;
             }

From dc2bdefaa6b468b7d1fa96f4b8687e533bc01a9b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 18:35:15 +0430
Subject: [PATCH 019/781] Extract copyable row press handling

---
 src/components/MenuItem.tsx                   | 11 +++-----
 .../MoneyRequestReportTransactionItem.tsx     | 12 +++------
 .../SearchList/ListItem/GroupHeader.tsx       | 12 +++------
 .../ListItem/TransactionGroupListExpanded.tsx | 12 +++------
 .../ListItem/TransactionGroupListItem.tsx     | 12 +++------
 .../TransactionListItemNarrow.tsx             | 12 +++------
 .../TransactionListItemWide.tsx               | 12 +++------
 .../SelectionList/ListItem/BaseListItem.tsx   | 12 +++------
 src/components/Table/TableRow.tsx             | 14 ++++-------
 src/components/TextWithTooltip/selection.ts   | 25 ++++++++++++++++++-
 10 files changed, 61 insertions(+), 73 deletions(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index a0d5e8d8a827..c81b5259e88f 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -59,7 +59,7 @@ import RadioButton from './RadioButton';
 import RenderHTML from './RenderHTML';
 import ReportActionAvatars from './ReportActionAvatars';
 import Text from './Text';
-import {COPYABLE_TEXT_DATA_SET, isCopyableTextTarget, shouldSuppressCopyableTextPress} from './TextWithTooltip/selection';
+import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from './TextWithTooltip/selection';
 import EducationalTooltip from './Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from './utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from './utils/getContextMenuAccessibilityProps';
@@ -642,8 +642,7 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<View>(null);
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later menu item clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useEffect(() => {
         const element = pressableRef.current;
         if (interactive || !element || typeof HTMLElement === 'undefined' || !(element instanceof HTMLElement) || typeof element.onclick === 'undefined') {
@@ -821,9 +820,7 @@ function MenuItem({
             return;
         }
 
-        const shouldSuppressPress = copyable && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress(copyable)) {
             return;
         }
 
@@ -890,7 +887,7 @@ function MenuItem({
                             <PressableWithSecondaryInteraction
                                 onPress={shouldCheckActionAllowedOnPress ? callFunctionIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
                                 onMouseDown={(event) => {
-                                    wasMouseDownOnCopyableTextRef.current = copyable && isCopyableTextTarget(event?.target);
+                                    markMouseDownOnCopyableText(event?.target, copyable);
                                 }}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
                                 onPressOut={ControlSelection.unblock}
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 005a3b753afa..ee81a3da6d3f 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -2,7 +2,7 @@ import {getButtonRole} from '@components/Button/utils';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
@@ -153,8 +153,7 @@ function MoneyRequestReportTransactionItemBody({
 
     // Keep this ref local so React Compiler can prove the after-render event mutations are safe.
     const wasEditingOnMouseDownRef = useRef(false);
-    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!wasRecentlyEditingCell) {
@@ -165,8 +164,7 @@ function MoneyRequestReportTransactionItemBody({
 
     const handleMouseDown = (e?: React.MouseEvent) => {
         wasEditingOnMouseDownRef.current = isEditingCell;
-        const isCopyableTarget = isCopyableTextTarget(e?.target);
-        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
 
         if (!isEditingCell && !isCopyableTarget) {
             e?.preventDefault();
@@ -176,9 +174,7 @@ function MoneyRequestReportTransactionItemBody({
     const handleHoverIn = () => setShouldDisableHoverStyle(false);
 
     const handlePress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = () => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 727864ff0441..51a24efef4c7 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -6,7 +6,7 @@ import {useSearchSelectionContext} from '@components/Search/SearchContext';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@components/Search/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -360,8 +360,7 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later group row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -378,9 +377,7 @@ function GroupHeader({
     const shouldDisplayEmptyView = isEmpty && isExpenseReportType;
 
     const handlePress = (event?: ModifiedMouseEvent) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -410,8 +407,7 @@ function GroupHeader({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    const isCopyableTarget = isCopyableTextTarget(e?.target);
-                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index c5baa9187801..8caf5f1287d6 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -6,7 +6,7 @@ import ScrollView from '@components/ScrollView';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
@@ -158,8 +158,7 @@ function TransactionGroupListExpandedImpl({
     const currentOffset = transactionsSnapshotMetadata?.offset ?? 0;
     const shouldShowLoadingOnSearch = !!(!transactions?.length && transactionsSnapshotMetadata?.isLoading) || currentOffset > 0;
     const shouldDisplayLoadingIndicator = !isExpenseReportType && !!transactionsSnapshotMetadata?.isLoading && shouldShowLoadingOnSearch;
-    // Remember where this mouse sequence started so an old text selection does not block later expanded row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     const {isLargeScreenWidth} = useResponsiveLayout();
     const StyleUtils = useStyleUtils();
 
@@ -287,9 +286,7 @@ function TransactionGroupListExpandedImpl({
     }
 
     const handleOnPress = (transaction: TransactionListItemType, event?: ModifiedMouseEvent) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -355,8 +352,7 @@ function TransactionGroupListExpandedImpl({
                             accessibilityLabel={transaction.text ?? ''}
                             isNested
                             onMouseDown={(e) => {
-                                const isCopyableTarget = isCopyableTextTarget(e?.target);
-                                wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                                const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                                 if (isCopyableTarget) {
                                     return;
                                 }
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 19738554b0c0..53ae59d84b5b 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -6,7 +6,7 @@ import {useSearchResultsContext, useSearchSelectionContext} from '@components/Se
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -252,8 +252,7 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later group row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -312,9 +311,7 @@ function TransactionGroupListItemImpl({
     };
 
     const onPress = (event?: ModifiedMouseEvent) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -578,8 +575,7 @@ function TransactionGroupListItemImpl({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    const isCopyableTarget = isCopyableTextTarget(e?.target);
-                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index cd643e7862e6..42c74f932971 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -5,7 +5,7 @@ import type {TransactionListItemType} from '@components/Search/SearchList/ListIt
 import UserInfoAndActionButtonRow from '@components/Search/SearchList/ListItem/UserInfoAndActionButtonRow';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -53,17 +53,14 @@ function TransactionListItemNarrow<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
     const {isSelected} = useRowSelection(item.keyForList);
 
     const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -137,8 +134,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                 ]}
                 onFocus={onFocus}
                 onMouseDown={(event) => {
-                    const isCopyableTarget = isCopyableTextTarget(event?.target);
-                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    const isCopyableTarget = markMouseDownOnCopyableText(event?.target);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index dc4ce4047c4a..eea62f5cbe39 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -4,7 +4,7 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
@@ -55,8 +55,7 @@ function TransactionListItemWide<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -96,9 +95,7 @@ function TransactionListItemWide<TItem extends ListItem>({
     });
 
     const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -124,8 +121,7 @@ function TransactionListItemWide<TItem extends ListItem>({
 
     const handleOnMouseDown = (e?: React.MouseEvent) => {
         wasEditingOnMouseDownRef.current = isEditingCell;
-        const isCopyableTarget = isCopyableTextTarget(e?.target);
-        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
 
         // Skip preventDefault when editing so the browser naturally blurs the input (triggering save/cancel).
         if (!isEditingCell && !isCopyableTarget) {
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 839d8f26165b..ff7e643f7ac4 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -6,7 +6,7 @@ import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWi
 import getAccessibilityLabel from '@components/SelectionList/utils/getAccessibilityLabel';
 import {getItemRole} from '@components/SelectionList/utils/getItemRole';
 import {getSelectableState} from '@components/SelectionList/utils/getSelectableState';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useHover from '@hooks/useHover';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -124,8 +124,7 @@ function BaseListItem<TItem extends ListItem>({
     const {setMouseUp} = useMouseActions();
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'Checkmark', 'DotIndicator']);
     const pressableRef = useRef<View>(null);
-    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     // Sync focus on an item
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
@@ -203,9 +202,7 @@ function BaseListItem<TItem extends ListItem>({
                     onLongPressRow?.(item);
                 }}
                 onPress={(e) => {
-                    const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-                    wasMouseDownOnCopyableTextRef.current = false;
-                    if (shouldSuppressPress) {
+                    if (shouldSuppressCopyableTextRowPress()) {
                         e?.stopPropagation();
                         return;
                     }
@@ -228,8 +225,7 @@ function BaseListItem<TItem extends ListItem>({
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus}}
                 onMouseDown={(e) => {
                     const target = e?.target;
-                    const isCopyableTarget = isCopyableTextTarget(target);
-                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    const isCopyableTarget = markMouseDownOnCopyableText(target);
 
                     if ((target as HTMLElement)?.tagName === CONST.ELEMENT_NAME.INPUT || isCopyableTarget) {
                         return;
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index a9acebdd9a7d..b52f1535f466 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -4,7 +4,7 @@ import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import {isCopyableTextTarget, shouldSuppressCopyableTextPress} from '@components/TextWithTooltip/selection';
+import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useLocalize from '@hooks/useLocalize';
@@ -20,7 +20,7 @@ import CONST from '@src/CONST';
 
 import type {GestureResponderEvent, PressableStateCallbackType} from 'react-native';
 
-import React, {useRef} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import Animated from 'react-native-reanimated';
 
@@ -68,8 +68,7 @@ export default function TableRow({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth, shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
     const {processedData, columns, shouldUseNarrowTableLayout, tableMethods, selectionEnabled, isMobileSelectionEnabled, shouldEnableSelectionInNarrowPaneModal = false} = useTableContext();
-    // Remember where this mouse sequence started so an old text selection does not block later row clicks.
-    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     // Tables inside a narrow pane modal (RHP) opt into keying the selection UX off the real screen size (isSmallScreenWidth),
     // because shouldUseNarrowLayout is always true in an RHP and would otherwise suppress selection entirely. All other
@@ -158,9 +157,7 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
-        const shouldSuppressPress = shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        if (shouldSuppressPress) {
+        if (shouldSuppressCopyableTextRowPress()) {
             return;
         }
 
@@ -208,8 +205,7 @@ export default function TableRow({
                 role={interactive ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
                 onMouseDown={(e) => {
                     const target = e?.target;
-                    const isCopyableTarget = isCopyableTextTarget(target);
-                    wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+                    const isCopyableTarget = markMouseDownOnCopyableText(target);
 
                     if (isCopyableTarget) {
                         return;
diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index 2a60f2c7645d..f18bd3292067 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -1,5 +1,7 @@
 import CONST from '@src/CONST';
 
+import {useRef} from 'react';
+
 /**
  * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
  * native text selection without triggering row navigation after drag-select.
@@ -51,4 +53,25 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
     return !!anchorCopyableElement || !!focusCopyableElement;
 }
 
-export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isCopyableTextTarget, shouldSuppressCopyableTextPress};
+function useCopyableTextRowPress() {
+    const wasMouseDownOnCopyableTextRef = useRef(false);
+
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
+        const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
+        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        return isCopyableTarget;
+    };
+
+    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
+        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        return shouldSuppressPress;
+    };
+
+    return {
+        markMouseDownOnCopyableText,
+        shouldSuppressCopyableTextRowPress,
+    };
+}
+
+export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isCopyableTextTarget, shouldSuppressCopyableTextPress, useCopyableTextRowPress};

From 90714cc808340efe587095316ece48dc9532120e Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 18:51:45 +0430
Subject: [PATCH 020/781] Remove unused copyable selection exports

---
 src/components/TextWithTooltip/selection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index f18bd3292067..9d2d0bc72fd9 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -74,4 +74,4 @@ function useCopyableTextRowPress() {
     };
 }
 
-export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isCopyableTextTarget, shouldSuppressCopyableTextPress, useCopyableTextRowPress};
+export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, useCopyableTextRowPress};

From ad39fbdb6fe88ae4a2ca7f14f09385631baa71f6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 19:13:23 +0430
Subject: [PATCH 021/781] Remove unused expanded group row import

---
 .../Search/SearchList/ListItem/TransactionGroupListExpanded.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 8caf5f1287d6..29690f939146 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -43,7 +43,7 @@ import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
-import React, {useCallback, useMemo, useRef} from 'react';
+import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 
 import type {TransactionGroupListExpandedProps, TransactionListItemType} from './types';

From 96084ad4c04d79130223fe5750cda161718a2edb Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 29 Jul 2026 19:19:07 +0430
Subject: [PATCH 022/781] Mark HTML menu titles as copyable

---
 src/components/MenuItem.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index c81b5259e88f..0ed2288b051b 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -1061,7 +1061,15 @@ function MenuItem({
                                                                 fsClass={forwardedFSClass}
                                                             >
                                                                 {!!title && (shouldRenderAsHTML || (shouldParseTitle && !!html.length)) && (
-                                                                    <View style={[styles.renderHTMLTitle, styles.textAlignLeft, shouldApplyIconPaddingToHTMLTitle && iconLeftPadding]}>
+                                                                    <View
+                                                                        style={[
+                                                                            styles.renderHTMLTitle,
+                                                                            styles.textAlignLeft,
+                                                                            copyable && styles.userSelectText,
+                                                                            shouldApplyIconPaddingToHTMLTitle && iconLeftPadding,
+                                                                        ]}
+                                                                        dataSet={copyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                                                                    >
                                                                         {/* Use Text instead of RenderHTML when the title is plain text.
                                                                             Titles with shouldRenderAsHTML use baseFontStyle, which differs from combinedTitleTextStyle below.
                                                                         */}

From e1d2f61be67ba15ead56b15741289012c67d5ad2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 4 Aug 2026 04:49:46 +0700
Subject: [PATCH 023/781] Fix merchant operator rows overlapping the value
 input on native

SingleSelectListItem's BaseListItem stack miscalculates row height when
rendered outside a SelectionList on native (Fabric), collapsing the row
so the merchant value input overlapped the Equal to/Contains labels.
Replace the two operator rows with a plain PressableWithFeedback +
ListRadioButton row, which lays out correctly on all platforms. Web
rendering is unchanged.
---
 .../TextInputFilterContent.tsx                | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 525cd9b8943e..7b45ffce1dd9 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,9 +1,11 @@
 import Button from '@components/Button';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import ListRadioButton from '@components/SelectionList/components/ListRadioButton';
 import type {ListItem} from '@components/SelectionList/types';
+import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
@@ -99,12 +101,19 @@ function TextInputFilterContent({
                     {shouldShowMerchantMatchType
                         ? merchantMatchTypeItems.map((item) => (
                               <Fragment key={item.keyForList}>
-                                  <SingleSelectListItem
-                                      item={item}
-                                      showTooltip={false}
-                                      keyForList={item.keyForList}
-                                      onSelectRow={() => setMerchantOperator(item.keyForList)}
-                                  />
+                                  <PressableWithFeedback
+                                      sentryLabel="TextInputFilterContent-MerchantMatchType"
+                                      accessibilityLabel={item.text ?? ''}
+                                      role={CONST.ROLE.BUTTON}
+                                      onPress={() => setMerchantOperator(item.keyForList)}
+                                      style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.optionRow]}
+                                  >
+                                      <Text style={[styles.optionDisplayName, styles.sidebarLinkTextBold]}>{item.text}</Text>
+                                      <ListRadioButton
+                                          item={item}
+                                          onSelectRow={() => setMerchantOperator(item.keyForList)}
+                                      />
+                                  </PressableWithFeedback>
                                   {item.isSelected && filterInput}
                               </Fragment>
                           ))

From 58af72695fd808741bb513c7cec8e058716ded3a Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 16:36:24 +0430
Subject: [PATCH 024/781] Remove redundant copyable text selection styles

---
 src/components/DisplayNames/DisplayNamesTooltipItem.tsx    | 2 +-
 src/components/DisplayNames/DisplayNamesWithTooltip.tsx    | 2 +-
 src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx | 2 +-
 src/components/MenuItem.tsx                                | 1 -
 src/components/TextWithTooltip/index.tsx                   | 5 +----
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index a217b0660be9..3f01dfd4b676 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -76,7 +76,7 @@ function DisplayNamesTooltipItem({
                     // eslint-disable-next-line no-param-reassign
                     childRefs.current[index] = el;
                 }}
-                style={[textStyles, styles.pre, isCopyable && styles.userSelectText]}
+                style={[textStyles, styles.pre]}
                 fsClass={forwardedFSClass}
                 selectable={isCopyable}
                 dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index a7d0e6143cb2..e35846be2f21 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -69,7 +69,7 @@ function DisplayNamesWithToolTip({
         // Tokenization of string only support prop numberOfLines on Web
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, styles.pRelative, isCopyable && styles.userSelectText]}
+            style={[textStyles, styles.pRelative]}
             numberOfLines={numberOfLines || undefined}
             ref={containerRef}
             testID="DisplayNamesWithToolTip"
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index ff102b7e359e..15668a0119b9 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -42,7 +42,7 @@ function DisplayNamesWithoutTooltip({
     return (
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap, isCopyable && styles.userSelectText]}
+            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap]}
             numberOfLines={numberOfLines}
             fsClass={forwardedFSClass}
             selectable={isCopyable}
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index 0ed2288b051b..a2052613c7f6 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -695,7 +695,6 @@ function MenuItem({
             shouldShowBasicTitle ? {} : styles.textStrong,
             numberOfLinesTitle !== 1 ? styles.preWrap : styles.pre,
             interactive && disabled ? {...styles.userSelectNone} : {},
-            copyable ? styles.userSelectText : {},
             styles.ltr,
             isDeleted ? styles.offlineFeedbackDeleted : {},
             shouldBreakWord ? styles.breakWord : {},
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index c160b55f0365..6ad1a2337f6a 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -1,8 +1,6 @@
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
-import useThemeStyles from '@hooks/useThemeStyles';
-
 import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
@@ -14,7 +12,6 @@ type LayoutChangeEvent = {
 };
 
 function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
-    const styles = useThemeStyles();
     const [showTooltip, setShowTooltip] = useState(false);
 
     return (
@@ -24,7 +21,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
         >
             <Text
                 testID={testID}
-                style={[style, isCopyable && styles.userSelectText]}
+                style={style}
                 numberOfLines={numberOfLines}
                 selectable={isCopyable}
                 onLayout={(e) => {

From 37620ce73c7cfb566ba054ff4929ab2a2d619f47 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 17:14:20 +0430
Subject: [PATCH 025/781] Let copyable report transaction text bypass touch
 selection blocking

---
 .../MoneyRequestReportTransactionItem.tsx        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 222d738dacf5..5fd7d1836ed4 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -201,11 +201,21 @@ function MoneyRequestReportTransactionItemBody({
         handleOnPress(transaction.transactionID);
     };
 
-    const handlePressIn = () => {
+    const handlePressIn: React.ComponentProps<typeof PressableWithFeedback>['onPressIn'] = (event) => {
         wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
-        if (canUseTouchScreen()) {
-            ControlSelection.block();
+        // Selection only needs to be blocked for touch interactions; desktop mouse selection is handled by onMouseDown.
+        if (!canUseTouchScreen()) {
+            return;
         }
+
+        // Let copyable values use native long-press/drag selection instead of applying the global selection blocker.
+        const isCopyableTarget = markMouseDownOnCopyableText(event?.target as unknown as EventTarget | null | undefined);
+        if (isCopyableTarget) {
+            return;
+        }
+
+        // Preserve the existing row behavior for non-copyable touch targets.
+        ControlSelection.block();
     };
 
     const handlePressableLongPress = () => {

From 7eff4d55df6986aebd5d15c4ed735c704cb56fd0 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 17:44:17 +0430
Subject: [PATCH 026/781] Keep narrow expense report rows as plain copyable
 text

---
 .../ExpenseReportListItemRowNarrow.tsx        | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index 0bb6edb39d80..d893a7d3ab6d 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -1,6 +1,7 @@
 import Checkbox from '@components/Checkbox';
 import getExpenseReportRowDisplayValues from '@components/Search/SearchList/ListItem/getExpenseReportRowDisplayValues';
-import TextWithTooltip from '@components/TextWithTooltip';
+import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
@@ -37,29 +38,37 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
             )}
             <View style={[styles.flexColumn, styles.gap1, styles.flex1]}>
                 <View style={[styles.flexRow, styles.gap2]}>
-                    <TextWithTooltip
-                        text={item.reportName ?? ''}
+                    <Text
                         numberOfLines={2}
                         style={[styles.lh20, styles.flex1]}
-                        isCopyable
-                    />
-                    <TextWithTooltip
-                        text={amountText}
+                        selectable
+                        dataSet={COPYABLE_TEXT_DATA_SET}
+                    >
+                        {item.reportName ?? ''}
+                    </Text>
+                    <Text
                         style={[styles.lh20, styles.flexShrink0, styles.textAlignRight]}
-                        isCopyable
-                    />
+                        selectable
+                        dataSet={COPYABLE_TEXT_DATA_SET}
+                    >
+                        {amountText}
+                    </Text>
                 </View>
                 <View style={[styles.flexRow, styles.gap2]}>
-                    <TextWithTooltip
-                        text={formattedDate}
+                    <Text
                         style={[styles.mutedNormalTextLabel, styles.flex1]}
-                        isCopyable
-                    />
-                    <TextWithTooltip
-                        text={expenseCountText}
+                        selectable
+                        dataSet={COPYABLE_TEXT_DATA_SET}
+                    >
+                        {formattedDate}
+                    </Text>
+                    <Text
                         style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight]}
-                        isCopyable
-                    />
+                        selectable
+                        dataSet={COPYABLE_TEXT_DATA_SET}
+                    >
+                        {expenseCountText}
+                    </Text>
                 </View>
             </View>
         </View>

From b7289bb24eecf401cf1b3f3ac4b64a182f1ee425 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 17:55:16 +0430
Subject: [PATCH 027/781] Keep user info cells as plain copyable text

---
 .../Search/SearchList/ListItem/UserInfoCell.tsx    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index aa6a1da4b1f7..196619b938bc 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -1,5 +1,6 @@
 import Avatar from '@components/Avatar';
-import TextWithTooltip from '@components/TextWithTooltip';
+import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -44,12 +45,15 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
                 avatarID={accountID}
                 containerStyles={[styles.pr2, avatarStyle]}
             />
-            <TextWithTooltip
-                text={displayName}
+            {/* Keep this as plain text; selectable plus the copyable marker is enough for row copy behavior. */}
+            <Text
                 numberOfLines={1}
                 style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle]}
-                isCopyable
-            />
+                selectable
+                dataSet={COPYABLE_TEXT_DATA_SET}
+            >
+                {displayName}
+            </Text>
         </View>
     );
 }

From 6981c6652bef6ffc4acd13104c01f0c384235ce4 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 18:00:00 +0430
Subject: [PATCH 028/781] Simplify BaseListItem press suppression logic

---
 src/components/SelectionList/ListItem/BaseListItem.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index ff7e643f7ac4..3f420d59950f 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -202,12 +202,7 @@ function BaseListItem<TItem extends ListItem>({
                     onLongPressRow?.(item);
                 }}
                 onPress={(e) => {
-                    if (shouldSuppressCopyableTextRowPress()) {
-                        e?.stopPropagation();
-                        return;
-                    }
-
-                    if (isMouseDownOnInput) {
+                    if (shouldSuppressCopyableTextRowPress() || isMouseDownOnInput) {
                         e?.stopPropagation(); // Preventing the click action
                         return;
                     }

From d322412b19fa5214f03b2ddc7fd65ce575cb38bf Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 19:04:26 +0430
Subject: [PATCH 029/781] Keep AvatarWithDisplayName copyability scoped to
 report titles

---
 src/components/AvatarWithDisplayName.tsx     | 21 ++++++++++----------
 src/components/DisplayNames/index.native.tsx | 13 +++++++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 6d4d42944935..7890d0d305d1 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -3,7 +3,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
-import {useDerivedReportNamesByReportIDs} from '@hooks/useReportAttributes';
+import useReportAttributes, {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -14,8 +14,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import {getHumanAgentAccountIDFromReportAction, getHumanAgentFirstName} from '@libs/ReportActionsUtils';
-import {getReportNameFromNames} from '@libs/ReportAttributesUtils';
-import {getReportName} from '@libs/ReportNameUtils';
+import {deprecatedGetReportName} from '@libs/ReportNameUtils';
 import type {DisplayNameWithTooltips} from '@libs/ReportUtils';
 import {
     canEditReportTitle,
@@ -110,14 +109,16 @@ function getCustomDisplayName(
     title: string,
     displayNamesWithTooltips: DisplayNameWithTooltips,
     transactions: TransactionListItemType[],
-    shouldUseFullTitle: boolean,
     customSearchDisplayStyle: TextStyle[],
     regularStyle: TextStyle[],
+    isAnonymous: boolean,
+    isMoneyRequestOrReport: boolean,
     isCopyable: boolean,
 ): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
     const isIOUOrInvoice = report?.type === CONST.REPORT.TYPE.IOU || report?.type === CONST.REPORT.TYPE.INVOICE;
     const hasTransactions = transactions.length > 0;
+    const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
 
     function getDisplayProps(): DisplayNamesProps {
         const baseProps = {
@@ -160,7 +161,7 @@ function getCustomDisplayName(
         return {
             fullTitle: title,
             textStyles: regularStyle,
-            shouldUseFullTitle,
+            shouldUseFullTitle: isMoneyRequestOrReport || isAnonymous,
             ...baseProps,
         };
     }
@@ -209,10 +210,10 @@ function AvatarWithDisplayName({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
 
-    const derivedReportNames = useDerivedReportNamesByReportIDs([report?.reportID, report?.parentReportID]);
-    const derivedParentReportName = getReportNameFromNames(derivedReportNames, report?.parentReportID);
+    const reportAttributes = useReportAttributes();
+    const derivedParentReportName = useDerivedReportNameByReportID(report?.parentReportID);
     const isReportArchived = useReportIsArchived(report?.reportID);
-    const title = getReportName(report, getReportNameFromNames(derivedReportNames, report?.reportID));
+    const title = deprecatedGetReportName(report, reportAttributes);
     const isParentReportArchived = useReportIsArchived(report?.parentReportID);
     const subtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translate, true, isReportArchived);
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report, policy, conciergeReportID, translate, derivedParentReportName, isParentReportArchived);
@@ -283,16 +284,16 @@ function AvatarWithDisplayName({
         }
     };
 
-    const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
     const displayNameContent = getCustomDisplayName(
         shouldUseCustomSearchTitleName,
         report,
         title,
         displayNamesWithTooltips,
         transactions,
-        shouldUseFullTitle,
         [styles.headerText, styles.pre, customDisplayNameStyle],
         [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
+        isAnonymous,
+        isMoneyRequestOrReport,
         isDisplayNameCopyable,
     );
 
diff --git a/src/components/DisplayNames/index.native.tsx b/src/components/DisplayNames/index.native.tsx
index b3c62e101399..5e57ecfd9fed 100644
--- a/src/components/DisplayNames/index.native.tsx
+++ b/src/components/DisplayNames/index.native.tsx
@@ -13,7 +13,17 @@ import React, {useMemo} from 'react';
 import type DisplayNamesProps from './types';
 
 // As we don't have to show tooltips of the Native platform so we simply render the full display names list.
-function DisplayNames({accessibilityLabel, fullTitle, textStyles = [], numberOfLines = 1, renderAdditionalText, forwardedFSClass, testID, shouldParseFullTitle = true}: DisplayNamesProps) {
+function DisplayNames({
+    accessibilityLabel,
+    fullTitle,
+    textStyles = [],
+    numberOfLines = 1,
+    renderAdditionalText,
+    forwardedFSClass,
+    testID,
+    shouldParseFullTitle = true,
+    isCopyable = false,
+}: DisplayNamesProps) {
     const {translate} = useLocalize();
     const titleContainsTextAndCustomEmoji = useMemo(() => containsCustomEmoji(fullTitle) && !containsOnlyCustomEmoji(fullTitle), [fullTitle]);
     const title = useMemo(() => {
@@ -28,6 +38,7 @@ function DisplayNames({accessibilityLabel, fullTitle, textStyles = [], numberOfL
             numberOfLines={numberOfLines}
             testID={`DisplayNames${testID !== undefined ? `-${testID}` : ''}`}
             fsClass={forwardedFSClass}
+            selectable={isCopyable}
         >
             {titleContainsTextAndCustomEmoji ? (
                 <TextWithEmojiFragment

From 9d5c87d7fb963d3a62c38c4507318d6541861d2b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 4 Aug 2026 19:18:29 +0430
Subject: [PATCH 030/781] Separate MenuItem copy actions from selectable title
 text

---
 src/components/MenuItem.tsx                      | 16 ++++++++++------
 .../ReportActionItem/MoneyRequestView.tsx        | 13 +++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index a2052613c7f6..bee5c1cf298f 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -440,6 +440,9 @@ type MenuItemBaseProps = ForwardedFSClassProps &
         /** Should enable copy to clipboard action */
         copyable?: boolean;
 
+        /** Whether the title text should be directly selectable */
+        isTitleSelectable?: boolean;
+
         /** Plaid image for the bank */
         plaidUrl?: string;
 
@@ -616,6 +619,7 @@ function MenuItem({
     plaidUrl,
     copyValue = title,
     copyable = false,
+    isTitleSelectable = false,
     hasSubMenuItems = false,
     forwardedFSClass,
     ref,
@@ -819,7 +823,7 @@ function MenuItem({
             return;
         }
 
-        if (shouldSuppressCopyableTextRowPress(copyable)) {
+        if (shouldSuppressCopyableTextRowPress(isTitleSelectable)) {
             return;
         }
 
@@ -886,7 +890,7 @@ function MenuItem({
                             <PressableWithSecondaryInteraction
                                 onPress={shouldCheckActionAllowedOnPress ? callFunctionIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
                                 onMouseDown={(event) => {
-                                    markMouseDownOnCopyableText(event?.target, copyable);
+                                    markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
                                 onPressOut={ControlSelection.unblock}
@@ -1064,10 +1068,10 @@ function MenuItem({
                                                                         style={[
                                                                             styles.renderHTMLTitle,
                                                                             styles.textAlignLeft,
-                                                                            copyable && styles.userSelectText,
+                                                                            isTitleSelectable && styles.userSelectText,
                                                                             shouldApplyIconPaddingToHTMLTitle && iconLeftPadding,
                                                                         ]}
-                                                                        dataSet={copyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                                                                        dataSet={isTitleSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
                                                                     >
                                                                         {/* Use Text instead of RenderHTML when the title is plain text.
                                                                             Titles with shouldRenderAsHTML use baseFontStyle, which differs from combinedTitleTextStyle below.
@@ -1085,9 +1089,9 @@ function MenuItem({
                                                                         numberOfLines={numberOfLinesTitle || undefined}
                                                                         dataSet={{
                                                                             [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled,
-                                                                            ...(copyable ? COPYABLE_TEXT_DATA_SET : {}),
+                                                                            ...(isTitleSelectable ? COPYABLE_TEXT_DATA_SET : {}),
                                                                         }}
-                                                                        selectable={copyable}
+                                                                        selectable={isTitleSelectable}
                                                                         accessibilityRole={titleAccessibilityRole}
                                                                     >
                                                                         {renderTitleContent()}
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index db6d8bcd20ba..99aa8a4720d5 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -998,6 +998,7 @@ function MoneyRequestView({
                     errorText={getErrorForField('waypoints')}
                     copyValue={distanceCopyValue}
                     copyable={!!distanceCopyValue}
+                    isTitleSelectable={!!distanceCopyValue}
                 />
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={getPendingFieldAction('customUnitRateID')}>
@@ -1056,6 +1057,7 @@ function MoneyRequestView({
                     errorText={getErrorForField('customUnitRateID')}
                     copyValue={distanceRateCopyValue}
                     copyable={!!distanceRateCopyValue}
+                    isTitleSelectable={!!distanceRateCopyValue}
                 />
             </OfflineWithFeedback>
         </>
@@ -1140,6 +1142,7 @@ function MoneyRequestView({
                     shouldShowDescriptionOnTop
                     copyValue={tagCopyValue}
                     copyable={!!tagCopyValue}
+                    isTitleSelectable={!!tagCopyValue}
                 />
             </OfflineWithFeedback>
         );
@@ -1240,6 +1243,7 @@ function MoneyRequestView({
                         errorText={getErrorForField('amount')}
                         copyValue={amountCopyValue}
                         copyable={!!amountCopyValue}
+                        isTitleSelectable={!!amountCopyValue}
                     />
                 </OfflineWithFeedback>
                 {!shouldHideEmptyDescription && (
@@ -1268,6 +1272,7 @@ function MoneyRequestView({
                             numberOfLinesTitle={0}
                             copyValue={descriptionCopyValue}
                             copyable={!!descriptionCopyValue}
+                            isTitleSelectable={!!descriptionCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1299,6 +1304,7 @@ function MoneyRequestView({
                             numberOfLinesTitle={0}
                             copyValue={merchantCopyValue}
                             copyable={!!merchantCopyValue}
+                            isTitleSelectable={!!merchantCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1325,6 +1331,7 @@ function MoneyRequestView({
                         errorText={getErrorForField('date')}
                         copyValue={dateCopyValue}
                         copyable={!!dateCopyValue}
+                        isTitleSelectable={!!dateCopyValue}
                     />
                 </OfflineWithFeedback>
                 {!!shouldShowCategory && (
@@ -1387,6 +1394,7 @@ function MoneyRequestView({
                             errorText={getErrorForField('category')}
                             copyValue={categoryCopyValue}
                             copyable={!!categoryCopyValue}
+                            isTitleSelectable={!!categoryCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1429,6 +1437,7 @@ function MoneyRequestView({
                             interactive={false}
                             copyValue={cardCopyValue}
                             copyable={!!cardCopyValue}
+                            isTitleSelectable={!!cardCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1457,6 +1466,7 @@ function MoneyRequestView({
                             errorText={getErrorForField('tax')}
                             copyValue={taxRateCopyValue}
                             copyable={!!taxRateCopyValue}
+                            isTitleSelectable={!!taxRateCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1483,6 +1493,7 @@ function MoneyRequestView({
                             }}
                             copyValue={taxAmountCopyValue}
                             copyable={!!taxAmountCopyValue}
+                            isTitleSelectable={!!taxAmountCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1525,6 +1536,7 @@ function MoneyRequestView({
                             shouldShowRightIcon={canEdit}
                             copyValue={attendeesCopyValue}
                             copyable={!!attendeesCopyValue}
+                            isTitleSelectable={!!attendeesCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1622,6 +1634,7 @@ function MoneyRequestView({
                             shouldRenderAsHTML
                             copyValue={reportCopyValue}
                             copyable={!!reportCopyValue}
+                            isTitleSelectable={!!reportCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}

From 7429be8025b3b654e5b1f359f94f2a8b8260721d Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 5 Aug 2026 10:57:11 +0430
Subject: [PATCH 031/781] Fix lint issues in copyable report title handling

---
 src/components/AvatarWithDisplayName.tsx               |  8 ++++----
 .../MoneyRequestReportTransactionItem.tsx              | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index f06d83aeeaa5..83c7e1ca390c 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -4,7 +4,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
-import useReportAttributes, {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
+import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -15,7 +15,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import {getHumanAgentAccountIDFromReportAction, getHumanAgentFirstName} from '@libs/ReportActionsUtils';
-import {deprecatedGetReportName} from '@libs/ReportNameUtils';
+import {getReportName} from '@libs/ReportNameUtils';
 import type {DisplayNameWithTooltips} from '@libs/ReportUtils';
 import {
     canEditReportTitle,
@@ -212,10 +212,10 @@ function AvatarWithDisplayName({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
 
-    const reportAttributes = useReportAttributes();
+    const derivedReportName = useDerivedReportNameByReportID(report?.reportID);
     const derivedParentReportName = useDerivedReportNameByReportID(report?.parentReportID);
     const isReportArchived = useReportIsArchived(report?.reportID);
-    const title = deprecatedGetReportName(report, reportAttributes);
+    const title = getReportName(report, derivedReportName);
     const isParentReportArchived = useReportIsArchived(report?.parentReportID);
     const subtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translate, true, isReportArchived);
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report, policy, conciergeReportID, translate, derivedParentReportName, isParentReportArchived);
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 5fd7d1836ed4..aae8bbdf9af9 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -114,6 +114,14 @@ type MoneyRequestReportTransactionItemBodyProps = Omit<MoneyRequestReportTransac
     shouldSkipDeferRBR?: boolean;
 };
 
+function getPressEventTarget(target: unknown): EventTarget | null {
+    if (typeof EventTarget === 'undefined' || !(target instanceof EventTarget)) {
+        return null;
+    }
+
+    return target;
+}
+
 function MoneyRequestReportTransactionItemBody({
     transaction,
     violations,
@@ -209,7 +217,7 @@ function MoneyRequestReportTransactionItemBody({
         }
 
         // Let copyable values use native long-press/drag selection instead of applying the global selection blocker.
-        const isCopyableTarget = markMouseDownOnCopyableText(event?.target as unknown as EventTarget | null | undefined);
+        const isCopyableTarget = markMouseDownOnCopyableText(getPressEventTarget(event?.target));
         if (isCopyableTarget) {
             return;
         }

From 3c20c8ef492ad5908a46145f46afbdd8e16b3027 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 6 Aug 2026 01:14:09 +0430
Subject: [PATCH 032/781] Make report, expense, and member values reliably
 copyable in pressable rows

---
 .../SearchList/ListItem/GroupHeader.tsx       |  31 ++--
 .../ListItem/TransactionGroupListExpanded.tsx |   1 +
 .../ListItem/TransactionGroupListItem.tsx     |  32 ++--
 .../WorkspaceMembersTableRow.tsx              |  28 ++-
 src/components/TextWithTooltip/selection.ts   | 167 ++++++++++++++++-
 .../TransactionItemRowNarrow.tsx              |   3 +
 .../TransactionItemRowWide.tsx                |   2 +
 src/components/TransactionItemRow/index.tsx   |   3 +
 src/components/TransactionItemRow/types.ts    |   1 +
 src/libs/SelectionScraper/index.ts            | 174 +++++++++++++++++-
 10 files changed, 397 insertions(+), 45 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 51a24efef4c7..04d9faca52a1 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -6,7 +6,7 @@ import {useSearchSelectionContext} from '@components/Search/SearchContext';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@components/Search/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
+import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -360,7 +360,7 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {handleCopyableTextRowPress, markMouseDownOnCopyableText} = useCopyableTextRowPress();
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -377,16 +377,18 @@ function GroupHeader({
     const shouldDisplayEmptyView = isEmpty && isExpenseReportType;
 
     const handlePress = (event?: ModifiedMouseEvent) => {
-        if (shouldSuppressCopyableTextRowPress()) {
-            return;
-        }
-
-        if (isExpenseReportType) {
-            onSelectRow(withOriginalKey(item), transactionPreviewData, event);
-        }
-        if (!isExpenseReportType) {
-            onToggle();
-        }
+        handleCopyableTextRowPress(
+            () => {
+                if (isExpenseReportType) {
+                    onSelectRow(withOriginalKey(item), transactionPreviewData, event);
+                }
+                if (!isExpenseReportType) {
+                    onToggle();
+                }
+            },
+            true,
+            true,
+        );
     };
 
     const handleLongPress = () => {
@@ -407,7 +409,10 @@ function GroupHeader({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
+                    // Fresh double-click selection can press before selected text exists, so suppress grouped-header toggles that start on copyable text.
+                    const isCopyableTextMouseDown = isMouseDownOnCopyableText(e);
+                    const shouldSuppressTextPress = isCopyableTextMouseDown && shouldSuppressCopyableTextPressOnMouseDown(e);
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target, isCopyableTextMouseDown, shouldSuppressTextPress);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 29690f939146..31098ff6ed3d 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -385,6 +385,7 @@ function TransactionGroupListExpandedImpl({
                                     columns={currentColumns}
                                     onButtonPress={(event) => handleButtonPress(transaction, event)}
                                     style={[styles.noBorderRadius, isLargeScreenWidth ? [styles.p3, styles.pv2, styles.tableRowHeight] : styles.p4, styles.flex1]}
+                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     isReportItemChild
                                     isInSingleTransactionReport={isInSingleTransactionReport}
                                     shouldShowBottomBorder={shouldShowBottomBorder}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 53ae59d84b5b..09ae61d71645 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -6,7 +6,7 @@ import {useSearchResultsContext, useSearchSelectionContext} from '@components/Se
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
+import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -252,7 +252,7 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {handleCopyableTextRowPress, markMouseDownOnCopyableText} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -311,16 +311,18 @@ function TransactionGroupListItemImpl({
     };
 
     const onPress = (event?: ModifiedMouseEvent) => {
-        if (shouldSuppressCopyableTextRowPress()) {
-            return;
-        }
-
-        if (isExpenseReportType || transactions.length === 0) {
-            onSelectRow(item, transactionPreviewData, event);
-        }
-        if (!isExpenseReportType) {
-            handleToggle();
-        }
+        handleCopyableTextRowPress(
+            () => {
+                if (isExpenseReportType || transactions.length === 0) {
+                    onSelectRow(item, transactionPreviewData, event);
+                }
+                if (!isExpenseReportType) {
+                    handleToggle();
+                }
+            },
+            true,
+            true,
+        );
     };
 
     const onLongPress = () => {
@@ -575,7 +577,11 @@ function TransactionGroupListItemImpl({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
+                    // Suppress grouped-row toggle only when the interaction starts on selectable text;
+                    // blank row space keeps expand/collapse behavior.
+                    const isCopyableTextMouseDown = isMouseDownOnCopyableText(e);
+                    const shouldSuppressTextPress = isCopyableTextMouseDown && shouldSuppressCopyableTextPressOnMouseDown(e);
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target, isCopyableTextMouseDown, shouldSuppressTextPress);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index a13de6a6663a..e91e8368ab0a 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -4,6 +4,7 @@ import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
 import Text from '@components/Text';
 import TextWithTooltip from '@components/TextWithTooltip';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -76,12 +77,18 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
                         style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}
                         {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                     >
-                        <ReportActionAvatars
-                            size={avatarSize}
-                            accountIDs={[item.accountID]}
-                            fallbackDisplayName={item.name ?? item.email}
-                            secondaryAvatarContainerStyle={getSecondaryAvatarContainerStyle(!!hovered)}
-                        />
+                        <View
+                            // Avatar initials are visual-only in member rows, so keep them out of multi-row copied text.
+                            style={styles.userSelectNone}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                        >
+                            <ReportActionAvatars
+                                size={avatarSize}
+                                accountIDs={[item.accountID]}
+                                fallbackDisplayName={item.name ?? item.email}
+                                secondaryAvatarContainerStyle={getSecondaryAvatarContainerStyle(!!hovered)}
+                            />
+                        </View>
                         <View style={[shouldUseNarrowTableLayout && styles.gap1, styles.flex1]}>
                             <TextWithTooltip
                                 shouldShowTooltip
@@ -139,7 +146,14 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
                             style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <Text numberOfLines={1}>{roleLabel}</Text>
+                            {/* Keep role as plain text while marking it copyable like the other member-table values. */}
+                            <Text
+                                numberOfLines={1}
+                                selectable
+                                dataSet={COPYABLE_TEXT_DATA_SET}
+                            >
+                                {roleLabel}
+                            </Text>
                         </View>
                     )}
 
diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index 9d2d0bc72fd9..fdd6bb35cf49 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-import {useRef} from 'react';
+import {useEffect, useRef} from 'react';
 
 /**
  * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
@@ -8,6 +8,19 @@ import {useRef} from 'react';
  */
 const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
+// Keep the delay short while leaving enough time for the browser to report a second click.
+const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 300;
+
+type CaretPosition = {
+    offsetNode: Node | null;
+    offset: number;
+};
+
+type DocumentWithCaretHelpers = Document & {
+    // Browsers expose different caret APIs for finding the text node under a pointer.
+    caretPositionFromPoint?: (x: number, y: number) => CaretPosition | null;
+    caretRangeFromPoint?: (x: number, y: number) => Range | null;
+};
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
@@ -33,6 +46,101 @@ function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
     return !!getCopyableTextElement(target);
 }
 
+function getMouseEventPosition(event: unknown): {clientX: number; clientY: number} | null {
+    // React Native Web events may expose mouse coordinates directly or through nativeEvent.
+    if (typeof event !== 'object' || event === null) {
+        return null;
+    }
+
+    if ('clientX' in event && 'clientY' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
+        return {clientX: event.clientX, clientY: event.clientY};
+    }
+
+    if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
+        return null;
+    }
+
+    const {nativeEvent} = event;
+    if ('clientX' in nativeEvent && 'clientY' in nativeEvent && typeof nativeEvent.clientX === 'number' && typeof nativeEvent.clientY === 'number') {
+        return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
+    }
+
+    return null;
+}
+
+function getTextNodeAtMousePosition(clientX: number, clientY: number): {node: Node; offset: number} | null {
+    if (typeof document === 'undefined' || typeof Node === 'undefined') {
+        return null;
+    }
+
+    const ownerDocument: DocumentWithCaretHelpers = document;
+
+    if (typeof ownerDocument.caretPositionFromPoint === 'function') {
+        const position = ownerDocument.caretPositionFromPoint(clientX, clientY);
+        if (position?.offsetNode?.nodeType === Node.TEXT_NODE) {
+            return {node: position.offsetNode, offset: position.offset};
+        }
+    }
+
+    if (typeof ownerDocument.caretRangeFromPoint === 'function') {
+        const range = ownerDocument.caretRangeFromPoint(clientX, clientY);
+        if (range?.startContainer?.nodeType === Node.TEXT_NODE) {
+            return {node: range.startContainer, offset: range.startOffset};
+        }
+    }
+
+    return null;
+}
+
+function isPointInsideTextRect(node: Node, offset: number, clientX: number, clientY: number): boolean {
+    const text = node.textContent ?? '';
+    if (!text.trim()) {
+        return false;
+    }
+
+    // Caret APIs can return a nearby text node from padding/empty space, so confirm the pointer is inside a glyph rect.
+    const offsetsToCheck = [offset, offset - 1].filter((textOffset) => textOffset >= 0 && textOffset < text.length);
+
+    for (const textOffset of offsetsToCheck) {
+        const range = document.createRange();
+        range.setStart(node, textOffset);
+        range.setEnd(node, textOffset + 1);
+
+        for (const rect of Array.from(range.getClientRects())) {
+            if (clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+function isMouseDownOnCopyableText(event: unknown): boolean {
+    const position = getMouseEventPosition(event);
+    if (!position) {
+        return false;
+    }
+
+    // Only treat direct text hits as copyable interactions, so blank space inside a copyable cell keeps normal row behavior.
+    const textPosition = getTextNodeAtMousePosition(position.clientX, position.clientY);
+    if (!textPosition || !isCopyableTextTarget(textPosition.node)) {
+        return false;
+    }
+
+    return isPointInsideTextRect(textPosition.node, textPosition.offset, position.clientX, position.clientY);
+}
+
+function shouldSuppressCopyableTextPressOnMouseDown(event: unknown): boolean {
+    // MouseEvent.detail is greater than 1 for double/triple clicks, which should select text instead of pressing the row.
+    if (typeof event !== 'object' || event === null || !('detail' in event)) {
+        return false;
+    }
+
+    const {detail} = event;
+    return typeof detail === 'number' && detail > 1;
+}
+
 // Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
 function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
     if (!didMouseDownStartOnCopyableText) {
@@ -55,23 +163,74 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
 
 function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
+    const shouldSuppressNextPressRef = useRef(false);
+    // Single-click row actions from copyable text are delayed so a following double-click can cancel them.
+    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+    const clearPendingCopyableTextPress = () => {
+        if (!pendingCopyableTextPressRef.current) {
+            return;
+        }
 
-    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
+        clearTimeout(pendingCopyableTextPressRef.current);
+        pendingCopyableTextPressRef.current = null;
+    };
+
+    useEffect(
+        () => () => {
+            if (!pendingCopyableTextPressRef.current) {
+                return;
+            }
+
+            clearTimeout(pendingCopyableTextPressRef.current);
+            pendingCopyableTextPressRef.current = null;
+        },
+        [],
+    );
+
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, shouldSuppressNextPress = false): boolean => {
+        // A second click on text cancels any pending single-click row action before it can expand/collapse the group.
+        clearPendingCopyableTextPress();
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
         return isCopyableTarget;
     };
 
     const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
-        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        const didMouseDownStartOnCopyableText = wasMouseDownOnCopyableTextRef.current;
+        const shouldSuppressNextPress = shouldSuppressNextPressRef.current;
+        const shouldSuppressFromSelection = shouldCheck && shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText);
+        // Some text-selection gestures, like double-click selection, can trigger press before selection text is observable.
+        const shouldSuppressPress = shouldCheck && (shouldSuppressNextPress || shouldSuppressFromSelection);
         wasMouseDownOnCopyableTextRef.current = false;
+        shouldSuppressNextPressRef.current = false;
         return shouldSuppressPress;
     };
 
+    const handleCopyableTextRowPress = (onPress: () => void, shouldCheck = true, shouldDelayCopyableTextPress = false) => {
+        // Delay only copyable-text single clicks so double-click text selection can cancel the row press; non-text clicks run immediately.
+        const shouldDelayPress = shouldCheck && shouldDelayCopyableTextPress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
+        if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
+            return;
+        }
+
+        if (!shouldDelayPress) {
+            onPress();
+            return;
+        }
+
+        pendingCopyableTextPressRef.current = setTimeout(() => {
+            pendingCopyableTextPressRef.current = null;
+            onPress();
+        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
+    };
+
     return {
         markMouseDownOnCopyableText,
         shouldSuppressCopyableTextRowPress,
+        handleCopyableTextRowPress,
     };
 }
 
-export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, useCopyableTextRowPress};
+export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress};
diff --git a/src/components/TransactionItemRow/TransactionItemRowNarrow.tsx b/src/components/TransactionItemRow/TransactionItemRowNarrow.tsx
index e12dd83a44f6..4b29589f12b6 100644
--- a/src/components/TransactionItemRow/TransactionItemRowNarrow.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowNarrow.tsx
@@ -36,6 +36,7 @@ type TransactionItemRowNarrowProps = Pick<
     | 'onCheckboxPress'
     | 'shouldShowCheckbox'
     | 'style'
+    | 'dataSet'
     | 'isInSingleTransactionReport'
     | 'shouldShowRadioButton'
     | 'onRadioButtonPress'
@@ -62,6 +63,7 @@ function TransactionItemRowNarrow({
     onCheckboxPress = () => {},
     shouldShowCheckbox = false,
     style,
+    dataSet,
     isInSingleTransactionReport = false,
     shouldShowRadioButton = false,
     onRadioButtonPress = () => {},
@@ -94,6 +96,7 @@ function TransactionItemRowNarrow({
         <>
             <View
                 style={[styles.expenseWidgetRadius, styles.overflowHidden, bgActiveStyles, styles.justifyContentEvenly, style]}
+                dataSet={dataSet}
                 testID="transaction-item-row"
             >
                 <View style={[styles.flexRow]}>
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index fd159d89e651..bf0a2e195cf2 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -88,6 +88,7 @@ function TransactionItemRowWide({
     columns,
     onButtonPress = () => {},
     style,
+    dataSet,
     isReportItemChild = false,
     isActionLoading,
     isInSingleTransactionReport = false,
@@ -682,6 +683,7 @@ function TransactionItemRowWide({
                     styles.mw100,
                     style,
                 ]}
+                dataSet={dataSet}
                 testID="transaction-item-row"
             >
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3, fullHeightMainRowStyle]}>
diff --git a/src/components/TransactionItemRow/index.tsx b/src/components/TransactionItemRow/index.tsx
index 562c7efa660a..d317dcb8de04 100644
--- a/src/components/TransactionItemRow/index.tsx
+++ b/src/components/TransactionItemRow/index.tsx
@@ -56,6 +56,7 @@ function TransactionItemRow({
     columns,
     onButtonPress = () => {},
     style,
+    dataSet,
     isReportItemChild = false,
     isActionLoading,
     isInSingleTransactionReport = false,
@@ -153,6 +154,7 @@ function TransactionItemRow({
             onCheckboxPress,
             shouldShowCheckbox,
             style,
+            dataSet,
             isInSingleTransactionReport,
             shouldShowRadioButton,
             onRadioButtonPress,
@@ -204,6 +206,7 @@ function TransactionItemRow({
         columns,
         onButtonPress,
         style,
+        dataSet,
         isReportItemChild,
         isActionLoading,
         isInSingleTransactionReport,
diff --git a/src/components/TransactionItemRow/types.ts b/src/components/TransactionItemRow/types.ts
index 019e34e468e1..7dac7d9ceddf 100644
--- a/src/components/TransactionItemRow/types.ts
+++ b/src/components/TransactionItemRow/types.ts
@@ -75,6 +75,7 @@ type TransactionItemRowProps = {
     columns?: SearchColumnType[];
     onButtonPress?: (event?: ModifiedMouseEvent) => void;
     style?: StyleProp<ViewStyle>;
+    dataSet?: Record<string, unknown>;
     isReportItemChild?: boolean;
     isActionLoading?: boolean;
     isInSingleTransactionReport?: boolean;
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 6b856caace3d..39ecb73d96f2 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -13,6 +13,156 @@ import type GetCurrentSelection from './types';
 
 const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user']);
 const tagAttribute = 'data-testid';
+const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
+const hiddenElementSelector = `[${hiddenElementAttribute}=true]`;
+// These rows need line-based copy output when a browser selection crosses grouped search rows.
+const copyableRowSelector = [`[${tagAttribute}=transaction-group-header-row][${hiddenElementAttribute}=true]`, `[${tagAttribute}=transaction-item-row][${hiddenElementAttribute}=true]`].join(
+    ', ',
+);
+
+function getCopyableElementText(element: globalThis.Element): string {
+    return element.textContent?.trim().replace(/[\t\n\r ]+/g, ' ') ?? '';
+}
+
+function isTopLevelCopyableElementForHiddenElement(copyableElement: globalThis.Element, hiddenElement: globalThis.Element): boolean {
+    if (!copyableElement.matches(COPYABLE_TEXT_SELECTOR) || copyableElement.closest(hiddenElementSelector) !== hiddenElement) {
+        return false;
+    }
+
+    // DisplayNames can mark both the wrapper and child names copyable, so only keep the top-most copyable node.
+    const copyableAncestor = copyableElement.parentElement?.closest(COPYABLE_TEXT_SELECTOR);
+    return !copyableAncestor || copyableAncestor.closest(hiddenElementSelector) !== hiddenElement;
+}
+
+function getCopyableTextForHiddenElement(element: globalThis.Element): string {
+    return [element, ...Array.from(element.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
+        .filter((copyableElement) => isTopLevelCopyableElementForHiddenElement(copyableElement, element))
+        .map(getCopyableElementText)
+        .filter((text) => !!text)
+        .join(' ');
+}
+
+function getDirectHiddenChildren(element: globalThis.Element): globalThis.Element[] {
+    return Array.from(element.querySelectorAll(hiddenElementSelector)).filter((hiddenElement) => hiddenElement.parentElement?.closest(hiddenElementSelector) === element);
+}
+
+function getCopyableSelectionLines(element: globalThis.Element): string[] {
+    const currentLine = getCopyableTextForHiddenElement(element);
+    // Expanded grouped rows contain hidden child rows; keep each child as its own copied line.
+    const nestedLines = getDirectHiddenChildren(element).flatMap(getCopyableSelectionLines);
+    return currentLine ? [currentLine, ...nestedLines] : nestedLines;
+}
+
+function replaceElementContentWithLines(element: globalThis.Element, lines: string[]) {
+    while (element.firstChild) {
+        element.removeChild(element.firstChild);
+    }
+
+    for (const [index, line] of lines.entries()) {
+        if (index > 0) {
+            element.appendChild(document.createElement('br'));
+        }
+        element.appendChild(document.createTextNode(line));
+    }
+}
+
+// Hidden row wrappers can contain avatars, icons, and violation text; keep only values explicitly marked copyable.
+function keepOnlyCopyableSelectionContent(element: globalThis.Element): boolean {
+    const copyableLines = getCopyableSelectionLines(element);
+    if (copyableLines.length === 0) {
+        return false;
+    }
+
+    // Rebuild copied row text with spaces between cells and line breaks between rows.
+    replaceElementContentWithLines(element, copyableLines);
+    element.removeAttribute(hiddenElementAttribute);
+    return true;
+}
+
+function getElementFromNode(node: globalThis.Node): globalThis.Element | null {
+    if (node instanceof globalThis.Element) {
+        return node;
+    }
+
+    return node.parentElement;
+}
+
+function getSelectedRowsForRange(range: Range): globalThis.Element[] {
+    const rootElement = getElementFromNode(range.commonAncestorContainer);
+    if (!rootElement) {
+        return [];
+    }
+
+    // Use the live selection range so partially selected first/last grouped rows are still included.
+    return [rootElement.closest(copyableRowSelector), ...Array.from(rootElement.querySelectorAll(copyableRowSelector))].filter(
+        (row): row is globalThis.Element => !!row && range.intersectsNode(row),
+    );
+}
+
+function isTopLevelCopyableElementForRow(copyableElement: globalThis.Element, row: globalThis.Element): boolean {
+    if (!copyableElement.matches(COPYABLE_TEXT_SELECTOR) || copyableElement.closest(copyableRowSelector) !== row) {
+        return false;
+    }
+
+    const copyableAncestor = copyableElement.parentElement?.closest(COPYABLE_TEXT_SELECTOR);
+    return !copyableAncestor || copyableAncestor.closest(copyableRowSelector) !== row;
+}
+
+function getCopyableElementsForSelectedRow(row: globalThis.Element, range: Range): globalThis.Element[] {
+    return [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))].filter(
+        (copyableElement) => isTopLevelCopyableElementForRow(copyableElement, row) && range.intersectsNode(copyableElement),
+    );
+}
+
+function getHTMLOfSelectedTransactionRows(selection: Selection): string {
+    const selectedRows: globalThis.Element[] = [];
+    const selectedCopyableElementsByRow = new Map<globalThis.Element, Set<globalThis.Element>>();
+
+    // Build an ordered row -> cells map so multi-row copied output follows the visual table order.
+    for (let i = 0; i < selection.rangeCount; i++) {
+        const range = selection.getRangeAt(i);
+        for (const row of getSelectedRowsForRange(range)) {
+            const copyableElements = getCopyableElementsForSelectedRow(row, range);
+            if (copyableElements.length === 0) {
+                continue;
+            }
+
+            if (!selectedCopyableElementsByRow.has(row)) {
+                selectedRows.push(row);
+                selectedCopyableElementsByRow.set(row, new Set());
+            }
+
+            const selectedCopyableElements = selectedCopyableElementsByRow.get(row);
+            for (const copyableElement of copyableElements) {
+                selectedCopyableElements?.add(copyableElement);
+            }
+        }
+    }
+
+    const selectedCopyableElementCount = Array.from(selectedCopyableElementsByRow.values()).reduce((count, copyableElements) => count + copyableElements.size, 0);
+    if (selectedCopyableElementCount <= 1) {
+        // Single-cell selections should preserve the browser's exact selected text instead of forcing full-cell output.
+        return '';
+    }
+
+    const lines = selectedRows
+        .map((row) =>
+            [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
+                .filter((copyableElement) => selectedCopyableElementsByRow.get(row)?.has(copyableElement))
+                .map(getCopyableElementText)
+                .filter((text) => !!text)
+                .join(' '),
+        )
+        .filter((line) => !!line);
+
+    if (lines.length === 0) {
+        return '';
+    }
+
+    const div = document.createElement('div');
+    replaceElementContentWithLines(div, lines);
+    return div.innerHTML;
+}
 
 /**
  * Reads html of selection. If browser doesn't support Selection API, returns empty string.
@@ -32,6 +182,12 @@ const getHTMLOfSelection = (): string => {
         return window.getSelection()?.toString() ?? '';
     }
 
+    const selectedTransactionRowsHTML = getHTMLOfSelectedTransactionRows(selection);
+    if (selectedTransactionRowsHTML) {
+        // Grouped transaction rows need normalized row text before the generic selection cleanup strips hidden wrappers.
+        return selectedTransactionRowsHTML;
+    }
+
     const div = document.createElement('div');
 
     // HTML tag of markdown comments is in data-testid attribute (em, strong, blockquote..). Our goal here is to
@@ -91,15 +247,17 @@ const getHTMLOfSelection = (): string => {
         }
     }
 
-    // Find and remove the div housing the UnreadActionIndicator because we don't want
-    // the 'New/Nuevo' text inside it being copied.
-    const divsToRemove = div.querySelectorAll(`[data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}=true]`);
+    // Find and remove content that is intentionally hidden from copied selections.
+    const hiddenElements = div.querySelectorAll(hiddenElementSelector);
+
+    if (hiddenElements && hiddenElements.length > 0) {
+        for (const element of hiddenElements) {
+            if (!div.contains(element)) {
+                continue;
+            }
 
-    if (divsToRemove && divsToRemove.length > 0) {
-        for (const element of divsToRemove) {
-            // Keep explicitly copyable values even when their parent row is hidden from the selection scraper.
-            if (element.matches(COPYABLE_TEXT_SELECTOR) || element.querySelector(COPYABLE_TEXT_SELECTOR)) {
-                element.removeAttribute(`data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`);
+            // Keep only explicitly copyable values when their parent row is hidden from the selection scraper.
+            if (keepOnlyCopyableSelectionContent(element)) {
                 continue;
             }
             element.remove();

From 1d3d85713415aa61e642875f28f10b6bada1bf62 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 6 Aug 2026 01:50:53 +0430
Subject: [PATCH 033/781] Fix lint issues in copyable row selection helpers

---
 src/components/TextWithTooltip/selection.ts | 71 ++++++++-------------
 src/libs/SelectionScraper/index.ts          |  2 +-
 2 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index fdd6bb35cf49..a3320662cce5 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -11,17 +11,6 @@ const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 // Keep the delay short while leaving enough time for the browser to report a second click.
 const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 300;
 
-type CaretPosition = {
-    offsetNode: Node | null;
-    offset: number;
-};
-
-type DocumentWithCaretHelpers = Document & {
-    // Browsers expose different caret APIs for finding the text node under a pointer.
-    caretPositionFromPoint?: (x: number, y: number) => CaretPosition | null;
-    caretRangeFromPoint?: (x: number, y: number) => Range | null;
-};
-
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
         return null;
@@ -68,48 +57,44 @@ function getMouseEventPosition(event: unknown): {clientX: number; clientY: numbe
     return null;
 }
 
-function getTextNodeAtMousePosition(clientX: number, clientY: number): {node: Node; offset: number} | null {
-    if (typeof document === 'undefined' || typeof Node === 'undefined') {
+function getMouseEventTarget(event: unknown): EventTarget | null {
+    if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
         return null;
     }
 
-    const ownerDocument: DocumentWithCaretHelpers = document;
+    return event.target;
+}
 
-    if (typeof ownerDocument.caretPositionFromPoint === 'function') {
-        const position = ownerDocument.caretPositionFromPoint(clientX, clientY);
-        if (position?.offsetNode?.nodeType === Node.TEXT_NODE) {
-            return {node: position.offsetNode, offset: position.offset};
-        }
+function getTextNodes(element: HTMLElement): Node[] {
+    if (typeof document === 'undefined' || typeof NodeFilter === 'undefined' || typeof document.createTreeWalker !== 'function') {
+        return [];
     }
 
-    if (typeof ownerDocument.caretRangeFromPoint === 'function') {
-        const range = ownerDocument.caretRangeFromPoint(clientX, clientY);
-        if (range?.startContainer?.nodeType === Node.TEXT_NODE) {
-            return {node: range.startContainer, offset: range.startOffset};
+    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+    const textNodes: Node[] = [];
+    let currentNode = walker.nextNode();
+
+    while (currentNode) {
+        if (currentNode.textContent?.trim()) {
+            textNodes.push(currentNode);
         }
+        currentNode = walker.nextNode();
     }
 
-    return null;
+    return textNodes;
 }
 
-function isPointInsideTextRect(node: Node, offset: number, clientX: number, clientY: number): boolean {
-    const text = node.textContent ?? '';
-    if (!text.trim()) {
-        return false;
-    }
-
-    // Caret APIs can return a nearby text node from padding/empty space, so confirm the pointer is inside a glyph rect.
-    const offsetsToCheck = [offset, offset - 1].filter((textOffset) => textOffset >= 0 && textOffset < text.length);
+function isPointInsideRect(clientX: number, clientY: number, rect: DOMRect): boolean {
+    return clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom;
+}
 
-    for (const textOffset of offsetsToCheck) {
-        const range = document.createRange();
-        range.setStart(node, textOffset);
-        range.setEnd(node, textOffset + 1);
+function isPointInsideTextNode(node: Node, clientX: number, clientY: number): boolean {
+    const range = document.createRange();
+    range.selectNodeContents(node);
 
-        for (const rect of Array.from(range.getClientRects())) {
-            if (clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom) {
-                return true;
-            }
+    for (const rect of Array.from(range.getClientRects())) {
+        if (isPointInsideRect(clientX, clientY, rect)) {
+            return true;
         }
     }
 
@@ -123,12 +108,12 @@ function isMouseDownOnCopyableText(event: unknown): boolean {
     }
 
     // Only treat direct text hits as copyable interactions, so blank space inside a copyable cell keeps normal row behavior.
-    const textPosition = getTextNodeAtMousePosition(position.clientX, position.clientY);
-    if (!textPosition || !isCopyableTextTarget(textPosition.node)) {
+    const copyableElement = getCopyableTextElement(getMouseEventTarget(event));
+    if (!copyableElement) {
         return false;
     }
 
-    return isPointInsideTextRect(textPosition.node, textPosition.offset, position.clientX, position.clientY);
+    return getTextNodes(copyableElement).some((textNode) => isPointInsideTextNode(textNode, position.clientX, position.clientY));
 }
 
 function shouldSuppressCopyableTextPressOnMouseDown(event: unknown): boolean {
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 39ecb73d96f2..a64926b35373 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -21,7 +21,7 @@ const copyableRowSelector = [`[${tagAttribute}=transaction-group-header-row][${h
 );
 
 function getCopyableElementText(element: globalThis.Element): string {
-    return element.textContent?.trim().replace(/[\t\n\r ]+/g, ' ') ?? '';
+    return element.textContent?.trim().replaceAll(/[\t\n\r ]+/g, ' ') ?? '';
 }
 
 function isTopLevelCopyableElementForHiddenElement(copyableElement: globalThis.Element, hiddenElement: globalThis.Element): boolean {

From d1fa1cd1f39859c31f4080ed35bcf891142d6f4e Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 6 Aug 2026 10:11:28 +0700
Subject: [PATCH 034/781] Add missing merchant filter translation to Greek (el)

---
 src/languages/el.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/languages/el.ts b/src/languages/el.ts
index 156176de9848..9c8c327dd00a 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9230,6 +9230,10 @@ ${reportName}`,
                 },
                 equalTo: (amount?: string) => `Ίσο με ${amount ?? ''}`,
             },
+            merchant: {
+                equalTo: 'Ίσο με',
+                contains: 'Περιέχει',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Ενοποιημένη τιμολόγηση ταξιδιών',

From 215bee36eebe87b291e5f281270f90c843b10a44 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 6 Aug 2026 11:00:02 +0430
Subject: [PATCH 035/781] Exclude transaction status badges from copied row
 text

---
 src/components/TransactionItemRow/TransactionItemRowWide.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index bf0a2e195cf2..dcc889ce9822 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -591,6 +591,8 @@ function TransactionItemRowWide({
                     <View
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}
+                        // Status badges are visual state, not copyable row values, so exclude their text from copied selections.
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                     >
                         <StatusCell
                             stateNum={transactionItem.report?.stateNum}

From 7cc4975aa2217b60f93a8a0e892ea87712505098 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 6 Aug 2026 13:52:19 +0430
Subject: [PATCH 036/781] Fix merchant grouped header text selection on web

---
 src/components/Search/ExpenseGroupedSearchView.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/ExpenseGroupedSearchView.tsx b/src/components/Search/ExpenseGroupedSearchView.tsx
index d18170e4267c..b1eb04615afe 100644
--- a/src/components/Search/ExpenseGroupedSearchView.tsx
+++ b/src/components/Search/ExpenseGroupedSearchView.tsx
@@ -214,7 +214,10 @@ function ExpenseGroupedSearchView({
         layout.size = variables.tableRowHeight;
     };
 
-    const stickyHeaderConfig = shouldSplit ? {hideRelatedCell: true, useNativeDriver: true, zIndex: 2} : undefined;
+    // FlashList sticky headers render in a separate web layer, which breaks native multi-row text selection
+    // when dragging from the first merchant group header.
+    const shouldUseStickyGroupHeaders = shouldSplit && groupBy !== CONST.SEARCH.GROUP_BY.MERCHANT;
+    const stickyHeaderConfig = shouldUseStickyGroupHeaders ? {hideRelatedCell: true, useNativeDriver: true, zIndex: 2} : undefined;
 
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => {
         if (isGroupHeaderItem(item)) {
@@ -353,7 +356,7 @@ function ExpenseGroupedSearchView({
                 newTransactions={newTransactions}
                 isAttendeesEnabledForMovingPolicy={isAttendeesEnabledForMovingPolicy}
                 nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
-                stickyHeaderIndices={stickyHeaderIndices}
+                stickyHeaderIndices={shouldUseStickyGroupHeaders ? stickyHeaderIndices : undefined}
                 getItemType={getItemType}
                 stickyHeaderConfig={stickyHeaderConfig}
                 disabledIndexes={shouldSplit ? childrenContainerIndices : undefined}

From 2a353ed1b2f5b14535119cffa3be92c9509ad7f4 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 7 Aug 2026 17:13:09 +0700
Subject: [PATCH 037/781] fix(search): hide merchant match types when negated

---
 .../TextInputFilterContent.tsx                |  2 +-
 tests/ui/TextInputFilterContentTest.tsx       | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/TextInputFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 7b45ffce1dd9..bc9ceef0d43c 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -52,7 +52,7 @@ function TextInputFilterContent({
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
     const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
         {
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
new file mode 100644
index 000000000000..0cb5ff065c25
--- /dev/null
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -0,0 +1,51 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
+
+import CONST from '@src/CONST';
+
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+
+function renderMerchantFilter(onChange = jest.fn()) {
+    return {
+        onChange,
+        ...render(
+            <TextInputFilterContent
+                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                value="I"
+                isNegated={false}
+                merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                onChange={onChange}
+            />,
+        ),
+    };
+}
+
+describe('TextInputFilterContent', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('hides the merchant match type and omits the operator when the filter is negated', () => {
+        // Given a positive Merchant Contains filter where both match options must be available.
+        const {onChange} = renderMerchantFilter();
+
+        expect(screen.getByRole('button', {name: 'search.filters.merchant.equalTo'})).toBeOnTheScreen();
+        expect(screen.getByRole('button', {name: 'search.filters.merchant.contains'})).toBeOnTheScreen();
+
+        // When the user negates the filter because negated Merchant searches only support exact matching.
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        // Then match options disappear so the UI matches the submitted query.
+        expect(screen.queryByRole('button', {name: 'search.filters.merchant.equalTo'})).not.toBeOnTheScreen();
+        expect(screen.queryByRole('button', {name: 'search.filters.merchant.contains'})).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBeOnTheScreen();
+
+        // When the user confirms the negated filter after match options disappear.
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        // Then no Merchant operator is submitted because negated searches only support exact matching.
+        expect(onChange).toHaveBeenCalledWith('I', true, undefined);
+    });
+});

From 98de9dbd85f0eb7e37e0fedc4b9f471e53eabf1e Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 8 Aug 2026 20:52:35 +0430
Subject: [PATCH 038/781] Preserve `Text` components for copyable yes/no cells.

---
 .../TransactionItemRowWide.tsx                   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index 7471da06060e..04ce68359019 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -12,6 +12,8 @@ import AmountCell from '@components/Search/SearchList/ListItem/TotalCell';
 import UserInfoCell from '@components/Search/SearchList/ListItem/UserInfoCell';
 import WorkspaceCell from '@components/Search/SearchList/ListItem/WorkspaceCell';
 import type {SearchColumnType} from '@components/Search/types';
+import Text from '@components/Text';
+import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -326,7 +328,12 @@ function TransactionItemRowWide({
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE)]}
                     >
-                        <TextCell text={getReimbursable(transactionItem) ? translate('common.yes') : translate('common.no')} />
+                        <Text
+                            selectable
+                            dataSet={COPYABLE_TEXT_DATA_SET}
+                        >
+                            {getReimbursable(transactionItem) ? translate('common.yes') : translate('common.no')}
+                        </Text>
                     </View>
                 );
             case CONST.SEARCH.TABLE_COLUMNS.BILLABLE:
@@ -335,7 +342,12 @@ function TransactionItemRowWide({
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.BILLABLE)]}
                     >
-                        <TextCell text={transactionItem.billable ? translate('common.yes') : translate('common.no')} />
+                        <Text
+                            selectable
+                            dataSet={COPYABLE_TEXT_DATA_SET}
+                        >
+                            {transactionItem.billable ? translate('common.yes') : translate('common.no')}
+                        </Text>
                     </View>
                 );
             case CONST.SEARCH.TABLE_COLUMNS.ACTION:

From 799d6725ae897fce2c05609ae7ef8c0f28f312d6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 8 Aug 2026 23:57:15 +0430
Subject: [PATCH 039/781] Use shared cleanup for copyable text press timeout

---
 src/components/AvatarWithDisplayName.tsx             |  2 +-
 .../Search/SearchList/ListItem/UserInfoCell.tsx      |  1 -
 src/components/TextWithTooltip/selection.ts          | 12 +-----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 83c7e1ca390c..ecb178cf3407 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -162,7 +162,7 @@ function getCustomDisplayName(
         return {
             fullTitle: title,
             textStyles: regularStyle,
-            shouldUseFullTitle: isMoneyRequestOrReport || isAnonymous,
+            shouldUseFullTitle,
             ...baseProps,
         };
     }
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 196619b938bc..cda1f82060da 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -45,7 +45,6 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
                 avatarID={accountID}
                 containerStyles={[styles.pr2, avatarStyle]}
             />
-            {/* Keep this as plain text; selectable plus the copyable marker is enough for row copy behavior. */}
             <Text
                 numberOfLines={1}
                 style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle]}
diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/TextWithTooltip/selection.ts
index a3320662cce5..cd53b58c753f 100644
--- a/src/components/TextWithTooltip/selection.ts
+++ b/src/components/TextWithTooltip/selection.ts
@@ -161,17 +161,7 @@ function useCopyableTextRowPress() {
         pendingCopyableTextPressRef.current = null;
     };
 
-    useEffect(
-        () => () => {
-            if (!pendingCopyableTextPressRef.current) {
-                return;
-            }
-
-            clearTimeout(pendingCopyableTextPressRef.current);
-            pendingCopyableTextPressRef.current = null;
-        },
-        [],
-    );
+    useEffect(() => clearPendingCopyableTextPress, []);
 
     const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, shouldSuppressNextPress = false): boolean => {
         // A second click on text cancels any pending single-click row action before it can expand/collapse the group.

From ffa1ee0f87b9f511a831258c35adcc02b3671a51 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sun, 9 Aug 2026 01:52:58 +0430
Subject: [PATCH 040/781] Disable sticky headers for selectable grouped expense
 rows

---
 src/components/Search/ExpenseGroupedSearchView.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/ExpenseGroupedSearchView.tsx b/src/components/Search/ExpenseGroupedSearchView.tsx
index b1eb04615afe..56519dcdc628 100644
--- a/src/components/Search/ExpenseGroupedSearchView.tsx
+++ b/src/components/Search/ExpenseGroupedSearchView.tsx
@@ -19,7 +19,7 @@ import React, {useImperativeHandle, useState} from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps, TransactionViewExtras} from './searchViewProps';
-import type {SearchQueryJSON, SelectedTransactions} from './types';
+import type {SearchGroupBy, SearchQueryJSON, SelectedTransactions} from './types';
 
 import useSearchListViewState from './hooks/useSearchListViewState';
 import AnimatedExitRow from './primitives/AnimatedExitRow';
@@ -37,6 +37,13 @@ const keyExtractor = (item: SearchListItem, index: number) => item.keyForList ??
 
 const isRowDeleted = (item: SearchListItem) => item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
+const GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS: Set<SearchGroupBy> = new Set([
+    CONST.SEARCH.GROUP_BY.MERCHANT,
+    CONST.SEARCH.GROUP_BY.CATEGORY,
+    CONST.SEARCH.GROUP_BY.FROM,
+    CONST.SEARCH.GROUP_BY.CARD,
+]);
+
 const isGroupRowExiting = (item: SearchListItem) => isRowDeleted(item) || (isTransactionGroupListItemType(item) && item.transactions.length > 0 && item.transactions.every(isRowDeleted));
 
 const isRowSelected = (key: string | undefined, selectedTransactions: SelectedTransactions) => !!(key && selectedTransactions[key]?.isSelected);
@@ -215,8 +222,8 @@ function ExpenseGroupedSearchView({
     };
 
     // FlashList sticky headers render in a separate web layer, which breaks native multi-row text selection
-    // when dragging from the first merchant group header.
-    const shouldUseStickyGroupHeaders = shouldSplit && groupBy !== CONST.SEARCH.GROUP_BY.MERCHANT;
+    // when dragging from the first grouped header in text-heavy group-by views.
+    const shouldUseStickyGroupHeaders = shouldSplit && !GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS.has(groupBy);
     const stickyHeaderConfig = shouldUseStickyGroupHeaders ? {hideRelatedCell: true, useNativeDriver: true, zIndex: 2} : undefined;
 
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => {

From a487fa5d30204b02828da24b22ff4543858c84ac Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sun, 9 Aug 2026 02:28:59 +0430
Subject: [PATCH 041/781] Fix Set generic placement in grouped expense view

---
 src/components/Search/ExpenseGroupedSearchView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Search/ExpenseGroupedSearchView.tsx b/src/components/Search/ExpenseGroupedSearchView.tsx
index 56519dcdc628..ce40bcd51370 100644
--- a/src/components/Search/ExpenseGroupedSearchView.tsx
+++ b/src/components/Search/ExpenseGroupedSearchView.tsx
@@ -37,7 +37,7 @@ const keyExtractor = (item: SearchListItem, index: number) => item.keyForList ??
 
 const isRowDeleted = (item: SearchListItem) => item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
-const GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS: Set<SearchGroupBy> = new Set([
+const GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS = new Set<SearchGroupBy>([
     CONST.SEARCH.GROUP_BY.MERCHANT,
     CONST.SEARCH.GROUP_BY.CATEGORY,
     CONST.SEARCH.GROUP_BY.FROM,

From 18a0923a3f7dfaf7cc27922d87ce237628312f6b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 12 Aug 2026 17:02:38 +0430
Subject: [PATCH 042/781] Restore sticky grouped expense headers

---
 .../Search/ExpenseGroupedSearchView.tsx          | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/components/Search/ExpenseGroupedSearchView.tsx b/src/components/Search/ExpenseGroupedSearchView.tsx
index ce40bcd51370..d18170e4267c 100644
--- a/src/components/Search/ExpenseGroupedSearchView.tsx
+++ b/src/components/Search/ExpenseGroupedSearchView.tsx
@@ -19,7 +19,7 @@ import React, {useImperativeHandle, useState} from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps, TransactionViewExtras} from './searchViewProps';
-import type {SearchGroupBy, SearchQueryJSON, SelectedTransactions} from './types';
+import type {SearchQueryJSON, SelectedTransactions} from './types';
 
 import useSearchListViewState from './hooks/useSearchListViewState';
 import AnimatedExitRow from './primitives/AnimatedExitRow';
@@ -37,13 +37,6 @@ const keyExtractor = (item: SearchListItem, index: number) => item.keyForList ??
 
 const isRowDeleted = (item: SearchListItem) => item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
-const GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS = new Set<SearchGroupBy>([
-    CONST.SEARCH.GROUP_BY.MERCHANT,
-    CONST.SEARCH.GROUP_BY.CATEGORY,
-    CONST.SEARCH.GROUP_BY.FROM,
-    CONST.SEARCH.GROUP_BY.CARD,
-]);
-
 const isGroupRowExiting = (item: SearchListItem) => isRowDeleted(item) || (isTransactionGroupListItemType(item) && item.transactions.length > 0 && item.transactions.every(isRowDeleted));
 
 const isRowSelected = (key: string | undefined, selectedTransactions: SelectedTransactions) => !!(key && selectedTransactions[key]?.isSelected);
@@ -221,10 +214,7 @@ function ExpenseGroupedSearchView({
         layout.size = variables.tableRowHeight;
     };
 
-    // FlashList sticky headers render in a separate web layer, which breaks native multi-row text selection
-    // when dragging from the first grouped header in text-heavy group-by views.
-    const shouldUseStickyGroupHeaders = shouldSplit && !GROUP_BY_OPTIONS_WITH_SELECTABLE_HEADERS.has(groupBy);
-    const stickyHeaderConfig = shouldUseStickyGroupHeaders ? {hideRelatedCell: true, useNativeDriver: true, zIndex: 2} : undefined;
+    const stickyHeaderConfig = shouldSplit ? {hideRelatedCell: true, useNativeDriver: true, zIndex: 2} : undefined;
 
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => {
         if (isGroupHeaderItem(item)) {
@@ -363,7 +353,7 @@ function ExpenseGroupedSearchView({
                 newTransactions={newTransactions}
                 isAttendeesEnabledForMovingPolicy={isAttendeesEnabledForMovingPolicy}
                 nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
-                stickyHeaderIndices={shouldUseStickyGroupHeaders ? stickyHeaderIndices : undefined}
+                stickyHeaderIndices={stickyHeaderIndices}
                 getItemType={getItemType}
                 stickyHeaderConfig={stickyHeaderConfig}
                 disabledIndexes={shouldSplit ? childrenContainerIndices : undefined}

From 828cfa68fea02f8fbe020586b1cdc89b754987e6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 12 Aug 2026 17:43:10 +0430
Subject: [PATCH 043/781] Refactor display name options to preserve title
 behavior

---
 src/components/AvatarWithDisplayName.tsx | 29 ++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index ecb178cf3407..7b2909e9d363 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -4,7 +4,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
-import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
+import {useDerivedReportNamesByReportIDs} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -15,6 +15,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import {getHumanAgentAccountIDFromReportAction, getHumanAgentFirstName} from '@libs/ReportActionsUtils';
+import {getReportNameFromNames} from '@libs/ReportAttributesUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import type {DisplayNameWithTooltips} from '@libs/ReportUtils';
 import {
@@ -104,22 +105,26 @@ type AvatarWithDisplayNameProps = {
     parentNavigationStatusContainerStyles?: StyleProp<ViewStyle>;
 };
 
+type CustomDisplayNameOptions = {
+    isAnonymous: boolean;
+    isMoneyRequestOrReport: boolean;
+    isCopyable: boolean;
+};
+
 function getCustomDisplayName(
     shouldUseCustomSearchTitleName: boolean,
     report: OnyxEntry<Report>,
     title: string,
     displayNamesWithTooltips: DisplayNameWithTooltips,
     transactions: TransactionListItemType[],
+    shouldUseFullTitle: boolean,
     customSearchDisplayStyle: TextStyle[],
     regularStyle: TextStyle[],
-    isAnonymous: boolean,
-    isMoneyRequestOrReport: boolean,
-    isCopyable: boolean,
+    {isAnonymous, isMoneyRequestOrReport, isCopyable}: CustomDisplayNameOptions,
 ): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
     const isIOUOrInvoice = report?.type === CONST.REPORT.TYPE.IOU || report?.type === CONST.REPORT.TYPE.INVOICE;
     const hasTransactions = transactions.length > 0;
-    const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
 
     function getDisplayProps(): DisplayNamesProps {
         const baseProps = {
@@ -162,7 +167,7 @@ function getCustomDisplayName(
         return {
             fullTitle: title,
             textStyles: regularStyle,
-            shouldUseFullTitle,
+            shouldUseFullTitle: isMoneyRequestOrReport || isAnonymous,
             ...baseProps,
         };
     }
@@ -212,10 +217,10 @@ function AvatarWithDisplayName({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
 
-    const derivedReportName = useDerivedReportNameByReportID(report?.reportID);
-    const derivedParentReportName = useDerivedReportNameByReportID(report?.parentReportID);
+    const derivedReportNames = useDerivedReportNamesByReportIDs([report?.reportID, report?.parentReportID]);
+    const derivedParentReportName = getReportNameFromNames(derivedReportNames, report?.parentReportID);
     const isReportArchived = useReportIsArchived(report?.reportID);
-    const title = getReportName(report, derivedReportName);
+    const title = getReportName(report, getReportNameFromNames(derivedReportNames, report?.reportID));
     const isParentReportArchived = useReportIsArchived(report?.parentReportID);
     const subtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translate, true, isReportArchived);
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report, policy, conciergeReportID, translate, derivedParentReportName, isParentReportArchived);
@@ -286,17 +291,17 @@ function AvatarWithDisplayName({
         }
     };
 
+    const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
     const displayNameContent = getCustomDisplayName(
         shouldUseCustomSearchTitleName,
         report,
         title,
         displayNamesWithTooltips,
         transactions,
+        shouldUseFullTitle,
         [styles.headerText, styles.pre, customDisplayNameStyle],
         [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
-        isAnonymous,
-        isMoneyRequestOrReport,
-        isDisplayNameCopyable,
+        {isAnonymous, isMoneyRequestOrReport, isCopyable: isDisplayNameCopyable},
     );
 
     const multipleAvatars = (

From cd288763f847709c2fb9489956803982cf0d19f7 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 12 Aug 2026 18:22:45 +0430
Subject: [PATCH 044/781] Move copyable text helpers to a generic location

---
 src/components/{TextWithTooltip => CopyableText}/selection.ts  | 0
 src/components/DisplayNames/DisplayNamesTooltipItem.tsx        | 2 +-
 src/components/DisplayNames/DisplayNamesWithTooltip.tsx        | 2 +-
 src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx     | 2 +-
 src/components/MenuItem.tsx                                    | 2 +-
 .../MoneyRequestReportTransactionItem.tsx                      | 2 +-
 .../ExpenseReportListItemRowNarrow.tsx                         | 2 +-
 src/components/Search/SearchList/ListItem/GroupHeader.tsx      | 2 +-
 .../SearchList/ListItem/TransactionGroupListExpanded.tsx       | 2 +-
 .../Search/SearchList/ListItem/TransactionGroupListItem.tsx    | 2 +-
 .../ListItem/TransactionListItem/TransactionListItemNarrow.tsx | 2 +-
 .../ListItem/TransactionListItem/TransactionListItemWide.tsx   | 2 +-
 src/components/Search/SearchList/ListItem/UserInfoCell.tsx     | 2 +-
 src/components/SelectionList/ListItem/BaseListItem.tsx         | 2 +-
 src/components/Table/TableRow.tsx                              | 2 +-
 .../Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx  | 2 +-
 src/components/TextWithTooltip/index.tsx                       | 3 +--
 src/components/TransactionItemRow/TransactionItemRowWide.tsx   | 2 +-
 src/libs/SelectionScraper/index.ts                             | 2 +-
 19 files changed, 18 insertions(+), 19 deletions(-)
 rename src/components/{TextWithTooltip => CopyableText}/selection.ts (100%)

diff --git a/src/components/TextWithTooltip/selection.ts b/src/components/CopyableText/selection.ts
similarity index 100%
rename from src/components/TextWithTooltip/selection.ts
rename to src/components/CopyableText/selection.ts
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 3f01dfd4b676..bb29741288c3 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -1,5 +1,5 @@
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 import UserDetailsTooltip from '@components/UserDetailsTooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index e35846be2f21..a47f33011c70 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -1,5 +1,5 @@
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 import Tooltip from '@components/Tooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index 15668a0119b9..ab20f5805b1c 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -1,5 +1,5 @@
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index 76a97cc88f31..acfce7fc0298 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -46,6 +46,7 @@ import Avatar from './Avatar';
 import WorkspaceAvatar from './Avatar/WorkspaceAvatar';
 import Badge from './Badge';
 import {useIsCompactMenu} from './CompactMenuContext';
+import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from './CopyableText/selection';
 import CopyTextToClipboard from './CopyTextToClipboard';
 import DisplayNames from './DisplayNames';
 import FormHelpMessage from './FormHelpMessage';
@@ -59,7 +60,6 @@ import RadioButton from './RadioButton';
 import RenderHTML from './RenderHTML';
 import ReportActionAvatars from './ReportActionAvatars';
 import Text from './Text';
-import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from './TextWithTooltip/selection';
 import EducationalTooltip from './Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from './utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from './utils/getContextMenuAccessibilityProps';
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index aae8bbdf9af9..aeac30bf0785 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -1,8 +1,8 @@
 import {getButtonRole} from '@components/Button/utils';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index 1eb413bbe34d..c16645a85626 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -1,7 +1,7 @@
 import Checkbox from '@components/Checkbox';
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import getExpenseReportRowDisplayValues from '@components/Search/SearchList/ListItem/getExpenseReportRowDisplayValues';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 04d9faca52a1..4e322065f825 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -1,4 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
+import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -6,7 +7,6 @@ import {useSearchSelectionContext} from '@components/Search/SearchContext';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@components/Search/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
-import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index b58dcd29b1a8..5e46525c035a 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -1,5 +1,6 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import Button from '@components/Button';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -7,7 +8,6 @@ import ScrollView from '@components/ScrollView';
 import SearchTableHeader from '@components/Search/SearchTableHeader';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 8704b0116ae6..ae84e54aff4c 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -1,12 +1,12 @@
 import AnimatedCollapsible from '@components/AnimatedCollapsible';
 import {getButtonRole} from '@components/Button/utils';
+import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import {useSearchResultsContext, useSearchSelectionContext} from '@components/Search/SearchContext';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
-import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index b16c9a1ee4ac..b1adfb62567f 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -1,11 +1,11 @@
 import {getButtonRole} from '@components/Button/utils';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import UserInfoAndActionButtonRow from '@components/Search/SearchList/ListItem/UserInfoAndActionButtonRow';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 35f7587bf807..2ad1a6a38500 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -1,10 +1,10 @@
 import {getButtonRole} from '@components/Button/utils';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index cda1f82060da..f5e99702ea3e 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -1,6 +1,6 @@
 import Avatar from '@components/Avatar';
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 3f420d59950f..4271e7a16f42 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -1,4 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
@@ -6,7 +7,6 @@ import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWi
 import getAccessibilityLabel from '@components/SelectionList/utils/getAccessibilityLabel';
 import {getItemRole} from '@components/SelectionList/utils/getItemRole';
 import {getSelectableState} from '@components/SelectionList/utils/getSelectableState';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useHover from '@hooks/useHover';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 8c6ffce32810..5f8f4c9407fd 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -1,10 +1,10 @@
 import Checkbox from '@components/Checkbox';
+import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import ErrorMessageRow from '@components/ErrorMessageRow';
 import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import {useCopyableTextRowPress} from '@components/TextWithTooltip/selection';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useLocalize from '@hooks/useLocalize';
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index ea591e21492f..a5e31098558b 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -1,10 +1,10 @@
 import AccountAvatar from '@components/Avatar/connected/AccountAvatar';
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
 import Text from '@components/Text';
 import TextWithTooltip from '@components/TextWithTooltip';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 6ad1a2337f6a..87d5da22643b 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -1,3 +1,4 @@
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
@@ -5,8 +6,6 @@ import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
 
-import {COPYABLE_TEXT_DATA_SET} from './selection';
-
 type LayoutChangeEvent = {
     target: HTMLElement;
 };
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index eccb0d9ec78b..23983228c464 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -1,4 +1,5 @@
 import Checkbox from '@components/Checkbox';
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import {PressableWithFeedback} from '@components/Pressable';
 import RadioButton from '@components/RadioButton';
@@ -13,7 +14,6 @@ import UserInfoCell from '@components/Search/SearchList/ListItem/UserInfoCell';
 import WorkspaceCell from '@components/Search/SearchList/ListItem/WorkspaceCell';
 import type {SearchColumnType} from '@components/Search/types';
 import Text from '@components/Text';
-import {COPYABLE_TEXT_DATA_SET} from '@components/TextWithTooltip/selection';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index a64926b35373..bdc9e1676321 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -1,4 +1,4 @@
-import {COPYABLE_TEXT_SELECTOR} from '@components/TextWithTooltip/selection';
+import {COPYABLE_TEXT_SELECTOR} from '@components/CopyableText/selection';
 
 import CONST from '@src/CONST';
 

From c704cf8080ee8f4d94b7837147b6c829f4a3ac6b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 13 Aug 2026 11:43:47 +0430
Subject: [PATCH 045/781] Make editable expense detail values selectable

---
 .../ReportActionItem/MoneyRequestView.tsx     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 70893642988b..98b62d1effb3 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -937,22 +937,21 @@ function MoneyRequestView({
         });
     };
 
-    const distanceCopyValue = !canEditDistance ? distanceToDisplay : undefined;
-    const distanceRateCopyValue = !canEditDistanceRate ? rateToDisplay : undefined;
-    // Keep the visible amount copyable even when it is editable, so users do not need to open the amount step first.
+    const distanceCopyValue = distanceToDisplay || undefined;
+    const distanceRateCopyValue = rateToDisplay || undefined;
     const amountCopyValue = amountTitle || undefined;
     const descriptionHTML = updatedTransactionDescription ?? transactionDescription;
-    const descriptionCopyValue = !canEdit && descriptionHTML ? Parser.htmlToText(descriptionHTML) : undefined;
-    const merchantCopyValue = !canEditMerchant ? updatedMerchantTitle : undefined;
-    const dateCopyValue = !canEditDate ? transactionDate : undefined;
+    const descriptionCopyValue = descriptionHTML ? Parser.htmlToText(descriptionHTML) : undefined;
+    const merchantCopyValue = updatedMerchantTitle || undefined;
+    const dateCopyValue = actualTransactionDate || undefined;
     const categoryValue = updatedTransaction?.category ?? categoryForDisplay;
     const decodedCategoryName = getDecodedLeafCategoryName(categoryValue);
-    const categoryCopyValue = !canEdit ? decodedCategoryName : undefined;
+    const categoryCopyValue = decodedCategoryName || undefined;
     const cardCopyValue = cardProgramName;
     const taxRateValue = hasTaxValueChanged ? taxValue : (transaction?.taxName ?? taxRateTitle ?? fallbackTaxRateTitle ?? '');
-    const taxRateCopyValue = !canEditTaxFields ? taxRateValue : undefined;
+    const taxRateCopyValue = taxRateValue || undefined;
     const taxAmountTitle = formattedTaxAmount ? formattedTaxAmount.toString() : '';
-    const taxAmountCopyValue = !canEditTaxFields ? taxAmountTitle : undefined;
+    const taxAmountCopyValue = taxAmountTitle || undefined;
 
     const distanceRequestFields = (
         <>
@@ -1084,7 +1083,7 @@ function MoneyRequestView({
 
     // actualAttendees is already sorted by enrichAndSortAttendees above; pass without localeCompare to preserve that order while stripping the SMS domain.
     const getAttendeesTitle = Array.isArray(actualAttendees) ? getAttendeesListDisplayString(actualAttendees) : '';
-    const attendeesCopyValue = !canEdit ? getAttendeesTitle : undefined;
+    const attendeesCopyValue = getAttendeesTitle || undefined;
 
     const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
         const tagForDisplay = getTagForDisplay(updatedTransaction ?? transaction, index);
@@ -1108,7 +1107,7 @@ function MoneyRequestView({
             hasDependentTags,
             tagForDisplay,
         );
-        const tagCopyValue = !canEdit ? tagForDisplay : undefined;
+        const tagCopyValue = tagForDisplay || undefined;
 
         return (
             <OfflineWithFeedback
@@ -1152,7 +1151,7 @@ function MoneyRequestView({
     const parentReportDerivedName = parentReport?.reportID ? derivedReportNames?.[parentReport.reportID] : undefined;
     const reportNameToDisplay = isFromMergeTransaction ? (updatedTransaction?.reportName ?? translate('common.none')) : getReportName(parentReport, parentReportDerivedName);
     const shouldShowReport = !!parentReportID || (isFromMergeTransaction && !!reportNameToDisplay);
-    const reportCopyValue = !canEditReport && reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
+    const reportCopyValue = reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
     const shouldShowCategoryAnalyzing = isCategoryBeingAnalyzed(updatedTransaction ?? transaction);
 
     // In this case we want to use this value. The shouldUseNarrowLayout will always be true as this case is handled when we display ReportScreen in RHP.

From 26574e8b20ebfbef187fcb22390a767d3ce2aae6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 14 Aug 2026 09:08:59 +0430
Subject: [PATCH 046/781] Fix copyable expense value lint errors

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index b0aee5373a0d..86776c084a98 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -942,14 +942,14 @@ function MoneyRequestView({
     const amountCopyValue = amountTitle || undefined;
     const descriptionHTML = updatedTransactionDescription ?? transactionDescription;
     const descriptionCopyValue = descriptionHTML ? Parser.htmlToText(descriptionHTML) : undefined;
-    const merchantCopyValue = updatedMerchantTitle || undefined;
-    const dateCopyValue = actualTransactionDate || undefined;
+    const merchantCopyValue = updatedMerchantTitle;
+    const dateCopyValue = actualTransactionDate;
     const categoryValue = updatedTransaction?.category ?? categoryForDisplay;
     const decodedCategoryName = getDecodedLeafCategoryName(categoryValue);
     const categoryCopyValue = decodedCategoryName || undefined;
     const cardCopyValue = cardProgramName;
     const taxRateValue = hasTaxValueChanged ? taxValue : (transaction?.taxName ?? taxRateTitle ?? fallbackTaxRateTitle ?? '');
-    const taxRateCopyValue = taxRateValue || undefined;
+    const taxRateCopyValue = taxRateValue;
     const taxAmountTitle = formattedTaxAmount ? formattedTaxAmount.toString() : '';
     const taxAmountCopyValue = taxAmountTitle || undefined;
 

From 81247ea28cbc402ecee73e2fdae24ca18ae443dc Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 15 Aug 2026 05:14:42 +0700
Subject: [PATCH 047/781] fix(search): align merchant filter with rules layout

---
 .../TextInputFilterContent.tsx                | 59 ++++++++----------
 tests/ui/TextInputFilterContentTest.tsx       | 61 +++++++++++++++----
 2 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index bc9ceef0d43c..0bdae06c1a14 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,10 +1,10 @@
 import Button from '@components/Button';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import ListRadioButton from '@components/SelectionList/components/ListRadioButton';
-import type {ListItem} from '@components/SelectionList/types';
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/ListItem/types';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -20,7 +20,7 @@ import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm'
 
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 
-import React, {Fragment, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 
 type TextInputFilterContentProps = {
@@ -55,16 +55,16 @@ function TextInputFilterContent({
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
     const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('search.filters.merchant.equalTo'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('search.filters.merchant.contains'),
+            text: translate('workspace.rules.merchantRules.matchTypeContains'),
             isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        },
     ];
 
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
@@ -86,7 +86,7 @@ function TextInputFilterContent({
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph4, styles.mv2] : [styles.ph5]}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
         />
     );
 
@@ -96,28 +96,23 @@ function TextInputFilterContent({
                 baseFilterKey={baseFilterKey}
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
+                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
             >
-                <View>
-                    {shouldShowMerchantMatchType
-                        ? merchantMatchTypeItems.map((item) => (
-                              <Fragment key={item.keyForList}>
-                                  <PressableWithFeedback
-                                      sentryLabel="TextInputFilterContent-MerchantMatchType"
-                                      accessibilityLabel={item.text ?? ''}
-                                      role={CONST.ROLE.BUTTON}
-                                      onPress={() => setMerchantOperator(item.keyForList)}
-                                      style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.optionRow]}
-                                  >
-                                      <Text style={[styles.optionDisplayName, styles.sidebarLinkTextBold]}>{item.text}</Text>
-                                      <ListRadioButton
-                                          item={item}
-                                          onSelectRow={() => setMerchantOperator(item.keyForList)}
-                                      />
-                                  </PressableWithFeedback>
-                                  {item.isSelected && filterInput}
-                              </Fragment>
-                          ))
-                        : filterInput}
+                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
+                    {filterInput}
+                    {shouldShowMerchantMatchType && (
+                        <>
+                            <View style={[styles.pb2, styles.ph5]}>
+                                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+                            </View>
+                            <SelectionList
+                                data={merchantMatchTypeItems}
+                                ListItem={SingleSelectListItem}
+                                onSelectRow={(item) => setMerchantOperator(item.keyForList)}
+                                shouldSingleExecuteRowSelect
+                            />
+                        </>
+                    )}
                 </View>
             </NegatableFilter>
             <Button
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 0cb5ff065c25..86c0c4b18582 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -4,6 +4,8 @@ import TextInputFilterContent from '@components/Search/FilterComponents/Advanced
 
 import CONST from '@src/CONST';
 
+import {NavigationContainer} from '@react-navigation/native';
+
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
@@ -11,13 +13,15 @@ function renderMerchantFilter(onChange = jest.fn()) {
     return {
         onChange,
         ...render(
-            <TextInputFilterContent
-                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                value="I"
-                isNegated={false}
-                merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
-                onChange={onChange}
-            />,
+            <NavigationContainer>
+                <TextInputFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
         ),
     };
 }
@@ -27,20 +31,53 @@ describe('TextInputFilterContent', () => {
         jest.clearAllMocks();
     });
 
+    it('keeps the merchant input fixed above the Rules match type options', () => {
+        // Given a positive Merchant Contains filter using the Rules layout.
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+
+        // When the user edits the input and changes the match type.
+        fireEvent.changeText(merchantInput, 'Ibis');
+        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+
+        // Then the input stays mounted with its current value.
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('Ibis', false, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    });
+
+    it('submits the selected Contains operator from the Rules layout', () => {
+        const {onChange} = renderMerchantFilter();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    });
+
     it('hides the merchant match type and omits the operator when the filter is negated', () => {
         // Given a positive Merchant Contains filter where both match options must be available.
         const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByRole('button', {name: 'search.filters.merchant.equalTo'})).toBeOnTheScreen();
-        expect(screen.getByRole('button', {name: 'search.filters.merchant.contains'})).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
 
         // When the user negates the filter because negated Merchant searches only support exact matching.
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
         // Then match options disappear so the UI matches the submitted query.
-        expect(screen.queryByRole('button', {name: 'search.filters.merchant.equalTo'})).not.toBeOnTheScreen();
-        expect(screen.queryByRole('button', {name: 'search.filters.merchant.contains'})).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
         // When the user confirms the negated filter after match options disappear.
         fireEvent.press(screen.getByText('common.confirm'));

From d664814d929d6116b6cbb241ff9a317c9ae45624 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 18 Aug 2026 11:26:00 +0700
Subject: [PATCH 048/781] fix(search): address review feedback on merchant
 contains operator

- Remove unused merchant equalTo/contains translation keys from all locales
- Simplify getMerchantOperator with nullish coalescing
- Restrict the contains operator (*:) to the merchant field; non-merchant
  input falls back to keyword and autocomplete rejects it
---
 src/languages/de.ts                           |  1 -
 src/languages/el.ts                           |  4 ---
 src/languages/en.ts                           |  4 ---
 src/languages/es.ts                           |  1 -
 src/languages/fr.ts                           |  1 -
 src/languages/it.ts                           |  1 -
 src/languages/ja.ts                           |  1 -
 src/languages/nl.ts                           |  1 -
 src/languages/pl.ts                           |  1 -
 src/languages/pt-BR.ts                        |  1 -
 src/languages/zh-hans.ts                      |  1 -
 src/libs/SearchParser/autocompleteParser.js   |  3 +-
 .../SearchParser/autocompleteParser.peggy     |  3 +-
 src/libs/SearchParser/searchParser.js         |  7 ++++-
 src/libs/SearchParser/searchParser.peggy      |  7 ++++-
 src/libs/SearchQueryUtils.ts                  |  2 +-
 tests/unit/SearchAutocompleteParserTest.ts    |  8 +++++
 tests/unit/SearchParserTest.ts                | 30 +++++++++++++++++++
 18 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index cba5c7ee8dd5..635638daa3ab 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9103,7 +9103,6 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
-            merchant: {equalTo: 'Gleich wie', contains: 'Enthält'},
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
         },
         display: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index f5cbf42e725a..d90403cca7b6 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9270,10 +9270,6 @@ ${reportName}`,
                 },
                 equalTo: (amount?: string) => `Ίσο με ${amount ?? ''}`,
             },
-            merchant: {
-                equalTo: 'Ίσο με',
-                contains: 'Περιέχει',
-            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Ενοποιημένη τιμολόγηση ταξιδιών',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5cc8dce4ca6d..4634fd9386ed 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9182,10 +9182,6 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
-            merchant: {
-                equalTo: 'Equal to',
-                contains: 'Contains',
-            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Consolidated Travel Billing',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 23f554668215..154b29106a74 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8964,7 +8964,6 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
-            merchant: {equalTo: 'Igual a', contains: 'Contiene'},
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
         },
         chartTitles: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index cab2f30f26bb..d5fb36e85b25 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9138,7 +9138,6 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
-            merchant: {equalTo: 'Égal à', contains: 'Contient'},
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
         },
         display: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 57f47a918a41..8e1b563d788f 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9075,7 +9075,6 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
-            merchant: {equalTo: 'Uguale a', contains: 'Contiene'},
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
         },
         display: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5c777b078812..283c302e0312 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8962,7 +8962,6 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
-            merchant: {equalTo: '等しい', contains: '含む'},
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
         },
         display: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index f6ebb5a1bbbc..c313ee7d3e65 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9046,7 +9046,6 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
-            merchant: {equalTo: 'Gelijk aan', contains: 'Bevat'},
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
         },
         display: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 47833b5ab793..ad7bfa61e49f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9023,7 +9023,6 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
-            merchant: {equalTo: 'Równe', contains: 'Zawiera'},
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
         },
         display: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 7fe933524286..ebb2357903b4 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9041,7 +9041,6 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
-            merchant: {equalTo: 'Igual a', contains: 'Contém'},
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
         },
         display: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index b6a0936ea03e..cbe4a0c5063b 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8726,7 +8726,6 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
-            merchant: {equalTo: '等于', contains: '包含'},
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
         },
         display: {
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 69c41e6a1f26..0765f531f4ea 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -467,7 +467,8 @@ function peg$parse(input, options) {
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
-      if (neg && op === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains" && (neg || key !== "merchant")) {
         autocomplete = null;
         return;
       }
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index a27936722760..9bf08c42f092 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -40,7 +40,8 @@ defaultFilter
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
-      if (neg && op === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains" && (neg || key !== "merchant")) {
         autocomplete = null;
         return;
       }
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index a0f36d952b84..c29dc191c56e 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -501,6 +501,10 @@ function peg$parse(input, options) {
       );
     };
   var peg$f2 = function(key, op, value) {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
       updateDefaultValues(key, value);
       return {...buildFilter(op, key, value), isDefault: true};
     };
@@ -520,7 +524,8 @@ function peg$parse(input, options) {
       const key = field;
       let operator = op;
 
-      if (neg && operator === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (operator === "contains" && (neg || key !== "merchant")) {
         return buildFilter("eq", "keyword", text().trim());
       }
 
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 7199419f1b28..9d2153efc066 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -214,6 +214,10 @@ filter = @(standardFilter / defaultFilter / freeTextFilter)
 
 defaultFilter
   = _ key:defaultKey _ op:operator _ value:identifier {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
       updateDefaultValues(key, value);
       return {...buildFilter(op, key, value), isDefault: true};
     }
@@ -237,7 +241,8 @@ standardFilter
       const key = field;
       let operator = op;
 
-      if (neg && operator === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (operator === "contains" && (neg || key !== "merchant")) {
         return buildFilter("eq", "keyword", text().trim());
       }
 
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index b190d0180421..7635e71d8b4a 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -104,7 +104,7 @@ const operatorToCharMap = {
 const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
 
 function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
-    return operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : DEFAULT_MERCHANT_OPERATOR;
+    return operator ?? DEFAULT_MERCHANT_OPERATOR;
 }
 
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
index 43d80a96088b..70dfc78bb415 100644
--- a/tests/unit/SearchAutocompleteParserTest.ts
+++ b/tests/unit/SearchAutocompleteParserTest.ts
@@ -348,6 +348,14 @@ const tests: Array<{query: string; expected: ExpectedAutocompleteParserResult}>
             ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
         },
     },
+    {
+        // The "contains" operator is only supported for the merchant field
+        query: 'type:expense category*:travel',
+        expected: {
+            autocomplete: null,
+            ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
+        },
+    },
 ];
 
 const limitAutocompleteTests: Array<{query: string; expected: ExpectedAutocompleteParserResult; description: string}> = [
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index ace3f4fee2a7..8688d7d80a5e 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1012,6 +1012,36 @@ const keywordTests = [
             },
         },
     },
+    {
+        // The "contains" operator is only supported for the merchant field
+        query: 'category*:travel',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['category*:travel'],
+            },
+        },
+    },
+    {
+        // The "contains" operator is not supported for default keys
+        query: 'type*:expense',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['type*:expense'],
+            },
+        },
+    },
     {
         query: '" " "  "', // Multiple whitespaces wrapped in quotes
         expected: {

From 9e9827b4f5a0d947167f99ae7ee6ced3bb4eed1f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 19 Aug 2026 09:26:40 +0430
Subject: [PATCH 049/781] `Fix Safari text selection in pressable rows`

---
 .../DisplayNames/DisplayNamesTooltipItem.tsx  |  2 +-
 .../DisplayNames/DisplayNamesWithTooltip.tsx  |  2 +-
 .../DisplayNamesWithoutTooltip.tsx            |  2 +-
 src/components/MenuItem/MenuItem.tsx          | 10 ++++++++-
 .../MoneyRequestReportTransactionItem.tsx     |  3 ++-
 .../implementation/BaseGenericPressable.tsx   |  5 ++++-
 .../GenericPressable/implementation/index.tsx | 22 ++++++++++++++++---
 .../Pressable/GenericPressable/types.ts       |  3 +++
 .../index.tsx                                 |  5 ++++-
 .../ListItem/ExpenseReportListItem.tsx        |  7 ++----
 .../ExpenseReportListItemRowNarrow.tsx        |  8 +++----
 .../SearchList/ListItem/GroupHeader.tsx       |  1 +
 .../ListItem/TransactionGroupListExpanded.tsx |  1 +
 .../ListItem/TransactionGroupListItem.tsx     |  1 +
 .../TransactionListItemNarrow.tsx             |  1 +
 .../TransactionListItemWide.tsx               |  3 ++-
 .../SearchList/ListItem/UserInfoCell.tsx      |  2 +-
 .../SelectionList/ListItem/BaseListItem.tsx   |  2 ++
 .../SelectionList/ListItem/types.ts           |  3 +++
 src/components/Table/TableRow.tsx             |  2 +-
 src/components/TextWithTooltip/index.tsx      |  5 ++++-
 .../TransactionItemRowWide.tsx                |  2 ++
 22 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index bb29741288c3..a12e522e49b0 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -76,7 +76,7 @@ function DisplayNamesTooltipItem({
                     // eslint-disable-next-line no-param-reassign
                     childRefs.current[index] = el;
                 }}
-                style={[textStyles, styles.pre]}
+                style={[textStyles, styles.pre, isCopyable && styles.userSelectText]}
                 fsClass={forwardedFSClass}
                 selectable={isCopyable}
                 dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index a47f33011c70..27ff59437f4a 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -69,7 +69,7 @@ function DisplayNamesWithToolTip({
         // Tokenization of string only support prop numberOfLines on Web
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, styles.pRelative]}
+            style={[textStyles, styles.pRelative, isCopyable && styles.userSelectText]}
             numberOfLines={numberOfLines || undefined}
             ref={containerRef}
             testID="DisplayNamesWithToolTip"
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index ab20f5805b1c..c03366801f66 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -42,7 +42,7 @@ function DisplayNamesWithoutTooltip({
     return (
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap]}
+            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap, isCopyable && styles.userSelectText]}
             numberOfLines={numberOfLines}
             fsClass={forwardedFSClass}
             selectable={isCopyable}
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index ee73b0c9b23b..ba3149c90398 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -692,6 +692,7 @@ function MenuItem({
             isDeleted ? styles.offlineFeedbackDeleted : {},
             shouldBreakWord ? styles.breakWord : {},
             styles.mw100,
+            isTitleSelectable ? styles.userSelectText : {},
         ],
         (titleStyle ?? {}) as TextStyle,
     );
@@ -881,6 +882,7 @@ function MenuItem({
                                 onMouseDown={(event) => {
                                     markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
+                                shouldAllowTextSelection={isTitleSelectable}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
                                 onPressOut={ControlSelection.unblock}
                                 onSecondaryInteraction={copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction}
@@ -1133,7 +1135,13 @@ function MenuItem({
                                                     </View>
                                                 </View>
                                             </View>
-                                            <View style={[styles.flexRow, StyleUtils.getMenuItemTextContainerStyle(isCompact), !hasPressableRightComponent && styles.pointerEventsNone]}>
+                                            <View
+                                                style={[
+                                                    styles.flexRow,
+                                                    StyleUtils.getMenuItemTextContainerStyle(isCompact),
+                                                    !hasPressableRightComponent && !isTitleSelectable && styles.pointerEventsNone,
+                                                ]}
+                                            >
                                                 {!!badgeText && !shouldShowBadgeInSeparateRow && !shouldShowBadgeBelow && (
                                                     <Badge
                                                         text={badgeText}
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index aeac30bf0785..b353754ecaf6 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -242,6 +242,7 @@ function MoneyRequestReportTransactionItemBody({
                 sentryLabel={CONST.SENTRY_LABEL.REPORT.MONEY_REQUEST_REPORT_TRANSACTION_ITEM}
                 role={getButtonRole(true)}
                 isNested
+                shouldAllowTextSelection
                 id={transaction.transactionID}
                 style={[styles.transactionListItemStyle, !shouldUseNarrowLayout ? StyleUtils.getSearchTableRowPressableStyle(isLastItem, isSelected) : styles.noBorderRadius]}
                 hoverStyle={[!isPendingDelete && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
@@ -252,7 +253,7 @@ function MoneyRequestReportTransactionItemBody({
                 onPressOut={() => ControlSelection.unblock()}
                 onLongPress={handlePressableLongPress}
                 disabled={isTransactionPendingDelete(transaction)}
-                wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}
+                wrapperStyle={[animatedHighlightStyle, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}
             >
                 {({hovered}) => (
                     <TransactionItemRow
diff --git a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
index 919be79d487a..a435f6f06b3c 100644
--- a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
@@ -20,6 +20,8 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import {Pressable} from 'react-native';
 
+const allowTextSelectionStyle = {userSelect: 'auto', WebkitUserSelect: 'auto'} as const;
+
 function GenericPressable({
     children,
     onPress,
@@ -43,6 +45,7 @@ function GenericPressable({
     accessible = true,
     fullDisabled = false,
     interactive = true,
+    shouldAllowTextSelection = false,
     isNested = false,
     ref,
     dataSet,
@@ -215,7 +218,7 @@ function GenericPressable({
                 (state.hovered || isHovered) && StyleUtils.parseStyleFromFunction(hoverStyle, state),
                 state.pressed && StyleUtils.parseStyleFromFunction(pressStyle, state),
                 isDisabled && [StyleUtils.parseStyleFromFunction(disabledStyle, state), styles.noSelect],
-                isRoleButton && styles.userSelectNone,
+                shouldAllowTextSelection ? allowTextSelectionStyle : isRoleButton && styles.userSelectNone,
             ]}
             // accessibility props
             accessibilityState={{
diff --git a/src/components/Pressable/GenericPressable/implementation/index.tsx b/src/components/Pressable/GenericPressable/implementation/index.tsx
index 8e16d795f90a..caa3a5a1e895 100644
--- a/src/components/Pressable/GenericPressable/implementation/index.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/index.tsx
@@ -2,6 +2,8 @@ import type PressableProps from '@components/Pressable/GenericPressable/types';
 
 import mergeRefs from '@libs/mergeRefs';
 
+import CONST from '@src/CONST';
+
 import type {Role, View} from 'react-native';
 
 import React, {useLayoutEffect, useRef} from 'react';
@@ -10,6 +12,10 @@ import GenericPressable from './BaseGenericPressable';
 
 function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: PressableProps) {
     const accessible = (props.accessible ?? props.accessible === undefined) ? true : props.accessible;
+    const role = (props.accessibilityRole ?? props.role) as Role;
+    // React Native Web maps role="button" to a native <button>. Safari clears the native text range
+    // before the click handler can suppress row navigation, so render a div and restore the ARIA role.
+    const shouldRenderAsNonNativeButton = props.shouldAllowTextSelection && role === CONST.ROLE.BUTTON;
 
     // react-native-web's Pressable always sets aria-disabled from its own `disabled` prop,
     // overriding any explicit aria-disabled we pass. We pass fullDisabled (not isDisabled) to
@@ -27,7 +33,10 @@ function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: Pre
         } else {
             el.removeAttribute('aria-disabled');
         }
-    }, [isAriaDisabled]);
+        if (shouldRenderAsNonNativeButton) {
+            el.setAttribute('role', role);
+        }
+    }, [isAriaDisabled, role, shouldRenderAsNonNativeButton]);
 
     return (
         <GenericPressable
@@ -36,7 +45,8 @@ function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: Pre
             // change native accessibility props to web accessibility props
             focusable={focusable}
             tabIndex={(props.tabIndex ?? (!accessible || !focusable)) ? -1 : 0}
-            role={(props.accessibilityRole ?? props.role) as Role}
+            accessibilityRole={shouldRenderAsNonNativeButton ? undefined : props.accessibilityRole}
+            role={shouldRenderAsNonNativeButton ? undefined : role}
             id={props.id}
             aria-label={props.accessibilityLabel}
             aria-labelledby={props.accessibilityLabelledBy}
@@ -46,7 +56,13 @@ function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: Pre
             aria-valuetext={props.accessibilityValue?.text}
             // Note: data-tag="pressable" is also used by Sentry's INP instrumentation patch to detect pressable containers
             // and shorten interaction selectors. See patches/sentry-core/ before removing or renaming it.
-            dataSet={{tag: 'pressable', ...(props.noDragArea && {dragArea: false}), ...(sentryLabel && {sentryLabel}), ...props.dataSet}}
+            dataSet={{
+                tag: 'pressable',
+                ...(shouldRenderAsNonNativeButton && {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}),
+                ...(props.noDragArea && {dragArea: false}),
+                ...(sentryLabel && {sentryLabel}),
+                ...props.dataSet,
+            }}
         />
     );
 }
diff --git a/src/components/Pressable/GenericPressable/types.ts b/src/components/Pressable/GenericPressable/types.ts
index 1b44e6010ad9..f4748fed54b7 100644
--- a/src/components/Pressable/GenericPressable/types.ts
+++ b/src/components/Pressable/GenericPressable/types.ts
@@ -155,6 +155,9 @@ type PressableProps = RNPressableProps &
          */
         interactive?: boolean;
 
+        /** Whether descendants can use native text selection inside the pressable */
+        shouldAllowTextSelection?: boolean;
+
         /**
          * Whether the pressable is nested in another one.
          */
diff --git a/src/components/PressableWithSecondaryInteraction/index.tsx b/src/components/PressableWithSecondaryInteraction/index.tsx
index 45b3d6a16aba..a67d5f1d9a85 100644
--- a/src/components/PressableWithSecondaryInteraction/index.tsx
+++ b/src/components/PressableWithSecondaryInteraction/index.tsx
@@ -25,6 +25,7 @@ function PressableWithSecondaryInteraction({
     onSecondaryInteraction: rawOnSecondaryInteraction,
     activeOpacity = 1,
     opacityAnimationDuration,
+    shouldAllowTextSelection = false,
     ref,
     ...rest
 }: PressableWithSecondaryInteractionProps) {
@@ -102,6 +103,7 @@ function PressableWithSecondaryInteraction({
     }, [ref, onSecondaryInteraction, preventDefaultContextMenu, withoutFocusOnSecondaryInteraction]);
 
     const inlineStyle = inline ? styles.dInline : {};
+    const selectionStyle = canUseTouchScreen() && !shouldAllowTextSelection ? [styles.userSelectNone, styles.noSelect] : [];
 
     // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
     return (
@@ -111,7 +113,8 @@ function PressableWithSecondaryInteraction({
             accessibilityHasPopup={accessibilityHasPopup}
             nativeID={nativeID}
             accessibilityControls={accessibilityControls}
-            wrapperStyle={[StyleUtils.combineStyles(canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle), wrapperStyle]}
+            shouldAllowTextSelection={shouldAllowTextSelection}
+            wrapperStyle={[StyleUtils.combineStyles(selectionStyle, inlineStyle), wrapperStyle]}
             onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
             pressDimmingValue={activeOpacity}
             dimAnimationDuration={opacityAnimationDuration}
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
index e613ee1a4fce..f5c9455f00ad 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
@@ -371,11 +371,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
     );
 
     const listItemWrapperStyle = useMemo(
-        () => [
-            styles.flex1,
-            styles.userSelectNone,
-            isLargeScreenWidth ? {...styles.flexRow, ...styles.justifyContentBetween, ...styles.alignItemsCenter} : {...styles.flexColumn, ...styles.alignItemsStretch},
-        ],
+        () => [styles.flex1, isLargeScreenWidth ? {...styles.flexRow, ...styles.justifyContentBetween, ...styles.alignItemsCenter} : {...styles.flexColumn, ...styles.alignItemsStretch}],
         [styles, isLargeScreenWidth],
     );
 
@@ -472,6 +468,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
             accessibilityRole={canSelectMultiple ? CONST.ROLE.GROUP : undefined}
             accessibilityLabel={rowAccessibilityLabel}
             shouldUseOptionRole={false}
+            shouldAllowTextSelection
             pressableStyle={listItemPressableStyle}
             wrapperStyle={listItemWrapperStyle}
             isFocused={isFocused}
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index c16645a85626..0b4504924821 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -40,14 +40,14 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
                 <View style={[styles.flexRow, styles.gap2]}>
                     <Text
                         numberOfLines={2}
-                        style={[styles.lh20, styles.flex1]}
+                        style={[styles.lh20, styles.flex1, styles.userSelectText]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
                         {item.reportName ?? ''}
                     </Text>
                     <Text
-                        style={[styles.lh20, styles.flexShrink0, styles.textAlignRight]}
+                        style={[styles.lh20, styles.flexShrink0, styles.textAlignRight, styles.userSelectText]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
@@ -56,14 +56,14 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
                 </View>
                 <View style={[styles.flexRow, styles.gap2]}>
                     <Text
-                        style={[styles.mutedNormalTextLabel, styles.flex1]}
+                        style={[styles.mutedNormalTextLabel, styles.flex1, styles.userSelectText]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
                         {formattedDate}
                     </Text>
                     <Text
-                        style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight]}
+                        style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight, styles.userSelectText]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 4e322065f825..1a51cd012676 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -406,6 +406,7 @@ function GroupHeader({
                 accessibilityLabel={item.text ?? ''}
                 role={getButtonRole(true)}
                 isNested
+                shouldAllowTextSelection
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 0fb646d74ee1..92b947ecaffd 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -353,6 +353,7 @@ function TransactionGroupListExpandedImpl({
                             accessibilityRole={CONST.ROLE.BUTTON}
                             accessibilityLabel={transaction.text ?? ''}
                             isNested
+                            shouldAllowTextSelection
                             onMouseDown={(e) => {
                                 const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                                 if (isCopyableTarget) {
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index f9b42b0b6d10..1ec227a4622e 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -585,6 +585,7 @@ function TransactionGroupListItemImpl({
                 accessibilityLabel={item.text ?? ''}
                 role={getButtonRole(true)}
                 isNested
+                shouldAllowTextSelection
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index b1adfb62567f..cb89b6848272 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -123,6 +123,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                 accessibilityLabel={item.text ?? ''}
                 role={!isDeletedTransaction ? getButtonRole(true) : 'none'}
                 isNested
+                shouldAllowTextSelection
                 hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 id={item.keyForList ?? ''}
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 2ad1a6a38500..f8ff5cc8058d 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -169,6 +169,7 @@ function TransactionListItemWide<TItem extends ListItem>({
                 accessibilityLabel={item.text ?? ''}
                 role={!isDeletedTransaction ? getButtonRole(true) : 'none'}
                 isNested
+                shouldAllowTextSelection
                 onMouseDown={handleOnMouseDown}
                 onHoverIn={handleOnHoverIn}
                 hoverStyle={[!item.isDisabled && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
@@ -181,7 +182,7 @@ function TransactionListItemWide<TItem extends ListItem>({
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
                 onFocus={onFocus}
-                wrapperStyle={[styles.mh5, styles.flex1, animatedHighlightStyle, styles.userSelectNone, isLastItem && [styles.tableBottomRadius, styles.overflowHidden]]}
+                wrapperStyle={[styles.mh5, styles.flex1, animatedHighlightStyle, isLastItem && [styles.tableBottomRadius, styles.overflowHidden]]}
             >
                 {({hovered}) => (
                     <TransactionItemRow
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index f5e99702ea3e..9d06520fbfd1 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -47,7 +47,7 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
             />
             <Text
                 numberOfLines={1}
-                style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle]}
+                style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle, styles.userSelectText]}
                 selectable
                 dataSet={COPYABLE_TEXT_DATA_SET}
             >
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 4271e7a16f42..6c71a774bd86 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -107,6 +107,7 @@ function BaseListItem<TItem extends ListItem>({
     onLongPressRow,
     shouldHighlightSelectedItem = false,
     shouldDisableHoverStyle,
+    shouldAllowTextSelection = false,
     shouldShowRightCaret = false,
     accessible,
     accessibilityLabel,
@@ -214,6 +215,7 @@ function BaseListItem<TItem extends ListItem>({
                 disabled={isDisabled && !isRowSelected}
                 interactive={item.isInteractive}
                 isNested
+                shouldAllowTextSelection={shouldAllowTextSelection}
                 hoverDimmingValue={1}
                 pressDimmingValue={item.isInteractive === false ? 1 : variables.pressDimValue}
                 hoverStyle={!shouldDisableHoverStyle ? [(!item.isDisabled || isRowSelected) && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle] : undefined}
diff --git a/src/components/SelectionList/ListItem/types.ts b/src/components/SelectionList/ListItem/types.ts
index 919f203ecb7a..cca02779ec61 100644
--- a/src/components/SelectionList/ListItem/types.ts
+++ b/src/components/SelectionList/ListItem/types.ts
@@ -364,6 +364,9 @@ type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> &
         /** Whether to disable the hover style of the item */
         shouldDisableHoverStyle?: boolean;
 
+        /** Whether descendants can use native text selection inside the row */
+        shouldAllowTextSelection?: boolean;
+
         /**
          * Whether the pressable should be accessible as a single element.
          * When false, allows child elements (like TextInput) to be independently focusable by screen readers.
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 5f8f4c9407fd..277cad3759e8 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -109,7 +109,6 @@ export default function TableRow({
     const tableRowPressableStyles = [
         styles.mh5,
         styles.highlightBG,
-        styles.userSelectNone,
         !isFirstRow && styles.borderTop,
         isLastRow && styles.tableBottomRadius,
         item.selected && [styles.activeComponentBG, {borderColor: theme.buttonHoveredBG}],
@@ -231,6 +230,7 @@ export default function TableRow({
                 style={tableRowPressableStyles}
                 sentryLabel={sentryLabel}
                 interactive={interactive}
+                shouldAllowTextSelection
                 disabled={isDisabled}
                 hoverStyle={tableRowPressableHoverStyle}
                 pressDimmingValue={!interactive ? undefined : 1}
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 87d5da22643b..4ec23f1cfc3c 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -2,6 +2,8 @@ import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
+import useThemeStyles from '@hooks/useThemeStyles';
+
 import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
@@ -11,6 +13,7 @@ type LayoutChangeEvent = {
 };
 
 function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
+    const styles = useThemeStyles();
     const [showTooltip, setShowTooltip] = useState(false);
 
     return (
@@ -20,7 +23,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
         >
             <Text
                 testID={testID}
-                style={style}
+                style={isCopyable ? [style, styles.userSelectText] : style}
                 numberOfLines={numberOfLines}
                 selectable={isCopyable}
                 onLayout={(e) => {
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index 7008d6266b69..1881101043b7 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -321,6 +321,7 @@ function TransactionItemRowWide({
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE)]}
                     >
                         <Text
+                            style={styles.userSelectText}
                             selectable
                             dataSet={COPYABLE_TEXT_DATA_SET}
                         >
@@ -335,6 +336,7 @@ function TransactionItemRowWide({
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.BILLABLE)]}
                     >
                         <Text
+                            style={styles.userSelectText}
                             selectable
                             dataSet={COPYABLE_TEXT_DATA_SET}
                         >

From dd4a4fcaedbe25564aaa6ef5663aa0703d2d0d39 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 20 Aug 2026 16:20:18 +0700
Subject: [PATCH 050/781] fix(search): show merchant match type on filter chip
 and chip popup

- Add a Merchant branch to getDisplayValue so the chip label reads
  Exactly matches "I" / Contains "I" instead of the raw value
- Extract MerchantMatchTypeSelector and reuse it in the chip popup
  (TextFilterPopup) and the advanced filters RHP
- Chip popup now writes merchantOperator on Apply; negated merchant
  keeps exact matching
- Add TextFilterPopup UI tests and getDisplayValue merchant unit tests
---
 .../TextInputFilterContent.tsx                | 33 ++------
 .../MerchantMatchTypeSelector.tsx             | 57 ++++++++++++++
 .../FilterDropdowns/TextFilterPopup.tsx       | 47 +++++++++---
 src/libs/SearchUIUtils.ts                     | 13 ++++
 tests/ui/TextFilterPopupTest.tsx              | 75 +++++++++++++++++++
 tests/unit/Search/SearchUIUtilsTest.ts        | 30 ++++++++
 6 files changed, 216 insertions(+), 39 deletions(-)
 create mode 100644 src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
 create mode 100644 tests/ui/TextFilterPopupTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 1367fb499180..02965a5ae9c5 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,11 +1,8 @@
 import Button from '@components/ButtonComposed';
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import SelectionList from '@components/SelectionList';
-import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
-import type {ListItem} from '@components/SelectionList/ListItem/types';
-import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
@@ -55,19 +52,6 @@ function TextInputFilterContent({
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('workspace.rules.merchantRules.matchTypeContains'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        },
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('workspace.rules.merchantRules.matchTypeExact'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        },
-    ];
-
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
@@ -102,17 +86,10 @@ function TextInputFilterContent({
                 <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
                     {filterInput}
                     {shouldShowMerchantMatchType && (
-                        <>
-                            <View style={[styles.pb2, styles.ph5]}>
-                                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
-                            </View>
-                            <SelectionList
-                                data={merchantMatchTypeItems}
-                                ListItem={SingleSelectListItem}
-                                onSelectRow={(item) => setMerchantOperator(item.keyForList)}
-                                shouldSingleExecuteRowSelect
-                            />
-                        </>
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
                     )}
                 </View>
             </NegatableFilter>
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
new file mode 100644
index 000000000000..9d74fbc288d9
--- /dev/null
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -0,0 +1,57 @@
+/**
+ * Shared Merchant match type selector for search filter surfaces.
+ */
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/ListItem/types';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type MerchantMatchTypeSelectorProps = {
+    /** Currently selected Merchant match type. */
+    value: MerchantMatchType;
+
+    /** Updates the selected Merchant match type. */
+    onChange: (value: MerchantMatchType) => void;
+};
+
+function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const items: Array<ListItem<MerchantMatchType>> = [
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            text: translate('workspace.rules.merchantRules.matchTypeContains'),
+            isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        },
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        },
+    ];
+
+    return (
+        <>
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+            </View>
+            <SelectionList
+                data={items}
+                ListItem={SingleSelectListItem}
+                onSelectRow={(item) => onChange(item.keyForList)}
+                shouldSingleExecuteRowSelect
+            />
+        </>
+    );
+}
+
+export default MerchantMatchTypeSelector;
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 92c5d679c3f3..d224b884ca5c 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -1,3 +1,4 @@
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -9,9 +10,12 @@ import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
+import {View} from 'react-native';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
@@ -31,14 +35,34 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [value, setValue] = useState(initialValue);
+    const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
+    const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
 
     const error = useTextFilterValidation(baseFilterKey, value);
+    const filterInput = (
+        <TextInput
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
 
     const applyChanges = () => {
         if (error) {
             return;
         }
-        updateFilterForm(getFilterFormValues(baseFilterKey, value, isNegated));
+        updateFilterForm({
+            ...getFilterFormValues(baseFilterKey, value, isNegated),
+            ...(isMerchantFilter && {
+                [FILTER_KEYS.MERCHANT_OPERATOR]: shouldShowMerchantMatchType ? merchantOperator : CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            }),
+        });
         closeOverlay();
     };
 
@@ -53,16 +77,17 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                <TextInput
-                    placeholder={label}
-                    value={value}
-                    errorText={error}
-                    hasError={!!error}
-                    onChangeText={setValue}
-                    accessibilityLabel={label}
-                    role={CONST.ROLE.PRESENTATION}
-                    containerStyles={[styles.ph5]}
-                />
+                {shouldShowMerchantMatchType ? (
+                    <View>
+                        {filterInput}
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    </View>
+                ) : (
+                    filterInput
+                )}
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index fb57d415d458..b6ca64516be6 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5714,6 +5714,19 @@ function getDisplayValue(
         return form[key]?.map((receiptType) => translate(getReceiptTypeTranslationKey(receiptType))).join(', ');
     }
 
+    if (key === FILTER_KEYS.MERCHANT) {
+        const merchant = form[key];
+        if (!merchant) {
+            return;
+        }
+
+        const matchTypeKey =
+            form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                ? 'workspace.rules.merchantRules.matchTypeContains'
+                : 'workspace.rules.merchantRules.matchTypeExact';
+        return `${translate(matchTypeKey)} "${merchant}"`;
+    }
+
     const formValue = form[key];
     return Array.isArray(formValue) ? formValue.join(', ') : formValue;
 }
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
new file mode 100644
index 000000000000..30d3bf9b7828
--- /dev/null
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -0,0 +1,75 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
+
+function renderMerchantPopup() {
+    const closeOverlay = jest.fn();
+    const updateFilterForm = jest.fn();
+
+    render(
+        <NavigationContainer>
+            <TextFilterPopup
+                baseFilterKey={FILTER_KEYS.MERCHANT}
+                values={{
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                }}
+                label="common.merchant"
+                closeOverlay={closeOverlay}
+                updateFilterForm={updateFilterForm}
+            />
+        </NavigationContainer>,
+    );
+
+    return {closeOverlay, updateFilterForm};
+}
+
+describe('TextFilterPopup', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('shows and submits the Merchant match type', () => {
+        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
+
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
+    });
+
+    it('hides the match type and submits exact matching for a negated Merchant', () => {
+        const {updateFilterForm} = renderMerchantPopup();
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index e6ec008cdb34..ffd34e590070 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -11788,6 +11788,36 @@ describe('SearchUIUtils', () => {
 
             expect(result).toBe(translateLocal('common.read'));
         });
+
+        test('includes the exact match type in a Merchant filter label', () => {
+            const result = SearchUIUtils.getDisplayValue(
+                FILTER_KEYS.MERCHANT,
+                {
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                },
+                CONST.SEARCH.DATA_TYPES.EXPENSE,
+                translateLocal,
+                localeCompare,
+            );
+
+            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeExact')} "I"`);
+        });
+
+        test('includes the contains match type in a Merchant filter label', () => {
+            const result = SearchUIUtils.getDisplayValue(
+                FILTER_KEYS.MERCHANT,
+                {
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                },
+                CONST.SEARCH.DATA_TYPES.EXPENSE,
+                translateLocal,
+                localeCompare,
+            );
+
+            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeContains')} "I"`);
+        });
     });
 
     describe('filterValidHasValues', () => {

From f5d4502ec69164614e2b59ef53ba1286e29c67f4 Mon Sep 17 00:00:00 2001
From: "mkhutornyi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Sun, 23 Aug 2026 20:40:16 +0000
Subject: [PATCH 051/781] Keep Payer row visible on Workflows after
 disconnecting bank account

Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
---
 src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
index c8b9897eddf9..5d44999801c2 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
@@ -139,7 +139,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     const hasOtherEligibleExistingAccounts = getEligibleExistingBusinessBankAccounts(bankAccountList, policy?.outputCurrency, true, bankAccountID).length > 0;
 
     const shouldShowBankAccount = (!!isBankAccountFullySetup || !!bankAccountConnectedToWorkspace) && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-    const shouldShowPayer = shouldShowBankAccount || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+    const shouldShowPayer = shouldShowBankAccount || policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
     const bankAccountPendingAction = bankAccountConnectedToWorkspace?.pendingAction;
     const isBankAccountPendingDelete = bankAccountPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 

From 44f969c2af2c59ebee54cb7d036559ba250e267b Mon Sep 17 00:00:00 2001
From: "mkhutornyi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Sun, 23 Aug 2026 20:47:03 +0000
Subject: [PATCH 052/781] Add regression test for Payer row visibility after
 bank disconnect

Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
---
 tests/ui/WorkspaceWorkflowsPayerRowTest.tsx | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
index 2e25014d7356..aa514fa2eb5b 100644
--- a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
+++ b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
@@ -144,6 +144,33 @@ describe('WorkspaceWorkflowsPage - Payer row visibility', () => {
         expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
     });
 
+    it('keeps the Payer row when reimbursementChoice is REIMBURSEMENT_YES after the bank account is disconnected', async () => {
+        await TestHelper.signInWithTestUser();
+        await act(async () => {
+            // Disconnecting the bank account clears the bank data (no open state, removed from BANK_ACCOUNT_LIST)
+            // but preserves the reimburser and leaves reimbursementChoice as REIMBURSEMENT_YES.
+            await Onyx.merge(
+                `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
+                buildPolicy({
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                    achAccount: {
+                        reimburser: 'test@user.com',
+                        bankAccountID: 0,
+                        accountNumber: '',
+                        routingNumber: '',
+                        addressName: '',
+                        bankName: '',
+                    },
+                }),
+            );
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
+    });
+
     it('shows the Payer row when reimbursementChoice is REIMBURSEMENT_MANUAL', async () => {
         await TestHelper.signInWithTestUser();
         await act(async () => {

From c100c7a317e89be171113891563d7408ef4edf17 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 26 Aug 2026 10:31:31 +0430
Subject: [PATCH 053/781] Refactor custom display name arguments into options
 object

---
 src/components/AvatarWithDisplayName.tsx | 44 +++++++++++++++---------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 7b2909e9d363..c73acb3fdacb 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -106,22 +106,32 @@ type AvatarWithDisplayNameProps = {
 };
 
 type CustomDisplayNameOptions = {
+    shouldUseCustomSearchTitleName: boolean;
+    report: OnyxEntry<Report>;
+    title: string;
+    displayNamesWithTooltips: DisplayNameWithTooltips;
+    transactions: TransactionListItemType[];
+    shouldUseFullTitle: boolean;
+    customSearchDisplayStyle: TextStyle[];
+    regularStyle: TextStyle[];
     isAnonymous: boolean;
     isMoneyRequestOrReport: boolean;
     isCopyable: boolean;
 };
 
-function getCustomDisplayName(
-    shouldUseCustomSearchTitleName: boolean,
-    report: OnyxEntry<Report>,
-    title: string,
-    displayNamesWithTooltips: DisplayNameWithTooltips,
-    transactions: TransactionListItemType[],
-    shouldUseFullTitle: boolean,
-    customSearchDisplayStyle: TextStyle[],
-    regularStyle: TextStyle[],
-    {isAnonymous, isMoneyRequestOrReport, isCopyable}: CustomDisplayNameOptions,
-): React.ReactNode {
+function getCustomDisplayName({
+    shouldUseCustomSearchTitleName,
+    report,
+    title,
+    displayNamesWithTooltips,
+    transactions,
+    shouldUseFullTitle,
+    customSearchDisplayStyle,
+    regularStyle,
+    isAnonymous,
+    isMoneyRequestOrReport,
+    isCopyable,
+}: CustomDisplayNameOptions): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
     const isIOUOrInvoice = report?.type === CONST.REPORT.TYPE.IOU || report?.type === CONST.REPORT.TYPE.INVOICE;
     const hasTransactions = transactions.length > 0;
@@ -292,17 +302,19 @@ function AvatarWithDisplayName({
     };
 
     const shouldUseFullTitle = isMoneyRequestOrReport || isAnonymous;
-    const displayNameContent = getCustomDisplayName(
+    const displayNameContent = getCustomDisplayName({
         shouldUseCustomSearchTitleName,
         report,
         title,
         displayNamesWithTooltips,
         transactions,
         shouldUseFullTitle,
-        [styles.headerText, styles.pre, customDisplayNameStyle],
-        [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
-        {isAnonymous, isMoneyRequestOrReport, isCopyable: isDisplayNameCopyable},
-    );
+        customSearchDisplayStyle: [styles.headerText, styles.pre, customDisplayNameStyle],
+        regularStyle: [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
+        isAnonymous,
+        isMoneyRequestOrReport,
+        isCopyable: isDisplayNameCopyable,
+    });
 
     const multipleAvatars = (
         <ReportActionAvatars

From 8dd88aa4ec302f1e9f26555335e1d41ba64e2e32 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 26 Aug 2026 10:40:17 +0430
Subject: [PATCH 054/781] Restore immediate grouped row press response

---
 src/components/CopyableText/selection.ts      | 33 ++-----------------
 .../SearchList/ListItem/GroupHeader.tsx       | 20 +++++------
 .../ListItem/TransactionGroupListItem.tsx     | 22 +++++--------
 3 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/src/components/CopyableText/selection.ts b/src/components/CopyableText/selection.ts
index cd53b58c753f..3017cd88df1f 100644
--- a/src/components/CopyableText/selection.ts
+++ b/src/components/CopyableText/selection.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-import {useEffect, useRef} from 'react';
+import {useRef} from 'react';
 
 /**
  * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
@@ -8,8 +8,6 @@ import {useEffect, useRef} from 'react';
  */
 const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
-// Keep the delay short while leaving enough time for the browser to report a second click.
-const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 300;
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
@@ -149,23 +147,8 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
 function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
     const shouldSuppressNextPressRef = useRef(false);
-    // Single-click row actions from copyable text are delayed so a following double-click can cancel them.
-    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-    const clearPendingCopyableTextPress = () => {
-        if (!pendingCopyableTextPressRef.current) {
-            return;
-        }
-
-        clearTimeout(pendingCopyableTextPressRef.current);
-        pendingCopyableTextPressRef.current = null;
-    };
-
-    useEffect(() => clearPendingCopyableTextPress, []);
 
     const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, shouldSuppressNextPress = false): boolean => {
-        // A second click on text cancels any pending single-click row action before it can expand/collapse the group.
-        clearPendingCopyableTextPress();
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
         shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
@@ -183,22 +166,12 @@ function useCopyableTextRowPress() {
         return shouldSuppressPress;
     };
 
-    const handleCopyableTextRowPress = (onPress: () => void, shouldCheck = true, shouldDelayCopyableTextPress = false) => {
-        // Delay only copyable-text single clicks so double-click text selection can cancel the row press; non-text clicks run immediately.
-        const shouldDelayPress = shouldCheck && shouldDelayCopyableTextPress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
+    const handleCopyableTextRowPress = (onPress: () => void, shouldCheck = true) => {
         if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
             return;
         }
 
-        if (!shouldDelayPress) {
-            onPress();
-            return;
-        }
-
-        pendingCopyableTextPressRef.current = setTimeout(() => {
-            pendingCopyableTextPressRef.current = null;
-            onPress();
-        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
+        onPress();
     };
 
     return {
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 1edbdbc6e307..2f6d3bc330d2 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -342,18 +342,14 @@ function GroupHeader({
     const shouldDisplayEmptyView = isEmpty && isExpenseReportType;
 
     const handlePress = (event?: ModifiedMouseEvent) => {
-        handleCopyableTextRowPress(
-            () => {
-                if (isExpenseReportType) {
-                    onSelectRow(withOriginalKey(item), transactionPreviewData, event);
-                }
-                if (!isExpenseReportType) {
-                    onToggle();
-                }
-            },
-            true,
-            true,
-        );
+        handleCopyableTextRowPress(() => {
+            if (isExpenseReportType) {
+                onSelectRow(withOriginalKey(item), transactionPreviewData, event);
+            }
+            if (!isExpenseReportType) {
+                onToggle();
+            }
+        }, true);
     };
 
     const handleLongPress = () => {
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index f6b3399e7b25..dac02fd74c36 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -263,19 +263,15 @@ function TransactionGroupListItemImpl({
     };
 
     const onPress = (event?: ModifiedMouseEvent) => {
-        handleCopyableTextRowPress(
-            () => {
-                const isEmptyGroupWithoutTransactionsQuery = transactions.length === 0 && !groupItem.transactionsQueryJSON;
-                if (isExpenseReportType || isEmptyGroupWithoutTransactionsQuery) {
-                    onSelectRow(item, transactionPreviewData, event);
-                }
-                if (!isExpenseReportType) {
-                    handleToggle();
-                }
-            },
-            true,
-            true,
-        );
+        handleCopyableTextRowPress(() => {
+            const isEmptyGroupWithoutTransactionsQuery = transactions.length === 0 && !groupItem.transactionsQueryJSON;
+            if (isExpenseReportType || isEmptyGroupWithoutTransactionsQuery) {
+                onSelectRow(item, transactionPreviewData, event);
+            }
+            if (!isExpenseReportType) {
+                handleToggle();
+            }
+        }, true);
     };
 
     const onLongPress = () => {

From dc9b1512a2861868b61c3418cfd10f599550df0d Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 26 Aug 2026 11:46:54 +0430
Subject: [PATCH 055/781] Normalize copied expense and report row values

---
 src/components/Search/ExpenseFlatSearchView.tsx |  4 ++++
 .../Search/ExpenseReportSearchView.tsx          |  4 ++++
 .../ExpenseReportListItemRowWide.tsx            |  7 ++++++-
 .../TransactionListItemWide.tsx                 |  2 ++
 .../Search/SearchList/ListItem/UserInfoCell.tsx | 17 ++++++++++-------
 .../TransactionItemRowWide.tsx                  |  6 +++---
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/components/Search/ExpenseFlatSearchView.tsx b/src/components/Search/ExpenseFlatSearchView.tsx
index f7eb690ac916..9a5090bc2004 100644
--- a/src/components/Search/ExpenseFlatSearchView.tsx
+++ b/src/components/Search/ExpenseFlatSearchView.tsx
@@ -1,5 +1,7 @@
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
+import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+
 import CONST from '@src/CONST';
 
 import type {NativeSyntheticEvent} from 'react-native';
@@ -58,6 +60,8 @@ function ExpenseFlatSearchView({
     ref,
 }: ExpenseFlatSearchViewProps) {
     const {type} = queryJSON;
+    // Normalize keyboard-copied expense rows so their grid cells paste as one space-separated row.
+    useCopySelectionHelper();
 
     const {
         isOffline,
diff --git a/src/components/Search/ExpenseReportSearchView.tsx b/src/components/Search/ExpenseReportSearchView.tsx
index 1a8ba373e619..353fa57cceee 100644
--- a/src/components/Search/ExpenseReportSearchView.tsx
+++ b/src/components/Search/ExpenseReportSearchView.tsx
@@ -1,5 +1,7 @@
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
+import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+
 import {isTransactionReportGroupListItemType} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
@@ -58,6 +60,8 @@ function ExpenseReportSearchView({
     ref,
 }: ExpenseReportSearchViewProps) {
     const {type} = queryJSON;
+    // Normalize keyboard-copied report rows so their grid cells paste as one space-separated row.
+    useCopySelectionHelper();
 
     const {
         isOffline,
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
index 92d99d60048a..4a145aa566c1 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
@@ -1,4 +1,5 @@
 import Checkbox from '@components/Checkbox';
+import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import {ReportSubmitToPopoverMeasurableAnchor} from '@components/ReportSubmitToPopoverAnchor';
 import DeferredActionCell from '@components/Search/SearchList/ListItem/ActionCell/DeferredActionCell';
@@ -131,7 +132,11 @@ function ExpenseReportListItemRowWide({
             </View>
         ),
         [CONST.SEARCH.TABLE_COLUMNS.STATUS]: (
-            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}>
+            <View
+                style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS), styles.userSelectText]}
+                // Preserve the visible report status when row-aware clipboard cleanup removes decorative content.
+                dataSet={COPYABLE_TEXT_DATA_SET}
+            >
                 <StatusCell
                     stateNum={item.stateNum}
                     statusNum={item.statusNum}
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index f8ff5cc8058d..e04d66856249 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -215,6 +215,8 @@ function TransactionListItemWide<TItem extends ListItem>({
                         shouldShowCheckbox={!!canSelectMultiple}
                         checkboxSentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM_CHECKBOX}
                         style={[styles.ph3, isLastItem ? styles.tableBottomRadius : styles.noBorderRadius]}
+                        // Mark the inner row so copied selections keep spaces between values and omit non-copyable cell content.
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         violations={transactionViolations}
                         onArrowRightPress={isDeletedTransaction ? undefined : (event) => onSelectRow(item, transactionPreviewData, event)}
                         isHover={hovered}
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index aeb881e11467..79b6fe9d2ebb 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -36,13 +36,16 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, containerStyle]}>
-            <UserAvatar
-                imageStyles={styles.alignSelfCenter}
-                size={avatarSize ?? CONST.AVATAR_SIZE.XXX_SMALL}
-                source={avatar}
-                accountID={accountID}
-                containerStyles={[styles.pr2, avatarStyle]}
-            />
+            {/* Avatar fallback initials are visual decoration and should not leak into multi-cell copied text. */}
+            <View style={styles.userSelectNone}>
+                <UserAvatar
+                    imageStyles={styles.alignSelfCenter}
+                    size={avatarSize ?? CONST.AVATAR_SIZE.XXX_SMALL}
+                    source={avatar}
+                    accountID={accountID}
+                    containerStyles={[styles.pr2, avatarStyle]}
+                />
+            </View>
             <Text
                 numberOfLines={1}
                 style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle, styles.userSelectText]}
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index f0cd1a9bcbf1..bb11c7affbb8 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -607,9 +607,9 @@ function TransactionItemRowWide({
                 return (
                     <View
                         key={column}
-                        style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}
-                        // Status badges are visual state, not copyable row values, so exclude their text from copied selections.
-                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                        style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS), styles.userSelectText]}
+                        // Treat the visible status as a row value while keeping the badge presentation unchanged.
+                        dataSet={COPYABLE_TEXT_DATA_SET}
                     >
                         <StatusCell
                             stateNum={transactionItem.report?.stateNum}

From bfe61533a36aafb03fb999fdd90c9a110b852dac Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 26 Aug 2026 14:45:11 +0700
Subject: [PATCH 056/781] fix(search): consolidate merchant popup imports

---
 src/components/Search/FilterDropdowns/TextFilterPopup.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index d224b884ca5c..7a952e054fff 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -11,8 +11,7 @@ import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';

From 2b7160e7ced3dac2b25de7c814554968b78e88e0 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 26 Aug 2026 14:00:53 +0430
Subject: [PATCH 057/781] Remove unnecessary avatar selection comment

---
 src/components/Search/SearchList/ListItem/UserInfoCell.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 79b6fe9d2ebb..72010daa4340 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -36,7 +36,6 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, containerStyle]}>
-            {/* Avatar fallback initials are visual decoration and should not leak into multi-cell copied text. */}
             <View style={styles.userSelectNone}>
                 <UserAvatar
                     imageStyles={styles.alignSelfCenter}

From b214d46b31cae3d3bd7ac9402e75d8c203ab71d6 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 27 Aug 2026 11:45:25 +0700
Subject: [PATCH 058/781] refactor(search): use search-scoped merchant
 translations

---
 .../MerchantMatchTypeSelector.tsx             |  6 +++---
 src/languages/de.ts                           |  1 +
 src/languages/el.ts                           |  1 +
 src/languages/en.ts                           |  5 +++++
 src/languages/es.ts                           |  2 +-
 src/languages/fr.ts                           |  1 +
 src/languages/it.ts                           |  1 +
 src/languages/ja.ts                           |  1 +
 src/languages/nl.ts                           |  1 +
 src/languages/pl.ts                           |  1 +
 src/languages/pt-BR.ts                        |  1 +
 src/languages/zh-hans.ts                      |  1 +
 src/libs/SearchUIUtils.ts                     |  5 +----
 tests/ui/TextFilterPopupTest.tsx              | 14 ++++++-------
 tests/ui/TextInputFilterContentTest.tsx       | 20 +++++++++----------
 tests/unit/Search/SearchUIUtilsTest.ts        |  4 ++--
 16 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 9d74fbc288d9..4275ac9a07ba 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -29,12 +29,12 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
     const items: Array<ListItem<MerchantMatchType>> = [
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('workspace.rules.merchantRules.matchTypeContains'),
+            text: translate('search.filters.merchant.contains'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            text: translate('search.filters.merchant.exactMatch'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
     ];
@@ -42,7 +42,7 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
     return (
         <>
             <View style={[styles.pb2, styles.ph5]}>
-                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+                <Text style={[styles.textLabelSupporting]}>{translate('search.filters.merchant.matchType')}</Text>
             </View>
             <SelectionList
                 data={items}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 099d90c61989..3e2286123297 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9304,6 +9304,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
+            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Exakte Übereinstimmungen'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 07098ff81d2f..28abbadd7dda 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9523,6 +9523,7 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
+            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ακριβής αντιστοιχία'},
         },
         display: {
             label: 'Εμφάνιση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6287e2d5a6ee..ed5776e999fe 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9379,6 +9379,11 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
+            merchant: {
+                matchType: 'Match type',
+                contains: 'Contains',
+                exactMatch: 'Exactly matches',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Consolidated Travel Billing',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fc6e7adee416..13d92767d9a1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9,7 +9,6 @@
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
-
 import CONST from '@src/CONST';
 import type {OriginalMessageReportPreview, OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
 
@@ -9174,6 +9173,7 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
+            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Coincide exactamente'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index aa9c91c3e6f5..5d7fbdc84f2b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9336,6 +9336,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
+            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Correspond exactement'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0bfd2a9d44a1..cc96f6923305 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9273,6 +9273,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
+            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Corrisponde esattamente'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index edeac1248c9c..44c6e93207da 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9149,6 +9149,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
+            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '完全一致'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index a48f7965ec28..99511f3e42fd 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9241,6 +9241,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
+            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Komt exact overeen'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 5e319a5c9344..7f2c9486763a 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9266,6 +9266,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
+            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Dokładne dopasowanie'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 9a7cf3345f1e..818214c1f6a3 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9238,6 +9238,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
+            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Corresponde exatamente'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 3385283d873d..d94712613b47 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8904,6 +8904,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
+            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '完全匹配'},
         },
         display: {
             label: '显示',
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index e46acb248433..e87dce74c779 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5870,10 +5870,7 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey =
-            form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
-                ? 'workspace.rules.merchantRules.matchTypeContains'
-                : 'workspace.rules.merchantRules.matchTypeExact';
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? 'search.filters.merchant.contains' : 'search.filters.merchant.exactMatch';
         return `${translate(matchTypeKey)} "${merchant}"`;
     }
 
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 30d3bf9b7828..311bef11bcae 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -40,11 +40,11 @@ describe('TextFilterPopup', () => {
     it('shows and submits the Merchant match type', () => {
         const {closeOverlay, updateFilterForm} = renderMerchantPopup();
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
-        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
         fireEvent.press(screen.getByText('common.apply'));
 
         expect(updateFilterForm).toHaveBeenCalledWith({
@@ -60,9 +60,9 @@ describe('TextFilterPopup', () => {
 
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
-        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
 
         fireEvent.press(screen.getByText('common.apply'));
 
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 86c0c4b18582..985f4de277ff 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -36,13 +36,13 @@ describe('TextInputFilterContent', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
         // When the user edits the input and changes the match type.
         fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
 
         // Then the input stays mounted with its current value.
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
@@ -66,17 +66,17 @@ describe('TextInputFilterContent', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
         // When the user negates the filter because negated Merchant searches only support exact matching.
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
         // Then match options disappear so the UI matches the submitted query.
-        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
         // When the user confirms the negated filter after match options disappear.
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index d9b512d91f9c..603bc08a0971 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -12414,7 +12414,7 @@ describe('SearchUIUtils', () => {
                 localeCompare,
             );
 
-            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeExact')} "I"`);
+            expect(result).toBe(`${translateLocal('search.filters.merchant.exactMatch')} "I"`);
         });
 
         test('includes the contains match type in a Merchant filter label', () => {
@@ -12429,7 +12429,7 @@ describe('SearchUIUtils', () => {
                 localeCompare,
             );
 
-            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeContains')} "I"`);
+            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
         });
     });
 

From 66923234f9ef68e2a9165ba62723770650fecdf7 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 27 Aug 2026 11:52:32 +0430
Subject: [PATCH 059/781] Prevent row actions during copyable text long press

---
 .../MoneyRequestReportTransactionItem.tsx          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index b353754ecaf6..f8662b9253de 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -170,6 +170,7 @@ function MoneyRequestReportTransactionItemBody({
 
     // Keep this ref local so React Compiler can prove the after-render event mutations are safe.
     const wasEditingOnMouseDownRef = useRef(false);
+    const wasPressInOnCopyableTextRef = useRef(false);
     const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
@@ -211,6 +212,7 @@ function MoneyRequestReportTransactionItemBody({
 
     const handlePressIn: React.ComponentProps<typeof PressableWithFeedback>['onPressIn'] = (event) => {
         wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
+        wasPressInOnCopyableTextRef.current = false;
         // Selection only needs to be blocked for touch interactions; desktop mouse selection is handled by onMouseDown.
         if (!canUseTouchScreen()) {
             return;
@@ -218,6 +220,7 @@ function MoneyRequestReportTransactionItemBody({
 
         // Let copyable values use native long-press/drag selection instead of applying the global selection blocker.
         const isCopyableTarget = markMouseDownOnCopyableText(getPressEventTarget(event?.target));
+        wasPressInOnCopyableTextRef.current = isCopyableTarget;
         if (isCopyableTarget) {
             return;
         }
@@ -227,9 +230,18 @@ function MoneyRequestReportTransactionItemBody({
     };
 
     const handlePressableLongPress = () => {
+        // Let touch-web long presses on copyable values complete native text selection without opening row actions.
+        if (wasPressInOnCopyableTextRef.current) {
+            return;
+        }
         handleLongPress(transaction.transactionID);
     };
 
+    const handlePressOut = () => {
+        wasPressInOnCopyableTextRef.current = false;
+        ControlSelection.unblock();
+    };
+
     return (
         <OfflineWithFeedback
             pendingAction={pendingAction}
@@ -250,7 +262,7 @@ function MoneyRequestReportTransactionItemBody({
                 onMouseDown={handleMouseDown}
                 onHoverIn={handleHoverIn}
                 onPressIn={handlePressIn}
-                onPressOut={() => ControlSelection.unblock()}
+                onPressOut={handlePressOut}
                 onLongPress={handlePressableLongPress}
                 disabled={isTransactionPendingDelete(transaction)}
                 wrapperStyle={[animatedHighlightStyle, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}

From d06d8f7a67e80083b107fb09a41b80982e58875f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 27 Aug 2026 14:58:52 +0430
Subject: [PATCH 060/781] Refactor copy normalization around explicit row
 markers

---
 src/CONST/index.ts                            |  1 +
 src/components/CopyableText/selection.ts      | 12 +++-
 .../MoneyRequestReportTransactionItem.tsx     |  4 +-
 .../GenericPressable/implementation/index.tsx |  1 -
 .../SearchList/ListItem/GroupHeader.tsx       |  4 +-
 .../ListItem/TransactionGroupListExpanded.tsx |  5 +-
 .../ListItem/TransactionGroupListItem.tsx     |  4 +-
 .../TransactionListItemNarrow.tsx             |  4 +-
 .../TransactionListItemWide.tsx               |  6 +-
 .../SelectionList/ListItem/BaseListItem.tsx   |  7 +-
 src/components/Table/TableRow.tsx             |  8 ++-
 .../WorkspaceMembersTableRow.tsx              |  4 +-
 .../Tables/WorkspaceMembersTable/index.tsx    |  2 +
 src/libs/SelectionScraper/index.ts            | 72 +++----------------
 14 files changed, 48 insertions(+), 86 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 05b1fd05ad22..683ed5394aa7 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6078,6 +6078,7 @@ const CONST = {
     SELECTION_SCRAPER_HIDDEN_ELEMENT: 'selection-scrapper-hidden-element',
     INNER_BOX_SHADOW_ELEMENT: 'inner-box-shadow-element',
     COPYABLE_TEXT_ELEMENT: 'copyable-text',
+    COPYABLE_ROW_ELEMENT: 'copyable-row',
     MODERATION: {
         MODERATOR_DECISION_PENDING: 'pending',
         MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',
diff --git a/src/components/CopyableText/selection.ts b/src/components/CopyableText/selection.ts
index 3017cd88df1f..395cd8978912 100644
--- a/src/components/CopyableText/selection.ts
+++ b/src/components/CopyableText/selection.ts
@@ -8,6 +8,8 @@ import {useRef} from 'react';
  */
 const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
+const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
+const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
@@ -181,4 +183,12 @@ function useCopyableTextRowPress() {
     };
 }
 
-export {COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress};
+export {
+    COPYABLE_ROW_DATA_SET,
+    COPYABLE_ROW_SELECTOR,
+    COPYABLE_TEXT_DATA_SET,
+    COPYABLE_TEXT_SELECTOR,
+    isMouseDownOnCopyableText,
+    shouldSuppressCopyableTextPressOnMouseDown,
+    useCopyableTextRowPress,
+};
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index f8662b9253de..552b2b53b470 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
@@ -258,7 +258,7 @@ function MoneyRequestReportTransactionItemBody({
                 id={transaction.transactionID}
                 style={[styles.transactionListItemStyle, !shouldUseNarrowLayout ? StyleUtils.getSearchTableRowPressableStyle(isLastItem, isSelected) : styles.noBorderRadius]}
                 hoverStyle={[!isPendingDelete && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                dataSet={COPYABLE_ROW_DATA_SET}
                 onMouseDown={handleMouseDown}
                 onHoverIn={handleHoverIn}
                 onPressIn={handlePressIn}
diff --git a/src/components/Pressable/GenericPressable/implementation/index.tsx b/src/components/Pressable/GenericPressable/implementation/index.tsx
index caa3a5a1e895..f0dcf7ecb3f9 100644
--- a/src/components/Pressable/GenericPressable/implementation/index.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/index.tsx
@@ -58,7 +58,6 @@ function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: Pre
             // and shorten interaction selectors. See patches/sentry-core/ before removing or renaming it.
             dataSet={{
                 tag: 'pressable',
-                ...(shouldRenderAsNonNativeButton && {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}),
                 ...(props.noDragArea && {dragArea: false}),
                 ...(sentryLabel && {sentryLabel}),
                 ...props.dataSet,
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 2f6d3bc330d2..77351260d1f8 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -369,7 +369,7 @@ function GroupHeader({
                 isNested
                 shouldAllowTextSelection
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
+                dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
                     // Fresh double-click selection can press before selected text exists, so suppress grouped-header toggles that start on copyable text.
                     const isCopyableTextMouseDown = isMouseDownOnCopyableText(e);
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 0fb5829fba8d..6ed895411bde 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -1,6 +1,6 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import LinkButton from '@components/ButtonComposed/composed/LinkButton';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -367,7 +367,7 @@ function TransactionGroupListExpandedImpl({
                             }}
                             hoverStyle={[!transaction.isDisabled && styles.hoveredComponentBG, transaction.isSelected && styles.activeComponentBG]}
                             wrapperStyle={isDeletedOrPendingDelete ? styles.cursorDisabled : undefined}
-                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
+                            dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                             id={transaction.transactionID}
                             sentryLabel={CONST.SENTRY_LABEL.SEARCH.EXPANDED_TRANSACTION_ROW}
                         >
@@ -392,7 +392,6 @@ function TransactionGroupListExpandedImpl({
                                     columns={currentColumns}
                                     onButtonPress={(event) => handleButtonPress(transaction, event)}
                                     style={[styles.noBorderRadius, isLargeScreenWidth ? [styles.p3, styles.pv2, styles.tableRowHeight] : styles.p4, styles.flex1]}
-                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     isReportItemChild
                                     isInSingleTransactionReport={isInSingleTransactionReport}
                                     shouldShowBottomBorder={shouldShowBottomBorder}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index dac02fd74c36..555754e770e2 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -1,6 +1,6 @@
 import AnimatedCollapsible from '@components/AnimatedCollapsible';
 import {getButtonRole} from '@components/Button/utils';
-import {isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import {useSearchResultsContext} from '@components/Search/SearchContext';
@@ -525,7 +525,7 @@ function TransactionGroupListItemImpl({
                 isNested
                 shouldAllowTextSelection
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
+                dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
                     // Suppress grouped-row toggle only when the interaction starts on selectable text;
                     // blank row space keeps expand/collapse behavior.
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index cb89b6848272..aa25279cc8e0 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
@@ -125,7 +125,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                 isNested
                 shouldAllowTextSelection
                 hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
+                dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 id={item.keyForList ?? ''}
                 sentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM}
                 style={[
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index e04d66856249..20496bdc5325 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
@@ -173,7 +173,7 @@ function TransactionListItemWide<TItem extends ListItem>({
                 onMouseDown={handleOnMouseDown}
                 onHoverIn={handleOnHoverIn}
                 hoverStyle={[!item.isDisabled && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
+                dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 id={item.keyForList ?? ''}
                 sentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM}
                 style={[
@@ -215,8 +215,6 @@ function TransactionListItemWide<TItem extends ListItem>({
                         shouldShowCheckbox={!!canSelectMultiple}
                         checkboxSentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM_CHECKBOX}
                         style={[styles.ph3, isLastItem ? styles.tableBottomRadius : styles.noBorderRadius]}
-                        // Mark the inner row so copied selections keep spaces between values and omit non-copyable cell content.
-                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         violations={transactionViolations}
                         onArrowRightPress={isDeletedTransaction ? undefined : (event) => onSelectRow(item, transactionPreviewData, event)}
                         isHover={hovered}
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index c0311f64076d..8a34d9a1b570 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
@@ -167,7 +167,10 @@ function BaseListItem<TItem extends ListItem>({
                 hoverDimmingValue={1}
                 pressDimmingValue={item.isInteractive === false ? 1 : variables.pressDimValue}
                 hoverStyle={!shouldDisableHoverStyle ? [(!item.isDisabled || isRowSelected) && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle] : undefined}
-                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus}}
+                dataSet={{
+                    ...(shouldAllowTextSelection ? COPYABLE_ROW_DATA_SET : {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}),
+                    [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus,
+                }}
                 onMouseDown={(e) => {
                     const target = e?.target;
                     const isCopyableTarget = markMouseDownOnCopyableText(target);
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index b78d95ec3395..b73ea4f60de5 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -71,6 +71,7 @@ export default function TableRow({
     focusable,
     fullDisabled,
     tabIndex,
+    shouldAllowTextSelection = false,
     ...props
 }: TableRowProps) {
     const theme = useTheme();
@@ -130,6 +131,7 @@ export default function TableRow({
     const tableRowPressableStyles = [
         styles.mh5,
         styles.highlightBG,
+        !shouldAllowTextSelection && styles.userSelectNone,
         !isFirstRow && styles.borderTop,
         isLastRow && styles.tableBottomRadius,
         item.selected && [styles.activeComponentBG, {borderColor: theme.buttonHoveredBG}],
@@ -210,7 +212,7 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
-        if (shouldSuppressCopyableTextRowPress()) {
+        if (shouldSuppressCopyableTextRowPress(shouldAllowTextSelection)) {
             return;
         }
 
@@ -253,7 +255,7 @@ export default function TableRow({
                 style={tableRowPressableStyles}
                 sentryLabel={sentryLabel}
                 interactive={interactive}
-                shouldAllowTextSelection
+                shouldAllowTextSelection={shouldAllowTextSelection}
                 disabled={isDisabled}
                 hoverStyle={tableRowPressableHoverStyle}
                 pressDimmingValue={!interactive ? undefined : 1}
@@ -261,7 +263,7 @@ export default function TableRow({
                 {...getRowAccessibilityProps(isTableSemanticsEnabled, rowIndex, false, semanticTableHasHeader)}
                 onMouseDown={(e) => {
                     const target = e?.target;
-                    const isCopyableTarget = markMouseDownOnCopyableText(target);
+                    const isCopyableTarget = markMouseDownOnCopyableText(target, shouldAllowTextSelection);
 
                     if (isCopyableTarget) {
                         return;
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index a5e31098558b..f82d8eaa166e 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -1,5 +1,5 @@
 import AccountAvatar from '@components/Avatar/connected/AccountAvatar';
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
@@ -53,6 +53,8 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
     return (
         <Table.Row
             interactive
+            shouldAllowTextSelection
+            dataSet={COPYABLE_ROW_DATA_SET}
             rowIndex={rowIndex}
             disabled={item.disabled}
             accessibilityLabel={accessibilityLabel}
diff --git a/src/components/Tables/WorkspaceMembersTable/index.tsx b/src/components/Tables/WorkspaceMembersTable/index.tsx
index 5108ccbf3f59..2186a50fd567 100644
--- a/src/components/Tables/WorkspaceMembersTable/index.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/index.tsx
@@ -1,6 +1,7 @@
 import type {CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
 
+import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
@@ -79,6 +80,7 @@ export default function WorkspaceMembersTable({
 }: WorkspaceMembersTableProps) {
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
+    useCopySelectionHelper();
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
     const workspaceMembersColumns: Array<TableColumn<WorkspaceMembersTableColumnKey, WorkspaceMemberRowData>> = [
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index bdc9e1676321..1053e08763f1 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -1,4 +1,4 @@
-import {COPYABLE_TEXT_SELECTOR} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_SELECTOR} from '@components/CopyableText/selection';
 
 import CONST from '@src/CONST';
 
@@ -15,44 +15,11 @@ const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q'
 const tagAttribute = 'data-testid';
 const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
 const hiddenElementSelector = `[${hiddenElementAttribute}=true]`;
-// These rows need line-based copy output when a browser selection crosses grouped search rows.
-const copyableRowSelector = [`[${tagAttribute}=transaction-group-header-row][${hiddenElementAttribute}=true]`, `[${tagAttribute}=transaction-item-row][${hiddenElementAttribute}=true]`].join(
-    ', ',
-);
 
 function getCopyableElementText(element: globalThis.Element): string {
     return element.textContent?.trim().replaceAll(/[\t\n\r ]+/g, ' ') ?? '';
 }
 
-function isTopLevelCopyableElementForHiddenElement(copyableElement: globalThis.Element, hiddenElement: globalThis.Element): boolean {
-    if (!copyableElement.matches(COPYABLE_TEXT_SELECTOR) || copyableElement.closest(hiddenElementSelector) !== hiddenElement) {
-        return false;
-    }
-
-    // DisplayNames can mark both the wrapper and child names copyable, so only keep the top-most copyable node.
-    const copyableAncestor = copyableElement.parentElement?.closest(COPYABLE_TEXT_SELECTOR);
-    return !copyableAncestor || copyableAncestor.closest(hiddenElementSelector) !== hiddenElement;
-}
-
-function getCopyableTextForHiddenElement(element: globalThis.Element): string {
-    return [element, ...Array.from(element.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
-        .filter((copyableElement) => isTopLevelCopyableElementForHiddenElement(copyableElement, element))
-        .map(getCopyableElementText)
-        .filter((text) => !!text)
-        .join(' ');
-}
-
-function getDirectHiddenChildren(element: globalThis.Element): globalThis.Element[] {
-    return Array.from(element.querySelectorAll(hiddenElementSelector)).filter((hiddenElement) => hiddenElement.parentElement?.closest(hiddenElementSelector) === element);
-}
-
-function getCopyableSelectionLines(element: globalThis.Element): string[] {
-    const currentLine = getCopyableTextForHiddenElement(element);
-    // Expanded grouped rows contain hidden child rows; keep each child as its own copied line.
-    const nestedLines = getDirectHiddenChildren(element).flatMap(getCopyableSelectionLines);
-    return currentLine ? [currentLine, ...nestedLines] : nestedLines;
-}
-
 function replaceElementContentWithLines(element: globalThis.Element, lines: string[]) {
     while (element.firstChild) {
         element.removeChild(element.firstChild);
@@ -66,19 +33,6 @@ function replaceElementContentWithLines(element: globalThis.Element, lines: stri
     }
 }
 
-// Hidden row wrappers can contain avatars, icons, and violation text; keep only values explicitly marked copyable.
-function keepOnlyCopyableSelectionContent(element: globalThis.Element): boolean {
-    const copyableLines = getCopyableSelectionLines(element);
-    if (copyableLines.length === 0) {
-        return false;
-    }
-
-    // Rebuild copied row text with spaces between cells and line breaks between rows.
-    replaceElementContentWithLines(element, copyableLines);
-    element.removeAttribute(hiddenElementAttribute);
-    return true;
-}
-
 function getElementFromNode(node: globalThis.Node): globalThis.Element | null {
     if (node instanceof globalThis.Element) {
         return node;
@@ -94,18 +48,18 @@ function getSelectedRowsForRange(range: Range): globalThis.Element[] {
     }
 
     // Use the live selection range so partially selected first/last grouped rows are still included.
-    return [rootElement.closest(copyableRowSelector), ...Array.from(rootElement.querySelectorAll(copyableRowSelector))].filter(
+    return [rootElement.closest(COPYABLE_ROW_SELECTOR), ...Array.from(rootElement.querySelectorAll(COPYABLE_ROW_SELECTOR))].filter(
         (row): row is globalThis.Element => !!row && range.intersectsNode(row),
     );
 }
 
 function isTopLevelCopyableElementForRow(copyableElement: globalThis.Element, row: globalThis.Element): boolean {
-    if (!copyableElement.matches(COPYABLE_TEXT_SELECTOR) || copyableElement.closest(copyableRowSelector) !== row) {
+    if (!copyableElement.matches(COPYABLE_TEXT_SELECTOR) || copyableElement.closest(COPYABLE_ROW_SELECTOR) !== row) {
         return false;
     }
 
     const copyableAncestor = copyableElement.parentElement?.closest(COPYABLE_TEXT_SELECTOR);
-    return !copyableAncestor || copyableAncestor.closest(copyableRowSelector) !== row;
+    return !copyableAncestor || copyableAncestor.closest(COPYABLE_ROW_SELECTOR) !== row;
 }
 
 function getCopyableElementsForSelectedRow(row: globalThis.Element, range: Range): globalThis.Element[] {
@@ -114,7 +68,7 @@ function getCopyableElementsForSelectedRow(row: globalThis.Element, range: Range
     );
 }
 
-function getHTMLOfSelectedTransactionRows(selection: Selection): string {
+function getHTMLOfSelectedCopyableRows(selection: Selection): string {
     const selectedRows: globalThis.Element[] = [];
     const selectedCopyableElementsByRow = new Map<globalThis.Element, Set<globalThis.Element>>();
 
@@ -182,10 +136,10 @@ const getHTMLOfSelection = (): string => {
         return window.getSelection()?.toString() ?? '';
     }
 
-    const selectedTransactionRowsHTML = getHTMLOfSelectedTransactionRows(selection);
-    if (selectedTransactionRowsHTML) {
-        // Grouped transaction rows need normalized row text before the generic selection cleanup strips hidden wrappers.
-        return selectedTransactionRowsHTML;
+    const selectedCopyableRowsHTML = getHTMLOfSelectedCopyableRows(selection);
+    if (selectedCopyableRowsHTML) {
+        // Explicitly marked rows need normalized row text before generic selection cleanup.
+        return selectedCopyableRowsHTML;
     }
 
     const div = document.createElement('div');
@@ -252,14 +206,6 @@ const getHTMLOfSelection = (): string => {
 
     if (hiddenElements && hiddenElements.length > 0) {
         for (const element of hiddenElements) {
-            if (!div.contains(element)) {
-                continue;
-            }
-
-            // Keep only explicitly copyable values when their parent row is hidden from the selection scraper.
-            if (keepOnlyCopyableSelectionContent(element)) {
-                continue;
-            }
             element.remove();
         }
     }

From 1648bc542a0c3bc02e76adc1b41ed73d40b5f00c Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 27 Aug 2026 18:52:22 +0430
Subject: [PATCH 061/781] Remove redundant selectable text styles

---
 src/components/DisplayNames/DisplayNamesTooltipItem.tsx   | 2 +-
 src/components/DisplayNames/DisplayNamesWithTooltip.tsx   | 2 +-
 .../DisplayNames/DisplayNamesWithoutTooltip.tsx           | 2 +-
 src/components/MenuItem/MenuItem.tsx                      | 1 -
 .../ExpenseReportListItemRowNarrow.tsx                    | 8 ++++----
 .../Search/SearchList/ListItem/UserInfoCell.tsx           | 2 +-
 src/components/TextWithTooltip/index.tsx                  | 5 +----
 .../TransactionItemRow/TransactionItemRowWide.tsx         | 2 --
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index a12e522e49b0..bb29741288c3 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -76,7 +76,7 @@ function DisplayNamesTooltipItem({
                     // eslint-disable-next-line no-param-reassign
                     childRefs.current[index] = el;
                 }}
-                style={[textStyles, styles.pre, isCopyable && styles.userSelectText]}
+                style={[textStyles, styles.pre]}
                 fsClass={forwardedFSClass}
                 selectable={isCopyable}
                 dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index 27ff59437f4a..a47f33011c70 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -69,7 +69,7 @@ function DisplayNamesWithToolTip({
         // Tokenization of string only support prop numberOfLines on Web
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, styles.pRelative, isCopyable && styles.userSelectText]}
+            style={[textStyles, styles.pRelative]}
             numberOfLines={numberOfLines || undefined}
             ref={containerRef}
             testID="DisplayNamesWithToolTip"
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index c03366801f66..ab20f5805b1c 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -42,7 +42,7 @@ function DisplayNamesWithoutTooltip({
     return (
         <Text
             accessibilityLabel={accessibilityLabel}
-            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap, isCopyable && styles.userSelectText]}
+            style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap]}
             numberOfLines={numberOfLines}
             fsClass={forwardedFSClass}
             selectable={isCopyable}
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 8094623afe1f..60c73e76059e 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -690,7 +690,6 @@ function MenuItem({
             isDeleted ? styles.offlineFeedbackDeleted : {},
             shouldBreakWord ? styles.breakWord : {},
             styles.mw100,
-            isTitleSelectable ? styles.userSelectText : {},
         ],
         (titleStyle ?? {}) as TextStyle,
     );
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index 0b4504924821..c16645a85626 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -40,14 +40,14 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
                 <View style={[styles.flexRow, styles.gap2]}>
                     <Text
                         numberOfLines={2}
-                        style={[styles.lh20, styles.flex1, styles.userSelectText]}
+                        style={[styles.lh20, styles.flex1]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
                         {item.reportName ?? ''}
                     </Text>
                     <Text
-                        style={[styles.lh20, styles.flexShrink0, styles.textAlignRight, styles.userSelectText]}
+                        style={[styles.lh20, styles.flexShrink0, styles.textAlignRight]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
@@ -56,14 +56,14 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
                 </View>
                 <View style={[styles.flexRow, styles.gap2]}>
                     <Text
-                        style={[styles.mutedNormalTextLabel, styles.flex1, styles.userSelectText]}
+                        style={[styles.mutedNormalTextLabel, styles.flex1]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
                         {formattedDate}
                     </Text>
                     <Text
-                        style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight, styles.userSelectText]}
+                        style={[styles.mutedNormalTextLabel, styles.flexShrink0, styles.textAlignRight]}
                         selectable
                         dataSet={COPYABLE_TEXT_DATA_SET}
                     >
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 72010daa4340..8dc192811ce0 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -47,7 +47,7 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
             </View>
             <Text
                 numberOfLines={1}
-                style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle, styles.userSelectText]}
+                style={[isLargeScreenWidth ? styles.themeTextColor : styles.textMicroSupporting, styles.flexShrink1, textStyle]}
                 selectable
                 dataSet={COPYABLE_TEXT_DATA_SET}
             >
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 4ec23f1cfc3c..87d5da22643b 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -2,8 +2,6 @@ import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
-import useThemeStyles from '@hooks/useThemeStyles';
-
 import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
@@ -13,7 +11,6 @@ type LayoutChangeEvent = {
 };
 
 function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
-    const styles = useThemeStyles();
     const [showTooltip, setShowTooltip] = useState(false);
 
     return (
@@ -23,7 +20,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
         >
             <Text
                 testID={testID}
-                style={isCopyable ? [style, styles.userSelectText] : style}
+                style={style}
                 numberOfLines={numberOfLines}
                 selectable={isCopyable}
                 onLayout={(e) => {
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index bb11c7affbb8..89c1a4038bb1 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -321,7 +321,6 @@ function TransactionItemRowWide({
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE)]}
                     >
                         <Text
-                            style={styles.userSelectText}
                             selectable
                             dataSet={COPYABLE_TEXT_DATA_SET}
                         >
@@ -336,7 +335,6 @@ function TransactionItemRowWide({
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.BILLABLE)]}
                     >
                         <Text
-                            style={styles.userSelectText}
                             selectable
                             dataSet={COPYABLE_TEXT_DATA_SET}
                         >

From 7db62ae656623a7036207dff6211e0e56fd2e9d9 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 27 Aug 2026 19:42:22 +0430
Subject: [PATCH 062/781] Remove grouped-row double-click selection workaround

---
 src/components/CopyableText/selection.ts      | 121 +-----------------
 .../SearchList/ListItem/GroupHeader.tsx       |  27 ++--
 .../ListItem/TransactionGroupListItem.tsx     |  30 ++---
 3 files changed, 30 insertions(+), 148 deletions(-)

diff --git a/src/components/CopyableText/selection.ts b/src/components/CopyableText/selection.ts
index 395cd8978912..fbfc2ed44a25 100644
--- a/src/components/CopyableText/selection.ts
+++ b/src/components/CopyableText/selection.ts
@@ -35,97 +35,6 @@ function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
     return !!getCopyableTextElement(target);
 }
 
-function getMouseEventPosition(event: unknown): {clientX: number; clientY: number} | null {
-    // React Native Web events may expose mouse coordinates directly or through nativeEvent.
-    if (typeof event !== 'object' || event === null) {
-        return null;
-    }
-
-    if ('clientX' in event && 'clientY' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
-        return {clientX: event.clientX, clientY: event.clientY};
-    }
-
-    if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
-        return null;
-    }
-
-    const {nativeEvent} = event;
-    if ('clientX' in nativeEvent && 'clientY' in nativeEvent && typeof nativeEvent.clientX === 'number' && typeof nativeEvent.clientY === 'number') {
-        return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
-    }
-
-    return null;
-}
-
-function getMouseEventTarget(event: unknown): EventTarget | null {
-    if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
-        return null;
-    }
-
-    return event.target;
-}
-
-function getTextNodes(element: HTMLElement): Node[] {
-    if (typeof document === 'undefined' || typeof NodeFilter === 'undefined' || typeof document.createTreeWalker !== 'function') {
-        return [];
-    }
-
-    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
-    const textNodes: Node[] = [];
-    let currentNode = walker.nextNode();
-
-    while (currentNode) {
-        if (currentNode.textContent?.trim()) {
-            textNodes.push(currentNode);
-        }
-        currentNode = walker.nextNode();
-    }
-
-    return textNodes;
-}
-
-function isPointInsideRect(clientX: number, clientY: number, rect: DOMRect): boolean {
-    return clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom;
-}
-
-function isPointInsideTextNode(node: Node, clientX: number, clientY: number): boolean {
-    const range = document.createRange();
-    range.selectNodeContents(node);
-
-    for (const rect of Array.from(range.getClientRects())) {
-        if (isPointInsideRect(clientX, clientY, rect)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-function isMouseDownOnCopyableText(event: unknown): boolean {
-    const position = getMouseEventPosition(event);
-    if (!position) {
-        return false;
-    }
-
-    // Only treat direct text hits as copyable interactions, so blank space inside a copyable cell keeps normal row behavior.
-    const copyableElement = getCopyableTextElement(getMouseEventTarget(event));
-    if (!copyableElement) {
-        return false;
-    }
-
-    return getTextNodes(copyableElement).some((textNode) => isPointInsideTextNode(textNode, position.clientX, position.clientY));
-}
-
-function shouldSuppressCopyableTextPressOnMouseDown(event: unknown): boolean {
-    // MouseEvent.detail is greater than 1 for double/triple clicks, which should select text instead of pressing the row.
-    if (typeof event !== 'object' || event === null || !('detail' in event)) {
-        return false;
-    }
-
-    const {detail} = event;
-    return typeof detail === 'number' && detail > 1;
-}
-
 // Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
 function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
     if (!didMouseDownStartOnCopyableText) {
@@ -148,47 +57,23 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
 
 function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
-    const shouldSuppressNextPressRef = useRef(false);
 
-    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, shouldSuppressNextPress = false): boolean => {
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
-        shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
         return isCopyableTarget;
     };
 
     const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
-        const didMouseDownStartOnCopyableText = wasMouseDownOnCopyableTextRef.current;
-        const shouldSuppressNextPress = shouldSuppressNextPressRef.current;
-        const shouldSuppressFromSelection = shouldCheck && shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText);
-        // Some text-selection gestures, like double-click selection, can trigger press before selection text is observable.
-        const shouldSuppressPress = shouldCheck && (shouldSuppressNextPress || shouldSuppressFromSelection);
+        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
         wasMouseDownOnCopyableTextRef.current = false;
-        shouldSuppressNextPressRef.current = false;
         return shouldSuppressPress;
     };
 
-    const handleCopyableTextRowPress = (onPress: () => void, shouldCheck = true) => {
-        if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
-            return;
-        }
-
-        onPress();
-    };
-
     return {
         markMouseDownOnCopyableText,
         shouldSuppressCopyableTextRowPress,
-        handleCopyableTextRowPress,
     };
 }
 
-export {
-    COPYABLE_ROW_DATA_SET,
-    COPYABLE_ROW_SELECTOR,
-    COPYABLE_TEXT_DATA_SET,
-    COPYABLE_TEXT_SELECTOR,
-    isMouseDownOnCopyableText,
-    shouldSuppressCopyableTextPressOnMouseDown,
-    useCopyableTextRowPress,
-};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, useCopyableTextRowPress};
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 77351260d1f8..38d10d546971 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -1,5 +1,5 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -325,7 +325,7 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
-    const {handleCopyableTextRowPress, markMouseDownOnCopyableText} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -342,14 +342,16 @@ function GroupHeader({
     const shouldDisplayEmptyView = isEmpty && isExpenseReportType;
 
     const handlePress = (event?: ModifiedMouseEvent) => {
-        handleCopyableTextRowPress(() => {
-            if (isExpenseReportType) {
-                onSelectRow(withOriginalKey(item), transactionPreviewData, event);
-            }
-            if (!isExpenseReportType) {
-                onToggle();
-            }
-        }, true);
+        if (shouldSuppressCopyableTextRowPress()) {
+            return;
+        }
+
+        if (isExpenseReportType) {
+            onSelectRow(withOriginalKey(item), transactionPreviewData, event);
+        }
+        if (!isExpenseReportType) {
+            onToggle();
+        }
     };
 
     const handleLongPress = () => {
@@ -371,10 +373,7 @@ function GroupHeader({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    // Fresh double-click selection can press before selected text exists, so suppress grouped-header toggles that start on copyable text.
-                    const isCopyableTextMouseDown = isMouseDownOnCopyableText(e);
-                    const shouldSuppressTextPress = isCopyableTextMouseDown && shouldSuppressCopyableTextPressOnMouseDown(e);
-                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target, isCopyableTextMouseDown, shouldSuppressTextPress);
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                     if (isCopyableTarget) {
                         return;
                     }
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 555754e770e2..230fba663a24 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -1,6 +1,6 @@
 import AnimatedCollapsible from '@components/AnimatedCollapsible';
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, isMouseDownOnCopyableText, shouldSuppressCopyableTextPressOnMouseDown, useCopyableTextRowPress} from '@components/CopyableText/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import {useSearchResultsContext} from '@components/Search/SearchContext';
@@ -206,7 +206,7 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
-    const {handleCopyableTextRowPress, markMouseDownOnCopyableText} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -263,15 +263,17 @@ function TransactionGroupListItemImpl({
     };
 
     const onPress = (event?: ModifiedMouseEvent) => {
-        handleCopyableTextRowPress(() => {
-            const isEmptyGroupWithoutTransactionsQuery = transactions.length === 0 && !groupItem.transactionsQueryJSON;
-            if (isExpenseReportType || isEmptyGroupWithoutTransactionsQuery) {
-                onSelectRow(item, transactionPreviewData, event);
-            }
-            if (!isExpenseReportType) {
-                handleToggle();
-            }
-        }, true);
+        if (shouldSuppressCopyableTextRowPress()) {
+            return;
+        }
+
+        const isEmptyGroupWithoutTransactionsQuery = transactions.length === 0 && !groupItem.transactionsQueryJSON;
+        if (isExpenseReportType || isEmptyGroupWithoutTransactionsQuery) {
+            onSelectRow(item, transactionPreviewData, event);
+        }
+        if (!isExpenseReportType) {
+            handleToggle();
+        }
     };
 
     const onLongPress = () => {
@@ -527,11 +529,7 @@ function TransactionGroupListItemImpl({
                 hoverStyle={[!isExpanded && !item.isDisabled && styles.hoveredComponentBG, isItemSelected && styles.activeComponentBG]}
                 dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
                 onMouseDown={(e) => {
-                    // Suppress grouped-row toggle only when the interaction starts on selectable text;
-                    // blank row space keeps expand/collapse behavior.
-                    const isCopyableTextMouseDown = isMouseDownOnCopyableText(e);
-                    const shouldSuppressTextPress = isCopyableTextMouseDown && shouldSuppressCopyableTextPressOnMouseDown(e);
-                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target, isCopyableTextMouseDown, shouldSuppressTextPress);
+                    const isCopyableTarget = markMouseDownOnCopyableText(e?.target);
                     if (isCopyableTarget) {
                         return;
                     }

From 6e769d165b34a674cb9ba1dce389ebbde3b68d22 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 28 Aug 2026 12:44:42 +0430
Subject: [PATCH 063/781] Prevent copyable row focus from scrolling search
 results

---
 src/components/CopyableText/selection.ts                 | 4 ++++
 .../Search/SearchList/ListItem/GroupHeader.tsx           | 9 +++++++--
 .../SearchList/ListItem/TransactionGroupListItem.tsx     | 9 +++++++--
 .../TransactionListItem/TransactionListItemNarrow.tsx    | 9 +++++++--
 .../TransactionListItem/TransactionListItemWide.tsx      | 9 +++++++--
 src/components/SelectionList/ListItem/BaseListItem.tsx   | 9 +++++++--
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/components/CopyableText/selection.ts b/src/components/CopyableText/selection.ts
index fbfc2ed44a25..1fc97052a852 100644
--- a/src/components/CopyableText/selection.ts
+++ b/src/components/CopyableText/selection.ts
@@ -70,8 +70,12 @@ function useCopyableTextRowPress() {
         return shouldSuppressPress;
     };
 
+    // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
+    const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
+
     return {
         markMouseDownOnCopyableText,
+        shouldSuppressCopyableTextRowFocus,
         shouldSuppressCopyableTextRowPress,
     };
 }
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 38d10d546971..b2e1b42ca946 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -325,7 +325,7 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -380,7 +380,12 @@ function GroupHeader({
                     e.preventDefault();
                 }}
                 id={item.keyForList ?? ''}
-                onFocus={onFocus}
+                onFocus={(event) => {
+                    if (shouldSuppressCopyableTextRowFocus()) {
+                        return;
+                    }
+                    onFocus?.(event);
+                }}
                 style={[
                     pressableStyle,
                     isFocused && StyleUtils.getItemBackgroundColorStyle(!!isItemSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 230fba663a24..cbabcf9560b7 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -206,7 +206,7 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -540,7 +540,12 @@ function TransactionGroupListItemImpl({
                     pressableStyle,
                     isFocused && StyleUtils.getItemBackgroundColorStyle(!!isItemSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
                 ]}
-                onFocus={onFocus}
+                onFocus={(event) => {
+                    if (shouldSuppressCopyableTextRowFocus()) {
+                        return;
+                    }
+                    onFocus?.(event);
+                }}
                 wrapperStyle={[
                     styles.mh5,
                     animatedHighlightStyle,
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index aa25279cc8e0..9b21c335ea19 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -53,7 +53,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -133,7 +133,12 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                     shouldShowFocusBackground && StyleUtils.getItemBackgroundColorStyle(isSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
-                onFocus={onFocus}
+                onFocus={(event) => {
+                    if (shouldSuppressCopyableTextRowFocus()) {
+                        return;
+                    }
+                    onFocus?.(event);
+                }}
                 onMouseDown={(event) => {
                     const isCopyableTarget = markMouseDownOnCopyableText(event?.target);
                     if (isCopyableTarget) {
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 20496bdc5325..e1f0eff3b419 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -56,7 +56,7 @@ function TransactionListItemWide<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -181,7 +181,12 @@ function TransactionListItemWide<TItem extends ListItem>({
                     isFocused && StyleUtils.getItemBackgroundColorStyle(isSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
-                onFocus={onFocus}
+                onFocus={(event) => {
+                    if (shouldSuppressCopyableTextRowFocus()) {
+                        return;
+                    }
+                    onFocus?.(event);
+                }}
                 wrapperStyle={[styles.mh5, styles.flex1, animatedHighlightStyle, isLastItem && [styles.tableBottomRadius, styles.overflowHidden]]}
             >
                 {({hovered}) => (
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 8a34d9a1b570..45f12782715e 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -73,7 +73,7 @@ function BaseListItem<TItem extends ListItem>({
     const {setMouseUp} = useMouseActions();
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'Checkmark', 'DotIndicator']);
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     // Sync focus on an item
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
@@ -193,7 +193,12 @@ function BaseListItem<TItem extends ListItem>({
                             theme.hoverComponentBG,
                         ),
                 ]}
-                onFocus={onFocus}
+                onFocus={(event) => {
+                    if (shouldSuppressCopyableTextRowFocus()) {
+                        return;
+                    }
+                    onFocus(event);
+                }}
                 role={role}
                 tabIndex={tabIndex}
                 {...accessibleAndAccessibilityLabel}

From 59ff37400f09931f87b97543a3f4d810bb59cb27 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 28 Aug 2026 14:14:28 +0430
Subject: [PATCH 064/781] Prevent violation messages from being text selectable

---
 .../Search/SearchList/ListItem/ExpenseReportListItem.tsx     | 5 +++--
 src/components/TransactionItemRow/TransactionItemRowRBR.tsx  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
index b38ab1907256..ece4c1e28b3f 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
@@ -413,7 +413,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
     const getDescription = useMemo(() => {
         if (reportItem?.isRejectedReport) {
             return (
-                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}>
                     <Icon
                         src={expensifyIcons.DotIndicator}
                         fill={theme.danger}
@@ -429,7 +429,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
             return;
         }
         return (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}>
                 <Icon
                     src={expensifyIcons.DotIndicator}
                     fill={theme.danger}
@@ -453,6 +453,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
         styles.textMicro,
         styles.mutedNormalTextLabel,
         styles.textDanger,
+        styles.userSelectNone,
         isLargeScreenWidth,
         expensifyIcons.DotIndicator,
         theme.danger,
diff --git a/src/components/TransactionItemRow/TransactionItemRowRBR.tsx b/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
index 4d8948ce9a66..c5cd038ff930 100644
--- a/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
@@ -96,7 +96,7 @@ function TransactionItemRowRBRInner({transaction, violations, report, containerS
     return (
         RBRMessages.length > 0 && (
             <View
-                style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, containerStyles]}
+                style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.userSelectNone, containerStyles]}
                 testID="TransactionItemRowRBR"
             >
                 <Icon

From 845f4121d129fab03ffe1c0eef922fe8d74338c6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 28 Aug 2026 14:54:43 +0430
Subject: [PATCH 065/781] fix: preserve partial text boundaries in multi-row
 selections

---
 src/libs/SelectionScraper/index.ts | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 1053e08763f1..7d303b1d662a 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -16,8 +16,30 @@ const tagAttribute = 'data-testid';
 const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
 const hiddenElementSelector = `[${hiddenElementAttribute}=true]`;
 
-function getCopyableElementText(element: globalThis.Element): string {
-    return element.textContent?.trim().replaceAll(/[\t\n\r ]+/g, ' ') ?? '';
+function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
+    const elementRange = document.createRange();
+    elementRange.selectNodeContents(element);
+    const selectedText: string[] = [];
+
+    for (let i = 0; i < selection.rangeCount; i++) {
+        const intersectionRange = selection.getRangeAt(i).cloneRange();
+        if (!intersectionRange.intersectsNode(element)) {
+            continue;
+        }
+
+        if (intersectionRange.compareBoundaryPoints(globalThis.Range.START_TO_START, elementRange) < 0) {
+            intersectionRange.setStart(elementRange.startContainer, elementRange.startOffset);
+        }
+        if (intersectionRange.compareBoundaryPoints(globalThis.Range.END_TO_END, elementRange) > 0) {
+            intersectionRange.setEnd(elementRange.endContainer, elementRange.endOffset);
+        }
+        selectedText.push(intersectionRange.toString());
+    }
+
+    return selectedText
+        .join(' ')
+        .trim()
+        .replaceAll(/[\t\n\r ]+/g, ' ');
 }
 
 function replaceElementContentWithLines(element: globalThis.Element, lines: string[]) {
@@ -103,7 +125,7 @@ function getHTMLOfSelectedCopyableRows(selection: Selection): string {
         .map((row) =>
             [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
                 .filter((copyableElement) => selectedCopyableElementsByRow.get(row)?.has(copyableElement))
-                .map(getCopyableElementText)
+                .map((copyableElement) => getCopyableElementText(copyableElement, selection))
                 .filter((text) => !!text)
                 .join(' '),
         )

From ee9be74ede4df85d598ee0ac37d416677bcb845b Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Fri, 28 Aug 2026 20:02:12 +0100
Subject: [PATCH 066/781] fix(profile): centralize active commuter exclusion
 policy state

---
 .../hooks/useTimeSensitiveHomeAddress.ts            | 12 ++++--------
 src/selectors/Policy.ts                             | 13 ++++++++++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts b/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
index 85e77007be9c..c3ce2237153f 100644
--- a/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
+++ b/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
@@ -1,15 +1,11 @@
 import useOnyx from '@hooks/useOnyx';
 
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, PrivatePersonalDetails} from '@src/types/onyx';
+import type {PrivatePersonalDetails} from '@src/types/onyx';
 
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 
-const hasHomeAndOfficeWorkspaceSelector = (policies: OnyxCollection<Policy>) =>
-    Object.values(policies ?? {}).some(
-        (policy) => policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    );
+import {hasHomeAndOfficeCommuterExclusionPolicySelector} from '@selectors/Policy';
 
 const hasHomeAddressSelector = (privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>) => (privatePersonalDetails?.addresses ?? []).some((address) => !!address?.street?.trim());
 
@@ -19,7 +15,7 @@ const hasHomeAddressSelector = (privatePersonalDetails: OnyxEntry<PrivatePersona
  * no home address recorded in their private personal details.
  */
 function useTimeSensitiveHomeAddress() {
-    const [hasHomeAndOfficeWorkspace] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasHomeAndOfficeWorkspaceSelector});
+    const [hasHomeAndOfficeWorkspace] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasHomeAndOfficeCommuterExclusionPolicySelector});
     const [hasHomeAddress] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS, {selector: hasHomeAddressSelector});
 
     return {
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index db58e5da1765..853c85d6b5be 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -379,10 +379,16 @@ const hasOnlyPersonalPoliciesSelector = (policies: OnyxCollection<Policy>): bool
  * Returns the name of a workspace the member belongs to that calculates commuter exclusions from the member's
  * home address, so the private home address row can name the workspace relying on it.
  */
+const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>): policy is Policy =>
+    !!policy &&
+    !!policy.areDistanceRatesEnabled &&
+    policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
+    policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+
+const hasHomeAndOfficeCommuterExclusionPolicySelector = (policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some(isActiveHomeAndOfficeCommuterExclusionPolicy);
+
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
-    Object.values(policies ?? {}).find(
-        (policy) => policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    )?.name;
+    Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
 
 function isAdminPolicyConnectedTo(policy: OnyxEntry<Policy>, connectionName: ReusablePolicyConnectionName): policy is Policy {
     return !!policy && policy.role === CONST.POLICY.ROLE.ADMIN && !!policy.connections?.[connectionName];
@@ -524,6 +530,7 @@ export {
     hasReusablePoliciesConnectedToSelector,
     lastWorkspaceNumberSelector,
     hasOnlyPersonalPoliciesSelector,
+    hasHomeAndOfficeCommuterExclusionPolicySelector,
     homeAndOfficeCommuterExclusionPolicyNameSelector,
     policyNameSelector,
     policyRoleSelector,

From ddf6b1df2ab001cbad38c2fdaba483ca56e9a541 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Fri, 28 Aug 2026 20:02:22 +0100
Subject: [PATCH 067/781] test(profile): cover disabled distance rates commuter
 indicators

---
 tests/ui/ProfilePageTest.tsx                  |  20 +++
 .../AddHomeAddressTest.tsx                    | 116 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx

diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index e969ae86862e..fbb9976a10d7 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -274,6 +274,7 @@ describe('ProfilePage - agent account', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
                 id: '1',
                 name: 'Boulder Development',
+                areDistanceRatesEnabled: true,
                 commuterExclusions: {method: 'homeAndOffice'},
             });
         });
@@ -281,6 +282,7 @@ describe('ProfilePage - agent account', () => {
         renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
         await waitForBatchedUpdatesWithAct();
 
+        expect(screen.getByTestId('address-menu-item')).toHaveTextContent('info-brickRoadIndicator');
         expect(screen.getByTestId('address-menu-item-further-details')).toHaveTextContent('Boulder Development uses this address for commuter exclusions.');
     });
 
@@ -301,6 +303,24 @@ describe('ProfilePage - agent account', () => {
         expect(screen.queryByTestId('address-menu-item-further-details')).toBeNull();
     });
 
+    it('hides the commuter exclusion indicator when distance rates are disabled', async () => {
+        await setupUser('user@expensify.com');
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
+                id: '1',
+                name: 'Boulder Development',
+                areDistanceRatesEnabled: false,
+                commuterExclusions: {method: 'homeAndOffice'},
+            });
+        });
+
+        renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByTestId('address-menu-item')).toHaveTextContent('none-brickRoadIndicator');
+        expect(screen.queryByTestId('address-menu-item-further-details')).toBeNull();
+    });
+
     it('shows contact methods, pronouns, timezone and private section for non-agent account', async () => {
         await setupUser('user@expensify.com');
 
diff --git a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
new file mode 100644
index 000000000000..cbc86bef074a
--- /dev/null
+++ b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
@@ -0,0 +1,116 @@
+import {render, screen} from '@testing-library/react-native';
+
+import OnyxListItemProvider from '@src/components/OnyxListItemProvider';
+import ONYXKEYS from '@src/ONYXKEYS';
+import TimeSensitiveGroup from '@src/pages/home/TimeSensitiveSection/TimeSensitiveGroup';
+import useTimeSensitiveItems from '@src/pages/home/TimeSensitiveSection/useTimeSensitiveItems';
+
+import type * as NativeNavigation from '@react-navigation/native';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../../../../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/Navigation/Navigation');
+
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<typeof NativeNavigation>('@react-navigation/native'),
+    useFocusEffect: jest.fn(),
+}));
+
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: jest.fn((key: string) => key)})));
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: jest.fn(() => ({
+        Home: () => null,
+    })),
+}));
+
+jest.mock('@src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveAddBankAccount', () =>
+    jest.fn(() => ({
+        shouldShowAddBankAccount: false,
+    })),
+);
+
+jest.mock('@src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveAddPaymentCard', () =>
+    jest.fn(() => ({
+        shouldShowAddPaymentCard: false,
+    })),
+);
+
+jest.mock('@src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveCards', () =>
+    jest.fn(() => ({
+        shouldShowAddShippingAddress: false,
+        shouldShowActivateCard: false,
+        shouldShowReviewCardFraud: false,
+        shouldShowAddVirtualCardPersonalDetails: false,
+        cardsNeedingShippingAddress: [],
+        cardsNeedingActivation: [],
+        cardsWithFraud: [],
+        virtualCardsNeedingPersonalDetails: [],
+    })),
+);
+
+jest.mock('@hooks/useCardFeedErrors', () =>
+    jest.fn(() => ({
+        cardsWithBrokenFeedConnection: {},
+        personalCardsWithBrokenConnection: {},
+    })),
+);
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({login: 'test@example.com'})));
+
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({shouldUseNarrowLayout: false})));
+
+function TimeSensitiveSection() {
+    return <TimeSensitiveGroup items={useTimeSensitiveItems()} />;
+}
+
+const renderTimeSensitiveSection = () =>
+    render(
+        <OnyxListItemProvider>
+            <TimeSensitiveSection />
+        </OnyxListItemProvider>,
+    );
+
+describe('TimeSensitiveSection - AddHomeAddress', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('renders AddHomeAddress when an active workspace uses home and office commuter exclusions', async () => {
+        await Onyx.set(ONYXKEYS.ACCOUNT, {validated: true});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
+            id: '1',
+            name: 'Boulder Development',
+            areDistanceRatesEnabled: true,
+            commuterExclusions: {method: 'homeAndOffice'},
+        });
+        await waitForBatchedUpdates();
+
+        renderTimeSensitiveSection();
+
+        expect(screen.getByText('homePage.timeSensitiveSection.addHomeAddress.title')).toBeTruthy();
+    });
+
+    it('hides AddHomeAddress when distance rates are disabled', async () => {
+        await Onyx.set(ONYXKEYS.ACCOUNT, {validated: true});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
+            id: '1',
+            name: 'Boulder Development',
+            areDistanceRatesEnabled: false,
+            commuterExclusions: {method: 'homeAndOffice'},
+        });
+        await waitForBatchedUpdates();
+
+        renderTimeSensitiveSection();
+
+        expect(screen.queryByText('homePage.timeSensitiveSection.addHomeAddress.title')).toBeNull();
+    });
+});

From aa3a25c0f517e58133c735351bae2387c87ea308 Mon Sep 17 00:00:00 2001
From: KJ21-ENG <140263938+KJ21-ENG@users.noreply.github.com>
Date: Sat, 29 Aug 2026 12:11:30 +0530
Subject: [PATCH 068/781] Clean up unnecessary type assertions

---
 .../getDeployPullRequestList.ts               |  5 +-
 src/components/AutoSubmitModal.tsx            | 33 ++++---
 src/components/ButtonComposed/Button.tsx      |  9 +-
 src/components/ButtonComposed/types.ts        |  7 +-
 src/components/ConfirmationPage.tsx           | 11 ++-
 .../EmojiPicker/CategoryShortcutButton.tsx    | 19 +++-
 .../tooling/getDeployPullRequestList.test.ts  | 52 ++++++++++
 tests/ui/components/ComposedButton.tsx        | 33 ++++++-
 .../IOURequestStepConfirmationPageTest.tsx    | 63 ++++++++++++
 tests/unit/EmojiPickerMenuTest.tsx            | 97 ++++++++++++++++++-
 10 files changed, 297 insertions(+), 32 deletions(-)
 create mode 100644 tests/tooling/getDeployPullRequestList.test.ts

diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
index dd7bae51190b..99882df715bd 100644
--- a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
+++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -84,8 +84,9 @@ async function run() {
         }
         core.setOutput('MOBILE_EXPENSIFY_PR_LIST', mobileExpensifyPRList);
     } catch (error) {
-        console.error((error as Error).message);
-        core.setFailed(error as Error);
+        const failure = error instanceof Error ? error : String(error);
+        console.error(failure instanceof Error ? failure.message : failure);
+        core.setFailed(failure);
     }
 }
 
diff --git a/src/components/AutoSubmitModal.tsx b/src/components/AutoSubmitModal.tsx
index b9a7a8e7a01a..e00cde2f2782 100644
--- a/src/components/AutoSubmitModal.tsx
+++ b/src/components/AutoSubmitModal.tsx
@@ -32,18 +32,23 @@ function AutoSubmitModal() {
     const StyleUtils = useStyleUtils();
     const illustrations = useMemoizedLazyIllustrations(['PaperAirplane', 'Pencil', 'ReceiptsStackedOnPin']);
     const menuSections = useMemo(
-        () => [
-            {
-                icon: illustrations.PaperAirplane,
-                titleTranslationKey: 'autoSubmitModal.submittedExpensesTitle',
-                descriptionTranslationKey: 'autoSubmitModal.submittedExpensesDescription',
-            },
-            {
-                icon: illustrations.Pencil,
-                titleTranslationKey: 'autoSubmitModal.pendingExpensesTitle',
-                descriptionTranslationKey: 'autoSubmitModal.pendingExpensesDescription',
-            },
-        ],
+        () =>
+            [
+                {
+                    icon: illustrations.PaperAirplane,
+                    titleTranslationKey: 'autoSubmitModal.submittedExpensesTitle',
+                    descriptionTranslationKey: 'autoSubmitModal.submittedExpensesDescription',
+                },
+                {
+                    icon: illustrations.Pencil,
+                    titleTranslationKey: 'autoSubmitModal.pendingExpensesTitle',
+                    descriptionTranslationKey: 'autoSubmitModal.pendingExpensesDescription',
+                },
+            ] satisfies Array<{
+                icon: (typeof illustrations)['PaperAirplane' | 'Pencil'];
+                titleTranslationKey: TranslationPaths;
+                descriptionTranslationKey: TranslationPaths;
+            }>,
         [illustrations.PaperAirplane, illustrations.Pencil],
     );
 
@@ -109,8 +114,8 @@ function AutoSubmitModal() {
                             additionalStyles={[styles.mr4]}
                         />
                         <View style={[styles.flex1, styles.justifyContentCenter]}>
-                            <Text style={[styles.textStrong, styles.mb1]}>{translate(section.titleTranslationKey as TranslationPaths)}</Text>
-                            <Text style={[styles.mutedTextLabel, styles.lh16]}>{translate(section.descriptionTranslationKey as TranslationPaths)}</Text>
+                            <Text style={[styles.textStrong, styles.mb1]}>{translate(section.titleTranslationKey)}</Text>
+                            <Text style={[styles.mutedTextLabel, styles.lh16]}>{translate(section.descriptionTranslationKey)}</Text>
                         </View>
                     </View>
                 ))}
diff --git a/src/components/ButtonComposed/Button.tsx b/src/components/ButtonComposed/Button.tsx
index 5365f18c45f0..264583afa228 100644
--- a/src/components/ButtonComposed/Button.tsx
+++ b/src/components/ButtonComposed/Button.tsx
@@ -1,6 +1,5 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import {getButtonRole} from '@components/Button/utils';
-import type {PressableRef} from '@components/Pressable/GenericPressable/types';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -135,7 +134,7 @@ function Button({
 
     return (
         <PressableWithFeedback
-            ref={ref as PressableRef}
+            ref={ref}
             id={id}
             testID={testID}
             accessibilityLabel={accessibilityLabel}
@@ -173,9 +172,9 @@ function Button({
             onHoverIn={!isDisabled || !stayNormalOnDisable ? () => setIsHovered(true) : undefined}
             onHoverOut={!isDisabled || !stayNormalOnDisable ? () => setIsHovered(false) : undefined}
             onPress={(event) => {
-                if (event?.type === 'click') {
-                    const currentTarget = event?.currentTarget as HTMLElement;
-                    currentTarget?.blur();
+                const currentTarget = event?.currentTarget;
+                if (event?.type === 'click' && typeof currentTarget === 'object' && currentTarget !== null && 'blur' in currentTarget && typeof currentTarget.blur === 'function') {
+                    currentTarget.blur();
                 }
 
                 if (enableHapticFeedback) {
diff --git a/src/components/ButtonComposed/types.ts b/src/components/ButtonComposed/types.ts
index 71a089bdee06..71c61bbc045a 100644
--- a/src/components/ButtonComposed/types.ts
+++ b/src/components/ButtonComposed/types.ts
@@ -1,11 +1,12 @@
+import type {PressableRef} from '@components/Pressable/GenericPressable/types';
+
 import type {ButtonVariant} from '@styles/utils/types';
 
 import type CONST from '@src/CONST';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
-import type {ForwardedRef} from 'react';
 import type React from 'react';
-import type {AccessibilityState, GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TargetedEvent, View, ViewStyle} from 'react-native';
+import type {AccessibilityState, GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TargetedEvent, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 type ButtonEventsProps = {
@@ -119,7 +120,7 @@ type BaseButtonProps = WithSentryLabel &
         /**
          * Reference to the outer element.
          */
-        ref?: ForwardedRef<View>;
+        ref?: PressableRef;
     };
 
 type ButtonProps = BaseButtonProps & {
diff --git a/src/components/ConfirmationPage.tsx b/src/components/ConfirmationPage.tsx
index 36c3d8478809..db2a12b0d439 100644
--- a/src/components/ConfirmationPage.tsx
+++ b/src/components/ConfirmationPage.tsx
@@ -106,6 +106,13 @@ function ConfirmationPage({
     const illustrations = useMemoizedLazyIllustrations(['Fireworks']);
     const isLottie = isIllustrationLottieAnimation(illustration);
     const shouldShowStaticFallback = isLottie && isReduceMotionEnabled && illustration === LottieAnimations.Fireworks;
+    const flattenedIllustrationStyle = StyleSheet.flatten(illustrationStyle);
+    const flattenedIllustrationWidth = flattenedIllustrationStyle?.width;
+    const flattenedIllustrationHeight = flattenedIllustrationStyle?.height;
+    const webIllustrationWidth =
+        typeof flattenedIllustrationWidth === 'string' || typeof flattenedIllustrationWidth === 'number' ? flattenedIllustrationWidth : styles.confirmationAnimation.width;
+    const webIllustrationHeight =
+        typeof flattenedIllustrationHeight === 'string' || typeof flattenedIllustrationHeight === 'number' ? flattenedIllustrationHeight : styles.confirmationAnimation.height;
 
     return (
         <View style={[styles.flex1, containerStyle]}>
@@ -129,8 +136,8 @@ function ConfirmationPage({
                                 loop
                                 style={[styles.confirmationAnimation, illustrationStyle]}
                                 webStyle={{
-                                    width: (StyleSheet.flatten(illustrationStyle)?.width as number) ?? styles.confirmationAnimation.width,
-                                    height: (StyleSheet.flatten(illustrationStyle)?.height as number) ?? styles.confirmationAnimation.height,
+                                    width: webIllustrationWidth,
+                                    height: webIllustrationHeight,
                                 }}
                             />
                         );
diff --git a/src/components/EmojiPicker/CategoryShortcutButton.tsx b/src/components/EmojiPicker/CategoryShortcutButton.tsx
index edf308f4f959..d01a021addd1 100644
--- a/src/components/EmojiPicker/CategoryShortcutButton.tsx
+++ b/src/components/EmojiPicker/CategoryShortcutButton.tsx
@@ -17,6 +17,19 @@ import type IconAsset from '@src/types/utils/IconAsset';
 
 import React, {useState} from 'react';
 
+const CATEGORY_TRANSLATION_KEYS: ReadonlyMap<string, TranslationPaths> = new Map<string, TranslationPaths>([
+    ['frequentlyUsed', 'emojiPicker.headers.frequentlyUsed'],
+    ['smileysAndEmotion', 'emojiPicker.headers.smileysAndEmotion'],
+    ['animalsAndNature', 'emojiPicker.headers.animalsAndNature'],
+    ['foodAndDrink', 'emojiPicker.headers.foodAndDrink'],
+    ['travelAndPlaces', 'emojiPicker.headers.travelAndPlaces'],
+    ['activities', 'emojiPicker.headers.activities'],
+    ['objects', 'emojiPicker.headers.objects'],
+    ['symbols', 'emojiPicker.headers.symbols'],
+    ['flags', 'emojiPicker.headers.flags'],
+]);
+const FALLBACK_CATEGORY_TRANSLATION_KEY: TranslationPaths = 'emojiPicker.headers.frequentlyUsed';
+
 type CategoryShortcutButtonProps = {
     /** The emoji code of the category header */
     code: string;
@@ -37,10 +50,12 @@ function CategoryShortcutButton({code, icon, onPress, isSelected = false}: Categ
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const [isHighlighted, setIsHighlighted] = useState(false);
+    const translationKey = CATEGORY_TRANSLATION_KEYS.get(code) ?? FALLBACK_CATEGORY_TRANSLATION_KEY;
+    const label = translate(translationKey);
 
     return (
         <Tooltip
-            text={translate(`emojiPicker.headers.${code}` as TranslationPaths)}
+            text={label}
             shiftVertical={-4}
         >
             <PressableWithoutFeedback
@@ -49,7 +64,7 @@ function CategoryShortcutButton({code, icon, onPress, isSelected = false}: Categ
                 onHoverIn={() => setIsHighlighted(true)}
                 onHoverOut={() => setIsHighlighted(false)}
                 style={({pressed}) => [StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)), styles.categoryShortcutButton, isHighlighted && styles.emojiItemHighlighted]}
-                accessibilityLabel={translate(`emojiPicker.headers.${code}` as TranslationPaths)}
+                accessibilityLabel={label}
                 accessibilityState={isSelected ? {selected: true} : undefined}
                 role={CONST.ROLE.BUTTON}
                 sentryLabel={CONST.SENTRY_LABEL.EMOJI_PICKER.CATEGORY_SHORTCUT}
diff --git a/tests/tooling/getDeployPullRequestList.test.ts b/tests/tooling/getDeployPullRequestList.test.ts
new file mode 100644
index 000000000000..434bd8c95c8d
--- /dev/null
+++ b/tests/tooling/getDeployPullRequestList.test.ts
@@ -0,0 +1,52 @@
+/// <reference types="bun" />
+
+import {afterEach, describe, expect, it, jest} from 'bun:test';
+
+import * as core from '@actions/core';
+
+import run from '../../.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList';
+import GithubUtils from '../../.github/libs/GithubUtils';
+
+const getInputSpy = jest.spyOn(core, 'getInput').mockImplementation((name: string) => {
+    if (name === 'TAG') {
+        return '1.0.0';
+    }
+    return 'false';
+});
+const setFailedSpy = jest.spyOn(core, 'setFailed').mockImplementation(() => {});
+const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+GithubUtils.initOctokitWithToken('test-token');
+const testOctokit = GithubUtils.internalOctokit;
+if (!testOctokit) {
+    throw new Error('GithubUtils did not initialize Octokit');
+}
+const paginateSpy = jest.spyOn(testOctokit, 'paginate');
+
+const rejectionCases = [
+    {name: 'Error', rejection: new Error('release lookup failed'), expectedConsoleValue: 'release lookup failed'},
+    {name: 'string', rejection: 'release lookup failed', expectedConsoleValue: 'release lookup failed'},
+    {name: 'null', rejection: null, expectedConsoleValue: 'null'},
+    {name: 'plain object', rejection: {reason: 'release lookup failed'}, expectedConsoleValue: '[object Object]'},
+];
+
+afterEach(() => {
+    getInputSpy.mockClear();
+    setFailedSpy.mockClear();
+    consoleErrorSpy.mockClear();
+    paginateSpy.mockReset();
+});
+
+describe('getDeployPullRequestList', () => {
+    for (const {name, rejection, expectedConsoleValue} of rejectionCases) {
+        it(`reports a rejected ${name} without a secondary failure`, async () => {
+            paginateSpy.mockRejectedValueOnce(rejection);
+
+            await expect(run()).resolves.toBeUndefined();
+
+            expect(consoleErrorSpy).toHaveBeenCalledTimes(1);
+            expect(consoleErrorSpy).toHaveBeenCalledWith(expectedConsoleValue);
+            expect(setFailedSpy).toHaveBeenCalledTimes(1);
+            expect(setFailedSpy).toHaveBeenCalledWith(rejection instanceof Error ? rejection : expectedConsoleValue);
+        });
+    }
+});
diff --git a/tests/ui/components/ComposedButton.tsx b/tests/ui/components/ComposedButton.tsx
index 06a31e62ce8e..562d5eba51a4 100644
--- a/tests/ui/components/ComposedButton.tsx
+++ b/tests/ui/components/ComposedButton.tsx
@@ -188,6 +188,32 @@ describe('ButtonComposed — Button', () => {
             expect(onPress).toHaveBeenCalledTimes(1);
         });
 
+        it('blurs a callable click target before preserving haptics and onPress', () => {
+            const blur = jest.fn();
+            const event = {type: 'click', currentTarget: {blur}};
+            renderButton({onPress, enableHapticFeedback: true});
+
+            fireEvent(getButton(), 'press', event);
+
+            expect(blur).toHaveBeenCalledTimes(1);
+            expect(HapticFeedback.press).toHaveBeenCalledTimes(1);
+            expect(onPress).toHaveBeenCalledWith(event);
+            expect(blur.mock.invocationCallOrder.at(0)).toBeLessThan(onPress.mock.invocationCallOrder.at(0) ?? 0);
+        });
+
+        it.each([
+            {name: 'absent', currentTarget: {}},
+            {name: 'non-callable', currentTarget: {blur: 'not callable'}},
+        ])('skips an $name blur member while preserving haptics and onPress', ({currentTarget}) => {
+            const event = {type: 'click', currentTarget};
+            renderButton({onPress, enableHapticFeedback: true});
+
+            expect(() => fireEvent(getButton(), 'press', event)).not.toThrow();
+
+            expect(HapticFeedback.press).toHaveBeenCalledTimes(1);
+            expect(onPress).toHaveBeenCalledWith(event);
+        });
+
         it('calls onPressIn when the button press begins', () => {
             // Given a Button with an onPressIn handler
             const onPressIn = jest.fn();
@@ -468,14 +494,17 @@ describe('ButtonComposed — Button', () => {
             expect(getButton().props.sentryLabel).toBe('submit-button');
         });
 
-        it('forwards ref to the underlying pressable', () => {
+        it('forwards ref to the underlying pressable and clears it on teardown', () => {
             // Given a ref attached to the Button
             const ref = React.createRef<View>();
-            renderButton({ref});
+            const {unmount} = renderButton({ref});
 
             // Then the ref is populated after mount (non-null means the native element
             // is reachable for imperative calls such as .measure() or .focus())
             expect(ref.current).not.toBeNull();
+
+            unmount();
+            expect(ref.current).toBeNull();
         });
     });
 
diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
index 227f1e3c10bd..8db30e3e0414 100644
--- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
+++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
@@ -1,8 +1,11 @@
 import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 
+import ConfirmationPage from '@components/ConfirmationPage';
+import type {ConfirmationPageProps} from '@components/ConfirmationPage';
 import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import HTMLEngineProvider from '@components/HTMLEngineProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import Lottie from '@components/Lottie';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
 import {startSplitBill} from '@libs/actions/IOU/Split';
@@ -19,6 +22,9 @@ import type {WaypointCollection} from '@src/types/onyx/Transaction';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
+// Use React Native Animated to exercise the native Animated.Value dimension accepted by ViewStyle.
+// eslint-disable-next-line no-restricted-imports
+import {Animated} from 'react-native';
 import Onyx from 'react-native-onyx';
 import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
 
@@ -29,6 +35,11 @@ import createRandomPolicy from '../../utils/collections/policies';
 import {signInWithTestUser, translateLocal} from '../../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
 
+jest.mock('@components/Lottie', () => ({
+    __esModule: true,
+    default: jest.fn(() => null),
+}));
+
 jest.mock('@rnmapbox/maps', () => {
     return {
         default: jest.fn(),
@@ -274,6 +285,21 @@ function createWaypoints(startAddress: string, endAddress: string): WaypointColl
     };
 }
 
+function renderConfirmationAndGetWebStyle(illustrationStyle?: ConfirmationPageProps['illustrationStyle']) {
+    render(
+        <ConfirmationPage
+            heading="Done"
+            illustrationStyle={illustrationStyle}
+        />,
+    );
+    const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
+    expect(lottieProps).toBeDefined();
+    if (!lottieProps) {
+        throw new Error('ConfirmationPage did not render Lottie');
+    }
+    return lottieProps.webStyle;
+}
+
 const DEFAULT_SPLIT_TRANSACTION: Transaction = {
     amount: 0,
     isAmountSet: true,
@@ -298,6 +324,43 @@ const DEFAULT_SPLIT_TRANSACTION: Transaction = {
     transactionID: TRANSACTION_ID,
 };
 
+describe('ConfirmationPage Lottie web dimensions', () => {
+    afterEach(() => {
+        jest.mocked(Lottie).mockClear();
+    });
+
+    it('preserves compatible dimensions and independently defaults absent dimensions', () => {
+        const defaults = renderConfirmationAndGetWebStyle();
+        expect(defaults).toBeDefined();
+        expect(defaults?.width).toBeDefined();
+        expect(defaults?.height).toBeDefined();
+
+        expect(renderConfirmationAndGetWebStyle({width: 0, height: 96})).toMatchObject({width: 0, height: 96});
+        expect(renderConfirmationAndGetWebStyle({width: 48, height: '75%'})).toMatchObject({width: 48, height: '75%'});
+        expect(renderConfirmationAndGetWebStyle({width: '50%'})).toMatchObject({width: '50%', height: defaults?.height});
+        expect(renderConfirmationAndGetWebStyle({height: 64})).toMatchObject({width: defaults?.width, height: 64});
+    });
+
+    it('defaults an animated width only at the web boundary and preserves the native style', () => {
+        const defaultWebStyle = renderConfirmationAndGetWebStyle();
+        expect(defaultWebStyle).toBeDefined();
+        if (!defaultWebStyle) {
+            throw new Error('ConfirmationPage did not provide default Lottie web dimensions');
+        }
+        const animatedWidth = new Animated.Value(40);
+        render(
+            <ConfirmationPage
+                heading="Done"
+                illustrationStyle={{width: animatedWidth, height: '75%'}}
+            />,
+        );
+        const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
+        expect(lottieProps).toBeDefined();
+        expect(lottieProps?.webStyle).toEqual({width: defaultWebStyle.width, height: '75%'});
+        expect(lottieProps?.style).toEqual(expect.arrayContaining([expect.objectContaining({width: animatedWidth, height: '75%'})]));
+    });
+});
+
 describe('IOURequestStepConfirmationPageTest', () => {
     beforeEach(() => {
         jest.clearAllMocks();
diff --git a/tests/unit/EmojiPickerMenuTest.tsx b/tests/unit/EmojiPickerMenuTest.tsx
index 7d1b404b0344..a6147bc7c1a5 100644
--- a/tests/unit/EmojiPickerMenuTest.tsx
+++ b/tests/unit/EmojiPickerMenuTest.tsx
@@ -1,3 +1,5 @@
+import {fireEvent, render, screen, waitFor} from '@testing-library/react-native';
+
 /**
  * Fallback option 1: tests the frequently-used dedupe logic end-to-end by calling
  * processFrequentlyUsedEmojis + mergeEmojisWithFrequentlyUsedEmojis directly rather than
@@ -6,12 +8,103 @@
  * [RED] before commit 12: hexcode-only entries are filtered by the current impl, so the
  * merged list is missing one entry and the summed count is wrong.
  */
-import emojis from '@assets/emojis';
+import emojis, {categoryFrequentlyUsed} from '@assets/emojis';
+
+import CategoryShortcutBar from '@components/EmojiPicker/CategoryShortcutBar';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import Tooltip from '@components/Tooltip';
+import type {TooltipExtendedProps} from '@components/Tooltip/types';
 
-import {mergeEmojisWithFrequentlyUsedEmojis, processFrequentlyUsedEmojis} from '@libs/EmojiUtils';
+import {getHeaderEmojis, mergeEmojisWithFrequentlyUsedEmojis, processFrequentlyUsedEmojis} from '@libs/EmojiUtils';
 
+import IntlStore from '@src/languages/IntlStore';
+import type {TranslationPaths} from '@src/languages/types';
 import type FrequentlyUsedEmoji from '@src/types/onyx/FrequentlyUsedEmoji';
 
+import React from 'react';
+
+import {translateLocal} from '../utils/TestHelper';
+
+jest.mock('@components/Tooltip', () => ({
+    __esModule: true,
+    default: jest.fn(({children}: TooltipExtendedProps) => children),
+}));
+
+describe('CategoryShortcutBar labels', () => {
+    it('uses production labels for every header and the frequently-used fallback for an unknown code', async () => {
+        await IntlStore.load('en');
+        const onPress = jest.fn();
+        const productionHeaders = getHeaderEmojis([categoryFrequentlyUsed, ...emojis]);
+        expect(productionHeaders.map(({code}) => code)).toEqual([
+            'frequentlyUsed',
+            'smileysAndEmotion',
+            'animalsAndNature',
+            'foodAndDrink',
+            'travelAndPlaces',
+            'activities',
+            'objects',
+            'symbols',
+            'flags',
+        ]);
+        const frequentlyUsedHeader = productionHeaders.at(0);
+        expect(frequentlyUsedHeader).toBeDefined();
+        if (!frequentlyUsedHeader) {
+            throw new Error('The frequently-used emoji header is missing');
+        }
+        const headerEmojis = [...productionHeaders, {...frequentlyUsedHeader, code: 'unknownCategory', index: -1}];
+        const expectedTranslationPaths: TranslationPaths[] = [
+            'emojiPicker.headers.frequentlyUsed',
+            'emojiPicker.headers.smileysAndEmotion',
+            'emojiPicker.headers.animalsAndNature',
+            'emojiPicker.headers.foodAndDrink',
+            'emojiPicker.headers.travelAndPlaces',
+            'emojiPicker.headers.activities',
+            'emojiPicker.headers.objects',
+            'emojiPicker.headers.symbols',
+            'emojiPicker.headers.flags',
+        ];
+        const selectedHeader = productionHeaders.at(1);
+        expect(selectedHeader).toBeDefined();
+        if (!selectedHeader) {
+            throw new Error('The smileys emoji header is missing');
+        }
+
+        jest.mocked(Tooltip).mockClear();
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={headerEmojis}
+                    selectedIndex={selectedHeader.index}
+                    onPress={onPress}
+                />
+            </LocaleContextProvider>,
+        );
+
+        for (const translationPath of expectedTranslationPaths) {
+            const label = translateLocal(translationPath);
+            const expectedCount = translationPath === 'emojiPicker.headers.frequentlyUsed' ? 2 : 1;
+            await waitFor(() => {
+                const tooltipLabels = jest
+                    .mocked(Tooltip)
+                    .mock.calls.slice(-headerEmojis.length)
+                    .map(([tooltipProps]) => tooltipProps.text);
+                expect(tooltipLabels.filter((tooltipLabel) => tooltipLabel === label)).toHaveLength(expectedCount);
+                expect(screen.getAllByLabelText(label)).toHaveLength(expectedCount);
+            });
+        }
+
+        const frequentlyUsedButtons = screen.getAllByLabelText(translateLocal('emojiPicker.headers.frequentlyUsed'));
+        expect(frequentlyUsedButtons.at(-1)?.props.accessibilityState).toMatchObject({disabled: false, selected: undefined});
+
+        const selectedButton = screen.getByLabelText(translateLocal('emojiPicker.headers.smileysAndEmotion'));
+        expect(selectedButton.props.accessibilityState).toMatchObject({disabled: false, selected: true});
+        fireEvent(selectedButton, 'hoverIn');
+        fireEvent(selectedButton, 'hoverOut');
+        fireEvent.press(selectedButton);
+        expect(onPress).toHaveBeenCalledWith(selectedHeader.index);
+    });
+});
+
 describe('EmojiPickerMenu frequently used dedupe', () => {
     it('collapses mixed-format frequently used entries to one picker entry per emoji', () => {
         const frequentlyUsedEmojis: FrequentlyUsedEmoji[] = [

From 2878437152ec4f3773981d9c5357a06983dcf1fc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 29 Aug 2026 13:13:29 +0430
Subject: [PATCH 069/781] refactor: move copyable selection helpers to
 SelectionScraper

---
 src/components/DisplayNames/DisplayNamesTooltipItem.tsx       | 2 +-
 src/components/DisplayNames/DisplayNamesWithTooltip.tsx       | 2 +-
 src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx    | 2 +-
 src/components/MenuItem/MenuItem.tsx                          | 2 +-
 .../MoneyRequestReportTransactionItem.tsx                     | 2 +-
 .../ExpenseReportListItemRowNarrow.tsx                        | 3 ++-
 .../ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx | 2 +-
 src/components/Search/SearchList/ListItem/GroupHeader.tsx     | 2 +-
 .../SearchList/ListItem/TransactionGroupListExpanded.tsx      | 2 +-
 .../Search/SearchList/ListItem/TransactionGroupListItem.tsx   | 2 +-
 .../TransactionListItem/TransactionListItemNarrow.tsx         | 2 +-
 .../ListItem/TransactionListItem/TransactionListItemWide.tsx  | 3 ++-
 src/components/Search/SearchList/ListItem/UserInfoCell.tsx    | 2 +-
 src/components/SelectionList/ListItem/BaseListItem.tsx        | 3 ++-
 src/components/Table/TableRow.tsx                             | 2 +-
 .../Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx | 3 ++-
 src/components/TextWithTooltip/index.tsx                      | 3 ++-
 src/components/TransactionItemRow/TransactionItemRowWide.tsx  | 2 +-
 src/libs/SelectionScraper/index.ts                            | 4 ++--
 .../CopyableText => libs/SelectionScraper}/selection.ts       | 0
 20 files changed, 25 insertions(+), 20 deletions(-)
 rename src/{components/CopyableText => libs/SelectionScraper}/selection.ts (100%)

diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index bb29741288c3..52a090bffbd2 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -1,10 +1,10 @@
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import UserDetailsTooltip from '@components/UserDetailsTooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import type {RefObject} from 'react';
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index a47f33011c70..d3a6a639e416 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -1,10 +1,10 @@
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {formatReportLastMessageText} from '@libs/ReportUtils';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 
 // eslint-disable-next-line no-restricted-imports
 import type {Text as RNText} from 'react-native';
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index ab20f5805b1c..a28153c14303 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -1,9 +1,9 @@
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 
 import type {StyleProp, TextStyle} from 'react-native';
 
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 60c73e76059e..1f863ee6de16 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -4,7 +4,6 @@ import UserAvatar from '@components/Avatar/UserAvatar';
 import WorkspaceAvatar from '@components/Avatar/WorkspaceAvatar';
 import Badge from '@components/Badge';
 import {useIsCompactMenu} from '@components/CompactMenuContext';
-import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import CopyTextToClipboard from '@components/CopyTextToClipboard';
 import DisplayNames from '@components/DisplayNames';
 import type {DisplayNameWithTooltip} from '@components/DisplayNames/types';
@@ -40,6 +39,7 @@ import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import getButtonState from '@libs/getButtonState';
 import mergeRefs from '@libs/mergeRefs';
 import Parser from '@libs/Parser';
+import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
 
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 552b2b53b470..6462383f40f6 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -1,5 +1,4 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
@@ -18,6 +17,7 @@ import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 import ControlSelection from '@libs/ControlSelection';
 import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
 import {hasFlexColumn} from '@libs/SearchUIUtils';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index c16645a85626..34a50edee80e 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -1,5 +1,4 @@
 import Checkbox from '@components/Checkbox';
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import getExpenseReportRowDisplayValues from '@components/Search/SearchList/ListItem/getExpenseReportRowDisplayValues';
 import Text from '@components/Text';
 
@@ -7,6 +6,8 @@ import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+
 import CONST from '@src/CONST';
 
 import React from 'react';
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
index 4a145aa566c1..d5d1cac70942 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
@@ -1,5 +1,4 @@
 import Checkbox from '@components/Checkbox';
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import {ReportSubmitToPopoverMeasurableAnchor} from '@components/ReportSubmitToPopoverAnchor';
 import DeferredActionCell from '@components/Search/SearchList/ListItem/ActionCell/DeferredActionCell';
@@ -18,6 +17,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getBase62ReportID from '@libs/getBase62ReportID';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 
 import variables from '@styles/variables';
 
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index b2e1b42ca946..f88be36e1bb7 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -1,5 +1,4 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -22,6 +21,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getColumnsToShow} from '@libs/SearchUIUtils';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 30313a985ec7..6c373cfb394f 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -1,6 +1,5 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import LinkButton from '@components/ButtonComposed/composed/LinkButton';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import {PressableWithFeedback} from '@components/Pressable';
@@ -30,6 +29,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getReportAction} from '@libs/ReportActionsUtils';
 import {getReportOrDraftReport} from '@libs/ReportUtils';
 import {createAndOpenSearchTransactionThread, getColumnsToShow, getTableMinWidth} from '@libs/SearchUIUtils';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import type {TransactionPreviewData} from '@userActions/Search';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index cbabcf9560b7..f913800ede1b 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -1,6 +1,5 @@
 import AnimatedCollapsible from '@components/AnimatedCollapsible';
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import {useSearchResultsContext} from '@components/Search/SearchContext';
@@ -23,6 +22,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getLoginByAccountID} from '@libs/PersonalDetailsUtils';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import {getVisibleTransactionViolations, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index 9b21c335ea19..959610bbf3bf 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -1,5 +1,4 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
@@ -15,6 +14,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import durationHighlightItem from '@libs/Navigation/helpers/getDurationHighlightItem';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index e1f0eff3b419..bebf0c006ee6 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -1,5 +1,4 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
@@ -15,6 +14,8 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+
 import CONST from '@src/CONST';
 
 import type {View} from 'react-native';
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 8dc192811ce0..6660f2fcbb39 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -1,10 +1,10 @@
 import UserAvatar from '@components/Avatar/UserAvatar';
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {isCorrectSearchUserName} from '@libs/SearchUIUtils';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import type {AvatarSizeName} from '@styles/utils';
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 45f12782715e..e09f878797b0 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -1,5 +1,4 @@
 import {getButtonRole} from '@components/Button/utils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
@@ -13,6 +12,8 @@ import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index b73ea4f60de5..d937a3cf2097 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -1,5 +1,4 @@
 import Checkbox from '@components/Checkbox';
-import {useCopyableTextRowPress} from '@components/CopyableText/selection';
 import ErrorMessageRow from '@components/ErrorMessageRow';
 import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -12,6 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index f82d8eaa166e..2344d93fa81b 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -1,5 +1,4 @@
 import AccountAvatar from '@components/Avatar/connected/AccountAvatar';
-import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
@@ -11,6 +10,8 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 87d5da22643b..68e935bb8d57 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -1,7 +1,8 @@
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+
 import React, {useState} from 'react';
 
 import type TextWithTooltipProps from './types';
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index 89c1a4038bb1..58051d88b900 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -1,5 +1,4 @@
 import Checkbox from '@components/Checkbox';
-import {COPYABLE_TEXT_DATA_SET} from '@components/CopyableText/selection';
 import Icon from '@components/Icon';
 import {PressableWithFeedback} from '@components/Pressable';
 import RadioButton from '@components/RadioButton';
@@ -27,6 +26,7 @@ import getBase62ReportID from '@libs/getBase62ReportID';
 import {isTaxCodeCustomized, getTagGLCode} from '@libs/PolicyUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import {getReimbursableTotal, isExpenseReport} from '@libs/ReportUtils';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 import {
     getAmount,
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 7d303b1d662a..14c6cb2e7689 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -1,5 +1,3 @@
-import {COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_SELECTOR} from '@components/CopyableText/selection';
-
 import CONST from '@src/CONST';
 
 import type {ChildNode} from 'domhandler';
@@ -11,6 +9,8 @@ import {parseDocument} from 'htmlparser2';
 
 import type GetCurrentSelection from './types';
 
+import {COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_SELECTOR} from './selection';
+
 const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user']);
 const tagAttribute = 'data-testid';
 const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
diff --git a/src/components/CopyableText/selection.ts b/src/libs/SelectionScraper/selection.ts
similarity index 100%
rename from src/components/CopyableText/selection.ts
rename to src/libs/SelectionScraper/selection.ts

From e8ecf7afcbe9a8c3be1753925ebc592e91d6a057 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 29 Aug 2026 13:55:58 +0430
Subject: [PATCH 070/781] `refactor: move copyable selection logic into
 SelectionScraper`

---
 .../DisplayNames/DisplayNamesTooltipItem.tsx  |  2 +-
 .../DisplayNames/DisplayNamesWithTooltip.tsx  |  2 +-
 .../DisplayNamesWithoutTooltip.tsx            |  2 +-
 src/components/MenuItem/MenuItem.tsx          |  2 +-
 .../MoneyRequestReportTransactionItem.tsx     |  2 +-
 .../ExpenseReportListItemRowNarrow.tsx        |  2 +-
 .../ExpenseReportListItemRowWide.tsx          |  2 +-
 .../SearchList/ListItem/GroupHeader.tsx       |  2 +-
 .../ListItem/TransactionGroupListExpanded.tsx |  2 +-
 .../ListItem/TransactionGroupListItem.tsx     |  2 +-
 .../TransactionListItemNarrow.tsx             |  2 +-
 .../TransactionListItemWide.tsx               |  2 +-
 .../SearchList/ListItem/UserInfoCell.tsx      |  2 +-
 .../SelectionList/ListItem/BaseListItem.tsx   |  2 +-
 src/components/Table/TableRow.tsx             |  2 +-
 .../WorkspaceMembersTableRow.tsx              |  2 +-
 src/components/TextWithTooltip/index.tsx      |  2 +-
 .../TransactionItemRowWide.tsx                |  2 +-
 src/libs/SelectionScraper/index.native.ts     | 20 +++++
 src/libs/SelectionScraper/index.ts            | 78 ++++++++++++++++-
 src/libs/SelectionScraper/selection.ts        | 83 -------------------
 21 files changed, 114 insertions(+), 103 deletions(-)
 delete mode 100644 src/libs/SelectionScraper/selection.ts

diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 52a090bffbd2..37b3939f4a8c 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -4,7 +4,7 @@ import UserDetailsTooltip from '@components/UserDetailsTooltip';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import type {RefObject} from 'react';
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index d3a6a639e416..daa7a646c398 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -4,7 +4,7 @@ import Tooltip from '@components/Tooltip';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {formatReportLastMessageText} from '@libs/ReportUtils';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 // eslint-disable-next-line no-restricted-imports
 import type {Text as RNText} from 'react-native';
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index a28153c14303..3363662e4780 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -3,7 +3,7 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import type {StyleProp, TextStyle} from 'react-native';
 
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 1f863ee6de16..9aee36e9d20f 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -39,7 +39,7 @@ import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import getButtonState from '@libs/getButtonState';
 import mergeRefs from '@libs/mergeRefs';
 import Parser from '@libs/Parser';
-import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
 
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 6462383f40f6..d449a5b88e00 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -17,7 +17,7 @@ import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 import ControlSelection from '@libs/ControlSelection';
 import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
 import {hasFlexColumn} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index 34a50edee80e..a2b9adbe0373 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -6,7 +6,7 @@ import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
index d5d1cac70942..9b32b43d1207 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
@@ -17,7 +17,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getBase62ReportID from '@libs/getBase62ReportID';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import variables from '@styles/variables';
 
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index f88be36e1bb7..c396e23f9e70 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -21,7 +21,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getColumnsToShow} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 6c373cfb394f..c3bda8bf79bc 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -29,7 +29,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getReportAction} from '@libs/ReportActionsUtils';
 import {getReportOrDraftReport} from '@libs/ReportUtils';
 import {createAndOpenSearchTransactionThread, getColumnsToShow, getTableMinWidth} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import type {TransactionPreviewData} from '@userActions/Search';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index f913800ede1b..0e49afe990bf 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -22,7 +22,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getLoginByAccountID} from '@libs/PersonalDetailsUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getVisibleTransactionViolations, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index 959610bbf3bf..0e5c362e4941 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -14,7 +14,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import durationHighlightItem from '@libs/Navigation/helpers/getDurationHighlightItem';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index bebf0c006ee6..15f3b39319cc 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -14,7 +14,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 6660f2fcbb39..861d50de6734 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -4,7 +4,7 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {isCorrectSearchUserName} from '@libs/SearchUIUtils';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import type {AvatarSizeName} from '@styles/utils';
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index e09f878797b0..8ebf9d3a81b1 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -12,7 +12,7 @@ import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
 
 import variables from '@styles/variables';
 
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index d937a3cf2097..55f4bea3e7b4 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -11,7 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {useCopyableTextRowPress} from '@libs/SelectionScraper/selection';
+import {useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index 2344d93fa81b..57a5c0cdd91c 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -10,7 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import variables from '@styles/variables';
 
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index 68e935bb8d57..c077d054649b 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -1,7 +1,7 @@
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import React, {useState} from 'react';
 
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index 58051d88b900..56f686b6baa8 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -26,7 +26,7 @@ import getBase62ReportID from '@libs/getBase62ReportID';
 import {isTaxCodeCustomized, getTagGLCode} from '@libs/PolicyUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import {getReimbursableTotal, isExpenseReport} from '@libs/ReportUtils';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper/selection';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 import {
     getAmount,
diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index aeb9c5ae3ce2..8cfc2289319d 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -1,8 +1,28 @@
+import CONST from '@src/CONST';
+
 import type GetCurrentSelection from './types';
 
+const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
+const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
+
+function useCopyableTextRowPress() {
+    // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
+    const markMouseDownOnCopyableText = (_target: EventTarget | null | undefined, _shouldCheck = true): boolean => false;
+    const shouldSuppressCopyableTextRowPress = (_shouldCheck = true): boolean => false;
+    const shouldSuppressCopyableTextRowFocus = () => false;
+
+    return {
+        markMouseDownOnCopyableText,
+        shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowPress,
+    };
+}
+
 // This is a no-op function for native devices because they wouldn't be able to support Selection API like a website.
 const getCurrentSelection: GetCurrentSelection = () => '';
 
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress};
+
 export default {
     getCurrentSelection,
 };
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 14c6cb2e7689..8e30c8c9263b 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -6,15 +6,87 @@ import render from 'dom-serializer';
 import {DataNode, Element} from 'domhandler';
 import {Str} from 'expensify-common';
 import {parseDocument} from 'htmlparser2';
+import {useRef} from 'react';
 
 import type GetCurrentSelection from './types';
 
-import {COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_SELECTOR} from './selection';
-
 const markdownElements = new Set(['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user']);
 const tagAttribute = 'data-testid';
 const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
 const hiddenElementSelector = `[${hiddenElementAttribute}=true]`;
+const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
+const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
+const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
+const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
+
+function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
+    if (typeof HTMLElement === 'undefined') {
+        return null;
+    }
+
+    try {
+        if (target instanceof HTMLElement) {
+            return target.closest(COPYABLE_TEXT_SELECTOR);
+        }
+
+        if (typeof Node !== 'undefined' && target instanceof Node) {
+            return target.parentElement?.closest(COPYABLE_TEXT_SELECTOR) ?? null;
+        }
+    } catch {
+        return null;
+    }
+
+    return null;
+}
+
+function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
+    return !!getCopyableTextElement(target);
+}
+
+// Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
+function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
+    if (!didMouseDownStartOnCopyableText) {
+        return false;
+    }
+
+    if (typeof window === 'undefined' || typeof window.getSelection !== 'function') {
+        return false;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.isCollapsed || selection.toString().length === 0) {
+        return false;
+    }
+
+    const anchorCopyableElement = getCopyableTextElement(selection.anchorNode);
+    const focusCopyableElement = getCopyableTextElement(selection.focusNode);
+    return !!anchorCopyableElement || !!focusCopyableElement;
+}
+
+function useCopyableTextRowPress() {
+    const wasMouseDownOnCopyableTextRef = useRef(false);
+
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
+        const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
+        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        return isCopyableTarget;
+    };
+
+    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
+        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+        wasMouseDownOnCopyableTextRef.current = false;
+        return shouldSuppressPress;
+    };
+
+    // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
+    const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
+
+    return {
+        markMouseDownOnCopyableText,
+        shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowPress,
+    };
+}
 
 function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
     const elementRange = document.createRange();
@@ -300,6 +372,8 @@ const getCurrentSelection: GetCurrentSelection = () => {
     return newHtml || '';
 };
 
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress};
+
 export default {
     getCurrentSelection,
 };
diff --git a/src/libs/SelectionScraper/selection.ts b/src/libs/SelectionScraper/selection.ts
deleted file mode 100644
index 1fc97052a852..000000000000
--- a/src/libs/SelectionScraper/selection.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import CONST from '@src/CONST';
-
-import {useRef} from 'react';
-
-/**
- * Helpers for detecting explicitly copyable text inside pressable rows, so row handlers can allow
- * native text selection without triggering row navigation after drag-select.
- */
-const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
-const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
-const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
-const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
-
-function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
-    if (typeof HTMLElement === 'undefined') {
-        return null;
-    }
-
-    try {
-        if (target instanceof HTMLElement) {
-            return target.closest(COPYABLE_TEXT_SELECTOR);
-        }
-
-        if (typeof Node !== 'undefined' && target instanceof Node) {
-            return target.parentElement?.closest(COPYABLE_TEXT_SELECTOR) ?? null;
-        }
-    } catch {
-        return null;
-    }
-
-    return null;
-}
-
-function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
-    return !!getCopyableTextElement(target);
-}
-
-// Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
-function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
-    if (!didMouseDownStartOnCopyableText) {
-        return false;
-    }
-
-    if (typeof window === 'undefined' || typeof window.getSelection !== 'function') {
-        return false;
-    }
-
-    const selection = window.getSelection();
-    if (!selection || selection.isCollapsed || selection.toString().length === 0) {
-        return false;
-    }
-
-    const anchorCopyableElement = getCopyableTextElement(selection.anchorNode);
-    const focusCopyableElement = getCopyableTextElement(selection.focusNode);
-    return !!anchorCopyableElement || !!focusCopyableElement;
-}
-
-function useCopyableTextRowPress() {
-    const wasMouseDownOnCopyableTextRef = useRef(false);
-
-    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
-        const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
-        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
-        return isCopyableTarget;
-    };
-
-    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
-        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
-        wasMouseDownOnCopyableTextRef.current = false;
-        return shouldSuppressPress;
-    };
-
-    // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
-    const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
-
-    return {
-        markMouseDownOnCopyableText,
-        shouldSuppressCopyableTextRowFocus,
-        shouldSuppressCopyableTextRowPress,
-    };
-}
-
-export {COPYABLE_ROW_DATA_SET, COPYABLE_ROW_SELECTOR, COPYABLE_TEXT_DATA_SET, COPYABLE_TEXT_SELECTOR, useCopyableTextRowPress};

From 91a7c9268a2639a2e28bc496b2a82e6dc03d9892 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 29 Aug 2026 14:07:54 +0430
Subject: [PATCH 071/781] `fix: remove unused native selection defaults`

---
 src/libs/SelectionScraper/index.native.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 8cfc2289319d..8fae98880817 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -7,8 +7,8 @@ const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
 function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
-    const markMouseDownOnCopyableText = (_target: EventTarget | null | undefined, _shouldCheck = true): boolean => false;
-    const shouldSuppressCopyableTextRowPress = (_shouldCheck = true): boolean => false;
+    const markMouseDownOnCopyableText = (_target: EventTarget | null | undefined, _shouldCheck?: boolean): boolean => false;
+    const shouldSuppressCopyableTextRowPress = (_shouldCheck?: boolean): boolean => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
 
     return {

From c8e9a4265070eba5f347ae38d2af5f67871557b6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 29 Aug 2026 14:33:05 +0430
Subject: [PATCH 072/781] fix: remove unused parameters from native selection
 helpers

---
 src/libs/SelectionScraper/index.native.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 8fae98880817..9e6a64fe84c8 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -7,8 +7,8 @@ const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
 function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
-    const markMouseDownOnCopyableText = (_target: EventTarget | null | undefined, _shouldCheck?: boolean): boolean => false;
-    const shouldSuppressCopyableTextRowPress = (_shouldCheck?: boolean): boolean => false;
+    const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
 
     return {

From a7614e3d1ee7dcaa2411508481ac32b657ed2d07 Mon Sep 17 00:00:00 2001
From: KJ21-ENG <140263938+KJ21-ENG@users.noreply.github.com>
Date: Sat, 29 Aug 2026 16:39:34 +0530
Subject: [PATCH 073/781] Narrow Seatbelt cleanup scope for c1-260827-r1

---
 src/components/ButtonComposed/Button.tsx |  9 ++++---
 src/components/ButtonComposed/types.ts   |  7 +++--
 tests/ui/components/ComposedButton.tsx   | 33 ++----------------------
 3 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/components/ButtonComposed/Button.tsx b/src/components/ButtonComposed/Button.tsx
index 264583afa228..5365f18c45f0 100644
--- a/src/components/ButtonComposed/Button.tsx
+++ b/src/components/ButtonComposed/Button.tsx
@@ -1,5 +1,6 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import {getButtonRole} from '@components/Button/utils';
+import type {PressableRef} from '@components/Pressable/GenericPressable/types';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -134,7 +135,7 @@ function Button({
 
     return (
         <PressableWithFeedback
-            ref={ref}
+            ref={ref as PressableRef}
             id={id}
             testID={testID}
             accessibilityLabel={accessibilityLabel}
@@ -172,9 +173,9 @@ function Button({
             onHoverIn={!isDisabled || !stayNormalOnDisable ? () => setIsHovered(true) : undefined}
             onHoverOut={!isDisabled || !stayNormalOnDisable ? () => setIsHovered(false) : undefined}
             onPress={(event) => {
-                const currentTarget = event?.currentTarget;
-                if (event?.type === 'click' && typeof currentTarget === 'object' && currentTarget !== null && 'blur' in currentTarget && typeof currentTarget.blur === 'function') {
-                    currentTarget.blur();
+                if (event?.type === 'click') {
+                    const currentTarget = event?.currentTarget as HTMLElement;
+                    currentTarget?.blur();
                 }
 
                 if (enableHapticFeedback) {
diff --git a/src/components/ButtonComposed/types.ts b/src/components/ButtonComposed/types.ts
index 71c61bbc045a..71a089bdee06 100644
--- a/src/components/ButtonComposed/types.ts
+++ b/src/components/ButtonComposed/types.ts
@@ -1,12 +1,11 @@
-import type {PressableRef} from '@components/Pressable/GenericPressable/types';
-
 import type {ButtonVariant} from '@styles/utils/types';
 
 import type CONST from '@src/CONST';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
+import type {ForwardedRef} from 'react';
 import type React from 'react';
-import type {AccessibilityState, GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TargetedEvent, ViewStyle} from 'react-native';
+import type {AccessibilityState, GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TargetedEvent, View, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 type ButtonEventsProps = {
@@ -120,7 +119,7 @@ type BaseButtonProps = WithSentryLabel &
         /**
          * Reference to the outer element.
          */
-        ref?: PressableRef;
+        ref?: ForwardedRef<View>;
     };
 
 type ButtonProps = BaseButtonProps & {
diff --git a/tests/ui/components/ComposedButton.tsx b/tests/ui/components/ComposedButton.tsx
index 562d5eba51a4..06a31e62ce8e 100644
--- a/tests/ui/components/ComposedButton.tsx
+++ b/tests/ui/components/ComposedButton.tsx
@@ -188,32 +188,6 @@ describe('ButtonComposed — Button', () => {
             expect(onPress).toHaveBeenCalledTimes(1);
         });
 
-        it('blurs a callable click target before preserving haptics and onPress', () => {
-            const blur = jest.fn();
-            const event = {type: 'click', currentTarget: {blur}};
-            renderButton({onPress, enableHapticFeedback: true});
-
-            fireEvent(getButton(), 'press', event);
-
-            expect(blur).toHaveBeenCalledTimes(1);
-            expect(HapticFeedback.press).toHaveBeenCalledTimes(1);
-            expect(onPress).toHaveBeenCalledWith(event);
-            expect(blur.mock.invocationCallOrder.at(0)).toBeLessThan(onPress.mock.invocationCallOrder.at(0) ?? 0);
-        });
-
-        it.each([
-            {name: 'absent', currentTarget: {}},
-            {name: 'non-callable', currentTarget: {blur: 'not callable'}},
-        ])('skips an $name blur member while preserving haptics and onPress', ({currentTarget}) => {
-            const event = {type: 'click', currentTarget};
-            renderButton({onPress, enableHapticFeedback: true});
-
-            expect(() => fireEvent(getButton(), 'press', event)).not.toThrow();
-
-            expect(HapticFeedback.press).toHaveBeenCalledTimes(1);
-            expect(onPress).toHaveBeenCalledWith(event);
-        });
-
         it('calls onPressIn when the button press begins', () => {
             // Given a Button with an onPressIn handler
             const onPressIn = jest.fn();
@@ -494,17 +468,14 @@ describe('ButtonComposed — Button', () => {
             expect(getButton().props.sentryLabel).toBe('submit-button');
         });
 
-        it('forwards ref to the underlying pressable and clears it on teardown', () => {
+        it('forwards ref to the underlying pressable', () => {
             // Given a ref attached to the Button
             const ref = React.createRef<View>();
-            const {unmount} = renderButton({ref});
+            renderButton({ref});
 
             // Then the ref is populated after mount (non-null means the native element
             // is reachable for imperative calls such as .measure() or .focus())
             expect(ref.current).not.toBeNull();
-
-            unmount();
-            expect(ref.current).toBeNull();
         });
     });
 

From be3bad3c17105e50baf2427df10cfce7241cd309 Mon Sep 17 00:00:00 2001
From: KJ21-ENG <140263938+KJ21-ENG@users.noreply.github.com>
Date: Sat, 29 Aug 2026 23:05:37 +0530
Subject: [PATCH 074/781] Update generated deploy pull request action

---
 .github/actions/javascript/getDeployPullRequestList/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 86ebf2b747d2..a6a784bfee67 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -26271,8 +26271,9 @@ async function run() {
     }
     setOutput("MOBILE_EXPENSIFY_PR_LIST", mobileExpensifyPRList);
   } catch (error2) {
-    console.error(error2.message);
-    setFailed(error2);
+    const failure = error2 instanceof Error ? error2 : String(error2);
+    console.error(failure instanceof Error ? failure.message : failure);
+    setFailed(failure);
   }
 }
 if (import.meta.main) {

From 33adf6ee519642d10ef8c2bfa3bdaa80543e9618 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 31 Aug 2026 10:44:46 +0430
Subject: [PATCH 075/781] fix: prevent copyable table text from triggering row
 actions

---
 src/components/Table/TableRow.tsx         |  8 ++-
 src/libs/SelectionScraper/index.native.ts | 10 +++-
 src/libs/SelectionScraper/index.ts        | 68 ++++++++++++++++++++++-
 3 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 55f4bea3e7b4..76a16415205e 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -11,7 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {isMouseDownOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
@@ -212,7 +212,7 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
-        if (shouldSuppressCopyableTextRowPress(shouldAllowTextSelection)) {
+        if (shouldSuppressCopyableTextRowPress(shouldAllowTextSelection, {shouldSuppressOnMouseDown: true})) {
             return;
         }
 
@@ -263,7 +263,9 @@ export default function TableRow({
                 {...getRowAccessibilityProps(isTableSemanticsEnabled, rowIndex, false, semanticTableHasHeader)}
                 onMouseDown={(e) => {
                     const target = e?.target;
-                    const isCopyableTarget = markMouseDownOnCopyableText(target, shouldAllowTextSelection);
+                    // Reserve direct copyable-text interactions for native selection while preserving normal presses outside the text.
+                    const isCopyableTextMouseDown = shouldAllowTextSelection && isMouseDownOnCopyableText(e);
+                    const isCopyableTarget = markMouseDownOnCopyableText(target, isCopyableTextMouseDown);
 
                     if (isCopyableTarget) {
                         return;
diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 9e6a64fe84c8..0c80b4adf5a9 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -5,10 +5,16 @@ import type GetCurrentSelection from './types';
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
+type SuppressCopyableTextRowPressOptions = {
+    shouldSuppressOnMouseDown?: boolean;
+};
+
+const isMouseDownOnCopyableText = () => false;
+
 function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
     const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean) => boolean = () => false;
-    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean, options?: SuppressCopyableTextRowPressOptions) => boolean = () => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
 
     return {
@@ -21,7 +27,7 @@ function useCopyableTextRowPress() {
 // This is a no-op function for native devices because they wouldn't be able to support Selection API like a website.
 const getCurrentSelection: GetCurrentSelection = () => '';
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isMouseDownOnCopyableText, useCopyableTextRowPress};
 
 export default {
     getCurrentSelection,
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 8e30c8c9263b..5b90151b949c 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -19,6 +19,10 @@ const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
+type SuppressCopyableTextRowPressOptions = {
+    shouldSuppressOnMouseDown?: boolean;
+};
+
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
         return null;
@@ -43,6 +47,63 @@ function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
     return !!getCopyableTextElement(target);
 }
 
+function getMouseEventPosition(event: unknown): {clientX: number; clientY: number} | null {
+    if (typeof event !== 'object' || event === null) {
+        return null;
+    }
+
+    if ('clientX' in event && 'clientY' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
+        return {clientX: event.clientX, clientY: event.clientY};
+    }
+
+    if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
+        return null;
+    }
+
+    const {nativeEvent} = event;
+    if ('clientX' in nativeEvent && 'clientY' in nativeEvent && typeof nativeEvent.clientX === 'number' && typeof nativeEvent.clientY === 'number') {
+        return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
+    }
+
+    return null;
+}
+
+function getMouseEventTarget(event: unknown): EventTarget | null {
+    if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
+        return null;
+    }
+
+    return event.target;
+}
+
+function isMouseDownOnCopyableText(event: unknown): boolean {
+    const position = getMouseEventPosition(event);
+    const copyableElement = getCopyableTextElement(getMouseEventTarget(event));
+    if (!position || !copyableElement || typeof document === 'undefined' || typeof NodeFilter === 'undefined') {
+        return false;
+    }
+
+    const walker = document.createTreeWalker(copyableElement, NodeFilter.SHOW_TEXT);
+    let textNode = walker.nextNode();
+
+    while (textNode) {
+        if (textNode.textContent?.trim()) {
+            const range = document.createRange();
+            range.selectNodeContents(textNode);
+
+            const isInsideText = Array.from(range.getClientRects()).some(
+                (rect) => position.clientX >= rect.left && position.clientX <= rect.right && position.clientY >= rect.top && position.clientY <= rect.bottom,
+            );
+            if (isInsideText) {
+                return true;
+            }
+        }
+        textNode = walker.nextNode();
+    }
+
+    return false;
+}
+
 // Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
 function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
     if (!didMouseDownStartOnCopyableText) {
@@ -72,8 +133,9 @@ function useCopyableTextRowPress() {
         return isCopyableTarget;
     };
 
-    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
-        const shouldSuppressPress = shouldCheck && shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current);
+    const shouldSuppressCopyableTextRowPress = (shouldCheck = true, {shouldSuppressOnMouseDown = false}: SuppressCopyableTextRowPressOptions = {}): boolean => {
+        const shouldSuppressPress =
+            shouldCheck && wasMouseDownOnCopyableTextRef.current && (shouldSuppressOnMouseDown || shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current));
         wasMouseDownOnCopyableTextRef.current = false;
         return shouldSuppressPress;
     };
@@ -372,7 +434,7 @@ const getCurrentSelection: GetCurrentSelection = () => {
     return newHtml || '';
 };
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isMouseDownOnCopyableText, useCopyableTextRowPress};
 
 export default {
     getCurrentSelection,

From ff259ea67c3c9b3fcdd1eb8e6785476d4e0dabdc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 1 Sep 2026 22:43:30 +0430
Subject: [PATCH 076/781] fix: preserve member navigation and copyable text
 selection

---
 src/components/Table/TableRow.tsx         |  56 ++++++-----
 src/libs/SelectionScraper/index.native.ts |  23 +++--
 src/libs/SelectionScraper/index.ts        | 110 +++++++++++++++++++---
 3 files changed, 146 insertions(+), 43 deletions(-)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 76a16415205e..60eb36ce4832 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -11,7 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {isMouseDownOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {isPressStartOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
@@ -90,7 +90,7 @@ export default function TableRow({
         tableListMetadata,
         dynamicGridTemplateColumns,
     } = useTableContext();
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {handleCopyableTextRowPress, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress} = useCopyableTextRowPress();
     const semanticRowID = useTableRowSemanticID();
     const semanticTableHasHeader = !tableListMetadata.hasPageHeader || tableListMetadata.shouldRenderStickyHeader;
     const isAccessibilityHidden = semanticRowID === null || ariaHidden === true;
@@ -212,29 +212,34 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
-        if (shouldSuppressCopyableTextRowPress(shouldAllowTextSelection, {shouldSuppressOnMouseDown: true})) {
-            return;
-        }
-
-        if (isDisabled || !interactive) {
-            return;
-        }
-
-        if (!selectionUsesNarrowLayout || !isMobileSelectionEnabled || !selectionEnabled) {
-            onPress?.(event);
-            return;
-        }
+        handleCopyableTextRowPress(
+            () => {
+                if (isDisabled || !interactive) {
+                    return;
+                }
+
+                if (!selectionUsesNarrowLayout || !isMobileSelectionEnabled || !selectionEnabled) {
+                    onPress?.(event);
+                    return;
+                }
+
+                if (item.disabled) {
+                    return;
+                }
+
+                if (!item.isSelectionDisabled) {
+                    handleCheckboxPress(event);
+                }
+            },
+            {shouldCheck: shouldAllowTextSelection, shouldDelayMousePress: true},
+        );
+    };
 
-        if (item.disabled) {
+    const handleRowLongPress = () => {
+        if (shouldSuppressCopyableTextRowLongPress(shouldAllowTextSelection)) {
             return;
         }
 
-        if (!item.isSelectionDisabled) {
-            handleCheckboxPress(event);
-        }
-    };
-
-    const handleRowLongPress = () => {
         if (isDisabled || item.disabled || !selectionEnabled || isMobileSelectionEnabled || !shouldEnableMobileSelectionLongPress || !interactive || item.isSelectionDisabled) {
             return;
         }
@@ -263,9 +268,8 @@ export default function TableRow({
                 {...getRowAccessibilityProps(isTableSemanticsEnabled, rowIndex, false, semanticTableHasHeader)}
                 onMouseDown={(e) => {
                     const target = e?.target;
-                    // Reserve direct copyable-text interactions for native selection while preserving normal presses outside the text.
-                    const isCopyableTextMouseDown = shouldAllowTextSelection && isMouseDownOnCopyableText(e);
-                    const isCopyableTarget = markMouseDownOnCopyableText(target, isCopyableTextMouseDown);
+                    const isCopyableTextMouseDown = shouldAllowTextSelection && isPressStartOnCopyableText(e);
+                    const isCopyableTarget = markMouseDownOnCopyableText(target, isCopyableTextMouseDown, {shouldSuppressNextPress: e.detail > 1});
 
                     if (isCopyableTarget) {
                         return;
@@ -287,6 +291,10 @@ export default function TableRow({
 
                     e.preventDefault();
                 }}
+                onTouchStart={(e) => {
+                    const isCopyableTextTouchStart = shouldAllowTextSelection && isPressStartOnCopyableText(e);
+                    markTouchStartOnCopyableText(e, isCopyableTextTouchStart);
+                }}
                 onPress={(event) => handleRowPress(event)}
                 onLongPress={handleRowLongPress}
                 {...props}
diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 0c80b4adf5a9..84562a489020 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -5,21 +5,32 @@ import type GetCurrentSelection from './types';
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
-type SuppressCopyableTextRowPressOptions = {
-    shouldSuppressOnMouseDown?: boolean;
+type MarkCopyableTextMouseDownOptions = {
+    shouldSuppressNextPress?: boolean;
 };
 
-const isMouseDownOnCopyableText = () => false;
+type HandleCopyableTextRowPressOptions = {
+    shouldCheck?: boolean;
+    shouldDelayMousePress?: boolean;
+};
+
+const isPressStartOnCopyableText = () => false;
 
 function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
-    const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean) => boolean = () => false;
-    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean, options?: SuppressCopyableTextRowPressOptions) => boolean = () => false;
+    const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean, options?: MarkCopyableTextMouseDownOptions) => boolean = () => false;
+    const markTouchStartOnCopyableText: (event: unknown, shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowLongPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
+    const handleCopyableTextRowPress: (onPress: () => void, options?: HandleCopyableTextRowPressOptions) => void = (onPress) => onPress();
 
     return {
+        handleCopyableTextRowPress,
         markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
         shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
     };
 }
@@ -27,7 +38,7 @@ function useCopyableTextRowPress() {
 // This is a no-op function for native devices because they wouldn't be able to support Selection API like a website.
 const getCurrentSelection: GetCurrentSelection = () => '';
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isMouseDownOnCopyableText, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress};
 
 export default {
     getCurrentSelection,
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 5b90151b949c..c61ff834a03e 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -6,7 +6,7 @@ import render from 'dom-serializer';
 import {DataNode, Element} from 'domhandler';
 import {Str} from 'expensify-common';
 import {parseDocument} from 'htmlparser2';
-import {useRef} from 'react';
+import {useEffect, useRef} from 'react';
 
 import type GetCurrentSelection from './types';
 
@@ -18,9 +18,16 @@ const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
+// Accommodate slower browser double-click intervals while keeping single-click navigation responsive.
+const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 500;
 
-type SuppressCopyableTextRowPressOptions = {
-    shouldSuppressOnMouseDown?: boolean;
+type MarkCopyableTextMouseDownOptions = {
+    shouldSuppressNextPress?: boolean;
+};
+
+type HandleCopyableTextRowPressOptions = {
+    shouldCheck?: boolean;
+    shouldDelayMousePress?: boolean;
 };
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
@@ -47,7 +54,20 @@ function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
     return !!getCopyableTextElement(target);
 }
 
-function getMouseEventPosition(event: unknown): {clientX: number; clientY: number} | null {
+function getTouchPosition(touches: unknown): {clientX: number; clientY: number} | null {
+    if (typeof touches !== 'object' || touches === null || !('0' in touches)) {
+        return null;
+    }
+
+    const touch = touches[0];
+    if (typeof touch !== 'object' || touch === null || !('clientX' in touch) || !('clientY' in touch) || typeof touch.clientX !== 'number' || typeof touch.clientY !== 'number') {
+        return null;
+    }
+
+    return {clientX: touch.clientX, clientY: touch.clientY};
+}
+
+function getPressStartPosition(event: unknown): {clientX: number; clientY: number} | null {
     if (typeof event !== 'object' || event === null) {
         return null;
     }
@@ -56,6 +76,13 @@ function getMouseEventPosition(event: unknown): {clientX: number; clientY: numbe
         return {clientX: event.clientX, clientY: event.clientY};
     }
 
+    if ('touches' in event) {
+        const touchPosition = getTouchPosition(event.touches);
+        if (touchPosition) {
+            return touchPosition;
+        }
+    }
+
     if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
         return null;
     }
@@ -65,10 +92,14 @@ function getMouseEventPosition(event: unknown): {clientX: number; clientY: numbe
         return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
     }
 
+    if ('touches' in nativeEvent) {
+        return getTouchPosition(nativeEvent.touches);
+    }
+
     return null;
 }
 
-function getMouseEventTarget(event: unknown): EventTarget | null {
+function getPressStartTarget(event: unknown): EventTarget | null {
     if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
         return null;
     }
@@ -76,9 +107,9 @@ function getMouseEventTarget(event: unknown): EventTarget | null {
     return event.target;
 }
 
-function isMouseDownOnCopyableText(event: unknown): boolean {
-    const position = getMouseEventPosition(event);
-    const copyableElement = getCopyableTextElement(getMouseEventTarget(event));
+function isPressStartOnCopyableText(event: unknown): boolean {
+    const position = getPressStartPosition(event);
+    const copyableElement = getCopyableTextElement(getPressStartTarget(event));
     if (!position || !copyableElement || typeof document === 'undefined' || typeof NodeFilter === 'undefined') {
         return false;
     }
@@ -126,26 +157,79 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
 
 function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
+    const wasTouchStartOnCopyableTextRef = useRef(false);
+    const shouldSuppressNextPressRef = useRef(false);
+    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+    const clearPendingCopyableTextPress = () => {
+        if (!pendingCopyableTextPressRef.current) {
+            return;
+        }
+
+        clearTimeout(pendingCopyableTextPressRef.current);
+        pendingCopyableTextPressRef.current = null;
+    };
+
+    useEffect(() => clearPendingCopyableTextPress, []);
 
-    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true): boolean => {
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
+        clearPendingCopyableTextPress();
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
+        return isCopyableTarget;
+    };
+
+    const markTouchStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
+        clearPendingCopyableTextPress();
+        const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
+        wasMouseDownOnCopyableTextRef.current = false;
+        wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
+        shouldSuppressNextPressRef.current = false;
         return isCopyableTarget;
     };
 
-    const shouldSuppressCopyableTextRowPress = (shouldCheck = true, {shouldSuppressOnMouseDown = false}: SuppressCopyableTextRowPressOptions = {}): boolean => {
-        const shouldSuppressPress =
-            shouldCheck && wasMouseDownOnCopyableTextRef.current && (shouldSuppressOnMouseDown || shouldSuppressCopyableTextPress(wasMouseDownOnCopyableTextRef.current));
+    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
+        const didPressStartOnCopyableText = wasMouseDownOnCopyableTextRef.current || wasTouchStartOnCopyableTextRef.current;
+        const shouldSuppressPress = shouldCheck && (shouldSuppressNextPressRef.current || shouldSuppressCopyableTextPress(didPressStartOnCopyableText));
         wasMouseDownOnCopyableTextRef.current = false;
+        wasTouchStartOnCopyableTextRef.current = false;
+        shouldSuppressNextPressRef.current = false;
         return shouldSuppressPress;
     };
 
+    const shouldSuppressCopyableTextRowLongPress = (shouldCheck = true): boolean => {
+        const shouldSuppressLongPress = shouldCheck && wasTouchStartOnCopyableTextRef.current;
+        shouldSuppressNextPressRef.current = shouldSuppressLongPress;
+        return shouldSuppressLongPress;
+    };
+
+    const handleCopyableTextRowPress = (onPress: () => void, {shouldCheck = true, shouldDelayMousePress = false}: HandleCopyableTextRowPressOptions = {}) => {
+        const shouldDelayPress = shouldCheck && shouldDelayMousePress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
+        if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
+            return;
+        }
+
+        if (!shouldDelayPress) {
+            onPress();
+            return;
+        }
+
+        pendingCopyableTextPressRef.current = setTimeout(() => {
+            pendingCopyableTextPressRef.current = null;
+            onPress();
+        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
+    };
+
     // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
     const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
 
     return {
+        handleCopyableTextRowPress,
         markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
         shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
     };
 }
@@ -434,7 +518,7 @@ const getCurrentSelection: GetCurrentSelection = () => {
     return newHtml || '';
 };
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isMouseDownOnCopyableText, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress};
 
 export default {
     getCurrentSelection,

From 1e79ab81ab90a31074e727c789109f27ce3c410c Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Tue, 1 Sep 2026 19:25:38 +0100
Subject: [PATCH 077/781] chore: fix tests

---
 tests/ui/InitialSettingsPageTest.tsx           | 1 +
 tests/unit/useAccountTabIndicatorStatusTest.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index 30dd05544ea9..c9bd2e53c6bf 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -257,6 +257,7 @@ describe('InitialSettingsPage - agent account', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
                 id: '1',
                 name: 'Boulder Development',
+                areDistanceRatesEnabled: true,
                 commuterExclusions: {method: 'homeAndOffice'},
             });
         });
diff --git a/tests/unit/useAccountTabIndicatorStatusTest.ts b/tests/unit/useAccountTabIndicatorStatusTest.ts
index c06c5a354adf..331f4c360498 100644
--- a/tests/unit/useAccountTabIndicatorStatusTest.ts
+++ b/tests/unit/useAccountTabIndicatorStatusTest.ts
@@ -185,6 +185,7 @@ const getMockForTestCase = ({name, status}: IndicatorTestCase) =>
             owner: name === accountCardFeedTestCases.admin.name ? 'johndoe12@expensify.com' : 'otheruser@expensify.com',
             role: name === accountCardFeedTestCases.admin.name ? 'admin' : 'user',
             policyAccountID: cardFeed.policyAccountID,
+            areDistanceRatesEnabled: status === CONST.INDICATOR_STATUS.HAS_HOME_ADDRESS_INFO,
             commuterExclusions: status === CONST.INDICATOR_STATUS.HAS_HOME_ADDRESS_INFO ? {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE} : undefined,
         },
         [ONYXKEYS.CARD_LIST]: {

From 1e47e3517fbcb04bba8d0123bae72bc25f3353b5 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 2 Sep 2026 12:14:59 +0430
Subject: [PATCH 078/781] fix: refine selectable expense detail content

---
 src/components/MenuItem/MenuItem.tsx          |  6 ++-
 .../ReportActionItem/MoneyRequestView.tsx     | 47 +++++++++++++++++--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index dc3052990b46..21c60f92de42 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -225,6 +225,9 @@ type MenuItemBaseProps = ForwardedFSClassProps &
         /** Hint to display at the bottom of the component */
         hintText?: string | ReactNode;
 
+        /** Any additional styles to pass to hint text. */
+        hintTextStyle?: StyleProp<ViewStyle>;
+
         /** Should the error text red dot indicator be shown */
         shouldShowRedDotIndicator?: boolean;
 
@@ -548,6 +551,7 @@ function MenuItem({
     errorTextStyle,
     shouldShowRedDotIndicator,
     hintText,
+    hintTextStyle,
     success = false,
     iconReportID,
     focused = false,
@@ -1317,7 +1321,7 @@ function MenuItem({
                                                 isError={false}
                                                 shouldShowRedDotIndicator={false}
                                                 message={hintText}
-                                                style={styles.menuItemError}
+                                                style={[styles.menuItemError, hintTextStyle]}
                                                 shouldRenderMessageAsHTML={shouldRenderHintAsHTML}
                                             />
                                         )}
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 1d1b71a8c48f..8c790024468a 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -95,6 +95,7 @@ import {
     isTrackExpenseReportNew,
     shouldEnableNegative,
 } from '@libs/ReportUtils';
+import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import {hasEnabledTags, shouldShowDependentTagList} from '@libs/TagsOptionsListUtils';
 import {
     getAttendeesListDisplayString,
@@ -974,6 +975,7 @@ function MoneyRequestView({
     const categoryValue = updatedTransaction?.category ?? categoryForDisplay;
     const decodedCategoryName = getDecodedLeafCategoryName(categoryValue);
     const categoryCopyValue = decodedCategoryName || undefined;
+    const vendorCopyValue = transactionVendorName || undefined;
     const cardCopyValue = cardProgramName;
     const taxRateValue = hasTaxValueChanged ? taxValue : (transaction?.taxName ?? taxRateTitle ?? fallbackTaxRateTitle ?? '');
     const taxRateCopyValue = taxRateValue;
@@ -985,6 +987,7 @@ function MoneyRequestView({
             <OfflineWithFeedback pendingAction={getPendingFieldAction('waypoints') ?? getPendingFieldAction('merchant')}>
                 <MenuItemWithTopDescription
                     description={distanceToDisplayDescription}
+                    descriptionTextStyle={styles.userSelectNone}
                     title={distanceToDisplay}
                     hintText={distanceToDisplayHintText}
                     numberOfLinesTitle={2}
@@ -1020,6 +1023,7 @@ function MoneyRequestView({
                     }}
                     brickRoadIndicator={getErrorForField('waypoints') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                     errorText={getErrorForField('waypoints')}
+                    errorTextStyle={styles.userSelectNone}
                     copyValue={distanceCopyValue}
                     copyable={!!distanceCopyValue}
                     isTitleSelectable={!!distanceCopyValue}
@@ -1028,6 +1032,7 @@ function MoneyRequestView({
             <OfflineWithFeedback pendingAction={getPendingFieldAction('customUnitRateID')}>
                 <MenuItemWithTopDescription
                     description={translate('common.rate')}
+                    descriptionTextStyle={styles.userSelectNone}
                     title={rateToDisplay}
                     numberOfLinesTitle={2}
                     interactive={canEditDistanceRate}
@@ -1078,6 +1083,7 @@ function MoneyRequestView({
                     }}
                     brickRoadIndicator={getErrorForField('customUnitRateID') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                     errorText={getErrorForField('customUnitRateID')}
+                    errorTextStyle={styles.userSelectNone}
                     copyValue={distanceRateCopyValue}
                     copyable={!!distanceRateCopyValue}
                     isTitleSelectable={!!distanceRateCopyValue}
@@ -1135,6 +1141,7 @@ function MoneyRequestView({
                 <HighlightableMenuItemWithTopDescription
                     highlighted={hasDependentTags && shouldShow && !getTagForDisplay(transaction, index) && currentTagLength > previousTagLength}
                     description={name ?? translate('common.tag')}
+                    descriptionTextStyle={styles.userSelectNone}
                     title={tagForDisplay}
                     numberOfLinesTitle={2}
                     interactive={canEdit}
@@ -1156,6 +1163,7 @@ function MoneyRequestView({
                     }}
                     brickRoadIndicator={tagError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                     errorText={tagError}
+                    errorTextStyle={styles.userSelectNone}
                     shouldShowBasicTitle
                     shouldShowDescriptionOnTop
                     copyValue={tagCopyValue}
@@ -1188,7 +1196,10 @@ function MoneyRequestView({
     }
 
     return (
-        <View style={[styles.moneyRequestView]}>
+        <View
+            style={[styles.moneyRequestView]}
+            dataSet={COPYABLE_ROW_DATA_SET}
+        >
             {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
             <>
                 {(!isInWideRHP || isSmallScreenWidth || isFromReviewDuplicates || isFromMergeTransaction) && (
@@ -1200,7 +1211,7 @@ function MoneyRequestView({
                     />
                 )}
                 {isCustomUnitOutOfPolicy && isPerDiemRequest && (
-                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.mh4, styles.mb2]}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.mh4, styles.mb2, styles.userSelectNone]}>
                         <Icon
                             src={icons.DotIndicator}
                             fill={theme.danger}
@@ -1221,7 +1232,9 @@ function MoneyRequestView({
                         shouldShowTitleIcon={shouldShowPaid}
                         titleIcon={icons.Checkmark}
                         description={amountDescription}
+                        descriptionTextStyle={styles.userSelectNone}
                         hintText={amountHintText}
+                        hintTextStyle={styles.userSelectNone}
                         titleStyle={styles.textHeadlineH2}
                         numberOfLinesTitle={2}
                         interactive={canEditAmount}
@@ -1259,6 +1272,7 @@ function MoneyRequestView({
                         }}
                         brickRoadIndicator={getErrorForField('amount') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                         errorText={getErrorForField('amount')}
+                        errorTextStyle={styles.userSelectNone}
                         copyValue={amountCopyValue}
                         copyable={!!amountCopyValue}
                         isTitleSelectable={!!amountCopyValue}
@@ -1268,6 +1282,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('comment')}>
                         <MenuItemWithTopDescription
                             description={translate('common.description')}
+                            descriptionTextStyle={styles.userSelectNone}
                             shouldRenderAsHTML
                             title={updatedTransactionDescription ?? transactionDescription}
                             interactive={canEdit}
@@ -1283,6 +1298,7 @@ function MoneyRequestView({
                             wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                             brickRoadIndicator={getErrorForField('comment') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('comment')}
+                            errorTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={0}
                             copyValue={descriptionCopyValue}
                             copyable={!!descriptionCopyValue}
@@ -1296,6 +1312,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('merchant')}>
                         <MenuItemWithTopDescription
                             description={translate('common.merchant')}
+                            descriptionTextStyle={styles.userSelectNone}
                             title={updatedMerchantTitle}
                             interactive={canEditMerchant}
                             shouldShowRightIcon={canEditMerchant}
@@ -1311,6 +1328,7 @@ function MoneyRequestView({
                             furtherDetailsComponent={shouldShowGoogleMerchantSearchLink ? renderGoogleMerchantSearchLink() : undefined}
                             brickRoadIndicator={getErrorForField('merchant') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('merchant')}
+                            errorTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={0}
                             copyValue={merchantCopyValue}
                             copyable={!!merchantCopyValue}
@@ -1321,6 +1339,7 @@ function MoneyRequestView({
                 <OfflineWithFeedback pendingAction={getPendingFieldAction('created')}>
                     <MenuItemWithTopDescription
                         description={dateDescription}
+                        descriptionTextStyle={styles.userSelectNone}
                         title={actualTransactionDate}
                         numberOfLinesTitle={2}
                         interactive={canEditDate}
@@ -1335,6 +1354,7 @@ function MoneyRequestView({
                         }}
                         brickRoadIndicator={getErrorForField('date') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                         errorText={getErrorForField('date')}
+                        errorTextStyle={styles.userSelectNone}
                         copyValue={dateCopyValue}
                         copyable={!!dateCopyValue}
                         isTitleSelectable={!!dateCopyValue}
@@ -1344,6 +1364,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('category')}>
                         <MenuItemWithTopDescription
                             description={translate('common.category')}
+                            descriptionTextStyle={styles.userSelectNone}
                             title={shouldShowCategoryAnalyzing ? translate('common.analyzing') : decodedCategoryName}
                             numberOfLinesTitle={2}
                             interactive={canEdit}
@@ -1403,6 +1424,7 @@ function MoneyRequestView({
                             }}
                             brickRoadIndicator={getErrorForField('category') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('category')}
+                            errorTextStyle={styles.userSelectNone}
                             copyValue={categoryCopyValue}
                             copyable={!!categoryCopyValue}
                             isTitleSelectable={!!categoryCopyValue}
@@ -1413,6 +1435,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('vendor')}>
                         <MenuItemWithTopDescription
                             description={vendorFieldLabel}
+                            descriptionTextStyle={styles.userSelectNone}
                             title={transactionVendorName}
                             numberOfLinesTitle={2}
                             interactive={canEdit}
@@ -1434,6 +1457,10 @@ function MoneyRequestView({
                             }}
                             brickRoadIndicator={getErrorForField('vendor') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('vendor')}
+                            errorTextStyle={styles.userSelectNone}
+                            copyValue={vendorCopyValue}
+                            copyable={!!vendorCopyValue}
+                            isTitleSelectable={!!vendorCopyValue}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -1442,6 +1469,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('cardID')}>
                         <MenuItemWithTopDescription
                             description={translate('iou.card')}
+                            descriptionTextStyle={styles.userSelectNone}
                             title={cardCopyValue}
                             numberOfLinesTitle={2}
                             titleStyle={styles.flex1}
@@ -1457,6 +1485,7 @@ function MoneyRequestView({
                         <MenuItemWithTopDescription
                             title={taxRateValue}
                             description={taxRatesDescription ?? translate('common.tax')}
+                            descriptionTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={2}
                             interactive={canEditTaxFields}
                             shouldShowRightIcon={canEditTaxFields}
@@ -1475,6 +1504,7 @@ function MoneyRequestView({
                             }}
                             brickRoadIndicator={getErrorForField('tax') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('tax')}
+                            errorTextStyle={styles.userSelectNone}
                             copyValue={taxRateCopyValue}
                             copyable={!!taxRateCopyValue}
                             isTitleSelectable={!!taxRateCopyValue}
@@ -1486,6 +1516,7 @@ function MoneyRequestView({
                         <MenuItemWithTopDescription
                             title={taxAmountTitle}
                             description={taxAmountDescription}
+                            descriptionTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={2}
                             interactive={canEditTaxFields}
                             shouldShowRightIcon={canEditTaxFields}
@@ -1518,7 +1549,7 @@ function MoneyRequestView({
                                     ? `${CONST.DOT_SEPARATOR} ${formattedPerAttendeeAmount} ${translate('common.perPerson')}`
                                     : ''
                             }`}
-                            descriptionTextStyle={styles.textLabelSupportingNormal}
+                            descriptionTextStyle={[styles.textLabelSupportingNormal, styles.userSelectNone]}
                             titleComponent={
                                 Array.isArray(actualAttendees) ? (
                                     <UserPills
@@ -1543,6 +1574,7 @@ function MoneyRequestView({
                             }}
                             brickRoadIndicator={getErrorForField('attendees') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             errorText={getErrorForField('attendees')}
+                            errorTextStyle={styles.userSelectNone}
                             interactive={canEdit}
                             shouldShowRightIcon={canEdit}
                             copyValue={attendeesCopyValue}
@@ -1560,6 +1592,8 @@ function MoneyRequestView({
                             <Text
                                 accessible={false}
                                 aria-hidden
+                                style={styles.userSelectText}
+                                dataSet={COPYABLE_TEXT_DATA_SET}
                             >
                                 {Str.UCFirst(translate('iou.reimbursable'))}
                             </Text>
@@ -1581,13 +1615,14 @@ function MoneyRequestView({
                             <Text
                                 accessible={false}
                                 aria-hidden
+                                style={styles.userSelectNone}
                             >
                                 {translate('common.billable')}
                             </Text>
                             {!!getErrorForField('billable') && (
                                 <ViolationMessages
                                     violations={getViolationsForField('billable')}
-                                    containerStyle={[styles.mt1]}
+                                    containerStyle={[styles.mt1, styles.userSelectNone]}
                                     textStyle={[styles.ph0]}
                                     isLast
                                     isMarkAsCash={isMarkAsCash}
@@ -1613,6 +1648,7 @@ function MoneyRequestView({
                             shouldShowRightIcon={canEditReport}
                             title={reportNameToDisplay}
                             description={translate('common.report')}
+                            descriptionTextStyle={styles.userSelectNone}
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                             onPress={() => {
@@ -1652,6 +1688,7 @@ function MoneyRequestView({
                         <MenuItemWithTopDescription
                             title={tripRoomName}
                             description={translate('travel.trip')}
+                            descriptionTextStyle={styles.userSelectNone}
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                             numberOfLinesTitle={2}
@@ -1682,7 +1719,7 @@ function MoneyRequestView({
                 {hasRequiredCompanyCardViolation && (
                     <DotIndicatorMessage
                         type="error"
-                        style={[styles.mv3, styles.mh4]}
+                        style={[styles.mv3, styles.mh4, styles.userSelectNone]}
                         messages={{error: translate('violations.companyCardRequired')}}
                     />
                 )}

From 3e8fcc7555a33890c3e504efbdad3f0e29087b25 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 2 Sep 2026 14:38:26 +0100
Subject: [PATCH 079/781] remove victory-native piesliceangularinset patch

---
 patches/victory-native/details.md             | 12 ----
 ...1.0+002+fix-piesliceangularinset-bug.patch | 63 -------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 patches/victory-native/victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index a1f721a1a811..0f7201367715 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -11,15 +11,3 @@
 - Upstream PR/issue: Not yet. This is urgent patch with deadline.
 - E/App issue: https://github.com/Expensify/App/issues/91883
 - PR introducing patch: https://github.com/Expensify/App/pull/91659
-
-### [victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch](victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch)
-
-- Reason:
-  
-    ```
-    Fix bug https://github.com/FormidableLabs/victory-native-xl/issues/652
-    ```
-  
-- Upstream PR/issue: https://github.com/FormidableLabs/victory-native-xl/pull/666
-- E/App issue: https://github.com/Expensify/App/issues/92114
-- PR introducing patch: https://github.com/Expensify/App/pull/92130
diff --git a/patches/victory-native/victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch b/patches/victory-native/victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch
deleted file mode 100644
index 827614abdf50..000000000000
--- a/patches/victory-native/victory-native+41.21.0+002+fix-piesliceangularinset-bug.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/node_modules/victory-native/dist/pie/hooks/useSliceAngularInsetPath.d.ts b/node_modules/victory-native/dist/pie/hooks/useSliceAngularInsetPath.d.ts
-index 18425b7..5508130 100644
---- a/node_modules/victory-native/dist/pie/hooks/useSliceAngularInsetPath.d.ts
-+++ b/node_modules/victory-native/dist/pie/hooks/useSliceAngularInsetPath.d.ts
-@@ -4,5 +4,5 @@ type SliceAngularInsetPathArgs = {
-     slice: PieSliceData;
-     angularInset: PieSliceAngularInsetData;
- };
--export declare const useSliceAngularInsetPath: ({ angularInset, slice, }: SliceAngularInsetPathArgs) => readonly [import("@shopify/react-native-skia").SkPath, import("@shopify/react-native-skia").SkPaint];
-+export declare const useSliceAngularInsetPath: ({ angularInset, slice, }: SliceAngularInsetPathArgs) => readonly [import("@shopify/react-native-skia").SkPath];
- export {};
-diff --git a/node_modules/victory-native/src/pie/PieSliceAngularInset.tsx b/node_modules/victory-native/src/pie/PieSliceAngularInset.tsx
-index bede090..0523900 100644
---- a/node_modules/victory-native/src/pie/PieSliceAngularInset.tsx
-+++ b/node_modules/victory-native/src/pie/PieSliceAngularInset.tsx
-@@ -21,7 +21,7 @@ type PieSliceAngularInsetProps = {
- export const PieSliceAngularInset = (props: PieSliceAngularInsetProps) => {
-   const { angularInset, children, animate, ...rest } = props;
-   const { slice } = usePieSliceContext();
--  const [path, insetPaint] = useSliceAngularInsetPath({ slice, angularInset });
-+  const [path] = useSliceAngularInsetPath({ slice, angularInset });
- 
-   // If the path is empty, don't render anything
-   if (path.toSVGString() === "M0 0L0 0M0 0L0 0") {
-@@ -34,7 +34,7 @@ export const PieSliceAngularInset = (props: PieSliceAngularInsetProps) => {
- 
-   const Component = animate ? AnimatedPath : Path;
-   return (
--    <Component path={path} paint={insetPaint} animate={animate} {...rest}>
-+    <Component path={path} style="stroke" color={angularInset.angularStrokeColor} strokeWidth={angularInset.angularStrokeWidth} animate={animate} {...rest}>
-       {children}
-     </Component>
-   );
-diff --git a/node_modules/victory-native/src/pie/hooks/useSliceAngularInsetPath.ts b/node_modules/victory-native/src/pie/hooks/useSliceAngularInsetPath.ts
-index 022dc49..2da6c64 100644
---- a/node_modules/victory-native/src/pie/hooks/useSliceAngularInsetPath.ts
-+++ b/node_modules/victory-native/src/pie/hooks/useSliceAngularInsetPath.ts
-@@ -15,7 +15,7 @@ export const useSliceAngularInsetPath = ({
-   angularInset,
-   slice,
- }: SliceAngularInsetPathArgs) => {
--  const [path, paint] = useMemo(() => {
-+  const [path] = useMemo(() => {
-     const { radius, center, innerRadius } = slice;
- 
-     const path = Skia.Path.Make();
-@@ -72,14 +72,8 @@ export const useSliceAngularInsetPath = ({
-       path.moveTo(center.x, center.y);
-       path.lineTo(endPoint.x, endPoint.y);
-     }
--
--    // Create Paint for inset
--    const insetPaint = Skia.Paint();
--    insetPaint.setColor(Skia.Color(angularInset.angularStrokeColor));
--    insetPaint.setStyle(PaintStyle.Stroke);
--    insetPaint.setStrokeWidth(angularInset.angularStrokeWidth);
--    return [path, insetPaint] as const;
-+    return [path] as const;
-   }, [slice, angularInset]);
- 
--  return [path, paint] as const;
-+  return [path] as const;
- };

From 420ab5904ab5010b4d14c25641d59a3d9d19a9a6 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 2 Sep 2026 14:57:51 +0100
Subject: [PATCH 080/781] update victory-native to 42.0.1

---
 package-lock.json | 64 ++++++++++++++++++++++++++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4697db7a5f0..b41d39a84f72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -150,7 +150,7 @@
         "react-web-config": "^1.0.0",
         "react-webcam": "^7.1.1",
         "scheduler": "0.27.0",
-        "victory-native": "^41.21.0",
+        "victory-native": "^42.0.1",
         "xlsx": "^0.18.5"
       },
       "devDependencies": {
@@ -16685,13 +16685,16 @@
       }
     },
     "node_modules/@shopify/react-native-skia": {
-      "version": "2.4.18",
-      "resolved": "https://registry.npmjs.org/@shopify/react-native-skia/-/react-native-skia-2.4.18.tgz",
-      "integrity": "sha512-/AB/mvb2dGSQVIJTxyG9ZMFn2PjwWlVcFxHU4TV+K25LCU49ntJXl4xda2ghXxdENMggKgO9R5pA+P/AQ0UUrA==",
-      "hasInstallScript": true,
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@shopify/react-native-skia/-/react-native-skia-2.11.2.tgz",
+      "integrity": "sha512-BGTSMlsl3gM/gw9FyfCDgEATBQvNkhyDX9iEDu/iu3ZLcZT7+QzeFwpC0Sij2pLjuY33x3UDPS2DhSis7Mo7Xw==",
       "license": "MIT",
       "dependencies": {
-        "canvaskit-wasm": "0.40.0",
+        "canvaskit-wasm": "0.41.0",
+        "react-native-skia-android": "152.0.0",
+        "react-native-skia-apple-ios": "152.0.0",
+        "react-native-skia-apple-macos": "152.0.0",
+        "react-native-skia-apple-tvos": "152.0.0",
         "react-reconciler": "0.31.0"
       },
       "bin": {
@@ -16700,7 +16703,8 @@
       "peerDependencies": {
         "react": ">=19.0",
         "react-native": ">=0.78",
-        "react-native-reanimated": ">=3.19.1"
+        "react-native-reanimated": ">=4.0.0",
+        "react-native-worklets": ">=0.7.0"
       },
       "peerDependenciesMeta": {
         "react-native": {
@@ -16708,9 +16712,21 @@
         },
         "react-native-reanimated": {
           "optional": true
+        },
+        "react-native-worklets": {
+          "optional": true
         }
       }
     },
+    "node_modules/@shopify/react-native-skia/node_modules/canvaskit-wasm": {
+      "version": "0.41.0",
+      "resolved": "https://registry.npmjs.org/canvaskit-wasm/-/canvaskit-wasm-0.41.0.tgz",
+      "integrity": "sha512-cnbL02NFB3yOYMF/MtxViZHgD1vh55Pvy+zR8q4JuFvyCPejZP3eClkt2GuZ0S7jOmGMCJXaHBasbMChbR9JZg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@webgpu/types": "0.1.21"
+      }
+    },
     "node_modules/@sideway/address": {
       "version": "4.1.5",
       "devOptional": true,
@@ -36247,6 +36263,30 @@
         "node": ">=16"
       }
     },
+    "node_modules/react-native-skia-android": {
+      "version": "152.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-skia-android/-/react-native-skia-android-152.0.0.tgz",
+      "integrity": "sha512-X++QG8bpPLHpavUyNfQvAxvtjH3r8fnivxS1PTFZsKL4ZiAJ1V9IVsJi4qltafWJbzhq7IutpZQNYd06uwNkjg==",
+      "license": "MIT"
+    },
+    "node_modules/react-native-skia-apple-ios": {
+      "version": "152.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-skia-apple-ios/-/react-native-skia-apple-ios-152.0.0.tgz",
+      "integrity": "sha512-rmnHYWkwvxm7B9fXZCkTRdZVoQwVnNydjytfphxatweQmEqwYE+/g1LOL/emhM/ulmwAFKFT0VNAEzAlvHId2A==",
+      "license": "MIT"
+    },
+    "node_modules/react-native-skia-apple-macos": {
+      "version": "152.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-skia-apple-macos/-/react-native-skia-apple-macos-152.0.0.tgz",
+      "integrity": "sha512-boWCDyPPJUuKwcE+DU8X7dop6EwLdrOH+v7pxYAj+43NbOwgfV1wzq4g+kWIQqag5ZOQInq2mVwCc8S1eJjlXw==",
+      "license": "MIT"
+    },
+    "node_modules/react-native-skia-apple-tvos": {
+      "version": "152.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-skia-apple-tvos/-/react-native-skia-apple-tvos-152.0.0.tgz",
+      "integrity": "sha512-+UnXke4Yz9Jmy3uTcDbYFrVG/+CZMqYbaTV3f52wovaMzf8wWy+iZampZr6dW6rOWLWrsUFiq7yMImg6UGbiFg==",
+      "license": "MIT"
+    },
     "node_modules/react-native-svg": {
       "version": "15.15.5",
       "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.15.5.tgz",
@@ -40731,9 +40771,9 @@
       }
     },
     "node_modules/victory-native": {
-      "version": "41.21.0",
-      "resolved": "https://registry.npmjs.org/victory-native/-/victory-native-41.21.0.tgz",
-      "integrity": "sha512-qyldgowkkiAWzN765sODzp4REh2MxBoex+DF5LerIpssTXpxGYEF21bIrhAoQJLDXiZ2rrCj1Dye+MNVYJd7vw==",
+      "version": "42.0.1",
+      "resolved": "https://registry.npmjs.org/victory-native/-/victory-native-42.0.1.tgz",
+      "integrity": "sha512-W3dNBMeRtZ8AQGBkV1PrYYKLFSstTy6uulmlJJFch4hvPX/R1xH1VJXzZopK6GGbcq/ejcr8WwntWwhqTo0lzA==",
       "license": "MIT",
       "dependencies": {
         "d3-scale": "^4.0.2",
@@ -40743,11 +40783,11 @@
         "react-fast-compare": "^3.2.2"
       },
       "peerDependencies": {
-        "@shopify/react-native-skia": ">=1.2.3 <3.0.0",
+        "@shopify/react-native-skia": ">=2.6.0 <3.0.0",
         "react": "*",
         "react-native": "*",
         "react-native-gesture-handler": ">=2.0.0",
-        "react-native-reanimated": ">=3.0.0"
+        "react-native-reanimated": ">=3.19.1"
       }
     },
     "node_modules/vlq": {
diff --git a/package.json b/package.json
index 7e8a670355cc..3622e3cc43f4 100644
--- a/package.json
+++ b/package.json
@@ -224,7 +224,7 @@
     "react-web-config": "^1.0.0",
     "react-webcam": "^7.1.1",
     "scheduler": "0.27.0",
-    "victory-native": "^41.21.0",
+    "victory-native": "^42.0.1",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

From a7c1490f85c663a435edd7751b3405e23092eedb Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 2 Sep 2026 20:24:17 +0430
Subject: [PATCH 081/781] fix: preserve native text selection for expense
 fields on touch web

---
 src/components/MenuItem/MenuItem.tsx                       | 6 +++++-
 src/components/PressableWithSecondaryInteraction/index.tsx | 3 ++-
 src/components/PressableWithSecondaryInteraction/types.ts  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 21c60f92de42..fc88a4535802 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -39,7 +39,7 @@ import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import getButtonState from '@libs/getButtonState';
 import mergeRefs from '@libs/mergeRefs';
 import Parser from '@libs/Parser';
-import {COPYABLE_TEXT_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
 
@@ -836,6 +836,9 @@ function MenuItem({
     };
 
     const secondaryInteraction = (event: GestureResponderEvent | MouseEvent) => {
+        if (isTitleSelectable && isPressStartOnCopyableText(event)) {
+            return;
+        }
         if (!copyValue) {
             return;
         }
@@ -888,6 +891,7 @@ function MenuItem({
                                     markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
                                 shouldAllowTextSelection={isTitleSelectable}
+                                preventDefaultContextMenu={(event) => deviceHasHoverSupport || !isTitleSelectable || !isPressStartOnCopyableText(event)}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
                                 onPressOut={ControlSelection.unblock}
                                 onSecondaryInteraction={copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction}
diff --git a/src/components/PressableWithSecondaryInteraction/index.tsx b/src/components/PressableWithSecondaryInteraction/index.tsx
index a67d5f1d9a85..f1c618137b3e 100644
--- a/src/components/PressableWithSecondaryInteraction/index.tsx
+++ b/src/components/PressableWithSecondaryInteraction/index.tsx
@@ -77,7 +77,8 @@ function PressableWithSecondaryInteraction({
             }
 
             event.stopPropagation();
-            if (preventDefaultContextMenu) {
+            const shouldPreventDefaultContextMenu = typeof preventDefaultContextMenu === 'function' ? preventDefaultContextMenu(event) : preventDefaultContextMenu;
+            if (shouldPreventDefaultContextMenu) {
                 event.preventDefault();
             }
 
diff --git a/src/components/PressableWithSecondaryInteraction/types.ts b/src/components/PressableWithSecondaryInteraction/types.ts
index 0158ed8d543c..f26040e9b2b3 100644
--- a/src/components/PressableWithSecondaryInteraction/types.ts
+++ b/src/components/PressableWithSecondaryInteraction/types.ts
@@ -23,7 +23,7 @@ type PressableWithSecondaryInteractionProps = PressableWithFeedbackProps & {
     onSecondaryInteraction?: (event: GestureResponderEvent | MouseEvent) => void;
 
     /** Prevent the default ContextMenu on web */
-    preventDefaultContextMenu?: boolean;
+    preventDefaultContextMenu?: boolean | ((event: MouseEvent) => boolean);
 
     /** Use Text instead of Pressable to create inline layout.
      * It has few limitations in comparison to Pressable.

From 82e0fec0b89318be615e251be1980547bc339416 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 2 Sep 2026 21:09:59 +0430
Subject: [PATCH 082/781] refactor: move copyable text row press logic to hooks

---
 src/components/MenuItem/MenuItem.tsx          |   3 +-
 .../MoneyRequestReportTransactionItem.tsx     |   3 +-
 .../SearchList/ListItem/GroupHeader.tsx       |   3 +-
 .../ListItem/TransactionGroupListExpanded.tsx |   3 +-
 .../ListItem/TransactionGroupListItem.tsx     |   3 +-
 .../TransactionListItemNarrow.tsx             |   3 +-
 .../TransactionListItemWide.tsx               |   3 +-
 .../SelectionList/ListItem/BaseListItem.tsx   |   3 +-
 src/components/Table/TableRow.tsx             |   2 +-
 .../useCopyableTextRowPress/index.native.ts   |  32 +++
 src/hooks/useCopyableTextRowPress/index.ts    | 223 ++++++++++++++++++
 src/libs/SelectionScraper/index.native.ts     |  32 +--
 src/libs/SelectionScraper/index.ts            | 218 +----------------
 13 files changed, 274 insertions(+), 257 deletions(-)
 create mode 100644 src/hooks/useCopyableTextRowPress/index.native.ts
 create mode 100644 src/hooks/useCopyableTextRowPress/index.ts

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index fc88a4535802..dd443018a20f 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -24,6 +24,7 @@ import EducationalTooltip from '@components/Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from '@components/utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from '@components/utils/getContextMenuAccessibilityProps';
 
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -39,7 +40,7 @@ import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import getButtonState from '@libs/getButtonState';
 import mergeRefs from '@libs/mergeRefs';
 import Parser from '@libs/Parser';
-import {COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
 
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index d449a5b88e00..c0e3f916a659 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -6,6 +6,7 @@ import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP';
@@ -17,7 +18,7 @@ import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 import ControlSelection from '@libs/ControlSelection';
 import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
 import {hasFlexColumn} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index df7a854b7ad1..cf97430d545a 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -7,6 +7,7 @@ import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@comp
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useExpandCollapseAnimation from '@hooks/useExpandCollapseAnimation';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -21,7 +22,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getColumnsToShow} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index 83981a9815fb..b461c6b9f1e7 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -10,6 +10,7 @@ import Text from '@components/Text';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
@@ -29,7 +30,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getReportAction} from '@libs/ReportActionsUtils';
 import {getReportOrDraftReport} from '@libs/ReportUtils';
 import {createAndOpenSearchTransactionThread, getColumnsToShow, getTableMinWidth} from '@libs/SearchUIUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import type {TransactionPreviewData} from '@userActions/Search';
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 0dc7efc75cf1..6aca29f77634 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -8,6 +8,7 @@ import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -22,7 +23,7 @@ import type {TransactionPreviewData} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
 import {getLoginByAccountID} from '@libs/PersonalDetailsUtils';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {getVisibleTransactionViolations, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index c0d43f95e94f..1e1b5d286eda 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -8,13 +8,14 @@ import type {ListItem} from '@components/SelectionList/types';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import durationHighlightItem from '@libs/Navigation/helpers/getDurationHighlightItem';
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index e5df49df2c19..4de0f45718ef 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -8,13 +8,14 @@ import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index a33e5eca7c70..05d41cb337bc 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -5,6 +5,7 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import getListItemAccessibilityProps from '@components/SelectionList/utils/getListItemAccessibilityProps';
 import isListItemSelected from '@components/SelectionList/utils/isListItemSelected';
 
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useHover from '@hooks/useHover';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import {useMouseActions, useMouseState} from '@hooks/useMouseContext';
@@ -13,7 +14,7 @@ import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {COPYABLE_ROW_DATA_SET, useCopyableTextRowPress} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 
 import variables from '@styles/variables';
 
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 60eb36ce4832..e7cca061c0d6 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -6,12 +6,12 @@ import type {PressableWithFeedbackProps} from '@components/Pressable/PressableWi
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {isPressStartOnCopyableText, useCopyableTextRowPress} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
diff --git a/src/hooks/useCopyableTextRowPress/index.native.ts b/src/hooks/useCopyableTextRowPress/index.native.ts
new file mode 100644
index 000000000000..e2224d81e219
--- /dev/null
+++ b/src/hooks/useCopyableTextRowPress/index.native.ts
@@ -0,0 +1,32 @@
+type MarkCopyableTextMouseDownOptions = {
+    shouldSuppressNextPress?: boolean;
+};
+
+type HandleCopyableTextRowPressOptions = {
+    shouldCheck?: boolean;
+    shouldDelayMousePress?: boolean;
+};
+
+const isPressStartOnCopyableText = () => false;
+
+function useCopyableTextRowPress() {
+    // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
+    const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean, options?: MarkCopyableTextMouseDownOptions) => boolean = () => false;
+    const markTouchStartOnCopyableText: (event: unknown, shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowLongPress: (shouldCheck?: boolean) => boolean = () => false;
+    const shouldSuppressCopyableTextRowFocus = () => false;
+    const handleCopyableTextRowPress: (onPress: () => void, options?: HandleCopyableTextRowPressOptions) => void = (onPress) => onPress();
+
+    return {
+        handleCopyableTextRowPress,
+        markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
+        shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowLongPress,
+        shouldSuppressCopyableTextRowPress,
+    };
+}
+
+export {isPressStartOnCopyableText};
+export default useCopyableTextRowPress;
diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
new file mode 100644
index 000000000000..442ce8286800
--- /dev/null
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -0,0 +1,223 @@
+import CONST from '@src/CONST';
+
+import {useEffect, useRef} from 'react';
+
+const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
+// Accommodate slower browser double-click intervals while keeping single-click navigation responsive.
+const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 500;
+
+type MarkCopyableTextMouseDownOptions = {
+    shouldSuppressNextPress?: boolean;
+};
+
+type HandleCopyableTextRowPressOptions = {
+    shouldCheck?: boolean;
+    shouldDelayMousePress?: boolean;
+};
+
+function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
+    if (typeof HTMLElement === 'undefined') {
+        return null;
+    }
+
+    try {
+        if (target instanceof HTMLElement) {
+            return target.closest(COPYABLE_TEXT_SELECTOR);
+        }
+
+        if (typeof Node !== 'undefined' && target instanceof Node) {
+            return target.parentElement?.closest(COPYABLE_TEXT_SELECTOR) ?? null;
+        }
+    } catch {
+        return null;
+    }
+
+    return null;
+}
+
+function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
+    return !!getCopyableTextElement(target);
+}
+
+function getTouchPosition(touches: unknown): {clientX: number; clientY: number} | null {
+    if (typeof touches !== 'object' || touches === null || !('0' in touches)) {
+        return null;
+    }
+
+    const touch = touches[0];
+    if (typeof touch !== 'object' || touch === null || !('clientX' in touch) || !('clientY' in touch) || typeof touch.clientX !== 'number' || typeof touch.clientY !== 'number') {
+        return null;
+    }
+
+    return {clientX: touch.clientX, clientY: touch.clientY};
+}
+
+function getPressStartPosition(event: unknown): {clientX: number; clientY: number} | null {
+    if (typeof event !== 'object' || event === null) {
+        return null;
+    }
+
+    if ('clientX' in event && 'clientY' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
+        return {clientX: event.clientX, clientY: event.clientY};
+    }
+
+    if ('touches' in event) {
+        const touchPosition = getTouchPosition(event.touches);
+        if (touchPosition) {
+            return touchPosition;
+        }
+    }
+
+    if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
+        return null;
+    }
+
+    const {nativeEvent} = event;
+    if ('clientX' in nativeEvent && 'clientY' in nativeEvent && typeof nativeEvent.clientX === 'number' && typeof nativeEvent.clientY === 'number') {
+        return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
+    }
+
+    if ('touches' in nativeEvent) {
+        return getTouchPosition(nativeEvent.touches);
+    }
+
+    return null;
+}
+
+function getPressStartTarget(event: unknown): EventTarget | null {
+    if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
+        return null;
+    }
+
+    return event.target;
+}
+
+function isPressStartOnCopyableText(event: unknown): boolean {
+    const position = getPressStartPosition(event);
+    const copyableElement = getCopyableTextElement(getPressStartTarget(event));
+    if (!position || !copyableElement || typeof document === 'undefined' || typeof NodeFilter === 'undefined') {
+        return false;
+    }
+
+    const walker = document.createTreeWalker(copyableElement, NodeFilter.SHOW_TEXT);
+    let textNode = walker.nextNode();
+
+    while (textNode) {
+        if (textNode.textContent?.trim()) {
+            const range = document.createRange();
+            range.selectNodeContents(textNode);
+
+            const isInsideText = Array.from(range.getClientRects()).some(
+                (rect) => position.clientX >= rect.left && position.clientX <= rect.right && position.clientY >= rect.top && position.clientY <= rect.bottom,
+            );
+            if (isInsideText) {
+                return true;
+            }
+        }
+        textNode = walker.nextNode();
+    }
+
+    return false;
+}
+
+// Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
+function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
+    if (!didMouseDownStartOnCopyableText) {
+        return false;
+    }
+
+    if (typeof window === 'undefined' || typeof window.getSelection !== 'function') {
+        return false;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.isCollapsed || selection.toString().length === 0) {
+        return false;
+    }
+
+    const anchorCopyableElement = getCopyableTextElement(selection.anchorNode);
+    const focusCopyableElement = getCopyableTextElement(selection.focusNode);
+    return !!anchorCopyableElement || !!focusCopyableElement;
+}
+
+function useCopyableTextRowPress() {
+    const wasMouseDownOnCopyableTextRef = useRef(false);
+    const wasTouchStartOnCopyableTextRef = useRef(false);
+    const shouldSuppressNextPressRef = useRef(false);
+    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+    const clearPendingCopyableTextPress = () => {
+        if (!pendingCopyableTextPressRef.current) {
+            return;
+        }
+
+        clearTimeout(pendingCopyableTextPressRef.current);
+        pendingCopyableTextPressRef.current = null;
+    };
+
+    useEffect(() => clearPendingCopyableTextPress, []);
+
+    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
+        clearPendingCopyableTextPress();
+        const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
+        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
+        return isCopyableTarget;
+    };
+
+    const markTouchStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
+        clearPendingCopyableTextPress();
+        const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
+        wasMouseDownOnCopyableTextRef.current = false;
+        wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
+        shouldSuppressNextPressRef.current = false;
+        return isCopyableTarget;
+    };
+
+    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
+        const didPressStartOnCopyableText = wasMouseDownOnCopyableTextRef.current || wasTouchStartOnCopyableTextRef.current;
+        const shouldSuppressPress = shouldCheck && (shouldSuppressNextPressRef.current || shouldSuppressCopyableTextPress(didPressStartOnCopyableText));
+        wasMouseDownOnCopyableTextRef.current = false;
+        wasTouchStartOnCopyableTextRef.current = false;
+        shouldSuppressNextPressRef.current = false;
+        return shouldSuppressPress;
+    };
+
+    const shouldSuppressCopyableTextRowLongPress = (shouldCheck = true): boolean => {
+        const shouldSuppressLongPress = shouldCheck && wasTouchStartOnCopyableTextRef.current;
+        shouldSuppressNextPressRef.current = shouldSuppressLongPress;
+        return shouldSuppressLongPress;
+    };
+
+    const handleCopyableTextRowPress = (onPress: () => void, {shouldCheck = true, shouldDelayMousePress = false}: HandleCopyableTextRowPressOptions = {}) => {
+        const shouldDelayPress = shouldCheck && shouldDelayMousePress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
+        if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
+            return;
+        }
+
+        if (!shouldDelayPress) {
+            onPress();
+            return;
+        }
+
+        pendingCopyableTextPressRef.current = setTimeout(() => {
+            pendingCopyableTextPressRef.current = null;
+            onPress();
+        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
+    };
+
+    // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
+    const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
+
+    return {
+        handleCopyableTextRowPress,
+        markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
+        shouldSuppressCopyableTextRowFocus,
+        shouldSuppressCopyableTextRowLongPress,
+        shouldSuppressCopyableTextRowPress,
+    };
+}
+
+export {isPressStartOnCopyableText};
+export default useCopyableTextRowPress;
diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 84562a489020..3a5d9e94e3f2 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -5,40 +5,10 @@ import type GetCurrentSelection from './types';
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 
-type MarkCopyableTextMouseDownOptions = {
-    shouldSuppressNextPress?: boolean;
-};
-
-type HandleCopyableTextRowPressOptions = {
-    shouldCheck?: boolean;
-    shouldDelayMousePress?: boolean;
-};
-
-const isPressStartOnCopyableText = () => false;
-
-function useCopyableTextRowPress() {
-    // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
-    const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean, options?: MarkCopyableTextMouseDownOptions) => boolean = () => false;
-    const markTouchStartOnCopyableText: (event: unknown, shouldCheck?: boolean) => boolean = () => false;
-    const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
-    const shouldSuppressCopyableTextRowLongPress: (shouldCheck?: boolean) => boolean = () => false;
-    const shouldSuppressCopyableTextRowFocus = () => false;
-    const handleCopyableTextRowPress: (onPress: () => void, options?: HandleCopyableTextRowPressOptions) => void = (onPress) => onPress();
-
-    return {
-        handleCopyableTextRowPress,
-        markMouseDownOnCopyableText,
-        markTouchStartOnCopyableText,
-        shouldSuppressCopyableTextRowFocus,
-        shouldSuppressCopyableTextRowLongPress,
-        shouldSuppressCopyableTextRowPress,
-    };
-}
-
 // This is a no-op function for native devices because they wouldn't be able to support Selection API like a website.
 const getCurrentSelection: GetCurrentSelection = () => '';
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
 
 export default {
     getCurrentSelection,
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index c61ff834a03e..49db72622592 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -6,7 +6,6 @@ import render from 'dom-serializer';
 import {DataNode, Element} from 'domhandler';
 import {Str} from 'expensify-common';
 import {parseDocument} from 'htmlparser2';
-import {useEffect, useRef} from 'react';
 
 import type GetCurrentSelection from './types';
 
@@ -18,221 +17,6 @@ const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
-// Accommodate slower browser double-click intervals while keeping single-click navigation responsive.
-const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 500;
-
-type MarkCopyableTextMouseDownOptions = {
-    shouldSuppressNextPress?: boolean;
-};
-
-type HandleCopyableTextRowPressOptions = {
-    shouldCheck?: boolean;
-    shouldDelayMousePress?: boolean;
-};
-
-function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
-    if (typeof HTMLElement === 'undefined') {
-        return null;
-    }
-
-    try {
-        if (target instanceof HTMLElement) {
-            return target.closest(COPYABLE_TEXT_SELECTOR);
-        }
-
-        if (typeof Node !== 'undefined' && target instanceof Node) {
-            return target.parentElement?.closest(COPYABLE_TEXT_SELECTOR) ?? null;
-        }
-    } catch {
-        return null;
-    }
-
-    return null;
-}
-
-function isCopyableTextTarget(target: EventTarget | null | undefined): boolean {
-    return !!getCopyableTextElement(target);
-}
-
-function getTouchPosition(touches: unknown): {clientX: number; clientY: number} | null {
-    if (typeof touches !== 'object' || touches === null || !('0' in touches)) {
-        return null;
-    }
-
-    const touch = touches[0];
-    if (typeof touch !== 'object' || touch === null || !('clientX' in touch) || !('clientY' in touch) || typeof touch.clientX !== 'number' || typeof touch.clientY !== 'number') {
-        return null;
-    }
-
-    return {clientX: touch.clientX, clientY: touch.clientY};
-}
-
-function getPressStartPosition(event: unknown): {clientX: number; clientY: number} | null {
-    if (typeof event !== 'object' || event === null) {
-        return null;
-    }
-
-    if ('clientX' in event && 'clientY' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
-        return {clientX: event.clientX, clientY: event.clientY};
-    }
-
-    if ('touches' in event) {
-        const touchPosition = getTouchPosition(event.touches);
-        if (touchPosition) {
-            return touchPosition;
-        }
-    }
-
-    if (!('nativeEvent' in event) || typeof event.nativeEvent !== 'object' || event.nativeEvent === null) {
-        return null;
-    }
-
-    const {nativeEvent} = event;
-    if ('clientX' in nativeEvent && 'clientY' in nativeEvent && typeof nativeEvent.clientX === 'number' && typeof nativeEvent.clientY === 'number') {
-        return {clientX: nativeEvent.clientX, clientY: nativeEvent.clientY};
-    }
-
-    if ('touches' in nativeEvent) {
-        return getTouchPosition(nativeEvent.touches);
-    }
-
-    return null;
-}
-
-function getPressStartTarget(event: unknown): EventTarget | null {
-    if (typeof EventTarget === 'undefined' || typeof event !== 'object' || event === null || !('target' in event) || !(event.target instanceof EventTarget)) {
-        return null;
-    }
-
-    return event.target;
-}
-
-function isPressStartOnCopyableText(event: unknown): boolean {
-    const position = getPressStartPosition(event);
-    const copyableElement = getCopyableTextElement(getPressStartTarget(event));
-    if (!position || !copyableElement || typeof document === 'undefined' || typeof NodeFilter === 'undefined') {
-        return false;
-    }
-
-    const walker = document.createTreeWalker(copyableElement, NodeFilter.SHOW_TEXT);
-    let textNode = walker.nextNode();
-
-    while (textNode) {
-        if (textNode.textContent?.trim()) {
-            const range = document.createRange();
-            range.selectNodeContents(textNode);
-
-            const isInsideText = Array.from(range.getClientRects()).some(
-                (rect) => position.clientX >= rect.left && position.clientX <= rect.right && position.clientY >= rect.top && position.clientY <= rect.bottom,
-            );
-            if (isInsideText) {
-                return true;
-            }
-        }
-        textNode = walker.nextNode();
-    }
-
-    return false;
-}
-
-// Row press handlers use this after mouseup/click to suppress navigation only for the drag-select gesture that started on copyable text.
-function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolean): boolean {
-    if (!didMouseDownStartOnCopyableText) {
-        return false;
-    }
-
-    if (typeof window === 'undefined' || typeof window.getSelection !== 'function') {
-        return false;
-    }
-
-    const selection = window.getSelection();
-    if (!selection || selection.isCollapsed || selection.toString().length === 0) {
-        return false;
-    }
-
-    const anchorCopyableElement = getCopyableTextElement(selection.anchorNode);
-    const focusCopyableElement = getCopyableTextElement(selection.focusNode);
-    return !!anchorCopyableElement || !!focusCopyableElement;
-}
-
-function useCopyableTextRowPress() {
-    const wasMouseDownOnCopyableTextRef = useRef(false);
-    const wasTouchStartOnCopyableTextRef = useRef(false);
-    const shouldSuppressNextPressRef = useRef(false);
-    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-    const clearPendingCopyableTextPress = () => {
-        if (!pendingCopyableTextPressRef.current) {
-            return;
-        }
-
-        clearTimeout(pendingCopyableTextPressRef.current);
-        pendingCopyableTextPressRef.current = null;
-    };
-
-    useEffect(() => clearPendingCopyableTextPress, []);
-
-    const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
-        clearPendingCopyableTextPress();
-        const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
-        wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
-        shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
-        return isCopyableTarget;
-    };
-
-    const markTouchStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
-        clearPendingCopyableTextPress();
-        const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
-        wasMouseDownOnCopyableTextRef.current = false;
-        wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
-        shouldSuppressNextPressRef.current = false;
-        return isCopyableTarget;
-    };
-
-    const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
-        const didPressStartOnCopyableText = wasMouseDownOnCopyableTextRef.current || wasTouchStartOnCopyableTextRef.current;
-        const shouldSuppressPress = shouldCheck && (shouldSuppressNextPressRef.current || shouldSuppressCopyableTextPress(didPressStartOnCopyableText));
-        wasMouseDownOnCopyableTextRef.current = false;
-        wasTouchStartOnCopyableTextRef.current = false;
-        shouldSuppressNextPressRef.current = false;
-        return shouldSuppressPress;
-    };
-
-    const shouldSuppressCopyableTextRowLongPress = (shouldCheck = true): boolean => {
-        const shouldSuppressLongPress = shouldCheck && wasTouchStartOnCopyableTextRef.current;
-        shouldSuppressNextPressRef.current = shouldSuppressLongPress;
-        return shouldSuppressLongPress;
-    };
-
-    const handleCopyableTextRowPress = (onPress: () => void, {shouldCheck = true, shouldDelayMousePress = false}: HandleCopyableTextRowPressOptions = {}) => {
-        const shouldDelayPress = shouldCheck && shouldDelayMousePress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
-        if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
-            return;
-        }
-
-        if (!shouldDelayPress) {
-            onPress();
-            return;
-        }
-
-        pendingCopyableTextPressRef.current = setTimeout(() => {
-            pendingCopyableTextPressRef.current = null;
-            onPress();
-        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
-    };
-
-    // Pointer focus from copyable text should not make virtualized lists scroll the row into view.
-    const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
-
-    return {
-        handleCopyableTextRowPress,
-        markMouseDownOnCopyableText,
-        markTouchStartOnCopyableText,
-        shouldSuppressCopyableTextRowFocus,
-        shouldSuppressCopyableTextRowLongPress,
-        shouldSuppressCopyableTextRowPress,
-    };
-}
 
 function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
     const elementRange = document.createRange();
@@ -518,7 +302,7 @@ const getCurrentSelection: GetCurrentSelection = () => {
     return newHtml || '';
 };
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET, isPressStartOnCopyableText, useCopyableTextRowPress};
+export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
 
 export default {
     getCurrentSelection,

From ce5a286aa391d058c703be51cbdab57a8907ae19 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 2 Sep 2026 23:28:56 +0430
Subject: [PATCH 083/781] fix: preserve native text selection on Android mWeb

---
 src/components/MenuItem/MenuItem.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index dd443018a20f..dbf5418dff97 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -650,7 +650,7 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<View>(null);
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     useRemoveNonInteractiveClickHandler(pressableRef, interactive);
     const deviceHasHoverSupport = hasHoverSupport();
     const isCompactMenu = useIsCompactMenu();
@@ -837,7 +837,7 @@ function MenuItem({
     };
 
     const secondaryInteraction = (event: GestureResponderEvent | MouseEvent) => {
-        if (isTitleSelectable && isPressStartOnCopyableText(event)) {
+        if (isTitleSelectable && (shouldSuppressCopyableTextRowLongPress() || isPressStartOnCopyableText(event))) {
             return;
         }
         if (!copyValue) {
@@ -891,6 +891,9 @@ function MenuItem({
                                 onMouseDown={(event) => {
                                     markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
+                                onTouchStart={(event) => {
+                                    markTouchStartOnCopyableText(event, isTitleSelectable && isPressStartOnCopyableText(event));
+                                }}
                                 shouldAllowTextSelection={isTitleSelectable}
                                 preventDefaultContextMenu={(event) => deviceHasHoverSupport || !isTitleSelectable || !isPressStartOnCopyableText(event)}
                                 onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}

From 0cbb14c348ef0d964556ce9a7fd8d2bf252e3d90 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 3 Sep 2026 01:01:33 +0430
Subject: [PATCH 084/781] fix: make ampersand descriptions selectable on mobile
 web

---
 src/components/MenuItem/MenuItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index dbf5418dff97..54fe5cd1b14f 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -750,7 +750,7 @@ function MenuItem({
         return Parser.replace(helperText, {shouldEscapeText});
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
-    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.isHTML(title);
+    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && /<[^>]+>/.test(title);
 
     const processedTitle = useMemo(() => {
         let titleToWrap = '';

From e72167845fa37f0c7f04c6be916cdd8bb52d7517 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 3 Sep 2026 02:26:20 +0430
Subject: [PATCH 085/781] fix: allow text selection in Spend rows on iOS web

---
 .../Search/SearchList/ListItem/GroupHeader.tsx    | 11 +++++++++--
 .../ListItem/TransactionGroupListExpanded.tsx     | 14 +++++++++++---
 .../ListItem/TransactionGroupListItem.tsx         | 11 +++++++++--
 .../TransactionListItemNarrow.tsx                 | 15 ++++++++++++---
 .../TransactionListItemWide.tsx                   | 15 ++++++++++++---
 .../SelectionList/ListItem/BaseListItem.tsx       | 11 +++++++++--
 6 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index cf97430d545a..c98ffdff2ada 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -7,7 +7,7 @@ import type {SearchColumnType, SearchCustomColumnIds, SearchGroupBy} from '@comp
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useExpandCollapseAnimation from '@hooks/useExpandCollapseAnimation';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -326,7 +326,8 @@ function GroupHeader({
 
     const isLastItemCollapsed = isLastItem && !isExpanded && !isSubHeaderRendered;
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
 
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
@@ -356,6 +357,9 @@ function GroupHeader({
     };
 
     const handleLongPress = () => {
+        if (shouldSuppressCopyableTextRowLongPress()) {
+            return;
+        }
         onLongPressRow?.(withOriginalKey(item), isExpenseReportType ? undefined : groupItem.transactions);
     };
 
@@ -380,6 +384,9 @@ function GroupHeader({
                     }
                     e.preventDefault();
                 }}
+                onTouchStart={(event) => {
+                    markTouchStartOnCopyableText(event, isPressStartOnCopyableText(event));
+                }}
                 id={item.keyForList ?? ''}
                 onFocus={(event) => {
                     if (shouldSuppressCopyableTextRowFocus()) {
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index b461c6b9f1e7..9616ec8a356d 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -10,7 +10,7 @@ import Text from '@components/Text';
 import TransactionItemRow from '@components/TransactionItemRow';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
@@ -164,7 +164,7 @@ function TransactionGroupListExpandedImpl({
     const currentOffset = transactionsSnapshotMetadata?.offset ?? 0;
     const shouldShowLoadingOnSearch = !!(!transactions?.length && transactionsSnapshotMetadata?.isLoading) || currentOffset > 0;
     const shouldDisplayLoadingIndicator = !isExpenseReportType && !!transactionsSnapshotMetadata?.isLoading && shouldShowLoadingOnSearch;
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
     const {isLargeScreenWidth} = useResponsiveLayout();
     const StyleUtils = useStyleUtils();
 
@@ -354,7 +354,12 @@ function TransactionGroupListExpandedImpl({
                         <PressableWithFeedback
                             onPress={isDeletedOrPendingDelete && !canSelectMultiple ? undefined : (event) => handleOnPress(transaction, event)}
                             disabled={isTransactionPendingDelete(transaction) && !transaction.isSelected}
-                            onLongPress={() => onLongPress?.(transaction)}
+                            onLongPress={() => {
+                                if (shouldSuppressCopyableTextRowLongPress()) {
+                                    return;
+                                }
+                                onLongPress?.(transaction);
+                            }}
                             accessibilityRole={CONST.ROLE.BUTTON}
                             accessibilityLabel={transaction.text ?? ''}
                             isNested
@@ -366,6 +371,9 @@ function TransactionGroupListExpandedImpl({
                                 }
                                 e.preventDefault();
                             }}
+                            onTouchStart={(event) => {
+                                markTouchStartOnCopyableText(event, isPressStartOnCopyableText(event));
+                            }}
                             hoverStyle={[!transaction.isDisabled && styles.hoveredComponentBG, transaction.isSelected && styles.activeComponentBG]}
                             wrapperStyle={isDeletedOrPendingDelete ? styles.cursorDisabled : undefined}
                             dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: true}}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 6aca29f77634..0a973553512a 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -8,7 +8,7 @@ import type {SearchGroupBy} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -207,7 +207,8 @@ function TransactionGroupListItemImpl({
         isItemSelected && styles.activeComponentBG,
     ];
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
 
     useEffect(() => {
         if (!newTransactionID || !isExpanded) {
@@ -278,6 +279,9 @@ function TransactionGroupListItemImpl({
     };
 
     const onLongPress = () => {
+        if (shouldSuppressCopyableTextRowLongPress()) {
+            return;
+        }
         onLongPressRow?.(item, isExpenseReportType ? undefined : transactions);
     };
 
@@ -536,6 +540,9 @@ function TransactionGroupListItemImpl({
                     }
                     e.preventDefault();
                 }}
+                onTouchStart={(event) => {
+                    markTouchStartOnCopyableText(event, isPressStartOnCopyableText(event));
+                }}
                 id={item.keyForList ?? ''}
                 style={[
                     pressableStyle,
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index 1e1b5d286eda..f7bc9d946e35 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -8,7 +8,7 @@ import type {ListItem} from '@components/SelectionList/types';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
@@ -54,7 +54,8 @@ function TransactionListItemNarrow<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -131,7 +132,12 @@ function TransactionListItemNarrow<TItem extends ListItem>({
         <OfflineWithFeedback pendingAction={item.pendingAction}>
             <PressableWithFeedback
                 ref={pressableRef}
-                onLongPress={() => onLongPressRow?.(item)}
+                onLongPress={() => {
+                    if (shouldSuppressCopyableTextRowLongPress()) {
+                        return;
+                    }
+                    onLongPressRow?.(item);
+                }}
                 onPress={handleOnPress}
                 disabled={isDisabled && !isSelected}
                 accessibilityLabel={item.text ?? ''}
@@ -160,6 +166,9 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                     }
                     event.preventDefault();
                 }}
+                onTouchStart={(event) => {
+                    markTouchStartOnCopyableText(event, isPressStartOnCopyableText(event));
+                }}
                 wrapperStyle={[
                     styles.mh5,
                     styles.flex1,
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 4de0f45718ef..9cb2ade166e3 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -8,7 +8,7 @@ import TransactionItemRow from '@components/TransactionItemRow';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
@@ -58,7 +58,8 @@ function TransactionListItemWide<TItem extends ListItem>({
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const transactionItem = item as unknown as TransactionListItemType;
@@ -165,7 +166,12 @@ function TransactionListItemWide<TItem extends ListItem>({
         <OfflineWithFeedback pendingAction={item.pendingAction}>
             <PressableWithFeedback
                 ref={pressableRef}
-                onLongPress={() => onLongPressRow?.(item)}
+                onLongPress={() => {
+                    if (shouldSuppressCopyableTextRowLongPress()) {
+                        return;
+                    }
+                    onLongPressRow?.(item);
+                }}
                 onPress={handleOnPress}
                 disabled={isDisabled && !isSelected}
                 accessibilityLabel={item.text ?? ''}
@@ -173,6 +179,9 @@ function TransactionListItemWide<TItem extends ListItem>({
                 isNested
                 shouldAllowTextSelection
                 onMouseDown={handleOnMouseDown}
+                onTouchStart={(event) => {
+                    markTouchStartOnCopyableText(event, isPressStartOnCopyableText(event));
+                }}
                 onHoverIn={handleOnHoverIn}
                 hoverStyle={[!item.isDisabled && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
                 dataSet={{...COPYABLE_ROW_DATA_SET, [CONST.INNER_BOX_SHADOW_ELEMENT]: true}}
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index 05d41cb337bc..0308a054da49 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -5,7 +5,7 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import getListItemAccessibilityProps from '@components/SelectionList/utils/getListItemAccessibilityProps';
 import isListItemSelected from '@components/SelectionList/utils/isListItemSelected';
 
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useHover from '@hooks/useHover';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import {useMouseActions, useMouseState} from '@hooks/useMouseContext';
@@ -72,7 +72,8 @@ function BaseListItem<TItem extends ListItem>({
     const {setMouseUp} = useMouseActions();
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'Checkmark', 'DotIndicator']);
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowFocus, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
 
     // Sync focus on an item
     useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
@@ -146,6 +147,9 @@ function BaseListItem<TItem extends ListItem>({
                 lang={item.lang}
                 accessibilityLanguage={item.lang}
                 onLongPress={() => {
+                    if (shouldAllowTextSelection && shouldSuppressCopyableTextRowLongPress()) {
+                        return;
+                    }
                     onLongPressRow?.(item);
                 }}
                 onPress={(e) => {
@@ -178,6 +182,9 @@ function BaseListItem<TItem extends ListItem>({
                     }
                     e.preventDefault();
                 }}
+                onTouchStart={(event) => {
+                    markTouchStartOnCopyableText(event, shouldAllowTextSelection && isPressStartOnCopyableText(event));
+                }}
                 id={item.keyForList ?? ''}
                 testID={`${CONST.BASE_LIST_ITEM_TEST_ID}${item.keyForList}`}
                 style={[

From dfd1882f1e04e9de595a10e18eaa2273aa2f9056 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 3 Sep 2026 18:28:03 +0430
Subject: [PATCH 086/781] fix: preserve default MenuItem text selection

---
 src/components/MenuItem/MenuItem.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 54fe5cd1b14f..2f99a578ff4c 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -1117,7 +1117,6 @@ function MenuItem({
                                                                             [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled,
                                                                             ...(isTitleSelectable ? COPYABLE_TEXT_DATA_SET : {}),
                                                                         }}
-                                                                        selectable={isTitleSelectable}
                                                                         accessibilityRole={titleAccessibilityRole}
                                                                     >
                                                                         {renderTitleContent()}

From c1201939aa11287f95b8c1c6cd3bc5d233fd5d78 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 09:56:25 +0430
Subject: [PATCH 087/781] fix: remove click delay for copyable text

---
 src/components/Table/TableRow.tsx             |  2 +-
 .../useCopyableTextRowPress/index.native.ts   |  1 -
 src/hooks/useCopyableTextRowPress/index.ts    | 32 ++-----------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index e7cca061c0d6..01a577035e9e 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -231,7 +231,7 @@ export default function TableRow({
                     handleCheckboxPress(event);
                 }
             },
-            {shouldCheck: shouldAllowTextSelection, shouldDelayMousePress: true},
+            {shouldCheck: shouldAllowTextSelection},
         );
     };
 
diff --git a/src/hooks/useCopyableTextRowPress/index.native.ts b/src/hooks/useCopyableTextRowPress/index.native.ts
index e2224d81e219..4c3214f4dd0f 100644
--- a/src/hooks/useCopyableTextRowPress/index.native.ts
+++ b/src/hooks/useCopyableTextRowPress/index.native.ts
@@ -4,7 +4,6 @@ type MarkCopyableTextMouseDownOptions = {
 
 type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
-    shouldDelayMousePress?: boolean;
 };
 
 const isPressStartOnCopyableText = () => false;
diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
index 442ce8286800..334f2b9ff9ec 100644
--- a/src/hooks/useCopyableTextRowPress/index.ts
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -1,10 +1,8 @@
 import CONST from '@src/CONST';
 
-import {useEffect, useRef} from 'react';
+import {useRef} from 'react';
 
 const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
-// Accommodate slower browser double-click intervals while keeping single-click navigation responsive.
-const COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS = 500;
 
 type MarkCopyableTextMouseDownOptions = {
     shouldSuppressNextPress?: boolean;
@@ -12,7 +10,6 @@ type MarkCopyableTextMouseDownOptions = {
 
 type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
-    shouldDelayMousePress?: boolean;
 };
 
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
@@ -144,21 +141,8 @@ function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
     const wasTouchStartOnCopyableTextRef = useRef(false);
     const shouldSuppressNextPressRef = useRef(false);
-    const pendingCopyableTextPressRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-    const clearPendingCopyableTextPress = () => {
-        if (!pendingCopyableTextPressRef.current) {
-            return;
-        }
-
-        clearTimeout(pendingCopyableTextPressRef.current);
-        pendingCopyableTextPressRef.current = null;
-    };
-
-    useEffect(() => clearPendingCopyableTextPress, []);
 
     const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
-        clearPendingCopyableTextPress();
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
         shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
@@ -166,7 +150,6 @@ function useCopyableTextRowPress() {
     };
 
     const markTouchStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
-        clearPendingCopyableTextPress();
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
         wasMouseDownOnCopyableTextRef.current = false;
         wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
@@ -189,21 +172,12 @@ function useCopyableTextRowPress() {
         return shouldSuppressLongPress;
     };
 
-    const handleCopyableTextRowPress = (onPress: () => void, {shouldCheck = true, shouldDelayMousePress = false}: HandleCopyableTextRowPressOptions = {}) => {
-        const shouldDelayPress = shouldCheck && shouldDelayMousePress && wasMouseDownOnCopyableTextRef.current && !shouldSuppressNextPressRef.current;
+    const handleCopyableTextRowPress = (onPress: () => void, {shouldCheck = true}: HandleCopyableTextRowPressOptions = {}) => {
         if (shouldSuppressCopyableTextRowPress(shouldCheck)) {
             return;
         }
 
-        if (!shouldDelayPress) {
-            onPress();
-            return;
-        }
-
-        pendingCopyableTextPressRef.current = setTimeout(() => {
-            pendingCopyableTextPressRef.current = null;
-            onPress();
-        }, COPYABLE_TEXT_SINGLE_PRESS_DELAY_MS);
+        onPress();
     };
 
     // Pointer focus from copyable text should not make virtualized lists scroll the row into view.

From 232686c1506e76fb279f686f83f24ccab650cec8 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 12:20:42 +0430
Subject: [PATCH 088/781] fix: preserve mixed selection content

---
 src/libs/SelectionScraper/index.ts | 47 +++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 49db72622592..f05e4bb244f0 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -57,6 +57,21 @@ function replaceElementContentWithLines(element: globalThis.Element, lines: stri
     }
 }
 
+function getSelectedTextForTextNode(textNode: globalThis.Text, range: Range): string {
+    const textNodeRange = document.createRange();
+    textNodeRange.selectNodeContents(textNode);
+
+    const intersectionRange = range.cloneRange();
+    if (intersectionRange.compareBoundaryPoints(globalThis.Range.START_TO_START, textNodeRange) < 0) {
+        intersectionRange.setStart(textNodeRange.startContainer, textNodeRange.startOffset);
+    }
+    if (intersectionRange.compareBoundaryPoints(globalThis.Range.END_TO_END, textNodeRange) > 0) {
+        intersectionRange.setEnd(textNodeRange.endContainer, textNodeRange.endOffset);
+    }
+
+    return intersectionRange.toString();
+}
+
 function getElementFromNode(node: globalThis.Node): globalThis.Element | null {
     if (node instanceof globalThis.Element) {
         return node;
@@ -92,6 +107,36 @@ function getCopyableElementsForSelectedRow(row: globalThis.Element, range: Range
     );
 }
 
+function selectionContainsTextOutsideCopyableRows(selection: Selection): boolean {
+    if (typeof document === 'undefined' || typeof NodeFilter === 'undefined') {
+        return false;
+    }
+
+    for (let i = 0; i < selection.rangeCount; i++) {
+        const range = selection.getRangeAt(i);
+        const rootElement = getElementFromNode(range.commonAncestorContainer);
+        if (!rootElement) {
+            continue;
+        }
+
+        const walker = document.createTreeWalker(rootElement, NodeFilter.SHOW_TEXT);
+        let textNode = walker.nextNode();
+
+        while (textNode) {
+            if (range.intersectsNode(textNode) && getSelectedTextForTextNode(textNode as globalThis.Text, range).trim()) {
+                const textElement = getElementFromNode(textNode);
+                if (!textElement?.closest(COPYABLE_ROW_SELECTOR) && !textElement?.closest(hiddenElementSelector)) {
+                    return true;
+                }
+            }
+
+            textNode = walker.nextNode();
+        }
+    }
+
+    return false;
+}
+
 function getHTMLOfSelectedCopyableRows(selection: Selection): string {
     const selectedRows: globalThis.Element[] = [];
     const selectedCopyableElementsByRow = new Map<globalThis.Element, Set<globalThis.Element>>();
@@ -161,7 +206,7 @@ const getHTMLOfSelection = (): string => {
     }
 
     const selectedCopyableRowsHTML = getHTMLOfSelectedCopyableRows(selection);
-    if (selectedCopyableRowsHTML) {
+    if (selectedCopyableRowsHTML && !selectionContainsTextOutsideCopyableRows(selection)) {
         // Explicitly marked rows need normalized row text before generic selection cleanup.
         return selectedCopyableRowsHTML;
     }

From f30c813dd5e9ca279d295d814667a6e295e73b0c Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 4 Sep 2026 14:59:20 +0700
Subject: [PATCH 089/781] fix(search): default merchant filters to contains

---
 .../SearchAdvancedFiltersContent.tsx             |  2 +-
 .../AdvancedFilters/TextInputFilterContent.tsx   |  2 +-
 .../Search/FilterDropdowns/TextFilterPopup.tsx   |  2 +-
 src/libs/SearchQueryUtils.ts                     |  6 +++---
 src/libs/SearchUIUtils.ts                        |  2 +-
 tests/ui/TextFilterPopupTest.tsx                 | 16 ++++++++++++++--
 tests/ui/TextInputFilterContentTest.tsx          | 12 ++++++++++--
 tests/unit/Search/SearchQueryUtilsTest.ts        | 15 +++++++++++++--
 tests/unit/Search/SearchUIUtilsTest.ts           |  6 ++++++
 9 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index cb0ad059f928..fc62ace7f3de 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -98,7 +98,7 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
         const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const TextFilter = components.Text;
         const isMerchantFilter = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <TextFilter
                 key={isMerchantFilter ? `${baseFilterKey}-${merchantOperator}` : baseFilterKey}
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 02965a5ae9c5..40d2fc36922a 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -51,7 +51,7 @@ function TextInputFilterContent({
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 7a952e054fff..50be29f732eb 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -36,7 +36,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const [value, setValue] = useState(initialValue);
     const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
     const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
 
     const error = useTextFilterValidation(baseFilterKey, value);
     const filterInput = (
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 1d26d85ccc58..08cf6ab900e5 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -102,7 +102,7 @@ const operatorToCharMap = {
 };
 const EXPLICIT_EQUAL_TO_OPERATOR = '=' as const;
 
-const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
 
 function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
     return operator ?? DEFAULT_MERCHANT_OPERATOR;
@@ -1379,8 +1379,8 @@ function buildFilterFormValuesFromQuery(
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE) {
             filtersForm[addNegation(filterKey, isNegated)] = filterValues.join(',');
             if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated) {
-                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS)
-                    ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+                    ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                     : DEFAULT_MERCHANT_OPERATOR;
             }
         }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index e87dce74c779..1509ffdf3b1e 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5870,7 +5870,7 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? 'search.filters.merchant.contains' : 'search.filters.merchant.exactMatch';
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.exactMatch' : 'search.filters.merchant.contains';
         return `${translate(matchTypeKey)} "${merchant}"`;
     }
 
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 311bef11bcae..9da812158edc 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -10,7 +10,7 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup() {
+function renderMerchantPopup(hasStoredMerchantOperator = true) {
     const closeOverlay = jest.fn();
     const updateFilterForm = jest.fn();
 
@@ -20,7 +20,7 @@ function renderMerchantPopup() {
                 baseFilterKey={FILTER_KEYS.MERCHANT}
                 values={{
                     [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
                 }}
                 label="common.merchant"
                 closeOverlay={closeOverlay}
@@ -55,6 +55,18 @@ describe('TextFilterPopup', () => {
         expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {updateFilterForm} = renderMerchantPopup(false);
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides the match type and submits exact matching for a negated Merchant', () => {
         const {updateFilterForm} = renderMerchantPopup();
 
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 985f4de277ff..6e7fce3da3e0 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -9,7 +9,7 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn()) {
+function renderMerchantFilter(onChange = jest.fn(), hasStoredMerchantOperator = true) {
     return {
         onChange,
         ...render(
@@ -18,7 +18,7 @@ function renderMerchantFilter(onChange = jest.fn()) {
                     baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
                     value="I"
                     isNegated={false}
-                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                    merchantOperator={hasStoredMerchantOperator ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : undefined}
                     onChange={onChange}
                 />
             </NavigationContainer>,
@@ -61,6 +61,14 @@ describe('TextInputFilterContent', () => {
         expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     });
 
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {onChange} = renderMerchantFilter(jest.fn(), false);
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    });
+
     it('hides the merchant match type and omits the operator when the filter is negated', () => {
         // Given a positive Merchant Contains filter where both match options must be available.
         const {onChange} = renderMerchantFilter();
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2fc3348dbf51..d5771f5301d8 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -455,7 +455,18 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant=Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
+        });
+
+        test('defaults a merchant filter without an operator to contains', () => {
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Amazon',
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
         test('builds contains merchant query when merchant operator is contains', () => {
@@ -781,7 +792,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc'});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant=Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 603bc08a0971..f534351073e8 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -12431,6 +12431,12 @@ describe('SearchUIUtils', () => {
 
             expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
         });
+
+        test('defaults a Merchant filter label without an operator to contains', () => {
+            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, {[FILTER_KEYS.MERCHANT]: 'I'}, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
+
+            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
+        });
     });
 
     describe('filterValidHasValues', () => {

From 11e0948d07e573c02c28b7423cf3fcc10b944ed1 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 14:21:14 +0430
Subject: [PATCH 090/781] fix: restore expense detail copyable guards

---
 .../ReportActionItem/MoneyRequestView.tsx     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 31bc03923ea3..fbad43bf027f 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1025,7 +1025,7 @@ function MoneyRequestView({
                     errorText={getErrorForField('waypoints')}
                     errorTextStyle={styles.userSelectNone}
                     copyValue={distanceCopyValue}
-                    copyable={!!distanceCopyValue}
+                    copyable={!canEditDistance && !!distanceCopyValue}
                     isTitleSelectable={!!distanceCopyValue}
                 />
             </OfflineWithFeedback>
@@ -1085,7 +1085,7 @@ function MoneyRequestView({
                     errorText={getErrorForField('customUnitRateID')}
                     errorTextStyle={styles.userSelectNone}
                     copyValue={distanceRateCopyValue}
-                    copyable={!!distanceRateCopyValue}
+                    copyable={!canEditDistanceRate && !!distanceRateCopyValue}
                     isTitleSelectable={!!distanceRateCopyValue}
                 />
             </OfflineWithFeedback>
@@ -1167,7 +1167,7 @@ function MoneyRequestView({
                     shouldShowBasicTitle
                     shouldShowDescriptionOnTop
                     copyValue={tagCopyValue}
-                    copyable={!!tagCopyValue}
+                    copyable={!canEdit && !!tagCopyValue}
                     isTitleSelectable={!!tagCopyValue}
                 />
             </OfflineWithFeedback>
@@ -1274,7 +1274,7 @@ function MoneyRequestView({
                         errorText={getErrorForField('amount')}
                         errorTextStyle={styles.userSelectNone}
                         copyValue={amountCopyValue}
-                        copyable={!!amountCopyValue}
+                        copyable={!canEditAmount && !!amountCopyValue}
                         isTitleSelectable={!!amountCopyValue}
                     />
                 </OfflineWithFeedback>
@@ -1301,7 +1301,7 @@ function MoneyRequestView({
                             errorTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={0}
                             copyValue={descriptionCopyValue}
-                            copyable={!!descriptionCopyValue}
+                            copyable={!canEdit && !!descriptionCopyValue}
                             isTitleSelectable={!!descriptionCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1331,7 +1331,7 @@ function MoneyRequestView({
                             errorTextStyle={styles.userSelectNone}
                             numberOfLinesTitle={0}
                             copyValue={merchantCopyValue}
-                            copyable={!!merchantCopyValue}
+                            copyable={!canEditMerchant && !!merchantCopyValue}
                             isTitleSelectable={!!merchantCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1356,7 +1356,7 @@ function MoneyRequestView({
                         errorText={getErrorForField('date')}
                         errorTextStyle={styles.userSelectNone}
                         copyValue={dateCopyValue}
-                        copyable={!!dateCopyValue}
+                        copyable={!canEditDate && !!dateCopyValue}
                         isTitleSelectable={!!dateCopyValue}
                     />
                 </OfflineWithFeedback>
@@ -1426,7 +1426,7 @@ function MoneyRequestView({
                             errorText={getErrorForField('category')}
                             errorTextStyle={styles.userSelectNone}
                             copyValue={categoryCopyValue}
-                            copyable={!!categoryCopyValue}
+                            copyable={!canEdit && !!categoryCopyValue}
                             isTitleSelectable={!!categoryCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1459,7 +1459,7 @@ function MoneyRequestView({
                             errorText={getErrorForField('vendor')}
                             errorTextStyle={styles.userSelectNone}
                             copyValue={vendorCopyValue}
-                            copyable={!!vendorCopyValue}
+                            copyable={!canEdit && !!vendorCopyValue}
                             isTitleSelectable={!!vendorCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1506,7 +1506,7 @@ function MoneyRequestView({
                             errorText={getErrorForField('tax')}
                             errorTextStyle={styles.userSelectNone}
                             copyValue={taxRateCopyValue}
-                            copyable={!!taxRateCopyValue}
+                            copyable={!canEditTaxFields && !!taxRateCopyValue}
                             isTitleSelectable={!!taxRateCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1534,7 +1534,7 @@ function MoneyRequestView({
                                 );
                             }}
                             copyValue={taxAmountCopyValue}
-                            copyable={!!taxAmountCopyValue}
+                            copyable={!canEditTaxFields && !!taxAmountCopyValue}
                             isTitleSelectable={!!taxAmountCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1578,7 +1578,7 @@ function MoneyRequestView({
                             interactive={canEdit}
                             shouldShowRightIcon={canEdit}
                             copyValue={attendeesCopyValue}
-                            copyable={!!attendeesCopyValue}
+                            copyable={!canEdit && !!attendeesCopyValue}
                             isTitleSelectable={!!attendeesCopyValue}
                         />
                     </OfflineWithFeedback>
@@ -1678,7 +1678,7 @@ function MoneyRequestView({
                             interactive={canEditReport}
                             shouldRenderAsHTML
                             copyValue={reportCopyValue}
-                            copyable={!!reportCopyValue}
+                            copyable={!canEditReport && !!reportCopyValue}
                             isTitleSelectable={!!reportCopyValue}
                         />
                     </OfflineWithFeedback>

From d49bf0934100a87fa64f8b304b9fb4ddf66e268b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 14:25:43 +0430
Subject: [PATCH 091/781] refactor: move HTML tag detection to Parser

---
 src/components/MenuItem/MenuItem.tsx | 2 +-
 src/libs/Parser.ts                   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 2f99a578ff4c..ca31f90175de 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -750,7 +750,7 @@ function MenuItem({
         return Parser.replace(helperText, {shouldEscapeText});
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
-    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && /<[^>]+>/.test(title);
+    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.hasHTMLTags(title);
 
     const processedTitle = useMemo(() => {
         let titleToWrap = '';
diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts
index d91e00dc2739..abe30d2816fb 100644
--- a/src/libs/Parser.ts
+++ b/src/libs/Parser.ts
@@ -69,6 +69,10 @@ class ExpensiMarkWithContext extends ExpensiMark {
     isHTML(text: string): boolean {
         return /<[^>]+>/.test(text) || /&[#\w]+;/.test(text);
     }
+
+    hasHTMLTags(text: string): boolean {
+        return /<[^>]+>/.test(text);
+    }
 }
 
 ExpensiMarkWithContext.setLogger(Log);

From 58caaabd35595737e62ed6a6f288b6247c568dd0 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 14:47:52 +0430
Subject: [PATCH 092/781] refactor: move user select auto style to platform
 utils

---
 .../GenericPressable/implementation/BaseGenericPressable.tsx  | 4 +---
 src/styles/utils/userSelect/index.native.ts                   | 3 +++
 src/styles/utils/userSelect/index.ts                          | 4 ++++
 src/styles/utils/userSelect/types.ts                          | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
index a435f6f06b3c..3e9a7f657fab 100644
--- a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
@@ -20,8 +20,6 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import {Pressable} from 'react-native';
 
-const allowTextSelectionStyle = {userSelect: 'auto', WebkitUserSelect: 'auto'} as const;
-
 function GenericPressable({
     children,
     onPress,
@@ -218,7 +216,7 @@ function GenericPressable({
                 (state.hovered || isHovered) && StyleUtils.parseStyleFromFunction(hoverStyle, state),
                 state.pressed && StyleUtils.parseStyleFromFunction(pressStyle, state),
                 isDisabled && [StyleUtils.parseStyleFromFunction(disabledStyle, state), styles.noSelect],
-                shouldAllowTextSelection ? allowTextSelectionStyle : isRoleButton && styles.userSelectNone,
+                shouldAllowTextSelection ? styles.userSelectAuto : isRoleButton && styles.userSelectNone,
             ]}
             // accessibility props
             accessibilityState={{
diff --git a/src/styles/utils/userSelect/index.native.ts b/src/styles/utils/userSelect/index.native.ts
index 05e3c8996f4a..d0905f8b5f25 100644
--- a/src/styles/utils/userSelect/index.native.ts
+++ b/src/styles/utils/userSelect/index.native.ts
@@ -1,6 +1,9 @@
 import type UserSelectStyles from './types';
 
 const userSelect: UserSelectStyles = {
+    userSelectAuto: {
+        userSelect: 'auto',
+    },
     userSelectText: {
         userSelect: 'text',
     },
diff --git a/src/styles/utils/userSelect/index.ts b/src/styles/utils/userSelect/index.ts
index 79eec6d3b139..15d2910ac1fe 100644
--- a/src/styles/utils/userSelect/index.ts
+++ b/src/styles/utils/userSelect/index.ts
@@ -1,6 +1,10 @@
 import type UserSelectStyles from './types';
 
 const userSelect: UserSelectStyles = {
+    userSelectAuto: {
+        userSelect: 'auto',
+        WebkitUserSelect: 'auto',
+    },
     userSelectText: {
         userSelect: 'text',
         WebkitUserSelect: 'text',
diff --git a/src/styles/utils/userSelect/types.ts b/src/styles/utils/userSelect/types.ts
index 74a4a7bbde9a..06c0d5bbf2b1 100644
--- a/src/styles/utils/userSelect/types.ts
+++ b/src/styles/utils/userSelect/types.ts
@@ -1,5 +1,6 @@
 import type {TextStyle} from 'react-native';
 
-type UserSelectStyles = Record<'userSelectText' | 'userSelectNone', Pick<TextStyle, 'userSelect' | 'WebkitUserSelect'>>;
+type UserSelectStyle = Pick<TextStyle, 'userSelect'> & Partial<Pick<TextStyle, 'WebkitUserSelect'>>;
+type UserSelectStyles = Record<'userSelectAuto' | 'userSelectText' | 'userSelectNone', UserSelectStyle>;
 
 export default UserSelectStyles;

From 164ea899a39b9e8dacdbadda5955afea2f8dafcc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 15:57:08 +0430
Subject: [PATCH 093/781] fix: avoid unsafe SelectionScraper text assertion

---
 src/libs/SelectionScraper/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index f05e4bb244f0..a58e4389a34f 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -123,7 +123,7 @@ function selectionContainsTextOutsideCopyableRows(selection: Selection): boolean
         let textNode = walker.nextNode();
 
         while (textNode) {
-            if (range.intersectsNode(textNode) && getSelectedTextForTextNode(textNode as globalThis.Text, range).trim()) {
+            if (textNode instanceof globalThis.Text && range.intersectsNode(textNode) && getSelectedTextForTextNode(textNode, range).trim()) {
                 const textElement = getElementFromNode(textNode);
                 if (!textElement?.closest(COPYABLE_ROW_SELECTOR) && !textElement?.closest(hiddenElementSelector)) {
                     return true;

From 1f74774c0e6dd5f1bdcaf8a9270101774d7f7cbd Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 16:07:49 +0430
Subject: [PATCH 094/781] fix: exclude report row avatars from copied text

---
 .../ExpenseReportListItemAvatar.tsx                      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemAvatar.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemAvatar.tsx
index a671891dbf83..75e456f28f18 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemAvatar.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemAvatar.tsx
@@ -67,7 +67,14 @@ function ExpenseReportListItemAvatar({item, isHovered = false, isFocused = false
         );
     }
 
-    return <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.AVATAR), styles.alignItemsStretch]}>{avatarContent}</View>;
+    return (
+        <View
+            style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.AVATAR), styles.alignItemsStretch, styles.userSelectNone]}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+        >
+            {avatarContent}
+        </View>
+    );
 }
 
 export default ExpenseReportListItemAvatar;

From d2af5d2f6ca3706032fd0b0ae46dad41946cbc56 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 16:21:17 +0430
Subject: [PATCH 095/781] fix: type menu item hint text style correctly

---
 src/components/FormHelpMessage.tsx   | 8 ++++++--
 src/components/MenuItem/MenuItem.tsx | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/FormHelpMessage.tsx b/src/components/FormHelpMessage.tsx
index 558c5a2f1286..aa5cbf3ca176 100644
--- a/src/components/FormHelpMessage.tsx
+++ b/src/components/FormHelpMessage.tsx
@@ -8,7 +8,7 @@ import Parser from '@libs/Parser';
 
 import CONST from '@src/CONST';
 
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 
 import isEmpty from 'lodash/isEmpty';
 import React, {useContext, useMemo} from 'react';
@@ -32,6 +32,9 @@ type FormHelpMessageProps = {
     /** Container style props */
     style?: StyleProp<ViewStyle>;
 
+    /** Message text style props */
+    messageStyle?: StyleProp<TextStyle>;
+
     /** Whether to show dot indicator */
     shouldShowRedDotIndicator?: boolean;
 
@@ -55,6 +58,7 @@ function FormHelpMessage({
     children,
     isError = true,
     style,
+    messageStyle,
     shouldShowRedDotIndicator = true,
     shouldRenderMessageAsHTML = false,
     isInfo = false,
@@ -142,7 +146,7 @@ function FormHelpMessage({
                         <RenderHTML html={HTMLMessage} />
                     ) : (
                         <Text
-                            style={[isError ? styles.formError : styles.formHelp, styles.mb0]}
+                            style={[isError ? styles.formError : styles.formHelp, styles.mb0, messageStyle]}
                             nativeID={nativeID}
                             role={visibleMessageRole}
                             accessibilityRole={!isWeb && shouldAnnounceError ? CONST.ROLE.ALERT : undefined}
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index ca31f90175de..97de6ebebae1 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -227,7 +227,7 @@ type MenuItemBaseProps = ForwardedFSClassProps &
         hintText?: string | ReactNode;
 
         /** Any additional styles to pass to hint text. */
-        hintTextStyle?: StyleProp<ViewStyle>;
+        hintTextStyle?: StyleProp<TextStyle>;
 
         /** Should the error text red dot indicator be shown */
         shouldShowRedDotIndicator?: boolean;
@@ -1328,7 +1328,8 @@ function MenuItem({
                                                 isError={false}
                                                 shouldShowRedDotIndicator={false}
                                                 message={hintText}
-                                                style={[styles.menuItemError, hintTextStyle]}
+                                                style={styles.menuItemError}
+                                                messageStyle={hintTextStyle}
                                                 shouldRenderMessageAsHTML={shouldRenderHintAsHTML}
                                             />
                                         )}

From 6fd1449a9f258cc96c2ae745c680d43f86cf44fc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 16:43:07 +0430
Subject: [PATCH 096/781] refactor: derive copyable row dataset in TableRow

---
 src/components/Table/TableRow.tsx                             | 4 ++++
 .../Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 01a577035e9e..f740db171d15 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -12,6 +12,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
@@ -72,6 +73,7 @@ export default function TableRow({
     fullDisabled,
     tabIndex,
     shouldAllowTextSelection = false,
+    dataSet,
     ...props
 }: TableRowProps) {
     const theme = useTheme();
@@ -109,6 +111,7 @@ export default function TableRow({
     // the static ones. They're only ever set on wide web layouts.
     const gridTemplateColumns = dynamicGridTemplateColumns ? [...dynamicGridTemplateColumns] : getGridTemplateColumns(columns);
     const isSelectionCheckboxVisible = selectionEnabled && (isMobileSelectionEnabled || !selectionUsesNarrowLayout);
+    const rowDataSet = shouldAllowTextSelection ? {...dataSet, ...COPYABLE_ROW_DATA_SET} : dataSet;
 
     const isDisabled = !!disabled || isAccessibilityHidden;
     const isFirstRow = rowIndex === 0;
@@ -299,6 +302,7 @@ export default function TableRow({
                 onLongPress={handleRowLongPress}
                 {...props}
                 {...inertProps}
+                dataSet={rowDataSet}
                 focusable={isAccessibilityHidden ? false : focusable}
                 fullDisabled={isAccessibilityHidden || fullDisabled}
                 tabIndex={isAccessibilityHidden ? -1 : tabIndex}
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index e1ed347b5324..f9dd39af0579 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -10,7 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import variables from '@styles/variables';
 
@@ -55,7 +55,6 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
         <Table.Row
             interactive
             shouldAllowTextSelection
-            dataSet={COPYABLE_ROW_DATA_SET}
             rowIndex={rowIndex}
             disabled={item.disabled}
             accessibilityLabel={accessibilityLabel}

From 403370a2cc9aa9665be96c5629997957915e9186 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 16:55:41 +0430
Subject: [PATCH 097/781] perf: cache copyable text press checks

---
 src/components/MenuItem/MenuItem.tsx          |  5 +--
 .../useCopyableTextRowPress/index.native.ts   |  1 +
 src/hooks/useCopyableTextRowPress/index.ts    | 33 +++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 97de6ebebae1..90ede4cc923e 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -24,7 +24,7 @@ import EducationalTooltip from '@components/Tooltip/EducationalTooltip';
 import getContextMenuAccessibilityHint from '@components/utils/getContextMenuAccessibilityHint';
 import getContextMenuAccessibilityProps from '@components/utils/getContextMenuAccessibilityProps';
 
-import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -650,7 +650,8 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<View>(null);
     const pressableRef = useRef<View>(null);
-    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const {isPressStartOnCopyableText, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
     useRemoveNonInteractiveClickHandler(pressableRef, interactive);
     const deviceHasHoverSupport = hasHoverSupport();
     const isCompactMenu = useIsCompactMenu();
diff --git a/src/hooks/useCopyableTextRowPress/index.native.ts b/src/hooks/useCopyableTextRowPress/index.native.ts
index 4c3214f4dd0f..572a1854a6b4 100644
--- a/src/hooks/useCopyableTextRowPress/index.native.ts
+++ b/src/hooks/useCopyableTextRowPress/index.native.ts
@@ -19,6 +19,7 @@ function useCopyableTextRowPress() {
 
     return {
         handleCopyableTextRowPress,
+        isPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
         shouldSuppressCopyableTextRowFocus,
diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
index 334f2b9ff9ec..b22334e757ea 100644
--- a/src/hooks/useCopyableTextRowPress/index.ts
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -12,6 +12,13 @@ type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
 };
 
+type PressStartOnCopyableTextCache = {
+    clientX: number | undefined;
+    clientY: number | undefined;
+    result: boolean;
+    target: EventTarget | null;
+};
+
 function getCopyableTextElement(target: EventTarget | Node | null | undefined): HTMLElement | null {
     if (typeof HTMLElement === 'undefined') {
         return null;
@@ -141,6 +148,30 @@ function useCopyableTextRowPress() {
     const wasMouseDownOnCopyableTextRef = useRef(false);
     const wasTouchStartOnCopyableTextRef = useRef(false);
     const shouldSuppressNextPressRef = useRef(false);
+    const pressStartOnCopyableTextCacheRef = useRef<PressStartOnCopyableTextCache | null>(null);
+
+    const getCachedIsPressStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
+        if (!shouldCheck) {
+            return false;
+        }
+
+        const position = getPressStartPosition(event);
+        const target = getPressStartTarget(event);
+        const cachedPressStart = pressStartOnCopyableTextCacheRef.current;
+
+        if (cachedPressStart && cachedPressStart.target === target && cachedPressStart.clientX === position?.clientX && cachedPressStart.clientY === position?.clientY) {
+            return cachedPressStart.result;
+        }
+
+        const result = isPressStartOnCopyableText(event);
+        pressStartOnCopyableTextCacheRef.current = {
+            clientX: position?.clientX,
+            clientY: position?.clientY,
+            result,
+            target,
+        };
+        return result;
+    };
 
     const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
@@ -163,6 +194,7 @@ function useCopyableTextRowPress() {
         wasMouseDownOnCopyableTextRef.current = false;
         wasTouchStartOnCopyableTextRef.current = false;
         shouldSuppressNextPressRef.current = false;
+        pressStartOnCopyableTextCacheRef.current = null;
         return shouldSuppressPress;
     };
 
@@ -185,6 +217,7 @@ function useCopyableTextRowPress() {
 
     return {
         handleCopyableTextRowPress,
+        isPressStartOnCopyableText: getCachedIsPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
         shouldSuppressCopyableTextRowFocus,

From 7efb6df65d62654861875d3f74a61afdea513398 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 17:18:02 +0430
Subject: [PATCH 098/781] test: cover copyable row selection behavior

---
 src/hooks/useCopyableTextRowPress/index.ts    |   2 +
 tests/unit/SelectionScraperTest.ts            | 107 ++++++++++++++++++
 .../hooks/useCopyableTextRowPress.test.ts     | 106 +++++++++++++++++
 3 files changed, 215 insertions(+)
 create mode 100644 tests/unit/SelectionScraperTest.ts
 create mode 100644 tests/unit/hooks/useCopyableTextRowPress.test.ts

diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
index b22334e757ea..9bcb0c37d762 100644
--- a/src/hooks/useCopyableTextRowPress/index.ts
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -174,6 +174,7 @@ function useCopyableTextRowPress() {
     };
 
     const markMouseDownOnCopyableText = (target: EventTarget | null | undefined, shouldCheck = true, {shouldSuppressNextPress = false}: MarkCopyableTextMouseDownOptions = {}): boolean => {
+        pressStartOnCopyableTextCacheRef.current = null;
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
         shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
@@ -181,6 +182,7 @@ function useCopyableTextRowPress() {
     };
 
     const markTouchStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
+        pressStartOnCopyableTextCacheRef.current = null;
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
         wasMouseDownOnCopyableTextRef.current = false;
         wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
new file mode 100644
index 000000000000..efa70a21f59f
--- /dev/null
+++ b/tests/unit/SelectionScraperTest.ts
@@ -0,0 +1,107 @@
+import type SelectionScraperModule from '../../src/libs/SelectionScraper/index';
+
+import CONST from '../../src/CONST';
+
+const SelectionScraper = jest.requireActual<{default: typeof SelectionScraperModule}>('../../src/libs/SelectionScraper/index.ts').default;
+const copyableRowAttribute = `data-${CONST.COPYABLE_ROW_ELEMENT}`;
+const copyableTextAttribute = `data-${CONST.COPYABLE_TEXT_ELEMENT}`;
+const hiddenElementAttribute = `data-${CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT}`;
+
+function getTextNode(id: string): ChildNode {
+    const element = document.getElementById(id);
+    if (!element?.firstChild) {
+        throw new Error(`Missing text node for ${id}`);
+    }
+
+    return element.firstChild;
+}
+
+function selectText(startNode: Node, startOffset: number, endNode: Node, endOffset: number) {
+    const selection = window.getSelection();
+    const range = document.createRange();
+    range.setStart(startNode, startOffset);
+    range.setEnd(endNode, endOffset);
+
+    selection?.removeAllRanges();
+    selection?.addRange(range);
+}
+
+describe('SelectionScraper', () => {
+    beforeEach(() => {
+        document.body.innerHTML = '';
+        window.getSelection()?.removeAllRanges();
+    });
+
+    it('formats selected copyable cells as one line per row', () => {
+        document.body.innerHTML = `
+            <div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="date1" ${copyableTextAttribute}="true">Aug 26</span>
+                    <span id="status1" ${copyableTextAttribute}="true">Paid</span>
+                    <span ${hiddenElementAttribute}="true">T</span>
+                </div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="date2" ${copyableTextAttribute}="true">Aug 27</span>
+                    <span id="status2" ${copyableTextAttribute}="true">Draft</span>
+                </div>
+            </div>
+        `;
+
+        selectText(getTextNode('date1'), 0, getTextNode('status2'), 'Draft'.length);
+
+        expect(SelectionScraper.getCurrentSelection()).toBe('Aug 26 Paid<br>Aug 27 Draft');
+    });
+
+    it('keeps browser selection behavior for a single selected copyable cell', () => {
+        document.body.innerHTML = `
+            <div ${copyableRowAttribute}="true">
+                <span id="amount" ${copyableTextAttribute}="true">$123.45</span>
+            </div>
+        `;
+
+        selectText(getTextNode('amount'), 1, getTextNode('amount'), 4);
+
+        expect(SelectionScraper.getCurrentSelection()).toBe('123');
+    });
+
+    it('preserves partial first and last cell boundaries in multi-row selections', () => {
+        document.body.innerHTML = `
+            <div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="date1" ${copyableTextAttribute}="true">Aug 26</span>
+                    <span id="status1" ${copyableTextAttribute}="true">Paid</span>
+                    <span id="title1" ${copyableTextAttribute}="true">Expense Report</span>
+                </div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="date2" ${copyableTextAttribute}="true">Aug 27</span>
+                    <span id="status2" ${copyableTextAttribute}="true">Draft</span>
+                    <span id="title2" ${copyableTextAttribute}="true">Expense Report</span>
+                </div>
+            </div>
+        `;
+
+        selectText(getTextNode('date1'), 'Aug '.length, getTextNode('title2'), 'Expense'.length);
+
+        expect(SelectionScraper.getCurrentSelection()).toBe('26 Paid Expense Report<br>Aug 27 Draft Expense');
+    });
+
+    it('falls back to regular scraping when selected text extends outside copyable rows', () => {
+        document.body.innerHTML = `
+            <div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="amount" ${copyableTextAttribute}="true">$40.00</span>
+                    <span id="merchant" ${copyableTextAttribute}="true">APPLE TEST</span>
+                </div>
+                <p id="comment">submitted a comment</p>
+            </div>
+        `;
+
+        selectText(getTextNode('amount'), 0, getTextNode('comment'), 'submitted a comment'.length);
+
+        const selectionHTML = SelectionScraper.getCurrentSelection();
+        expect(selectionHTML).toContain('$40.00');
+        expect(selectionHTML).toContain('APPLE TEST');
+        expect(selectionHTML).toContain('submitted a comment');
+        expect(selectionHTML).not.toBe('$40.00 APPLE TEST');
+    });
+});
diff --git a/tests/unit/hooks/useCopyableTextRowPress.test.ts b/tests/unit/hooks/useCopyableTextRowPress.test.ts
new file mode 100644
index 000000000000..668287d667ee
--- /dev/null
+++ b/tests/unit/hooks/useCopyableTextRowPress.test.ts
@@ -0,0 +1,106 @@
+import {renderHook} from '@testing-library/react-native';
+
+import type useCopyableTextRowPressModule from '../../../src/hooks/useCopyableTextRowPress/index';
+
+const useCopyableTextRowPress = jest.requireActual<{default: typeof useCopyableTextRowPressModule}>('../../../src/hooks/useCopyableTextRowPress/index.ts').default;
+const originalGetClientRectsDescriptor = Object.getOwnPropertyDescriptor(Range.prototype, 'getClientRects');
+
+function getCopyableTextElement(): HTMLElement {
+    const element = document.getElementById('copyableText');
+    if (!element) {
+        throw new Error('Missing copyable text element');
+    }
+
+    return element;
+}
+
+function selectElementText(element: HTMLElement) {
+    const selection = window.getSelection();
+    const range = document.createRange();
+    range.selectNodeContents(element);
+
+    selection?.removeAllRanges();
+    selection?.addRange(range);
+}
+
+describe('useCopyableTextRowPress', () => {
+    beforeEach(() => {
+        document.body.innerHTML = '<span id="copyableText" data-copyable-text="true">Copy me</span>';
+        window.getSelection()?.removeAllRanges();
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+        if (originalGetClientRectsDescriptor) {
+            Object.defineProperty(Range.prototype, 'getClientRects', originalGetClientRectsDescriptor);
+        } else {
+            delete Range.prototype.getClientRects;
+        }
+    });
+
+    it('suppresses row press after selecting copyable text', () => {
+        const {result} = renderHook(() => useCopyableTextRowPress());
+        const copyableTextElement = getCopyableTextElement();
+        selectElementText(copyableTextElement);
+
+        expect(result.current.markMouseDownOnCopyableText(copyableTextElement)).toBe(true);
+        expect(result.current.shouldSuppressCopyableTextRowPress()).toBe(true);
+        expect(result.current.shouldSuppressCopyableTextRowPress()).toBe(false);
+    });
+
+    it('suppresses the next row press for double-click selection starts', () => {
+        const {result} = renderHook(() => useCopyableTextRowPress());
+        const copyableTextElement = getCopyableTextElement();
+
+        expect(result.current.markMouseDownOnCopyableText(copyableTextElement, true, {shouldSuppressNextPress: true})).toBe(true);
+        expect(result.current.shouldSuppressCopyableTextRowPress()).toBe(true);
+    });
+
+    it('suppresses row long press after touch starts on copyable text', () => {
+        const {result} = renderHook(() => useCopyableTextRowPress());
+        const copyableTextElement = getCopyableTextElement();
+
+        expect(result.current.markTouchStartOnCopyableText({target: copyableTextElement})).toBe(true);
+        expect(result.current.shouldSuppressCopyableTextRowLongPress()).toBe(true);
+    });
+
+    it('does not suppress row press when the press starts outside copyable text', () => {
+        document.body.innerHTML = '<span id="regularText">Regular text</span>';
+        const regularTextElement = document.getElementById('regularText');
+        const {result} = renderHook(() => useCopyableTextRowPress());
+
+        expect(result.current.markMouseDownOnCopyableText(regularTextElement)).toBe(false);
+        expect(result.current.shouldSuppressCopyableTextRowPress()).toBe(false);
+    });
+
+    it('caches expensive copyable text hit testing for the same press', () => {
+        const {result} = renderHook(() => useCopyableTextRowPress());
+        const copyableTextElement = getCopyableTextElement();
+        const getClientRectsMock = jest.fn(() => [
+            {
+                bottom: 20,
+                height: 20,
+                left: 0,
+                right: 100,
+                top: 0,
+                width: 100,
+                x: 0,
+                y: 0,
+                toJSON: () => ({}),
+            },
+        ]);
+        Object.defineProperty(Range.prototype, 'getClientRects', {
+            configurable: true,
+            value: getClientRectsMock,
+        });
+        const pressEvent = {
+            clientX: 10,
+            clientY: 10,
+            target: copyableTextElement,
+        };
+
+        expect(result.current.isPressStartOnCopyableText(pressEvent)).toBe(true);
+        expect(result.current.isPressStartOnCopyableText(pressEvent)).toBe(true);
+        expect(getClientRectsMock).toHaveBeenCalledTimes(1);
+    });
+});

From 0a3d9731f3f2ead7b0f723da3e5f3145ab585822 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 4 Sep 2026 17:28:09 +0430
Subject: [PATCH 099/781] test: fix copyable text row press typecheck

---
 tests/unit/hooks/useCopyableTextRowPress.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/hooks/useCopyableTextRowPress.test.ts b/tests/unit/hooks/useCopyableTextRowPress.test.ts
index 668287d667ee..4d2295185c19 100644
--- a/tests/unit/hooks/useCopyableTextRowPress.test.ts
+++ b/tests/unit/hooks/useCopyableTextRowPress.test.ts
@@ -34,7 +34,7 @@ describe('useCopyableTextRowPress', () => {
         if (originalGetClientRectsDescriptor) {
             Object.defineProperty(Range.prototype, 'getClientRects', originalGetClientRectsDescriptor);
         } else {
-            delete Range.prototype.getClientRects;
+            Reflect.deleteProperty(Range.prototype, 'getClientRects');
         }
     });
 

From 83bd6150efef29246e6912cc09db45ee4f7e8fbc Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Mon, 7 Sep 2026 16:44:49 +0700
Subject: [PATCH 100/781] fix(search): preserve merchant lists and isolate
 filter UI

---
 .../AdvancedFilters/MerchantFilterContent.tsx | 140 ++++++++++++++++++
 .../SearchAdvancedFiltersContent.tsx          |  43 ++++--
 .../TextInputFilterContent.tsx                |  33 +----
 .../MerchantFilterContentPopupWrapper.tsx     |  23 +++
 .../TextInputFilterContentPopupWrapper.tsx    |   3 +-
 .../SearchAdvancedFiltersPopup/index.tsx      |   2 +
 src/libs/SearchQueryUtils.ts                  |   5 +-
 .../MerchantFilterContentPageWrapper.tsx      |  22 +++
 .../SearchAdvancedFiltersContentBase.tsx      |   2 +
 .../TextInputFilterContentPageWrapper.tsx     |   3 +-
 tests/ui/MerchantFilterContentTest.tsx        | 111 ++++++++++++++
 tests/ui/TextInputFilterContentTest.tsx       |  66 +--------
 tests/unit/Search/SearchQueryUtilsTest.ts     |  85 +++++++++++
 13 files changed, 433 insertions(+), 105 deletions(-)
 create mode 100644 src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
 create mode 100644 src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
 create mode 100644 src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
 create mode 100644 tests/ui/MerchantFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
new file mode 100644
index 000000000000..632f9f791e9c
--- /dev/null
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -0,0 +1,140 @@
+/**
+ * Renders the advanced Merchant filter input, match type, and negation controls.
+ */
+import Button from '@components/ButtonComposed';
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
+import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
+import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
+import TextInput from '@components/TextInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+type MerchantFilterContentProps = {
+    /** The Merchant filter key. */
+    baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+
+    /** The current Merchant value. */
+    value: string | undefined;
+
+    /** Whether the filter currently uses the negated value. */
+    isNegated: boolean;
+
+    /** The current Merchant match type. */
+    merchantOperator?: MerchantMatchType;
+
+    /** The button size used for confirmation. */
+    buttonSize?: Exclude<ValueOf<typeof CONST.BUTTON_SIZE>, typeof CONST.BUTTON_SIZE.SMALL>;
+
+    /** Whether the input should receive focus automatically. */
+    autoFocus?: boolean;
+
+    /** Additional styles for the filter content. */
+    style?: StyleProp<ViewStyle>;
+
+    /** Called with the updated Merchant filter form values. */
+    onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
+};
+
+function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
+    return !!element && 'isFocused' in element;
+}
+
+function MerchantFilterContent({
+    baseFilterKey,
+    value: initialValue,
+    isNegated: initialIsNegated,
+    merchantOperator: initialMerchantOperator,
+    buttonSize,
+    autoFocus,
+    style,
+    onChange,
+}: MerchantFilterContentProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [value, setValue] = useState(initialValue);
+    const [isNegated, setIsNegated] = useState(initialIsNegated);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    const shouldShowMerchantMatchType = !isNegated;
+    const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
+    const {inputCallbackRef} = useAutoFocusInput();
+    const error = useTextFilterValidation(baseFilterKey, value);
+
+    const filterInput = (
+        <TextInput
+            ref={(ref) => {
+                if (!autoFocus || !isTextInput(ref)) {
+                    return;
+                }
+                inputCallbackRef(ref);
+            }}
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
+
+    const updateMerchantFilter = () => {
+        if (error) {
+            return;
+        }
+
+        onChange({
+            [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
+            [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+        });
+    };
+
+    return (
+        <View style={[styles.flex1, styles.justifyContentBetween, style]}>
+            <NegatableFilter
+                baseFilterKey={baseFilterKey}
+                isNegated={isNegated}
+                onNegationChange={setIsNegated}
+                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
+            >
+                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
+                    {filterInput}
+                    {shouldShowMerchantMatchType && (
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    )}
+                </View>
+            </NegatableFilter>
+            <Button
+                style={[styles.ph5, styles.pb5]}
+                variant={CONST.BUTTON_VARIANT.SUCCESS}
+                size={buttonSize}
+                onPress={updateMerchantFilter}
+            >
+                <Button.KeyboardShortcut />
+                <Button.Text>{translate('common.confirm')}</Button.Text>
+            </Button>
+        </View>
+    );
+}
+
+export default MerchantFilterContent;
+export type {MerchantFilterContentProps};
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index fc62ace7f3de..f826386eccf4 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -12,10 +12,12 @@ import React from 'react';
 
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {DateFilterContentProps} from './DateFilterContent';
+import type {MerchantFilterContentProps} from './MerchantFilterContent';
 import type {ReportFieldFilterContentProps} from './ReportFieldFilterContent';
 import type {TextInputFilterContentProps} from './TextInputFilterContent';
 
-type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'merchantOperator' | 'onChange'>;
+type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'onChange'>;
+type MerchantFilterContentWrapperProps = Pick<MerchantFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'merchantOperator' | 'onChange'>;
 type AmountFilterContentWrapperProps = Pick<AmountFilterContentProps, 'baseFilterKey' | 'value' | 'onChange'>;
 type DateFilterContentWrapperProps = Pick<DateFilterContentProps, 'baseFilterKey' | 'value' | 'hasFeed' | 'onChange'>;
 type ReportFieldFilterContentWrapperProps = Pick<ReportFieldFilterContentProps, 'values' | 'onChange'>;
@@ -28,6 +30,7 @@ type SearchAdvancedFiltersContentProps = {
     values: Partial<SearchAdvancedFiltersForm> | undefined;
     ready?: boolean;
     components: {
+        Merchant: React.ComponentType<MerchantFilterContentWrapperProps>;
         Text: React.ComponentType<TextInputFilterContentWrapperProps>;
         Amount: React.ComponentType<AmountFilterContentWrapperProps>;
         Date: React.ComponentType<DateFilterContentWrapperProps>;
@@ -94,24 +97,33 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
         );
     }
 
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        const MerchantFilter = components.Merchant;
+        const isNegated = !!values?.[FILTER_KEYS.MERCHANT_NOT];
+        const value = values?.[isNegated ? FILTER_KEYS.MERCHANT_NOT : FILTER_KEYS.MERCHANT];
+        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
+        return (
+            <MerchantFilter
+                key={`${baseFilterKey}-${merchantOperator}`}
+                baseFilterKey={baseFilterKey}
+                value={value}
+                isNegated={isNegated}
+                merchantOperator={merchantOperator}
+                onChange={onChange}
+            />
+        );
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const TextFilter = components.Text;
-        const isMerchantFilter = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <TextFilter
-                key={isMerchantFilter ? `${baseFilterKey}-${merchantOperator}` : baseFilterKey}
+                key={baseFilterKey}
                 baseFilterKey={baseFilterKey}
                 value={value}
                 isNegated={isNegated}
-                merchantOperator={isMerchantFilter ? merchantOperator : undefined}
-                onChange={(newValue, negated, newMerchantOperator) =>
-                    onChange({
-                        ...getFilterFormValues(baseFilterKey, newValue, negated),
-                        ...(isMerchantFilter ? {[FILTER_KEYS.MERCHANT_OPERATOR]: newMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO} : {}),
-                    })
-                }
+                onChange={(newValue, negated) => onChange(getFilterFormValues(baseFilterKey, newValue, negated))}
             />
         );
     }
@@ -133,4 +145,11 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
 }
 
 export default SearchAdvancedFiltersContent;
-export type {TextInputFilterContentWrapperProps, AmountFilterContentWrapperProps, DateFilterContentWrapperProps, ReportFieldFilterContentWrapperProps, ListFilterContentWrapperProps};
+export type {
+    TextInputFilterContentWrapperProps,
+    MerchantFilterContentWrapperProps,
+    AmountFilterContentWrapperProps,
+    DateFilterContentWrapperProps,
+    ReportFieldFilterContentWrapperProps,
+    ListFilterContentWrapperProps,
+};
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 40d2fc36922a..1cf9f64a4c7e 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,5 +1,4 @@
 import Button from '@components/ButtonComposed';
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -13,7 +12,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
-import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
@@ -28,30 +26,18 @@ type TextInputFilterContentProps = {
     size?: Exclude<ValueOf<typeof CONST.BUTTON_SIZE>, typeof CONST.BUTTON_SIZE.SMALL>;
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
-    merchantOperator?: MerchantMatchType;
-    onChange: (value: string | undefined, isNegated: boolean, merchantOperator?: MerchantMatchType) => void;
+    onChange: (value: string | undefined, isNegated: boolean) => void;
 };
 
 function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
     return !!element && 'isFocused' in element;
 }
 
-function TextInputFilterContent({
-    baseFilterKey,
-    value: initialValue,
-    isNegated: initialIsNegated,
-    autoFocus,
-    size,
-    style,
-    merchantOperator: initialMerchantOperator,
-    onChange,
-}: TextInputFilterContentProps) {
+function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated: initialIsNegated, autoFocus, size, style, onChange}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
@@ -71,7 +57,7 @@ function TextInputFilterContent({
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+            containerStyles={[styles.ph5]}
         />
     );
 
@@ -81,17 +67,8 @@ function TextInputFilterContent({
                 baseFilterKey={baseFilterKey}
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
-                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
             >
-                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
-                    {filterInput}
-                    {shouldShowMerchantMatchType && (
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    )}
-                </View>
+                <View>{filterInput}</View>
             </NegatableFilter>
             <Button
                 style={[styles.ph5, styles.pb5]}
@@ -101,7 +78,7 @@ function TextInputFilterContent({
                     if (error) {
                         return;
                     }
-                    onChange(value, isNegated, shouldShowMerchantMatchType ? merchantOperator : undefined);
+                    onChange(value, isNegated);
                 }}
             >
                 <Button.KeyboardShortcut />
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
new file mode 100644
index 000000000000..6f96b88e3ef0
--- /dev/null
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
@@ -0,0 +1,23 @@
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+import type {MerchantFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+function MerchantFilterContentPopupWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: MerchantFilterContentWrapperProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <MerchantFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            merchantOperator={merchantOperator}
+            style={[styles.pt6]}
+            onChange={onChange}
+        />
+    );
+}
+
+export default MerchantFilterContentPopupWrapper;
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
index cb1b0c44633f..acd3dd16c586 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
@@ -7,7 +7,7 @@ import {isFilterNegatable} from '@libs/SearchQueryUtils';
 
 import React from 'react';
 
-function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, onChange}: TextInputFilterContentWrapperProps) {
     const styles = useThemeStyles();
     const isFilterKeyNegatable = isFilterNegatable(baseFilterKey);
 
@@ -16,7 +16,6 @@ function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, me
             baseFilterKey={baseFilterKey}
             value={value}
             isNegated={isNegated}
-            merchantOperator={merchantOperator}
             style={[isFilterKeyNegatable ? styles.pt6 : styles.pt5]}
             onChange={onChange}
         />
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
index eadcc3d4e5c9..a831b179dfe0 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
@@ -21,6 +21,7 @@ import {View} from 'react-native';
 import AmountFilterContentPopupWrapper from './AmountFilterContentPopupWrapper';
 import DateFilterContentPopupWrapper from './DateFilterContentPopupWrapper';
 import ListFilterContentPopupWrapper from './ListFilterContentPopupWrapper';
+import MerchantFilterContentPopupWrapper from './MerchantFilterContentPopupWrapper';
 import ReportFieldFilterContentPopupWrapper from './ReportFieldFilterContentPopupWrapper';
 import TextInputFilterContentPopupWrapper from './TextInputFilterContentPopupWrapper';
 
@@ -58,6 +59,7 @@ function SearchAdvancedFiltersPopup({queryJSON}: SearchAdvancedFiltersPopupProps
                         baseFilterKey={selectedFilter}
                         components={{
                             List: ListFilterContentPopupWrapper,
+                            Merchant: MerchantFilterContentPopupWrapper,
                             Text: TextInputFilterContentPopupWrapper,
                             Amount: AmountFilterContentPopupWrapper,
                             Date: DateFilterContentPopupWrapper,
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 4b5b2e3796c9..260887576c45 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -365,13 +365,16 @@ function buildAmountFilterQuery(filterKey: SearchAmountFilterKeys, filterValues:
 function buildFilterValuesString(filterName: string, queryFilters: QueryFilter[]) {
     const delimiter = filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD ? ' ' : ',';
     const allowedOps = new Set<string>([CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO]);
+    if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        allowedOps.add(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    }
 
     let filterValueString = '';
     for (const [index, queryFilter] of queryFilters.entries()) {
         const previousValueHasSameOp = allowedOps.has(queryFilter.operator) && queryFilters?.at(index - 1)?.operator === queryFilter.operator;
         const nextValueHasSameOp = allowedOps.has(queryFilter.operator) && queryFilters?.at(index + 1)?.operator === queryFilter.operator;
 
-        // If the previous queryFilter has the same operator (this rule applies only to eq and neq operators) then append the current value
+        // If the previous queryFilter has the same operator and that operator supports comma-delimited values, append the current value
         if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
             filterValueString += `${delimiter}${escapeKeyword(sanitizeSearchValue(queryFilter.value.toString()))}`;
         } else if (index !== 0 && (previousValueHasSameOp || nextValueHasSameOp)) {
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
new file mode 100644
index 000000000000..a0b2c9899f57
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
@@ -0,0 +1,22 @@
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+import type {MerchantFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+function MerchantFilterContentPageWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: MerchantFilterContentWrapperProps) {
+    return (
+        <MerchantFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            merchantOperator={merchantOperator}
+            buttonSize={CONST.BUTTON_SIZE.LARGE}
+            autoFocus
+            onChange={onChange}
+        />
+    );
+}
+
+export default MerchantFilterContentPageWrapper;
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
index 8a31225995c7..c92990946ee5 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
@@ -24,6 +24,7 @@ import {View} from 'react-native';
 import AmountFilterContentPageWrapper from './AmountFilterContentPageWrapper';
 import DateFilterContentPageWrapper from './DateFilterContentPageWrapper';
 import ListFilterContentPageWrapper from './ListFilterContentPageWrapper';
+import MerchantFilterContentPageWrapper from './MerchantFilterContentPageWrapper';
 import ReportFieldFilterContentPageWrapper from './ReportFieldFilterContentPageWrapper';
 import TextInputFilterContentPageWrapper from './TextInputFilterContentPageWrapper';
 
@@ -68,6 +69,7 @@ function SearchAdvancedFiltersContentBase() {
                                 ready={didScreenTransitionEnd}
                                 components={{
                                     List: ListFilterContentPageWrapper,
+                                    Merchant: MerchantFilterContentPageWrapper,
                                     Text: TextInputFilterContentPageWrapper,
                                     Amount: AmountFilterContentPageWrapper,
                                     Date: DateFilterContentPageWrapper,
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
index 60d47b6fb35a..d2b9a605ab27 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
@@ -5,13 +5,12 @@ import CONST from '@src/CONST';
 
 import React from 'react';
 
-function TextInputFilterContentPageWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPageWrapper({baseFilterKey, value, isNegated, onChange}: TextInputFilterContentWrapperProps) {
     return (
         <TextInputFilterContent
             baseFilterKey={baseFilterKey}
             value={value}
             isNegated={isNegated}
-            merchantOperator={merchantOperator}
             autoFocus
             size={CONST.BUTTON_SIZE.LARGE}
             onChange={onChange}
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
new file mode 100644
index 000000000000..fb56e7b1a4a9
--- /dev/null
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -0,0 +1,111 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+
+function renderMerchantFilter(onChange = jest.fn(), merchantOperator = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS) {
+    return {
+        onChange,
+        ...render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    merchantOperator={merchantOperator}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        ),
+    };
+}
+
+describe('MerchantFilterContent', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('keeps the merchant input fixed above the match type options', () => {
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
+
+        fireEvent.changeText(merchantInput, 'Ibis');
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Ibis',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+
+    it('submits the selected Contains operator', () => {
+        const {onChange} = renderMerchantFilter();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const onChange = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        );
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('hides match type controls and uses exact matching when the filter is negated', () => {
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 6e7fce3da3e0..62879fa431a7 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -9,16 +9,15 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn(), hasStoredMerchantOperator = true) {
+function renderDescriptionFilter(onChange = jest.fn()) {
     return {
         onChange,
         ...render(
             <NavigationContainer>
                 <TextInputFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION}
                     value="I"
                     isNegated={false}
-                    merchantOperator={hasStoredMerchantOperator ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : undefined}
                     onChange={onChange}
                 />
             </NavigationContainer>,
@@ -31,66 +30,13 @@ describe('TextInputFilterContent', () => {
         jest.clearAllMocks();
     });
 
-    it('keeps the merchant input fixed above the Rules match type options', () => {
-        // Given a positive Merchant Contains filter using the Rules layout.
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
+    it('submits a generic Description filter with two onChange arguments and no match type selector', () => {
+        const {onChange} = renderDescriptionFilter();
 
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        // When the user edits the input and changes the match type.
-        fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-
-        // Then the input stays mounted with its current value.
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
-        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('Ibis', false, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    });
-
-    it('submits the selected Contains operator from the Rules layout', () => {
-        const {onChange} = renderMerchantFilter();
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {onChange} = renderMerchantFilter(jest.fn(), false);
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    });
-
-    it('hides the merchant match type and omits the operator when the filter is negated', () => {
-        // Given a positive Merchant Contains filter where both match options must be available.
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        // When the user negates the filter because negated Merchant searches only support exact matching.
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
-
-        // Then match options disappear so the UI matches the submitted query.
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
-
-        // When the user confirms the negated filter after match options disappear.
         fireEvent.press(screen.getByText('common.confirm'));
 
-        // Then no Merchant operator is submitted because negated searches only support exact matching.
-        expect(onChange).toHaveBeenCalledWith('I', true, undefined);
+        expect(onChange).toHaveBeenCalledWith('I', false);
+        expect(onChange.mock.calls.at(0)).toHaveLength(2);
     });
 });
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index fb8c09f0e15c..362308c7ec96 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -3514,6 +3514,91 @@ describe('SearchQueryUtils', () => {
         return null;
     }
 
+    describe('merchant multi-value query serialization', () => {
+        test.each(['merchant*:Amazon,Uber', 'merchant:Amazon,Uber'])('preserves array AST for %s', (input) => {
+            const queryJSON = buildSearchQueryJSON(input);
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant filters to be defined');
+            }
+
+            const merchantNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+            if (!merchantNode) {
+                throw new Error('Expected merchant node to be found in AST');
+            }
+
+            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+            expect(merchantNode.right).toEqual(['Amazon', 'Uber']);
+
+            const builtQuery = buildSearchQueryString(queryJSON);
+            const updatedQuery = getQueryWithUpdatedValues(input, true);
+            if (!updatedQuery) {
+                throw new Error('Expected updated query to be defined');
+            }
+
+            expect(updatedQuery).toBe(builtQuery);
+            expect(buildSearchQueryJSON(builtQuery)?.filters).toEqual(queryJSON.filters);
+            expect(buildSearchQueryJSON(updatedQuery)?.filters).toEqual(queryJSON.filters);
+
+            const canonicalQueryJSON = buildSearchQueryJSON(updatedQuery);
+            if (!canonicalQueryJSON?.filters) {
+                throw new Error('Expected canonical merchant filters to be defined');
+            }
+
+            expect(serializeQueryJSONForBackend(canonicalQueryJSON)).toBe(JSON.stringify({...canonicalQueryJSON, status: ''}));
+            expect(getQueryWithUpdatedValues(updatedQuery, true)).toBe(updatedQuery);
+            expect(buildSearchQueryString(buildSearchQueryJSON(updatedQuery))).toBe(updatedQuery);
+        });
+
+        test.each([
+            ['merchant=Amazon,Uber', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, ['Amazon', 'Uber'], 'merchant=Amazon,Uber'],
+            ['-merchant:Amazon,Uber', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, ['Amazon', 'Uber'], '-merchant:Amazon,Uber'],
+            ['merchant*:Amazon', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'Amazon', 'merchant*:Amazon'],
+            ['merchant*:"Amazon,Uber"', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'Amazon,Uber', 'merchant*:"Amazon,Uber"'],
+        ])('keeps merchant operator semantics for %s', (input, operator, value, expectedQuery) => {
+            const queryJSON = buildSearchQueryJSON(input);
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant filters to be defined');
+            }
+
+            const merchantNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+            if (!merchantNode) {
+                throw new Error('Expected merchant node to be found in AST');
+            }
+
+            expect(merchantNode.operator).toBe(operator);
+            expect(merchantNode.right).toEqual(value);
+            const rebuiltQueryString = buildSearchQueryString(queryJSON);
+            expect(rebuiltQueryString).toContain(expectedQuery);
+            expect(buildSearchQueryJSON(rebuiltQueryString)?.filters).toEqual(queryJSON.filters);
+        });
+
+        test('preserves separate merchant contains filters when rebuilding', () => {
+            const queryJSON = buildSearchQueryJSON('merchant*:Amazon merchant*:Uber');
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant query to be defined');
+            }
+
+            expect(queryJSON.filters.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.AND);
+            expect(buildSearchQueryJSON(buildSearchQueryString(queryJSON))?.filters).toEqual(queryJSON.filters);
+        });
+
+        test('keeps category comma lists on the exact operator', () => {
+            const queryJSON = buildSearchQueryJSON('category:Travel,Meals');
+            if (!queryJSON?.filters) {
+                throw new Error('Expected category filters to be defined');
+            }
+
+            const categoryNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY);
+            if (!categoryNode) {
+                throw new Error('Expected category node to be found in AST');
+            }
+
+            expect(categoryNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+            expect(categoryNode.right).toEqual(['Travel', 'Meals']);
+            expect(buildSearchQueryString(queryJSON)).toContain('category:Travel,Meals');
+        });
+    });
+
     describe('applyContainsOperatorToTextFields', () => {
         it('should preserve explicit merchant eq as exact match', () => {
             const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');

From dbb9cc5df6a2c8d475dbdcdc2127ebb4c31ee37e Mon Sep 17 00:00:00 2001
From: "Eugene Voloshchak (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 7 Sep 2026 13:43:26 +0000
Subject: [PATCH 101/781] Offer export templates when a group row is selected
 on a grouped search

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>
---
 src/hooks/useSearchBulkActions.ts             |  4 +-
 .../hooks/useSearchBulkActionsExportTest.ts   | 47 +++++++++++++------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 2e675893b684..8e59f47ffa5d 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -1819,7 +1819,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             const exportOptions: ExportMenuItem[] = [];
 
             const isReportsTab = isExpenseReportType;
-            const includesGroupExport = isGroupedSearch && Object.entries(selectedTransactions).some(([key, selectedTransaction]) => isGroupSelection(key, selectedTransaction));
 
             const canReportBeExported = (report: (typeof selectedReports)[0], exportOption: ValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>) => {
                 if (!report.reportID) {
@@ -2078,7 +2077,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 addSeparatorBefore: true,
             });
 
-            if (!allSelectedAreDeleted && !includesGroupExport) {
+            // A group selection is exported through a query filter (see `addSelectedGroupsFilter`) rather than a list of IDs, so the templates work for it just like they do for an individual selection.
+            if (!allSelectedAreDeleted) {
                 // Builds a single export sub-menu item for a template. `isDefaultTemplate` picks the icon and `addSeparatorBefore` draws the divider at the top of each group.
                 const buildExportOption = (template: ExportTemplate, isDefaultTemplate: boolean, addSeparatorBefore: boolean): ExportMenuItem => {
                     // The basic export is a plain CSV download, so it uses its own handler rather than the template export flow
diff --git a/tests/unit/hooks/useSearchBulkActionsExportTest.ts b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
index 167bb07f9297..9c6e9afa1f48 100644
--- a/tests/unit/hooks/useSearchBulkActionsExportTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
@@ -1218,7 +1218,10 @@ describe('useSearchBulkActions - export options', () => {
         });
     });
 
-    it('hides templates when a full group is selected in an explicitly grouped search', async () => {
+    it('shows templates when a full group is selected in an explicitly grouped search', async () => {
+        // Regression test for https://github.com/Expensify/App/issues/100074: selecting a group row used to leave
+        // "Current view" as the only export option, so the templates were only reachable by ticking every line item
+        // in the group one by one. A group selection exports through a query filter, so the templates apply to it too.
         mockSelectedTransactions = {
             tx1: makeSelectedTransaction({
                 groupKey: `${CONST.SEARCH.GROUP_PREFIX}category`,
@@ -1229,7 +1232,28 @@ describe('useSearchBulkActions - export options', () => {
         const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
 
         await waitFor(() => {
-            expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView']);
+            expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(
+                expect.arrayContaining(['export.currentView', 'Custom template', 'export.expenseLevelExport', 'export.reportLevelExport']),
+            );
+        });
+
+        // The basic export stays hidden on a grouped search because it carries fewer columns than "Current view".
+        expect(getExportOptionTexts(result.current.headerButtonsOptions)).not.toContain('export.basicExport');
+    });
+
+    it('shows templates when a collapsed group is selected before its children have loaded', async () => {
+        // The other selection shape for the same user action: a group selected while collapsed is stored under a
+        // single `group_` stub instead of one entry per child, and it must offer the same templates.
+        mockSelectedTransactions = {
+            [`${CONST.SEARCH.GROUP_PREFIX}category`]: makeSelectedTransaction(),
+        };
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(
+                expect.arrayContaining(['export.currentView', 'Custom template', 'export.expenseLevelExport', 'export.reportLevelExport']),
+            );
         });
     });
 
@@ -1246,16 +1270,12 @@ describe('useSearchBulkActions - export options', () => {
     });
 
     it('keeps the Export entry as a submenu even when only one export option is available', async () => {
-        // Regression test for https://github.com/Expensify/App/issues/98779: a full group selection offers a single
-        // export option ('export.currentView'). While other bulk actions sit alongside it (Hold here), the Export
-        // entry must still open the Export submenu (keeping its generic label and subMenuItems) rather than
-        // collapsing straight into that single option.
+        // Regression test for https://github.com/Expensify/App/issues/98779: a deleted selection on a grouped search
+        // offers a single export option ('export.currentView'). While other bulk actions sit alongside it (Undelete
+        // here), the Export entry must still open the Export submenu (keeping its generic label and subMenuItems)
+        // rather than collapsing straight into that single option.
         mockSelectedTransactions = {
-            tx1: makeSelectedTransaction({
-                groupKey: `${CONST.SEARCH.GROUP_PREFIX}category`,
-                isSelectedViaGroup: true,
-                canHold: true,
-            }),
+            tx1: makeSelectedTransaction({reportID: CONST.REPORT.TRASH_REPORT_ID}),
         };
 
         const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
@@ -1277,10 +1297,7 @@ describe('useSearchBulkActions - export options', () => {
         // arrow leading nowhere, with "Export" kept as a plain dropdown header so the option still has context.
         mockAreAllMatchingItemsSelected = true;
         mockSelectedTransactions = {
-            tx1: makeSelectedTransaction({
-                groupKey: `${CONST.SEARCH.GROUP_PREFIX}category`,
-                isSelectedViaGroup: true,
-            }),
+            tx1: makeSelectedTransaction({reportID: CONST.REPORT.TRASH_REPORT_ID}),
         };
 
         const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});

From 7fb75a9016f0731132d433aada05aee3445dd704 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 03:14:53 +0700
Subject: [PATCH 102/781] refactor(search): isolate merchant filter chip popup

---
 .../FilterDropdowns/MerchantFilterPopup.tsx   |  99 ++++++++++++++++
 .../FilterDropdowns/TextFilterPopup.tsx       |  31 +----
 .../SearchPageHeader/useSearchFiltersBar.tsx  |  13 +++
 tests/ui/MerchantFilterPopupTest.tsx          | 107 ++++++++++++++++++
 tests/ui/TextFilterPopupTest.tsx              |  86 ++++----------
 5 files changed, 243 insertions(+), 93 deletions(-)
 create mode 100644 src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
 create mode 100644 tests/ui/MerchantFilterPopupTest.tsx

diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
new file mode 100644
index 000000000000..bdf6574e9307
--- /dev/null
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -0,0 +1,99 @@
+/**
+ * Edits the Merchant filter value and match type from its search filter chip.
+ */
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
+import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
+import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
+import TextInput from '@components/TextInput';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getFilterFormValues} from '@libs/SearchQueryUtils';
+import {getFilterNegatableValue} from '@libs/SearchUIUtils';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+import type {PopoverComponentProps} from './FilterPopupButton';
+
+import BasePopup from './BasePopup';
+
+type MerchantFilterPopupProps = {
+    /** The Merchant filter key. */
+    baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    /** The current search filter form values. */
+    values: Partial<SearchAdvancedFiltersForm> | undefined;
+    /** The translated filter label. */
+    label: string;
+    /** Closes the filter popup. */
+    closeOverlay: PopoverComponentProps['closeOverlay'];
+    /** Applies the updated Merchant filter values. */
+    updateFilterForm: (value: Partial<SearchAdvancedFiltersForm>) => void;
+};
+
+function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
+    const styles = useThemeStyles();
+
+    const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
+    const [isNegated, setIsNegated] = useState(initialIsNegated);
+    const [value, setValue] = useState(initialValue);
+    const shouldShowMerchantMatchType = !isNegated;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+
+    const error = useTextFilterValidation(baseFilterKey, value);
+    const filterInput = (
+        <TextInput
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
+
+    const applyChanges = () => {
+        if (error) {
+            return;
+        }
+        updateFilterForm({
+            ...getFilterFormValues(baseFilterKey, value, isNegated),
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+        });
+        closeOverlay();
+    };
+
+    return (
+        <BasePopup
+            label={label}
+            onApply={applyChanges}
+            applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+        >
+            <NegatableFilter
+                baseFilterKey={baseFilterKey}
+                isNegated={isNegated}
+                onNegationChange={setIsNegated}
+            >
+                {shouldShowMerchantMatchType ? (
+                    <View>
+                        {filterInput}
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    </View>
+                ) : (
+                    filterInput
+                )}
+            </NegatableFilter>
+        </BasePopup>
+    );
+}
+
+export default MerchantFilterPopup;
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 50be29f732eb..09968781f5a5 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -1,4 +1,3 @@
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -10,18 +9,16 @@ import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
-import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
-import {View} from 'react-native';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
 import BasePopup from './BasePopup';
 
 type TextFilterPopupProps = {
-    baseFilterKey: Exclude<SearchTextFilterKeys, typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT | ReportFieldTextKey>;
+    baseFilterKey: Exclude<SearchTextFilterKeys, typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT | ReportFieldTextKey>;
     values: Partial<SearchAdvancedFiltersForm> | undefined;
     label: string;
     closeOverlay: PopoverComponentProps['closeOverlay'];
@@ -34,9 +31,6 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [value, setValue] = useState(initialValue);
-    const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
-    const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
 
     const error = useTextFilterValidation(baseFilterKey, value);
     const filterInput = (
@@ -48,7 +42,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+            containerStyles={[styles.ph5]}
         />
     );
 
@@ -56,12 +50,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
         if (error) {
             return;
         }
-        updateFilterForm({
-            ...getFilterFormValues(baseFilterKey, value, isNegated),
-            ...(isMerchantFilter && {
-                [FILTER_KEYS.MERCHANT_OPERATOR]: shouldShowMerchantMatchType ? merchantOperator : CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            }),
-        });
+        updateFilterForm(getFilterFormValues(baseFilterKey, value, isNegated));
         closeOverlay();
     };
 
@@ -76,17 +65,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                {shouldShowMerchantMatchType ? (
-                    <View>
-                        {filterInput}
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    </View>
-                ) : (
-                    filterInput
-                )}
+                {filterInput}
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
index ecfbbd72163c..8caddba0b7b5 100644
--- a/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
@@ -2,6 +2,7 @@ import {ListFilterHeightContextProvider} from '@components/Search/FilterComponen
 import AmountPopup from '@components/Search/FilterDropdowns/AmountPopup';
 import type {PopoverComponentProps} from '@components/Search/FilterDropdowns/FilterPopupButton';
 import ListPopup from '@components/Search/FilterDropdowns/ListPopup';
+import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilterPopup';
 import ReportFieldPopup from '@components/Search/FilterDropdowns/ReportFieldPopup';
 import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
 import useUpdateFilterQuery from '@components/Search/hooks/useUpdateFilterQuery';
@@ -112,6 +113,18 @@ function FilterPopup({baseFilterKey, searchAdvancedFiltersForm, closeOverlay, se
         );
     }
 
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        return (
+            <MerchantFilterPopup
+                baseFilterKey={baseFilterKey}
+                values={searchAdvancedFiltersForm}
+                closeOverlay={closeOverlay}
+                label={label}
+                updateFilterForm={closeModalAndUpdateFilterForm}
+            />
+        );
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         return (
             <TextFilterPopup
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
new file mode 100644
index 000000000000..a69b136114c6
--- /dev/null
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -0,0 +1,107 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilterPopup';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
+
+function renderMerchantPopup(hasStoredMerchantOperator = true, values: Partial<SearchAdvancedFiltersForm> = {}) {
+    const closeOverlay = jest.fn();
+    const updateFilterForm = jest.fn<void, [Partial<SearchAdvancedFiltersForm>]>();
+
+    const rendered = render(
+        <NavigationContainer>
+            <MerchantFilterPopup
+                baseFilterKey={FILTER_KEYS.MERCHANT}
+                values={{
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
+                    ...values,
+                }}
+                label="common.merchant"
+                closeOverlay={closeOverlay}
+                updateFilterForm={updateFilterForm}
+            />
+        </NavigationContainer>,
+    );
+
+    return {closeOverlay, updateFilterForm, ...rendered};
+}
+
+describe('MerchantFilterPopup', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('shows and submits the Merchant match type', () => {
+        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
+
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the exact operator and edited value when reopened', () => {
+        const first = renderMerchantPopup();
+        fireEvent.changeText(screen.getByLabelText('common.merchant'), 'Ibis');
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('common.apply'));
+        const savedValues = first.updateFilterForm.mock.calls.at(0)?.at(0);
+        first.unmount();
+
+        const reopened = renderMerchantPopup(true, savedValues);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('common.apply'));
+        expect(reopened.updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Ibis',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {updateFilterForm} = renderMerchantPopup(false);
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('hides the match type and submits exact matching for a negated Merchant', () => {
+        const {updateFilterForm} = renderMerchantPopup();
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 9da812158edc..d1b9872b9ae1 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -2,7 +2,6 @@ import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
 
-import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
@@ -10,78 +9,31 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup(hasStoredMerchantOperator = true) {
-    const closeOverlay = jest.fn();
-    const updateFilterForm = jest.fn();
-
-    render(
-        <NavigationContainer>
-            <TextFilterPopup
-                baseFilterKey={FILTER_KEYS.MERCHANT}
-                values={{
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
-                }}
-                label="common.merchant"
-                closeOverlay={closeOverlay}
-                updateFilterForm={updateFilterForm}
-            />
-        </NavigationContainer>,
-    );
-
-    return {closeOverlay, updateFilterForm};
-}
-
 describe('TextFilterPopup', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('shows and submits the Merchant match type', () => {
-        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-        expect(closeOverlay).toHaveBeenCalledTimes(1);
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {updateFilterForm} = renderMerchantPopup(false);
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('hides the match type and submits exact matching for a negated Merchant', () => {
-        const {updateFilterForm} = renderMerchantPopup();
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+    it.each([FILTER_KEYS.DESCRIPTION, FILTER_KEYS.TITLE])('applies the %s text filter without Merchant fields', (baseFilterKey) => {
+        const closeOverlay = jest.fn();
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <TextFilterPopup
+                    baseFilterKey={baseFilterKey}
+                    values={{[baseFilterKey]: 'Office'}}
+                    label="common.description"
+                    closeOverlay={closeOverlay}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
 
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-
+        fireEvent.changeText(screen.getByLabelText('common.description'), 'Supplies');
+        expect(screen.queryByText('search.filters.filterType.is.negative')).not.toBeOnTheScreen();
         fireEvent.press(screen.getByText('common.apply'));
 
         expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: undefined,
-            [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            [baseFilterKey]: 'Supplies',
+            [`${baseFilterKey}Not`]: undefined,
         });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 });

From 631a35d41d6f0ff12654dfd414083bbce1d64384 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 03:26:25 +0700
Subject: [PATCH 103/781] refactor(search): remove redundant text filter
 wrapper

---
 .../TextInputFilterContent.tsx                | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 1cf9f64a4c7e..bf92c39e5811 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -38,29 +38,11 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
+
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
 
-    const filterInput = (
-        <TextInput
-            ref={(ref) => {
-                if (!autoFocus || !isTextInput(ref)) {
-                    return;
-                }
-                inputCallbackRef(ref);
-            }}
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
-        />
-    );
-
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
             <NegatableFilter
@@ -68,7 +50,22 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                <View>{filterInput}</View>
+                <TextInput
+                    ref={(ref) => {
+                        if (!autoFocus || !isTextInput(ref)) {
+                            return;
+                        }
+                        inputCallbackRef(ref);
+                    }}
+                    placeholder={label}
+                    value={value}
+                    errorText={error}
+                    hasError={!!error}
+                    onChangeText={setValue}
+                    accessibilityLabel={label}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.ph5]}
+                />
             </NegatableFilter>
             <Button
                 style={[styles.ph5, styles.pb5]}

From 23b9ecc551ab609fc1fd3734690f11d07cffcbe9 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 11:15:14 +0700
Subject: [PATCH 104/781] fix(search): preserve mixed merchant predicates in
 filter updates

---
 .../Search/hooks/useUpdateFilterQuery.tsx     |  8 +-
 src/libs/SearchQueryUtils.ts                  | 18 ++++-
 src/pages/Search/SearchColumnsPage.tsx        |  1 +
 tests/ui/SearchColumnsPageTest.tsx            | 53 +++++++++++++
 tests/unit/Search/SearchQueryUtilsTest.ts     | 79 +++++++++++++++++++
 tests/unit/hooks/useUpdateFilterQuery.test.ts | 77 ++++++++++++++++++
 6 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 tests/ui/SearchColumnsPageTest.tsx
 create mode 100644 tests/unit/hooks/useUpdateFilterQuery.test.ts

diff --git a/src/components/Search/hooks/useUpdateFilterQuery.tsx b/src/components/Search/hooks/useUpdateFilterQuery.tsx
index 1a1e171dc90d..97a8b54ceae5 100644
--- a/src/components/Search/hooks/useUpdateFilterQuery.tsx
+++ b/src/components/Search/hooks/useUpdateFilterQuery.tsx
@@ -38,13 +38,7 @@ function useUpdateFilterQuery(queryJSON: SearchQueryJSON | undefined) {
     }
 
     function setFilterQueryParams(values: Partial<SearchAdvancedFiltersForm>) {
-        const queryString =
-            buildFilterQueryWithSortDefaults(
-                values,
-                {view: searchAdvancedFiltersForm.view, groupBy: searchAdvancedFiltersForm.groupBy},
-                {sortBy: queryJSON?.sortBy, sortOrder: queryJSON?.sortOrder},
-                policies,
-            ) ?? '';
+        const queryString = buildFilterQueryWithSortDefaults(values, {view: searchAdvancedFiltersForm.view, groupBy: searchAdvancedFiltersForm.groupBy}, queryJSON ?? {}, policies) ?? '';
         if (!queryString) {
             return;
         }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 260887576c45..5e9a7a8a6f00 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -902,6 +902,8 @@ type BuildQueryStringOptions = {
     sortBy?: string;
     sortOrder?: string;
     limit?: number;
+    /** Original query filters, including predicates that cannot fit in a single form field. */
+    flatFilters?: QueryFilters;
 };
 
 /**
@@ -940,6 +942,15 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
+    const merchantFilters =
+        options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
+    const lastMerchantFilter = merchantFilters.at(-1);
+    // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
+    const shouldPreserveMerchantFilters =
+        merchantFilters.length > 1 &&
+        supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
+        getMerchantOperator(merchantOperator) ===
+            (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1000,6 +1011,10 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     if (filterKey === FILTER_KEYS.MERCHANT && !isNegated) {
+                        if (shouldPreserveMerchantFilters) {
+                            return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
+                        }
+
                         operator =
                             getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                                 ? EXPLICIT_EQUAL_TO_OPERATOR
@@ -2462,7 +2477,7 @@ function shouldResetSortForViewChange({newView, oldView, groupBy}: {newView: str
 function buildFilterQueryWithSortDefaults(
     filterValues: Partial<SearchAdvancedFiltersForm>,
     previousState: {view?: string; groupBy?: string},
-    currentQueryOptions: {sortBy?: string; sortOrder?: string},
+    currentQueryOptions: BuildQueryStringOptions,
     policies?: OnyxCollection<OnyxTypes.Policy>,
 ): string | undefined {
     const resetSort = shouldResetSort({
@@ -2481,6 +2496,7 @@ function buildFilterQueryWithSortDefaults(
     const queryString = buildQueryStringFromFilterFormValues(filterValues, {
         sortBy: resetSort || resetSortForViewChange ? undefined : currentQueryOptions.sortBy,
         sortOrder: resetSort || resetSortForViewChange ? undefined : currentQueryOptions.sortOrder,
+        flatFilters: currentQueryOptions.flatFilters,
     });
 
     if (!resetSort && !resetSortForViewChange) {
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index d3f35d34a0e1..ffedaab389ea 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -63,6 +63,7 @@ function SearchColumnsPage() {
         const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters, {
             sortBy: currentQueryJSON?.sortBy,
             sortOrder: currentQueryJSON?.sortOrder,
+            flatFilters: currentQueryJSON?.flatFilters,
         });
 
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
diff --git a/tests/ui/SearchColumnsPageTest.tsx b/tests/ui/SearchColumnsPageTest.tsx
new file mode 100644
index 000000000000..8805c241d71c
--- /dev/null
+++ b/tests/ui/SearchColumnsPageTest.tsx
@@ -0,0 +1,53 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import type ColumnsSettingsList from '@components/ColumnsSettingsList';
+import MockText from '@components/Text';
+
+import useOnyx from '@hooks/useOnyx';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {buildFilterFormValuesFromQuery, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SearchColumnsPage from '@src/pages/Search/SearchColumnsPage';
+import SCREENS from '@src/SCREENS';
+
+import type {ComponentProps} from 'react';
+
+const mockGetRootState = jest.fn();
+
+jest.mock('@hooks/useOnyx', () => jest.fn());
+jest.mock('@libs/Navigation/Navigation', () => ({__esModule: true, default: {navigate: jest.fn()}}));
+jest.mock('@libs/Navigation/navigationRef', () => ({__esModule: true, default: {getRootState: () => mockGetRootState() as unknown}}));
+jest.mock('@components/ColumnsSettingsList', () => ({onSave}: Pick<ComponentProps<typeof ColumnsSettingsList>, 'onSave'>) => (
+    <MockText onPress={() => onSave(['merchant', 'amount'])}>Save columns</MockText>
+));
+
+describe('SearchColumnsPage', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('keeps mixed Merchant predicates when saving different columns', () => {
+        const input = 'merchant=I merchant*:I';
+        const queryJSON = buildSearchQueryJSON(input);
+        if (!queryJSON) {
+            throw new Error('Invalid test query');
+        }
+
+        const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+        (jest.mocked(useOnyx) as jest.Mock).mockReturnValue([form]);
+        mockGetRootState.mockReturnValue({
+            routes: [{name: NAVIGATORS.TAB_NAVIGATOR, params: {screen: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, params: {screen: SCREENS.SEARCH.ROOT, params: {q: input}}}}],
+        });
+
+        render(<SearchColumnsPage />);
+        fireEvent.press(screen.getByText('Save columns'));
+
+        const [route] = jest.mocked(Navigation.navigate).mock.calls.at(-1) ?? [];
+        const updatedQuery = buildSearchQueryJSON(new URL(route ?? '', 'https://example.com').searchParams.get('q') ?? '');
+
+        expect(updatedQuery?.flatFilters).toEqual(queryJSON.flatFilters);
+        expect(updatedQuery?.columns).toEqual(['merchant', 'amount']);
+    });
+});
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 362308c7ec96..795065ebd8a7 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2595,6 +2595,85 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterQueryWithSortDefaults', () => {
+        describe('Merchant predicates', () => {
+            function updateQuery(input: string, updates: Partial<SearchAdvancedFiltersForm>) {
+                const originalQuery = buildSearchQueryJSON(input);
+                if (!originalQuery) {
+                    throw new Error('Invalid test query');
+                }
+
+                const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                const result = buildFilterQueryWithSortDefaults({...form, ...updates}, originalQuery, originalQuery);
+                const updatedQuery = buildSearchQueryJSON(result ?? '');
+                if (!updatedQuery) {
+                    throw new Error('Invalid updated query');
+                }
+
+                return {originalQuery, updatedQuery};
+            }
+
+            test.each([
+                'merchant="Coffee Shop" merchant*:Coffee',
+                'merchant*:Coffee merchant="Coffee Shop"',
+                'merchant*:Tea merchant="Coffee Shop"',
+                'merchant="Coffee Shop" merchant:Coffee',
+                'merchant="Coffee Shop",Uber merchant*:Coffee,Tea',
+                'merchant="Coffee, Shop" merchant*:"Coffee, Shop"',
+                'merchant=I merchant*:I merchant*:g',
+                'merchant=I merchant*:I -merchant:Ig',
+                'merchant*:Coffee merchant*:Shop',
+                'merchant=I',
+                'merchant*:I',
+                '-merchant:I',
+            ])('preserves Merchant predicates when changing Currency: %s', (input) => {
+                const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters.filter((filter) => filter.key === 'merchant'));
+                expect(updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
+            });
+
+            test.each<Partial<SearchAdvancedFiltersForm>>([{description: 'Lunch'}, {dateAfter: '2026-01-01'}, {groupBy: CONST.SEARCH.GROUP_BY.MONTH, view: CONST.SEARCH.VIEW.BAR}])(
+                'preserves Merchant predicates when changing other filters: %j',
+                (updates) => {
+                    const {originalQuery, updatedQuery} = updateQuery('merchant=I merchant*:I', updates);
+
+                    expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters);
+                },
+            );
+
+            test('preserves Merchant predicates through consecutive form updates', () => {
+                const firstUpdate = updateQuery('merchant=I merchant*:I', {description: 'Lunch'});
+                const secondUpdate = updateQuery(buildSearchQueryString(firstUpdate.updatedQuery), {currency: ['USD']});
+
+                expect(secondUpdate.updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(firstUpdate.originalQuery.flatFilters);
+                expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
+            });
+
+            test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
+                {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant=I'},
+                {updates: {merchant: undefined}, expected: ''},
+                {updates: {merchant: undefined, merchantNot: 'I'}, expected: '-merchant:I'},
+                {updates: {type: CONST.SEARCH.DATA_TYPES.CHAT}, expected: ''},
+            ])('replaces or removes Merchant predicates on an explicit change: %j', ({updates, expected}) => {
+                const {updatedQuery} = updateQuery('merchant=I merchant*:I', updates);
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(buildSearchQueryJSON(expected)?.flatFilters);
+            });
+
+            test('clears all Merchant predicates when resetting advanced filters', () => {
+                const queryJSON = buildSearchQueryJSON('merchant=I merchant*:I');
+                if (!queryJSON) {
+                    throw new Error('Invalid test query');
+                }
+
+                const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+                const {updatedQuery} = updateQuery('merchant=I merchant*:I', getAdvancedFiltersToReset(form));
+
+                expect(updatedQuery.flatFilters).toEqual([]);
+            });
+        });
+
         test('groupBy change replaces stale sortBy with new default', () => {
             const result = buildFilterQueryWithSortDefaults(
                 {type: 'expense', groupBy: CONST.SEARCH.GROUP_BY.MONTH, view: CONST.SEARCH.VIEW.BAR},
diff --git a/tests/unit/hooks/useUpdateFilterQuery.test.ts b/tests/unit/hooks/useUpdateFilterQuery.test.ts
new file mode 100644
index 000000000000..897292002e81
--- /dev/null
+++ b/tests/unit/hooks/useUpdateFilterQuery.test.ts
@@ -0,0 +1,77 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useUpdateFilterQuery from '@components/Search/hooks/useUpdateFilterQuery';
+
+import useOnyx from '@hooks/useOnyx';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {buildFilterFormValuesFromQuery, buildSearchQueryJSON, getAdvancedFiltersToReset} from '@libs/SearchQueryUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
+
+jest.mock('@hooks/useOnyx', () => jest.fn());
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {setParams: jest.fn()},
+}));
+
+describe('useUpdateFilterQuery', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    function setup() {
+        const queryJSON = buildSearchQueryJSON('merchant=I merchant*:I');
+        if (!queryJSON) {
+            throw new Error('Invalid test query');
+        }
+
+        const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : {}]);
+
+        return {...renderHook(() => useUpdateFilterQuery(queryJSON)), form, queryJSON};
+    }
+
+    function getNavigatedQuery() {
+        const [params] = jest.mocked(Navigation.setParams).mock.calls.at(-1) ?? [];
+        if (!params || !('q' in params) || typeof params.q !== 'string') {
+            throw new Error('Expected navigation to a search query');
+        }
+
+        return buildSearchQueryJSON(params.q);
+    }
+
+    test.each(['updateFilterQueryParams', 'setFilterQueryParams'] as const)('retains mixed Merchant predicates through %s', (method) => {
+        const {result, form, queryJSON} = setup();
+        const updates: Partial<SearchAdvancedFiltersForm> = {currency: ['VND']};
+
+        act(() => {
+            result.current[method](method === 'setFilterQueryParams' ? {...form, ...updates} : updates);
+        });
+
+        expect(getNavigatedQuery()?.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(queryJSON.flatFilters);
+        expect(getNavigatedQuery()?.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'VND'}]});
+    });
+
+    test('removes all positive Merchant predicates when clearing the Merchant chip', () => {
+        const {result} = setup();
+
+        act(() => {
+            result.current.updateFilterQueryParams({merchant: undefined});
+        });
+
+        expect(getNavigatedQuery()?.flatFilters).toEqual([]);
+    });
+
+    test('removes all Merchant predicates when resetting advanced filters', () => {
+        const {result, form} = setup();
+
+        act(() => {
+            result.current.setFilterQueryParams(getAdvancedFiltersToReset(form));
+        });
+
+        expect(getNavigatedQuery()?.flatFilters).toEqual([]);
+    });
+});

From 4b7c2342d9e0556d9eeac6fb7dbea908342ed2f5 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 12:25:07 +0700
Subject: [PATCH 105/781] fix(search): preserve merchant lists through filter
 updates

---
 src/libs/SearchQueryUtils.ts              |  2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 5e9a7a8a6f00..f3ed8985bf77 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -947,7 +947,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     const lastMerchantFilter = merchantFilters.at(-1);
     // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
     const shouldPreserveMerchantFilters =
-        merchantFilters.length > 1 &&
+        merchantFilters.length > 0 &&
         supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
         getMerchantOperator(merchantOperator) ===
             (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 795065ebd8a7..2feca9114bcf 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2622,6 +2622,12 @@ describe('SearchQueryUtils', () => {
                 'merchant=I merchant*:I merchant*:g',
                 'merchant=I merchant*:I -merchant:Ig',
                 'merchant*:Coffee merchant*:Shop',
+                'merchant*:Amazon,Uber',
+                'merchant:Amazon,Uber',
+                'merchant=Amazon,Uber',
+                'merchant*:"Amazon,Uber"',
+                'merchant="Amazon,Uber"',
+                'merchant*:"Coffee, Shop",Uber',
                 'merchant=I',
                 'merchant*:I',
                 '-merchant:I',
@@ -2649,6 +2655,15 @@ describe('SearchQueryUtils', () => {
                 expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
             });
 
+            test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
+                {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchant: undefined}, expected: ''},
+            ])('replaces or removes a Merchant list on an explicit change: %j', ({updates, expected}) => {
+                const {updatedQuery} = updateQuery('merchant*:Amazon,Uber', updates);
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(buildSearchQueryJSON(expected)?.flatFilters);
+            });
+
             test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
                 {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
                 {updates: {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant=I'},

From 7b33baff27d302110625b06bc05b92a44fb476d1 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 13:10:02 +0700
Subject: [PATCH 106/781] fix(search): retain merchant lists when changing
 match type

---
 src/libs/SearchQueryUtils.ts              | 10 ++++++-
 tests/unit/Search/SearchQueryUtilsTest.ts | 33 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index f3ed8985bf77..9beff22322ac 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -945,10 +945,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     const merchantFilters =
         options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
     const lastMerchantFilter = merchantFilters.at(-1);
+    const isMerchantValueUnchanged = supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
     // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
     const shouldPreserveMerchantFilters =
         merchantFilters.length > 0 &&
-        supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
+        isMerchantValueUnchanged &&
         getMerchantOperator(merchantOperator) ===
             (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
     const filtersString: string[] = [];
@@ -1015,6 +1016,13 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                             return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
                         }
 
+                        if (lastMerchantFilter && isMerchantValueUnchanged) {
+                            // The form string cannot distinguish a list from a Merchant name containing a comma.
+                            const updatedOperator = getMerchantOperator(merchantOperator);
+                            const updatedFilters = lastMerchantFilter.filters.map((filter) => ({...filter, operator: updatedOperator}));
+                            return buildFilterValuesString(FILTER_KEYS.MERCHANT, updatedFilters).trim();
+                        }
+
                         operator =
                             getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                                 ? EXPLICIT_EQUAL_TO_OPERATOR
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2feca9114bcf..d8e7cc079d13 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -50,6 +50,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Connections} from '@src/types/onyx/Policy';
 
@@ -2655,8 +2656,40 @@ describe('SearchQueryUtils', () => {
                 expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
             });
 
+            test.each<{input: string; operator: MerchantMatchType; expectedValue: string | string[]}>([
+                {input: 'merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
+                {input: 'merchant:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant*:"I,Ig"', operator: 'eq', expectedValue: 'I,Ig'},
+                {input: 'merchant="I,Ig"', operator: 'contains', expectedValue: 'I,Ig'},
+                {input: 'merchant*:"Coffee, Shop",Uber', operator: 'eq', expectedValue: ['Coffee, Shop', 'Uber']},
+                {input: 'merchant="Coffee, Shop",Uber', operator: 'contains', expectedValue: ['Coffee, Shop', 'Uber']},
+                {input: 'merchant=I merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant*:I merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
+            ])('preserves Merchant values when changing only the match type: %j', ({input, operator, expectedValue}) => {
+                const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
+
+                expect(updatedQuery.filters).toEqual({operator, left: 'merchant', right: expectedValue});
+            });
+
+            test('keeps a Merchant list through successive match type and Currency changes without mutating the original query', () => {
+                const {originalQuery, updatedQuery} = updateQuery('merchant*:I,Ig', {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
+                const currencyUpdate = updateQuery(buildSearchQueryString(updatedQuery), {currency: ['USD']});
+
+                expect(originalQuery.filters).toEqual({operator: 'contains', left: 'merchant', right: ['I', 'Ig']});
+                expect(currencyUpdate.updatedQuery.flatFilters).toContainEqual({
+                    key: 'merchant',
+                    filters: [
+                        {operator: 'eq', value: 'I'},
+                        {operator: 'eq', value: 'Ig'},
+                    ],
+                });
+                expect(currencyUpdate.updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
+            });
+
             test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
                 {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchant: 'I,Ig', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant="I,Ig"'},
                 {updates: {merchant: undefined}, expected: ''},
             ])('replaces or removes a Merchant list on an explicit change: %j', ({updates, expected}) => {
                 const {updatedQuery} = updateQuery('merchant*:Amazon,Uber', updates);

From 34585b3e7fe50ebb0471abbb1d5975a4e6a22d8c Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 8 Sep 2026 23:01:05 +0700
Subject: [PATCH 107/781] refactor: thread hasCompletedGuidedSetupFlow through
 navigateToConciergeChat

---
 src/DeepLinkHandler.tsx                       |  2 +
 .../HTMLRenderers/ConciergeLinkRenderer.tsx   |  8 ++-
 src/components/SettlementButton/index.tsx     |  8 ++-
 .../SidePanelButton/index.native.tsx          |  8 ++-
 .../WalletStatementModal/index.native.tsx     |  8 ++-
 src/components/WalletStatementModal/index.tsx | 10 +--
 .../walletNavigationUtils.ts                  |  3 +-
 .../useOpenConciergeAnywhere/index.native.tsx |  8 ++-
 src/libs/actions/Link.ts                      |  3 +-
 src/libs/actions/Report/index.ts              | 10 ++-
 src/pages/ConciergePage.tsx                   | 19 +++--
 .../NonUSD/Finish/index.tsx                   |  8 ++-
 .../ConnectBankAccount/ConnectBankAccount.tsx |  8 ++-
 .../components/FinishChatCard.tsx             |  7 +-
 .../USD/KYBDocuments/index.tsx                |  7 +-
 .../items/UnlockBankAccount.tsx               |  8 ++-
 src/pages/inbox/ReportNavigateAwayHandler.tsx | 20 +++++-
 src/pages/settings/AboutPage/AboutPage.tsx    | 10 +--
 .../BillingBanner/PreTrialBillingBanner.tsx   |  4 +-
 .../SubscriptionSettings/index.tsx            |  8 ++-
 .../Wallet/PersonalCards/AddNewCardPage.tsx   |  8 ++-
 .../settings/Wallet/WalletPage/index.tsx      |  8 ++-
 .../WorkspaceMoreFeaturesPage/index.tsx       | 10 +--
 .../WorkspaceCompanyCardsFeedPendingPage.tsx  |  8 ++-
 .../addNew/DynamicAddNewCardPage.tsx          |  8 ++-
 .../CopyPolicySettingsProgressModal.tsx       |  8 ++-
 .../expensifyCard/WorkspaceCardsListLabel.tsx |  4 +-
 .../workflows/tabs/WorkflowsPaymentsTab.tsx   | 10 +--
 tests/actions/ReportTest.ts                   | 70 ++++++++++++-------
 29 files changed, 199 insertions(+), 102 deletions(-)

diff --git a/src/DeepLinkHandler.tsx b/src/DeepLinkHandler.tsx
index f674b3fe6f44..695d29284bcb 100644
--- a/src/DeepLinkHandler.tsx
+++ b/src/DeepLinkHandler.tsx
@@ -112,6 +112,7 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                         conciergeReportID,
                         introSelected,
                         guidedSetupAndTourStatus?.isSelfTourViewed,
+                        guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
                         betas,
                         session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
                     );
@@ -155,6 +156,7 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                 conciergeReportID,
                 introSelected,
                 guidedSetupAndTourStatus?.isSelfTourViewed,
+                guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
                 betas,
                 session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
             );
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
index b40a24d77316..8326127435e2 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
@@ -14,7 +14,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {StyleProp, TextStyle} from 'react-native';
 import type {CustomRendererProps, RenderersProps, TPhrasing, TText} from 'react-native-render-html';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 import {TNodeChildrenRenderer, useRendererProps} from 'react-native-render-html';
 
@@ -35,7 +35,9 @@ function ConciergeLinkRenderer({tnode, style}: ConciergeLinkRendererProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const {onPress: onPressFromProps} = useRendererProps<ConciergeLinkRenderersProps, 'concierge-link'>('concierge-link') ?? {};
 
@@ -44,7 +46,7 @@ function ConciergeLinkRenderer({tnode, style}: ConciergeLinkRendererProps) {
      */
     const navigateToConciergeChat = () => {
         onPressFromProps?.();
-        navigateToConciergeChatAction(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+        navigateToConciergeChatAction(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
     };
 
     // Define link style based on context
diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx
index 5d69422a4bfc..104fa67fb598 100644
--- a/src/components/SettlementButton/index.tsx
+++ b/src/components/SettlementButton/index.tsx
@@ -54,7 +54,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {TupleToUnion} from 'type-fest';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import truncate from 'lodash/truncate';
 import React, {useContext} from 'react';
 import {View} from 'react-native';
@@ -155,7 +155,9 @@ function SettlementButton({
         !lastPaymentMethod;
     const {isBetaEnabled} = usePermissions();
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
 
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const delegateAccountID = useDelegateAccountID();
@@ -199,7 +201,7 @@ function SettlementButton({
                     return;
                 }
                 pressLockedBankAccount(policy?.achAccount?.bankAccountID, translate, conciergeReportID, delegateAccountID);
-                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
             });
             return true;
         }
diff --git a/src/components/SidePanel/SidePanelButton/index.native.tsx b/src/components/SidePanel/SidePanelButton/index.native.tsx
index 600318912567..ad97a9096ccc 100644
--- a/src/components/SidePanel/SidePanelButton/index.native.tsx
+++ b/src/components/SidePanel/SidePanelButton/index.native.tsx
@@ -14,7 +14,7 @@ import {navigateToConciergeChat} from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 
 import type SidePanelButtonProps from './types';
@@ -27,7 +27,9 @@ function SidePanelButton({style}: SidePanelButtonProps) {
     const {ConciergeAvatar} = useMemoizedLazyExpensifyIcons(['ConciergeAvatar']);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [betas] = useOnyx(ONYXKEYS.BETAS);
 
     if (shouldHideHelpButton) {
@@ -40,7 +42,7 @@ function SidePanelButton({style}: SidePanelButtonProps) {
                 sentryLabel={CONST.SENTRY_LABEL.SIDE_PANEL.HELP}
                 accessibilityLabel={translate('common.help')}
                 style={[styles.flexRow, styles.touchableButtonImage, style]}
-                onPress={() => navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas)}
+                onPress={() => navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas)}
             >
                 <Icon
                     src={ConciergeAvatar}
diff --git a/src/components/WalletStatementModal/index.native.tsx b/src/components/WalletStatementModal/index.native.tsx
index 38df1faf9fc1..29a034aa0c3d 100644
--- a/src/components/WalletStatementModal/index.native.tsx
+++ b/src/components/WalletStatementModal/index.native.tsx
@@ -9,7 +9,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {WebViewMessageEvent, WebViewNavigation} from 'react-native-webview';
 import type {ValueOf} from 'type-fest';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useRef} from 'react';
 import {StyleSheet, View} from 'react-native';
 import {WebView} from 'react-native-webview';
@@ -27,7 +27,9 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [betas] = useOnyx(ONYXKEYS.BETAS);
 
     const webViewRef = useRef<WebView>(null);
@@ -51,7 +53,7 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
         if (!webViewRef.current || !parsedData) {
             return;
         }
-        handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, betas, parsedData.type, parsedData.url);
+        handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, parsedData.type, parsedData.url);
     };
 
     return (
diff --git a/src/components/WalletStatementModal/index.tsx b/src/components/WalletStatementModal/index.tsx
index a6639e3d0df1..55ea7f4ec7b7 100644
--- a/src/components/WalletStatementModal/index.tsx
+++ b/src/components/WalletStatementModal/index.tsx
@@ -6,7 +6,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {StyleSheet, View} from 'react-native';
 
@@ -22,7 +22,9 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
 
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const navigateRef = useRef<(event: MessageEvent<WalletStatementMessage>) => void>(null);
 
@@ -33,9 +35,9 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
         (event: MessageEvent<WalletStatementMessage>) => {
             const {data} = event;
             const {type, url} = data || {};
-            handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, betas, type, url);
+            handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, type, url);
         },
-        [conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, betas],
+        [conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas],
     );
 
     useEffect(() => {
diff --git a/src/components/WalletStatementModal/walletNavigationUtils.ts b/src/components/WalletStatementModal/walletNavigationUtils.ts
index d9fd91dbfa23..8950835faac8 100644
--- a/src/components/WalletStatementModal/walletNavigationUtils.ts
+++ b/src/components/WalletStatementModal/walletNavigationUtils.ts
@@ -19,6 +19,7 @@ function handleWalletStatementNavigation(
     introSelected: OnyxEntry<IntroSelected>,
     currentUserAccountID: number | undefined,
     isSelfTourViewed: boolean | undefined,
+    hasCompletedGuidedSetupFlow: boolean | undefined,
     betas: OnyxEntry<Beta[]>,
     type?: string,
     url?: string,
@@ -28,7 +29,7 @@ function handleWalletStatementNavigation(
     }
 
     if (type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) {
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID, isSelfTourViewed, betas);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
         return;
     }
 
diff --git a/src/hooks/useOpenConciergeAnywhere/index.native.tsx b/src/hooks/useOpenConciergeAnywhere/index.native.tsx
index e7c0dbce41a8..3d6621f7aa67 100644
--- a/src/hooks/useOpenConciergeAnywhere/index.native.tsx
+++ b/src/hooks/useOpenConciergeAnywhere/index.native.tsx
@@ -5,7 +5,7 @@ import {navigateToConciergeChat} from '@userActions/Report';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 
 /**
  * Returns a callback that navigates to the Concierge chat on native (opens the side panel on web instead),
@@ -15,12 +15,14 @@ function useOpenConciergeAnywhere() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const openConciergeAnywhere = (_options?: {forceConcierge?: boolean}) => {
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
     };
 
     return {openConciergeAnywhere, isInSidePanel: false};
diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts
index ebe58d0e9966..93939efea6ec 100644
--- a/src/libs/actions/Link.ts
+++ b/src/libs/actions/Link.ts
@@ -462,6 +462,7 @@ function openReportFromDeepLink(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,
     isSelfTourViewed: boolean | undefined,
+    hasCompletedGuidedSetupFlow: boolean | undefined,
     betas: OnyxEntry<Beta[]>,
     callerAccountID: number,
 ) {
@@ -624,7 +625,7 @@ function openReportFromDeepLink(
                                     Navigation.navigate(lastAccessedReportRoute, {forceReplace: Navigation.getTopmostReportId() === reportID, waitForTransition: true});
                                     return;
                                 }
-                                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false, () => true);
+                                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false, () => true);
                                 return;
                             }
 
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 6de02839f381..a337098f8e32 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4323,11 +4323,13 @@ function updateWriteCapability(report: Report, newValue: WriteCapability) {
 /**
  * Navigates to the 1:1 report with Concierge
  */
+// eslint-disable-next-line @typescript-eslint/max-params
 function navigateToConciergeChat(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,
     currentUserAccountID: number,
     isSelfTourViewed: boolean | undefined,
+    hasCompletedGuidedSetupFlow: boolean | undefined,
     betas: OnyxEntry<Beta[]>,
     shouldDismissModal = false,
     checkIfCurrentPageActive = () => true,
@@ -4356,8 +4358,7 @@ function navigateToConciergeChat(
                 // The Concierge chat does not exist yet on this path (it is being created here), so there is no report to thread.
                 conciergeChat: undefined,
                 isSelfTourViewed,
-                // TODO: Pass the correct hasCompletedGuidedSetupFlow from Onyx data in the next PR. Refactor issue: https://github.com/Expensify/App/issues/66424
-                hasCompletedGuidedSetupFlow: undefined,
+                hasCompletedGuidedSetupFlow,
                 betas,
                 shouldDismissModal,
                 linkToOptions,
@@ -4829,6 +4830,8 @@ function navigateToConciergeChatAndDeleteReport(
         introSelected,
         currentUserAccountID,
         isSelfTourViewed,
+        // TODO: Thread hasCompletedGuidedSetupFlow through this wrapper in the next PR. Refactor issue: https://github.com/Expensify/App/issues/66424
+        undefined,
         betas,
         false,
         undefined,
@@ -5132,7 +5135,8 @@ function navigateToMostRecentReport(
             Navigation.goBack();
         }
 
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false, () => true, {forceReplace: true});
+        // TODO: Thread hasCompletedGuidedSetupFlow through this wrapper in the next PR. Refactor issue: https://github.com/Expensify/App/issues/66424
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, undefined, betas, false, () => true, {forceReplace: true});
     }
 }
 
diff --git a/src/pages/ConciergePage.tsx b/src/pages/ConciergePage.tsx
index 4315a35e89a2..598637a73c0b 100644
--- a/src/pages/ConciergePage.tsx
+++ b/src/pages/ConciergePage.tsx
@@ -13,7 +13,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
 import {useFocusEffect} from '@react-navigation/native';
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
 
@@ -30,7 +30,9 @@ function ConciergePage() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
 
     useFocusEffect(
         useCallback(() => {
@@ -40,12 +42,21 @@ function ConciergePage() {
                         return;
                     }
 
-                    navigateToConciergeChat(conciergeReportID, introSelected, session.accountID ?? CONST.DEFAULT_NUMBER_ID, isSelfTourViewed, betas, true, () => !isUnmounted.current);
+                    navigateToConciergeChat(
+                        conciergeReportID,
+                        introSelected,
+                        session.accountID ?? CONST.DEFAULT_NUMBER_ID,
+                        isSelfTourViewed,
+                        hasCompletedGuidedSetupFlow,
+                        betas,
+                        true,
+                        () => !isUnmounted.current,
+                    );
                 });
             } else {
                 Navigation.navigate(ROUTES.INBOX);
             }
-        }, [session, isLoadingReportData, conciergeReportID, introSelected, isSelfTourViewed, betas]),
+        }, [session, isLoadingReportData, conciergeReportID, introSelected, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas]),
     );
 
     useEffect(() => {
diff --git a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
index 10c0f5e85e42..f0ffcaeebaa1 100644
--- a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
@@ -20,7 +20,7 @@ import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -35,13 +35,15 @@ function Finish() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {getTwoFactorAuthRoute} = useTwoFactorAuthRoute();
 
     const handleBackButtonPress = () => {
         Navigation.dismissModal();
     };
-    const handleNavigateToConciergeChat = () => navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, true);
+    const handleNavigateToConciergeChat = () => navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, true);
 
     return (
         <ScreenWrapper
diff --git a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
index 6d3faa285747..0dd4e0611d00 100644
--- a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
+++ b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
@@ -24,7 +24,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useEffect, useRef} from 'react';
 import {View} from 'react-native';
 
@@ -59,11 +59,13 @@ function ConnectBankAccount({onBackButtonPress, setShouldShowConnectedVerifiedBa
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const handleNavigateToConciergeChat = () => {
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, true);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, true);
     };
     const bankAccountState = reimbursementAccount?.achData?.state ?? '';
     const pendingAction = reimbursementAccount?.pendingAction;
diff --git a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
index 04d748ad31a7..8b7c176e1cf5 100644
--- a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
+++ b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
@@ -24,7 +24,7 @@ import type {Policy, ReimbursementAccount} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -54,7 +54,9 @@ function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount, policy, se
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     useResetBankAccountModal({
@@ -69,6 +71,7 @@ function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount, policy, se
             introSelected,
             currentUserAccountID,
             isSelfTourViewed,
+            hasCompletedGuidedSetupFlow,
             betas,
             true,
             undefined,
diff --git a/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx b/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
index 067214d2f60b..e8bfa5c227e1 100644
--- a/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
+++ b/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
@@ -23,7 +23,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
 import type {FileObject} from '@src/types/utils/Attachment';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 
@@ -57,7 +57,9 @@ function KYBDocuments({onBackButtonPress, onSubmit}: KYBDocumentsProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const reimbursementAccountVerificationData = reimbursementAccount?.achData?.verifications?.externalApiResponses;
     const bankAccountID = reimbursementAccount?.achData?.bankAccountID ?? CONST.DEFAULT_NUMBER_ID;
@@ -69,6 +71,7 @@ function KYBDocuments({onBackButtonPress, onSubmit}: KYBDocumentsProps) {
             introSelected,
             currentUserAccountID,
             isSelfTourViewed,
+            hasCompletedGuidedSetupFlow,
             betas,
             true,
             undefined,
diff --git a/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx b/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
index 4856ec92c0bc..48dea5d4e9ab 100644
--- a/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
+++ b/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
@@ -14,7 +14,7 @@ import colors from '@styles/theme/colors';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 
 type UnlockBankAccountProps = {
@@ -31,7 +31,9 @@ function UnlockBankAccount({bankAccountID, policyName}: UnlockBankAccountProps)
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const delegateAccountID = useDelegateAccountID();
 
@@ -43,7 +45,7 @@ function UnlockBankAccount({bankAccountID, policyName}: UnlockBankAccountProps)
 
     const handleCtaPress = () => {
         pressLockedBankAccount(bankAccountID, translate, conciergeReportID, delegateAccountID);
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
     };
 
     return (
diff --git a/src/pages/inbox/ReportNavigateAwayHandler.tsx b/src/pages/inbox/ReportNavigateAwayHandler.tsx
index 13247de98645..458623c0537f 100644
--- a/src/pages/inbox/ReportNavigateAwayHandler.tsx
+++ b/src/pages/inbox/ReportNavigateAwayHandler.tsx
@@ -26,6 +26,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {useIsFocused, useRoute} from '@react-navigation/native';
+import {hasCompletedGuidedSetupFlowSelector} from '@selectors/Onboarding';
 import {useEffect, useEffectEvent, useRef} from 'react';
 
 import useReportWasDeleted from './hooks/useReportWasDeleted';
@@ -76,6 +77,7 @@ function ReportNavigateAwayHandler() {
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [onboarding] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
     const isSelfTourViewed = onboarding?.selfTourViewed;
+    const hasCompletedGuidedSetupFlow = hasCompletedGuidedSetupFlowSelector(onboarding);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
 
     const parentReportAction = useParentReportAction(report);
@@ -143,7 +145,7 @@ function ReportNavigateAwayHandler() {
         }
 
         Navigation.isNavigationReady().then(() => {
-            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
         });
     });
 
@@ -234,9 +236,21 @@ function ReportNavigateAwayHandler() {
             }
 
             // Fallback to Concierge
-            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
         });
-    }, [reportWasDeleted, previousReportWasDeleted, isFocused, deletedReportParentID, conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, reportIDFromRoute]);
+    }, [
+        reportWasDeleted,
+        previousReportWasDeleted,
+        isFocused,
+        deletedReportParentID,
+        conciergeReportID,
+        introSelected,
+        currentUserAccountID,
+        isSelfTourViewed,
+        hasCompletedGuidedSetupFlow,
+        betas,
+        reportIDFromRoute,
+    ]);
 
     return null;
 }
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index 91ec2738ef10..f271cbafa033 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -35,7 +35,7 @@ import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useCallback, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import DeviceInfo from 'react-native-device-info';
@@ -75,7 +75,9 @@ function AboutPage() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const menuItems = useMemo(() => {
@@ -119,7 +121,7 @@ function AboutPage() {
                 icon: icons.Bug,
                 sentryLabel: CONST.SENTRY_LABEL.SETTINGS_ABOUT.REPORT_A_BUG,
                 action: waitForNavigate(() => {
-                    navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+                    navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
                 }),
             },
         ];
@@ -146,7 +148,7 @@ function AboutPage() {
             wrapperStyle: [styles.sectionMenuItemTopDescription],
             sentryLabel,
         }));
-    }, [icons, styles, translate, waitForNavigate, conciergeReportID, introSelected, isSelfTourViewed, currentUserAccountID, betas]);
+    }, [icons, styles, translate, waitForNavigate, conciergeReportID, introSelected, isSelfTourViewed, hasCompletedGuidedSetupFlow, currentUserAccountID, betas]);
 
     const overlayContent = useCallback(
         () => (
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
index 7aba29d3ec0f..fad9a8f55237 100644
--- a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
@@ -13,6 +13,7 @@ import {getChatUsedForOnboarding} from '@libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
+import {hasCompletedGuidedSetupFlowSelector} from '@selectors/Onboarding';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -27,13 +28,14 @@ function PreTrialBillingBanner() {
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const isSelfTourViewed = onboarding?.selfTourViewed;
+    const hasCompletedGuidedSetupFlow = hasCompletedGuidedSetupFlowSelector(onboarding);
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const navigateToChat = () => {
         const reportUsedForOnboarding = getChatUsedForOnboarding(onboarding, conciergeReportID);
 
         if (!reportUsedForOnboarding) {
-            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
             return;
         }
 
diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
index 53b18eee8a6f..33d3e443e78a 100644
--- a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
@@ -52,7 +52,7 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import type {StyleProp, TextStyle} from 'react-native';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 
@@ -87,7 +87,9 @@ function SubscriptionSettings() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
 
     const {isSecretPromoCode, promoDiscountValue} = getPrivatePromoDiscountInfo(privatePromoDiscount, isAnnual);
 
@@ -352,7 +354,7 @@ function SubscriptionSettings() {
                     shouldShowRightIcon
                     onPress={() => {
                         requestTaxExempt();
-                        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+                        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
                     }}
                     icon={icons.Coins}
                     wrapperStyle={styles.sectionMenuItemTopDescription}
diff --git a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
index 46c5baec2714..941c5234f386 100644
--- a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
@@ -15,7 +15,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
@@ -30,7 +30,9 @@ function AddPersonalNewCardPage() {
     const [addNewPersonalCardFeed, addNewPersonalCardFeedMetadata] = useOnyx(ONYXKEYS.ADD_NEW_PERSONAL_CARD);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const {currentStep} = addNewPersonalCardFeed ?? {};
     const [isModalVisible, setIsModalVisible] = useState(false);
@@ -76,7 +78,7 @@ function AddPersonalNewCardPage() {
                                 if (result.action !== ModalActions.CONFIRM) {
                                     return;
                                 }
-                                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+                                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
                             })
                             .finally(() => {
                                 setIsModalVisible(false);
diff --git a/src/pages/settings/Wallet/WalletPage/index.tsx b/src/pages/settings/Wallet/WalletPage/index.tsx
index 2291c8869040..961f62c976d7 100644
--- a/src/pages/settings/Wallet/WalletPage/index.tsx
+++ b/src/pages/settings/Wallet/WalletPage/index.tsx
@@ -61,7 +61,7 @@ import {getEmptyObject} from '@src/types/utils/EmptyObject';
 import type {ForwardedRef, RefObject} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import debounce from 'lodash/debounce';
 import isEmpty from 'lodash/isEmpty';
 import React, {useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
@@ -96,7 +96,9 @@ function WalletPage() {
     const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const delegateAccountID = useDelegateAccountID();
     const isUserValidated = userAccount?.validated ?? false;
@@ -156,7 +158,7 @@ function WalletPage() {
 
         if (accountData?.state === CONST.BANK_ACCOUNT.STATE.LOCKED && accountData?.bankAccountID) {
             pressLockedBankAccount(accountData?.bankAccountID, translate, conciergeReportID ?? undefined, delegateAccountID);
-            navigateToConciergeChat(conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+            navigateToConciergeChat(conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
             return;
         }
 
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
index f6cdb604ab86..5223eaf7eba2 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
@@ -75,7 +75,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useEffect} from 'react';
 
 import MoreFeaturesSection from './MoreFeaturesSection';
@@ -134,7 +134,9 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}_${CONST.EXPENSIFY_CARD.BANK}`, {
         selector: filterInactiveCards,
@@ -256,7 +258,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         if (action !== ModalActions.CONFIRM) {
             return;
         }
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
     };
 
     const promptDisableTravelViaInvoicing = async () => {
@@ -282,7 +284,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         if (action !== ModalActions.CONFIRM) {
             return;
         }
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
     };
 
     const promptDisableSmartLimitForWorkflows = async () => {
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
index 1ed10d23a6f4..c732f8d75837 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
@@ -14,7 +14,7 @@ import {navigateToConciergeChat} from '@libs/actions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React from 'react';
 
 function WorkspaceCompanyCardsFeedPendingPage() {
@@ -24,7 +24,9 @@ function WorkspaceCompanyCardsFeedPendingPage() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     return (
@@ -40,7 +42,7 @@ function WorkspaceCompanyCardsFeedPendingPage() {
                     {translate('workspace.moreFeatures.companyCards.pendingFeedDescription')}
                     <TextLink
                         onPress={() => {
-                            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+                            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
                         }}
                     >
                         {' '}
diff --git a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
index 97689caca997..40ba2ca55212 100644
--- a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
+++ b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
@@ -26,7 +26,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
@@ -52,7 +52,9 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const {isDelegateAccessRestricted} = useDelegateNoAccessState();
@@ -159,7 +161,7 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
                 onCancel={() => setIsModalVisible(false)}
                 onConfirm={() => {
                     setIsModalVisible(false);
-                    navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+                    navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
                 }}
             />
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
index df603688af1e..4c961aad3e9b 100644
--- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
+++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
@@ -13,7 +13,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import {hasSeenTourSelector} from '@src/selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@src/selectors/Onboarding';
 
 import React from 'react';
 import {View} from 'react-native';
@@ -27,7 +27,9 @@ function useCopyPolicySettingsProgressModal() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
 
     const copyInProgressStep = copyPolicySettings?.currentStep === CONST.POLICY.COPY_SETTINGS_MODAL_STEP.LOADING;
     const requestNotificationStep = copyPolicySettings?.currentStep === CONST.POLICY.COPY_SETTINGS_MODAL_STEP.COMPLETE;
@@ -123,7 +125,7 @@ function useCopyPolicySettingsProgressModal() {
             shouldShowCancelButton: true,
             onConfirm: () => {
                 clearCopyPolicySettings();
-                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
             },
             onCancel: () => {
                 clearCopyPolicySettings();
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
index 7fe209d7c3a5..944431043090 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
@@ -141,7 +141,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr
         if (isGuidedSetupPending && !conciergeReportID) {
             // No Concierge chat exists yet: navigateToConciergeChat creates it and enqueues the onboarding OpenReport on
             // its create path. Wait for that promise so the limit-increase write lands after it in the queue.
-            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false).then(() => {
+            navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false).then(() => {
                 requestExpensifyCardLimitIncrease(settings?.paymentBankAccountID, defaultFundID);
             });
             return;
@@ -165,7 +165,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr
             });
         }
         requestExpensifyCardLimitIncrease(settings?.paymentBankAccountID, defaultFundID);
-        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas, false);
+        navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas, false);
     };
 
     const isCurrentBalanceType = type === CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CURRENT_BALANCE;
diff --git a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
index 26456e0d9f29..fca07edc061a 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
@@ -44,7 +44,7 @@ import ROUTES from '@src/ROUTES';
 
 import type {TupleToUnion} from 'type-fest';
 
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 
@@ -71,9 +71,11 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
-        selector: hasSeenTourSelector,
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
+        selector: guidedSetupAndTourStatusSelector,
     });
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
 
     const delegateAccountID = useDelegateAccountID();
     const {accountID: currentUserAccountID, login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
@@ -179,7 +181,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
         // User who is reimburser can initiate unlocking process
         if (state === CONST.BANK_ACCOUNT.STATE.LOCKED && bankAccountID && isUserReimburser) {
             pressLockedBankAccount(bankAccountID, translate, conciergeReportID ?? undefined, delegateAccountID);
-            navigateToConciergeChat(conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+            navigateToConciergeChat(conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, hasCompletedGuidedSetupFlow, betas);
             return;
         }
 
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index a4fd788509bd..109b8f2ad52c 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -5340,7 +5340,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
 
             await waitForBatchedUpdates();
 
@@ -5351,7 +5351,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, true);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, true);
 
             await waitForBatchedUpdates();
 
@@ -5366,7 +5366,7 @@ describe('actions/Report', () => {
             // When conciergeReportID is undefined, the function uses onServerDataReady()
             // which is async. We're testing that it doesn't throw and handles the case properly.
             expect(() => {
-                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
             }).not.toThrow();
         });
 
@@ -5375,7 +5375,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, true, undefined, undefined, reportActionID);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, true, undefined, undefined, reportActionID);
 
             await waitForBatchedUpdates();
 
@@ -5390,7 +5390,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false, undefined, linkToOptions);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false, undefined, linkToOptions);
 
             await waitForBatchedUpdates();
 
@@ -5404,7 +5404,7 @@ describe('actions/Report', () => {
             // Don't set CONCIERGE_REPORT_ID to simulate undefined state
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false, checkIfCurrentPageActive);
+            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false, checkIfCurrentPageActive);
 
             await waitForBatchedUpdates();
 
@@ -5419,7 +5419,7 @@ describe('actions/Report', () => {
             // When conciergeReportID is undefined (or null passed as undefined),
             // it should handle it gracefully
             expect(() => {
-                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
             }).not.toThrow();
         });
 
@@ -5429,7 +5429,7 @@ describe('actions/Report', () => {
 
             // Empty string is falsy in JavaScript, so it should trigger the undefined path
             expect(() => {
-                Report.navigateToConciergeChat('', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+                Report.navigateToConciergeChat('', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
             }).not.toThrow();
         });
 
@@ -5441,7 +5441,18 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, true, checkIfCurrentPageActive, linkToOptions, reportActionID);
+            Report.navigateToConciergeChat(
+                CONCIERGE_REPORT_ID,
+                testIntroSelected,
+                TEST_USER_ACCOUNT_ID,
+                undefined,
+                undefined,
+                undefined,
+                true,
+                checkIfCurrentPageActive,
+                linkToOptions,
+                reportActionID,
+            );
 
             await waitForBatchedUpdates();
 
@@ -5458,7 +5469,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, onyxConciergeReportID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(providedConciergeReportID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+            Report.navigateToConciergeChat(providedConciergeReportID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
 
             await waitForBatchedUpdates();
 
@@ -5482,7 +5493,7 @@ describe('actions/Report', () => {
 
             const testBetas = [CONST.BETAS.ALL];
 
-            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, testBetas, false);
+            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, testBetas, false);
             await waitForBatchedUpdates();
 
             TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
@@ -5493,22 +5504,22 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, false);
+                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, undefined, false);
             }).not.toThrow();
 
             expect(() => {
-                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, false, undefined, false);
+                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, false, undefined, undefined, false);
             }).not.toThrow();
 
             expect(() => {
-                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+                Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
             }).not.toThrow();
         });
 
         it('should navigate via navigateToAndOpenReport with isSelfTourViewed when conciergeReportID is undefined and page is active', async () => {
             const checkIfCurrentPageActive = jest.fn(() => true);
 
-            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, false, checkIfCurrentPageActive);
+            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, undefined, false, checkIfCurrentPageActive);
 
             await waitForBatchedUpdates();
 
@@ -5521,7 +5532,7 @@ describe('actions/Report', () => {
         it('should navigate via navigateToAndOpenReport with isSelfTourViewed=undefined when conciergeReportID is undefined', async () => {
             const checkIfCurrentPageActive = jest.fn(() => true);
 
-            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false, checkIfCurrentPageActive);
+            Report.navigateToConciergeChat(undefined, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false, checkIfCurrentPageActive);
 
             await waitForBatchedUpdates();
 
@@ -5533,7 +5544,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, false);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, undefined, false);
 
             await waitForBatchedUpdates();
 
@@ -5545,7 +5556,7 @@ describe('actions/Report', () => {
             await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, false);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, false);
 
             await waitForBatchedUpdates();
 
@@ -5557,7 +5568,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             // isSelfTourViewed=true should not change dismissModal behavior
-            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, true);
+            Report.navigateToConciergeChat(CONCIERGE_REPORT_ID, testIntroSelected, TEST_USER_ACCOUNT_ID, true, undefined, undefined, true);
 
             await waitForBatchedUpdates();
 
@@ -8204,7 +8215,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             // No error should be thrown, function should return early
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, undefined, undefined, undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, undefined, undefined, undefined, undefined);
             }).not.toThrow();
         });
 
@@ -8212,7 +8223,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             const TEST_USER_ACCOUNT_ID = 1;
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, 'invalidType', undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, 'invalidType', undefined);
             }).not.toThrow();
         });
 
@@ -8223,7 +8234,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             const TEST_USER_ACCOUNT_ID = 1;
 
-            handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+            handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
 
             await waitForBatchedUpdates();
 
@@ -8234,7 +8245,7 @@ describe('actions/Report', () => {
         it('should not throw with undefined introSelected', () => {
             const TEST_USER_ACCOUNT_ID = 1;
             expect(() => {
-                handleWalletStatementNavigation('123', undefined, TEST_USER_ACCOUNT_ID, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                handleWalletStatementNavigation('123', undefined, TEST_USER_ACCOUNT_ID, undefined, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
             }).not.toThrow();
         });
 
@@ -8255,7 +8266,16 @@ describe('actions/Report', () => {
             const isSelfTourViewed = true;
 
             expect(() => {
-                localHandleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                localHandleWalletStatementNavigation(
+                    '123',
+                    testIntroSelected,
+                    TEST_USER_ACCOUNT_ID,
+                    isSelfTourViewed,
+                    undefined,
+                    undefined,
+                    CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE,
+                    undefined,
+                );
             }).not.toThrow();
         });
 
@@ -8265,7 +8285,7 @@ describe('actions/Report', () => {
             const isSelfTourViewed = false;
 
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
             }).not.toThrow();
         });
     });

From dc9ba08bf5f459731fd4100b61d33f337bb6169b Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 9 Sep 2026 02:29:32 +0700
Subject: [PATCH 108/781] fix test

---
 .../pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
index c5156d4fce24..9508e6f4a941 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
@@ -322,6 +322,6 @@ describe('TimeSensitiveSection - UnlockBankAccount', () => {
         fireEvent.press(cta);
 
         expect(pressLockedBankAccount).toHaveBeenCalledWith(LOCKED_BANK_ACCOUNT_ID, expect.any(Function), CONCIERGE_REPORT_ID, undefined);
-        expect(navigateToConciergeChat).toHaveBeenCalledWith(CONCIERGE_REPORT_ID, undefined, ADMIN_ACCOUNT_ID, false, undefined);
+        expect(navigateToConciergeChat).toHaveBeenCalledWith(CONCIERGE_REPORT_ID, undefined, ADMIN_ACCOUNT_ID, false, true, undefined);
     });
 });

From c64fd18fe0a9bf37deaa48453f87feb3e56b1eae Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 9 Sep 2026 13:55:38 +0700
Subject: [PATCH 109/781] address comment

---
 src/libs/actions/Report/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index a337098f8e32..c3efb69a7879 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4324,6 +4324,7 @@ function updateWriteCapability(report: Report, newValue: WriteCapability) {
  * Navigates to the 1:1 report with Concierge
  */
 // eslint-disable-next-line @typescript-eslint/max-params
+// TODO: Refactor to use options object parameter to reduce parameter count https://github.com/Expensify/App/issues/66421
 function navigateToConciergeChat(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,

From 68d1178edae3469fbd4db888f05b7d9c8c4d9d15 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 9 Sep 2026 16:25:57 +0700
Subject: [PATCH 110/781] fix eslitn

---
 src/libs/actions/Report/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index c3efb69a7879..1254f9a3c620 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4323,8 +4323,7 @@ function updateWriteCapability(report: Report, newValue: WriteCapability) {
 /**
  * Navigates to the 1:1 report with Concierge
  */
-// eslint-disable-next-line @typescript-eslint/max-params
-// TODO: Refactor to use options object parameter to reduce parameter count https://github.com/Expensify/App/issues/66421
+// eslint-disable-next-line @typescript-eslint/max-params -- TODO: Refactor to use options object parameter to reduce parameter count https://github.com/Expensify/App/issues/66421
 function navigateToConciergeChat(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,

From cccf241de2d87ab046a5204710bdad3adc01aac4 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 10:55:05 +0430
Subject: [PATCH 111/781] fix: preserve default trip field selection behavior

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 61e5f219b286..d4a2267e1f5c 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1704,7 +1704,6 @@ function MoneyRequestView({
                         <MenuItemWithTopDescription
                             title={tripRoomName}
                             description={translate('travel.trip')}
-                            descriptionTextStyle={styles.userSelectNone}
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                             numberOfLinesTitle={2}

From 0dfac7d644540887a2bcd7066306011d580e4590 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 11:04:33 +0430
Subject: [PATCH 112/781] chore: remove redundant report header comment

---
 src/components/ReportSearchHeader/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ReportSearchHeader/index.tsx b/src/components/ReportSearchHeader/index.tsx
index 166d342c7683..8c5b83c439e8 100755
--- a/src/components/ReportSearchHeader/index.tsx
+++ b/src/components/ReportSearchHeader/index.tsx
@@ -28,7 +28,6 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor, isT
                 shouldEnableDetailPageNavigation={false}
                 shouldEnableAvatarNavigation={false}
                 avatarBorderColor={avatarBorderColor}
-                // Keep this opt-in scoped to search rows instead of making all report headers selectable.
                 isDisplayNameCopyable={isTitleCopyable}
                 size={isLargeScreenWidth ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                 customDisplayNameStyle={styles.fontWeightNormal}

From 476a6a99b79fbb0214c9aa70e3b6d5ab4c2e552b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 15:40:54 +0430
Subject: [PATCH 113/781] refactor: remove obsolete selection content cleanup

---
 src/libs/SelectionScraper/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index a58e4389a34f..cff240932ceb 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -45,10 +45,6 @@ function getCopyableElementText(element: globalThis.Element, selection: Selectio
 }
 
 function replaceElementContentWithLines(element: globalThis.Element, lines: string[]) {
-    while (element.firstChild) {
-        element.removeChild(element.firstChild);
-    }
-
     for (const [index, line] of lines.entries()) {
         if (index > 0) {
             element.appendChild(document.createElement('br'));

From e1881bb6219f14a2e593ec197c08cecaa0d33d9a Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 16:08:14 +0430
Subject: [PATCH 114/781] fix: clear text selection when changing expense
 grouping

---
 src/components/Search/FilterDropdowns/DisplayPopup.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/Search/FilterDropdowns/DisplayPopup.tsx b/src/components/Search/FilterDropdowns/DisplayPopup.tsx
index 4b9970af916f..8964eba64430 100644
--- a/src/components/Search/FilterDropdowns/DisplayPopup.tsx
+++ b/src/components/Search/FilterDropdowns/DisplayPopup.tsx
@@ -12,6 +12,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {close} from '@libs/actions/Modal';
+import clearSelectedText from '@libs/clearSelectedText/clearSelectedText';
 import Navigation from '@libs/Navigation/Navigation';
 import {getGroupBySections, getSearchColumnTranslationKey, getViewOptions} from '@libs/SearchUIUtils';
 
@@ -178,6 +179,9 @@ function DisplayPopup({queryJSON, searchResults, closeOverlay, onSort}: DisplayP
                     onBackButtonPress={goBack}
                     onChange={(item) => {
                         const newValue = item?.value;
+                        if (newValue !== queryJSON.groupBy) {
+                            clearSelectedText();
+                        }
                         if (!newValue) {
                             updateFilterForm({groupBy: undefined, groupCurrency: undefined});
                         } else {

From de02363cd9b3154f6e5d6eb2df0402bb1a3878fc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 22:20:42 +0430
Subject: [PATCH 115/781] fix: exclude map receipts from copied expense rows

---
 src/components/TransactionItemRow/DataCells/ReceiptCell.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx b/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
index 42a5a1ebae91..904997fa33a2 100644
--- a/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
@@ -10,11 +10,12 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
-import {hasReceiptSource, isPerDiemRequest} from '@libs/TransactionUtils';
+import {hasReceiptSource, isMapBasedDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import type {Transaction} from '@src/types/onyx';
 
 import type {ViewStyle} from 'react-native';
@@ -64,6 +65,7 @@ function ReceiptCell({
     const isMissingReceiptSource = !hasReceiptSource(transactionItem);
     const isEReceipt = transactionItem.hasEReceipt && isMissingReceiptSource;
     const isPerDiem = isPerDiemRequest(transactionItem) && isMissingReceiptSource;
+    const isMapDistanceRequest = isMapBasedDistanceRequest(transactionItem);
     const receiptURIs = getThumbnailAndImageURIs(transactionItem, null, null);
     const filename = receiptURIs.filename ?? '';
 
@@ -86,8 +88,10 @@ function ReceiptCell({
                 StyleUtils.getBorderRadiusStyle(variables.componentBorderRadiusSmall),
                 styles.overflowHidden,
                 backgroundStyles,
+                isMapDistanceRequest && styles.userSelectNone,
                 style,
             ]}
+            dataSet={isMapDistanceRequest ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
             onMouseEnter={handleMouseEnter}
             onMouseLeave={bind.onMouseLeave}
         >

From 2b2c4c98a7d155cb959025903ee3e96990880f6e Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 11 Sep 2026 22:27:06 +0430
Subject: [PATCH 116/781] fix: exclude receipt thumbnails from copied expense
 rows

---
 .../TransactionItemRow/DataCells/ReceiptCell.tsx           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx b/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
index 904997fa33a2..3262c8d8adfa 100644
--- a/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/ReceiptCell.tsx
@@ -10,7 +10,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
-import {hasReceiptSource, isMapBasedDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
+import {hasReceiptSource, isPerDiemRequest} from '@libs/TransactionUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 
 import variables from '@styles/variables';
@@ -65,7 +65,6 @@ function ReceiptCell({
     const isMissingReceiptSource = !hasReceiptSource(transactionItem);
     const isEReceipt = transactionItem.hasEReceipt && isMissingReceiptSource;
     const isPerDiem = isPerDiemRequest(transactionItem) && isMissingReceiptSource;
-    const isMapDistanceRequest = isMapBasedDistanceRequest(transactionItem);
     const receiptURIs = getThumbnailAndImageURIs(transactionItem, null, null);
     const filename = receiptURIs.filename ?? '';
 
@@ -88,10 +87,10 @@ function ReceiptCell({
                 StyleUtils.getBorderRadiusStyle(variables.componentBorderRadiusSmall),
                 styles.overflowHidden,
                 backgroundStyles,
-                isMapDistanceRequest && styles.userSelectNone,
+                styles.userSelectNone,
                 style,
             ]}
-            dataSet={isMapDistanceRequest ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             onMouseEnter={handleMouseEnter}
             onMouseLeave={bind.onMouseLeave}
         >

From 137acf1a0b0634555d6ff61ab460fe4eef7548cb Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 12 Sep 2026 09:13:28 +0430
Subject: [PATCH 117/781] fix: exclude distance hint text from expense detail
 copy

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 762f49315971..4154b9d6ae2b 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1002,6 +1002,7 @@ function MoneyRequestView({
                     descriptionTextStyle={styles.userSelectNone}
                     title={distanceToDisplay}
                     hintText={distanceToDisplayHintText}
+                    hintTextStyle={styles.userSelectNone}
                     numberOfLinesTitle={2}
                     interactive={canEditDistance}
                     shouldShowRightIcon={canEditDistance}

From df6d1be572ce78f809e2d54f77104f2d7e21286f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 12 Sep 2026 09:53:37 +0430
Subject: [PATCH 118/781] fix: suppress copy sheet for selectable attendee
 pills

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 1 +
 src/components/UserPill.tsx                          | 8 ++++++--
 src/components/UserPills.tsx                         | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 4154b9d6ae2b..1c65fee5bd28 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1572,6 +1572,7 @@ function MoneyRequestView({
                                             email: a?.email,
                                         }))}
                                         maxVisible={canEdit ? undefined : actualAttendees.length}
+                                        isCopyable={!!attendeesCopyValue}
                                     />
                                 ) : undefined
                             }
diff --git a/src/components/UserPill.tsx b/src/components/UserPill.tsx
index f86d04d29ac3..0a7fa9bf8da6 100644
--- a/src/components/UserPill.tsx
+++ b/src/components/UserPill.tsx
@@ -2,6 +2,7 @@ import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
@@ -22,9 +23,10 @@ type UserPillProps = {
     accountID?: number;
     email?: string;
     style?: StyleProp<ViewStyle>;
+    isCopyable?: boolean;
 };
 
-function UserPill({avatar, displayName, accountID, email, style}: UserPillProps) {
+function UserPill({avatar, displayName, accountID, email, style, isCopyable = false}: UserPillProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {formatPhoneNumber} = useLocalize();
@@ -48,8 +50,10 @@ function UserPill({avatar, displayName, accountID, email, style}: UserPillProps)
                     accountID={accountID ?? CONST.DEFAULT_NUMBER_ID}
                 />
                 <Text
-                    style={styles.userPillText}
+                    style={[styles.userPillText, isCopyable && styles.userSelectText]}
                     numberOfLines={1}
+                    selectable={isCopyable}
+                    dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
                 >
                     {formattedDisplayName}
                 </Text>
diff --git a/src/components/UserPills.tsx b/src/components/UserPills.tsx
index 4ee882a37633..b0ab6074cc05 100644
--- a/src/components/UserPills.tsx
+++ b/src/components/UserPills.tsx
@@ -24,6 +24,7 @@ type UserPillData = {
 type UserPillsProps = {
     users: UserPillData[];
     maxVisible?: number;
+    isCopyable?: boolean;
 } & (
     | {onShowAllPress?: undefined; showAllSentryLabel?: undefined}
     | {
@@ -36,7 +37,7 @@ type UserPillsProps = {
 
 const DEFAULT_MAX_VISIBLE = 6;
 
-function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, showAllSentryLabel}: UserPillsProps) {
+function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, showAllSentryLabel, isCopyable = false}: UserPillsProps) {
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber} = useLocalize();
 
@@ -62,6 +63,7 @@ function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, sho
                         displayName={user.displayName}
                         accountID={user.accountID}
                         email={user.email}
+                        isCopyable={isCopyable}
                     />
                 );
             })}

From c2cb147024cf99340d88f906b5b5d3772928e4e3 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 12 Sep 2026 19:41:30 +0430
Subject: [PATCH 119/781] fix: enable formatted expense description selection
 on mobile web

---
 src/components/MenuItem/MenuItem.tsx |  7 +++-
 src/components/RenderHTML.tsx        | 34 ++++++++++++----
 tests/ui/components/MenuItemTest.tsx | 37 +++++++++++++++++
 tests/unit/RenderHTMLTest.tsx        | 59 +++++++++++++++++++++++++++-
 4 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 0b3c91fc7edd..64a360390034 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -38,6 +38,7 @@ import {canUseTouchScreen, hasHoverSupport} from '@libs/DeviceCapabilities';
 import {containsCustomEmoji, containsOnlyCustomEmoji} from '@libs/EmojiUtils';
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import getButtonState from '@libs/getButtonState';
+import getPlatform from '@libs/getPlatform';
 import mergeRefs from '@libs/mergeRefs';
 import Parser from '@libs/Parser';
 import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
@@ -687,6 +688,7 @@ function MenuItem({
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
     const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.hasHTMLTags(title);
+    const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform(true) === CONST.PLATFORM.MOBILE_WEB;
 
     const processedTitle = useMemo(() => {
         let titleToWrap = '';
@@ -1039,7 +1041,10 @@ function MenuItem({
                                                                             Titles with shouldRenderAsHTML use baseFontStyle, which differs from combinedTitleTextStyle below.
                                                                         */}
                                                                         {shouldRenderTitleAsHTML || shouldParseTitle ? (
-                                                                            <RenderHTML html={processedTitle} />
+                                                                            <RenderHTML
+                                                                                html={processedTitle}
+                                                                                isSelectable={shouldOverrideHTMLTitleSelection ? true : undefined}
+                                                                            />
                                                                         ) : (
                                                                             <Text style={styles.webViewStyles.baseFontStyle}>{convertToLTR(Parser.htmlToText(processedTitle))}</Text>
                                                                         )}
diff --git a/src/components/RenderHTML.tsx b/src/components/RenderHTML.tsx
index 4bde7c529079..96a77488f70d 100644
--- a/src/components/RenderHTML.tsx
+++ b/src/components/RenderHTML.tsx
@@ -7,8 +7,9 @@ import Parser from '@libs/Parser';
 import type {RenderersProps} from 'react-native-render-html';
 
 import React, {useMemo} from 'react';
-import {RenderHTMLConfigProvider, RenderHTMLSource} from 'react-native-render-html';
+import {RenderHTMLConfigProvider, RenderHTMLSource, useSharedProps} from 'react-native-render-html';
 
+import htmlRenderers from './HTMLEngineProvider/HTMLRenderers';
 import BulletItemRenderer from './HTMLEngineProvider/HTMLRenderers/BulletItemRenderer';
 import ConciergeLinkRenderer from './HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer';
 import OLRenderer from './HTMLEngineProvider/HTMLRenderers/OLRenderer';
@@ -46,6 +47,7 @@ function RenderHTML({html: htmlParam, onLinkPress, onConciergeLinkPress, isSelec
 
     const styles = useThemeStyles();
     const {windowWidth} = useWindowDimensions();
+    const sharedProps = useSharedProps();
     const html = useMemo(() => {
         return (
             Parser.replace(htmlParam, {shouldEscapeText: false, filterRules: ['emoji']})
@@ -87,16 +89,34 @@ function RenderHTML({html: htmlParam, onLinkPress, onConciergeLinkPress, isSelec
         />
     );
 
-    return onLinkPress || onConciergeLinkPress ? (
+    if (onLinkPress || onConciergeLinkPress) {
+        return (
+            <RenderHTMLConfigProvider
+                defaultTextProps={{selectable: isSelectable ?? true, allowFontScaling: false, style: styles.overflowVisible}}
+                renderersProps={renderersProps}
+                renderers={renderers}
+            >
+                {htmlSource}
+            </RenderHTMLConfigProvider>
+        );
+    }
+
+    if (isSelectable === undefined) {
+        return htmlSource;
+    }
+
+    return (
         <RenderHTMLConfigProvider
-            defaultTextProps={{selectable: isSelectable ?? true, allowFontScaling: false, style: styles.overflowVisible}}
-            renderersProps={renderersProps}
-            renderers={renderers}
+            {...sharedProps}
+            defaultTextProps={{
+                ...sharedProps.defaultTextProps,
+                selectable: isSelectable,
+                style: [sharedProps.defaultTextProps.style, styles.overflowVisible],
+            }}
+            renderers={htmlRenderers}
         >
             {htmlSource}
         </RenderHTMLConfigProvider>
-    ) : (
-        htmlSource
     );
 }
 
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index 71aaa4b5c858..afedfc689fa9 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -18,6 +18,12 @@ const mockNewWindowIcon: React.FC<SvgProps> = () => null;
 const mockLinkIcon: React.FC<SvgProps> = () => null;
 const mockDownloadIcon: React.FC<SvgProps> = () => null;
 const mockCheckmarkIcon: React.FC<SvgProps> = () => null;
+const mockRenderHTML = jest.fn((_props: {html: string; isSelectable?: boolean}) => null);
+
+jest.mock('@components/RenderHTML', () => ({
+    __esModule: true,
+    default: (props: {html: string; isSelectable?: boolean}) => mockRenderHTML(props),
+}));
 
 jest.mock('@hooks/useLazyAsset', () => ({
     useMemoizedLazyExpensifyIcons: jest.fn(() => ({
@@ -37,10 +43,41 @@ function Wrapper({children}: {children: React.ReactNode}) {
 
 describe('MenuItem', () => {
     beforeEach(() => {
+        mockRenderHTML.mockClear();
         mockedGetPlatform.mockReturnValue(CONST.PLATFORM.ANDROID);
         mockedGetOperatingSystem.mockReturnValue(CONST.OS.WINDOWS);
     });
 
+    it('forwards selectable HTML titles to RenderHTML on mobile web', () => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.MOBILE_WEB);
+
+        render(
+            <Wrapper>
+                <MenuItem
+                    title="<strong>Formatted description</strong>"
+                    shouldRenderAsHTML
+                    isTitleSelectable
+                />
+            </Wrapper>,
+        );
+
+        expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: true}));
+    });
+
+    it('does not override HTML title selection on native', () => {
+        render(
+            <Wrapper>
+                <MenuItem
+                    title="<strong>Formatted description</strong>"
+                    shouldRenderAsHTML
+                    isTitleSelectable
+                />
+            </Wrapper>,
+        );
+
+        expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: undefined}));
+    });
+
     describe('accessibility label with NewWindow icon', () => {
         it('appends "Opens in a new tab" to the accessibility label when iconRight is NewWindow', () => {
             const customLabel = 'Open external link';
diff --git a/tests/unit/RenderHTMLTest.tsx b/tests/unit/RenderHTMLTest.tsx
index 5e0b71da0221..dca22b041d87 100644
--- a/tests/unit/RenderHTMLTest.tsx
+++ b/tests/unit/RenderHTMLTest.tsx
@@ -7,12 +7,31 @@ import React from 'react';
 import {View} from 'react-native';
 
 jest.mock('@hooks/useWindowDimensions', () => () => ({windowWidth: 400}));
+const mockInheritedDefaultTextProps = {selectable: false, textBreakStrategy: 'simple'};
+const mockInheritedDefaultViewProps = {testID: 'html-view'};
+let mockConfigProps:
+    | {
+          defaultTextProps?: {selectable?: boolean; textBreakStrategy?: string};
+          defaultViewProps?: {testID?: string};
+          enableExperimentalBRCollapsing?: boolean;
+          renderers?: Record<string, unknown>;
+          renderersProps?: {a?: {onPress?: unknown}};
+      }
+    | undefined;
 jest.mock('react-native-render-html', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {View: MockView} = require('react-native');
     return {
-        RenderHTMLConfigProvider: ({children}: {children: React.ReactNode}) => children,
+        RenderHTMLConfigProvider: ({children, ...configProps}: {children: React.ReactNode}) => {
+            mockConfigProps = configProps;
+            return children;
+        },
         RenderHTMLSource: () => <MockView />,
+        useSharedProps: () => ({
+            defaultTextProps: mockInheritedDefaultTextProps,
+            defaultViewProps: mockInheritedDefaultViewProps,
+            enableExperimentalBRCollapsing: true,
+        }),
     };
 });
 
@@ -20,6 +39,11 @@ const mockUseHasTextAncestor = jest.fn(() => false);
 jest.mock('@hooks/useHasTextAncestor', () => () => mockUseHasTextAncestor());
 
 describe('RenderHTML', () => {
+    beforeEach(() => {
+        mockConfigProps = undefined;
+        mockUseHasTextAncestor.mockReturnValue(false);
+    });
+
     it('throws when rendered inside a Text ancestor', () => {
         mockUseHasTextAncestor.mockReturnValue(true);
         expect(() =>
@@ -41,4 +65,37 @@ describe('RenderHTML', () => {
             ),
         ).not.toThrow();
     });
+
+    it('enables selection while preserving inherited HTML configuration', () => {
+        render(
+            <RenderHTML
+                html="<strong>test</strong>"
+                isSelectable
+            />,
+        );
+
+        expect(mockConfigProps).toEqual(
+            expect.objectContaining({
+                defaultTextProps: expect.objectContaining({selectable: true, textBreakStrategy: 'simple'}),
+                defaultViewProps: mockInheritedDefaultViewProps,
+                enableExperimentalBRCollapsing: true,
+                renderers: expect.objectContaining({'mention-user': expect.anything(), emoji: expect.anything()}),
+            }),
+        );
+    });
+
+    it('preserves the existing renderer path when handling link presses', () => {
+        const onLinkPress = jest.fn();
+
+        render(
+            <RenderHTML
+                html='<a href="https://example.com">test</a>'
+                onLinkPress={onLinkPress}
+            />,
+        );
+
+        expect(mockConfigProps?.renderersProps?.a?.onPress).toBe(onLinkPress);
+        expect(mockConfigProps?.renderers).not.toHaveProperty('a');
+        expect(mockConfigProps?.renderers).toHaveProperty('bullet-item');
+    });
 });

From 138170f3274f39aa498d665f7fa7bbd416ab4bba Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Sat, 12 Sep 2026 22:45:00 +0000
Subject: [PATCH 120/781] Allow admins to merge card + cash expenses across
 draft reports

Remove the same-report shortcut for admins in getTransactionsForMerging.
Admins now discover cross-report and cross-workspace candidates via the
API (online) or the local filter (offline). Only non-admin managers
reviewing a processing report keep the same-report restriction.

The offline filter (getTransactionsForMergingLocally) now resolves admin
access per-candidate against that candidate's own workspace policy.
Candidates are excluded when their workspace policy is absent from the
local cache rather than assumed accessible.

MergeTransactionsListContent subscribes to allPolicies and allReports
and forwards them for the offline per-candidate check.

Tests: 5 new cases covering admin cross-report (same workspace),
non-admin workspace rejection, missing-cache exclusion, manager
same-report restriction, and admin-as-submitter cross-report.
---
 src/libs/actions/MergeTransaction.ts          |  61 ++-
 .../MergeTransactionsListContent.tsx          |  17 +-
 tests/actions/MergeTransactionTest.ts         | 451 ++++++++++++++++++
 3 files changed, 518 insertions(+), 11 deletions(-)

diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index 6791d35fc5b8..d79a018815a5 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -195,10 +195,22 @@ function getTransactionsForMergingFromAPI(transactionID: string) {
 }
 
 /**
- * Fetches eligible transactions for merging locally
- * This is FE version of READ_COMMANDS.GET_TRANSACTIONS_FOR_MERGING API call
+ * Fetches eligible transactions for merging locally.
+ * This is the offline FE equivalent of the READ_COMMANDS.GET_TRANSACTIONS_FOR_MERGING API call.
+ * Per-candidate admin access is checked against each candidate report’s own workspace so that
+ * cross-workspace admin merges are not granted based on the target’s workspace alone.
+ * When the candidate’s policy is not in the local cache the candidate is excluded rather than
+ * assuming access.
  */
-function getTransactionsForMergingLocally(transactionID: string, targetTransaction: Transaction, transactions: OnyxCollection<Transaction>, rules: OnyxCollection<Rule>, isAdmin = false) {
+function getTransactionsForMergingLocally(
+    transactionID: string,
+    targetTransaction: Transaction,
+    transactions: OnyxCollection<Transaction>,
+    rules: OnyxCollection<Rule>,
+    allPolicies: OnyxCollection<Policy>,
+    currentUserLogin: string | undefined,
+    allReports?: OnyxCollection<Report>,
+) {
     const transactionsArray = Object.values(transactions ?? {});
 
     const eligibleTransactions = transactionsArray.filter((transaction): transaction is Transaction => {
@@ -207,10 +219,30 @@ function getTransactionsForMergingLocally(transactionID: string, targetTransacti
         }
 
         const isUnreportedExpense = !transaction?.reportID || transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+        if (isUnreportedExpense) {
+            return areTransactionsEligibleForMerge(targetTransaction, transaction) && !isTransactionPendingDelete(transaction);
+        }
+
+        if (!transaction.reportID) {
+            return false;
+        }
+
+        // Resolve admin status against the candidate’s own workspace. If the policy is absent from
+        // the local cache we cannot verify access, so we exclude the candidate rather than assuming
+        // admin rights.
+        const candidateReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] ?? getReportOrDraftReport(transaction.reportID);
+        const candidatePolicyKey = `${ONYXKEYS.COLLECTION.POLICY}${candidateReport?.policyID}`;
+        const candidatePolicy = candidateReport?.policyID ? (allPolicies?.[candidatePolicyKey] ?? null) : null;
+        const isCandidatePolicyMissing = !!candidateReport?.policyID && candidatePolicy === null;
+        if (isCandidatePolicyMissing) {
+            return false;
+        }
+        const isCandidateAdmin = isPolicyAdmin(candidatePolicy, currentUserLogin);
+
         return (
             areTransactionsEligibleForMerge(targetTransaction, transaction) &&
             !isTransactionPendingDelete(transaction) &&
-            (isUnreportedExpense || (!!transaction.reportID && isMoneyRequestReportEligibleForMerge(transaction.reportID, isAdmin, rules)))
+            isMoneyRequestReportEligibleForMerge(candidateReport, isCandidateAdmin, rules)
         );
     });
 
@@ -227,6 +259,8 @@ function getTransactionsForMerging({
     report,
     currentUserLogin,
     rules,
+    allPolicies,
+    allReports,
 }: {
     isOffline: boolean;
     targetTransaction: Transaction;
@@ -236,22 +270,29 @@ function getTransactionsForMerging({
     currentUserLogin: string | undefined;
     cardList?: CardList;
     rules: OnyxCollection<Rule>;
+    allPolicies?: OnyxCollection<Policy>;
+    allReports?: OnyxCollection<Report>;
 }) {
     const transactionID = targetTransaction.transactionID;
     if (!transactionID) {
         return;
     }
 
-    // Collect/Control workspaces:
-    // - Admins and approvers: The list of eligible expenses will only contain the expenses from the report that the admin/approver triggered the merge from. This is intentionally limited since they’ll only be reviewing one report at a time.
-    // - Submitters will see all their editable expenses, including their IOUs/unreported expenses
+    // Candidate discovery:
+    // - Admins: The list of eligible expenses now includes expenses from the same submitter across all of their draft
+    //   reports where the admin has access. This replaces the previous same-report-only shortcut so admins can initiate
+    //   cross-report merges from either the card or cash expense.
+    // - Managers (non-admin approvers): Still limited to same-report transactions on the processing report they
+    //   triggered the merge from, as they review one report at a time.
+    // - Submitters will see all their editable expenses, including their IOUs/unreported expenses.
     // IOU:
     // - There are no admins/approvers outside of the submitter in these cases, so there’s no consideration for different roles.
-    // - The submitter, who is also the admin, will see all their editable expenses, including their IOUs/unreported expenses
+    // - The submitter, who is also the admin, will see all their editable expenses, including their IOUs/unreported expenses.
     const isAdmin = isPolicyAdmin(policy, currentUserLogin);
     const isManager = isReportManager(report);
 
-    if (isPaidGroupPolicy(policy) && (isAdmin || isManager) && !isCurrentUserSubmitter(report)) {
+    // Managers (non-admin approvers) reviewing a processing report still see only same-report transactions.
+    if (isPaidGroupPolicy(policy) && isManager && !isAdmin && !isCurrentUserSubmitter(report)) {
         const reportTransactions = getReportTransactions(report?.reportID);
         const eligibleTransactions = reportTransactions.filter((transaction): transaction is Transaction => {
             if (!transaction || transaction.transactionID === transactionID) {
@@ -268,7 +309,7 @@ function getTransactionsForMerging({
     }
 
     if (isOffline) {
-        getTransactionsForMergingLocally(transactionID, targetTransaction, transactions, rules, isAdmin);
+        getTransactionsForMergingLocally(transactionID, targetTransaction, transactions, rules, allPolicies ?? null, currentUserLogin, allReports);
     } else {
         getTransactionsForMergingFromAPI(transactionID);
     }
diff --git a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
index 394d3cdba6a8..f44196b61890 100644
--- a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
@@ -51,6 +51,8 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
     const currentUserLogin = session?.email;
     const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const {isOffline} = useNetwork();
     const {convertToDisplayString, getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
 
@@ -73,8 +75,21 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
             report: targetTransactionReport,
             currentUserLogin,
             rules,
+            allPolicies,
+            allReports,
         });
-    }, [transactions, isOffline, mergeTransaction?.eligibleTransactions, targetTransactionPolicy, targetTransactionReport, currentUserLogin, targetTransaction, rules]);
+    }, [
+        transactions,
+        isOffline,
+        mergeTransaction?.eligibleTransactions,
+        targetTransactionPolicy,
+        targetTransactionReport,
+        currentUserLogin,
+        targetTransaction,
+        rules,
+        allPolicies,
+        allReports,
+    ]);
 
     const data = !eligibleTransactions
         ? []
diff --git a/tests/actions/MergeTransactionTest.ts b/tests/actions/MergeTransactionTest.ts
index f9d051be7f15..8353415fe36c 100644
--- a/tests/actions/MergeTransactionTest.ts
+++ b/tests/actions/MergeTransactionTest.ts
@@ -1496,6 +1496,457 @@ describe('getTransactionsForMerging', () => {
         const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
         expect(mergeTransaction).toBeUndefined();
     });
+
+    it('should allow admin to see cash candidates from another open draft report in the same workspace (offline)', async () => {
+        // Given an admin user and two open draft expense reports in the same workspace
+        const adminLogin = 'admin@test.com';
+        const submitterAccountID = 42;
+
+        const policy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-1',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+
+        const targetReport = {
+            ...createExpenseReport(1),
+            reportID: 'target-report-1',
+            policyID: 'workspace-1',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+        const otherDraftReport = {
+            ...createExpenseReport(2),
+            reportID: 'other-report-2',
+            policyID: 'workspace-1',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        // Card expense (target) on the first report
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'card-tx-1',
+            reportID: 'target-report-1',
+            // Make it a card transaction by giving it a cardNumber
+            cardNumber: '1234',
+            bank: undefined,
+        };
+
+        // Cash expense candidate on the other draft report
+        const candidateTransaction = {
+            ...createRandomTransaction(2),
+            transactionID: 'cash-tx-2',
+            reportID: 'other-report-2',
+            // Cash: no cardNumber, bank, or managedCard
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 500,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`, targetReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${otherDraftReport.reportID}`, otherDraftReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`]: candidateTransaction,
+        };
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
+        };
+
+        // When the admin requests merge candidates offline
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`]: targetReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${otherDraftReport.reportID}`]: otherDraftReport,
+        };
+
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            policy,
+            report: targetReport,
+            currentUserLogin: adminLogin,
+            rules: null,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the cash candidate from the other draft report appears in eligible transactions
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(true);
+    });
+
+    it('should NOT allow admin to see candidates from another workspace where they are not an admin (offline)', async () => {
+        // Given an admin in workspace-1 but only a member in workspace-2
+        const adminLogin = 'admin@test.com';
+        const submitterAccountID = 42;
+
+        const adminPolicy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-1',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+        const memberPolicy = {
+            ...createRandomPolicy(2),
+            id: 'workspace-2',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.USER,
+        };
+
+        const targetReport = {
+            ...createExpenseReport(1),
+            reportID: 'admin-report-1',
+            policyID: 'workspace-1',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+        const otherWorkspaceReport = {
+            ...createExpenseReport(2),
+            reportID: 'member-report-2',
+            policyID: 'workspace-2',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'card-tx-a',
+            reportID: 'admin-report-1',
+            cardNumber: '1234',
+            bank: undefined,
+        };
+
+        const candidateTransaction = {
+            ...createRandomTransaction(2),
+            transactionID: 'cash-tx-b',
+            reportID: 'member-report-2',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 500,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`, targetReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${otherWorkspaceReport.reportID}`, otherWorkspaceReport);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`]: candidateTransaction,
+        };
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${adminPolicy.id}`]: adminPolicy,
+            [`${ONYXKEYS.COLLECTION.POLICY}${memberPolicy.id}`]: memberPolicy,
+        };
+
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`]: targetReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${otherWorkspaceReport.reportID}`]: otherWorkspaceReport,
+        };
+
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            policy: adminPolicy,
+            report: targetReport,
+            currentUserLogin: adminLogin,
+            rules: null,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the candidate from the non-admin workspace is NOT in the eligible list
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(false);
+    });
+
+    it('should exclude candidates when their policy is missing from the local cache (offline)', async () => {
+        // Given an admin with a candidate whose policy is not cached locally
+        const adminLogin = 'admin@test.com';
+        const submitterAccountID = 42;
+
+        const adminPolicy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-known',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+
+        const targetReport = {
+            ...createExpenseReport(1),
+            reportID: 'known-report',
+            policyID: 'workspace-known',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+        const unknownPolicyReport = {
+            ...createExpenseReport(2),
+            reportID: 'unknown-policy-report',
+            policyID: 'workspace-unknown',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'card-tx-known',
+            reportID: 'known-report',
+            cardNumber: '9999',
+            bank: undefined,
+        };
+        const candidateTransaction = {
+            ...createRandomTransaction(2),
+            transactionID: 'cash-tx-unknown',
+            reportID: 'unknown-policy-report',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 300,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`, targetReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${unknownPolicyReport.reportID}`, unknownPolicyReport);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`]: candidateTransaction,
+        };
+        // workspace-unknown is intentionally absent from the local policy cache
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${adminPolicy.id}`]: adminPolicy,
+        };
+
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`]: targetReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${unknownPolicyReport.reportID}`]: unknownPolicyReport,
+        };
+
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            policy: adminPolicy,
+            report: targetReport,
+            currentUserLogin: adminLogin,
+            rules: null,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the candidate from the uncached workspace is excluded rather than allowed
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(false);
+    });
+
+    it('should limit manager (non-admin approver) to same-report candidates on processing reports (offline)', async () => {
+        // Given a manager (not admin) reviewing a processing report
+        const managerLogin = 'manager@test.com';
+        const managerAccountID = 99;
+        const submitterAccountID = 42;
+
+        // Set the session so module-level currentUserAccountID resolves to the manager
+        await Onyx.set(ONYXKEYS.SESSION, {email: managerLogin, accountID: managerAccountID});
+        await waitForBatchedUpdates();
+
+        const policy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-manager',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.USER,
+        };
+
+        const processingReport = {
+            ...createExpenseReport(1),
+            reportID: 'processing-report',
+            policyID: 'workspace-manager',
+            ownerAccountID: submitterAccountID,
+            managerID: managerAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+        };
+        const otherOpenReport = {
+            ...createExpenseReport(2),
+            reportID: 'other-open-report',
+            policyID: 'workspace-manager',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'card-tx-mgr',
+            reportID: 'processing-report',
+            cardNumber: '5678',
+            bank: undefined,
+        };
+        const sameReportCandidate = {
+            ...createRandomTransaction(2),
+            transactionID: 'cash-tx-same',
+            reportID: 'processing-report',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 400,
+        };
+        const otherReportCandidate = {
+            ...createRandomTransaction(3),
+            transactionID: 'cash-tx-other',
+            reportID: 'other-open-report',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 600,
+        };
+
+        // Set individual transactions in Onyx so the module-level getReportTransactions can find them
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`, targetTransaction);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${sameReportCandidate.transactionID}`, sameReportCandidate);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${otherReportCandidate.transactionID}`, otherReportCandidate);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${processingReport.reportID}`, processingReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${otherOpenReport.reportID}`, otherOpenReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${sameReportCandidate.transactionID}`]: sameReportCandidate,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${otherReportCandidate.transactionID}`]: otherReportCandidate,
+        };
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
+        };
+
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${processingReport.reportID}`]: processingReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${otherOpenReport.reportID}`]: otherOpenReport,
+        };
+
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            policy,
+            report: processingReport,
+            currentUserLogin: managerLogin,
+            rules: null,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        // Same-report candidate is included; cross-report candidate is excluded for a non-admin manager
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === sameReportCandidate.transactionID)).toBe(true);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === otherReportCandidate.transactionID)).toBe(false);
+    });
+
+    it('should include candidates from other draft reports for admin who is also the submitter (treated as submitter)', async () => {
+        // Given an admin who is also the report owner (submitter), they go through the submitter path
+        const adminLogin = 'admin-owner@test.com';
+        const adminAccountID = 7;
+
+        // Set the session so module-level currentUserAccountID resolves to the admin/submitter
+        await Onyx.set(ONYXKEYS.SESSION, {email: adminLogin, accountID: adminAccountID});
+        await waitForBatchedUpdates();
+
+        const policy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-self',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+
+        const ownReport = {
+            ...createExpenseReport(1),
+            reportID: 'own-report',
+            policyID: 'workspace-self',
+            ownerAccountID: adminAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+        const otherOwnDraftReport = {
+            ...createExpenseReport(2),
+            reportID: 'own-other-report',
+            policyID: 'workspace-self',
+            ownerAccountID: adminAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'self-card-tx',
+            reportID: 'own-report',
+            cardNumber: '1111',
+            bank: undefined,
+        };
+        const candidateTransaction = {
+            ...createRandomTransaction(2),
+            transactionID: 'self-cash-tx',
+            reportID: 'own-other-report',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 250,
+        };
+
+        // Set individual transactions in Onyx so the offline filter can access them
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`, targetTransaction);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`, candidateTransaction);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${ownReport.reportID}`, ownReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${otherOwnDraftReport.reportID}`, otherOwnDraftReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`]: candidateTransaction,
+        };
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
+        };
+
+        // Session matches the report ownerAccountID so this is treated as the submitter path
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${ownReport.reportID}`]: ownReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${otherOwnDraftReport.reportID}`]: otherOwnDraftReport,
+        };
+
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            policy,
+            report: ownReport,
+            currentUserLogin: adminLogin,
+            rules: null,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(true);
+    });
 });
 
 describe('setupMergeTransactionData', () => {

From 3e7a415e19a3bb1885bde4b5574d7457f5fb6f26 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 14 Sep 2026 11:48:52 +0430
Subject: [PATCH 121/781] Fix selectable HTML tests and preserve existing
 render behavior

---
 src/components/RenderHTML.tsx        | 39 ++++++++++++++++++----------
 tests/ui/components/MenuItemTest.tsx |  2 +-
 tests/unit/RenderHTMLTest.tsx        |  3 ++-
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/RenderHTML.tsx b/src/components/RenderHTML.tsx
index 96a77488f70d..ea7d0aaa5388 100644
--- a/src/components/RenderHTML.tsx
+++ b/src/components/RenderHTML.tsx
@@ -35,6 +35,30 @@ type RenderHTMLProps = {
     isSelectable?: boolean;
 };
 
+type SelectableHTMLConfigProviderProps = {
+    children: React.ReactNode;
+    isSelectable: boolean;
+};
+
+function SelectableHTMLConfigProvider({children, isSelectable}: SelectableHTMLConfigProviderProps) {
+    const styles = useThemeStyles();
+    const sharedProps = useSharedProps();
+
+    return (
+        <RenderHTMLConfigProvider
+            {...sharedProps}
+            defaultTextProps={{
+                ...sharedProps.defaultTextProps,
+                selectable: isSelectable,
+                style: [sharedProps.defaultTextProps.style, styles.overflowVisible],
+            }}
+            renderers={htmlRenderers}
+        >
+            {children}
+        </RenderHTMLConfigProvider>
+    );
+}
+
 // We are using the explicit composite architecture for performance gains.
 // Configuration for RenderHTML is handled in a top-level component providing
 // context to RenderHTMLSource components. See https://git.io/JRcZb
@@ -47,7 +71,6 @@ function RenderHTML({html: htmlParam, onLinkPress, onConciergeLinkPress, isSelec
 
     const styles = useThemeStyles();
     const {windowWidth} = useWindowDimensions();
-    const sharedProps = useSharedProps();
     const html = useMemo(() => {
         return (
             Parser.replace(htmlParam, {shouldEscapeText: false, filterRules: ['emoji']})
@@ -105,19 +128,7 @@ function RenderHTML({html: htmlParam, onLinkPress, onConciergeLinkPress, isSelec
         return htmlSource;
     }
 
-    return (
-        <RenderHTMLConfigProvider
-            {...sharedProps}
-            defaultTextProps={{
-                ...sharedProps.defaultTextProps,
-                selectable: isSelectable,
-                style: [sharedProps.defaultTextProps.style, styles.overflowVisible],
-            }}
-            renderers={htmlRenderers}
-        >
-            {htmlSource}
-        </RenderHTMLConfigProvider>
-    );
+    return <SelectableHTMLConfigProvider isSelectable={isSelectable}>{htmlSource}</SelectableHTMLConfigProvider>;
 }
 
 export default RenderHTML;
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index afedfc689fa9..c2176618ab7f 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -18,7 +18,7 @@ const mockNewWindowIcon: React.FC<SvgProps> = () => null;
 const mockLinkIcon: React.FC<SvgProps> = () => null;
 const mockDownloadIcon: React.FC<SvgProps> = () => null;
 const mockCheckmarkIcon: React.FC<SvgProps> = () => null;
-const mockRenderHTML = jest.fn((_props: {html: string; isSelectable?: boolean}) => null);
+const mockRenderHTML = jest.fn<null, [{html: string; isSelectable?: boolean}]>(() => null);
 
 jest.mock('@components/RenderHTML', () => ({
     __esModule: true,
diff --git a/tests/unit/RenderHTMLTest.tsx b/tests/unit/RenderHTMLTest.tsx
index dca22b041d87..e37836b9248a 100644
--- a/tests/unit/RenderHTMLTest.tsx
+++ b/tests/unit/RenderHTMLTest.tsx
@@ -79,9 +79,10 @@ describe('RenderHTML', () => {
                 defaultTextProps: expect.objectContaining({selectable: true, textBreakStrategy: 'simple'}),
                 defaultViewProps: mockInheritedDefaultViewProps,
                 enableExperimentalBRCollapsing: true,
-                renderers: expect.objectContaining({'mention-user': expect.anything(), emoji: expect.anything()}),
             }),
         );
+        expect(mockConfigProps?.renderers).toHaveProperty('mention-user');
+        expect(mockConfigProps?.renderers).toHaveProperty('emoji');
     });
 
     it('preserves the existing renderer path when handling link presses', () => {

From 6139c2cb087c6fbfdf63cb8f0a36c15a09220bee Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 14 Sep 2026 12:36:15 +0430
Subject: [PATCH 122/781] fix: restore default MenuItem accessory interactions

---
 src/components/MenuItem/MenuItem.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 64a360390034..547d93cad610 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -1116,13 +1116,7 @@ function MenuItem({
                                                     </View>
                                                 </View>
                                             </View>
-                                            <View
-                                                style={[
-                                                    styles.flexRow,
-                                                    StyleUtils.getMenuItemTextContainerStyle(isCompact),
-                                                    !hasPressableRightComponent && !isTitleSelectable && styles.pointerEventsNone,
-                                                ]}
-                                            >
+                                            <View style={[styles.flexRow, StyleUtils.getMenuItemTextContainerStyle(isCompact), !hasPressableRightComponent && styles.pointerEventsNone]}>
                                                 {!!badgeText && !shouldShowBadgeInSeparateRow && !shouldShowBadgeBelow && (
                                                     <Badge
                                                         text={badgeText}

From e820b5fd51322dee9a19757354e8d1ecd26d77d2 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 15 Sep 2026 10:01:06 +0430
Subject: [PATCH 123/781] Prevent selection of attendee avatar initials

---
 src/components/UserPill.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/UserPill.tsx b/src/components/UserPill.tsx
index 0a7fa9bf8da6..f3669263bd07 100644
--- a/src/components/UserPill.tsx
+++ b/src/components/UserPill.tsx
@@ -44,11 +44,16 @@ function UserPill({avatar, displayName, accountID, email, style, isCopyable = fa
             }}
         >
             <View style={[styles.flexRow, styles.alignItemsCenter, styles.alignSelfStart, styles.userPill, shouldUseNarrowLayout && styles.mw100, style]}>
-                <UserAvatar
-                    source={avatar}
-                    size={CONST.AVATAR_SIZE.XXX_SMALL}
-                    accountID={accountID ?? CONST.DEFAULT_NUMBER_ID}
-                />
+                <View
+                    style={isCopyable && styles.userSelectNone}
+                    dataSet={isCopyable ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
+                >
+                    <UserAvatar
+                        source={avatar}
+                        size={CONST.AVATAR_SIZE.XXX_SMALL}
+                        accountID={accountID ?? CONST.DEFAULT_NUMBER_ID}
+                    />
+                </View>
                 <Text
                     style={[styles.userPillText, isCopyable && styles.userSelectText]}
                     numberOfLines={1}

From 9b8e2afef16dbd4401d35875944132722a08470d Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 15 Sep 2026 14:29:12 +0430
Subject: [PATCH 124/781] Prevent selection of company card violation in
 expense details

---
 src/components/DotIndicatorMessage.tsx              |  7 ++++---
 .../ReportActionItem/MoneyRequestView.tsx           | 13 ++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/DotIndicatorMessage.tsx b/src/components/DotIndicatorMessage.tsx
index 5475d768f715..53b16c4e51af 100644
--- a/src/components/DotIndicatorMessage.tsx
+++ b/src/components/DotIndicatorMessage.tsx
@@ -42,10 +42,11 @@ type DotIndicatorMessageProps = {
     style?: StyleProp<ViewStyle>;
 
     textStyles?: StyleProp<TextStyle>;
+    isSelectable?: boolean;
     dismissError?: () => void;
 };
 
-function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissError = () => {}}: DotIndicatorMessageProps) {
+function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectable, dismissError = () => {}}: DotIndicatorMessageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -69,7 +70,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
     const isErrorMessage = type === 'error';
     const receiptError = uniqueMessages.find(isReceiptError);
 
-    const isTextSelectable = !canUseTouchScreen() || !shouldUseNarrowLayout;
+    const isTextSelectable = isSelectable ?? (!canUseTouchScreen() || !shouldUseNarrowLayout);
 
     const renderMessage = (message: string | ReceiptError | ReactElement, index: number) => {
         if (isReceiptError(message)) {
@@ -126,7 +127,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
                     />
                 </View>
                 <Text
-                    style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, styles.flex1]}
+                    style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, styles.flex1, isSelectable === false && styles.userSelectNone]}
                     accessibilityRole={isErrorMessage ? CONST.ROLE.ALERT : undefined}
                     accessibilityLiveRegion={isErrorMessage ? 'assertive' : undefined}
                 >
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 1c65fee5bd28..f4eb7450786f 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1729,11 +1729,14 @@ function MoneyRequestView({
                 )}
 
                 {hasRequiredCompanyCardViolation && (
-                    <DotIndicatorMessage
-                        type="error"
-                        style={[styles.mv3, styles.mh4, styles.userSelectNone]}
-                        messages={{error: translate('violations.companyCardRequired')}}
-                    />
+                    <View dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}>
+                        <DotIndicatorMessage
+                            type="error"
+                            style={[styles.mv3, styles.mh4, styles.userSelectNone]}
+                            messages={{error: translate('violations.companyCardRequired')}}
+                            isSelectable={false}
+                        />
+                    </View>
                 )}
             </>
         </View>

From d7c11c83e9f0dbd576047a15933023999a52e84d Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 15 Sep 2026 12:41:18 +0200
Subject: [PATCH 125/781] feat: liquid glass tab bar owned by the tab navigator

Single floating capsule, native glass on iOS 26, translucent fallback elsewhere.
---
 ios/NewExpensify.xcodeproj/project.pbxproj    |  2 -
 ios/Podfile.lock                              | 20 ++++----
 package-lock.json                             | 12 +++++
 package.json                                  |  1 +
 .../NavigationTabBar/InboxTabButton.tsx       |  3 +-
 .../NavigationTabBar/SearchTabButton.tsx      |  3 +-
 .../NavigationTabBar/TabBarItem.tsx           | 19 +++++---
 .../NavigationTabBar/WorkspacesTabButton.tsx  |  3 +-
 .../Navigation/NavigationTabBar/index.tsx     | 14 +++---
 .../BaseNavigationTabBarSurface.tsx           | 24 ++++++++++
 .../NavigationTabBarSurface/index.ios.tsx     | 47 +++++++++++++++++++
 .../NavigationTabBarSurface/index.tsx         |  3 ++
 .../NavigationTabBarSurface/types.ts          | 14 ++++++
 .../Navigation/TabBarBottomContent/index.tsx  | 30 +++++-------
 .../Tables/WorkspaceListTable/index.tsx       |  2 +-
 .../Navigators/TabNavigatorBar.tsx            |  5 +-
 src/pages/Search/SearchPageNarrow/index.tsx   |  4 +-
 src/pages/home/HomePage.tsx                   |  4 +-
 .../inbox/sidebar/NavigationTabBarAvatar.tsx  | 15 +++---
 src/pages/inbox/sidebar/SidebarLinks.tsx      |  8 +++-
 src/pages/settings/InitialSettingsPage.tsx    |  2 +-
 src/pages/workspace/WorkspaceInitialPage.tsx  |  2 +-
 src/styles/index.ts                           | 32 +++++++++++--
 src/styles/theme/themes/dark.ts               |  3 ++
 src/styles/theme/themes/light.ts              |  3 ++
 src/styles/theme/types.ts                     |  3 ++
 src/styles/utils/index.ts                     |  8 ++--
 src/styles/variables.ts                       |  9 ++++
 28 files changed, 224 insertions(+), 71 deletions(-)
 create mode 100644 src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
 create mode 100644 src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
 create mode 100644 src/components/Navigation/NavigationTabBarSurface/index.tsx
 create mode 100644 src/components/Navigation/NavigationTabBarSurface/types.ts

diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index 641c3c63d9a9..54548c581a79 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -817,7 +817,6 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-timing/React-timing_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TrustKit/TrustKit.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
@@ -851,7 +850,6 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-timing_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TrustKit.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0967642080e5..4af082831ca7 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -128,6 +128,8 @@ PODS:
     - ExpoModulesCore
   - ExpoFont (57.0.1):
     - ExpoModulesCore
+  - ExpoGlassEffect (57.0.3):
+    - ExpoModulesCore
   - ExpoImage (57.0.1):
     - ExpoModulesCore
     - libavif/libdav1d
@@ -4216,7 +4218,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - RNSentry (8.7.0):
+  - RNSentry (8.25.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -4243,7 +4245,6 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - Sentry (= 9.8.0)
     - SocketRocket
     - Yoga
   - RNShare (11.0.2):
@@ -4431,9 +4432,6 @@ PODS:
   - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - Sentry (9.8.0):
-    - Sentry/Core (= 9.8.0)
-  - Sentry/Core (9.8.0)
   - SocketRocket (0.7.1)
   - SwiftUIIntrospect (1.3.0)
   - TrustKit (3.0.7)
@@ -4461,6 +4459,7 @@ DEPENDENCIES:
   - ExpoAudio (from `../node_modules/expo-audio/ios`)
   - "ExpoDomWebView (from `../node_modules/@expo/dom-webview/ios`)"
   - ExpoFont (from `../node_modules/expo-font/ios`)
+  - ExpoGlassEffect (from `../node_modules/expo-glass-effect/ios`)
   - ExpoImage (from `../node_modules/expo-image/ios`)
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoLocation (from `../node_modules/expo-location/ios`)
@@ -4645,7 +4644,6 @@ SPEC REPOS:
     - SDWebImageAVIFCoder
     - SDWebImageSVGCoder
     - SDWebImageWebPCoder
-    - Sentry
     - SocketRocket
     - SwiftUIIntrospect
     - TrustKit
@@ -4675,6 +4673,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@expo/dom-webview/ios"
   ExpoFont:
     :path: "../node_modules/expo-font/ios"
+  ExpoGlassEffect:
+    :path: "../node_modules/expo-glass-effect/ios"
   ExpoImage:
     :path: "../node_modules/expo-image/ios"
   ExpoImageManipulator:
@@ -4971,7 +4971,7 @@ SPEC CHECKSUMS:
   AirshipServiceExtension: 50d11b2f62c4a490d4e81a1c36f70e2ecb70a27e
   AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
   AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
-  boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
+  boost: 659a89341ea4ab3df8259733813b52f26d8be9a5
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   EXConstants: fa5647482320b7bde855057f8b86580456d4b9f0
   expensify-react-native-background-task: 03c640e1f5649692d058cba48c0a138f024a6dd3
@@ -4981,6 +4981,7 @@ SPEC CHECKSUMS:
   ExpoAudio: b69f36525132edba8d87a715b3a20c678ef78b30
   ExpoDomWebView: beaec034e51bd028428b98bb1f2633ab79c6d095
   ExpoFont: 59e1faf66ba9bcd232ae1e2ce58d202a48b6f65e
+  ExpoGlassEffect: ac454a05346de8610d61dc1324d624893ca22d14
   ExpoImage: 4c1e7634db6033185a98959fb028d8d4b1c89695
   ExpoImageManipulator: d3c962dabd86b331980f8ec6794c6073b3cb541a
   ExpoLocation: 187949911b868f72e34a8a6f8f487207ba86388a
@@ -5011,7 +5012,7 @@ SPEC CHECKSUMS:
   GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
-  hermes-engine: 8992dac2fb037a77b783469d993f59f96167417e
+  hermes-engine: 1637145fb37fdf98c062d0056874f15ddce37e20
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
@@ -5142,7 +5143,7 @@ SPEC CHECKSUMS:
   RNReactNativeHapticFeedback: 5f1542065f0b24c9252bd8cf3e83bc9c548182e4
   RNReanimated: de3eaf0bd2aec5036554a125eb02c28b59de45ae
   RNScreens: 2b6107925ee4e14a9b2eb0dfb52fe25223aa64d7
-  RNSentry: 67d50593363789905dde212b2fcab30a4f8b1846
+  RNSentry: b03603e1f0b5e9840742ee3f72706c3ab836913a
   RNShare: 1c1fde2c4134b9cf220ffebbd6df9c414036d382
   RNSVG: 88b18f5959cffb583527b9611ce17b53e54c1fb6
   RNWorklets: 25b8ee140def8e1561209a825b005ee70f3e26f5
@@ -5150,7 +5151,6 @@ SPEC CHECKSUMS:
   SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
-  Sentry: 88746bf877eff714bc45315a39ad1d1efea2cdda
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SwiftUIIntrospect: fee9aa07293ee280373a591e1824e8ddc869ba5d
   TrustKit: 1050f3ce0595f8ed775f1237b7f590e3a4f93e91
diff --git a/package-lock.json b/package-lock.json
index 83db0be3123d..11c1702f5db9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,6 +72,7 @@
         "expo-asset": "57.0.7",
         "expo-audio": "57.0.3",
         "expo-font": "57.0.1",
+        "expo-glass-effect": "57.0.3",
         "expo-image": "57.0.1",
         "expo-image-manipulator": "57.0.6",
         "expo-location": "57.0.6",
@@ -26150,6 +26151,17 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-glass-effect": {
+      "version": "57.0.3",
+      "resolved": "https://registry.npmjs.org/expo-glass-effect/-/expo-glass-effect-57.0.3.tgz",
+      "integrity": "sha512-aTh2J5eCxf+rSRMBJTnP8Ib5/k8DYFVDuEX1xqesN9F9aqTXocwMv/aQRVBNUs/iogDWhHIJz2pN97IsrrTcoA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/expo-image": {
       "version": "57.0.1",
       "resolved": "https://registry.npmjs.org/expo-image/-/expo-image-57.0.1.tgz",
diff --git a/package.json b/package.json
index fb86c23b3e47..95abe81f8c8d 100644
--- a/package.json
+++ b/package.json
@@ -148,6 +148,7 @@
     "expo-asset": "57.0.7",
     "expo-audio": "57.0.3",
     "expo-font": "57.0.1",
+    "expo-glass-effect": "57.0.3",
     "expo-image": "57.0.1",
     "expo-image-manipulator": "57.0.6",
     "expo-location": "57.0.6",
diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index b35767100788..057ca46a9816 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -236,7 +236,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
             accessibilityLabel={accessibilityLabel}
             accessibilityState={{selected: selectedTab === NAVIGATION_TABS.INBOX}}
             wrapperStyle={styles.flex1}
-            style={styles.navigationTabBarItem}
+            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.INBOX && styles.navigationTabBarItemSelected]}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
         >
             <TabBarItem
@@ -245,6 +245,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
                 isSelected={selectedTab === NAVIGATION_TABS.INBOX}
                 statusIndicatorColor={statusIndicatorColor}
                 numberOfLines={1}
+                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
index 72308f304f1f..0d51fb5bbb73 100644
--- a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
@@ -84,7 +84,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
             accessibilityLabel={translate('common.spend')}
             accessibilityState={searchAccessibilityState}
             wrapperStyle={styles.flex1}
-            style={styles.navigationTabBarItem}
+            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.SEARCH && styles.navigationTabBarItemSelected]}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
         >
             <TabBarItem
@@ -92,6 +92,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
                 label={translate('common.spend')}
                 isSelected={selectedTab === NAVIGATION_TABS.SEARCH}
                 numberOfLines={1}
+                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
index 6d75e37b5ea0..6665ace2a65f 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
@@ -18,6 +18,9 @@ type TabBarItemProps = {
     isHovered?: boolean;
     statusIndicatorColor?: string;
     numberOfLines?: number;
+
+    /** The floating bottom bar has no room for labels, so it renders the icons alone. */
+    shouldShowLabel?: boolean;
 };
 
 function getIconFill(isSelected: boolean, isHovered: boolean, theme: ReturnType<typeof useTheme>) {
@@ -30,7 +33,7 @@ function getIconFill(isSelected: boolean, isHovered: boolean, theme: ReturnType<
     return theme.icon;
 }
 
-function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicatorColor, numberOfLines = 2}: TabBarItemProps) {
+function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicatorColor, numberOfLines = 2, shouldShowLabel = true}: TabBarItemProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
 
@@ -47,12 +50,14 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
                     <View style={[styles.navigationTabBarStatusIndicator, styles.statusIndicatorColor(statusIndicatorColor), isHovered && {borderColor: theme.sidebarHover}]} />
                 )}
             </View>
-            <Text
-                numberOfLines={numberOfLines}
-                style={[styles.textSmall, styles.textAlignCenter, styles.mt1Half, isSelected ? styles.textBold : styles.textSupporting, styles.navigationTabBarLabel]}
-            >
-                {label}
-            </Text>
+            {shouldShowLabel && (
+                <Text
+                    numberOfLines={numberOfLines}
+                    style={[styles.textSmall, styles.textAlignCenter, styles.mt1Half, isSelected ? styles.textBold : styles.textSupporting, styles.navigationTabBarLabel]}
+                >
+                    {label}
+                </Text>
+            )}
         </>
     );
 }
diff --git a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
index f996c54f0522..d61c5033203f 100644
--- a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
@@ -62,7 +62,7 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
             accessibilityLabel={`${translate('common.workspacesTabTitle')}${workspacesTabIndicatorStatus ? `. ${translate('common.yourReviewIsRequired')}` : ''}`}
             accessibilityState={workspacesAccessibilityState}
             wrapperStyle={styles.flex1}
-            style={styles.navigationTabBarItem}
+            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.WORKSPACES && styles.navigationTabBarItemSelected]}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.WORKSPACES}
         >
             <TabBarItem
@@ -71,6 +71,7 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
                 isSelected={selectedTab === NAVIGATION_TABS.WORKSPACES}
                 statusIndicatorColor={workspacesStatusIndicatorColor}
                 numberOfLines={1}
+                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index bf51cac6e9c6..aac5c3a9c23f 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -3,6 +3,7 @@ import FloatingGPSButton from '@components/FloatingGPSButton';
 import Hoverable from '@components/Hoverable';
 import ImageSVG from '@components/ImageSVG';
 import DebugTabView from '@components/Navigation/DebugTabView';
+import NavigationTabBarSurface from '@components/Navigation/NavigationTabBarSurface';
 import {PressableWithFeedback} from '@components/Pressable';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -69,8 +70,8 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
         });
     };
 
-    // shouldShowFloatingButtons is false for the swipe-back duplicate tab bar rendered via
-    // bottomContent — gating the debug view on it prevents it from appearing in that copy too.
+    // The navigator drops shouldShowFloatingButtons while it hides the bar, and the debug view rides along
+    // so it cannot linger over a screen the bar has already left.
     const shouldShowDebugTabView = !!isDebugModeEnabled && shouldShowFloatingButtons;
 
     if (!shouldUseNarrowLayout) {
@@ -153,7 +154,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     return (
         <>
             {shouldShowDebugTabView && <DebugTabView selectedTab={selectedTab} />}
-            <View
+            <NavigationTabBarSurface
                 style={styles.navigationTabBarContainer}
                 testID="NavigationTabBar"
             >
@@ -162,13 +163,14 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     role={CONST.ROLE.TAB}
                     accessibilityLabel={translate('common.home')}
                     wrapperStyle={styles.flex1}
-                    style={styles.navigationTabBarItem}
+                    style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.HOME && styles.navigationTabBarItemSelected]}
                     sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.HOME}
                 >
                     <TabBarItem
                         icon={expensifyIcons.Home}
                         label={translate('common.home')}
                         isSelected={selectedTab === NAVIGATION_TABS.HOME}
+                        shouldShowLabel={false}
                     />
                 </PressableWithFeedback>
                 <InboxTabButton
@@ -190,11 +192,11 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     isWideLayout={false}
                 />
                 <NavigationTabBarAvatar
-                    style={styles.navigationTabBarItem}
+                    style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.SETTINGS && styles.navigationTabBarItemSelected]}
                     isSelected={selectedTab === NAVIGATION_TABS.SETTINGS}
                     onPress={navigateToSettings}
                 />
-            </View>
+            </NavigationTabBarSurface>
 
             {shouldShowFloatingButtons && (
                 <>
diff --git a/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx b/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
new file mode 100644
index 000000000000..4b49cd16dd87
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
@@ -0,0 +1,24 @@
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import type NavigationTabBarSurfaceProps from './types';
+
+/**
+ * Translucent stand-in for the liquid glass capsule, drawn wherever the native material is unavailable.
+ */
+function BaseNavigationTabBarSurface({children, style, testID}: NavigationTabBarSurfaceProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <View
+            style={[style, styles.navigationTabBarFallbackSurface]}
+            testID={testID}
+        >
+            {children}
+        </View>
+    );
+}
+
+export default BaseNavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx b/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
new file mode 100644
index 000000000000..bd34679deb00
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
@@ -0,0 +1,47 @@
+import useThemePreference from '@hooks/useThemePreference';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+
+import {GlassView, isGlassEffectAPIAvailable, isLiquidGlassAvailable} from 'expo-glass-effect';
+import React from 'react';
+
+import type NavigationTabBarSurfaceProps from './types';
+
+import BaseNavigationTabBarSurface from './BaseNavigationTabBarSurface';
+
+const DARK_THEME_PREFERENCES = new Set<string>([CONST.THEME.DARK, CONST.THEME.DARK_CONTRAST]);
+
+/**
+ * Liquid glass capsule behind the narrow tab bar. The material arrives with iOS 26, and some of its betas ship
+ * without the runtime API, so both checks have to pass before the glass view replaces the translucent surface.
+ */
+function NavigationTabBarSurface({children, style, testID}: NavigationTabBarSurfaceProps) {
+    const styles = useThemeStyles();
+    const themePreference = useThemePreference();
+
+    if (!isLiquidGlassAvailable() || !isGlassEffectAPIAvailable()) {
+        return (
+            <BaseNavigationTabBarSurface
+                style={style}
+                testID={testID}
+            >
+                {children}
+            </BaseNavigationTabBarSurface>
+        );
+    }
+
+    return (
+        <GlassView
+            style={[style, styles.bgTransparent]}
+            glassEffectStyle="regular"
+            // The app carries its own theme switch, so the material follows that instead of the system appearance.
+            colorScheme={DARK_THEME_PREFERENCES.has(themePreference) ? 'dark' : 'light'}
+            testID={testID}
+        >
+            {children}
+        </GlassView>
+    );
+}
+
+export default NavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/index.tsx b/src/components/Navigation/NavigationTabBarSurface/index.tsx
new file mode 100644
index 000000000000..3a0ba046ca38
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBarSurface/index.tsx
@@ -0,0 +1,3 @@
+import BaseNavigationTabBarSurface from './BaseNavigationTabBarSurface';
+
+export default BaseNavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/types.ts b/src/components/Navigation/NavigationTabBarSurface/types.ts
new file mode 100644
index 000000000000..74276066a1d6
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBarSurface/types.ts
@@ -0,0 +1,14 @@
+import type {ReactNode} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+type NavigationTabBarSurfaceProps = {
+    /** Tab items drawn on top of the surface. */
+    children: ReactNode;
+
+    /** Capsule geometry the surface has to take: size, radius and inner padding. */
+    style: StyleProp<ViewStyle>;
+
+    testID?: string;
+};
+
+export default NavigationTabBarSurfaceProps;
diff --git a/src/components/Navigation/TabBarBottomContent/index.tsx b/src/components/Navigation/TabBarBottomContent/index.tsx
index a90b227de290..be7d68435fe7 100644
--- a/src/components/Navigation/TabBarBottomContent/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/index.tsx
@@ -1,24 +1,16 @@
-import NavigationTabBar from '@components/Navigation/NavigationTabBar';
-
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-
-import React from 'react';
+import type {FC} from 'react';
 
 import type TabBarBottomContentProps from './types';
 
-function TabBarBottomContent({selectedTab}: TabBarBottomContentProps) {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-
-    if (!shouldUseNarrowLayout) {
-        return null;
-    }
-
-    return (
-        <NavigationTabBar
-            selectedTab={selectedTab}
-            shouldShowFloatingButtons={false}
-        />
-    );
+/**
+ * Bottom slot that every tab root screen reserves for the tab bar. The navigator owns the only bar there is,
+ * so the slot renders nothing: one bar per preloaded screen would stack glass capsules behind the visible one.
+ * The slot itself stays because ScreenWrapper keys the placement of the bottom-docked offline indicator on it.
+ */
+function TabBarBottomContent() {
+    return null;
 }
 
-export default TabBarBottomContent;
+const tabBarBottomContent: FC<TabBarBottomContentProps> = TabBarBottomContent;
+
+export default tabBarBottomContent;
diff --git a/src/components/Tables/WorkspaceListTable/index.tsx b/src/components/Tables/WorkspaceListTable/index.tsx
index 504682a3e635..a7e5448ff0bc 100644
--- a/src/components/Tables/WorkspaceListTable/index.tsx
+++ b/src/components/Tables/WorkspaceListTable/index.tsx
@@ -222,7 +222,7 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
             />
 
             <Table.Header />
-            <Table.Body />
+            <Table.Body contentContainerStyle={shouldUseNarrowLayout && styles.floatingTabBarContentInset} />
         </Table>
     );
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index 9b46ffd6e246..058f6f31c033 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -40,7 +40,6 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     const isAtRoot = isTabRouteAtRoot(activeRoute);
     // --- Narrow-only animation logic (hooks must run unconditionally per Rules of Hooks) ---
-    // On native, screens also render the tab bar via bottomContent for swipe-back animations.
     // Delay showing this navigator's tab bar only when navigating back from a deeper screen
     // (where the tab bar was hidden). Keep it visible during tab switches so it doesn't flash.
     // Guard with shouldUseNarrowLayout so prevShouldHide stays false in wide layout,
@@ -73,7 +72,9 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
         // Negative marginTop overlays the tab bar on content (zero flex space) to prevent layout shifts.
         return (
             <View
-                style={[StyleUtils.getTabBarNarrowStyle(safeAreaPaddingBottom), isHidden && styles.opacity0]}
+                // Hidden with display rather than opacity: a liquid glass surface anywhere under an opacity of 0
+                // stops rendering its material and does not come back once the opacity is restored.
+                style={[StyleUtils.getTabBarNarrowStyle(safeAreaPaddingBottom), isHidden && styles.dNone]}
                 pointerEvents={isHidden ? 'none' : 'auto'}
             >
                 <NavigationTabBar
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index a5616ae2432a..45e89ccbe771 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -228,7 +228,7 @@ function SearchPageNarrow({
     const isDataLoaded = shouldUseLiveData || isSearchDataLoaded(searchResults, queryJSON);
     // Use the request state because `isLoading` also covers temporary UI loading that should not keep this bar visible.
     const shouldShowLoadingState = !isOffline && (!isDataLoaded || isSearchPending(searchResults));
-    const contentContainerStyle = !isMobileSelectionModeEnabled ? styles.searchListContentContainerStyles(hasFilterBars) : undefined;
+    const contentContainerStyle = [!isMobileSelectionModeEnabled && styles.searchListContentContainerStyles(hasFilterBars), styles.floatingTabBarContentInset];
 
     const shouldRenderLayoutProbe = (isOverlayActive || !isHeaderInteractive) && !searchOverlayContent;
 
@@ -240,7 +240,7 @@ function SearchPageNarrow({
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
                 isDisabled={useStaticRendering && !isHeaderInteractive}
-                dropWrapperStyle={{marginBottom: variables.bottomTabHeight}}
+                dropWrapperStyle={{marginBottom: variables.floatingTabBarContentInset}}
             >
                 <ScreenWrapper
                     testID="SearchPageNarrow"
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index b8b991bf9aef..54aa3e2ef76b 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -53,7 +53,7 @@ function HomePage() {
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
-                dropWrapperStyle={shouldUseNarrowLayout ? {marginBottom: variables.bottomTabHeight} : undefined}
+                dropWrapperStyle={shouldUseNarrowLayout ? {marginBottom: variables.floatingTabBarContentInset} : undefined}
             >
                 <ScreenWrapper
                     shouldEnablePickerAvoiding={false}
@@ -69,7 +69,7 @@ function HomePage() {
                         shouldDisplayHelpButton
                     />
                     <ScrollView
-                        contentContainerStyle={styles.homePageContentContainer}
+                        contentContainerStyle={[styles.homePageContentContainer, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index 9837c75340f1..8d536ad84a28 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -89,12 +89,15 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
             {({hovered}) => (
                 <>
                     {renderAvatar(isSelected || (!shouldUseNarrowLayout && hovered), hovered)}
-                    <Text
-                        numberOfLines={2}
-                        style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}
-                    >
-                        {translate('initialSettingsPage.account')}
-                    </Text>
+                    {/* The floating bottom bar has no room for labels, so it renders the avatar alone. */}
+                    {!shouldUseNarrowLayout && (
+                        <Text
+                            numberOfLines={2}
+                            style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}
+                        >
+                            {translate('initialSettingsPage.account')}
+                        </Text>
+                    )}
                 </>
             )}
         </PressableWithFeedback>
diff --git a/src/pages/inbox/sidebar/SidebarLinks.tsx b/src/pages/inbox/sidebar/SidebarLinks.tsx
index d4859cf99422..65305b0da07b 100644
--- a/src/pages/inbox/sidebar/SidebarLinks.tsx
+++ b/src/pages/inbox/sidebar/SidebarLinks.tsx
@@ -82,8 +82,12 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
 
     const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const contentContainerStyles = useMemo(() => StyleSheet.flatten([styles.pt2, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]), [insets]);
+    // On narrow layouts the floating tab bar covers the end of the list, and its footprint already clears the
+    // home indicator, so it replaces the safe area padding rather than adding to it.
+    const contentContainerStyles = useMemo(
+        () => StyleSheet.flatten([styles.pt2, shouldUseNarrowLayout ? styles.floatingTabBarContentInset : {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]),
+        [StyleUtils, insets, shouldUseNarrowLayout, styles.floatingTabBarContentInset, styles.pt2],
+    );
 
     const shouldShowEmptyLHN = optionListItems.length === 0;
 
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 1a587b428e2d..5fe37e243ff5 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -163,7 +163,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 ref={scrollViewRef}
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
-                contentContainerStyle={[styles.w100]}
+                contentContainerStyle={[styles.w100, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}
                 showsVerticalScrollIndicator={false}
             >
                 {headerContent}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 49f7720d21c8..979bee077bf5 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -244,7 +244,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                     shouldDisplayHelpButton={shouldUseNarrowLayout}
                 />
 
-                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14]}>
+                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}>
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
                         onClose={() => dismissError(policyID, policy?.pendingAction)}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index ee6536f4b49b..1e9702baf4ca 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -724,12 +724,36 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
+        // The narrow tab bar is a capsule floating above the screen content, so it paints no background of
+        // its own. NavigationTabBarSurface draws the glass (or the translucent fallback) behind the items.
         navigationTabBarContainer: {
             flexDirection: 'row',
-            height: variables.bottomTabHeight,
-            borderTopWidth: 1,
-            borderTopColor: theme.border,
-            backgroundColor: theme.appBG,
+            height: variables.floatingTabBarHeight,
+            marginHorizontal: variables.floatingTabBarHorizontalInset,
+            borderRadius: variables.componentBorderRadiusCircle,
+            // Insets the row so the selected item's capsule keeps a margin inside the bar's rounded edge.
+            ...spacing.p1,
+            // Clips each item's hover and press background to the capsule's rounded ends.
+            overflow: 'hidden',
+        },
+
+        // Stands in for liquid glass where the platform has no such material, so the capsule still reads as a
+        // translucent surface over the content it floats above.
+        navigationTabBarFallbackSurface: {
+            backgroundColor: theme.floatingTabBarBG,
+            borderWidth: variables.hairlineBorderWidth,
+            borderColor: theme.floatingTabBarBorder,
+        },
+
+        navigationTabBarItemSelected: {
+            backgroundColor: theme.floatingTabBarSelectedBG,
+            borderRadius: variables.componentBorderRadiusCircle,
+        },
+
+        // Ends a tab root screen's scrollable content above the floating bar, so its last row stays reachable
+        // while everything scrolled past it still passes behind the glass.
+        floatingTabBarContentInset: {
+            paddingBottom: variables.floatingTabBarContentInset,
         },
 
         navigationTabBarItem: {
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 658c23a66748..92aaafef4ea5 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -58,6 +58,9 @@ const darkTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
+    floatingTabBarBG: 'rgba(6,27,9,0.65)',
+    floatingTabBarBorder: colors.productDark400,
+    floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
     textDark: colors.productDark100,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index dfdd66540d9b..acdd7a244db9 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -58,6 +58,9 @@ const lightTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
+    floatingTabBarBG: 'rgba(252,251,249,0.65)',
+    floatingTabBarBorder: colors.productLight400,
+    floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
     heading: colors.productLight900,
     textLight: colors.white,
     textDark: colors.productLight900,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index d1a4f83d901a..18edcdcb7cb5 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -65,6 +65,9 @@ type ThemeColors = {
     signInSidebar: Color;
     sidebar: Color;
     sidebarHover: Color;
+    floatingTabBarBG: Color;
+    floatingTabBarBorder: Color;
+    floatingTabBarSelectedBG: Color;
     heading: Color;
     textLight: Color;
     textDark: Color;
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 2bf01456f591..4f6f495d1e14 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -2450,11 +2450,13 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         }
     },
 
+    // The negative top margin keeps the bar out of the layout flow, so the screen content it floats above
+    // reaches the bottom edge of the screen instead of ending where the bar starts.
     getTabBarNarrowStyle: (safeAreaPaddingBottom: number): ViewStyle => ({
         overflow: 'visible',
-        marginTop: -(variables.bottomTabHeight + safeAreaPaddingBottom),
-        paddingBottom: safeAreaPaddingBottom,
-        backgroundColor: theme.appBG,
+        marginTop: -(variables.floatingTabBarHeight + variables.floatingTabBarBottomInset + safeAreaPaddingBottom),
+        paddingBottom: variables.floatingTabBarBottomInset + safeAreaPaddingBottom,
+        backgroundColor: theme.transparent,
     }),
 
     getStyleWithEnvSafeAreaPadding: (style: ViewStyle): ViewStyle => ({
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index dc24ec84b31f..ae2aa3f1213a 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -28,8 +28,16 @@ const avatarSizes = {
     avatarBorderWidthLarge: 4,
 } as const;
 
+const floatingTabBarHeight = 60;
+const floatingTabBarBottomInset = 8;
+
 export default {
     bottomTabHeight: 72,
+    floatingTabBarHeight,
+    floatingTabBarHorizontalInset: 16,
+    floatingTabBarBottomInset,
+    // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
+    floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
     debugTabViewHeight: 64,
     contentHeaderHeight: getValueUsingPixelRatio(72, 100),
@@ -43,6 +51,7 @@ export default {
     spacing2: 8,
     rulesDocumentThumbnailMaxWidth: 368,
     rulesDocumentThumbnailHeight: 200,
+    hairlineBorderWidth: 0.5,
     componentBorderRadius: 8,
     componentBorderRadiusSmall: 4,
     componentBorderRadiusMedium: 6,

From 2c15f8a04bc74bdf83f421159b41304855263fc4 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 15 Sep 2026 16:02:04 +0200
Subject: [PATCH 126/781] feat: native bottom tabs on iOS and Android, floating
 capsule on mWeb

UITabBar gives iOS 26 glass, Material bar on Android, rounded JS bar on web.
---
 assets/images/native-tab-icons/buildings.png  | Bin 0 -> 446 bytes
 .../images/native-tab-icons/buildings@2x.png  | Bin 0 -> 842 bytes
 .../images/native-tab-icons/buildings@3x.png  | Bin 0 -> 1287 bytes
 assets/images/native-tab-icons/home.png       | Bin 0 -> 292 bytes
 assets/images/native-tab-icons/home@2x.png    | Bin 0 -> 460 bytes
 assets/images/native-tab-icons/home@3x.png    | Bin 0 -> 610 bytes
 assets/images/native-tab-icons/inbox.png      | Bin 0 -> 278 bytes
 assets/images/native-tab-icons/inbox@2x.png   | Bin 0 -> 464 bytes
 assets/images/native-tab-icons/inbox@3x.png   | Bin 0 -> 660 bytes
 assets/images/native-tab-icons/profile.png    | Bin 0 -> 493 bytes
 assets/images/native-tab-icons/profile@2x.png | Bin 0 -> 990 bytes
 assets/images/native-tab-icons/profile@3x.png | Bin 0 -> 1465 bytes
 .../native-tab-icons/receipt-multiple.png     | Bin 0 -> 625 bytes
 .../native-tab-icons/receipt-multiple@2x.png  | Bin 0 -> 1216 bytes
 .../native-tab-icons/receipt-multiple@3x.png  | Bin 0 -> 1842 bytes
 ios/NewExpensify.xcodeproj/project.pbxproj    |   2 +
 ios/Podfile.lock                              |  20 +-
 package-lock.json                             |  12 -
 package.json                                  |   1 -
 .../Navigation/NavigationTabBar/index.tsx     |   7 +-
 .../BaseNavigationTabBarSurface.tsx           |  24 --
 .../NavigationTabBarSurface/index.ios.tsx     |  47 ---
 .../NavigationTabBarSurface/index.tsx         |   3 -
 .../NavigationTabBarSurface/types.ts          |  14 -
 .../Tables/WorkspaceListTable/index.tsx       |   4 +-
 .../index.native.ts                           |   8 +
 .../index.ts                                  |  18 ++
 .../Navigators/TAB_SCREENS.native.ts          |  12 +
 .../Navigators/TabNavigator.native.tsx        | 270 +++++++++++++++---
 .../Navigators/TabNavigatorBar.tsx            |   4 +-
 .../PlatformStackNavigation/ScreenLayout.tsx  |  21 +-
 src/pages/Search/SearchPageNarrow/index.tsx   |   6 +-
 src/pages/home/HomePage.tsx                   |   6 +-
 src/pages/inbox/sidebar/SidebarLinks.tsx      |  10 +-
 src/pages/settings/InitialSettingsPage.tsx    |   4 +-
 src/pages/workspace/WorkspaceInitialPage.tsx  |   4 +-
 src/styles/index.ts                           |  19 +-
 37 files changed, 348 insertions(+), 168 deletions(-)
 create mode 100644 assets/images/native-tab-icons/buildings.png
 create mode 100644 assets/images/native-tab-icons/buildings@2x.png
 create mode 100644 assets/images/native-tab-icons/buildings@3x.png
 create mode 100644 assets/images/native-tab-icons/home.png
 create mode 100644 assets/images/native-tab-icons/home@2x.png
 create mode 100644 assets/images/native-tab-icons/home@3x.png
 create mode 100644 assets/images/native-tab-icons/inbox.png
 create mode 100644 assets/images/native-tab-icons/inbox@2x.png
 create mode 100644 assets/images/native-tab-icons/inbox@3x.png
 create mode 100644 assets/images/native-tab-icons/profile.png
 create mode 100644 assets/images/native-tab-icons/profile@2x.png
 create mode 100644 assets/images/native-tab-icons/profile@3x.png
 create mode 100644 assets/images/native-tab-icons/receipt-multiple.png
 create mode 100644 assets/images/native-tab-icons/receipt-multiple@2x.png
 create mode 100644 assets/images/native-tab-icons/receipt-multiple@3x.png
 delete mode 100644 src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBarSurface/index.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBarSurface/types.ts
 create mode 100644 src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
 create mode 100644 src/hooks/useFloatingTabBarContentInsetStyle/index.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts

diff --git a/assets/images/native-tab-icons/buildings.png b/assets/images/native-tab-icons/buildings.png
new file mode 100644
index 0000000000000000000000000000000000000000..31476c8ea396b7398c1d2614e842ed28b8385925
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0a7jc#RCt`-mcK3pQ5431g-Wq>)H+dm0d%M+JOU4}EB-AK;Q>4Y
zi6x5N^$6QYjCvEbja5rl=gLXGk&|nzoyj6`l2hDo=APf3`<<CP@JlfQ>;Wwx>67Qc
zR1v@~5C+T#EhtyCH2Dpv18rBZ2V4MMr%mStB%0XJc+wTym$vM**`k29im$n14WI;^
z3<EHX>;c!n_)h_X@-z!z^s2Tcz3~w!M~k?V)^S>0e!XgZn+33Lu^4j`%hDE{HZQH>
zH1o-#rg4%5=&D=1p@|A!Iqg!~z0;00_qiWnn3?<u;0ajN<9b8qv@NMtljaw81T48X
zJ{i>HN*|Lq^P1dKt2N!kjv(I9L|WXY2d+*3smTF&0cPB_Q9XW$3@t_aDlp+b^<M&P
zujAN=0QN#z96HUu!WK7Kfb_umbV0Em0lMmz)X<=nH+5(Q)%=K^oPaPuZutUs#u~(^
oXBmK%Z+-@RT8-@@=XRlZ2mhi`77TpLkN^Mx07*qoM6N<$g7g@}Z2$lO

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/buildings@2x.png b/assets/images/native-tab-icons/buildings@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a902f49f984af66f7d147293850465f13221289a
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVh{7FPXRCt{2nmcb3K@i7(AP5x@N1~wSm572q62cH8dY~e-P?|?1
zD3GW~oF<8oP{I|6@GAHO7$WltkZ`C-l<)-*I0a6GOnhjiv9wyvp3j^gXW@~ivH!l^
z-`?!Z?44m?>9ajR4k!S@Kl)SPA#kSKlOF*}K-ea)153cZZmoQ&jgz;1wi^Js4o%+p
zZ{SF$0SX-iFn+ny0D&@S4R{1(fjm(0Ol||X22232JenK50GM_(S3Qu&9Nl|Gce57&
zSx0k7(X1)gno0{m-qD;@G}}PN(Y;IyKt;mlpiF+<6W=ENjtPia{oS+xgembKz+2#S
zzXF6-xL)dKfDrf&9PVd;&{tD@05wUK+f6Q7k%Cr_(9}g!i4iJmGPd^p<G27DR*}j?
zG<#2g{h~VuR29uH$z+Ij(Q~a8U|4j=flWmd#04<zfo)@o=BG9JhRrLwIY(oDquq&9
zj&3pufay@(^Mb1}E9BaJMQ1*9?VF-=i{iy30H!gs?XD-TP1rQ-0I;g)%D|ANGi{2t
zUv4{NzDWWQN@F%9?SXHDRwZoi0be3E=c;HHJo_Y+D*i&o{NT~F1dv7#1^^5I=o-K~
z$v(@THn~xx=46AGBL@B~n)xQ1__>T(ObTE!k8O7pP2H-nNUAJ*CU2)vlX|tRcFP&_
z^?zN+CS$Y`6{VF}h|x-zyRoI{MjhStBmkSzP&HQnqbDX8Er_fqzN=Qn9+Ky$q2eX$
zE}Zb(rIt2vP0qqQO)|rlr*qU6MO*pM@*NrTPtr}CRu2XM3;^glfO%1I)bn0pG{(Dy
zT`5w-P4r)Zae0__#dB(F8Nl@Tdx^G8lY{?qO#Qf{%eMpI8SyNt4>AW7*VYxCS$W&C
z?Ep}JpxCE~YnaB&wv(R6CMIlbn@tNqD2-W8+5@e^h7$96S^0toGHCS`Q@a4#<<r{W
z6MY15-Zz1jJ^(02O<=?WkrsfWa$ZpF0x)C!b---8IQAgH-xGoepNR^afzd<z3n*(w
UU@e}4-v9sr07*qoM6N<$f`rO@n*aa+

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/buildings@3x.png b/assets/images/native-tab-icons/buildings@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e0ef74fac7de2a18efcf90b4e1d32e2fcb4ef6
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qcxk*GpRCt{2oK0*MRTRg6Xq!M3EyazpLQ(uS#ucbZr5K}?or?HT
zF~%26D6ZTgA2BXWtVTD+7<H!!E-bqBsViv&R%*0h35bD(iJ~p2sq~tgoR>@{cka0}
z@6B{Nz5nE_+W*`$zs}r`bMF+QqM{a9D}YVFD9|b)o&_EP23cfU4ZH=M2TTPq2OI#_
zu?Tb{aH1kG>G%_PfSNx!3kAnW%mTMjQ@y>waE!z^z%pvsA<xzTj*+;NnrTxFpqNCw
zM9nlBnD_-?N=BYMH#`sg4Ez!J`*swqm0AH{UI6;!_b&s+18;T$xH{3+2yjO6yvrg3
zv?Ig!f#N#~^gDbTfd85T=zQYIN$U;;&@-MkCz}Fj%Hz920W{?Ce%us5bJFLybdLgP
z%+ux%O#x(pHyoZzfUgzbX<)$NeX41lw2=<^c3`DEIU1bgE4l?(B@5EMz`sodWEv2E
z1IK}P@~-)o3Luk+i@<BZr4bO`crOA%jmIJ&yzyfMgc`R*KzQSkZUKD@Y?tN3m`nmg
z8vYB|0}RW%K9M8oPsKAV^QW0W-!H&U$<^k3IKcCKH-IJ_3)TUd1Zr^BJKB3CAmRNE
z-%SCKegdvc`E2e76<@0;p!rliC#i>(MqkeG*@RDdd?!5>guP0ew%+8@HF7UK2Q=;R
z4JyfQ_IN+>`0UTJv{`A>E@`rKq6|RiJi83ncQL>C%HwN$e2*(_UYFrprj&dO12VEj
zT;y@LeV0quN*UKzq+6Te{jA_?t#t=o0XhS0bd)T#Rk@K4xi1ChXn^lX3X(0|z8c`O
zIX#ie^={y7nShMckSC=Q=qq+*4ZC*#{Y&M^Nyi289LO=P=*0Ju>!d79P1%4<!y^JB
z0wMw;0wMyUp3#$G{t)ny454`%KPf|XJLfQOCyZZ+*SB_a#dnhHA!VDpXA{K@DbJIE
z6UF_hiQ-zB1Zuv+sfl7=U=_gTv@MnE#()D8T>*M9!?!1(p4024hE}%No#7iP3()VL
z#p*hx(MLUPwmm-kT4iag(x!!9>0))dX626i>sIcVmtvDkTa;w&E9g?ctk1H1r#uC-
zeM*~l)$Y=ovI=HKN(||PQ1&l%O!3V~nKZ4CRk`hu)4Dm}u<4ZJz=X~H^RkEeBl7ux
zErjm^ehu(+AnlXF`__PZPBIRPXIQQgdJ^}v<TxZbhm=?1M3D%H2#5%X2#9({1VjWx
zZ2<iyhXS&;q&pgrnXR^mpS3FAEgOM(uhW(l{7N~C_<ogu{sC@Pz_>u=-L~0Q@H%Zd
zqMX)vRe(OEn0DnXb``x&x^C6c<;qt|Jp=S&K|tE6{AAb-zbp+YUi(^Q=~xwjS_J{!
zm7@(?Ce6}wiZ|>0bH7rgTU3B90{1$u(HC%9%y!5wjdgQhbpvFihCGs}X08b+S#)At
z`kW5bodKH#tzLYRX(|MiJfAdOz&9t;g3w)*r+f8LZ>wTJRfX@{HkQkQ%cTlvMi_YY
z<`M?<ddLk72EOa9h5<UB@zI}C>*f1)vqS({I5*_IkyY{u=4^uj&B#<B_{ni;IdGrj
xA1t}HaYA%eN&l!RPmIcFrFO_sQBjns{{ePx-cHm@%}f9Q002ovPDHLkV1lITT|58)

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/home.png b/assets/images/native-tab-icons/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccb34aeed4888197e36a0f98dcf3407e18567285
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpx`x6
z7srr_Id3Q1avd^|aFBnYu!Ae^z|os0jbA7&>OOaLt!-2I2Zp>jr(G6hFCIO5wP0OS
zGJ7veP{+b!LBRoEnzuiBZp*=9m-EYEJx?KT1e4Q7rdR8p=q9W_8C>RY`{?93#!ocG
z6Czw<7@r-us^q_uk$b_c@Ouo`ERP&YU^a<AX?<W{LyQKW!}pmrY%2LDT9pFVwa>H?
z;BM}e<M8HasZ!8W6!`D=fa6C)x&VW^IOF|K`Ap)B=Y=Lz|7W-_*x|+D^6TKns0pEy
n8&ws)Z+ho({Y26EyLT8Rye+Hwug$p*^dW<%tDnm{r-UW|EAMgL

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/home@2x.png b/assets/images/native-tab-icons/home@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..395f787214bf54f5535b5b5522f08edec91e1725
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVgen~_@RCt{2nXyX4P#8v!sGH#A;HHa<SRcU62XOQe1P3RT4t)W;
ztB@yf>;vfJoJ=mA+#I?X!9^>0<w63nrcH8loBYN9gAY2i$vGu_y-?6-#O4%uPHJB-
zOxA!qz)W-itRp--z*7!<+99xu&>R78GvL#{1IGx;3UCE{mw?YU09M<E-vAyef@k{(
zY_<h|0KC+IPdfq*n}$CDK0Uyjq+dW6SZZq`eRVL;sV$mFUmeb4YVAbE4Zs`UQ@iXq
zk-i$#nOZxM_bq{&x>M_GB7JpKWoplWu>fc@(Q(2yGhG3orl6P8;J1Z-^Jb#<2Xre>
z;6ebLDcSQpfg1r}rerPap9BKHOvzeS6)-A*3jE5y7l?rf2n!l{IGP8(1+FU|d+mE~
zr3kz_p4shZVhIBFk#J2ULBKxOt_f8j6BTesr~;X&fI~tR$V3Gk5~@HZ{RI-}=Ur^y
z@n4sw1wMezv<r3;yP!gQH3WJU?`7HcYTQqQ@B9FGrsk12kb+MD0000<MNUMnLSTZ!
Cn7sc0

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/home@3x.png b/assets/images/native-tab-icons/home@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbd209645b85c3586887d2bc425009d27b5f2b9f
GIT binary patch
literal 610
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9EB4?vjF!m7EPfq_ZH
z)5S5QV$R!HhS|Y^5^eK61hhn~O1hdAnqFR5db3&T`lC6H8xl5oEzG{%^N;nv)A4_7
z>=$pkW*ieM>AtjZs+?s3^TG+$d1rQhuls)Qd!x9MQ_=p<6Hb2@Vshe8w2^&~EA&4?
zWlMwd1E~Vfb(5d}$?i=Pwulxewts#=jCUz_jsHaB^ZW_Z+YDL$rA*jdaa#5Q!>t3y
zMUUJ$ul_*M^r_*8N?yy)HO%t@jDH;nWwHGHhbb<YIqCrW1GPnSD*rJFKVUSCeW(|t
z70J3wGQ46<$SN+L@R)}illF0KxelT?ag`{o{SaXo%KGcTQbx^Zs~ohCi^l!b+7Nkx
zYki973$Z<iv_o0jRM&o(5&9r@ZupMP5v*3n!gj3Gx?sNRQ1a8~R-q3Bc9<4)>?xi-
zr&Lvqjjf#ZxytG};s@q7HpU+Om@bzh_~q(>4eOTFaGtD8OYjIUnzxLzDmlR+yy)9y
zmc8Z%3$!io9Sl0g##W+w+<Jn73J0fC(*%V#u0R6FUR2nWb~0b@pL*-P`eXaQi~NW+
zcQk%r`SHfdz#z@0zRvTRb6I$c1WZ;;UJ%FE^e5dbfJ;ckp^3>OfPs@s!I4o#qk)BW
z!U6^i!AKF4NeX+Km+qOQ@MnI+^iLc!%pxwZZkYJ=&}BBRT@2qg#odXnnR%!GF~`kw
pju*<7+;lq`*?eC{k!9mgc9lnLtEYcrzXVJ)44$rjF6*2UngHD605$*s

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/inbox.png b/assets/images/native-tab-icons/inbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccab0c1eb69f7dd22a6db32c06e6979017c6b5de
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpx_Bl
z7srr_Id7*r@--QVxX4>uHpMOK){A(3c285+G3ggf{fpTX*}J7CIqh2(s-b$U#Zyi3
z<@-I;1lZ~phy*mqWu$(u<FR8hO<;;;-pOAgC75%sreN+q+n=l_nBoH2VvhR8<t=2{
zE6Ee8Ry6C3UzCo?`GuGE&5^v2#rB7D0mHdN(F%nvs%5_C#A+Gz*2^}Woo?IAP@bUq
zEc}47+5raDg3Wr>XR_~~*PAw#MW;b4sp6^DTpOi?=fB#5Z@VOG7vEn#TV3<7=NFa<
XLeF}pdf5pA{lwtu>gTe~DWM4fKHOx@

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/inbox@2x.png b/assets/images/native-tab-icons/inbox@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..609dbffa777dcd7b1d9427db3b9bed5bf1d698d8
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVgf=NU{RCt{2nLA2DK@^5R5JG~DiF+{Cv9*X1>;y{@a?8;TBr8bi
zdllj`bODN%J{IA#b7WxBg!`I1_c4U?!{1!y%=y1zZZii&qRQ0)MnD9pnjG1lrgvej
z16RN|pd0cRa0&EW!*2rb4F=Z>egpb0Cm&LHZT$*#^8j225LPGnJS%+1-n+%Z2Vhd;
zPdou0V{&`~?KFT<LiiT-tCaw;lU5YP6ijJO)0jNtv;q}VV7@ga<(fwTN|q7;1i(v5
z01yB#DFHwLyrcvG0q~L%0G0q?25hBx0IU`WXKDr+d(X-M$m1tq#UZ>|`&_VBB>={|
z4gh-|eN<HdHx2-|Ap-mX`#HiN*tNj{82<o=Df=G*zn(o*l>l?!0ms0$^$Boa(%z~L
zfGVw)8XyWFpw95v^>H^e57Pk5)AdIHA$5W?pVy5p0tl)Td`b@W>`Y1r<`-a%oa)<|
zR7l}Ba8%dMq~b<Sb>8_imy?fE+m3bW9&``${IDVse)<P9c$}t<a;&@n0000<MNUMn
GLSTYG<hbDg

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/inbox@3x.png b/assets/images/native-tab-icons/inbox@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa76c2e9e48e364b058ce7d1f87e36b926d705b4
GIT binary patch
literal 660
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9EB4?vjF!m7EPfq}`*
z)5S5QV$R#yd$XoEinPsN6PvWUcFVS2wRKheO&%Y_u3X7FaxQkgLs|CPqgI?ZvR}%s
zSS`?D)^#i?C1sVvzR5G^&OKvZDPJ)=Rq|Zrx8IV}EEQS=7HP5_VB5gj)9CqBvOVg$
z^IPs@)(Wl~<{1CaqBr>VraV<MSiRt2%ugns;*&es|EyfF^3F%w+;iIL9Dmj=nCbdd
zV8>Lg=QYXOuNMB~(OJ$>73TPH=_i%2a|$*eW8LeRb|2W%6#ldD<JPx~`+MTjHbyt_
zCLjEMK<n?p>%R`Zco}u3Df-yd&0ha^q{MjgCy7;G+;~CnZ|eHR>jTd?P3~)5_GNme
zd;GrVI!$U{rsvdpPH1G2^dOVCAjAE(eX@|@O~$+l-_JbpbCUh7%Chr_Oo~<PEB}3e
zBOGd%>z!cSZp^W3^MYHe1iolBFSxGDZN<YrGiWEzpWMg^%=Z|d3q9fKVGcOUQFOpN
zK{Lqj`orbVSS%m#7CdCx8pCo=Y{habN4_6?Htg$Ub}pKBD1Gq<+43;foyxzL^eZl1
z^2KX{^-~W4As0i($6Q=xt&iiyBHaXI7Vnf-&e+@36#H<E;LhT?p#dc)C9lnx`?r3Z
zw#J?ixrqn73|>o}Uw&nx&-t&$23KDH-#54WtlRNJfBEaD`|unt*^vEW+o$B^k&%3t
z57yT0{+a&japgQq^}9?lta5GpmDQ%Ei#!Xw9u)V~i9>P4^!mh7MVVd4Bz^&t8H1;*
KpUXO@geCyTs3YJ2

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/profile.png b/assets/images/native-tab-icons/profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..23b477c9c67eb099a9cb65d15684e264ae58586f
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0pGibPRCt`tmCr6iQ4q#|U6iEQ_!m3_#T$r<$3V9l9)LcAwGe+6
zO%dJziK-=SQeJ?Kgf6<nrb*=_-(_-pdwbg^;!7rJzM1pQ>CD_Y@DDHxWPuZ)C_53C
z>_vDPC<Bc)Rsxnf5$*#Hd?H`Ed0ti&XJht(cogw#bLbgZ0|w-uk|8b)yqNf_c1i5b
z&w+&adEn9bD!`n4F6P4c_QGmz#be?}fwzF#SAlWG#C%CoK?%yHEZ)r>HbNSl;TH*0
zt_K1}(L3a7Zm|=R!1*lF#y4XfS&^Tnp&nL460G=Q2hDVCS;v`3H-3Kf15W|s6-}KV
zck;WB@dw2q(qIHQ0$yc@z;KJ$Q)v|}c`GtU@5oE*Ca6R%ksp)5rji$AIZf9@)Dn43
z{!pVF#(-m>9@6BxO6Ou7hBPQmO-`Ca>-uu55f+_i@A|SchMV^PwUP<0bs*l5)pXYV
zz7J~7LKmWq78bZF(8}#qe3uZ!wQ{=^zl`!G#I<s}xp|xpkkVFcC+r%!*om+oZYyq^
jr_y^m-JCa#;-BLiwSE2NzHp3G00000NkvXXu0mjfWRKbM

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/profile@2x.png b/assets/images/native-tab-icons/profile@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b5c76f49c84adba7216afb8a5205e209a3dc1b
GIT binary patch
literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVikV!;ARCt{2noCHPK@`V-nPsWbW6@(_S1Ah07SW;yMX6DdSZ!Jr
z;l?uC7)B6ft1NdtjHu9pq-a;sDrnOaqAV9tiT1E}?b0%O-WWK7e9X)@^ZDI-CH%ty
z`IvL&KQrewbA@62Unl}9fI6TNI4;sC-zsFxkU<tu2DAXLfuy5!1I<9G*ho9Z05!l1
z57H)i4paj<=_0S(;AITNgYpL0m`dW~fD0)go(xDUkRLbs89+zK#D9Q?z+s>YSOqK+
zSuNj=0FPv>&DPU6gMA+G!7|xLU>`8u!)5}g2R>Qsz6Xlq*m)EAufQG&=paVQ&TkS~
zDBpq@3+x5HSr$<^7@s$}O&c&%qca-V4Sd$<sNLQrV}h6^uBDsnNz|Ay1?&~sxgaJ2
zHywiX1~5URp9@?y=$!K<zurPVTQgo2qw5}-=9-~^Wm^_e?n++y^ecng=yqPAGD5oC
zY_O$HqTNvNoQhqIAz*br-;W0o7I4pEZ#K}U(b*bCKFiP^sBB|`^8LRN7NB&-TkO_r
zbh^TNr<I00Z*m=lxe>_s%N&c{Ttl5$Zd*W$MnM%R8;S<8fJBJx{TiLqHid4@F^3fr
zmDhVBkpBXV3bCEgxTi`m&O51k8yB39*tEHz-Sy-uGy_#*<^tu*KRw9*kWAx(qpmff
zPBTz-kgnM7v4GHYH~`x;`a99!kY=E2iG5HhHN!-_7ue!ybB)H%LEXS6&A`R@V;ayP
z%~`LA`uhMdHG;h*8eYd-7qFDfW0~s$bS|`x%wvOwmpWmmAodA1q%|l3c8H%gi8M%$
zRT9!Z=uqt%#JV)9-fqG$Netcwemi8KU%)M(R&>K~#x;%V3fVJ@;VH7a-y;;Ue(4i`
zo@|+?!>0uawh~I_2gZz$W9=OT@u2jGyDHlQu|P9cb<0LHYZTPmW<S*3^m2^ElL5H|
z<PDhbgl5c1+X6}r$6O%(+Ll7{Ns;?<$0#sdYOL*amR#L}N*95<X&|2zxg&E1zjwMk
z2K)3h>6R)SFZFS}I>#-YhBqbW1}f81jwf1&0O_R2St1}`UWqeJ{&66+dZEDcr=z&#
zox{aH6vgsNoNn@O<;f-%6v``cI^8Bg%*dBl;&cRT9w|gwih{cfSWB9aBd-NrF%hrw
zDN=Dl^(8ChxzFdPS5@gxNn@6gAG%FQNX4wx{HsB&xJc~5ISew0e@nXoP-2-0MF0Q*
M07*qoM6N<$f?!p}j{pDw

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/profile@3x.png b/assets/images/native-tab-icons/profile@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a620f6bb3dd49f80468cf839c1baa3d85badae48
GIT binary patch
literal 1465
zcmV;q1xEUbP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qdYe_^wRCt{2oM~uXMHI(>X(LH%6Vtj-6&G9(f>^MmDu@zO>1xH2
zYO#%0#kzwlwQj_MD=PR!{HASF)8Yc+0*bY*O8u_UC}}EwXicrLYFq7seKK$^gh$@Y
znYnY{yYKn_@c(k(y=TsxJIh(-KB%LPI%*hgz%1ZuU<t57xJ0hal6(FaXa+igHNX~N
z4^U9j-1|B3w8${BY66YG0$?NXw}(MoG_v}E`O-$!p%r)(_$8uIO3}2jO4`glCIh{|
zzA_l5n7;#00h7ont^sydz%a!e1{RVdw90x=$Qk>9DU~+P#lTR6&g_#n|BY}s(lq@6
zm{BR?ECdb)C_Mta1*}x~If<Wihm2Am*C62mU>;@0&A?F)CI11|0<(b$DcYSV4&*xE
zkVpGRfF8<doMRqu??qsG26~(dyyP*8jn2y{!?Zf8ROkcXEQQP_nF0?1uLvIm=E`p_
zoGv3uJCf#QxgZ}@DDel-t&n#b@H+69MV9&PH5n}~To3%I9Mu<*!B#$`Xx!{T=P2ae
z=DEO|PTiuAdoD1b+})zO0R4(azfeZr&j;*837=KSp9*}XkY%Q26f9C2N8{q(o5DB=
z?^1?58Y7utHx(uWKPje_X5_Scx(2p|_5wwF(-hNfN7~d$uVO*gtT_hnM=(yp_mpj(
zr&ze32sO?L3U^<#TN#|`;X7$)WSyaGd#OX#D9{pOpw$k+?|8_%FQRc0-tE!8YxF+i
zYn(<$vg?4y8#Gv-fq~xiX#Z@7Td~_WGr7Q_+zUR!fX^~8(5Id{yzG!?Ja;uVS_B;u
zFW3i~E!US{dg?G;g62~4HfRMkI}+?`@yFX47-&;~9_t;;h9>soDu-fS0g64Bfq|Y0
z&|{86<`o(tYaGe02?2^-o`Hcb3(P0|YLRLDJ}0(V1oQ_el_=)&$bC4RBJsA#B6qV!
zz=%b_O2V-`qJfO_7m7O_+r1TS4#hfBC}!UHClQSEG0>1gk4qi$tp&&q$HQ%;gGogU
zrZCR;5p<a5Xk%vRDnCjboG5cW#P2yJk`A^Q(-Z|tqTBM|PU7J>-~r$_g<;G+_eVaY
z@Ux}8#kL1mIPyNRVKN3c0q@Gx+b<lHV7MovLkZtn`e~{*K?eGc+QDF`foxN3gxbNL
z&?z>@k?L%q`q3bL30kDH-sZ<!tlOm|y;z2~;dOGYUG9mAscE)(m!sI3Qn{0XWfD~n
zINs#gkvkw|nj3+WQtIFe##_^b8jl4i)FehRrJ;WV{GVbP8Qa8Is`Nw=9#0c$xPsLW
zJrpsO%O`=o5sXrbd!-GZD(OdQgH>C)W4}Tf6S?2x7>ThtA_YZPgx?~4NR{sBbSQJH
zBRRgcjD{)ZcHn%Aez(U+m^C{p0NYDEx76`=%0+V`<c1PDejOv_syVFCG0wslvoM&J
z$K;&$SX`nw^r^;thp??<?tL`}1}Q~z7%RcHm}Q?v+42e&E|MLjkaL>a`?ZdHcFE@A
zg;frrnp8zz=+gCJ0?;bQ`wKPB;KK{Zw-1FHr#Yk%j7d^rDby&3VtjixHwPWbim8v_
zCFsjRXJYdWB4SF)a!ua&W15Az6lRD!UZ`@KaOgrZLKkp22b~P%5lJg&ik_UsT|S96
zlVmFkmMPPvdEw!58fWZuvwet?7gpqhx&-ZxDrKcPn8lYpAuhnW92jFfKj(OIgsz<U
zN;_hD$g$BZ`IpfOr8HItmV(NT7CGMUO1j11F3IOq{2TcYOq3mDL*OUmww<X@0%`9|
zU|!J#Tq(7u&7Pxcw>;A;rJ1UjMlsMThXrQK(VOHCmb&HI%xd{pmpbaGgAn`&3>*Te
TRsNQ>00000NkvXXu0mjf$po^`

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/receipt-multiple.png b/assets/images/native-tab-icons/receipt-multiple.png
new file mode 100644
index 0000000000000000000000000000000000000000..88c0d4ae12e8f4437282f20c5728546efbdc8113
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^1BS}O-RCt`t)mw;8Q4|O8pKF9-FhvoCT#8aslhnwA<dQtdiw6?L
z14@%5k|-%nqe-NBle~H$w-PTTB}y_1xulF+G&07gqjhRKon!c(X4UTOz1DyK*FI~l
zy*B+oMkn(X*c9`L*j^9eF3gMhYJ9~SG~yj<Xu}oU58U|pj>4QW(xaG(CHRTY*os#{
z*o)UOPsbMwKnt3~;Ttrd3Da^1m+=W7OGs*cj4V`J3c82*hUK|~_Bx1bF&1NKg>8Bo
z_cFi_JdHnW58RH(OODxyDHVH%<_=aBjJq)-1r+33f<26Z5t5XnGu<$|U>uX!hD5TK
zVH-}z>2mD(z&$E(TuL1bi%Q9jj|0$&o<4GLFE}m~^e2kH{o*eq-EqS15?fY%nH(?Z
zcNQI7PmEm=j%G}XS{G$kc7VpX)v0b}(ZQ+2*in+$5!hehpeb^c>Sh%QS`uSchOIb*
z8_A8X8XKYz@^x?I^$%J550|P7w<Dq76a7I9PIS*oBJjJxrDPAV59_fY`b#RU3HEI0
zp2YfUnS+th=+d~B$v7;E1LW8{VY?XXlchTg9Wx8VW*ovf+{K5A(7liSZAm96m7D+3
z<Z6Y{5Phl^??<V0)It0*z6;|$$>wvb9PBM2=)v1$eJt8YEiUIE9KihGID+9-4%S7f
zWw-KqknF+O2;Z&foLNa`q*JSis$_EVs85K~W@MRUtvjo<{w2Qv*M=gkvHHWL00000
LNkvXXu0mjf(eWO6

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/receipt-multiple@2x.png b/assets/images/native-tab-icons/receipt-multiple@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33a87c5e95d7955a3676ced3e691b42cb4c47fb
GIT binary patch
literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVja!Eu%RCt{2ntf>1WfaFhd#Tk5v!oVoRM-oOq=;`#p;bafw6G{*
zj#_pjNx~Nb%Rj2w%2^RqZ1iSkDO#+k45g^lBBEwmEh?1)rNq=yu~zxA-FV<!I6nS<
z&&%EQE^1#m?EaqToacPc?>;Z*Id?FC|29Sg6H@vv11k6zzz`Xn&|VGf2Mz%lt8XTd
z1!fe3;0eH0Kv_cHwL)YIaK6>IO8Rp0Fi--V100aHr<K0xJ1%%soV^89s`f#^Pm17f
z;1cO;u*m0REwEWVuTkSo2F|v8j|W}^&IloTF>tfhHWoOn9CiX#()UaP!9Rg#fqf|f
z*s@jm8Uehnp05YGMQ^Fat1M|oyduia1LZPxzDjVq4Ok5H29k8iA@PMQ=pLX2ct}2L
zT{DdhYJe|+m39CNmGZ~(^=6A8!xV>Y4!xg&+49#sudoBi6p64cS1Jx4M%XQ|1E}k#
z0A?x<&qdhXY6no$PXRokILwQ%n`8%2qE>w&#Oz32!27^nhu$j1;f9Fu&msZeM3OWI
z(k7q-Xq9zTC*P*V>A<%sV|=IdMn(8d#G9Ts+6FYqp_4lgLNO<0+`oZR(WwmFo;RjB
zdE8+%mA*l5)3%(e^mYUU@LHOa87T(6DY;MxP6MWU*4GrJ|4~2ykEA)9;xIB<XBvh8
z6M<>K1HdxiQ^}7)=JcIvti=KPx2F*~&tbF&m@mdHa+G&^c9>9kOmUbWpnqvv0Hw01
zvPG6R6o;Dv^oKfT!%^vOv7}4+ALG&O_T3%c$&*BnBx4`QF7ZQzZMPzIsz>*0Jb2PG
zfXVgW1KNSPKs_)#;eKn<@%0fwR4dzG0;gLd?sgcP6#HbtF+C!HI%W5XL(kk0ow(Xz
zTuU4lMFfyhc1r`d+(ca9FgC&YV5ZJRz`el1hyYsE823B$t_UHZ@4;F&%RPCJ%=>y-
z2ko*hestLSq(gB?D+*+#s^LY<4pJ!DWK|=4iJuei_Co-_EB}L2bWBPfgth_@`VIJ8
zF5jlga2s%+CqJrE9DYsce>*gQxq&2iNz(SREW8G(g}Mq+mpjIrtn@zfTtA(t_k7ij
zvXJvZxnt}mrMKKu0B~Z2!$~uJ!;OxyTa;e2rv&4~NePv)oZJ;jxJsr*ldP@3909CU
zcDHznU|wu@Bva;=rBNfPKt>Lv4%rrSRp?OJpvJ6qlp%xQs*>%M{w}%fXA30zl>alW
zK2ySvLQIvckTOJZ&{gi$u>r(X$qFeG6^AcW`%|$2#8k-&DUFK5tEzogYyhEEvcAfC
zsrToeA5<KgRQolt0i05xA2E&qOHxvZjk2>;sDtYT#i2yyWfzhMLaJoBlw!G%P0RC#
zNgY&gi=!>Frer=c;T*~P*Gyd{GyD3w1cJTlguD*;L-l<xhoUa>u9ZHM;2n1?5ofz)
zUoMe1ssnh*vKa^Ll#~3J8a{BM%;%^>DPP<pBu$p7afjTzcFJ3|QEg?G{e}w1zY2_z
eYvlm`*Z2pnxr;KmA9)%80000<MNUMnLSTZ}zBVBM

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/receipt-multiple@3x.png b/assets/images/native-tab-icons/receipt-multiple@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07be16e489816bb3c3708d29be37abbdc77738d
GIT binary patch
literal 1842
zcmV-22hI42P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qe<Vi$9RCt{2Txo1oMHK#u&<E}jA&LqL2wG6o5MvZ8!37O!jdiO#
zL|j@8YU8emilUKL0}2|{hPX$GQnd-75*I2)jiRZVswfgu5K#mRDlONX<h*1$&dfV=
z@4UyYzArgH+B<W4&bfDH&Nc;#D58k}5qbg0Y;PgbiUR<w2Jj1jagK4r0ek~s34k8>
z51<mjB>+ksW9Zpi03xQp09<SsM+RwD#*IQZ$H|H^F9PUo8F!g7E=$`0Ow|lKMH@rL
zPaS#!SOnl_Hh>Mg09d6d^ge*T+PDD#elr*-OAP?}02m425AE4a8n063=fY0NGj3J{
z+zQ}w%eY4@3bz6ns*HQZVVo?r1L!dPexBj)KH-r4R_60~5(5l%EQMhJwipDRp)G|m
z06HBCuLE!;fQJOeanVwPjLQL>XZY&pYI9GEW1KU1GA)fm3>)OT4q=~X!|n>;tAvV6
ziB3HoPxJEc$3O4JC!Ric6>kG7=p|nTpxS1j8x#h=12{=}RxJ>C4GR|)h&p+HQZbF6
ztpIQhfELGm+6J=7@Jr4<%Nn=~Dm4aw1Gt0tnN0;$+=oVJI$Yps;L`!@1K>U7_Z__9
z{|kquK;g)fDl{FA3c&L_+Y;NE{g0>{QLU!Ko&k808)HRV3Y3mKXpTXLUla0t)MX%b
zEk@md78`W<C?U`5T?T4Mfzpu&tu*MMo<?zqHf}3!Pl3{r=SifeNbX6<v&?0na|@(c
z8!u=2VsB&bcQnUR6s6Di;B}Cu!=-_Jt1cKF$N<{_{K(<JJPs_+VpoDrO9`Y#I#ruD
zCV|}KVLP#V3_~<?tW(Q=$w)^$=Yvr~87K{+Vy^@SqP$d2tP?W(iNA<^VLzc9vkh}M
z#x#&9(qA6aiwzCwUeaWk`)N!A-6#?486mR_@`ocloL0(F>v$=qfzFf&H%++r^bKH$
z9XMfs0_TWk^2YAUCq;&!nsPoWX2dkmp%S4l6f&FYQO-FKz$pN(2JkR|HvoLi3Hm4i
zsaZ-}o?G(LMJZWnMBE8rI)Fi(m^zp<b=Pq`LqXrSoSKdDOnQENYz!WB=!np-018Ec
zsYcUb-xxgJfd@9EKxrSUH>6M7J$XFoW1x>yptKJ)8g%%=lLu8j#CRbEO8XEM3Uo+H
zN-CY>W1#7IQiQzp54ie3?!=t{UJH=P{F7Y<6%TsyAm2-ji3x;V!&TG<PM>5Wb&B(B
zsPgoEOtino^9s-TbP|hktOw%`ep^QxYE3>^l+ZxrY^pfkWA0jCVfXf6PTd<JaDPGr
zkteQVkjLC*zQUFmngwhrPgiS;4}3ROohVGvtHGvHxrr$E<c$>q#<bUjK)Izs!G~To
z@clAy*wh6J1dKPuY$>6)JCM7{>Hus`Xq<@s9vzLsx#!0*&;vr|&v8I%i_}l#rhqzr
z%Po8?M}cXxVY$}}=h6Y=jmaLu{Q%%Gj?`Zd9I5*d#b7FGg!A@@W1w-{LBXU%QM`)r
zf;m))jfH_JP}r9!52Rv<V9tke4b&sh=2=LhOrpLI=345{A^}<opwxPPi?rF_%`L!3
z1L)7;33<q$3wgb4(4jTQoV$`3Xkj2DtYvR?J~w4m@yQ|G9Q!kmTz}^?!`!AEb4)$i
zV${dz8+;1DEdb62a5(oZhQMs0U#1`RvvSO#uQfKRJ&aSA=j#E|SdA*Ha5SLnL|<oY
zj28;kl4s+T2t%KUYx625IL1=5Y9b643PqoBzEH|l66u#r6<PfPjBV^ENrmglg}Er7
zN2Qi#Dd&XUy?n=Gz2`ni*-+iUwm_KpCq}Dqb0nwCCrF*l@!kSnK9cl`geae`W2I#*
zy@bSQ@`%T(I8im28_}zI^In+8AXO)-$mm#X89OP2fo2szsgOi9Jsoo_V`(`j#*`E&
z?Mu`zt)kX4F4y%b5hkQSVPB&D0u>d8G3}w!#luseurE=Eii$GB7&;h&pfo_fxX?sJ
zNfjAG-HlGqVE8@-O8XF1ZguEaM9IYnh9xOb+C+^Ujq7O{>a)xhSK6+V#=_hJD&1*#
z+qT}s9a%mq8^5Xb0O%;u{2|x<d~ehi&_HxGlyH&5v7}~)<1`t2DR)gwUl7=V-N0UZ
ztVF#H6#=~4N!mXKkW@I!EwPyE%2HX59)STI?gYgMM_*sAu8fU}Kp9T0n#Q$R-s&)3
zPHIS#q)8$#=ws;N$wtj%b41)VhP~iE&mLv+jNfKs>!qF4V72CCsnygWTrAX;ZgwQn
zCMu~EQv}}au#}bA$_-Jbx4cX-&KCB<T{woDtWvjR;-HehqH7&vdh=C=4#UzaLV>B7
gp@<@iC;|%p0f1sTB9!jRX8-^I07*qoM6N<$f{Ru}xBvhE

literal 0
HcmV?d00001

diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index 54548c581a79..641c3c63d9a9 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -817,6 +817,7 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-timing/React-timing_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TrustKit/TrustKit.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
@@ -850,6 +851,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-timing_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TrustKit.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 4af082831ca7..0967642080e5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -128,8 +128,6 @@ PODS:
     - ExpoModulesCore
   - ExpoFont (57.0.1):
     - ExpoModulesCore
-  - ExpoGlassEffect (57.0.3):
-    - ExpoModulesCore
   - ExpoImage (57.0.1):
     - ExpoModulesCore
     - libavif/libdav1d
@@ -4218,7 +4216,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - RNSentry (8.25.0):
+  - RNSentry (8.7.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -4245,6 +4243,7 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+    - Sentry (= 9.8.0)
     - SocketRocket
     - Yoga
   - RNShare (11.0.2):
@@ -4432,6 +4431,9 @@ PODS:
   - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
+  - Sentry (9.8.0):
+    - Sentry/Core (= 9.8.0)
+  - Sentry/Core (9.8.0)
   - SocketRocket (0.7.1)
   - SwiftUIIntrospect (1.3.0)
   - TrustKit (3.0.7)
@@ -4459,7 +4461,6 @@ DEPENDENCIES:
   - ExpoAudio (from `../node_modules/expo-audio/ios`)
   - "ExpoDomWebView (from `../node_modules/@expo/dom-webview/ios`)"
   - ExpoFont (from `../node_modules/expo-font/ios`)
-  - ExpoGlassEffect (from `../node_modules/expo-glass-effect/ios`)
   - ExpoImage (from `../node_modules/expo-image/ios`)
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoLocation (from `../node_modules/expo-location/ios`)
@@ -4644,6 +4645,7 @@ SPEC REPOS:
     - SDWebImageAVIFCoder
     - SDWebImageSVGCoder
     - SDWebImageWebPCoder
+    - Sentry
     - SocketRocket
     - SwiftUIIntrospect
     - TrustKit
@@ -4673,8 +4675,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@expo/dom-webview/ios"
   ExpoFont:
     :path: "../node_modules/expo-font/ios"
-  ExpoGlassEffect:
-    :path: "../node_modules/expo-glass-effect/ios"
   ExpoImage:
     :path: "../node_modules/expo-image/ios"
   ExpoImageManipulator:
@@ -4971,7 +4971,7 @@ SPEC CHECKSUMS:
   AirshipServiceExtension: 50d11b2f62c4a490d4e81a1c36f70e2ecb70a27e
   AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
   AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
-  boost: 659a89341ea4ab3df8259733813b52f26d8be9a5
+  boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   EXConstants: fa5647482320b7bde855057f8b86580456d4b9f0
   expensify-react-native-background-task: 03c640e1f5649692d058cba48c0a138f024a6dd3
@@ -4981,7 +4981,6 @@ SPEC CHECKSUMS:
   ExpoAudio: b69f36525132edba8d87a715b3a20c678ef78b30
   ExpoDomWebView: beaec034e51bd028428b98bb1f2633ab79c6d095
   ExpoFont: 59e1faf66ba9bcd232ae1e2ce58d202a48b6f65e
-  ExpoGlassEffect: ac454a05346de8610d61dc1324d624893ca22d14
   ExpoImage: 4c1e7634db6033185a98959fb028d8d4b1c89695
   ExpoImageManipulator: d3c962dabd86b331980f8ec6794c6073b3cb541a
   ExpoLocation: 187949911b868f72e34a8a6f8f487207ba86388a
@@ -5012,7 +5011,7 @@ SPEC CHECKSUMS:
   GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
-  hermes-engine: 1637145fb37fdf98c062d0056874f15ddce37e20
+  hermes-engine: 8992dac2fb037a77b783469d993f59f96167417e
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
@@ -5143,7 +5142,7 @@ SPEC CHECKSUMS:
   RNReactNativeHapticFeedback: 5f1542065f0b24c9252bd8cf3e83bc9c548182e4
   RNReanimated: de3eaf0bd2aec5036554a125eb02c28b59de45ae
   RNScreens: 2b6107925ee4e14a9b2eb0dfb52fe25223aa64d7
-  RNSentry: b03603e1f0b5e9840742ee3f72706c3ab836913a
+  RNSentry: 67d50593363789905dde212b2fcab30a4f8b1846
   RNShare: 1c1fde2c4134b9cf220ffebbd6df9c414036d382
   RNSVG: 88b18f5959cffb583527b9611ce17b53e54c1fb6
   RNWorklets: 25b8ee140def8e1561209a825b005ee70f3e26f5
@@ -5151,6 +5150,7 @@ SPEC CHECKSUMS:
   SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
+  Sentry: 88746bf877eff714bc45315a39ad1d1efea2cdda
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SwiftUIIntrospect: fee9aa07293ee280373a591e1824e8ddc869ba5d
   TrustKit: 1050f3ce0595f8ed775f1237b7f590e3a4f93e91
diff --git a/package-lock.json b/package-lock.json
index 11c1702f5db9..83db0be3123d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,7 +72,6 @@
         "expo-asset": "57.0.7",
         "expo-audio": "57.0.3",
         "expo-font": "57.0.1",
-        "expo-glass-effect": "57.0.3",
         "expo-image": "57.0.1",
         "expo-image-manipulator": "57.0.6",
         "expo-location": "57.0.6",
@@ -26151,17 +26150,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/expo-glass-effect": {
-      "version": "57.0.3",
-      "resolved": "https://registry.npmjs.org/expo-glass-effect/-/expo-glass-effect-57.0.3.tgz",
-      "integrity": "sha512-aTh2J5eCxf+rSRMBJTnP8Ib5/k8DYFVDuEX1xqesN9F9aqTXocwMv/aQRVBNUs/iogDWhHIJz2pN97IsrrTcoA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/expo-image": {
       "version": "57.0.1",
       "resolved": "https://registry.npmjs.org/expo-image/-/expo-image-57.0.1.tgz",
diff --git a/package.json b/package.json
index 95abe81f8c8d..fb86c23b3e47 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,6 @@
     "expo-asset": "57.0.7",
     "expo-audio": "57.0.3",
     "expo-font": "57.0.1",
-    "expo-glass-effect": "57.0.3",
     "expo-image": "57.0.1",
     "expo-image-manipulator": "57.0.6",
     "expo-location": "57.0.6",
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index aac5c3a9c23f..fd0c8a95230c 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -3,7 +3,6 @@ import FloatingGPSButton from '@components/FloatingGPSButton';
 import Hoverable from '@components/Hoverable';
 import ImageSVG from '@components/ImageSVG';
 import DebugTabView from '@components/Navigation/DebugTabView';
-import NavigationTabBarSurface from '@components/Navigation/NavigationTabBarSurface';
 import {PressableWithFeedback} from '@components/Pressable';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -154,8 +153,8 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     return (
         <>
             {shouldShowDebugTabView && <DebugTabView selectedTab={selectedTab} />}
-            <NavigationTabBarSurface
-                style={styles.navigationTabBarContainer}
+            <View
+                style={[styles.navigationTabBarContainer, styles.navigationTabBarSurface]}
                 testID="NavigationTabBar"
             >
                 <PressableWithFeedback
@@ -196,7 +195,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     isSelected={selectedTab === NAVIGATION_TABS.SETTINGS}
                     onPress={navigateToSettings}
                 />
-            </NavigationTabBarSurface>
+            </View>
 
             {shouldShowFloatingButtons && (
                 <>
diff --git a/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx b/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
deleted file mode 100644
index 4b49cd16dd87..000000000000
--- a/src/components/Navigation/NavigationTabBarSurface/BaseNavigationTabBarSurface.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import React from 'react';
-import {View} from 'react-native';
-
-import type NavigationTabBarSurfaceProps from './types';
-
-/**
- * Translucent stand-in for the liquid glass capsule, drawn wherever the native material is unavailable.
- */
-function BaseNavigationTabBarSurface({children, style, testID}: NavigationTabBarSurfaceProps) {
-    const styles = useThemeStyles();
-
-    return (
-        <View
-            style={[style, styles.navigationTabBarFallbackSurface]}
-            testID={testID}
-        >
-            {children}
-        </View>
-    );
-}
-
-export default BaseNavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx b/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
deleted file mode 100644
index bd34679deb00..000000000000
--- a/src/components/Navigation/NavigationTabBarSurface/index.ios.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import useThemePreference from '@hooks/useThemePreference';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import CONST from '@src/CONST';
-
-import {GlassView, isGlassEffectAPIAvailable, isLiquidGlassAvailable} from 'expo-glass-effect';
-import React from 'react';
-
-import type NavigationTabBarSurfaceProps from './types';
-
-import BaseNavigationTabBarSurface from './BaseNavigationTabBarSurface';
-
-const DARK_THEME_PREFERENCES = new Set<string>([CONST.THEME.DARK, CONST.THEME.DARK_CONTRAST]);
-
-/**
- * Liquid glass capsule behind the narrow tab bar. The material arrives with iOS 26, and some of its betas ship
- * without the runtime API, so both checks have to pass before the glass view replaces the translucent surface.
- */
-function NavigationTabBarSurface({children, style, testID}: NavigationTabBarSurfaceProps) {
-    const styles = useThemeStyles();
-    const themePreference = useThemePreference();
-
-    if (!isLiquidGlassAvailable() || !isGlassEffectAPIAvailable()) {
-        return (
-            <BaseNavigationTabBarSurface
-                style={style}
-                testID={testID}
-            >
-                {children}
-            </BaseNavigationTabBarSurface>
-        );
-    }
-
-    return (
-        <GlassView
-            style={[style, styles.bgTransparent]}
-            glassEffectStyle="regular"
-            // The app carries its own theme switch, so the material follows that instead of the system appearance.
-            colorScheme={DARK_THEME_PREFERENCES.has(themePreference) ? 'dark' : 'light'}
-            testID={testID}
-        >
-            {children}
-        </GlassView>
-    );
-}
-
-export default NavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/index.tsx b/src/components/Navigation/NavigationTabBarSurface/index.tsx
deleted file mode 100644
index 3a0ba046ca38..000000000000
--- a/src/components/Navigation/NavigationTabBarSurface/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import BaseNavigationTabBarSurface from './BaseNavigationTabBarSurface';
-
-export default BaseNavigationTabBarSurface;
diff --git a/src/components/Navigation/NavigationTabBarSurface/types.ts b/src/components/Navigation/NavigationTabBarSurface/types.ts
deleted file mode 100644
index 74276066a1d6..000000000000
--- a/src/components/Navigation/NavigationTabBarSurface/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {ReactNode} from 'react';
-import type {StyleProp, ViewStyle} from 'react-native';
-
-type NavigationTabBarSurfaceProps = {
-    /** Tab items drawn on top of the surface. */
-    children: ReactNode;
-
-    /** Capsule geometry the surface has to take: size, radius and inner padding. */
-    style: StyleProp<ViewStyle>;
-
-    testID?: string;
-};
-
-export default NavigationTabBarSurfaceProps;
diff --git a/src/components/Tables/WorkspaceListTable/index.tsx b/src/components/Tables/WorkspaceListTable/index.tsx
index a7e5448ff0bc..c33b533989ab 100644
--- a/src/components/Tables/WorkspaceListTable/index.tsx
+++ b/src/components/Tables/WorkspaceListTable/index.tsx
@@ -1,6 +1,7 @@
 import type {CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
 
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
@@ -73,6 +74,7 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
     const {isRestrictedPolicyCreation} = usePreferredPolicy();
     const illustrations = useMemoizedLazyIllustrations(['PlanetWithMobileApp']);
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
     const workspaceTableColumns: Array<TableColumn<WorkspaceTableColumnKey>> = [
@@ -222,7 +224,7 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
             />
 
             <Table.Header />
-            <Table.Body contentContainerStyle={shouldUseNarrowLayout && styles.floatingTabBarContentInset} />
+            <Table.Body contentContainerStyle={floatingTabBarContentInsetStyle} />
         </Table>
     );
 }
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
new file mode 100644
index 000000000000..34bcc8a5a9a4
--- /dev/null
+++ b/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
@@ -0,0 +1,8 @@
+import type {StyleProp, ViewStyle} from 'react-native';
+
+/** The native tab bar reports its own height through the safe area, so no extra content padding is needed. */
+function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
+    return undefined;
+}
+
+export default useFloatingTabBarContentInsetStyle;
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
new file mode 100644
index 000000000000..ce42dd197c1b
--- /dev/null
+++ b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
@@ -0,0 +1,18 @@
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+/**
+ * Bottom padding a tab root screen's scrollable content needs so its last row settles above the floating tab
+ * bar instead of under it. Mobile web draws that bar itself; the native platforms get the same room from the
+ * safe area their own tab bar reports, so there the hook adds nothing.
+ */
+function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    return shouldUseNarrowLayout ? styles.floatingTabBarContentInset : undefined;
+}
+
+export default useFloatingTabBarContentInsetStyle;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
new file mode 100644
index 000000000000..bfd8d0f176f5
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
@@ -0,0 +1,12 @@
+/**
+ * Ordered list of screen names registered inside TabNavigator.
+ * This must match the Tab.Screen order in TabNavigator.native.tsx, where the order is also the order the native
+ * tab bar draws its items in, so Workspaces comes before Account.
+ * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
+ */
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+const TAB_SCREENS = [SCREENS.HOME, NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, NAVIGATORS.WORKSPACE_NAVIGATOR, NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR] as const;
+
+export default TAB_SCREENS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 8b0b7c7e1856..d760d6b26ffd 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -1,54 +1,191 @@
+import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
+import homeIcon from '@assets/images/native-tab-icons/home.png';
+import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
+import profileIcon from '@assets/images/native-tab-icons/profile.png';
+import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
+
+import FloatingCameraButton from '@components/FloatingCameraButton';
+import FloatingGPSButton from '@components/FloatingGPSButton';
+import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
+import DebugTabView from '@components/Navigation/DebugTabView';
+import NavigationTabBar from '@components/Navigation/NavigationTabBar';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
-import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
+import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
+import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
+import {getAvatarURL} from '@libs/UserAvatarUtils';
 
 import HomePage from '@pages/home/HomePage';
-import InsightsPage from '@pages/Insights/InsightsPage';
+import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
+
+import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
-/**
- * Tab Navigator containing Home, Inbox (Reports), Search, Insights, Settings, and Workspaces pages.
- */
-import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
-import type {NavigationAction, NavigationState, Router, TabNavigationState} from '@react-navigation/native';
+import type {NativeBottomTabIcon, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
+import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
 
-import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
+import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
-import React, {useEffect} from 'react';
+import {ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
 
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
 import SettingsSplitNavigator from './SettingsSplitNavigator';
-import TabNavigatorBar from './TabNavigatorBar';
 import WorkspaceNavigator from './WorkspaceNavigator';
 
-const renderTabBar = ({state}: BottomTabBarProps) => <TabNavigatorBar state={state} />;
+/**
+ * Tab Navigator backed by the platform's own tab bar: UITabBar on iOS, which brings the liquid glass material
+ * with it on iOS 26, and a Material BottomNavigationView on Android. Wide layouts keep the JS side bar, since
+ * neither native bar can be moved to the side of the screen.
+ */
+const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
-const Tab = createBottomTabNavigator<TabNavigatorParamList>();
+/** Template icons, so each platform tints them with the active and inactive colors taken from our theme. */
+const HOME_TAB_ICON = {type: 'image', source: homeIcon} as const satisfies NativeBottomTabIcon;
+const INBOX_TAB_ICON = {type: 'image', source: inboxIcon} as const satisfies NativeBottomTabIcon;
+const SPEND_TAB_ICON = {type: 'image', source: receiptMultipleIcon} as const satisfies NativeBottomTabIcon;
+const WORKSPACES_TAB_ICON = {type: 'image', source: buildingsIcon} as const satisfies NativeBottomTabIcon;
+const ACCOUNT_TAB_ICON = {type: 'image', source: profileIcon} as const satisfies NativeBottomTabIcon;
 
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
  * WORKSPACE.INITIAL is intentionally excluded — swiping back from it returns to the workspace list.
  */
-const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.INSIGHTS, SCREENS.SETTINGS.ROOT]);
+const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
+
+type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
+
+/** stale === false distinguishes a fully realized NavigationState from a PartialState. */
+function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
+    return state?.stale === false;
+}
+
+/**
+ * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
+ * circle off-screen and handed over as a data URI.
+ */
+async function createCircularAvatarIcon(uri: string): Promise<string | undefined> {
+    const response = await fetch(uri);
+    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
+    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
+    const iconSize = variables.iconBottomBar * 3;
+    const surface = Skia.Surface.MakeOffscreen(iconSize, iconSize);
+
+    if (!image || !surface) {
+        image?.dispose();
+        surface?.dispose();
+        return undefined;
+    }
+
+    const sourceSize = Math.min(image.width(), image.height());
+    const sourceX = (image.width() - sourceSize) / 2;
+    const sourceY = (image.height() - sourceSize) / 2;
+    const circle = Skia.Path.Make();
+    circle.addCircle(iconSize / 2, iconSize / 2, iconSize / 2);
+
+    const canvas = surface.getCanvas();
+    canvas.clipPath(circle, ClipOp.Intersect, true);
+    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, iconSize, iconSize), Skia.Paint());
+    surface.flush();
+
+    const snapshot = surface.makeImageSnapshot();
+    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
+
+    circle.dispose();
+    image.dispose();
+    snapshot.dispose();
+    surface.dispose();
+
+    return `data:image/png;base64,${base64}`;
+}
+
+/**
+ * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
+ * them. The native bar is part of the navigator itself, so it is switched off through the active tab's options
+ * instead of being unmounted.
+ */
+function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
+    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const activeRoute = state.routes[state.index];
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeRoute) && !isBlockingViewVisible;
+    const activeTabNavigation = activeRoute ? descriptors[activeRoute.key]?.navigation : undefined;
+
+    // setOptions replaces tabBarStyle wholesale, so the background travels with the visibility flag. The
+    // background only lands on Android and iOS 18 and below; iOS 26 keeps its own glass material.
+    useEffect(() => {
+        activeTabNavigation?.setOptions({tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG}});
+    }, [activeTabNavigation, shouldShowNativeTabBar, theme.appBG]);
+
+    if (!shouldUseNarrowLayout) {
+        return (
+            <View style={[styles.flex1, styles.flexRow]}>
+                <View
+                    style={styles.tabNavigatorBarContainer}
+                    pointerEvents="box-none"
+                >
+                    <NavigationTabBar selectedTab={selectedTab} />
+                </View>
+                <View style={styles.flex1}>{children}</View>
+            </View>
+        );
+    }
+
+    return (
+        <View style={styles.flex1}>
+            {children}
+            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
+            {shouldShowNativeTabBar && (
+                <View
+                    style={styles.nativeTabBarFloatingButtons}
+                    pointerEvents="box-none"
+                >
+                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
+                        <NavigationTabBarFloatingActionButton />
+                    </View>
+                    <FloatingGPSButton />
+                    <FloatingCameraButton />
+                </View>
+            )}
+        </View>
+    );
+}
 
-const TAB_SCREEN_OPTIONS_BASE = {
-    headerShown: false,
-    lazy: true,
-    animation: 'none' as const,
-    freezeOnBlur: true,
-    tabBarPosition: 'bottom' as const,
-} as const;
+const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {translate} = useLocalize();
     const theme = useTheme();
+    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
+    const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
+    const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const navigation = useNavigation();
     const parentNavigation = navigation.getParent();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -56,7 +193,42 @@ function TabNavigator() {
     // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
     // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
     // mounts, so the nearest navigation listener context is still the parent stack's.
-    const tabState = useNavigationState((parentState) => parentState.routes.find((r) => r.key === route.key)?.state as NavigationState | undefined);
+    const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
+    const activeTabRouteName = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index]?.name : SCREENS.HOME;
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+
+    const avatarSource = getAvatarURL({
+        avatarSource: currentUserPersonalDetails.avatar,
+        accountID: currentUserPersonalDetails.accountID,
+    });
+    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
+    const [circularAvatar, setCircularAvatar] = useState<{source: string; uri: string}>();
+    const circularAvatarURI = circularAvatar && circularAvatar.source === avatarURI ? circularAvatar.uri : undefined;
+    const accountTabIcon: NativeBottomTabIcon = circularAvatarURI
+        ? {type: 'image', source: {uri: circularAvatarURI, width: variables.iconBottomBar, height: variables.iconBottomBar, scale: 3}, tinted: false}
+        : ACCOUNT_TAB_ICON;
+
+    useEffect(() => {
+        let isActive = true;
+        if (!avatarURI) {
+            return () => {
+                isActive = false;
+            };
+        }
+
+        createCircularAvatarIcon(avatarURI)
+            .then((result) => {
+                if (!isActive || !result) {
+                    return;
+                }
+                setCircularAvatar({source: avatarURI, uri: result});
+            })
+            .catch(() => {});
+
+        return () => {
+            isActive = false;
+        };
+    }, [avatarURI]);
 
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
@@ -67,13 +239,24 @@ function TabNavigator() {
     }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
 
     useEffect(() => {
-        // stale === false distinguishes a fully realized NavigationState from a PartialState.
-        if (!tabState || tabState.stale !== false) {
+        if (!isRealizedNavigationState(tabState)) {
             return;
         }
         setPreservedNavigatorState(route.key, tabState);
     }, [tabState, route.key]);
 
+    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
+    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
+    useEffect(() => {
+        let spans;
+        if (selectedTab === NAVIGATION_TABS.INBOX) {
+            spans = INBOX_TAB_SPAN_IDS;
+        } else if (selectedTab === NAVIGATION_TABS.SEARCH) {
+            spans = REPORTS_TAB_SPAN_IDS;
+        }
+        cancelTabNavigationSpans(spans);
+    }, [selectedTab]);
+
     // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
     // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
     // state by overriding the bottom-tab router's getInitialState — the same pattern SplitRouter
@@ -88,41 +271,62 @@ function TabNavigator() {
     });
 
     const screenOptions = {
-        ...TAB_SCREEN_OPTIONS_BASE,
-        sceneStyle: {flex: 1, backgroundColor: theme.appBG},
+        headerShown: false,
+        lazy: true,
+        tabBarActiveTintColor: theme.iconMenu,
+        tabBarInactiveTintColor: theme.icon,
+        tabBarControllerMode: 'tabBar' as const,
+        // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
+        tabBarMinimizeBehavior: 'never' as const,
     };
 
     return (
         <Tab.Navigator
             backBehavior="fullHistory"
-            tabBar={renderTabBar}
+            layout={renderNativeTabLayout}
+            screenLayout={nativeBottomTabScreenLayoutWrapper}
             screenOptions={screenOptions}
-            screenLayout={bottomTabScreenLayoutWrapper}
             UNSTABLE_router={tabRouterOverride}
         >
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
+                options={{tabBarLabel: translate('common.home'), tabBarIcon: HOME_TAB_ICON}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
+                options={{
+                    tabBarLabel: translate('common.inbox'),
+                    tabBarIcon: INBOX_TAB_ICON,
+                    tabBarBadge: chatTabBrickRoad ? ' ' : undefined,
+                    tabBarBadgeStyle: {backgroundColor: chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger},
+                }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
+                options={{tabBarLabel: translate('common.spend'), tabBarIcon: SPEND_TAB_ICON}}
             />
             <Tab.Screen
-                name={SCREENS.INSIGHTS}
-                component={InsightsPage}
+                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
+                component={WorkspaceNavigator}
+                options={{
+                    tabBarLabel: translate('common.workspacesTabTitle'),
+                    tabBarIcon: WORKSPACES_TAB_ICON,
+                    tabBarBadge: workspacesIndicatorStatus ? ' ' : undefined,
+                    tabBarBadgeStyle: {backgroundColor: workspacesIndicatorColor},
+                }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
-                component={WorkspaceNavigator}
+                options={{
+                    tabBarLabel: translate('initialSettingsPage.account'),
+                    tabBarIcon: accountTabIcon,
+                    tabBarBadge: accountIndicatorStatus ? ' ' : undefined,
+                    tabBarBadgeStyle: {backgroundColor: accountIndicatorColor},
+                }}
             />
         </Tab.Navigator>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index 058f6f31c033..b7dba78fe5d6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -72,9 +72,7 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
         // Negative marginTop overlays the tab bar on content (zero flex space) to prevent layout shifts.
         return (
             <View
-                // Hidden with display rather than opacity: a liquid glass surface anywhere under an opacity of 0
-                // stops rendering its material and does not come back once the opacity is restored.
-                style={[StyleUtils.getTabBarNarrowStyle(safeAreaPaddingBottom), isHidden && styles.dNone]}
+                style={[StyleUtils.getTabBarNarrowStyle(safeAreaPaddingBottom), isHidden && styles.opacity0]}
                 pointerEvents={isHidden ? 'none' : 'auto'}
             >
                 <NavigationTabBar
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index 821007eb556a..2b74f7b4b002 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -2,6 +2,7 @@ import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {TransitionHandle} from '@libs/Navigation/TransitionTracker';
 
 import type {BottomTabNavigationOptions, BottomTabNavigationProp} from '@react-navigation/bottom-tabs';
+import type {NativeBottomTabNavigationOptions, NativeBottomTabNavigationProp} from '@react-navigation/bottom-tabs/unstable';
 import type {ParamListBase, ScreenLayoutArgs} from '@react-navigation/native';
 
 import React, {useLayoutEffect, useRef} from 'react';
@@ -37,7 +38,23 @@ function bottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<Pa
     );
 }
 
-type ScreenLayoutProps = ScreenLayoutArgs<ParamListBase, string, PlatformSpecificNavigationOptions | PlatformStackNavigationOptions | BottomTabNavigationOptions, TransitionAwareNavigation>;
+// Same again for the native bottom tab navigator, whose options type differs while its navigation prop still
+// carries the `addListener` that ScreenLayout needs.
+function nativeBottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBase, string, NativeBottomTabNavigationOptions, NativeBottomTabNavigationProp<ParamListBase>>) {
+    return (
+        <ScreenLayout
+            {...rest}
+            navigation={navigation}
+        />
+    );
+}
+
+type ScreenLayoutProps = ScreenLayoutArgs<
+    ParamListBase,
+    string,
+    PlatformSpecificNavigationOptions | PlatformStackNavigationOptions | BottomTabNavigationOptions | NativeBottomTabNavigationOptions,
+    TransitionAwareNavigation
+>;
 
 function ScreenLayout({children, navigation}: ScreenLayoutProps) {
     const transitionHandleRef = useRef<TransitionHandle | null>(null);
@@ -81,4 +98,4 @@ function ScreenLayout({children, navigation}: ScreenLayoutProps) {
 }
 
 export default screenLayoutWrapper;
-export {bottomTabScreenLayoutWrapper};
+export {bottomTabScreenLayoutWrapper, nativeBottomTabScreenLayoutWrapper};
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index c86be105c9ce..02f23b236b2e 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -16,6 +16,7 @@ import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useLoadingBarVisibility} from '@hooks/useInFlightRequests';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -82,6 +83,7 @@ function SearchPageNarrow({
     const {translate} = useLocalize();
     const {windowHeight} = useWindowDimensions();
     const styles = useThemeStyles();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const StyleUtils = useStyleUtils();
     const {clearSelectedTransactions} = useSearchSelectionActions();
     const {shouldUseLiveData} = useSearchResultsContext();
@@ -227,7 +229,7 @@ function SearchPageNarrow({
     const isDataLoaded = shouldUseLiveData || isSearchDataLoaded(searchResults, queryJSON);
     // Use the request state because `isLoading` also covers temporary UI loading that should not keep this bar visible.
     const shouldShowLoadingState = !isOffline && (!isDataLoaded || isSearchPending(searchResults));
-    const contentContainerStyle = [!isMobileSelectionModeEnabled && styles.searchListContentContainerStyles(hasFilterBars), styles.floatingTabBarContentInset];
+    const contentContainerStyle = [!isMobileSelectionModeEnabled && styles.searchListContentContainerStyles(hasFilterBars), floatingTabBarContentInsetStyle];
 
     const shouldRenderLayoutProbe = (isOverlayActive || !isHeaderInteractive) && !searchOverlayContent;
 
@@ -239,7 +241,7 @@ function SearchPageNarrow({
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
                 isDisabled={useStaticRendering && !isHeaderInteractive}
-                dropWrapperStyle={{marginBottom: variables.floatingTabBarContentInset}}
+                dropWrapperStyle={{marginBottom: variables.bottomTabHeight}}
             >
                 <ScreenWrapper
                     testID="SearchPageNarrow"
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 54aa3e2ef76b..fab52aeb884c 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -7,6 +7,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useDocumentTitle from '@hooks/useDocumentTitle';
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -32,6 +33,7 @@ import YourSpendSection from './YourSpendSection';
 
 function HomePage() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
@@ -53,7 +55,7 @@ function HomePage() {
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
-                dropWrapperStyle={shouldUseNarrowLayout ? {marginBottom: variables.floatingTabBarContentInset} : undefined}
+                dropWrapperStyle={shouldUseNarrowLayout ? {marginBottom: variables.bottomTabHeight} : undefined}
             >
                 <ScreenWrapper
                     shouldEnablePickerAvoiding={false}
@@ -69,7 +71,7 @@ function HomePage() {
                         shouldDisplayHelpButton
                     />
                     <ScrollView
-                        contentContainerStyle={[styles.homePageContentContainer, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}
+                        contentContainerStyle={[styles.homePageContentContainer, floatingTabBarContentInsetStyle]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >
diff --git a/src/pages/inbox/sidebar/SidebarLinks.tsx b/src/pages/inbox/sidebar/SidebarLinks.tsx
index 65305b0da07b..03afd7e0c897 100644
--- a/src/pages/inbox/sidebar/SidebarLinks.tsx
+++ b/src/pages/inbox/sidebar/SidebarLinks.tsx
@@ -2,6 +2,7 @@ import LHNEmptyState from '@components/LHNOptionsList/LHNEmptyState';
 import LHNOptionsList from '@components/LHNOptionsList/LHNOptionsList';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {useSidebarOrderedReportsActions} from '@hooks/useSidebarOrderedReports';
@@ -44,6 +45,7 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {setStickyReportID} = useSidebarOrderedReportsActions();
     const [isLoadingReportData = true] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
 
@@ -82,11 +84,11 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
 
     const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
 
-    // On narrow layouts the floating tab bar covers the end of the list, and its footprint already clears the
-    // home indicator, so it replaces the safe area padding rather than adding to it.
+    // Where the floating tab bar covers the end of the list, its footprint already clears the home indicator,
+    // so it replaces the safe area padding rather than adding to it.
     const contentContainerStyles = useMemo(
-        () => StyleSheet.flatten([styles.pt2, shouldUseNarrowLayout ? styles.floatingTabBarContentInset : {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]),
-        [StyleUtils, insets, shouldUseNarrowLayout, styles.floatingTabBarContentInset, styles.pt2],
+        () => StyleSheet.flatten([styles.pt2, floatingTabBarContentInsetStyle ?? {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]),
+        [StyleUtils, floatingTabBarContentInsetStyle, insets, styles.pt2],
     );
 
     const shouldShowEmptyLHN = optionListItems.length === 0;
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 5fe37e243ff5..7bbf79faf1d2 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -10,6 +10,7 @@ import Text from '@components/Text';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePrevious from '@hooks/usePrevious';
@@ -45,6 +46,7 @@ type InitialSettingsPageProps = WithCurrentUserPersonalDetailsProps;
 
 function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPageProps) {
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
     const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SETTINGS} />;
     const styles = useThemeStyles();
@@ -163,7 +165,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 ref={scrollViewRef}
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
-                contentContainerStyle={[styles.w100, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}
+                contentContainerStyle={[styles.w100, floatingTabBarContentInsetStyle]}
                 showsVerticalScrollIndicator={false}
             >
                 {headerContent}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 979bee077bf5..5776a3507af1 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -9,6 +9,7 @@ import ScrollView from '@components/ScrollView';
 
 import useCardFeedErrors from '@hooks/useCardFeedErrors';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useGetReceiptPartnersIntegrationData from '@hooks/useGetReceiptPartnersIntegrationData';
 import useIsWorkspacesTabFocused from '@hooks/useIsWorkspacesTabFocused';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -69,6 +70,7 @@ function dismissError(policyID: string | undefined, pendingAction: PendingAction
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {translate} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
     const {isBetaEnabled} = usePermissions();
@@ -244,7 +246,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                     shouldDisplayHelpButton={shouldUseNarrowLayout}
                 />
 
-                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14, shouldUseNarrowLayout && styles.floatingTabBarContentInset]}>
+                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14, floatingTabBarContentInsetStyle]}>
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
                         onClose={() => dismissError(policyID, policy?.pendingAction)}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 5fbe79cf1d7c..e6a33c2b09f0 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -724,8 +724,8 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
-        // The narrow tab bar is a capsule floating above the screen content, so it paints no background of
-        // its own. NavigationTabBarSurface draws the glass (or the translucent fallback) behind the items.
+        // The narrow tab bar is a capsule floating above the screen content. Only mobile web renders it, since
+        // the native platforms hand the bottom bar over to UIKit and to Material.
         navigationTabBarContainer: {
             flexDirection: 'row',
             height: variables.floatingTabBarHeight,
@@ -737,9 +737,9 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'hidden',
         },
 
-        // Stands in for liquid glass where the platform has no such material, so the capsule still reads as a
+        // Mobile web has no native tab bar to inherit a material from, so the capsule paints its own
         // translucent surface over the content it floats above.
-        navigationTabBarFallbackSurface: {
+        navigationTabBarSurface: {
             backgroundColor: theme.floatingTabBarBG,
             borderWidth: variables.hairlineBorderWidth,
             borderColor: theme.floatingTabBarBorder,
@@ -764,6 +764,17 @@ const staticStyles = (theme: ThemeColors) =>
             paddingHorizontal: 4,
         },
 
+        // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
+        // against it without taking part in the tab screen's layout.
+        nativeTabBarFloatingButtons: {
+            position: 'absolute',
+            right: 0,
+            bottom: variables.bottomTabHeight + spacing.gap3.gap,
+            left: 0,
+            height: 0,
+            zIndex: 10,
+        },
+
         navigationTabBarFABItem: {
             display: 'flex',
             justifyContent: 'center',

From 39d637e0fb86f3b445b4e6257d468ac483ab8646 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 15 Sep 2026 19:54:44 +0200
Subject: [PATCH 127/781] fix: floating tab bar inset on the two remaining tab
 roots

---
 src/pages/Insights/InsightsPage.tsx    | 7 ++++++-
 src/pages/domain/DomainInitialPage.tsx | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/Insights/InsightsPage.tsx b/src/pages/Insights/InsightsPage.tsx
index c13c817d11f9..fd4c704f73e4 100644
--- a/src/pages/Insights/InsightsPage.tsx
+++ b/src/pages/Insights/InsightsPage.tsx
@@ -5,6 +5,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useDocumentTitle from '@hooks/useDocumentTitle';
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
 
@@ -24,6 +25,7 @@ type InsightsPageProps = BottomTabScreenProps<TabNavigatorParamList, typeof SCRE
 function InsightsPage({route}: InsightsPageProps) {
     const {translate} = useLocalize();
     const {isBetaEnabled} = usePermissions();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     useDocumentTitle(translate('common.insights'));
 
     const isKnownDashboard = route.params.dashboardID === CONST.INSIGHTS.DASHBOARD.SPEND;
@@ -43,7 +45,10 @@ function InsightsPage({route}: InsightsPageProps) {
                 breadcrumbLabel={translate('common.insights')}
                 shouldDisplayHelpButton
             />
-            <ScrollView addBottomSafeAreaPadding />
+            <ScrollView
+                addBottomSafeAreaPadding
+                contentContainerStyle={floatingTabBarContentInsetStyle}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index 8780238ea019..0524f3bdde9f 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -8,6 +8,7 @@ import ScrollView from '@components/ScrollView';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDocumentTitle from '@hooks/useDocumentTitle';
+import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -47,6 +48,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
     const {singleExecution, isExecuting} = useSingleExecution();
     const activeRoute = useNavigationState((state) => findFocusedRoute(state)?.name);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {translate} = useLocalize();
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const domainAccountID = route.params?.domainAccountID;
@@ -120,7 +122,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
                     shouldDisplayHelpButton={shouldUseNarrowLayout}
                 />
 
-                <ScrollView contentContainerStyle={styles.flexColumn}>
+                <ScrollView contentContainerStyle={[styles.flexColumn, floatingTabBarContentInsetStyle]}>
                     <View style={[styles.pb4, styles.mh3, styles.mt3]}>
                         {/*
                             Ideally we should use MenuList component for MenuItems with singleExecution/Navigation actions.

From 08e28cda327a060d4e29a9041380c216598632b1 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 15 Sep 2026 19:58:36 +0200
Subject: [PATCH 128/781] chore: bump react-navigation for the native tabs
 contract

bottom-tabs 7.16.2, native 7.2.6, elements 2.9.19. rns 4.25.0 needs screenKey.
---
 package-lock.json                             | 31 ++++----
 package.json                                  |  5 +-
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...navigation+native+7.2.6+001+initial.patch} | 73 ++++++-------------
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...istory-go-popstate-fallback-timeout.patch} |  5 +-
 .../Navigators/TabNavigator.native.tsx        |  2 +-
 8 files changed, 46 insertions(+), 70 deletions(-)
 rename patches/react-navigation/{@react-navigation+bottom-tabs+7.15.5+001+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+elements+2.9.14+001+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+native+7.1.33+001+initial.patch => @react-navigation+native+7.2.6+001+initial.patch} (76%)
 rename patches/react-navigation/{@react-navigation+native+7.1.33+002+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch => @react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch} (91%)

diff --git a/package-lock.json b/package-lock.json
index 83db0be3123d..2f947614003a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,10 +45,11 @@
         "@react-native-firebase/app": "^22.2.1",
         "@react-native-google-signin/google-signin": "^10.0.1",
         "@react-native-picker/picker": "2.11.3",
-        "@react-navigation/bottom-tabs": "7.15.5",
+        "@react-navigation/bottom-tabs": "7.16.2",
         "@react-navigation/core": "7.21.12",
+        "@react-navigation/elements": "2.9.19",
         "@react-navigation/material-top-tabs": "7.4.19",
-        "@react-navigation/native": "7.1.33",
+        "@react-navigation/native": "7.2.6",
         "@react-navigation/native-stack": "7.14.5",
         "@react-navigation/stack": "7.8.5",
         "@react-ng/bounds-observer": "^0.2.1",
@@ -14401,17 +14402,17 @@
       }
     },
     "node_modules/@react-navigation/bottom-tabs": {
-      "version": "7.15.5",
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.15.5.tgz",
-      "integrity": "sha512-wQHredlCrRmShWQ1vF4HUcLdaiJ8fUgnbaeQH7BJ7MQVQh4mdzab0IOY/4QSmUyNRB350oyu1biTycyQ5FKWMQ==",
+      "version": "7.16.2",
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.16.2.tgz",
+      "integrity": "sha512-Lbp++BGMc7SQXnyKuO/JrQJIhFH0zyB5v4kIEbnzDJLJfgubd5hoSe+QfCqy4YHfLA4phC4Xf/6Q2Ic8x7datQ==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/elements": "^2.9.10",
+        "@react-navigation/elements": "^2.9.19",
         "color": "^4.2.3",
         "sf-symbols-typescript": "^2.1.0"
       },
       "peerDependencies": {
-        "@react-navigation/native": "^7.1.33",
+        "@react-navigation/native": "^7.2.5",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0",
@@ -14459,9 +14460,9 @@
       }
     },
     "node_modules/@react-navigation/elements": {
-      "version": "2.9.14",
-      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.14.tgz",
-      "integrity": "sha512-lKqzu+su2pI/YIZmR7L7xdOs4UL+rVXKJAMpRMBrwInEy96SjIFst6QDGpE89Dunnu3VjVpjWfByo9f2GWBHDQ==",
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.19.tgz",
+      "integrity": "sha512-gBUvCZuUkOGw1KpLQEZIkByUz8RYPwXeoA6mZFJy9K1mxd8GdqHDMFCIoB0lfPz9rgrHj99RvtdlGZ/ZzkZv2A==",
       "license": "MIT",
       "dependencies": {
         "color": "^4.2.3",
@@ -14470,7 +14471,7 @@
       },
       "peerDependencies": {
         "@react-native-masked-view/masked-view": ">= 0.2.0",
-        "@react-navigation/native": "^7.2.2",
+        "@react-navigation/native": "^7.2.5",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0"
@@ -14500,12 +14501,12 @@
       }
     },
     "node_modules/@react-navigation/native": {
-      "version": "7.1.33",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.33.tgz",
-      "integrity": "sha512-DpFdWGcgLajKZ1TuIvDNQsblN2QaUFWpTQaB8v7WRP9Mix8H/6TFoIrZd93pbymI2hybd6UYrD+lI408eWVcfw==",
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.2.6.tgz",
+      "integrity": "sha512-Lvxb8ShLnsuK1pjFoN1jym/8c68IvJQlkrDhQXDJq10o3lU36Oxsmc9BdtN+Z4yJRYSbx3Qh+Wpom75QehC4og==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/core": "^7.16.1",
+        "@react-navigation/core": "^7.18.0",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.3.11",
diff --git a/package.json b/package.json
index fb86c23b3e47..b36e5894a929 100644
--- a/package.json
+++ b/package.json
@@ -121,10 +121,11 @@
     "@react-native-firebase/app": "^22.2.1",
     "@react-native-google-signin/google-signin": "^10.0.1",
     "@react-native-picker/picker": "2.11.3",
-    "@react-navigation/bottom-tabs": "7.15.5",
+    "@react-navigation/bottom-tabs": "7.16.2",
     "@react-navigation/core": "7.21.12",
+    "@react-navigation/elements": "2.9.19",
     "@react-navigation/material-top-tabs": "7.4.19",
-    "@react-navigation/native": "7.1.33",
+    "@react-navigation/native": "7.2.6",
     "@react-navigation/native-stack": "7.14.5",
     "@react-navigation/stack": "7.8.5",
     "@react-ng/bounds-observer": "^0.2.1",
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.15.5+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+bottom-tabs+7.15.5+001+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+elements+2.9.14+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+elements+2.9.14+001+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+native+7.1.33+001+initial.patch b/patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch
similarity index 76%
rename from patches/react-navigation/@react-navigation+native+7.1.33+001+initial.patch
rename to patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch
index 6c845817d9b0..36dc2bcd4e8c 100644
--- a/patches/react-navigation/@react-navigation+native+7.1.33+001+initial.patch
+++ b/patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch
@@ -1,48 +1,26 @@
 diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-index 474db5e..4d94ed8 100644
+index 2ca4c08..0c204b9 100644
 --- a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 +++ b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-@@ -1,10 +1,27 @@
+@@ -1,6 +1,7 @@
  "use strict";
  
  import { nanoid } from 'nanoid/non-secure';
 +import { findFocusedRouteKey } from "./findFocusedRouteKey.js";
+ const getPathWithoutHash = path => path.split('#')[0];
  export function createMemoryHistory() {
    let index = 0;
-   let items = [];
- 
-+  // const log = () => {
-+  //   console.log(JSON.stringify({
-+  //     index,
-+  //     indexGetter: history.index,
-+  //     items: items.map((item, i) => {
-+  //       var _item$state;
-+  //       return {
-+  //         selected: history.index === i ? '<<<<<<<' : undefined,
-+  //         path: item.path,
-+  //         id: item.id,
-+  //         state: ((_item$state = item.state) === null || _item$state === void 0 ? void 0 : _item$state.key) || null
-+  //       };
-+  //     })
-+  //   }, null, 4));
-+  // };
-+
-   // Pending callbacks for `history.go(n)`
-   // We might modify the callback stored if it was interrupted, so we have a ref to identify it
-   const pending = [];
-@@ -17,7 +34,10 @@ export function createMemoryHistory() {
-       it.cb = () => cb(true);
+@@ -19,6 +20,9 @@ export function createMemoryHistory() {
      });
    };
--  const history = {
-+  return {
+   const history = {
 +    get items() {
 +      return items;
 +    },
      get index() {
        // We store an id in the state instead of an index
        // Index could get out of sync with in-memory values if page reloads
-@@ -32,12 +52,13 @@ export function createMemoryHistory() {
+@@ -33,14 +37,15 @@ export function createMemoryHistory() {
        return items[index];
      },
      backIndex({
@@ -50,15 +28,17 @@ index 474db5e..4d94ed8 100644
 +      path,
 +      state
      }) {
+       const pathWithoutHash = getPathWithoutHash(path);
+ 
        // We need to find the index from the element before current to get closest path to go back to
        for (let i = index - 1; i >= 0; i--) {
          const item = items[i];
--        if (item.path === path) {
-+        if (item.path === path && findFocusedRouteKey(item.state) === findFocusedRouteKey(state)) {
+-        if (item.path === pathWithoutHash) {
++        if (item.path === pathWithoutHash && findFocusedRouteKey(item.state) === findFocusedRouteKey(state)) {
            return i;
          }
        }
-@@ -77,7 +98,7 @@ export function createMemoryHistory() {
+@@ -82,7 +87,7 @@ export function createMemoryHistory() {
  
        // Need to keep the hash part of the path if there was no previous history entry
        // or the previous history entry had the same path
@@ -67,16 +47,9 @@ index 474db5e..4d94ed8 100644
        const hash = pathWithHash.includes('#') ? '' : location.hash;
        if (!items.length || items.findIndex(item => item.id === id) < 0) {
          // There are two scenarios for creating an array with only one history record:
-@@ -211,6 +232,5 @@ export function createMemoryHistory() {
-       return () => window.removeEventListener('popstate', onPopState);
-     }
-   };
--  return history;
- }
- //# sourceMappingURL=createMemoryHistory.js.map
 diff --git a/node_modules/@react-navigation/native/lib/module/findFocusedRouteKey.js b/node_modules/@react-navigation/native/lib/module/findFocusedRouteKey.js
 new file mode 100644
-index 0000000..b996822
+index 0000000..290e96f
 --- /dev/null
 +++ b/node_modules/@react-navigation/native/lib/module/findFocusedRouteKey.js
 @@ -0,0 +1,8 @@
@@ -84,12 +57,12 @@ index 0000000..b996822
 +
 +import { findFocusedRoute } from '@react-navigation/core';
 +export function findFocusedRouteKey(state) {
-+    const focusedRoute = findFocusedRoute(state);
-+    return focusedRoute?.key;
++  const focusedRoute = findFocusedRoute(state);
++  return focusedRoute?.key;
 +}
 +//# sourceMappingURL=findFocusedRouteKey.js.map
 diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index d30009f..0dab822 100644
+index 6005f78..a932e78 100644
 --- a/node_modules/@react-navigation/native/lib/module/useLinking.js
 +++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
 @@ -4,6 +4,7 @@ import { findFocusedRoute, getActionFromState as getActionFromStateDefault, getP
@@ -98,9 +71,9 @@ index d30009f..0dab822 100644
  import { createMemoryHistory } from "./createMemoryHistory.js";
 +import { findFocusedRouteKey } from "./findFocusedRouteKey.js";
  import { ServerContext } from "./ServerContext.js";
- /**
-  * Find the matching navigation state that changed between 2 navigation states
-@@ -45,6 +46,43 @@ export const series = cb => {
+ const getRoutesUntilIndex = state => state.routes.slice(0, state.index + 1);
+ 
+@@ -65,6 +66,43 @@ export const series = cb => {
    return callback;
  };
  const linkingHandlers = [];
@@ -144,17 +117,17 @@ index d30009f..0dab822 100644
  export function useLinking(ref, {
    enabled = true,
    config,
-@@ -256,6 +294,9 @@ export function useLinking(ref, {
+@@ -298,6 +336,9 @@ export function useLinking(ref, {
        // Otherwise it's likely a change triggered by `popstate`
        path !== pendingPath) {
-         const historyDelta = (focusedState.history ? focusedState.history.length : focusedState.routes.length) - (previousFocusedState.history ? previousFocusedState.history.length : previousFocusedState.routes.length);
+         const historyDelta = getHistoryLength(focusedState) - getHistoryLength(previousFocusedState);
 +
 +        // The historyDelta and historyDeltaByKeys may differ if the new state has an entry that didn't exist in previous state
 +        const historyDeltaByKeys = getHistoryDeltaByKeys(focusedState, previousFocusedState);
          if (historyDelta > 0) {
            // If history length is increased, we should pushState
            // Note that path might not actually change here, for example, drawer open should pushState
-@@ -267,7 +308,8 @@ export function useLinking(ref, {
+@@ -309,7 +350,8 @@ export function useLinking(ref, {
            // If history length is decreased, i.e. entries were removed, we want to go back
  
            const nextIndex = history.backIndex({
@@ -164,7 +137,7 @@ index d30009f..0dab822 100644
            });
            const currentIndex = history.index;
            try {
-@@ -276,11 +318,26 @@ export function useLinking(ref, {
+@@ -318,11 +360,26 @@ export function useLinking(ref, {
              history.get(nextIndex)) {
                // An existing entry for this path exists and it's less than current index, go back to that
                await history.go(nextIndex - currentIndex);
@@ -192,7 +165,7 @@ index d30009f..0dab822 100644
              }
  
              // Store the updated state as well as fix the path if incorrect
-@@ -293,10 +350,22 @@ export function useLinking(ref, {
+@@ -335,10 +392,22 @@ export function useLinking(ref, {
            }
          } else {
            // If history length is unchanged, we want to replaceState
diff --git a/patches/react-navigation/@react-navigation+native+7.1.33+002+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+native+7.1.33+002+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch b/patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch
similarity index 91%
rename from patches/react-navigation/@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch
rename to patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch
index 4d7806ce3819..bda764b7f963 100644
--- a/patches/react-navigation/@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch
+++ b/patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch
@@ -1,7 +1,8 @@
 diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
+index 07d02ef..3f7bc78 100644
 --- a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 +++ b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-@@ -189,10 +189,14 @@
+@@ -178,10 +178,14 @@ export function createMemoryHistory() {
            cb: done
          });
  
@@ -18,7 +19,7 @@ diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistor
          // We're using a hacky timeout since there doesn't seem to be way to know for sure
          const timer = setTimeout(() => {
            const foundIndex = pending.findIndex(it => it.ref === done);
-@@ -201,7 +205,7 @@
+@@ -190,7 +194,7 @@ export function createMemoryHistory() {
              pending.splice(foundIndex, 1);
            }
            index = this.index;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index d760d6b26ffd..d23c6eb777e9 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -277,7 +277,7 @@ function TabNavigator() {
         tabBarInactiveTintColor: theme.icon,
         tabBarControllerMode: 'tabBar' as const,
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
-        tabBarMinimizeBehavior: 'never' as const,
+        tabBarMinimizeBehavior: 'none' as const,
     };
 
     return (

From f330ddadcd5763f4aeafe95da58c28c020ab8a3b Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 15 Sep 2026 22:38:51 +0200
Subject: [PATCH 129/781] fix: reveal the tab bar when the pop starts, not when
 it commits

An interactive swipe back left the bar out until the gesture ended.
---
 .../Navigators/TabNavigatorBar.tsx            | 34 ++++++---------
 .../PlatformStackNavigation/ScreenLayout.tsx  | 18 ++++++--
 src/libs/Navigation/closingScreens.ts         | 42 +++++++++++++++++++
 .../helpers/getLeafScreenNameAfterPop.ts      | 30 +++++++++++++
 .../Navigation/helpers/isTabRouteAtRoot.ts    |  1 +
 5 files changed, 99 insertions(+), 26 deletions(-)
 create mode 100644 src/libs/Navigation/closingScreens.ts
 create mode 100644 src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts

diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index b7dba78fe5d6..3dbea5a6399a 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -3,13 +3,14 @@ import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
-import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import {getIsAnyScreenClosing, subscribeToClosingScreens} from '@libs/Navigation/closingScreens';
+import getLeafScreenNameAfterPop from '@libs/Navigation/helpers/getLeafScreenNameAfterPop';
+import isTabRouteAtRoot, {isAtTabRootLevel} from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import SCREENS from '@src/SCREENS';
@@ -17,7 +18,7 @@ import SCREENS from '@src/SCREENS';
 import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
 import type {ValueOf} from 'type-fest';
 
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useSyncExternalStore} from 'react';
 import {View} from 'react-native';
 
 const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
@@ -39,26 +40,15 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
     const activeRoute = state.routes[state.index];
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     const isAtRoot = isTabRouteAtRoot(activeRoute);
-    // --- Narrow-only animation logic (hooks must run unconditionally per Rules of Hooks) ---
-    // Delay showing this navigator's tab bar only when navigating back from a deeper screen
-    // (where the tab bar was hidden). Keep it visible during tab switches so it doesn't flash.
-    // Guard with shouldUseNarrowLayout so prevShouldHide stays false in wide layout,
-    // preventing false shouldApplyDelay triggers on layout transitions (e.g. web resize).
+    // --- Narrow-only visibility logic (hooks must run unconditionally per Rules of Hooks) ---
     const shouldHide = shouldUseNarrowLayout && (!isAtRoot || isBlockingViewVisible);
-    const prevTabIndex = usePrevious(state.index);
-    const prevShouldHide = usePrevious(shouldHide);
-    const stateKey = `${state.index}-${isAtRoot}`;
-    const [animationDoneKey, setAnimationDoneKey] = useState(stateKey);
 
-    const tabChanged = prevTabIndex !== state.index;
-    const shouldApplyDelay = !tabChanged && prevShouldHide && !shouldHide;
-
-    useEffect(() => {
-        const frameId = requestAnimationFrame(() => {
-            setAnimationDoneKey(stateKey);
-        });
-        return () => cancelAnimationFrame(frameId);
-    }, [stateKey]);
+    // Navigation state only changes once a pop commits, which on an interactive swipe is the moment the gesture
+    // ends. Waiting for it makes the bar drop into place after the screen has already arrived. Watching for the
+    // pop instead puts the bar under the incoming screen for the whole gesture, and an aborted swipe settles the
+    // screen without a state change, so the bar goes back to hidden on its own.
+    const isAnyScreenClosing = useSyncExternalStore(subscribeToClosingScreens, getIsAnyScreenClosing, getIsAnyScreenClosing);
+    const shouldRevealDuringPop = isAnyScreenClosing && !isBlockingViewVisible && isAtTabRootLevel(getLeafScreenNameAfterPop(activeRoute?.state));
 
     // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
     // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
@@ -66,7 +56,7 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
         cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
     }, [selectedTab]);
 
-    const isHidden = shouldHide || (shouldApplyDelay && animationDoneKey !== stateKey);
+    const isHidden = shouldHide && !shouldRevealDuringPop;
 
     if (shouldUseNarrowLayout) {
         // Negative marginTop overlays the tab bar on content (zero flex space) to prevent layout shifts.
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index 2b74f7b4b002..0efebb03962b 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -1,3 +1,4 @@
+import {markScreenClosing, markScreenSettled} from '@libs/Navigation/closingScreens';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {TransitionHandle} from '@libs/Navigation/TransitionTracker';
 
@@ -13,7 +14,7 @@ import type {PlatformSpecificNavigationOptions, PlatformStackNavigationOptions}
 // it's used with. Keeping this minimal means passing a real (properly-typed) navigation prop into it - e.g. from
 // bottomTabScreenLayoutWrapper below - needs no unsafe cast, since every navigator's `addListener` structurally satisfies it.
 type TransitionAwareNavigation = {
-    addListener(type: 'transitionStart' | 'transitionEnd', callback: () => void): () => void;
+    addListener(type: 'transitionStart' | 'transitionEnd', callback: (event: {data?: {closing?: boolean}}) => void): () => void;
 };
 
 // screenLayout is invoked as a render function (not JSX), so we need this wrapper to create a proper React component boundary for hooks.
@@ -56,19 +57,27 @@ type ScreenLayoutProps = ScreenLayoutArgs<
     TransitionAwareNavigation
 >;
 
-function ScreenLayout({children, navigation}: ScreenLayoutProps) {
+function ScreenLayout({children, navigation, route}: ScreenLayoutProps) {
     const transitionHandleRef = useRef<TransitionHandle | null>(null);
     // Net-count overlapping starts so a single handle spans rapid back/forward re-fires — no decrement-to-zero seam for `runAfterTransitions` to flush through, and `transitionEnd` for the wrong leg can't end the active one.
     const pendingTransitionsRef = useRef(0);
 
     useLayoutEffect(() => {
-        const transitionStartListener = navigation.addListener('transitionStart', () => {
+        const transitionStartListener = navigation.addListener('transitionStart', (event) => {
+            // A closing transition starts as soon as an interactive swipe does, which is the only chance anything
+            // drawn outside the screens has to react before the pop commits.
+            if (event.data?.closing) {
+                markScreenClosing(route.key);
+            } else {
+                markScreenSettled(route.key);
+            }
             pendingTransitionsRef.current += 1;
             if (!transitionHandleRef.current) {
                 transitionHandleRef.current = TransitionTracker.startTransition('navigation');
             }
         });
         const transitionEndListener = navigation.addListener('transitionEnd', () => {
+            markScreenSettled(route.key);
             if (pendingTransitionsRef.current > 0) {
                 pendingTransitionsRef.current -= 1;
             }
@@ -81,6 +90,7 @@ function ScreenLayout({children, navigation}: ScreenLayoutProps) {
         return () => {
             transitionStartListener();
             transitionEndListener();
+            markScreenSettled(route.key);
             const handleToEnd = transitionHandleRef.current;
             transitionHandleRef.current = null;
             pendingTransitionsRef.current = 0;
@@ -92,7 +102,7 @@ function ScreenLayout({children, navigation}: ScreenLayoutProps) {
                 TransitionTracker.endTransition(handleToEnd);
             });
         };
-    }, [navigation]);
+    }, [navigation, route.key]);
 
     return children;
 }
diff --git a/src/libs/Navigation/closingScreens.ts b/src/libs/Navigation/closingScreens.ts
new file mode 100644
index 000000000000..e27f5d7382f3
--- /dev/null
+++ b/src/libs/Navigation/closingScreens.ts
@@ -0,0 +1,42 @@
+/**
+ * Tracks which screens are in the middle of closing, so UI drawn outside the screens can react to a pop while it
+ * is still running. Navigation state only changes once a pop commits, which on an interactive iOS swipe is the
+ * moment the gesture ends, far too late for anything that has to travel with the screen.
+ */
+const closingRouteKeys = new Set<string>();
+const listeners = new Set<() => void>();
+
+function emit() {
+    for (const listener of listeners) {
+        listener();
+    }
+}
+
+function subscribeToClosingScreens(listener: () => void): () => void {
+    listeners.add(listener);
+    return () => {
+        listeners.delete(listener);
+    };
+}
+
+function getIsAnyScreenClosing(): boolean {
+    return closingRouteKeys.size > 0;
+}
+
+function markScreenClosing(routeKey: string) {
+    if (closingRouteKeys.has(routeKey)) {
+        return;
+    }
+    closingRouteKeys.add(routeKey);
+    emit();
+}
+
+/** Called when the screen settles, which covers a finished pop as much as a gesture the user aborted. */
+function markScreenSettled(routeKey: string) {
+    if (!closingRouteKeys.delete(routeKey)) {
+        return;
+    }
+    emit();
+}
+
+export {subscribeToClosingScreens, getIsAnyScreenClosing, markScreenClosing, markScreenSettled};
diff --git a/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts b/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts
new file mode 100644
index 000000000000..689327b2cfb5
--- /dev/null
+++ b/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts
@@ -0,0 +1,30 @@
+import type {NavigationState, PartialState} from '@react-navigation/native';
+
+import getFocusedLeafScreenName from './getFocusedLeafScreenName';
+
+/**
+ * Leaf screen name the focused route chain would resolve to if the deepest stack with something to pop popped once.
+ * Returns undefined when nothing in the chain can be popped.
+ */
+function getLeafScreenNameAfterPop(state: NavigationState | PartialState<NavigationState> | undefined): string | undefined {
+    if (!state?.routes?.length) {
+        return undefined;
+    }
+    // PartialState (e.g. from getStateFromPath on cold-start) may omit index; React Navigation treats the last route as focused.
+    const focusedIndex = state.index ?? state.routes.length - 1;
+    const focused = state.routes[focusedIndex];
+
+    // The innermost stack is the one the gesture pops, so it wins over anything above it.
+    const deeperName = focused?.state ? getLeafScreenNameAfterPop(focused.state) : undefined;
+    if (deeperName) {
+        return deeperName;
+    }
+
+    if (focusedIndex <= 0) {
+        return undefined;
+    }
+    const previous = state.routes[focusedIndex - 1];
+    return previous?.state ? getFocusedLeafScreenName(previous.state) : previous?.name;
+}
+
+export default getLeafScreenNameAfterPop;
diff --git a/src/libs/Navigation/helpers/isTabRouteAtRoot.ts b/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
index d24291aeaa13..b1de3b57e942 100644
--- a/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
+++ b/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
@@ -58,3 +58,4 @@ function isTabRouteAtRoot(route: TabRouteLike | undefined): boolean {
 }
 
 export default isTabRouteAtRoot;
+export {isAtTabRootLevel};

From 6e868e3f8ab5e91600e5d94cc8d1f46043d88546 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 12:39:28 +0200
Subject: [PATCH 130/781] fix: tint native tab bar icons and mount tab screens
 eagerly

Adds an RNScreens patch tinting unselected items on iOS 26.
---
 patches/react-native-screens/details.md       |   7 ++
 ...t-unselected-tab-bar-items-on-ios-26.patch |  34 ++++++
 .../Navigators/TabNavigator.native.tsx        | 115 ++++++++++++++++--
 3 files changed, 147 insertions(+), 9 deletions(-)
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 4fa2295af185..a1f579740d81 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -6,3 +6,10 @@
 - Upstream PR/issue: [software-mansion/react-native-screens#4413](https://github.com/software-mansion/react-native-screens/pull/4413) (merged, [`b3badd0`](https://github.com/software-mansion/react-native-screens/commit/b3badd012f83679b12f4e29f2e28eceaa4830efd)) / [software-mansion/react-native-screens#4151](https://github.com/software-mansion/react-native-screens/issues/4151). Not in a release yet — the latest tag at the time of patching is 4.27.0, published before the merge. **This patch can be removed as soon as `react-native-screens` is bumped to the first release containing `b3badd0`**; the patched files are byte-identical to the merged upstream files (upstream `cpp/legacy/RNSScreenRemovalListener.*` maps to `cpp/RNSScreenRemovalListener.*` in the published package).
 - E/App issue: [#93842](https://github.com/Expensify/App/issues/93842)
 - PR introducing patch: [#98632](https://github.com/Expensify/App/pull/98632)
+
+### [react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch](react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch)
+
+- Reason: On iOS 26 the tab bar renders its own glass material and honors the per-item `UITabBarItemAppearance` only in part. Measured on screenshots of the bar: `badgeBackgroundColor` is applied, while `tabBarItemIconColor` and the normal-state title color are not, so unselected icons and titles fall back to the system label color (black in light mode). The comparison that isolates it: with template icons the bar renders 0 pixels of the configured `#A2A9A3` and 11769 dark pixels, while the badge renders the configured `#F25730` in the very same frame. The selected item still takes its color from `tabBar.tintColor`, a bar-level property. `unselectedItemTintColor` is that property's unselected counterpart, so the coordinator mirrors the color the screens already carry in their item appearance onto it. Titles are the only thing left that needs it — the App hands over pre-tinted non-template icons, which UIKit leaves alone either way.
+- Upstream PR/issue: not reported yet.
+- E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
+- PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch b/patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch
new file mode 100644
index 000000000000..1bdb49f1de1c
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch
@@ -0,0 +1,34 @@
+diff --git a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
+index ae5873c..e277003 100644
+--- a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
++++ b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
+@@ -40,6 +40,29 @@ - (void)updateAppearanceOfTabBar:(nullable UITabBar *)tabBar
+ 
+     [self configureTabBarItemForTabScreenController:tabScreenCtrl imageLoader:imageLoader];
+   }
++
++  // Step 3 - mirror the unselected item color onto the bar itself.
++  // iOS 26 renders the tab bar's own glass material and ignores the unselected colors carried by the per-item
++  // UITabBarItemAppearance, which leaves unselected titles on the system label color. unselectedItemTintColor is a
++  // bar-level property and is still honored, so the color the screens already carry is reused for it.
++  [self updateUnselectedItemTintColorOfTabBar:tabBar fromTabScreenControllers:tabScreenCtrls];
++}
++
++- (void)updateUnselectedItemTintColorOfTabBar:(nonnull UITabBar *)tabBar
++                     fromTabScreenControllers:(nonnull NSArray<RNSTabsScreenViewController *> *)tabScreenCtrls
++{
++  for (RNSTabsScreenViewController *tabScreenCtrl in tabScreenCtrls) {
++    UITabBarAppearance *standardAppearance = tabScreenCtrl.tabScreenComponentView.standardAppearance;
++    if (standardAppearance == nil) {
++      continue;
++    }
++
++    UIColor *unselectedColor = standardAppearance.stackedLayoutAppearance.normal.iconColor;
++    if (unselectedColor != nil) {
++      tabBar.unselectedItemTintColor = unselectedColor;
++      return;
++    }
++  }
+ }
+ 
+ - (void)configureTabBarItemForTabScreenController:(nonnull RNSTabsScreenViewController *)tabScreenCtrl
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index d23c6eb777e9..a42392dca2eb 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -41,12 +41,13 @@ import SCREENS from '@src/SCREENS';
 
 import type {NativeBottomTabIcon, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+import type {ImageSourcePropType} from 'react-native';
 
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
-import {ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
 import React, {useEffect, useState} from 'react';
-import {View} from 'react-native';
+import {Image, View} from 'react-native';
 
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
@@ -60,13 +61,22 @@ import WorkspaceNavigator from './WorkspaceNavigator';
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
-/** Template icons, so each platform tints them with the active and inactive colors taken from our theme. */
+/** Template icons, so the selected tab picks up the active color through the bar's own tint. */
 const HOME_TAB_ICON = {type: 'image', source: homeIcon} as const satisfies NativeBottomTabIcon;
 const INBOX_TAB_ICON = {type: 'image', source: inboxIcon} as const satisfies NativeBottomTabIcon;
 const SPEND_TAB_ICON = {type: 'image', source: receiptMultipleIcon} as const satisfies NativeBottomTabIcon;
 const WORKSPACES_TAB_ICON = {type: 'image', source: buildingsIcon} as const satisfies NativeBottomTabIcon;
 const ACCOUNT_TAB_ICON = {type: 'image', source: profileIcon} as const satisfies NativeBottomTabIcon;
 
+/** Every template icon the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
+const TAB_ICONS = [
+    [SCREENS.HOME, homeIcon],
+    [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, inboxIcon],
+    [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, receiptMultipleIcon],
+    [NAVIGATORS.WORKSPACE_NAVIGATOR, buildingsIcon],
+    [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, profileIcon],
+] as const;
+
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
@@ -81,6 +91,49 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
     return state?.stale === false;
 }
 
+/** The recolored copies of one tab icon, one per selection state. */
+type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
+
+/**
+ * iOS 26 draws the bar's glass material itself and ignores the per-item `UITabBarItemAppearance`, so the inactive
+ * icon color never reaches an unselected template icon — it lands on the system label color instead. Recoloring the
+ * icon off-screen and handing it over as an opaque image is the only way to keep the theme's icon color there.
+ * Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon differ in type.
+ */
+async function createTintedIcon(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
+    const asset = Image.resolveAssetSource(source);
+    if (!asset?.uri) {
+        return undefined;
+    }
+
+    const response = await fetch(asset.uri);
+    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
+    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
+    const surface = image ? Skia.Surface.MakeOffscreen(image.width(), image.height()) : null;
+
+    if (!image || !surface) {
+        image?.dispose();
+        surface?.dispose();
+        return undefined;
+    }
+
+    const bounds = Skia.XYWHRect(0, 0, image.width(), image.height());
+    const paint = Skia.Paint();
+    // SrcIn keeps the glyph's alpha and replaces every colored pixel with the theme color.
+    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
+    surface.getCanvas().drawImageRect(image, bounds, bounds, paint);
+    surface.flush();
+
+    const snapshot = surface.makeImageSnapshot();
+    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
+
+    image.dispose();
+    snapshot.dispose();
+    surface.dispose();
+
+    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: asset.width, height: asset.height, scale: asset.scale}, tinted: false};
+}
+
 /**
  * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
  * circle off-screen and handed over as a data URI.
@@ -197,6 +250,47 @@ function TabNavigator() {
     const activeTabRouteName = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index]?.name : SCREENS.HOME;
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
 
+    const [tintedIcons, setTintedIcons] = useState<{inactiveColor: string; activeColor: string; icons: Record<string, TintedTabIconPair>}>();
+    const tintedIconsForTheme = tintedIcons?.inactiveColor === theme.icon && tintedIcons.activeColor === theme.iconMenu ? tintedIcons.icons : undefined;
+
+    useEffect(() => {
+        let isActive = true;
+        const inactiveColor = theme.icon;
+        const activeColor = theme.iconMenu;
+
+        Promise.all(
+            TAB_ICONS.map(([name, source]) =>
+                Promise.all([createTintedIcon(source, inactiveColor), createTintedIcon(source, activeColor)]).then(([inactive, active]) => ({name, inactive, active})),
+            ),
+        )
+            .then((results) => {
+                if (!isActive) {
+                    return;
+                }
+                const icons: Record<string, TintedTabIconPair> = {};
+                for (const result of results) {
+                    if (result.inactive && result.active) {
+                        icons[result.name] = {inactive: result.inactive, active: result.active};
+                    }
+                }
+                setTintedIcons({inactiveColor, activeColor, icons});
+            })
+            .catch(() => {});
+
+        return () => {
+            isActive = false;
+        };
+    }, [theme.icon, theme.iconMenu]);
+
+    /** Falls back to the template icon until both tinted copies are ready, so a tab is never left without one. */
+    const getTabBarIcon = (name: string, fallbackIcon: NativeBottomTabIcon) => {
+        const pair = tintedIconsForTheme?.[name];
+        if (!pair) {
+            return fallbackIcon;
+        }
+        return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
+    };
+
     const avatarSource = getAvatarURL({
         avatarSource: currentUserPersonalDetails.avatar,
         accountID: currentUserPersonalDetails.accountID,
@@ -272,7 +366,10 @@ function TabNavigator() {
 
     const screenOptions = {
         headerShown: false,
-        lazy: true,
+        // The native bar swaps the visible tab itself, so a tab that mounts on first focus hands the bar an empty
+        // container to show while its tree renders. Unfocused tabs render through a transition instead, which keeps
+        // them off the first paint and still leaves each one ready to draw its own skeleton the moment it is picked.
+        lazy: false,
         tabBarActiveTintColor: theme.iconMenu,
         tabBarInactiveTintColor: theme.icon,
         tabBarControllerMode: 'tabBar' as const,
@@ -291,14 +388,14 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={{tabBarLabel: translate('common.home'), tabBarIcon: HOME_TAB_ICON}}
+                options={{tabBarLabel: translate('common.home'), tabBarIcon: getTabBarIcon(SCREENS.HOME, HOME_TAB_ICON)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
                 options={{
                     tabBarLabel: translate('common.inbox'),
-                    tabBarIcon: INBOX_TAB_ICON,
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, INBOX_TAB_ICON),
                     tabBarBadge: chatTabBrickRoad ? ' ' : undefined,
                     tabBarBadgeStyle: {backgroundColor: chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger},
                 }}
@@ -306,14 +403,14 @@ function TabNavigator() {
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={{tabBarLabel: translate('common.spend'), tabBarIcon: SPEND_TAB_ICON}}
+                options={{tabBarLabel: translate('common.spend'), tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SPEND_TAB_ICON)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
                 options={{
                     tabBarLabel: translate('common.workspacesTabTitle'),
-                    tabBarIcon: WORKSPACES_TAB_ICON,
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR, WORKSPACES_TAB_ICON),
                     tabBarBadge: workspacesIndicatorStatus ? ' ' : undefined,
                     tabBarBadgeStyle: {backgroundColor: workspacesIndicatorColor},
                 }}
@@ -323,7 +420,7 @@ function TabNavigator() {
                 component={SettingsSplitNavigator}
                 options={{
                     tabBarLabel: translate('initialSettingsPage.account'),
-                    tabBarIcon: accountTabIcon,
+                    tabBarIcon: circularAvatarURI ? accountTabIcon : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, accountTabIcon),
                     tabBarBadge: accountIndicatorStatus ? ' ' : undefined,
                     tabBarBadgeStyle: {backgroundColor: accountIndicatorColor},
                 }}

From 8760e9668fcaad253602ae06b3972ff2d5b85797 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 13:09:01 +0200
Subject: [PATCH 131/781] fix: keep each native tab's badge color with that tab
 on iOS 26

---
 patches/react-native-screens/details.md            |  4 ++--
 ...ly-tab-bar-item-colors-ignored-on-ios-26.patch} | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)
 rename patches/react-native-screens/{react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch => react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch} (64%)

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index a1f579740d81..c5c348ba84a5 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -7,9 +7,9 @@
 - E/App issue: [#93842](https://github.com/Expensify/App/issues/93842)
 - PR introducing patch: [#98632](https://github.com/Expensify/App/pull/98632)
 
-### [react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch](react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch)
+### [react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch](react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch)
 
-- Reason: On iOS 26 the tab bar renders its own glass material and honors the per-item `UITabBarItemAppearance` only in part. Measured on screenshots of the bar: `badgeBackgroundColor` is applied, while `tabBarItemIconColor` and the normal-state title color are not, so unselected icons and titles fall back to the system label color (black in light mode). The comparison that isolates it: with template icons the bar renders 0 pixels of the configured `#A2A9A3` and 11769 dark pixels, while the badge renders the configured `#F25730` in the very same frame. The selected item still takes its color from `tabBar.tintColor`, a bar-level property. `unselectedItemTintColor` is that property's unselected counterpart, so the coordinator mirrors the color the screens already carry in their item appearance onto it. Titles are the only thing left that needs it — the App hands over pre-tinted non-template icons, which UIKit leaves alone either way.
+- Reason: On iOS 26 the tab bar renders its own glass material and does not apply the per-item `UITabBarItemAppearance` the way earlier versions did. Two symptoms, both measured on screenshots of the bar. Unselected icons and titles ignore `tabBarItemIconColor` and the normal-state title color and fall back to the system label color: with template icons the bar renders 0 pixels of the configured `#A2A9A3` and 11769 dark ones. Badges ignore their own item's `badgeBackgroundColor` and are all drawn in the color belonging to whichever tab is selected: with Home selected every badge measured `#FF3B30`, which is the `notification` color of React Navigation's default theme that Home falls back to, and with the account tab selected every badge measured that tab's `#F25730`. The selected item still takes its color from `tabBar.tintColor`, and the icons still follow `tabBarItem.image`, so properties set directly on the bar and on the item are honored. The patch routes both ignored colors onto such properties: the unselected color is mirrored onto the bar-level `unselectedItemTintColor`, and each item's badge color is read back from its appearance and set on its own `badgeColor`.
 - Upstream PR/issue: not reported yet.
 - E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
 - PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch b/patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch
similarity index 64%
rename from patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch
rename to patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch
index 1bdb49f1de1c..43c67a70aeee 100644
--- a/patches/react-native-screens/react-native-screens+4.25.0+002+tint-unselected-tab-bar-items-on-ios-26.patch
+++ b/patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
-index ae5873c..e277003 100644
+index ae5873c..33e35b1 100644
 --- a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
 +++ b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
 @@ -40,6 +40,29 @@ - (void)updateAppearanceOfTabBar:(nullable UITabBar *)tabBar
@@ -32,3 +32,15 @@ index ae5873c..e277003 100644
  }
  
  - (void)configureTabBarItemForTabScreenController:(nonnull RNSTabsScreenViewController *)tabScreenCtrl
+@@ -50,6 +73,11 @@ - (void)configureTabBarItemForTabScreenController:(nonnull RNSTabsScreenViewCont
+   tabBarItem.standardAppearance = tabScreenCtrl.tabScreenComponentView.standardAppearance;
+   tabBarItem.scrollEdgeAppearance = tabScreenCtrl.tabScreenComponentView.scrollEdgeAppearance;
+ 
++  // The badge color reaches the bar through the same per-item appearance, so on iOS 26 every badge ends up drawn in
++  // the color of whichever tab is selected. Setting it on the item's own badgeColor keeps each tab's color with that
++  // tab: a plain UITabBarItem property, the same kind as the icons below, which the new bar does honor.
++  tabBarItem.badgeColor = tabScreenCtrl.tabScreenComponentView.standardAppearance.stackedLayoutAppearance.normal.badgeBackgroundColor;
++
+   [self setIconsForTabBarItem:tabBarItem
+                fromScreenView:tabScreenCtrl.tabScreenComponentView
+               withImageLoader:imageLoader];

From 5eab7d4a643d41ce6532003d04e98bccbe8c3702 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 14:13:26 +0200
Subject: [PATCH 132/781] revert: drop the iOS 26 tab bar color patch,
 measurements show it has no effect

---
 patches/react-native-screens/details.md       |  6 ---
 ...ab-bar-item-colors-ignored-on-ios-26.patch | 46 -------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index c5c348ba84a5..27ee4da38a75 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -7,9 +7,3 @@
 - E/App issue: [#93842](https://github.com/Expensify/App/issues/93842)
 - PR introducing patch: [#98632](https://github.com/Expensify/App/pull/98632)
 
-### [react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch](react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch)
-
-- Reason: On iOS 26 the tab bar renders its own glass material and does not apply the per-item `UITabBarItemAppearance` the way earlier versions did. Two symptoms, both measured on screenshots of the bar. Unselected icons and titles ignore `tabBarItemIconColor` and the normal-state title color and fall back to the system label color: with template icons the bar renders 0 pixels of the configured `#A2A9A3` and 11769 dark ones. Badges ignore their own item's `badgeBackgroundColor` and are all drawn in the color belonging to whichever tab is selected: with Home selected every badge measured `#FF3B30`, which is the `notification` color of React Navigation's default theme that Home falls back to, and with the account tab selected every badge measured that tab's `#F25730`. The selected item still takes its color from `tabBar.tintColor`, and the icons still follow `tabBarItem.image`, so properties set directly on the bar and on the item are honored. The patch routes both ignored colors onto such properties: the unselected color is mirrored onto the bar-level `unselectedItemTintColor`, and each item's badge color is read back from its appearance and set on its own `badgeColor`.
-- Upstream PR/issue: not reported yet.
-- E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
-- PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch b/patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch
deleted file mode 100644
index 43c67a70aeee..000000000000
--- a/patches/react-native-screens/react-native-screens+4.25.0+002+apply-tab-bar-item-colors-ignored-on-ios-26.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
-index ae5873c..33e35b1 100644
---- a/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
-+++ b/node_modules/react-native-screens/ios/tabs/RNSTabBarAppearanceCoordinator.mm
-@@ -40,6 +40,29 @@ - (void)updateAppearanceOfTabBar:(nullable UITabBar *)tabBar
- 
-     [self configureTabBarItemForTabScreenController:tabScreenCtrl imageLoader:imageLoader];
-   }
-+
-+  // Step 3 - mirror the unselected item color onto the bar itself.
-+  // iOS 26 renders the tab bar's own glass material and ignores the unselected colors carried by the per-item
-+  // UITabBarItemAppearance, which leaves unselected titles on the system label color. unselectedItemTintColor is a
-+  // bar-level property and is still honored, so the color the screens already carry is reused for it.
-+  [self updateUnselectedItemTintColorOfTabBar:tabBar fromTabScreenControllers:tabScreenCtrls];
-+}
-+
-+- (void)updateUnselectedItemTintColorOfTabBar:(nonnull UITabBar *)tabBar
-+                     fromTabScreenControllers:(nonnull NSArray<RNSTabsScreenViewController *> *)tabScreenCtrls
-+{
-+  for (RNSTabsScreenViewController *tabScreenCtrl in tabScreenCtrls) {
-+    UITabBarAppearance *standardAppearance = tabScreenCtrl.tabScreenComponentView.standardAppearance;
-+    if (standardAppearance == nil) {
-+      continue;
-+    }
-+
-+    UIColor *unselectedColor = standardAppearance.stackedLayoutAppearance.normal.iconColor;
-+    if (unselectedColor != nil) {
-+      tabBar.unselectedItemTintColor = unselectedColor;
-+      return;
-+    }
-+  }
- }
- 
- - (void)configureTabBarItemForTabScreenController:(nonnull RNSTabsScreenViewController *)tabScreenCtrl
-@@ -50,6 +73,11 @@ - (void)configureTabBarItemForTabScreenController:(nonnull RNSTabsScreenViewCont
-   tabBarItem.standardAppearance = tabScreenCtrl.tabScreenComponentView.standardAppearance;
-   tabBarItem.scrollEdgeAppearance = tabScreenCtrl.tabScreenComponentView.scrollEdgeAppearance;
- 
-+  // The badge color reaches the bar through the same per-item appearance, so on iOS 26 every badge ends up drawn in
-+  // the color of whichever tab is selected. Setting it on the item's own badgeColor keeps each tab's color with that
-+  // tab: a plain UITabBarItem property, the same kind as the icons below, which the new bar does honor.
-+  tabBarItem.badgeColor = tabScreenCtrl.tabScreenComponentView.standardAppearance.stackedLayoutAppearance.normal.badgeBackgroundColor;
-+
-   [self setIconsForTabBarItem:tabBarItem
-                fromScreenView:tabScreenCtrl.tabScreenComponentView
-               withImageLoader:imageLoader];

From 4c2aa31e891bc3a79d548ea6c4d3e239462fe03a Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 14:33:29 +0200
Subject: [PATCH 133/781] fix: draw tab status dots into the icons and fade the
 floating buttons in

---
 .../Navigators/TabNavigator.native.tsx        | 123 +++++++++++++-----
 src/styles/variables.ts                       |   4 +
 2 files changed, 93 insertions(+), 34 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index a42392dca2eb..74ec34100ba8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -41,6 +41,7 @@ import SCREENS from '@src/SCREENS';
 
 import type {NativeBottomTabIcon, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+import type {SkCanvas} from '@shopify/react-native-skia';
 import type {ImageSourcePropType} from 'react-native';
 
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
@@ -48,6 +49,7 @@ import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@re
 import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
 import React, {useEffect, useState} from 'react';
 import {Image, View} from 'react-native';
+import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
@@ -94,13 +96,23 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 /** The recolored copies of one tab icon, one per selection state. */
 type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
+/** Paints the status dot in the canvas' top right corner, where a native badge would have sat. */
+function drawStatusDot(canvas: SkCanvas, canvasWidth: number, scale: number, color: string) {
+    const radius = variables.nativeTabIconDotRadius * scale;
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    canvas.drawCircle(canvasWidth - radius, radius, radius, paint);
+}
+
 /**
- * iOS 26 draws the bar's glass material itself and ignores the per-item `UITabBarItemAppearance`, so the inactive
- * icon color never reaches an unselected template icon — it lands on the system label color instead. Recoloring the
- * icon off-screen and handing it over as an opaque image is the only way to keep the theme's icon color there.
- * Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon differ in type.
+ * iOS 26 draws the bar's glass material itself and honors very little of what a tab item is told about its colors.
+ * The inactive icon color from `UITabBarItemAppearance` never arrives, and every badge is painted in the color of
+ * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
+ * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
+ * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
+ * differ in type. Every icon reserves the same room for the dot so the glyphs stay aligned across tabs.
  */
-async function createTintedIcon(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
+async function createTabIcon(source: ImageSourcePropType, color: string, dotColor: string | undefined): Promise<NativeBottomTabIcon | undefined> {
     const asset = Image.resolveAssetSource(source);
     if (!asset?.uri) {
         return undefined;
@@ -109,7 +121,11 @@ async function createTintedIcon(source: ImageSourcePropType, color: string): Pro
     const response = await fetch(asset.uri);
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
-    const surface = image ? Skia.Surface.MakeOffscreen(image.width(), image.height()) : null;
+    const scale = asset.scale ?? 1;
+    const padding = variables.nativeTabIconDotRadius * 2 * scale;
+    const canvasWidth = image ? image.width() + padding : 0;
+    const canvasHeight = image ? image.height() + padding : 0;
+    const surface = image ? Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight) : null;
 
     if (!image || !surface) {
         image?.dispose();
@@ -117,11 +133,18 @@ async function createTintedIcon(source: ImageSourcePropType, color: string): Pro
         return undefined;
     }
 
-    const bounds = Skia.XYWHRect(0, 0, image.width(), image.height());
     const paint = Skia.Paint();
     // SrcIn keeps the glyph's alpha and replaces every colored pixel with the theme color.
     paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
-    surface.getCanvas().drawImageRect(image, bounds, bounds, paint);
+
+    const canvas = surface.getCanvas();
+    // The glyph sits in the bottom left so the reserved room ends up under the dot.
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(0, padding, image.width(), image.height()), paint);
+
+    if (dotColor) {
+        drawStatusDot(canvas, canvasWidth, scale, dotColor);
+    }
+
     surface.flush();
 
     const snapshot = surface.makeImageSnapshot();
@@ -131,19 +154,23 @@ async function createTintedIcon(source: ImageSourcePropType, color: string): Pro
     snapshot.dispose();
     surface.dispose();
 
-    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: asset.width, height: asset.height, scale: asset.scale}, tinted: false};
+    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
 }
 
 /**
  * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI.
+ * circle off-screen and handed over as a data URI. It reserves the same room for the status dot as every other tab
+ * icon, so the avatar lines up with the glyphs next to it.
  */
-async function createCircularAvatarIcon(uri: string): Promise<string | undefined> {
+async function createCircularAvatarIcon(uri: string, dotColor: string | undefined): Promise<string | undefined> {
     const response = await fetch(uri);
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
-    const iconSize = variables.iconBottomBar * 3;
-    const surface = Skia.Surface.MakeOffscreen(iconSize, iconSize);
+    const scale = variables.nativeTabIconScale;
+    const avatarSize = variables.iconBottomBar * scale;
+    const padding = variables.nativeTabIconDotRadius * 2 * scale;
+    const canvasSize = avatarSize + padding;
+    const surface = Skia.Surface.MakeOffscreen(canvasSize, canvasSize);
 
     if (!image || !surface) {
         image?.dispose();
@@ -155,11 +182,18 @@ async function createCircularAvatarIcon(uri: string): Promise<string | undefined
     const sourceX = (image.width() - sourceSize) / 2;
     const sourceY = (image.height() - sourceSize) / 2;
     const circle = Skia.Path.Make();
-    circle.addCircle(iconSize / 2, iconSize / 2, iconSize / 2);
+    circle.addCircle(avatarSize / 2, padding + avatarSize / 2, avatarSize / 2);
 
     const canvas = surface.getCanvas();
+    canvas.save();
     canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, iconSize, iconSize), Skia.Paint());
+    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, padding, avatarSize, avatarSize), Skia.Paint());
+    canvas.restore();
+
+    if (dotColor) {
+        drawStatusDot(canvas, canvasSize, scale, dotColor);
+    }
+
     surface.flush();
 
     const snapshot = surface.makeImageSnapshot();
@@ -214,7 +248,10 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
             {children}
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
-                <View
+                // The buttons belong to the bar, so they fade with it rather than appearing in place.
+                <Animated.View
+                    entering={FadeIn.duration(CONST.ANIMATED_TRANSITION)}
+                    exiting={FadeOut.duration(CONST.ANIMATED_TRANSITION)}
                     style={styles.nativeTabBarFloatingButtons}
                     pointerEvents="box-none"
                 >
@@ -223,7 +260,7 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
                     </View>
                     <FloatingGPSButton />
                     <FloatingCameraButton />
-                </View>
+                </Animated.View>
             )}
         </View>
     );
@@ -250,17 +287,36 @@ function TabNavigator() {
     const activeTabRouteName = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index]?.name : SCREENS.HOME;
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
 
-    const [tintedIcons, setTintedIcons] = useState<{inactiveColor: string; activeColor: string; icons: Record<string, TintedTabIconPair>}>();
-    const tintedIconsForTheme = tintedIcons?.inactiveColor === theme.icon && tintedIcons.activeColor === theme.iconMenu ? tintedIcons.icons : undefined;
+    let inboxDotColor: string | undefined;
+    if (chatTabBrickRoad) {
+        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
+    }
+    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
+    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
+    const dotColors: Record<string, string | undefined> = {
+        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
+        [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
+        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: accountDotColor,
+    };
+    // The signature covers everything baked into the bitmaps, so a status that comes or goes redraws them.
+    const iconsSignature = `${theme.icon}|${theme.iconMenu}|${inboxDotColor}|${workspacesDotColor}|${accountDotColor}`;
+
+    const [tintedIcons, setTintedIcons] = useState<{signature: string; icons: Record<string, TintedTabIconPair>}>();
+    const tintedIconsForTheme = tintedIcons?.signature === iconsSignature ? tintedIcons.icons : undefined;
 
     useEffect(() => {
         let isActive = true;
         const inactiveColor = theme.icon;
         const activeColor = theme.iconMenu;
+        const signature = iconsSignature;
 
         Promise.all(
             TAB_ICONS.map(([name, source]) =>
-                Promise.all([createTintedIcon(source, inactiveColor), createTintedIcon(source, activeColor)]).then(([inactive, active]) => ({name, inactive, active})),
+                Promise.all([createTabIcon(source, inactiveColor, dotColors[name]), createTabIcon(source, activeColor, dotColors[name])]).then(([inactive, active]) => ({
+                    name,
+                    inactive,
+                    active,
+                })),
             ),
         )
             .then((results) => {
@@ -273,14 +329,15 @@ function TabNavigator() {
                         icons[result.name] = {inactive: result.inactive, active: result.active};
                     }
                 }
-                setTintedIcons({inactiveColor, activeColor, icons});
+                setTintedIcons({signature, icons});
             })
             .catch(() => {});
 
         return () => {
             isActive = false;
         };
-    }, [theme.icon, theme.iconMenu]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [iconsSignature]);
 
     /** Falls back to the template icon until both tinted copies are ready, so a tab is never left without one. */
     const getTabBarIcon = (name: string, fallbackIcon: NativeBottomTabIcon) => {
@@ -296,10 +353,12 @@ function TabNavigator() {
         accountID: currentUserPersonalDetails.accountID,
     });
     const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const [circularAvatar, setCircularAvatar] = useState<{source: string; uri: string}>();
-    const circularAvatarURI = circularAvatar && circularAvatar.source === avatarURI ? circularAvatar.uri : undefined;
+    const avatarSignature = `${avatarURI}|${accountDotColor}`;
+    const [circularAvatar, setCircularAvatar] = useState<{signature: string; uri: string}>();
+    const circularAvatarURI = circularAvatar?.signature === avatarSignature ? circularAvatar.uri : undefined;
+    const accountIconSize = variables.iconBottomBar + variables.nativeTabIconDotRadius * 2;
     const accountTabIcon: NativeBottomTabIcon = circularAvatarURI
-        ? {type: 'image', source: {uri: circularAvatarURI, width: variables.iconBottomBar, height: variables.iconBottomBar, scale: 3}, tinted: false}
+        ? {type: 'image', source: {uri: circularAvatarURI, width: accountIconSize, height: accountIconSize, scale: variables.nativeTabIconScale}, tinted: false}
         : ACCOUNT_TAB_ICON;
 
     useEffect(() => {
@@ -310,19 +369,21 @@ function TabNavigator() {
             };
         }
 
-        createCircularAvatarIcon(avatarURI)
+        const signature = avatarSignature;
+        createCircularAvatarIcon(avatarURI, accountDotColor)
             .then((result) => {
                 if (!isActive || !result) {
                     return;
                 }
-                setCircularAvatar({source: avatarURI, uri: result});
+                setCircularAvatar({signature, uri: result});
             })
             .catch(() => {});
 
         return () => {
             isActive = false;
         };
-    }, [avatarURI]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [avatarSignature]);
 
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
@@ -396,8 +457,6 @@ function TabNavigator() {
                 options={{
                     tabBarLabel: translate('common.inbox'),
                     tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, INBOX_TAB_ICON),
-                    tabBarBadge: chatTabBrickRoad ? ' ' : undefined,
-                    tabBarBadgeStyle: {backgroundColor: chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger},
                 }}
             />
             <Tab.Screen
@@ -411,8 +470,6 @@ function TabNavigator() {
                 options={{
                     tabBarLabel: translate('common.workspacesTabTitle'),
                     tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR, WORKSPACES_TAB_ICON),
-                    tabBarBadge: workspacesIndicatorStatus ? ' ' : undefined,
-                    tabBarBadgeStyle: {backgroundColor: workspacesIndicatorColor},
                 }}
             />
             <Tab.Screen
@@ -421,8 +478,6 @@ function TabNavigator() {
                 options={{
                     tabBarLabel: translate('initialSettingsPage.account'),
                     tabBarIcon: circularAvatarURI ? accountTabIcon : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, accountTabIcon),
-                    tabBarBadge: accountIndicatorStatus ? ' ' : undefined,
-                    tabBarBadgeStyle: {backgroundColor: accountIndicatorColor},
                 }}
             />
         </Tab.Navigator>
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 0da088c279fb..7e6a081a81bb 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -104,6 +104,10 @@ export default {
     iconSizeMegaLarge: 105,
     iconSizeMenuItem: 32,
     iconBottomBar: 24,
+    /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
+    nativeTabIconDotRadius: 4,
+    /** Pixel density the native tab bar icons are rasterized at. */
+    nativeTabIconScale: 3,
     iconHeader: 48,
     iconSection: 68,
     iouAmountTextSize: 40,

From 0c8fac937905afd7446856405f1e0582b4ce2876 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 14:41:31 +0200
Subject: [PATCH 134/781] fix: let UIKit animate hiding the native tab bar
 instead of blinking it

---
 patches/react-native-screens/details.md       |  7 ++++++
 ...02+animate-hiding-the-native-tab-bar.patch | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 27ee4da38a75..f00bd6eb1620 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -7,3 +7,10 @@
 - E/App issue: [#93842](https://github.com/Expensify/App/issues/93842)
 - PR introducing patch: [#98632](https://github.com/Expensify/App/pull/98632)
 
+
+### [react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch](react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch)
+
+- Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES` at both call sites, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart.
+- Upstream PR/issue: not reported yet.
+- E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
+- PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch b/patches/react-native-screens/react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch
new file mode 100644
index 000000000000..039851fb2235
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch
@@ -0,0 +1,24 @@
+diff --git a/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm b/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
+index b92035c..f6c85fe 100644
+--- a/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
++++ b/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
+@@ -298,7 +298,8 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
+     _tabBarHidden = newComponentProps.tabBarHidden;
+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
+     if (@available(iOS 18.0, *)) {
+-      [_controller setTabBarHidden:_tabBarHidden animated:NO];
++      // Animated so the bar slides out with the screen that hid it instead of blinking away.
++      [_controller setTabBarHidden:_tabBarHidden animated:YES];
+     } else
+ #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
+     {
+@@ -488,7 +489,8 @@ - (void)setTabBarHidden:(BOOL)tabBarHidden
+   _tabBarHidden = tabBarHidden;
+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
+   if (@available(iOS 18.0, *)) {
+-    [_controller setTabBarHidden:_tabBarHidden animated:NO];
++    // Animated so the bar slides out with the screen that hid it instead of blinking away.
++    [_controller setTabBarHidden:_tabBarHidden animated:YES];
+   } else
+ #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
+   {

From 9d243e9a4552b307e63bbe8450088cc78f8befaf Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 16 Sep 2026 16:10:25 +0200
Subject: [PATCH 135/781] fix: match the floating button fade to the system tab
 bar animation

---
 .../AppNavigator/Navigators/TabNavigator.native.tsx       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 74ec34100ba8..842a7e53aa30 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -248,10 +248,12 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
             {children}
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
-                // The buttons belong to the bar, so they fade with it rather than appearing in place.
+                // The buttons belong to the bar, so they fade with it rather than appearing in place. UIKit animates
+                // the bar itself over roughly the 0.35s it gives every bar, which the FAB's own timing already
+                // matches on the way in; it leaves faster so it stops covering the bar that is still sliding out.
                 <Animated.View
-                    entering={FadeIn.duration(CONST.ANIMATED_TRANSITION)}
-                    exiting={FadeOut.duration(CONST.ANIMATED_TRANSITION)}
+                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
+                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
                     style={styles.nativeTabBarFloatingButtons}
                     pointerEvents="box-none"
                 >

From a8ffa51e31731576d14b402562bc446431d87987 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 17 Sep 2026 16:44:42 +0200
Subject: [PATCH 136/781] Document Auditor role membership rules in the
 security philosophy

---
 contributingGuides/philosophies/SECURITY.md | 55 ++++++++++++---------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index b452f0106a0b..ab61e76899c5 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -33,12 +33,12 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 ### Workspace Rooms
 #### Workspace
-|                    | Creator | Member(Employee/User) | Admin | Auditor? |
-| :----------------: | :-----: | :-------------------: | :---: | :------: |
-|     **Invite**     |    ✅    |           ❌           |   ✅   |    ❌     |
-|     **Remove**     |    ✅    |           ❌           |   ✅   |    ❌     |
-|     **Leave**      |    ❌    |           ✅           |   ❌   |    ✅     |
-| **Can be removed** |    ❌    |           ✅           |   ✅   |    ✅     |
+|                    | Creator | Member(Employee/User) | Admin | Auditor |
+| :----------------: | :-----: | :-------------------: | :---: | :-----: |
+|     **Invite**     |    ✅    |           ❌           |   ✅   |    ❌    |
+|     **Remove**     |    ✅    |           ❌           |   ✅   |    ❌    |
+|     **Leave**      |    ❌    |           ✅           |   ❌   |    ✅    |
+| **Can be removed** |    ❌    |           ✅           |   ✅   |    ✅    |
 
 - Creator can't leave or be removed from their own workspace
 - Admins can't leave from the workspace
@@ -47,35 +47,40 @@ Updated rules for managing members across all types of chats in New Expensify.
 - Members and Auditors cannot invite or remove anyone from the workspace
 
 #### Workspace #announce room
-|                    | Member(Employee/User) | Admin | Auditor? |
-| :----------------: | :-------------------: | :---: | :------: |
-|     **Invite**     |           ❌           |   ❌   |    ❌     |
-|     **Remove**     |           ❌           |   ❌   |    ❌     |
-|     **Leave**      |           ❌           |   ❌   |    ❌     |
-| **Can be removed** |           ❌           |   ❌   |    ❌     |
+|                    | Member(Employee/User) | Admin | Auditor |
+| :----------------: | :-------------------: | :---: | :-----: |
+|     **Invite**     |           ❌           |   ❌   |    ❌    |
+|     **Remove**     |           ❌           |   ❌   |    ❌    |
+|     **Leave**      |           ❌           |   ❌   |    ❌    |
+| **Can be removed** |           ❌           |   ❌   |    ❌    |
 
 - No one can leave or be removed from the #announce room
+- Auditors are added to #announce when they join the workspace, so they can't leave or be removed from it either
+- Only workspace admins can post in #announce. Every other role, auditors included, sees the room as read-only
 
 #### Workspace #admin room
-|                    | Admin |
-| :----------------: | :---: |
-|     **Invite**     |   ❌   |
-|     **Remove**     |   ❌   |
-|     **Leave**      |   ❌   |
-| **Can be removed** |   ❌   |
+|                    | Admin | Auditor |
+| :----------------: | :---: | :-----: |
+|     **Invite**     |   ❌   |    ❌    |
+|     **Remove**     |   ❌   |    ❌    |
+|     **Leave**      |   ❌   |   N/A   |
+| **Can be removed** |   ❌   |   N/A   |
 
 - Admins can't leave or be removed from #admins
+- Auditors are not members of #admins, so leaving and being removed don't apply to them. Changing a member's role to Auditor removes them from the room
+- Only workspace admins can post in #admins
 
 #### Workspace rooms
-|                    | Creator | Member | Guest(outside of the workspace) |
-| :----------------: | :-----: | :----: | :-----------------------------: |
-|     **Invite**     |    ✅    |   ✅    |                ✅                |
-|     **Remove**     |    ✅    |   ✅    |                ❌                |
-|     **Leave**      |    ✅    |   ✅    |                ✅                |
-| **Can be removed** |    ✅    |   ✅    |                ✅                |
+|                    | Creator | Member | Auditor | Guest(outside of the workspace) |
+| :----------------: | :-----: | :----: | :-----: | :-----------------------------: |
+|     **Invite**     |    ✅    |   ✅    |    ✅    |                ✅                |
+|     **Remove**     |    ✅    |   ✅    |    ✅    |                ❌                |
+|     **Leave**      |    ✅    |   ✅    |    ✅    |                ✅                |
+| **Can be removed** |    ✅    |   ✅    |    ✅    |                ✅                |
 
 - Everyone can be removed/can leave from the room including creator
 - Guests are not able to remove anyone from the room
+- Auditors are not added to user-created rooms automatically. They can discover and join non-private workspace rooms, and they can leave freely, like any other workspace member
 
 #### Expense chats
 |                    | Admin | Member(default) | Member(invited) |
@@ -90,6 +95,8 @@ Updated rules for managing members across all types of chats in New Expensify.
 - Invited members(invited by members) are not able to invite or remove from the expense chat
 - Invited members(invited by members) are able to leave the expense chat
 - Default members and admins are able to remove invited members
+- Auditors are default members of their own expense chat, so they can't leave or be removed from it
+- Auditors added to another member's expense chat are able to leave it, because they are not workspace admins
 
 ### Domain chat
 |                    | Member |

From 8e3d6b0d04698d0a7e2125a0a69b62fef650f972 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 17 Sep 2026 16:59:22 +0200
Subject: [PATCH 137/781] Correct the Auditor rules for #admins and expense
 chats against the Auth behaviour

---
 contributingGuides/philosophies/SECURITY.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index ab61e76899c5..356b2a5a278d 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -63,12 +63,14 @@ Updated rules for managing members across all types of chats in New Expensify.
 | :----------------: | :---: | :-----: |
 |     **Invite**     |   ❌   |    ❌    |
 |     **Remove**     |   ❌   |    ❌    |
-|     **Leave**      |   ❌   |   N/A   |
-| **Can be removed** |   ❌   |   N/A   |
+|     **Leave**      |   ❌   |    ❌    |
+| **Can be removed** |   ❌   |    ✅    |
 
 - Admins can't leave or be removed from #admins
-- Auditors are not members of #admins, so leaving and being removed don't apply to them. Changing a member's role to Auditor removes them from the room
-- Only workspace admins can post in #admins
+- Auditors are added to #admins when they are given the Auditor role, and membership follows the role rather than manual invites
+- Auditors can read and comment in #admins. Unlike #announce, the room has no admins-only write capability
+- No one can leave #admins, auditors included
+- Auditors can be removed from #admins, and they lose the room when their role changes to one without #admins access
 
 #### Workspace rooms
 |                    | Creator | Member | Auditor | Guest(outside of the workspace) |
@@ -80,7 +82,8 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 - Everyone can be removed/can leave from the room including creator
 - Guests are not able to remove anyone from the room
-- Auditors are not added to user-created rooms automatically. They can discover and join non-private workspace rooms, and they can leave freely, like any other workspace member
+- Auditors are not added to user-created rooms automatically. They can discover and join non-private workspace rooms, and they can leave freely
+- Auditors can invite and remove other participants in any room they are a participant of
 
 #### Expense chats
 |                    | Admin | Member(default) | Member(invited) |
@@ -95,8 +98,9 @@ Updated rules for managing members across all types of chats in New Expensify.
 - Invited members(invited by members) are not able to invite or remove from the expense chat
 - Invited members(invited by members) are able to leave the expense chat
 - Default members and admins are able to remove invited members
-- Auditors are default members of their own expense chat, so they can't leave or be removed from it
-- Auditors added to another member's expense chat are able to leave it, because they are not workspace admins
+- Auditors are added to every workspace expense chat, so they can see the expenses on the workspace, and they are able to comment
+- Auditors are not able to be removed from an expense chat
+- Auditors are able to leave another member's expense chat, but not their own
 
 ### Domain chat
 |                    | Member |

From c52a545b3ff8136b093062c6fa8339a86fa389f2 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 17 Sep 2026 21:05:07 +0200
Subject: [PATCH 138/781] Fix the Auditor rule for user-created workspace rooms

---
 contributingGuides/philosophies/SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index 356b2a5a278d..8781489d857b 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -82,8 +82,8 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 - Everyone can be removed/can leave from the room including creator
 - Guests are not able to remove anyone from the room
-- Auditors are not added to user-created rooms automatically. They can discover and join non-private workspace rooms, and they can leave freely
-- Auditors can invite and remove other participants in any room they are a participant of
+- Auditors are added to the workspace rooms that are not private when they are given the Auditor role. Private rooms are skipped, so they join those by invitation only
+- Auditors are able to invite and remove other participants in the rooms that their role shared with them
 
 #### Expense chats
 |                    | Admin | Member(default) | Member(invited) |

From 57288aedff48e75cfd073a103928c767ba246dce Mon Sep 17 00:00:00 2001
From: "MitchExpensify (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 17 Sep 2026 20:18:30 +0000
Subject: [PATCH 139/781] Stop routing group workspace members to the reports
 upgrade screen

Guard the upgrade path on policy hydration, let a valid active workspace
rescue the user before the upgrade early return, and pass the current
user login so the employeeList role fallback is reachable.

Co-authored-by: MitchExpensify <MitchExpensify@users.noreply.github.com>
---
 src/hooks/usePolicyForMovingExpenses.ts | 24 +++++++++++++++++++-----
 src/pages/Search/EmptySearchView.tsx    |  4 +++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/hooks/usePolicyForMovingExpenses.ts b/src/hooks/usePolicyForMovingExpenses.ts
index be09beaa39f9..5de9524f14e8 100644
--- a/src/hooks/usePolicyForMovingExpenses.ts
+++ b/src/hooks/usePolicyForMovingExpenses.ts
@@ -8,6 +8,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
@@ -100,7 +101,7 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
     // Contextual selector — captures login/flags from closure.
     // Returns only IDs + flags (stable output) to prevent re-renders when unrelated policies change.
     const policyQualificationSelector = (policies: OnyxCollection<Policy>) => getPolicyQualificationResult(policies, login, isPerDiemRequest, isTimeRequest, expensePolicyID);
-    const [qualificationResult] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {
+    const [qualificationResult, policiesLoadStatus] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {
         selector: policyQualificationSelector,
     });
 
@@ -110,17 +111,30 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
     const resolvedPolicyID = validExpensePolicyID ?? singlePolicyID;
     const [resolvedPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${resolvedPolicyID}`);
 
-    // User has no eligible policy
-    if (!resolvedPolicyID) {
-        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: true};
-    }
+    // Gate the upgrade path on policy hydration. Without this, during Onyx cold-start the collection reads
+    // empty and we'd report that a member of a group workspace has none, sending them to MONEY_REQUEST_UPGRADE.
+    // `useCreateReport` guards the same way.
+    const arePoliciesLoaded = !isLoadingOnyxValue(policiesLoadStatus);
 
     // If this is an employee's card transaction that we manage, then we should report it to their default policy
     // which we don't know. Sending an empty `policyID` instructs the backend to auto-select the preferred policy.
+    // This never depends on a locally resolved policy, so it has to be answered before the upgrade path below.
     if (isUnreportedManagedCardTransaction) {
         return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
     }
 
+    // User has no eligible policy
+    if (!resolvedPolicyID) {
+        // The active workspace can still be a valid destination even when the qualification pass came back
+        // empty, so check it before giving up. This has to run ahead of the upgrade path below, otherwise a
+        // perfectly valid active workspace can never rescue the user.
+        if (isPolicyValidForMovingExpenses(activePolicy, login, isPerDiemRequest, isTimeRequest)) {
+            return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+        }
+
+        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: arePoliciesLoaded};
+    }
+
     // If an expense policy ID is provided and valid, prefer it over the active policy
     if (validExpensePolicyID) {
         return {policyForMovingExpensesID: validExpensePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx
index f32e4d4a8902..1f5d250eedf0 100644
--- a/src/pages/Search/EmptySearchView.tsx
+++ b/src/pages/Search/EmptySearchView.tsx
@@ -87,7 +87,9 @@ function EmptySearchView({similarSearchHash, type, hasResults, queryJSON, violat
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);
 
-    const groupPoliciesWithChatEnabled = getGroupPoliciesWhereReportCanBeCreated(allPolicies);
+    // The login is required for the `employeeList` role fallback in `getPolicyRole`. Without it, every policy
+    // that only carries the member's role in `employeeList` is filtered out and the user looks workspace-less.
+    const groupPoliciesWithChatEnabled = getGroupPoliciesWhereReportCanBeCreated(allPolicies, currentUserPersonalDetails?.login);
 
     const [hasSeenTour = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
         selector: hasSeenTourSelector,

From b9698ad54020b54a3211b52569411bac1382edeb Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 17 Sep 2026 22:21:44 +0200
Subject: [PATCH 140/781] Mark auditors as non-removable from #admins to match
 the automatic-membership rule

---
 contributingGuides/philosophies/SECURITY.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index 8781489d857b..a19310ec44a5 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -10,6 +10,7 @@ Updated rules for managing members across all types of chats in New Expensify.
 - Admins MUST NOT be able to leave or be removed from expense chats
 - Members MUST NOT be able to leave or be removed from the #announce room
 - Admins MUST NOT be able to leave or be removed from #admins
+- Auditors MUST NOT be able to leave or be removed from #admins
 - Domain members MUST NOT be able to leave or be removed from their domain chat
 - Report submitters MUST NOT be able to leave or be removed from their reports
 - Report managers MUST NOT be able to leave or be removed from their reports
@@ -64,13 +65,13 @@ Updated rules for managing members across all types of chats in New Expensify.
 |     **Invite**     |   ❌   |    ❌    |
 |     **Remove**     |   ❌   |    ❌    |
 |     **Leave**      |   ❌   |    ❌    |
-| **Can be removed** |   ❌   |    ✅    |
+| **Can be removed** |   ❌   |    ❌    |
 
 - Admins can't leave or be removed from #admins
 - Auditors are added to #admins when they are given the Auditor role, and membership follows the role rather than manual invites
 - Auditors can read and comment in #admins. Unlike #announce, the room has no admins-only write capability
 - No one can leave #admins, auditors included
-- Auditors can be removed from #admins, and they lose the room when their role changes to one without #admins access
+- Auditors lose #admins when their role changes to one that has no #admins access. That is a role change, not a removal from the room
 
 #### Workspace rooms
 |                    | Creator | Member | Auditor | Guest(outside of the workspace) |

From 97c03f4389b32a5e9e66abee0f724d8e1d126f52 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 18 Sep 2026 12:44:53 +0430
Subject: [PATCH 141/781] Fix React Compiler lint for copyable transaction row
 press refs

---
 .../MoneyRequestReportTransactionItem.tsx            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index 7f74de932cb0..8ff542c2511a 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -178,10 +178,9 @@ function MoneyRequestReportTransactionItemBody({
         clearError(transaction.transactionID);
     };
 
-    // On narrow layouts `inlineEdit` is undefined (the parent skips the hook). The fallback ref
-    // keeps the press handler shape identical without ever being mutated on narrow.
-    const fallbackEditingOnMouseDownRef = useRef(false);
-    const wasEditingOnMouseDownRef = inlineEdit?.wasEditingOnMouseDownRef ?? fallbackEditingOnMouseDownRef;
+    // Keep this ref local so React Compiler can prove the after-render event mutations are safe.
+    const wasEditingOnMouseDownRef = useRef(false);
+    const wasEditingOnPressInRef = useRef(false);
     const wasPressInOnCopyableTextRef = useRef(false);
     const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
@@ -215,15 +214,16 @@ function MoneyRequestReportTransactionItemBody({
         }
         // If a cell was being edited when the user tapped the row, suppress navigation
         // so the second tap doesn't immediately open the transaction detail.
-        if (wasEditingOnMouseDownRef.current) {
+        if (wasEditingOnMouseDownRef.current || wasEditingOnPressInRef.current) {
             wasEditingOnMouseDownRef.current = false;
+            wasEditingOnPressInRef.current = false;
             return;
         }
         handleOnPress(transaction.transactionID);
     };
 
     const handlePressIn: React.ComponentProps<typeof PressableWithFeedback>['onPressIn'] = (event) => {
-        wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
+        wasEditingOnPressInRef.current = isEditingCell;
         wasPressInOnCopyableTextRef.current = false;
         // Selection only needs to be blocked for touch interactions; desktop mouse selection is handled by onMouseDown.
         if (!canUseTouchScreen()) {

From 054d0e58396074edbad9e643fb6b5509c0f83df2 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 18 Sep 2026 12:46:43 +0200
Subject: [PATCH 142/781] Apply batched suggestions from code review

Co-authored-by: Florent De'Neve <florent@expensify.com>
---
 contributingGuides/philosophies/SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index a19310ec44a5..4abfa28f7e8d 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -59,7 +59,7 @@ Updated rules for managing members across all types of chats in New Expensify.
 - Auditors are added to #announce when they join the workspace, so they can't leave or be removed from it either
 - Only workspace admins can post in #announce. Every other role, auditors included, sees the room as read-only
 
-#### Workspace #admin room
+#### Workspace #admins room
 |                    | Admin | Auditor |
 | :----------------: | :---: | :-----: |
 |     **Invite**     |   ❌   |    ❌    |

From afc8f295837a456398fb9bf5ccd68826b069b98f Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 18 Sep 2026 12:49:27 +0200
Subject: [PATCH 143/781] Revise SECURITY.md for clarity on roles and
 permissions

Updated the security guidelines to clarify workspace membership rules and reports section.
---
 contributingGuides/philosophies/SECURITY.md | 40 ++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/contributingGuides/philosophies/SECURITY.md b/contributingGuides/philosophies/SECURITY.md
index 4abfa28f7e8d..208307a519b9 100644
--- a/contributingGuides/philosophies/SECURITY.md
+++ b/contributingGuides/philosophies/SECURITY.md
@@ -33,20 +33,6 @@ Updated rules for managing members across all types of chats in New Expensify.
 - DM always has two participants. None of the participant can leave or be removed from the DM. Also no additional member can be invited to the chat.
 
 ### Workspace Rooms
-#### Workspace
-|                    | Creator | Member(Employee/User) | Admin | Auditor |
-| :----------------: | :-----: | :-------------------: | :---: | :-----: |
-|     **Invite**     |    ✅    |           ❌           |   ✅   |    ❌    |
-|     **Remove**     |    ✅    |           ❌           |   ✅   |    ❌    |
-|     **Leave**      |    ❌    |           ✅           |   ❌   |    ✅    |
-| **Can be removed** |    ❌    |           ✅           |   ✅   |    ✅    |
-
-- Creator can't leave or be removed from their own workspace
-- Admins can't leave from the workspace
-- Admins can remove other workspace admins, as well as workspace members, and invited guests
-- Creator can remove other workspace admins, as well as workspace members, and invited guests
-- Members and Auditors cannot invite or remove anyone from the workspace
-
 #### Workspace #announce room
 |                    | Member(Employee/User) | Admin | Auditor |
 | :----------------: | :-------------------: | :---: | :-----: |
@@ -112,12 +98,26 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 - Domain members can't leave or be removed from their domain chat
 
-4. ### Reports
-    |                    | Submitter | Manager |
-    | :----------------: | :-------: | :-----: |
-    |     **Remove**     |     ❌     |    ❌    |
-    |     **Leave**      |     ❌     |    ❌    |
-    | **Can be removed** |     ❌     |    ❌    |
+### Reports
+|                    | Submitter | Manager |
+| :----------------: | :-------: | :-----: |
+|     **Remove**     |     ❌     |    ❌    |
+|     **Leave**      |     ❌     |    ❌    |
+| **Can be removed** |     ❌     |    ❌    |
 
 - Report submitters can't leave or be removed from their reports (eg, if they are the report.accountID)
 - Report managers can't leave or be removed from their reports (eg, if they are the report.managerID)
+
+## Workspace membership
+|                    | Creator | Member(Employee/User) | Admin | Auditor |
+| :----------------: | :-----: | :-------------------: | :---: | :-----: |
+|     **Invite**     |    ✅    |           ❌           |   ✅   |    ❌    |
+|     **Remove**     |    ✅    |           ❌           |   ✅   |    ❌    |
+|     **Leave**      |    ❌    |           ✅           |   ❌   |    ✅    |
+| **Can be removed** |    ❌    |           ✅           |   ✅   |    ✅    |
+
+- Creator can't leave or be removed from their own workspace
+- Admins can't leave from the workspace
+- Admins can remove other workspace admins, as well as workspace members, and invited guests
+- Creator can remove other workspace admins, as well as workspace members, and invited guests
+- Members and Auditors cannot invite or remove anyone from the workspace

From 7c0a650738e087030ea194975880a08c62b0d169 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 18 Sep 2026 18:18:31 +0430
Subject: [PATCH 144/781] : Allow selectable HTML titles across web layouts

---
 src/components/MenuItem/MenuItem.tsx |  2 +-
 tests/ui/components/MenuItemTest.tsx | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 65e44245c125..aeeefa03d162 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -688,7 +688,7 @@ function MenuItem({
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
     const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.hasHTMLTags(title);
-    const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform(true) === CONST.PLATFORM.MOBILE_WEB;
+    const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform() === CONST.PLATFORM.WEB;
 
     const processedTitle = useMemo(() => {
         let titleToWrap = '';
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index c2176618ab7f..b3343d88ecae 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -48,8 +48,8 @@ describe('MenuItem', () => {
         mockedGetOperatingSystem.mockReturnValue(CONST.OS.WINDOWS);
     });
 
-    it('forwards selectable HTML titles to RenderHTML on mobile web', () => {
-        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.MOBILE_WEB);
+    it('forwards selectable HTML titles to RenderHTML on web', () => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
 
         render(
             <Wrapper>
@@ -64,6 +64,21 @@ describe('MenuItem', () => {
         expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: true}));
     });
 
+    it('does not override HTML title selection when the title is not selectable', () => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+
+        render(
+            <Wrapper>
+                <MenuItem
+                    title="<strong>Formatted description</strong>"
+                    shouldRenderAsHTML
+                />
+            </Wrapper>,
+        );
+
+        expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: undefined}));
+    });
+
     it('does not override HTML title selection on native', () => {
         render(
             <Wrapper>

From f5c3c2b7fc9b6153833bf1609137fedc44bfb260 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 18 Sep 2026 19:03:08 +0430
Subject: [PATCH 145/781] Remove redundant selection style from attendee pills

---
 src/components/UserPill.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/UserPill.tsx b/src/components/UserPill.tsx
index f3669263bd07..e0042eac9639 100644
--- a/src/components/UserPill.tsx
+++ b/src/components/UserPill.tsx
@@ -55,9 +55,9 @@ function UserPill({avatar, displayName, accountID, email, style, isCopyable = fa
                     />
                 </View>
                 <Text
-                    style={[styles.userPillText, isCopyable && styles.userSelectText]}
+                    style={styles.userPillText}
                     numberOfLines={1}
-                    selectable={isCopyable}
+                    selectable={isCopyable || undefined}
                     dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
                 >
                     {formattedDisplayName}

From 3bd822e8f1c092d34082a6b0b3c29491201e4bbc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 18 Sep 2026 20:05:53 +0430
Subject: [PATCH 146/781] Keep MenuItem HTML tag detection local

---
 src/components/MenuItem/MenuItem.tsx |  2 +-
 src/libs/Parser.ts                   |  4 ----
 tests/ui/components/MenuItemTest.tsx | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index aeeefa03d162..e90638c3cb27 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -687,7 +687,7 @@ function MenuItem({
         return Parser.replace(helperText, {shouldEscapeText});
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
-    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.hasHTMLTags(title);
+    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && /<[^>]+>/.test(title);
     const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform() === CONST.PLATFORM.WEB;
 
     const processedTitle = useMemo(() => {
diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts
index abe30d2816fb..d91e00dc2739 100644
--- a/src/libs/Parser.ts
+++ b/src/libs/Parser.ts
@@ -69,10 +69,6 @@ class ExpensiMarkWithContext extends ExpensiMark {
     isHTML(text: string): boolean {
         return /<[^>]+>/.test(text) || /&[#\w]+;/.test(text);
     }
-
-    hasHTMLTags(text: string): boolean {
-        return /<[^>]+>/.test(text);
-    }
 }
 
 ExpensiMarkWithContext.setLogger(Log);
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index b3343d88ecae..ea714260e595 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -64,6 +64,23 @@ describe('MenuItem', () => {
         expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: true}));
     });
 
+    it('renders an entity-only HTML title as plain text on web', () => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+
+        render(
+            <Wrapper>
+                <MenuItem
+                    title="A &amp; B"
+                    shouldRenderAsHTML
+                    isTitleSelectable
+                />
+            </Wrapper>,
+        );
+
+        expect(screen.getByText(/A & B/)).toBeOnTheScreen();
+        expect(mockRenderHTML).not.toHaveBeenCalled();
+    });
+
     it('does not override HTML title selection when the title is not selectable', () => {
         mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
 

From 022c63a20052eeeb58076c30c5a9a67eb9670319 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 22 Sep 2026 15:32:56 +0200
Subject: [PATCH 147/781] fix: drop the beta gate the merge left in the inner
 insights component

---
 src/pages/Insights/InsightsPage.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Insights/InsightsPage.tsx b/src/pages/Insights/InsightsPage.tsx
index c6e6503dcfe6..55642e590a60 100644
--- a/src/pages/Insights/InsightsPage.tsx
+++ b/src/pages/Insights/InsightsPage.tsx
@@ -31,9 +31,7 @@ type InsightsPageProps = BottomTabScreenProps<TabNavigatorParamList, typeof SCRE
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {translate} = useLocalize();
-    const {isBetaEnabled} = usePermissions();
     const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
-    useDocumentTitle(translate('common.insights'));
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
     const {filters, isResolved} = useInsightsFilters();

From b3dd3d5ecc42ab3acd8a98e7f47ced548c6065bc Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 22 Sep 2026 15:33:06 +0200
Subject: [PATCH 148/781] fix: draw the Android tab bar like the iOS one

Untint icons, label every tab, move visibility to screen options, tear down the color scheme coordinator.
---
 patches/react-native-screens/details.md       | 16 ++++++
 ...+4.25.0+003+no-android-tab-icon-tint.patch | 34 ++++++++++++
 ...ardown-tabs-color-scheme-coordinator.patch | 14 +++++
 .../Navigators/TabNavigator.native.tsx        | 55 ++++++++++---------
 4 files changed, 92 insertions(+), 27 deletions(-)
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index f00bd6eb1620..de7bbee3521e 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -14,3 +14,19 @@
 - Upstream PR/issue: not reported yet.
 - E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
 - PR introducing patch: n/a
+
+
+### [react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch](react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch)
+
+- Reason: The App builds every native tab icon off-screen in Skia and hands it over already colored, because iOS 26 ignores the inactive icon color from `UITabBarItemAppearance`. React Navigation marks those icons `tinted: false`, but `getPlatformIcon` in `@react-navigation/bottom-tabs` only honors the flag on iOS: Android always receives the plain `imageSource`, and `TabsAppearanceApplicator` then assigns `bottomNavigationView.itemIconTintList` unconditionally. A `ColorStateList` tint is `SRC_IN`, so it flattens the whole bitmap to one color. On the glyph tabs this is invisible, since Material repaints them in the same color Skia used, but the account tab shows the user's avatar and turns into a solid silhouette, gray when the tab is not selected and green when it is, and the status dots painted into the bitmaps lose their own colors too. The patch drops the icon tint list so Android draws the bitmap as supplied, which is what `tinted: false` already means on iOS. Label colors are untouched and keep coming from `tabBarItemTitleFontColor`.
+- Upstream PR/issue: not reported yet.
+- E/App issue: n/a, found while building the native tab bar in `TabNavigator.native.tsx`.
+- PR introducing patch: n/a
+
+
+### [react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch](react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch)
+
+- Reason: `TabsContainer.onAttachedToWindow` calls `colorSchemeCoordinator.setup(...)`, and that setup opens with `check(!isSetUp)`. `ColorSchemeCoordinator.teardown()` is the only thing that clears the flag, and it is never called anywhere in the package, so the coordinator stays marked as set up once the container has been attached a single time. The first time the fragment manager re-adds the container's view, `onAttachedToWindow` runs again and the check throws `[RNScreens] ColorSchemeCoordinator's setup method must not be called again without calling teardown() first`, with `ColorSchemeCoordinator.kt:57` under `TabsContainer.kt:270` under `FragmentStateManager.addViewToContainer`. In a debug build that surfaces as a red box over a dead React tree; in release the `IllegalStateException` propagates. The patch calls `teardown()` from `onDetachedFromWindow`, next to the fragment manager teardown that is already there, so attach and detach are symmetric.
+- Upstream PR/issue: not reported yet.
+- E/App issue: n/a, found while building the native tab bar in `TabNavigator.native.tsx`.
+- PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch b/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
new file mode 100644
index 000000000000..7e22783f334b
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
@@ -0,0 +1,34 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+index 10cd91b..cef93d9 100644
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+@@ -63,24 +63,11 @@ internal class TabsAppearanceApplicator(
+         bottomNavigationView.itemTextColor = ColorStateList(states, fontColors)
+ 
+         // Icon color
+-        val iconDisabledColor =
+-            tabBarAppearance?.disabled?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconFocusedColor =
+-            tabBarAppearance?.focused?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconSelectedColor =
+-            tabBarAppearance?.selected?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSecondaryContainer)
+-
+-        val iconNormalColor =
+-            tabBarAppearance?.normal?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconColors = intArrayOf(iconDisabledColor, iconSelectedColor, iconFocusedColor, iconNormalColor)
+-        bottomNavigationView.itemIconTintList = ColorStateList(states, iconColors)
++        // Every tab icon arrives as a bitmap that already carries its own colors: the recolored glyph, the status
++        // dot painted into it and the user's avatar on the account tab. A tint list paints over all of it with a
++        // single color, so no tint is applied and the bitmap is drawn as supplied, which is how `tinted: false`
++        // already behaves on iOS.
++        bottomNavigationView.itemIconTintList = null
+ 
+         // LabelVisibilityMode
+         // From docs: can be one of LABEL_VISIBILITY_AUTO, LABEL_VISIBILITY_SELECTED, LABEL_VISIBILITY_LABELED, or LABEL_VISIBILITY_UNLABELED
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch b/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch
new file mode 100644
index 000000000000..71b7b36538fe
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+index 3342c41..2cfa9ad 100644
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+@@ -275,6 +275,9 @@ class TabsContainer internal constructor(
+     override fun onDetachedFromWindow() {
+         super.onDetachedFromWindow()
+         teardownFragmentManager()
++        // Mirrors the setup() in onAttachedToWindow. Without it the coordinator stays marked as set up, and the
++        // next attach trips its own `check(!isSetUp)`.
++        colorSchemeCoordinator.teardown()
+     }
+ 
+     override fun onConfigurationChanged(newConfig: Configuration?) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 842a7e53aa30..4cdecf60c4d3 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -110,7 +110,9 @@ function drawStatusDot(canvas: SkCanvas, canvasWidth: number, scale: number, col
  * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
  * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
  * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
- * differ in type. Every icon reserves the same room for the dot so the glyphs stay aligned across tabs.
+ * differ in type. The canvas is the glyph's own size, so Android's fixed icon slot draws the glyph at full size
+ * instead of shrinking it to fit reserved room, and the dot overlaps the glyph's top right corner the way the
+ * indicator on the mobile web bar does.
  */
 async function createTabIcon(source: ImageSourcePropType, color: string, dotColor: string | undefined): Promise<NativeBottomTabIcon | undefined> {
     const asset = Image.resolveAssetSource(source);
@@ -122,9 +124,8 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = asset.scale ?? 1;
-    const padding = variables.nativeTabIconDotRadius * 2 * scale;
-    const canvasWidth = image ? image.width() + padding : 0;
-    const canvasHeight = image ? image.height() + padding : 0;
+    const canvasWidth = image?.width() ?? 0;
+    const canvasHeight = image?.height() ?? 0;
     const surface = image ? Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight) : null;
 
     if (!image || !surface) {
@@ -138,8 +139,7 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
     paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
 
     const canvas = surface.getCanvas();
-    // The glyph sits in the bottom left so the reserved room ends up under the dot.
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(0, padding, image.width(), image.height()), paint);
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(0, 0, image.width(), image.height()), paint);
 
     if (dotColor) {
         drawStatusDot(canvas, canvasWidth, scale, dotColor);
@@ -159,17 +159,15 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
 
 /**
  * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI. It reserves the same room for the status dot as every other tab
- * icon, so the avatar lines up with the glyphs next to it.
+ * circle off-screen and handed over as a data URI. It fills the same canvas as every other tab icon, so the avatar
+ * is drawn at the size of the glyphs next to it.
  */
 async function createCircularAvatarIcon(uri: string, dotColor: string | undefined): Promise<string | undefined> {
     const response = await fetch(uri);
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = variables.nativeTabIconScale;
-    const avatarSize = variables.iconBottomBar * scale;
-    const padding = variables.nativeTabIconDotRadius * 2 * scale;
-    const canvasSize = avatarSize + padding;
+    const canvasSize = variables.iconBottomBar * scale;
     const surface = Skia.Surface.MakeOffscreen(canvasSize, canvasSize);
 
     if (!image || !surface) {
@@ -182,12 +180,12 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     const sourceX = (image.width() - sourceSize) / 2;
     const sourceY = (image.height() - sourceSize) / 2;
     const circle = Skia.Path.Make();
-    circle.addCircle(avatarSize / 2, padding + avatarSize / 2, avatarSize / 2);
+    circle.addCircle(canvasSize / 2, canvasSize / 2, canvasSize / 2);
 
     const canvas = surface.getCanvas();
     canvas.save();
     canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, padding, avatarSize, avatarSize), Skia.Paint());
+    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, canvasSize, canvasSize), Skia.Paint());
     canvas.restore();
 
     if (dotColor) {
@@ -209,25 +207,17 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
 
 /**
  * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
- * them. The native bar is part of the navigator itself, so it is switched off through the active tab's options
- * instead of being unmounted.
+ * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
+ * navigator's screen options instead of being unmounted.
  */
-function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
+function NativeTabLayout({children, state}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const styles = useThemeStyles();
-    const theme = useTheme();
     const activeRoute = state.routes[state.index];
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeRoute) && !isBlockingViewVisible;
-    const activeTabNavigation = activeRoute ? descriptors[activeRoute.key]?.navigation : undefined;
-
-    // setOptions replaces tabBarStyle wholesale, so the background travels with the visibility flag. The
-    // background only lands on Android and iOS 18 and below; iOS 26 keeps its own glass material.
-    useEffect(() => {
-        activeTabNavigation?.setOptions({tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG}});
-    }, [activeTabNavigation, shouldShowNativeTabBar, theme.appBG]);
 
     if (!shouldUseNarrowLayout) {
         return (
@@ -272,6 +262,7 @@ const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout
 
 function TabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {translate} = useLocalize();
     const theme = useTheme();
     const {chatTabBrickRoad} = useSidebarOrderedReportsState();
@@ -286,8 +277,10 @@ function TabNavigator() {
     // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
     // mounts, so the nearest navigation listener context is still the parent stack's.
     const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
-    const activeTabRouteName = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index]?.name : SCREENS.HOME;
+    const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
+    const activeTabRouteName = isRealizedNavigationState(tabState) ? activeTabRoute?.name : SCREENS.HOME;
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
 
     let inboxDotColor: string | undefined;
     if (chatTabBrickRoad) {
@@ -358,9 +351,8 @@ function TabNavigator() {
     const avatarSignature = `${avatarURI}|${accountDotColor}`;
     const [circularAvatar, setCircularAvatar] = useState<{signature: string; uri: string}>();
     const circularAvatarURI = circularAvatar?.signature === avatarSignature ? circularAvatar.uri : undefined;
-    const accountIconSize = variables.iconBottomBar + variables.nativeTabIconDotRadius * 2;
     const accountTabIcon: NativeBottomTabIcon = circularAvatarURI
-        ? {type: 'image', source: {uri: circularAvatarURI, width: accountIconSize, height: accountIconSize, scale: variables.nativeTabIconScale}, tinted: false}
+        ? {type: 'image', source: {uri: circularAvatarURI, width: variables.iconBottomBar, height: variables.iconBottomBar, scale: variables.nativeTabIconScale}, tinted: false}
         : ACCOUNT_TAB_ICON;
 
     useEffect(() => {
@@ -435,6 +427,15 @@ function TabNavigator() {
         lazy: false,
         tabBarActiveTintColor: theme.iconMenu,
         tabBarInactiveTintColor: theme.icon,
+        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
+        // Pushed through setOptions instead, each tab kept the value it was left with, and the bar spent the first
+        // frame after a tab switch in the previous tab's state. The background only lands on Android and iOS 18 and
+        // below; iOS 26 keeps its own glass material.
+        tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
+        // Android defaults to showing the label on the selected tab only once a bar has more than three items,
+        // which leaves the other tabs centering a lone icon at a different height. Labelling every tab matches
+        // what iOS draws and keeps all five icons on one baseline.
+        tabBarLabelVisibilityMode: 'labeled' as const,
         tabBarControllerMode: 'tabBar' as const,
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
         tabBarMinimizeBehavior: 'none' as const,

From e09d3fd7259dc69b86250016f047194af77bfdfa Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 22 Sep 2026 16:50:20 +0200
Subject: [PATCH 149/781] fix: restore tab content after an opaque push

The tab fragment is removed and never re-added on the pop. Also reset the color scheme coordinator.
---
 patches/react-native-screens/details.md       |  5 +--
 ...s+4.25.0+004+tabs-container-reattach.patch | 34 +++++++++++++++++++
 ...ardown-tabs-color-scheme-coordinator.patch | 14 --------
 3 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
 delete mode 100644 patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index de7bbee3521e..34e5f510797e 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -24,9 +24,10 @@
 - PR introducing patch: n/a
 
 
-### [react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch](react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch)
+### [react-native-screens+4.25.0+004+tabs-container-reattach.patch](react-native-screens+4.25.0+004+tabs-container-reattach.patch)
 
-- Reason: `TabsContainer.onAttachedToWindow` calls `colorSchemeCoordinator.setup(...)`, and that setup opens with `check(!isSetUp)`. `ColorSchemeCoordinator.teardown()` is the only thing that clears the flag, and it is never called anywhere in the package, so the coordinator stays marked as set up once the container has been attached a single time. The first time the fragment manager re-adds the container's view, `onAttachedToWindow` runs again and the check throws `[RNScreens] ColorSchemeCoordinator's setup method must not be called again without calling teardown() first`, with `ColorSchemeCoordinator.kt:57` under `TabsContainer.kt:270` under `FragmentStateManager.addViewToContainer`. In a debug build that surfaces as a red box over a dead React tree; in release the `IllegalStateException` propagates. The patch calls `teardown()` from `onDetachedFromWindow`, next to the fragment manager teardown that is already there, so attach and detach are symmetric.
+- Reason: Pushing any opaque screen onto the root native stack over the tab navigator leaves the tab content permanently blank once that screen is popped. `ScreenStack.kt` computes a null `visibleBottom` when the new top is opaque and then removes every wrapper below it, so the whole `TAB_NAVIGATOR` `ScreenStackFragment` is removed rather than detached, taking its child FragmentManager and the selected tab's `TabsScreenFragment` with it. On the pop, `TabsContainer.onAttachedToWindow` calls `setupFragmentManager()`, which hands back a fresh and empty child FragmentManager, and then `flushPendingUpdates()`, which is guarded by `invalidationFlags.any()`. Nothing invalidated the container, because the JS side sends no new navigation state when the selected tab did not change, so the flush is a no-op and the content FrameLayout stays empty forever. The bar keeps working because it is a plain child View rather than a fragment, and switching tabs repairs it because `onMenuItemSelected` runs a real fragment transaction. Reproduced on an Android emulator from the Spend tab, where a row opens an RHP, and from the Inbox tab, where the report header opens the details RHP: after back the window has zero text nodes and is visually blank. The patch invalidates the container before the flush on re-attach so the selected tab's fragment is added to the new FragmentManager.
+- The same re-attach also trips `ColorSchemeCoordinator.setup`, which opens with `check(!isSetUp)`. `teardown()` is the only thing that clears the flag and the package never calls it, and the re-attach does not always come with a matching detach, so the patch calls `teardown()` both from `onDetachedFromWindow` and immediately before `setup()`. Without the second call the pop surfaces `[RNScreens] ColorSchemeCoordinator's setup method must not be called again without calling teardown() first` as a red box in debug, and an `IllegalStateException` in release.
 - Upstream PR/issue: not reported yet.
 - E/App issue: n/a, found while building the native tab bar in `TabNavigator.native.tsx`.
 - PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch b/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
new file mode 100644
index 000000000000..9232a3c76fde
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
@@ -0,0 +1,34 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+index 3342c41..ee3829e 100644
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+@@ -267,6 +267,21 @@ class TabsContainer internal constructor(
+         setupFragmentManager()
+         flushPendingUpdates()
+ 
++        // Pushing an opaque screen over the tab host removes this view's own fragment, which destroys the child
++        // FragmentManager that held the selected tab. setupFragmentManager hands back a fresh, empty one and
++        // nothing else re-adds the tab, because navState still names it and so the JS side sends no update.
++        // Without this the content area stays empty until another tab is picked.
++        val selectedFragment = if (navState.isNotEmpty()) getFragmentForScreenKey(navState.selectedScreenKey) else null
++        if (selectedFragment != null && !selectedFragment.isAdded) {
++            requireFragmentManager
++                .createTransactionWithReordering()
++                .add(contentView.id, selectedFragment)
++                .commitNowAllowingStateLoss()
++        }
++
++        // A re-attach does not always come with a matching detach, and setup() throws on a second call, so the
++        // coordinator is reset first. teardown() does nothing when it was never set up.
++        colorSchemeCoordinator.teardown()
+         colorSchemeCoordinator.setup(this) { uiNightMode ->
+             applyDayNightUiMode(uiNightMode)
+         }
+@@ -275,6 +290,7 @@ class TabsContainer internal constructor(
+     override fun onDetachedFromWindow() {
+         super.onDetachedFromWindow()
+         teardownFragmentManager()
++        colorSchemeCoordinator.teardown()
+     }
+ 
+     override fun onConfigurationChanged(newConfig: Configuration?) {
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch b/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch
deleted file mode 100644
index 71b7b36538fe..000000000000
--- a/patches/react-native-screens/react-native-screens+4.25.0+004+teardown-tabs-color-scheme-coordinator.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-index 3342c41..2cfa9ad 100644
---- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-+++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-@@ -275,6 +275,9 @@ class TabsContainer internal constructor(
-     override fun onDetachedFromWindow() {
-         super.onDetachedFromWindow()
-         teardownFragmentManager()
-+        // Mirrors the setup() in onAttachedToWindow. Without it the coordinator stays marked as set up, and the
-+        // next attach trips its own `check(!isSetUp)`.
-+        colorSchemeCoordinator.teardown()
-     }
- 
-     override fun onConfigurationChanged(newConfig: Configuration?) {

From 67db700a35f9b60cd9fa60207563546740c5cb0c Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 22 Sep 2026 16:50:27 +0200
Subject: [PATCH 150/781] fix: show skeleton rows while Search loads

The page skeleton stops at the first cached data and the list rendered a zero-sized view in the gap.
---
 src/components/Search/index.tsx             | 28 ++++++++-------------
 src/pages/Search/SearchPageNarrow/index.tsx |  7 ++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index aea1479aff19..0f5594a1f725 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -50,7 +50,6 @@ import {
     isTransactionGroupListItemType,
     isTransactionListItemType,
     isTransactionReportGroupListItemType,
-    isTransactionSearchType,
     shouldShowEmptyState,
     shouldShowYear as shouldShowYearUtil,
 } from '@libs/SearchUIUtils';
@@ -396,7 +395,7 @@ function Search({
     const hasUnresolvedErrors = hasErrors && responseStatusCode === null;
     const isWaitingForInitialData = !shouldUseLiveData && !isOffline && (!isDataLoaded || isSearchLoadingWithNoResults || hasUnresolvedErrors || isCardFeedsLoading);
     const shouldShowLoadingState = isDeferringHeavyWork || isWaitingForInitialData;
-    const shouldShowRowSkeleton = (!skeletonWasDisplayed || shouldShowLoadingState) && showPendingExpensePlaceholder && !hasErrors;
+    const shouldShowRowSkeleton = !hasErrors && (shouldShowLoadingState || (!skeletonWasDisplayed && showPendingExpensePlaceholder));
 
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && searchResults?.search?.isLoading && searchResults?.search?.offset > 0;
 
@@ -919,6 +918,11 @@ function Search({
     // Deferred layout only needs the base work (no scroll handling, no content-ready signal).
     const onDeferredLayout = onLayoutBase;
 
+    const handleSkeletonLayout = useCallback(() => {
+        onDeferredLayout();
+        onSkeletonLayout();
+    }, [onDeferredLayout, onSkeletonLayout]);
+
     const onLayout = useCallback(() => {
         onLayoutBase();
         handleSelectionListScroll(stableSortedData, searchListRef.current);
@@ -1078,25 +1082,15 @@ function Search({
         [clearSelectedTransactions, queryJSON, onSortPressedCallback, navigation],
     );
 
-    // When heavy work is deferred (e.g. during the RHP dismiss animation after
-    // submitting an expense), skip the expensive render below. The ancestor
-    // SearchPage (via SearchPageNarrow / SearchPageWide) renders a SearchStaticList
-    // overlay that covers this component, so the user sees real-looking content.
-    // The minimal View fires onLayout to flush the deferred API write and set
-    // hasHadFirstLayout.
-    if (isDeferringHeavyWork && searchResults?.data && isTransactionSearchType(type)) {
-        // Zero-sized View - onLayout still fires on RN, which is all we need here.
-        return <View onLayout={onDeferredLayout} />;
-    }
-
-    // This is a performance optimization for the submit-expense->search path only.
-    // The SearchPage skeleton (useSearchLoadingState) doesn't cover this case because
-    // Search must mount for its onLayout to flush the deferred CreateMoneyRequest API write, which would block the JS thread causing a slowdown on post expense creation navigation
+    // Stands in for the list while the heavy grouping and sorting work is deferred or the first response
+    // has not arrived. The page level skeleton (useSearchLoadingState) stops at the first defined `data`,
+    // so on a warm snapshot this is the only thing between the header and the rows. Its onLayout also
+    // flushes the deferred API write and sets hasHadFirstLayout.
     if (shouldShowRowSkeleton) {
         return (
             <SearchRowSkeleton
                 shouldAnimate
-                onLayout={onSkeletonLayout}
+                onLayout={handleSkeletonLayout}
                 containerStyle={shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3}
             />
         );
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index b4898118cd4b..595f9cd7b742 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -13,6 +13,7 @@ import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPa
 import SearchSelectionFooter from '@components/Search/SearchSelectionFooter';
 import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
 import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
@@ -327,6 +328,12 @@ function SearchPageNarrow({
                                             hasFilterBars={hasFilterBars}
                                         />
                                     )}
+                                    {!isInteractive && !searchOverlayContent && (
+                                        <SearchRowSkeleton
+                                            shouldAnimate
+                                            containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
+                                        />
+                                    )}
                                     {shouldRenderLayoutProbe && <View onLayout={onSearchLayout} />}
                                     {!!searchOverlayContent && (
                                         <View

From 0268312ad49bb9caca5b8db86514058945645167 Mon Sep 17 00:00:00 2001
From: "MitchExpensify (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 22 Sep 2026 20:33:52 +0000
Subject: [PATCH 151/781] Address review: login-aware role check and a loading
 guard for the mutating call site

- isPolicyMemberByRole now resolves the role via getPolicyRole, so a workspace
  that only carries the member's role in employeeList is accepted here the same
  way getGroupPoliciesWhereReportCanBeCreated already accepts it.
- Expose arePoliciesLoaded and no-op SearchTransactionsChangeReport's
  createReport while the policy collection loads, so it can never create a
  report with an undefined policy during the hydration window.
- Add unit tests for the hydration guard, the employeeList role fallback, and
  the managed card transaction path.

Co-authored-by: MitchExpensify <MitchExpensify@users.noreply.github.com>
---
 src/hooks/usePolicyForMovingExpenses.ts       |  36 ++++--
 .../Search/SearchTransactionsChangeReport.tsx |   9 +-
 .../SearchActionsBarCreateButtonTest.tsx      |   8 ++
 .../hooks/usePolicyForMovingExpenses.test.tsx | 113 ++++++++++++++++++
 4 files changed, 153 insertions(+), 13 deletions(-)
 create mode 100644 tests/unit/hooks/usePolicyForMovingExpenses.test.tsx

diff --git a/src/hooks/usePolicyForMovingExpenses.ts b/src/hooks/usePolicyForMovingExpenses.ts
index 5de9524f14e8..f60449456a35 100644
--- a/src/hooks/usePolicyForMovingExpenses.ts
+++ b/src/hooks/usePolicyForMovingExpenses.ts
@@ -2,7 +2,7 @@ import {useActivePolicyContext} from '@components/ActivePolicyProvider';
 import {useSession} from '@components/OnyxListItemProvider';
 
 import isTeachersUnitePolicyID from '@libs/isTeachersUnitePolicyID';
-import {canSubmitPerDiemExpenseFromWorkspace, isGroupPolicy, isPolicyMemberWithoutPendingDelete, isTimeTrackingEnabled} from '@libs/PolicyUtils';
+import {canSubmitPerDiemExpenseFromWorkspace, getPolicyRole, isGroupPolicy, isPolicyMemberWithoutPendingDelete, isTimeTrackingEnabled} from '@libs/PolicyUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,14 +22,19 @@ function checkForUserPendingDelete(login: string, policy: OnyxEntry<Policy>) {
     return isPolicyMemberWithoutPendingDelete(login, policy);
 }
 
-function isPolicyMemberByRole(policy: OnyxEntry<Policy>) {
-    return !!policy?.role && Object.values(CONST.POLICY.ROLE).includes(policy.role);
+// `policy.role` is only populated on the user's default/active policy, so fall back to the member's role in
+// `employeeList` via `getPolicyRole`. Without the login-aware lookup, a workspace the user is genuinely a member
+// of is rejected here while `getGroupPoliciesWhereReportCanBeCreated` (which uses `getPolicyRole`) accepts it,
+// and the two disagree about whether the user has a workspace at all.
+function isPolicyMemberByRole(policy: OnyxEntry<Policy>, login: string) {
+    const role = getPolicyRole(policy, login);
+    return !!role && (Object.values(CONST.POLICY.ROLE) as string[]).includes(role);
 }
 
 function isPolicyValidForMovingExpenses(policy: OnyxEntry<Policy>, login: string, isPerDiemRequest?: boolean, isTimeRequest?: boolean) {
     return (
         checkForUserPendingDelete(login, policy) &&
-        isPolicyMemberByRole(policy) &&
+        isPolicyMemberByRole(policy, login) &&
         isGroupPolicy(policy) &&
         policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
         // Teachers Unite doesn't support reimbursement, so it can never be a destination for moving/reporting an expense.
@@ -90,6 +95,13 @@ type PolicyForMovingExpenses = {
     policyForMovingExpenses: OnyxEntry<Policy>;
     shouldSelectPolicy: boolean;
     shouldNavigateToUpgradePath: boolean;
+    /**
+     * False while the policy collection is still being read from Onyx. Callers that *act* on the result — creating
+     * a report, moving transactions — must no-op until this is true, because `shouldNavigateToUpgradePath: false`
+     * during the read is "we don't know yet", not "this user has an eligible policy". `useCreateReport` gates the
+     * same way. Callers that only navigate to a picker can ignore it; they already handle an unresolved policy.
+     */
+    arePoliciesLoaded: boolean;
 };
 
 function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?: boolean, expensePolicyID?: string, isUnreportedManagedCardTransaction?: boolean): PolicyForMovingExpenses {
@@ -120,7 +132,7 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
     // which we don't know. Sending an empty `policyID` instructs the backend to auto-select the preferred policy.
     // This never depends on a locally resolved policy, so it has to be answered before the upgrade path below.
     if (isUnreportedManagedCardTransaction) {
-        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
     // User has no eligible policy
@@ -129,15 +141,15 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
         // empty, so check it before giving up. This has to run ahead of the upgrade path below, otherwise a
         // perfectly valid active workspace can never rescue the user.
         if (isPolicyValidForMovingExpenses(activePolicy, login, isPerDiemRequest, isTimeRequest)) {
-            return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+            return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
         }
 
-        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: arePoliciesLoaded};
+        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: arePoliciesLoaded, arePoliciesLoaded};
     }
 
     // If an expense policy ID is provided and valid, prefer it over the active policy
     if (validExpensePolicyID) {
-        return {policyForMovingExpensesID: validExpensePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+        return {policyForMovingExpensesID: validExpensePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
     if (
@@ -146,18 +158,18 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
         (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(activePolicy)) &&
         (!isTimeRequest || isTimeTrackingEnabled(activePolicy))
     ) {
-        return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+        return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
     if (singlePolicyID && !isMemberOfMoreThanOnePolicy) {
-        return {policyForMovingExpensesID: singlePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false};
+        return {policyForMovingExpensesID: singlePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
     if (isMemberOfMoreThanOnePolicy) {
-        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: true, shouldNavigateToUpgradePath: false};
+        return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: true, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
-    return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: true};
+    return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: true, arePoliciesLoaded};
 }
 
 export default usePolicyForMovingExpenses;
diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx
index 604437af7fd1..50299e06a890 100644
--- a/src/pages/Search/SearchTransactionsChangeReport.tsx
+++ b/src/pages/Search/SearchTransactionsChangeReport.tsx
@@ -88,7 +88,7 @@ function SearchTransactionsChangeReport() {
     // Get the policyID from the selected transactions' report to pass to usePolicyForMovingExpenses
     // This ensures the "Create report" button shows the correct workspace instead of the user's default
     const selectedReportPolicyID = selectedReportID ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`]?.policyID : undefined;
-    const {policyForMovingExpensesID, shouldSelectPolicy, shouldNavigateToUpgradePath} = usePolicyForMovingExpenses(
+    const {policyForMovingExpensesID, shouldSelectPolicy, shouldNavigateToUpgradePath, arePoliciesLoaded} = usePolicyForMovingExpenses(
         hasPerDiemTransactions,
         undefined,
         selectedReportPolicyID,
@@ -199,6 +199,13 @@ function SearchTransactionsChangeReport() {
     });
 
     const createReport = () => {
+        // Unlike the other consumers of this hook, this path *mutates* — it creates a report and moves the selected
+        // transactions into it. Falling through while the policy collection is still loading would create that report
+        // with an undefined policy, so wait instead. `useCreateReport` no-ops the same way.
+        if (!arePoliciesLoaded) {
+            return;
+        }
+
         if (shouldNavigateToUpgradePath && selectedTransactionsKeys.length > 0) {
             const firstTransactionID = selectedTransactionsKeys.at(0);
             if (firstTransactionID) {
diff --git a/tests/ui/components/SearchActionsBarCreateButtonTest.tsx b/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
index cdb1d30417f4..aaf6f1526131 100644
--- a/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
+++ b/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
@@ -113,6 +113,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: undefined,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: true,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -174,6 +175,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         // Set up multiple eligible group workspaces
@@ -212,6 +214,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -279,6 +282,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -309,6 +313,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -350,6 +355,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -389,6 +395,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
@@ -431,6 +438,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
 
         await act(async () => {
diff --git a/tests/unit/hooks/usePolicyForMovingExpenses.test.tsx b/tests/unit/hooks/usePolicyForMovingExpenses.test.tsx
new file mode 100644
index 000000000000..3be24978f879
--- /dev/null
+++ b/tests/unit/hooks/usePolicyForMovingExpenses.test.tsx
@@ -0,0 +1,113 @@
+import {renderHook, waitFor} from '@testing-library/react-native';
+
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+
+import type {ReactNode} from 'react';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../../utils/collections/policies';
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+/**
+ * Onyx resolves from the in-memory cache synchronously under Jest, so the real cold-start window can't be
+ * reproduced by just rendering. Stub the loading check instead — it is the only thing the hydration guard reads.
+ */
+let mockArePolicyResultsLoading = false;
+jest.mock('@src/types/utils/isLoadingOnyxValue', () => ({
+    __esModule: true,
+    default: (): boolean => mockArePolicyResultsLoading,
+}));
+
+const CURRENT_USER_LOGIN = 'member@example.com';
+const CURRENT_USER_ACCOUNT_ID = 1;
+const POLICY_ID = '1234';
+
+// `Policy['role']` is typed as required, but the backend only populates it for the user's default/active
+// workspace, so drop it to model a real member's non-active workspace.
+const {role, ...groupPolicyWithoutGlobalRole} = createRandomPolicy(Number(POLICY_ID), CONST.POLICY.TYPE.TEAM, 'Group workspace');
+
+/**
+ * A group workspace the user belongs to, where the member's role arrives only inside `employeeList`. This is the
+ * shape that used to make a real member look workspace-less and get routed to the reports upgrade screen.
+ */
+const policyWithRoleOnlyInEmployeeList: Omit<Policy, 'role'> = {
+    ...groupPolicyWithoutGlobalRole,
+    id: POLICY_ID,
+    pendingAction: undefined,
+    employeeList: {
+        [CURRENT_USER_LOGIN]: {role: CONST.POLICY.ROLE.USER},
+    },
+};
+
+function Wrapper({children}: {children: ReactNode}) {
+    return <OnyxListItemProvider>{children}</OnyxListItemProvider>;
+}
+
+describe('usePolicyForMovingExpenses', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        mockArePolicyResultsLoading = false;
+        await Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, {accountID: CURRENT_USER_ACCOUNT_ID, email: CURRENT_USER_LOGIN});
+        await waitForBatchedUpdates();
+    });
+
+    it('does not route to the upgrade path before the policy collection has loaded', async () => {
+        // Given Onyx has not finished reading the policy collection yet, so it reads back empty
+        mockArePolicyResultsLoading = true;
+
+        // When the hook runs
+        const {result} = renderHook(() => usePolicyForMovingExpenses(), {wrapper: Wrapper});
+        await waitForBatchedUpdates();
+
+        // Then it reports "I don't know yet" rather than claiming a real member has no workspace
+        expect(result.current.arePoliciesLoaded).toBe(false);
+        expect(result.current.shouldNavigateToUpgradePath).toBe(false);
+    });
+
+    it('routes to the upgrade path once the collection has loaded and the user genuinely has no workspace', async () => {
+        // Given the policy collection has loaded and contains no group workspace for this user
+        const {result} = renderHook(() => usePolicyForMovingExpenses(), {wrapper: Wrapper});
+
+        // When hydration completes
+        await waitFor(() => expect(result.current.arePoliciesLoaded).toBe(true));
+
+        // Then the upgrade path is the correct answer
+        expect(result.current.shouldNavigateToUpgradePath).toBe(true);
+    });
+
+    it('resolves a workspace whose role is only present in employeeList', async () => {
+        // Given a group workspace where the member's role is only in `employeeList`, not on `policy.role`
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policyWithRoleOnlyInEmployeeList);
+        await waitForBatchedUpdates();
+
+        // When the hook resolves a policy for moving expenses
+        const {result} = renderHook(() => usePolicyForMovingExpenses(), {wrapper: Wrapper});
+        await waitFor(() => expect(result.current.arePoliciesLoaded).toBe(true));
+
+        // Then that workspace is used and the user is not sent to the reports upgrade screen
+        expect(result.current.policyForMovingExpensesID).toBe(POLICY_ID);
+        expect(result.current.shouldNavigateToUpgradePath).toBe(false);
+    });
+
+    it('lets the backend auto-select the policy for an unreported managed card transaction', async () => {
+        // Given the user has no resolvable policy, but the transaction is a managed card transaction
+        const {result} = renderHook(() => usePolicyForMovingExpenses(undefined, undefined, undefined, true), {wrapper: Wrapper});
+        await waitForBatchedUpdates();
+
+        // Then an empty policyID is returned so the backend picks the preferred policy, with no upgrade screen
+        expect(result.current.policyForMovingExpensesID).toBeUndefined();
+        expect(result.current.shouldNavigateToUpgradePath).toBe(false);
+    });
+});

From 73db09076acab40a48233a45ca47de9590f5ea32 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 23 Sep 2026 11:20:40 +0430
Subject: [PATCH 152/781] Fix attendee avatars being selectable in expense rows

---
 src/components/Search/SearchList/ListItem/AttendeesCell.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/SearchList/ListItem/AttendeesCell.tsx b/src/components/Search/SearchList/ListItem/AttendeesCell.tsx
index 667e7b20b94d..7746d82fcbb6 100644
--- a/src/components/Search/SearchList/ListItem/AttendeesCell.tsx
+++ b/src/components/Search/SearchList/ListItem/AttendeesCell.tsx
@@ -63,8 +63,9 @@ function AttendeesCell({attendees, isHovered, isPressed}: AttendeesCellProps) {
 
     return (
         <View
-            style={avatarContainerStyles}
+            style={[avatarContainerStyles, styles.userSelectNone]}
             testID="AttendeesCell-Row"
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
             {[...icons].splice(0, maxAvatarsPerRow).map((icon, index) => (
                 <UserDetailsTooltip

From 7996005d9fbf42d9e1470cf765efb2d3f736d734 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 23 Sep 2026 11:43:09 +0430
Subject: [PATCH 153/781] Fix report status text selection on mobile web

---
 .../ListItem/ExpenseReportListItem.tsx        |  1 +
 .../ListItem/UserInfoAndActionButtonRow.tsx   | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
index dec16e80bed2..7471d7545b66 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
@@ -522,6 +522,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
                         stateNum={reportItem.stateNum}
                         statusNum={reportItem.statusNum}
                         isSelected={isSelected}
+                        shouldAllowStatusTextSelection
                     />
                 )}
                 <AvatarTooltipsProvider isEnabled={showTooltip}>
diff --git a/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx b/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
index cef02c8f61b1..e30750eca152 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
@@ -5,6 +5,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getReportStatusColorStyle, getReportStatusTooltipTranslation, getReportStatusTranslation, getStatusBadgeBackgroundColor} from '@libs/ReportUtils';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import {isDeletedTransaction} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
@@ -29,6 +30,7 @@ function UserInfoAndActionButtonRow({
     stateNum,
     statusNum,
     isSelected,
+    shouldAllowStatusTextSelection = false,
 }: {
     item: TransactionReportGroupListItemType | TransactionListItemType | ExpenseReportListItemType;
     shouldShowUserInfo: boolean;
@@ -36,6 +38,7 @@ function UserInfoAndActionButtonRow({
     stateNum: ExpenseReportListItemType['stateNum'];
     statusNum: ExpenseReportListItemType['statusNum'];
     isSelected?: boolean;
+    shouldAllowStatusTextSelection?: boolean;
 }) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -64,12 +67,17 @@ function UserInfoAndActionButtonRow({
                 />
             )}
             {!!statusText && !!reportStatusColorStyle && (
-                <StatusBadge
-                    text={statusText}
-                    backgroundColor={badgeBackgroundColor}
-                    textColor={reportStatusColorStyle.textColor}
-                    tooltipText={tooltipText}
-                />
+                <View
+                    style={shouldAllowStatusTextSelection ? styles.userSelectText : undefined}
+                    dataSet={shouldAllowStatusTextSelection ? COPYABLE_TEXT_DATA_SET : undefined}
+                >
+                    <StatusBadge
+                        text={statusText}
+                        backgroundColor={badgeBackgroundColor}
+                        textColor={reportStatusColorStyle.textColor}
+                        tooltipText={tooltipText}
+                    />
+                </View>
             )}
         </View>
     );

From a3b148277bc9f34fe4c2b5ada8e10c377cfc2918 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 23 Sep 2026 13:20:30 +0200
Subject: [PATCH 154/781] feat: floating tab bar on Android, painted labels on
 iOS

Android leaves the Material bar for the JS one; iOS paints its labels into the icon bitmaps.
---
 .../NavigationTabBar/InboxTabButton.tsx       |   3 +-
 .../NavigationTabBar/SearchTabButton.tsx      |   3 +-
 .../NavigationTabBar/TabBarItem.tsx           |  25 ++-
 .../NavigationTabBar/WorkspacesTabButton.tsx  |   3 +-
 .../Navigation/NavigationTabBar/index.tsx     |   5 +-
 .../{index.native.ts => index.ios.ts}         |   0
 ...B_SCREENS.native.ts => TAB_SCREENS.ios.ts} |   0
 ...igator.native.tsx => TabNavigator.ios.tsx} | 157 +++++++++++++-----
 .../AppNavigator/Navigators/TabNavigator.tsx  |  55 +-----
 .../Navigators/tabScreens.native.tsx          |  18 ++
 .../AppNavigator/Navigators/tabScreens.tsx    |  62 +++++++
 .../inbox/sidebar/NavigationTabBarAvatar.tsx  |  23 ++-
 src/styles/index.ts                           |  13 +-
 src/styles/theme/themes/dark.ts               |   2 +-
 src/styles/theme/themes/light.ts              |   2 +-
 src/styles/variables.ts                       |   5 +
 16 files changed, 246 insertions(+), 130 deletions(-)
 rename src/hooks/useFloatingTabBarContentInsetStyle/{index.native.ts => index.ios.ts} (100%)
 rename src/libs/Navigation/AppNavigator/Navigators/{TAB_SCREENS.native.ts => TAB_SCREENS.ios.ts} (100%)
 rename src/libs/Navigation/AppNavigator/Navigators/{TabNavigator.native.tsx => TabNavigator.ios.tsx} (75%)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index 25595f4b014b..e884e8de7956 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -257,7 +257,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
             accessibilityLabel={accessibilityLabel}
             accessibilityState={{selected: selectedTab === NAVIGATION_TABS.INBOX}}
             wrapperStyle={styles.flex1}
-            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.INBOX && styles.navigationTabBarItemSelected]}
+            style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
         >
             <TabBarItem
@@ -266,7 +266,6 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
                 isSelected={selectedTab === NAVIGATION_TABS.INBOX}
                 statusIndicatorColor={statusIndicatorColor}
                 numberOfLines={1}
-                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
index 0d51fb5bbb73..72308f304f1f 100644
--- a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
@@ -84,7 +84,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
             accessibilityLabel={translate('common.spend')}
             accessibilityState={searchAccessibilityState}
             wrapperStyle={styles.flex1}
-            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.SEARCH && styles.navigationTabBarItemSelected]}
+            style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
         >
             <TabBarItem
@@ -92,7 +92,6 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
                 label={translate('common.spend')}
                 isSelected={selectedTab === NAVIGATION_TABS.SEARCH}
                 numberOfLines={1}
-                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
index 6665ace2a65f..8955980f9339 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
@@ -1,6 +1,7 @@
 import Icon from '@components/Icon';
 import Text from '@components/Text';
 
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -18,9 +19,6 @@ type TabBarItemProps = {
     isHovered?: boolean;
     statusIndicatorColor?: string;
     numberOfLines?: number;
-
-    /** The floating bottom bar has no room for labels, so it renders the icons alone. */
-    shouldShowLabel?: boolean;
 };
 
 function getIconFill(isSelected: boolean, isHovered: boolean, theme: ReturnType<typeof useTheme>) {
@@ -33,12 +31,13 @@ function getIconFill(isSelected: boolean, isHovered: boolean, theme: ReturnType<
     return theme.icon;
 }
 
-function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicatorColor, numberOfLines = 2, shouldShowLabel = true}: TabBarItemProps) {
+function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicatorColor, numberOfLines = 2}: TabBarItemProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
-        <>
+        <View style={[styles.navigationTabBarItemContent, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
             <View>
                 <Icon
                     src={icon}
@@ -50,15 +49,13 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
                     <View style={[styles.navigationTabBarStatusIndicator, styles.statusIndicatorColor(statusIndicatorColor), isHovered && {borderColor: theme.sidebarHover}]} />
                 )}
             </View>
-            {shouldShowLabel && (
-                <Text
-                    numberOfLines={numberOfLines}
-                    style={[styles.textSmall, styles.textAlignCenter, styles.mt1Half, isSelected ? styles.textBold : styles.textSupporting, styles.navigationTabBarLabel]}
-                >
-                    {label}
-                </Text>
-            )}
-        </>
+            <Text
+                numberOfLines={numberOfLines}
+                style={[styles.textSmall, styles.textAlignCenter, styles.mt1Half, isSelected ? styles.textBold : styles.textSupporting, styles.navigationTabBarLabel]}
+            >
+                {label}
+            </Text>
+        </View>
     );
 }
 
diff --git a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
index d61c5033203f..f996c54f0522 100644
--- a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
@@ -62,7 +62,7 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
             accessibilityLabel={`${translate('common.workspacesTabTitle')}${workspacesTabIndicatorStatus ? `. ${translate('common.yourReviewIsRequired')}` : ''}`}
             accessibilityState={workspacesAccessibilityState}
             wrapperStyle={styles.flex1}
-            style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.WORKSPACES && styles.navigationTabBarItemSelected]}
+            style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.WORKSPACES}
         >
             <TabBarItem
@@ -71,7 +71,6 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
                 isSelected={selectedTab === NAVIGATION_TABS.WORKSPACES}
                 statusIndicatorColor={workspacesStatusIndicatorColor}
                 numberOfLines={1}
-                shouldShowLabel={false}
             />
         </PressableWithFeedback>
     );
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 823af72d6ac7..51892bd4610d 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -162,14 +162,13 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     role={CONST.ROLE.TAB}
                     accessibilityLabel={translate('common.home')}
                     wrapperStyle={styles.flex1}
-                    style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.HOME && styles.navigationTabBarItemSelected]}
+                    style={styles.navigationTabBarItem}
                     sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.HOME}
                 >
                     <TabBarItem
                         icon={expensifyIcons.Home}
                         label={translate('common.home')}
                         isSelected={selectedTab === NAVIGATION_TABS.HOME}
-                        shouldShowLabel={false}
                     />
                 </PressableWithFeedback>
                 <InboxTabButton
@@ -192,7 +191,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                 />
                 {!isInsightsTabVisible && (
                     <NavigationTabBarAvatar
-                        style={[styles.navigationTabBarItem, selectedTab === NAVIGATION_TABS.SETTINGS && styles.navigationTabBarItemSelected]}
+                        style={styles.navigationTabBarItem}
                         isSelected={selectedTab === NAVIGATION_TABS.SETTINGS}
                         onPress={navigateToSettings}
                     />
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.ios.ts
similarity index 100%
rename from src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
rename to src/hooks/useFloatingTabBarContentInsetStyle/index.ios.ts
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
similarity index 100%
rename from src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
rename to src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
similarity index 75%
rename from src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
rename to src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index 4cdecf60c4d3..f70d11d6f598 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -32,6 +32,7 @@ import {getAvatarURL} from '@libs/UserAvatarUtils';
 import HomePage from '@pages/home/HomePage';
 import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
+import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
@@ -46,7 +47,7 @@ import type {ImageSourcePropType} from 'react-native';
 
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
-import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import {BlendMode, ClipOp, FontWeight, ImageFormat, Skia} from '@shopify/react-native-skia';
 import React, {useEffect, useState} from 'react';
 import {Image, View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
@@ -96,12 +97,45 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 /** The recolored copies of one tab icon, one per selection state. */
 type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
-/** Paints the status dot in the canvas' top right corner, where a native badge would have sat. */
-function drawStatusDot(canvas: SkCanvas, canvasWidth: number, scale: number, color: string) {
+/** The account avatar drawn with its label, and the size it came out at. */
+type AvatarTabIcon = {uri: string; width: number; height: number};
+
+/** Paints the status dot in the glyph's top right corner, where a native badge would have sat. */
+function drawStatusDot(canvas: SkCanvas, glyphRight: number, scale: number, color: string) {
     const radius = variables.nativeTabIconDotRadius * scale;
     const paint = Skia.Paint();
     paint.setColor(Skia.Color(color));
-    canvas.drawCircle(canvasWidth - radius, radius, radius, paint);
+    canvas.drawCircle(glyphRight - radius, radius, radius, paint);
+}
+
+/** The label's own face, matching what the bar drew before it became native: Expensify Neue, bold when selected. */
+function getLabelFont(isSelected: boolean, scale: number) {
+    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
+        weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
+    });
+    return Skia.Font(typeface, variables.fontSizeSmall * scale);
+}
+
+/**
+ * Draws the label under the glyph and reports how much room it took. iOS 26 discards the title color an item
+ * appearance carries while honoring its font, and neither `unselectedItemTintColor` nor re-asserting it after
+ * layout gets through, so the text is painted into the image the item is handed instead.
+ */
+function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: boolean, scale: number, canvasWidth: number, top: number) {
+    const font = getLabelFont(isSelected, scale);
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    paint.setAntiAlias(true);
+    const width = font.measureText(label).width;
+    const metrics = font.getMetrics();
+    canvas.drawText(label, (canvasWidth - width) / 2, top - metrics.ascent, paint, font);
+}
+
+/** Width and height the label occupies, so a canvas can be sized before anything is drawn into it. */
+function measureLabel(label: string, isSelected: boolean, scale: number) {
+    const font = getLabelFont(isSelected, scale);
+    const metrics = font.getMetrics();
+    return {width: font.measureText(label).width, height: metrics.descent - metrics.ascent};
 }
 
 /**
@@ -114,7 +148,14 @@ function drawStatusDot(canvas: SkCanvas, canvasWidth: number, scale: number, col
  * instead of shrinking it to fit reserved room, and the dot overlaps the glyph's top right corner the way the
  * indicator on the mobile web bar does.
  */
-async function createTabIcon(source: ImageSourcePropType, color: string, dotColor: string | undefined): Promise<NativeBottomTabIcon | undefined> {
+async function createTabIcon(
+    source: ImageSourcePropType,
+    color: string,
+    dotColor: string | undefined,
+    label: string,
+    labelColor: string,
+    isSelected: boolean,
+): Promise<NativeBottomTabIcon | undefined> {
     const asset = Image.resolveAssetSource(source);
     if (!asset?.uri) {
         return undefined;
@@ -124,13 +165,21 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = asset.scale ?? 1;
-    const canvasWidth = image?.width() ?? 0;
-    const canvasHeight = image?.height() ?? 0;
-    const surface = image ? Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight) : null;
 
-    if (!image || !surface) {
-        image?.dispose();
-        surface?.dispose();
+    if (!image) {
+        return undefined;
+    }
+
+    const glyphWidth = image.width();
+    const glyphHeight = image.height();
+    const gap = variables.nativeTabIconLabelGap * scale;
+    const labelSize = measureLabel(label, isSelected, scale);
+    const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
+    const canvasHeight = Math.ceil(glyphHeight + gap + labelSize.height);
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+
+    if (!surface) {
+        image.dispose();
         return undefined;
     }
 
@@ -139,12 +188,15 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
     paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
 
     const canvas = surface.getCanvas();
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(0, 0, image.width(), image.height()), paint);
+    const glyphLeft = (canvasWidth - glyphWidth) / 2;
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, glyphWidth, glyphHeight), Skia.XYWHRect(glyphLeft, 0, glyphWidth, glyphHeight), paint);
 
     if (dotColor) {
-        drawStatusDot(canvas, canvasWidth, scale, dotColor);
+        drawStatusDot(canvas, glyphLeft + glyphWidth, scale, dotColor);
     }
 
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphHeight + gap);
+
     surface.flush();
 
     const snapshot = surface.makeImageSnapshot();
@@ -162,13 +214,17 @@ async function createTabIcon(source: ImageSourcePropType, color: string, dotColo
  * circle off-screen and handed over as a data URI. It fills the same canvas as every other tab icon, so the avatar
  * is drawn at the size of the glyphs next to it.
  */
-async function createCircularAvatarIcon(uri: string, dotColor: string | undefined): Promise<string | undefined> {
+async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<AvatarTabIcon | undefined> {
     const response = await fetch(uri);
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = variables.nativeTabIconScale;
-    const canvasSize = variables.iconBottomBar * scale;
-    const surface = Skia.Surface.MakeOffscreen(canvasSize, canvasSize);
+    const avatarSize = variables.iconBottomBar * scale;
+    const gap = variables.nativeTabIconLabelGap * scale;
+    const labelSize = measureLabel(label, isSelected, scale);
+    const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
+    const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
 
     if (!image || !surface) {
         image?.dispose();
@@ -179,19 +235,22 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     const sourceSize = Math.min(image.width(), image.height());
     const sourceX = (image.width() - sourceSize) / 2;
     const sourceY = (image.height() - sourceSize) / 2;
+    const avatarLeft = (canvasWidth - avatarSize) / 2;
     const circle = Skia.Path.Make();
-    circle.addCircle(canvasSize / 2, canvasSize / 2, canvasSize / 2);
+    circle.addCircle(avatarLeft + avatarSize / 2, avatarSize / 2, avatarSize / 2);
 
     const canvas = surface.getCanvas();
     canvas.save();
     canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, canvasSize, canvasSize), Skia.Paint());
+    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(avatarLeft, 0, avatarSize, avatarSize), Skia.Paint());
     canvas.restore();
 
     if (dotColor) {
-        drawStatusDot(canvas, canvasSize, scale, dotColor);
+        drawStatusDot(canvas, avatarLeft + avatarSize, scale, dotColor);
     }
 
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
+
     surface.flush();
 
     const snapshot = surface.makeImageSnapshot();
@@ -202,7 +261,7 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     snapshot.dispose();
     surface.dispose();
 
-    return `data:image/png;base64,${base64}`;
+    return {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale};
 }
 
 /**
@@ -293,8 +352,16 @@ function TabNavigator() {
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
         [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: accountDotColor,
     };
-    // The signature covers everything baked into the bitmaps, so a status that comes or goes redraws them.
-    const iconsSignature = `${theme.icon}|${theme.iconMenu}|${inboxDotColor}|${workspacesDotColor}|${accountDotColor}`;
+    const tabLabels: Record<string, string> = {
+        [SCREENS.HOME]: translate('common.home'),
+        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
+        [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
+        [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
+        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
+    };
+    // The signature covers everything baked into the bitmaps, so a status that comes or goes, a theme swap or a
+    // language change redraws them.
+    const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, inboxDotColor, workspacesDotColor, accountDotColor, ...Object.values(tabLabels)].join('|');
 
     const [tintedIcons, setTintedIcons] = useState<{signature: string; icons: Record<string, TintedTabIconPair>}>();
     const tintedIconsForTheme = tintedIcons?.signature === iconsSignature ? tintedIcons.icons : undefined;
@@ -303,11 +370,18 @@ function TabNavigator() {
         let isActive = true;
         const inactiveColor = theme.icon;
         const activeColor = theme.iconMenu;
+        // The label colors the bar drew before it became native: the supporting tone when idle, the plain text
+        // tone when selected. Both come from the theme, so light and dark each get their own pair.
+        const inactiveLabelColor = theme.textSupporting;
+        const activeLabelColor = theme.text;
         const signature = iconsSignature;
 
         Promise.all(
             TAB_ICONS.map(([name, source]) =>
-                Promise.all([createTabIcon(source, inactiveColor, dotColors[name]), createTabIcon(source, activeColor, dotColors[name])]).then(([inactive, active]) => ({
+                Promise.all([
+                    createTabIcon(source, inactiveColor, dotColors[name], tabLabels[name], inactiveLabelColor, false),
+                    createTabIcon(source, activeColor, dotColors[name], tabLabels[name], activeLabelColor, true),
+                ]).then(([inactive, active]) => ({
                     name,
                     inactive,
                     active,
@@ -349,11 +423,13 @@ function TabNavigator() {
     });
     const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
     const avatarSignature = `${avatarURI}|${accountDotColor}`;
-    const [circularAvatar, setCircularAvatar] = useState<{signature: string; uri: string}>();
-    const circularAvatarURI = circularAvatar?.signature === avatarSignature ? circularAvatar.uri : undefined;
-    const accountTabIcon: NativeBottomTabIcon = circularAvatarURI
-        ? {type: 'image', source: {uri: circularAvatarURI, width: variables.iconBottomBar, height: variables.iconBottomBar, scale: variables.nativeTabIconScale}, tinted: false}
-        : ACCOUNT_TAB_ICON;
+    const [circularAvatar, setCircularAvatar] = useState<{signature: string; active: AvatarTabIcon; inactive: AvatarTabIcon}>();
+    const avatarPair = circularAvatar?.signature === avatarSignature ? circularAvatar : undefined;
+    const toAvatarIcon = (icon: AvatarTabIcon): NativeBottomTabIcon => ({
+        type: 'image',
+        source: {uri: icon.uri, width: icon.width, height: icon.height, scale: variables.nativeTabIconScale},
+        tinted: false,
+    });
 
     useEffect(() => {
         let isActive = true;
@@ -364,12 +440,13 @@ function TabNavigator() {
         }
 
         const signature = avatarSignature;
-        createCircularAvatarIcon(avatarURI, accountDotColor)
-            .then((result) => {
-                if (!isActive || !result) {
+        const label = tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
+        Promise.all([createCircularAvatarIcon(avatarURI, accountDotColor, label, theme.textSupporting, false), createCircularAvatarIcon(avatarURI, accountDotColor, label, theme.text, true)])
+            .then(([inactive, active]) => {
+                if (!isActive || !inactive || !active) {
                     return;
                 }
-                setCircularAvatar({signature, uri: result});
+                setCircularAvatar({signature, active, inactive});
             })
             .catch(() => {});
 
@@ -377,7 +454,7 @@ function TabNavigator() {
             isActive = false;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [avatarSignature]);
+    }, [avatarSignature, iconsSignature]);
 
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
@@ -452,26 +529,26 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={{tabBarLabel: translate('common.home'), tabBarIcon: getTabBarIcon(SCREENS.HOME, HOME_TAB_ICON)}}
+                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.HOME, HOME_TAB_ICON)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
                 options={{
-                    tabBarLabel: translate('common.inbox'),
+                    tabBarLabel: '',
                     tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, INBOX_TAB_ICON),
                 }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={{tabBarLabel: translate('common.spend'), tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SPEND_TAB_ICON)}}
+                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SPEND_TAB_ICON)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
                 options={{
-                    tabBarLabel: translate('common.workspacesTabTitle'),
+                    tabBarLabel: '',
                     tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR, WORKSPACES_TAB_ICON),
                 }}
             />
@@ -479,8 +556,10 @@ function TabNavigator() {
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
                 options={{
-                    tabBarLabel: translate('initialSettingsPage.account'),
-                    tabBarIcon: circularAvatarURI ? accountTabIcon : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, accountTabIcon),
+                    tabBarLabel: '',
+                    tabBarIcon: avatarPair
+                        ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive)
+                        : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, ACCOUNT_TAB_ICON),
                 }}
             />
         </Tab.Navigator>
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index d77a12be149d..0e535d21c788 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -1,14 +1,9 @@
-import ActivityIndicator from '@components/ActivityIndicator';
-
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
 
 import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import {getSpan} from '@libs/telemetry/activeSpans';
 
-import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
@@ -19,58 +14,12 @@ import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
 
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
 import {findFocusedRoute, useNavigation, useNavigationState} from '@react-navigation/native';
-import React, {lazy, Suspense, useEffect} from 'react';
-import {View} from 'react-native';
+import React, {useEffect} from 'react';
 
 // Do not lazy load Search navigator for performance reasons
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
 import TabNavigatorBar from './TabNavigatorBar';
-
-const LazyHomePage = lazy(() => import('@pages/home/HomePage'));
-const LazyReportsSplitNavigator = lazy(() => import('./ReportsSplitNavigator'));
-const LazySettingsSplitNavigator = lazy(() => import('./SettingsSplitNavigator'));
-const LazyWorkspaceNavigator = lazy(() => import('./WorkspaceNavigator'));
-const LazyInsightsPage = lazy(() => import('@pages/Insights/InsightsPage'));
-
-type LazyFallbackProps = {
-    /** Sentry span to tag when this fallback renders. */
-    tabSpanName?: string;
-};
-
-function LazyFallback({tabSpanName}: LazyFallbackProps) {
-    const styles = useThemeStyles();
-
-    // Lets Sentry split slow tab navigations into "lazy chunk fetch" vs "screen render" buckets.
-    useEffect(() => {
-        if (!tabSpanName) {
-            return;
-        }
-        getSpan(tabSpanName)?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_LAZY_TAB_FALLBACK_SHOWN, true);
-    }, [tabSpanName]);
-
-    return (
-        <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.appBG]}>
-            <ActivityIndicator size="large" />
-        </View>
-    );
-}
-
-function withSuspense<P extends Record<string, unknown>>(LazyComponent: React.LazyExoticComponent<React.ComponentType<P>>, tabSpanName?: string) {
-    function SuspenseWrapper(props: P) {
-        return (
-            <Suspense fallback={<LazyFallback tabSpanName={tabSpanName} />}>
-                <LazyComponent {...props} />
-            </Suspense>
-        );
-    }
-    return SuspenseWrapper;
-}
-
-const HomePageScreen = withSuspense(LazyHomePage);
-const ReportsSplitNavigatorScreen = withSuspense(LazyReportsSplitNavigator, CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB);
-const SettingsSplitNavigatorScreen = withSuspense(LazySettingsSplitNavigator);
-const WorkspaceNavigatorScreen = withSuspense(LazyWorkspaceNavigator);
-const InsightsPageScreen = withSuspense(LazyInsightsPage);
+import {HomePageScreen, InsightsPageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen} from './tabScreens';
 
 const renderTabBar = ({state}: BottomTabBarProps) => <TabNavigatorBar state={state} />;
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
new file mode 100644
index 000000000000..eb463eb261e7
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
@@ -0,0 +1,18 @@
+import HomePage from '@pages/home/HomePage';
+import InsightsPage from '@pages/Insights/InsightsPage';
+
+import ReportsSplitNavigator from './ReportsSplitNavigator';
+import SettingsSplitNavigator from './SettingsSplitNavigator';
+import WorkspaceNavigator from './WorkspaceNavigator';
+
+/**
+ * The tab screens handed over as they are. Code splitting buys nothing here, the whole bundle is already on the
+ * device, and going through `lazy` would put a spinner in front of a tab the first time it is opened.
+ */
+const HomePageScreen = HomePage;
+const ReportsSplitNavigatorScreen = ReportsSplitNavigator;
+const SettingsSplitNavigatorScreen = SettingsSplitNavigator;
+const WorkspaceNavigatorScreen = WorkspaceNavigator;
+const InsightsPageScreen = InsightsPage;
+
+export {HomePageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen, InsightsPageScreen};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx
new file mode 100644
index 000000000000..bcc19d174e6a
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx
@@ -0,0 +1,62 @@
+import ActivityIndicator from '@components/ActivityIndicator';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getSpan} from '@libs/telemetry/activeSpans';
+
+import CONST from '@src/CONST';
+
+import React, {lazy, Suspense, useEffect} from 'react';
+import {View} from 'react-native';
+
+/**
+ * The tab screens, code split so a tab's chunk is fetched the first time it is opened. Native has no chunks to
+ * fetch, so it takes the sibling module that hands the components over directly and never shows the fallback.
+ */
+const LazyHomePage = lazy(() => import('@pages/home/HomePage'));
+const LazyReportsSplitNavigator = lazy(() => import('./ReportsSplitNavigator'));
+const LazySettingsSplitNavigator = lazy(() => import('./SettingsSplitNavigator'));
+const LazyWorkspaceNavigator = lazy(() => import('./WorkspaceNavigator'));
+const LazyInsightsPage = lazy(() => import('@pages/Insights/InsightsPage'));
+
+type LazyFallbackProps = {
+    /** Sentry span to tag when this fallback renders. */
+    tabSpanName?: string;
+};
+
+function LazyFallback({tabSpanName}: LazyFallbackProps) {
+    const styles = useThemeStyles();
+
+    // Lets Sentry split slow tab navigations into "lazy chunk fetch" vs "screen render" buckets.
+    useEffect(() => {
+        if (!tabSpanName) {
+            return;
+        }
+        getSpan(tabSpanName)?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_LAZY_TAB_FALLBACK_SHOWN, true);
+    }, [tabSpanName]);
+
+    return (
+        <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.appBG]}>
+            <ActivityIndicator size="large" />
+        </View>
+    );
+}
+
+function withSuspense<P extends Record<string, unknown>>(LazyComponent: React.LazyExoticComponent<React.ComponentType<P>>, tabSpanName?: string) {
+    function SuspenseWrapper(props: P) {
+        return (
+            <Suspense fallback={<LazyFallback tabSpanName={tabSpanName} />}>
+                <LazyComponent {...props} />
+            </Suspense>
+        );
+    }
+    return SuspenseWrapper;
+}
+
+const HomePageScreen = withSuspense(LazyHomePage);
+const ReportsSplitNavigatorScreen = withSuspense(LazyReportsSplitNavigator, CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB);
+const SettingsSplitNavigatorScreen = withSuspense(LazySettingsSplitNavigator);
+const WorkspaceNavigatorScreen = withSuspense(LazyWorkspaceNavigator);
+const InsightsPageScreen = withSuspense(LazyInsightsPage);
+
+export {HomePageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen, InsightsPageScreen};
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index 1c24fc717298..e994fcbfa44c 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -44,23 +44,22 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.ACCOUNT}
         >
             {({hovered}) => (
-                <>
+                <View style={[styles.navigationTabBarItemContent, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
                     <View style={styles.tn0Half}>
                         <AccountNavigationAvatar
-                            isSelected={isSelected || (!shouldUseNarrowLayout && hovered)}
+                            // The floating bar marks the selected tab with a pill behind the whole item, so the
+                            // avatar's own ring would double up on it. The side bar has no pill and keeps it.
+                            isSelected={!shouldUseNarrowLayout && (isSelected || hovered)}
                             isHovered={hovered}
                         />
                     </View>
-                    {/* The floating bottom bar has no room for labels, so it renders the avatar alone. */}
-                    {!shouldUseNarrowLayout && (
-                        <Text
-                            numberOfLines={2}
-                            style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}
-                        >
-                            {translate('initialSettingsPage.account')}
-                        </Text>
-                    )}
-                </>
+                    <Text
+                        numberOfLines={2}
+                        style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}
+                    >
+                        {translate('initialSettingsPage.account')}
+                    </Text>
+                </View>
             )}
         </PressableWithFeedback>
     );
diff --git a/src/styles/index.ts b/src/styles/index.ts
index c6cba1767ed4..ee636f4cc117 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -751,9 +751,21 @@ const staticStyles = (theme: ThemeColors) =>
             borderColor: theme.floatingTabBarBorder,
         },
 
+        // Wraps a tab's icon and label so the selected pill can be as wide as they are rather than as wide as
+        // the tab's share of the bar. A long label then pushes the pill past its tab instead of spilling out of it.
+        navigationTabBarItemContent: {
+            height: '100%',
+            justifyContent: 'center',
+            alignItems: 'center',
+        },
+
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
+            // The padding widens the pill while the matching negative margin keeps it from taking that width
+            // away from the label, so the pill reaches past its tab instead of squeezing what it wraps.
+            paddingHorizontal: variables.floatingTabBarSelectedOverhang,
+            marginHorizontal: -variables.floatingTabBarSelectedOverhang,
         },
 
         // Ends a tab root screen's scrollable content above the floating bar, so its last row stays reachable
@@ -767,7 +779,6 @@ const staticStyles = (theme: ThemeColors) =>
             display: 'flex',
             justifyContent: 'center',
             alignItems: 'center',
-            paddingHorizontal: 4,
         },
 
         // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 92aaafef4ea5..0cbe9f264b74 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -58,7 +58,7 @@ const darkTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
-    floatingTabBarBG: 'rgba(6,27,9,0.65)',
+    floatingTabBarBG: 'rgba(6,27,9,0.88)',
     floatingTabBarBorder: colors.productDark400,
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
     heading: colors.productDark900,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index acdd7a244db9..269b935f4ad0 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -58,7 +58,7 @@ const lightTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
-    floatingTabBarBG: 'rgba(252,251,249,0.65)',
+    floatingTabBarBG: 'rgba(252,251,249,0.88)',
     floatingTabBarBorder: colors.productLight400,
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
     heading: colors.productLight900,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 844c3f315fd5..5224493122f5 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -36,6 +36,9 @@ export default {
     bottomTabHeight: 72,
     floatingTabBarHeight,
     floatingTabBarHorizontalInset: 16,
+    // How far the selected pill reaches past the icon and label. Measured off the iOS glass bubble, where the
+    // account tab's 121px label sits in a 222px bubble, so 17pt a side.
+    floatingTabBarSelectedOverhang: 17,
     floatingTabBarBottomInset,
     // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
     floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
@@ -109,6 +112,8 @@ export default {
     iconBottomBar: 24,
     /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
     nativeTabIconDotRadius: 4,
+    // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.
+    nativeTabIconLabelGap: 6,
     /** Pixel density the native tab bar icons are rasterized at. */
     nativeTabIconScale: 3,
     iconHeader: 48,

From 713268a248c5b66864e3625112e2cf44611dec5f Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 23 Sep 2026 14:32:51 +0200
Subject: [PATCH 155/781] fix: remove dead tab bar footer slot, android
 patches, style duplicates

Restore Android tab state, gate Insights on registered tabs, sum LHN inset.
---
 package-lock.json                             |  1 -
 package.json                                  |  1 -
 patches/react-native-screens/details.md       | 18 +---------
 ...+4.25.0+003+no-android-tab-icon-tint.patch | 34 -------------------
 ...s+4.25.0+004+tabs-container-reattach.patch | 34 -------------------
 patches/react-navigation/details.md           | 10 +++---
 .../NavigationTabBar/TabBarItem.tsx           |  2 +-
 .../Navigation/NavigationTabBar/index.tsx     |  6 +++-
 .../Navigation/TabBarBottomContent/index.tsx  | 16 ---------
 .../Navigation/TabBarBottomContent/types.ts   |  9 -----
 src/components/WorkspaceListLayout.tsx        |  4 ---
 .../index.ts                                  |  4 +--
 .../Navigators/TAB_SCREENS.ios.ts             |  2 +-
 .../Navigators/TabNavigator.ios.tsx           | 17 +++-------
 .../AppNavigator/Navigators/TabNavigator.tsx  | 32 ++++++++++++++++-
 src/pages/Insights/InsightsDashboard.tsx      |  3 --
 src/pages/Search/SearchPageNarrow/index.tsx   |  6 ----
 src/pages/domain/DomainInitialPage.tsx        |  4 ---
 src/pages/home/HomePage.tsx                   |  4 ---
 src/pages/inbox/sidebar/BaseSidebarScreen.tsx |  4 ---
 .../inbox/sidebar/NavigationTabBarAvatar.tsx  |  2 +-
 src/pages/inbox/sidebar/SidebarLinks.tsx      | 10 ++++--
 src/pages/settings/InitialSettingsPage.tsx    |  5 ---
 src/pages/workspace/WorkspaceInitialPage.tsx  |  4 ---
 src/styles/index.ts                           | 12 ++-----
 src/styles/theme/themes/dark.ts               |  1 -
 src/styles/theme/themes/light.ts              |  1 -
 src/styles/theme/types.ts                     |  1 -
 tests/ui/BaseSidebarScreenTest.tsx            |  1 -
 tests/ui/InitialSettingsPageTest.tsx          |  8 -----
 tests/ui/WorkspaceInitialPageTest.tsx         |  1 -
 31 files changed, 61 insertions(+), 196 deletions(-)
 delete mode 100644 patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
 delete mode 100644 patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
 delete mode 100644 src/components/Navigation/TabBarBottomContent/index.tsx
 delete mode 100644 src/components/Navigation/TabBarBottomContent/types.ts

diff --git a/package-lock.json b/package-lock.json
index e905a6b83c31..1e05d3c26ea8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,7 +47,6 @@
         "@react-native-picker/picker": "2.11.3",
         "@react-navigation/bottom-tabs": "7.16.2",
         "@react-navigation/core": "7.21.12",
-        "@react-navigation/elements": "2.9.19",
         "@react-navigation/material-top-tabs": "7.4.19",
         "@react-navigation/native": "7.2.6",
         "@react-navigation/native-stack": "7.14.5",
diff --git a/package.json b/package.json
index 418dce1ac839..3ef520d45993 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,6 @@
     "@react-native-picker/picker": "2.11.3",
     "@react-navigation/bottom-tabs": "7.16.2",
     "@react-navigation/core": "7.21.12",
-    "@react-navigation/elements": "2.9.19",
     "@react-navigation/material-top-tabs": "7.4.19",
     "@react-navigation/native": "7.2.6",
     "@react-navigation/native-stack": "7.14.5",
diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 34e5f510797e..3900d5eaec4a 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -12,22 +12,6 @@
 
 - Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES` at both call sites, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart.
 - Upstream PR/issue: not reported yet.
-- E/App issue: n/a — found while building the native tab bar in `TabNavigator.native.tsx`.
+- E/App issue: n/a — found while building the native tab bar in `TabNavigator.ios.tsx`.
 - PR introducing patch: n/a
 
-
-### [react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch](react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch)
-
-- Reason: The App builds every native tab icon off-screen in Skia and hands it over already colored, because iOS 26 ignores the inactive icon color from `UITabBarItemAppearance`. React Navigation marks those icons `tinted: false`, but `getPlatformIcon` in `@react-navigation/bottom-tabs` only honors the flag on iOS: Android always receives the plain `imageSource`, and `TabsAppearanceApplicator` then assigns `bottomNavigationView.itemIconTintList` unconditionally. A `ColorStateList` tint is `SRC_IN`, so it flattens the whole bitmap to one color. On the glyph tabs this is invisible, since Material repaints them in the same color Skia used, but the account tab shows the user's avatar and turns into a solid silhouette, gray when the tab is not selected and green when it is, and the status dots painted into the bitmaps lose their own colors too. The patch drops the icon tint list so Android draws the bitmap as supplied, which is what `tinted: false` already means on iOS. Label colors are untouched and keep coming from `tabBarItemTitleFontColor`.
-- Upstream PR/issue: not reported yet.
-- E/App issue: n/a, found while building the native tab bar in `TabNavigator.native.tsx`.
-- PR introducing patch: n/a
-
-
-### [react-native-screens+4.25.0+004+tabs-container-reattach.patch](react-native-screens+4.25.0+004+tabs-container-reattach.patch)
-
-- Reason: Pushing any opaque screen onto the root native stack over the tab navigator leaves the tab content permanently blank once that screen is popped. `ScreenStack.kt` computes a null `visibleBottom` when the new top is opaque and then removes every wrapper below it, so the whole `TAB_NAVIGATOR` `ScreenStackFragment` is removed rather than detached, taking its child FragmentManager and the selected tab's `TabsScreenFragment` with it. On the pop, `TabsContainer.onAttachedToWindow` calls `setupFragmentManager()`, which hands back a fresh and empty child FragmentManager, and then `flushPendingUpdates()`, which is guarded by `invalidationFlags.any()`. Nothing invalidated the container, because the JS side sends no new navigation state when the selected tab did not change, so the flush is a no-op and the content FrameLayout stays empty forever. The bar keeps working because it is a plain child View rather than a fragment, and switching tabs repairs it because `onMenuItemSelected` runs a real fragment transaction. Reproduced on an Android emulator from the Spend tab, where a row opens an RHP, and from the Inbox tab, where the report header opens the details RHP: after back the window has zero text nodes and is visually blank. The patch invalidates the container before the flush on re-attach so the selected tab's fragment is added to the new FragmentManager.
-- The same re-attach also trips `ColorSchemeCoordinator.setup`, which opens with `check(!isSetUp)`. `teardown()` is the only thing that clears the flag and the package never calls it, and the re-attach does not always come with a matching detach, so the patch calls `teardown()` both from `onDetachedFromWindow` and immediately before `setup()`. Without the second call the pop surfaces `[RNScreens] ColorSchemeCoordinator's setup method must not be called again without calling teardown() first` as a red box in debug, and an `IllegalStateException` in release.
-- Upstream PR/issue: not reported yet.
-- E/App issue: n/a, found while building the native tab bar in `TabNavigator.native.tsx`.
-- PR introducing patch: n/a
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch b/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
deleted file mode 100644
index 7e22783f334b..000000000000
--- a/patches/react-native-screens/react-native-screens+4.25.0+003+no-android-tab-icon-tint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-index 10cd91b..cef93d9 100644
---- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-+++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-@@ -63,24 +63,11 @@ internal class TabsAppearanceApplicator(
-         bottomNavigationView.itemTextColor = ColorStateList(states, fontColors)
- 
-         // Icon color
--        val iconDisabledColor =
--            tabBarAppearance?.disabled?.tabBarItemIconColor
--                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
--
--        val iconFocusedColor =
--            tabBarAppearance?.focused?.tabBarItemIconColor
--                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
--
--        val iconSelectedColor =
--            tabBarAppearance?.selected?.tabBarItemIconColor
--                ?: resolveColorAttr(context, R.attr.colorOnSecondaryContainer)
--
--        val iconNormalColor =
--            tabBarAppearance?.normal?.tabBarItemIconColor
--                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
--
--        val iconColors = intArrayOf(iconDisabledColor, iconSelectedColor, iconFocusedColor, iconNormalColor)
--        bottomNavigationView.itemIconTintList = ColorStateList(states, iconColors)
-+        // Every tab icon arrives as a bitmap that already carries its own colors: the recolored glyph, the status
-+        // dot painted into it and the user's avatar on the account tab. A tint list paints over all of it with a
-+        // single color, so no tint is applied and the bitmap is drawn as supplied, which is how `tinted: false`
-+        // already behaves on iOS.
-+        bottomNavigationView.itemIconTintList = null
- 
-         // LabelVisibilityMode
-         // From docs: can be one of LABEL_VISIBILITY_AUTO, LABEL_VISIBILITY_SELECTED, LABEL_VISIBILITY_LABELED, or LABEL_VISIBILITY_UNLABELED
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch b/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
deleted file mode 100644
index 9232a3c76fde..000000000000
--- a/patches/react-native-screens/react-native-screens+4.25.0+004+tabs-container-reattach.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-index 3342c41..ee3829e 100644
---- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-+++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
-@@ -267,6 +267,21 @@ class TabsContainer internal constructor(
-         setupFragmentManager()
-         flushPendingUpdates()
- 
-+        // Pushing an opaque screen over the tab host removes this view's own fragment, which destroys the child
-+        // FragmentManager that held the selected tab. setupFragmentManager hands back a fresh, empty one and
-+        // nothing else re-adds the tab, because navState still names it and so the JS side sends no update.
-+        // Without this the content area stays empty until another tab is picked.
-+        val selectedFragment = if (navState.isNotEmpty()) getFragmentForScreenKey(navState.selectedScreenKey) else null
-+        if (selectedFragment != null && !selectedFragment.isAdded) {
-+            requireFragmentManager
-+                .createTransactionWithReordering()
-+                .add(contentView.id, selectedFragment)
-+                .commitNowAllowingStateLoss()
-+        }
-+
-+        // A re-attach does not always come with a matching detach, and setup() throws on a second call, so the
-+        // coordinator is reset first. teardown() does nothing when it was never set up.
-+        colorSchemeCoordinator.teardown()
-         colorSchemeCoordinator.setup(this) { uiNightMode ->
-             applyDayNightUiMode(uiNightMode)
-         }
-@@ -275,6 +290,7 @@ class TabsContainer internal constructor(
-     override fun onDetachedFromWindow() {
-         super.onDetachedFromWindow()
-         teardownFragmentManager()
-+        colorSchemeCoordinator.teardown()
-     }
- 
-     override fun onConfigurationChanged(newConfig: Configuration?) {
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 7e5f8c7caa01..ff4aae0c72e9 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -1,12 +1,12 @@
 # `@react-navigation` patches
 
 ### @react-navigation+package-name+7+fix-failing-jest-by-disabling-esmodule.patch
-#### [@react-navigation+bottom-tabs+7.15.5+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+bottom-tabs+7.15.5+001+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+core+7.21.12+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+core+7.21.12+001+fix-failing-jest-by-disabling-esmodule.patch)
-#### [@react-navigation+elements+2.9.14+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.9.14+001+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+material-top-tabs+7.4.19+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+material-top-tabs+7.4.19+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+native-stack+7.14.5+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native-stack+7.14.5+002+fix-failing-jest-by-disabling-esmodule.patch)
-#### [@react-navigation+native+7.1.33+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.1.33+002+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+routers+7.6.4+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+routers+7.6.4+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+stack+7.8.5+004+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+stack+7.8.5+004+fix-failing-jest-by-disabling-esmodule.patch)
 
@@ -24,7 +24,7 @@
 - PR Introducing Patch: [#37891](https://github.com/Expensify/App/pull/37891)
 - PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155), [#98097](https://github.com/Expensify/App/pull/98097)
 
-### [@react-navigation+native+7.1.33+001+initial.patch](@react-navigation+native+7.1.33+001+initial.patch)
+### [@react-navigation+native+7.2.6+001+initial.patch](@react-navigation+native+7.2.6+001+initial.patch)
 
 - Reason: Allows us to use some more advanced navigation actions without messing up the browser history
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/pull/12751 (`route.history` + `pushParams`, added upstream for this use case); originating issue https://github.com/react-navigation/react-navigation/issues/12460. On the v8 upgrade, evaluate adopting `pushParams` to shrink this patch.
@@ -49,7 +49,7 @@
 - PR Updating Patch: [#33280](https://github.com/Expensify/App/pull/33280) [#37421](https://github.com/Expensify/App/pull/37421) [#49539](https://github.com/Expensify/App/pull/49539) [#64155](https://github.com/Expensify/App/pull/64155) [#65119](https://github.com/Expensify/App/issues/65119)
 - Note: Not fully covered by the public `detachPreviousScreen` option (this also forces `activityState`). v8 replaces `detachInactiveScreens`/`detachPreviousScreen`/`freezeOnBlur` with a single `inactiveBehavior` option — re-evaluate this patch then.
 
-### [@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch](@react-navigation+native+7.1.33+003+increase-history-go-popstate-fallback-timeout.patch)
+### [@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch](@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch)
 
 - Reason:
 
diff --git a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
index 8955980f9339..bbf07ed6c0d9 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
@@ -37,7 +37,7 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
-        <View style={[styles.navigationTabBarItemContent, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
+        <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
             <View>
                 <Icon
                     src={icon}
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 51892bd4610d..40b8002f93fe 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -14,6 +14,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import TAB_SCREENS from '@libs/Navigation/AppNavigator/Navigators/TAB_SCREENS';
 import Navigation from '@libs/Navigation/Navigation';
 
 import NavigationTabBarAvatar from '@pages/inbox/sidebar/NavigationTabBarAvatar';
@@ -23,6 +24,7 @@ import SupportalSwitcherButton from '@pages/inbox/sidebar/SupportalSwitcherButto
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 
 import type {ValueOf} from 'type-fest';
 
@@ -46,7 +48,9 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     const {translate} = useLocalize();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const {isBetaEnabled} = usePermissions();
-    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+    // iOS drives its bar from the native tab navigator, which registers five items and leaves Insights out, so the
+    // wide layout's own bar must not offer a tab the navigator cannot route to.
+    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE) && (TAB_SCREENS as readonly string[]).includes(SCREENS.INSIGHTS);
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['ExpensifyAppIcon', 'Home']);
 
     const {shouldUseNarrowLayout} = useResponsiveLayout();
diff --git a/src/components/Navigation/TabBarBottomContent/index.tsx b/src/components/Navigation/TabBarBottomContent/index.tsx
deleted file mode 100644
index be7d68435fe7..000000000000
--- a/src/components/Navigation/TabBarBottomContent/index.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import type {FC} from 'react';
-
-import type TabBarBottomContentProps from './types';
-
-/**
- * Bottom slot that every tab root screen reserves for the tab bar. The navigator owns the only bar there is,
- * so the slot renders nothing: one bar per preloaded screen would stack glass capsules behind the visible one.
- * The slot itself stays because ScreenWrapper keys the placement of the bottom-docked offline indicator on it.
- */
-function TabBarBottomContent() {
-    return null;
-}
-
-const tabBarBottomContent: FC<TabBarBottomContentProps> = TabBarBottomContent;
-
-export default tabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/types.ts b/src/components/Navigation/TabBarBottomContent/types.ts
deleted file mode 100644
index 30f7b28d1650..000000000000
--- a/src/components/Navigation/TabBarBottomContent/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-
-import type {ValueOf} from 'type-fest';
-
-type TabBarBottomContentProps = {
-    selectedTab: ValueOf<typeof NAVIGATION_TABS>;
-};
-
-export default TabBarBottomContentProps;
diff --git a/src/components/WorkspaceListLayout.tsx b/src/components/WorkspaceListLayout.tsx
index ce180ea0d91d..e5a3ab23b321 100644
--- a/src/components/WorkspaceListLayout.tsx
+++ b/src/components/WorkspaceListLayout.tsx
@@ -16,8 +16,6 @@ import React from 'react';
 import {View} from 'react-native';
 
 import {useDebugTabViewHeight} from './Navigation/DebugTabView';
-import NAVIGATION_TABS from './Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from './Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from './Navigation/TopBarWithLoadingBar';
 import OfflineIndicator from './OfflineIndicator';
 import ScreenWrapper from './ScreenWrapper';
@@ -119,8 +117,6 @@ function WorkspaceListLayout({children, activeTabKey, headerButton, headerCompon
             shouldEnableMaxHeight
             shouldEnablePickerAvoiding={false}
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContentStyle={styles.overflowVisible}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
         >
             <View style={[styles.flex1, styles.flexRow]}>
                 <View style={[styles.flex1]}>
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
index ce42dd197c1b..12c4971b5243 100644
--- a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
+++ b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
@@ -5,8 +5,8 @@ import type {StyleProp, ViewStyle} from 'react-native';
 
 /**
  * Bottom padding a tab root screen's scrollable content needs so its last row settles above the floating tab
- * bar instead of under it. Mobile web draws that bar itself; the native platforms get the same room from the
- * safe area their own tab bar reports, so there the hook adds nothing.
+ * bar instead of under it. Android and mobile web draw that bar in JS; iOS takes the sibling module, because
+ * UITabBar reports its own height through the safe area and needs no extra room.
  */
 function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
     const styles = useThemeStyles();
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
index bfd8d0f176f5..575fc430519b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
@@ -1,6 +1,6 @@
 /**
  * Ordered list of screen names registered inside TabNavigator.
- * This must match the Tab.Screen order in TabNavigator.native.tsx, where the order is also the order the native
+ * This must match the Tab.Screen order in TabNavigator.ios.tsx, where the order is also the order the native
  * tab bar draws its items in, so Workspaces comes before Account.
  * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
  */
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index f70d11d6f598..b90b80cde843 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -58,9 +58,8 @@ import SettingsSplitNavigator from './SettingsSplitNavigator';
 import WorkspaceNavigator from './WorkspaceNavigator';
 
 /**
- * Tab Navigator backed by the platform's own tab bar: UITabBar on iOS, which brings the liquid glass material
- * with it on iOS 26, and a Material BottomNavigationView on Android. Wide layouts keep the JS side bar, since
- * neither native bar can be moved to the side of the screen.
+ * Tab Navigator backed by UITabBar, which brings the liquid glass material with it on iOS 26. Wide layouts keep
+ * the JS side bar, since UITabBar cannot be moved to the side of the screen.
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
@@ -422,7 +421,7 @@ function TabNavigator() {
         accountID: currentUserPersonalDetails.accountID,
     });
     const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const avatarSignature = `${avatarURI}|${accountDotColor}`;
+    const avatarSignature = [avatarURI, accountDotColor, tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR], theme.textSupporting, theme.text].join('|');
     const [circularAvatar, setCircularAvatar] = useState<{signature: string; active: AvatarTabIcon; inactive: AvatarTabIcon}>();
     const avatarPair = circularAvatar?.signature === avatarSignature ? circularAvatar : undefined;
     const toAvatarIcon = (icon: AvatarTabIcon): NativeBottomTabIcon => ({
@@ -454,7 +453,7 @@ function TabNavigator() {
             isActive = false;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [avatarSignature, iconsSignature]);
+    }, [avatarSignature]);
 
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
@@ -498,10 +497,6 @@ function TabNavigator() {
 
     const screenOptions = {
         headerShown: false,
-        // The native bar swaps the visible tab itself, so a tab that mounts on first focus hands the bar an empty
-        // container to show while its tree renders. Unfocused tabs render through a transition instead, which keeps
-        // them off the first paint and still leaves each one ready to draw its own skeleton the moment it is picked.
-        lazy: false,
         tabBarActiveTintColor: theme.iconMenu,
         tabBarInactiveTintColor: theme.icon,
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
@@ -509,10 +504,6 @@ function TabNavigator() {
         // frame after a tab switch in the previous tab's state. The background only lands on Android and iOS 18 and
         // below; iOS 26 keeps its own glass material.
         tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
-        // Android defaults to showing the label on the selected tab only once a bar has more than three items,
-        // which leaves the other tabs centering a lone icon at a different height. Labelling every tab matches
-        // what iOS draws and keeps all five icons on one baseline.
-        tabBarLabelVisibilityMode: 'labeled' as const,
         tabBarControllerMode: 'tabBar' as const,
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
         tabBarMinimizeBehavior: 'none' as const,
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index 0e535d21c788..3a1ffb8b3186 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -1,6 +1,7 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 
+import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
@@ -11,9 +12,10 @@ import SCREENS from '@src/SCREENS';
  * Tab Navigator containing Home, Inbox (Reports), Search, Insights, Settings, and Workspaces pages.
  */
 import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
+import type {NavigationAction, Router, TabNavigationState} from '@react-navigation/native';
 
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
-import {findFocusedRoute, useNavigation, useNavigationState} from '@react-navigation/native';
+import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import React, {useEffect} from 'react';
 
 // Do not lazy load Search navigator for performance reasons
@@ -45,6 +47,12 @@ function TabNavigator() {
     const navigation = useNavigation();
     const parentNavigation = navigation.getParent();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
+    const route = useRoute();
+    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
+    // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
+    // mounts, so the nearest navigation listener context is still the parent stack's.
+    const tabState = useNavigationState((parentState) => parentState.routes.find((r) => r.key === route.key)?.state);
+
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
             return;
@@ -53,6 +61,27 @@ function TabNavigator() {
         parentNavigation.setOptions({gestureEnabled: !isRootScreen});
     }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
 
+    useEffect(() => {
+        // stale === false distinguishes a fully realized NavigationState from a PartialState.
+        if (!tabState || tabState.stale !== false) {
+            return;
+        }
+        setPreservedNavigatorState(route.key, tabState);
+    }, [tabState, route.key]);
+
+    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
+    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
+    // state by overriding the bottom-tab router's getInitialState - the same pattern SplitRouter
+    // uses for its split navigators.
+    const tabRouterOverride = <Action extends NavigationAction>(
+        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
+    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
+        getInitialState: (configOptions) => {
+            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
+            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
+        },
+    });
+
     const screenOptions = {
         ...TAB_SCREEN_OPTIONS_BASE,
         sceneStyle: {flex: 1, backgroundColor: theme.appBG},
@@ -65,6 +94,7 @@ function TabNavigator() {
             tabBar={renderTabBar}
             screenOptions={screenOptions}
             screenLayout={bottomTabScreenLayoutWrapper}
+            UNSTABLE_router={tabRouterOverride}
         >
             <Tab.Screen
                 name={SCREENS.HOME}
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index 956c82394d2f..3efa907209dc 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,7 +1,5 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -168,7 +166,6 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
         <ScreenWrapper
             shouldShowOfflineIndicatorInWideScreen
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
             testID="InsightsPage"
         >
             <TopBar
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index d9a0351f7b25..91c2f19c5e40 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -1,7 +1,5 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import PulsingView from '@components/PulsingView';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -78,8 +76,6 @@ type SearchPageNarrowProps = {
     isOverlayActive: boolean;
 };
 
-const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SEARCH} />;
-
 function SearchPageNarrow({
     queryJSON,
     searchResults,
@@ -267,8 +263,6 @@ function SearchPageNarrow({
                     shouldEnableMaxHeight
                     offlineIndicatorStyle={styles.mtAuto}
                     shouldShowOfflineIndicator={!!searchResults}
-                    bottomContent={tabBarContent}
-                    bottomContentStyle={styles.overflowVisible}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index 543a56135663..f8996096591e 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -1,8 +1,6 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
@@ -104,8 +102,6 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
         <ScreenWrapper
             testID="DomainInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
-            bottomContentStyle={styles.overflowVisible}
         >
             <FullPageNotFoundView
                 onBackButtonPress={() => Navigation.dismissModal()}
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 868536b929cb..02cf216faa56 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,6 +1,4 @@
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -139,8 +137,6 @@ function HomePage() {
                     shouldShowOfflineIndicatorInWideScreen
                     testID="HomePage"
                     enableEdgeToEdgeBottomSafeAreaPadding={false}
-                    bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.HOME} />}
-                    bottomContentStyle={styles.overflowVisible}
                 >
                     <TopBar
                         breadcrumbLabel={translate('common.home')}
diff --git a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
index dd92d4ecd347..d59654609135 100644
--- a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
+++ b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
@@ -1,5 +1,3 @@
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -40,8 +38,6 @@ function BaseSidebarScreen() {
             shouldEnableKeyboardAvoidingView={false}
             style={[styles.sidebar, isMobile() ? styles.userSelectNone : {}]}
             testID="BaseSidebarScreen"
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INBOX} />}
-            bottomContentStyle={styles.overflowVisible}
         >
             {({insets}) => (
                 <>
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index e994fcbfa44c..ffb69bac45a4 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -44,7 +44,7 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.ACCOUNT}
         >
             {({hovered}) => (
-                <View style={[styles.navigationTabBarItemContent, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
+                <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
                     <View style={styles.tn0Half}>
                         <AccountNavigationAvatar
                             // The floating bar marks the selected tab with a pill behind the whole item, so the
diff --git a/src/pages/inbox/sidebar/SidebarLinks.tsx b/src/pages/inbox/sidebar/SidebarLinks.tsx
index a451d6cd7a56..b3a8b235c55c 100644
--- a/src/pages/inbox/sidebar/SidebarLinks.tsx
+++ b/src/pages/inbox/sidebar/SidebarLinks.tsx
@@ -16,6 +16,8 @@ import {cancelSpan} from '@libs/telemetry/activeSpans';
 
 import * as ReportActionContextMenu from '@pages/inbox/report/ContextMenu/ReportActionContextMenu';
 
+import variables from '@styles/variables';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -81,9 +83,11 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
 
     const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
 
-    // Where the floating tab bar covers the end of the list, its footprint already clears the home indicator,
-    // so it replaces the safe area padding rather than adding to it.
-    const contentContainerStyles = StyleSheet.flatten([styles.pt2, floatingTabBarContentInsetStyle ?? {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]);
+    // The floating tab bar covers the end of the list above the home indicator, so its footprint adds to the safe
+    // area padding instead of replacing it. Only the platforms that draw that bar in JS report an inset.
+    const safeAreaMarginBottom = StyleUtils.getSafeAreaMargins(insets).marginBottom;
+    const safeAreaPaddingBottom = typeof safeAreaMarginBottom === 'number' ? safeAreaMarginBottom : 0;
+    const contentContainerStyles = StyleSheet.flatten([styles.pt2, {paddingBottom: safeAreaPaddingBottom + (floatingTabBarContentInsetStyle ? variables.floatingTabBarContentInset : 0)}]);
 
     const shouldShowEmptyLHN = optionListItems.length === 0;
 
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 361a364892c8..4b09fb77f00b 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -1,8 +1,6 @@
 import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherButton from '@components/AccountSwitcherButton';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -50,7 +48,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
     const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
-    const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SETTINGS} />;
     const styles = useThemeStyles();
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
@@ -158,8 +155,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             includeSafeAreaPaddingBottom
             testID="InitialSettingsPage"
             shouldEnableKeyboardAvoidingView={false}
-            bottomContent={tabBarContent}
-            bottomContentStyle={styles.overflowVisible}
         >
             <TopBarWithLoadingBar
                 breadcrumbLabel={translate('initialSettingsPage.account')}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 030f8e10c4a1..e09d970530f4 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -1,8 +1,6 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -226,8 +224,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         <ScreenWrapper
             testID="WorkspaceInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
-            bottomContentStyle={styles.overflowVisible}
         >
             <FullPageNotFoundView
                 onBackButtonPress={goBackFromWorkspaceSettingPages}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index c075ea75bb71..4532f86aa472 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -748,15 +748,7 @@ const staticStyles = (theme: ThemeColors) =>
         navigationTabBarSurface: {
             backgroundColor: theme.floatingTabBarBG,
             borderWidth: variables.hairlineBorderWidth,
-            borderColor: theme.floatingTabBarBorder,
-        },
-
-        // Wraps a tab's icon and label so the selected pill can be as wide as they are rather than as wide as
-        // the tab's share of the bar. A long label then pushes the pill past its tab instead of spilling out of it.
-        navigationTabBarItemContent: {
-            height: '100%',
-            justifyContent: 'center',
-            alignItems: 'center',
+            borderColor: theme.border,
         },
 
         navigationTabBarItemSelected: {
@@ -774,6 +766,8 @@ const staticStyles = (theme: ThemeColors) =>
             paddingBottom: variables.floatingTabBarContentInset,
         },
 
+        // Also wraps a tab's icon and label, where it sizes to them rather than to the tab's share of the bar,
+        // so a long label pushes the selected pill past its tab instead of spilling out of it.
         navigationTabBarItem: {
             height: '100%',
             display: 'flex',
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 0cbe9f264b74..da2b8ef071fa 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -59,7 +59,6 @@ const darkTheme = {
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
     floatingTabBarBG: 'rgba(6,27,9,0.88)',
-    floatingTabBarBorder: colors.productDark400,
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 269b935f4ad0..9eb7daf68418 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -59,7 +59,6 @@ const lightTheme = {
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
     floatingTabBarBG: 'rgba(252,251,249,0.88)',
-    floatingTabBarBorder: colors.productLight400,
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
     heading: colors.productLight900,
     textLight: colors.white,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 18edcdcb7cb5..2ebe4017eb6d 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -66,7 +66,6 @@ type ThemeColors = {
     sidebar: Color;
     sidebarHover: Color;
     floatingTabBarBG: Color;
-    floatingTabBarBorder: Color;
     floatingTabBarSelectedBG: Color;
     heading: Color;
     textLight: Color;
diff --git a/tests/ui/BaseSidebarScreenTest.tsx b/tests/ui/BaseSidebarScreenTest.tsx
index 1daf35d456c8..eaf55a117f57 100644
--- a/tests/ui/BaseSidebarScreenTest.tsx
+++ b/tests/ui/BaseSidebarScreenTest.tsx
@@ -43,7 +43,6 @@ jest.mock('@components/ScreenWrapper', () => {
 });
 
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => () => null);
-jest.mock('@components/Navigation/TabBarBottomContent', () => () => null);
 jest.mock('@pages/inbox/sidebar/InboxTabSelector', () => () => null);
 jest.mock('@components/OptionsListSkeletonView', () => {
     const ReactModule = jest.requireActual<typeof React>('react');
diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index a5cef1a0dfff..b5f8f38ece19 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -85,14 +85,6 @@ jest.mock('@components/AccountSwitcherSkeletonView', () => {
     return MockAccountSwitcherSkeletonView;
 });
 
-jest.mock('@components/Navigation/TabBarBottomContent', () => {
-    function MockTabBarBottomContent() {
-        return null;
-    }
-    MockTabBarBottomContent.displayName = 'TabBarBottomContent';
-    return MockTabBarBottomContent;
-});
-
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => {
     function MockTopBarWithLoadingBar() {
         return null;
diff --git a/tests/ui/WorkspaceInitialPageTest.tsx b/tests/ui/WorkspaceInitialPageTest.tsx
index d056856626cb..bd6e7a5f51b4 100644
--- a/tests/ui/WorkspaceInitialPageTest.tsx
+++ b/tests/ui/WorkspaceInitialPageTest.tsx
@@ -66,7 +66,6 @@ jest.mock('@hooks/useWorkspaceAccountID', () => jest.fn());
 jest.mock('@components/BlockingViews/FullPageNotFoundView', () => (props: {children: React.ReactNode; shouldShow: boolean}) => mockFullPageNotFoundView(props));
 jest.mock('@components/HeaderWithBackButton', () => jest.fn());
 jest.mock('@components/HighlightableMenuItem', () => jest.fn());
-jest.mock('@components/Navigation/TabBarBottomContent', () => jest.fn());
 jest.mock(
     '@components/OfflineWithFeedback',
     () =>

From 0415ee99c45adaa6c459a571f8211bc67283981f Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 23 Sep 2026 14:44:45 +0200
Subject: [PATCH 156/781] fix: fold tab bar surface style into the container,
 correct stale comments

---
 .../Navigation/NavigationTabBar/index.tsx     |  2 +-
 .../Navigators/TabNavigator.ios.tsx           |  9 ++++-----
 src/styles/index.ts                           | 20 ++++++++-----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 40b8002f93fe..1d6da466e63d 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -158,7 +158,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
         <>
             {shouldShowDebugTabView && <DebugTabView selectedTab={selectedTab} />}
             <View
-                style={[styles.navigationTabBarContainer, styles.navigationTabBarSurface]}
+                style={styles.navigationTabBarContainer}
                 testID="NavigationTabBar"
             >
                 <PressableWithFeedback
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index b90b80cde843..5fb6b230a614 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -143,9 +143,8 @@ function measureLabel(label: string, isSelected: boolean, scale: number) {
  * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
  * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
  * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
- * differ in type. The canvas is the glyph's own size, so Android's fixed icon slot draws the glyph at full size
- * instead of shrinking it to fit reserved room, and the dot overlaps the glyph's top right corner the way the
- * indicator on the mobile web bar does.
+ * differ in type. The canvas is only as big as what it holds, and the dot overlaps the glyph's top right corner
+ * the way the indicator on the JS bar does.
  */
 async function createTabIcon(
     source: ImageSourcePropType,
@@ -501,8 +500,8 @@ function TabNavigator() {
         tabBarInactiveTintColor: theme.icon,
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
         // Pushed through setOptions instead, each tab kept the value it was left with, and the bar spent the first
-        // frame after a tab switch in the previous tab's state. The background only lands on Android and iOS 18 and
-        // below; iOS 26 keeps its own glass material.
+        // frame after a tab switch in the previous tab's state. The background only lands on iOS 18 and below;
+        // iOS 26 keeps its own glass material.
         tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
         tabBarControllerMode: 'tabBar' as const,
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 4532f86aa472..2e579093dcd6 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -730,27 +730,22 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
-        // The narrow tab bar is a capsule floating above the screen content. Only mobile web renders it, since
-        // the native platforms hand the bottom bar over to UIKit and to Material.
+        // The narrow tab bar is a capsule floating above the screen content, drawn by Android and mobile web.
+        // iOS hands the bottom bar over to UIKit, which paints its own material, so nothing here reaches it.
         navigationTabBarContainer: {
             flexDirection: 'row',
             height: variables.floatingTabBarHeight,
             marginHorizontal: variables.floatingTabBarHorizontalInset,
             borderRadius: variables.componentBorderRadiusCircle,
+            backgroundColor: theme.floatingTabBarBG,
+            borderWidth: variables.hairlineBorderWidth,
+            borderColor: theme.border,
             // Insets the row so the selected item's capsule keeps a margin inside the bar's rounded edge.
             ...spacing.p1,
             // Clips each item's hover and press background to the capsule's rounded ends.
             overflow: 'hidden',
         },
 
-        // Mobile web has no native tab bar to inherit a material from, so the capsule paints its own
-        // translucent surface over the content it floats above.
-        navigationTabBarSurface: {
-            backgroundColor: theme.floatingTabBarBG,
-            borderWidth: variables.hairlineBorderWidth,
-            borderColor: theme.border,
-        },
-
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
@@ -766,8 +761,9 @@ const staticStyles = (theme: ThemeColors) =>
             paddingBottom: variables.floatingTabBarContentInset,
         },
 
-        // Also wraps a tab's icon and label, where it sizes to them rather than to the tab's share of the bar,
-        // so a long label pushes the selected pill past its tab instead of spilling out of it.
+        // Used both for a tab's pressable and for the wrapper around its icon and label. As the wrapper it sizes
+        // to those two rather than to the tab's share of the bar, so a long label pushes the selected pill past
+        // its tab instead of spilling out of it.
         navigationTabBarItem: {
             height: '100%',
             display: 'flex',

From 877e3e704b2c6f68192731a9802b9d0975cba162 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 23 Sep 2026 15:55:54 +0200
Subject: [PATCH 157/781] feat: scale down floating tab bar icons and blur what
 the bar covers

Icons go to 20x20 with a tighter label gap; Android and mWeb blur the backdrop.
---
 package-lock.json                             | 12 +++++++++
 package.json                                  |  1 +
 .../TabBarBlur/index.android.tsx              | 26 +++++++++++++++++++
 .../NavigationTabBar/TabBarBlur/index.tsx     | 23 ++++++++++++++++
 .../NavigationTabBar/TabBarItem.tsx           | 13 +++++++---
 .../Navigation/NavigationTabBar/index.tsx     |  2 ++
 src/styles/index.ts                           |  9 +++++++
 src/styles/theme/themes/dark.ts               |  2 +-
 src/styles/theme/themes/light.ts              |  2 +-
 src/styles/variables.ts                       |  6 +++++
 10 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx

diff --git a/package-lock.json b/package-lock.json
index 1e05d3c26ea8..8c5be366abbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,6 +71,7 @@
         "expo": "57.0.8",
         "expo-asset": "57.0.7",
         "expo-audio": "57.0.3",
+        "expo-blur": "57.0.3",
         "expo-font": "57.0.1",
         "expo-image": "57.0.1",
         "expo-image-manipulator": "57.0.6",
@@ -27115,6 +27116,17 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-blur": {
+      "version": "57.0.3",
+      "resolved": "https://registry.npmjs.org/expo-blur/-/expo-blur-57.0.3.tgz",
+      "integrity": "sha512-uyBeJwxIuXzWXXNrnRub5pcF8VzQsiOz0VBTWDpMG2UztmaFyfAz6pI/GCwRtWpHhiOpLoJj79WLdg1GMB+9cg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/expo-constants": {
       "version": "57.0.7",
       "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-57.0.7.tgz",
diff --git a/package.json b/package.json
index 3ef520d45993..cd7cf6199a2a 100644
--- a/package.json
+++ b/package.json
@@ -147,6 +147,7 @@
     "expo": "57.0.8",
     "expo-asset": "57.0.7",
     "expo-audio": "57.0.3",
+    "expo-blur": "57.0.3",
     "expo-font": "57.0.1",
     "expo-image": "57.0.1",
     "expo-image-manipulator": "57.0.6",
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
new file mode 100644
index 000000000000..895bc2c90dd8
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
@@ -0,0 +1,26 @@
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import variables from '@styles/variables';
+
+import {BlurView} from 'expo-blur';
+import React from 'react';
+
+/**
+ * Blurs whatever the floating tab bar covers, so the bar reads as a glass capsule the way UIKit draws it on iOS.
+ * Android has no backdrop filter of its own, so the blur comes from a native view behind the row.
+ */
+function TabBarBlur() {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    return (
+        <BlurView
+            intensity={variables.floatingTabBarBlurIntensity}
+            tint={theme.colorScheme}
+            style={styles.navigationTabBarBlur}
+        />
+    );
+}
+
+export default TabBarBlur;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx
new file mode 100644
index 000000000000..cb0af14f37cc
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx
@@ -0,0 +1,23 @@
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import variables from '@styles/variables';
+
+import type {ViewStyle} from 'react-native';
+
+import React from 'react';
+import {View} from 'react-native';
+
+/**
+ * Blurs whatever the floating tab bar covers, so the bar reads as a glass capsule the way UIKit draws it on iOS.
+ * The web build gets the effect from the CSS backdrop filter, which react-native-web forwards and prefixes but
+ * React Native's own style types do not carry.
+ */
+const backdropFilterStyle = {backdropFilter: `blur(${variables.floatingTabBarBlurRadius}px)`} as ViewStyle;
+
+function TabBarBlur() {
+    const styles = useThemeStyles();
+
+    return <View style={[styles.navigationTabBarBlur, backdropFilterStyle]} />;
+}
+
+export default TabBarBlur;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
index bbf07ed6c0d9..87613dbe3f72 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
@@ -35,6 +35,7 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
     const theme = useTheme();
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const iconSize = shouldUseNarrowLayout ? variables.iconFloatingTabBar : variables.iconBottomBar;
 
     return (
         <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
@@ -42,8 +43,8 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
                 <Icon
                     src={icon}
                     fill={getIconFill(isSelected, isHovered, theme)}
-                    width={variables.iconBottomBar}
-                    height={variables.iconBottomBar}
+                    width={iconSize}
+                    height={iconSize}
                 />
                 {!!statusIndicatorColor && (
                     <View style={[styles.navigationTabBarStatusIndicator, styles.statusIndicatorColor(statusIndicatorColor), isHovered && {borderColor: theme.sidebarHover}]} />
@@ -51,7 +52,13 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
             </View>
             <Text
                 numberOfLines={numberOfLines}
-                style={[styles.textSmall, styles.textAlignCenter, styles.mt1Half, isSelected ? styles.textBold : styles.textSupporting, styles.navigationTabBarLabel]}
+                style={[
+                    styles.textSmall,
+                    styles.textAlignCenter,
+                    shouldUseNarrowLayout ? styles.mt1 : styles.mt1Half,
+                    isSelected ? styles.textBold : styles.textSupporting,
+                    styles.navigationTabBarLabel,
+                ]}
             >
                 {label}
             </Text>
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 1d6da466e63d..85de538cc13a 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -35,6 +35,7 @@ import InboxTabButton from './InboxTabButton';
 import InsightsTabButton from './InsightsTabButton';
 import NAVIGATION_TABS from './NAVIGATION_TABS';
 import SearchTabButton from './SearchTabButton';
+import TabBarBlur from './TabBarBlur';
 import TabBarItem from './TabBarItem';
 import WorkspacesTabButton from './WorkspacesTabButton';
 
@@ -161,6 +162,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                 style={styles.navigationTabBarContainer}
                 testID="NavigationTabBar"
             >
+                <TabBarBlur />
                 <PressableWithFeedback
                     onPress={navigateToNewDotHome}
                     role={CONST.ROLE.TAB}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 2e579093dcd6..b7511bc36852 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -746,6 +746,15 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'hidden',
         },
 
+        // Sits behind the row and inside the container's rounded clip, so the blur stops at the capsule's edge.
+        navigationTabBarBlur: {
+            position: 'absolute',
+            top: 0,
+            right: 0,
+            bottom: 0,
+            left: 0,
+        },
+
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index da2b8ef071fa..7848f94d9776 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -58,7 +58,7 @@ const darkTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
-    floatingTabBarBG: 'rgba(6,27,9,0.88)',
+    floatingTabBarBG: 'rgba(6,27,9,0.70)',
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 9eb7daf68418..77eb5620a411 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -58,7 +58,7 @@ const lightTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
-    floatingTabBarBG: 'rgba(252,251,249,0.88)',
+    floatingTabBarBG: 'rgba(252,251,249,0.70)',
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
     heading: colors.productLight900,
     textLight: colors.white,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 09b9b29f37ac..b09479591c19 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -40,6 +40,10 @@ export default {
     // account tab's 121px label sits in a 222px bubble, so 17pt a side.
     floatingTabBarSelectedOverhang: 17,
     floatingTabBarBottomInset,
+    // Blur the bar lays over what it covers. The web radius is a CSS blur; the Android one is expo-blur's own
+    // 0 to 100 intensity, which is not the same unit, so the two are tuned to match rather than shared.
+    floatingTabBarBlurRadius: 24,
+    floatingTabBarBlurIntensity: 65,
     // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
     floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
@@ -110,6 +114,8 @@ export default {
     iconSizeMegaLarge: 105,
     iconSizeMenuItem: 32,
     iconBottomBar: 24,
+    /** Glyph size in the floating tab bar, smaller than the side bar's so each item keeps padding above and below it. */
+    iconFloatingTabBar: 20,
     /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
     nativeTabIconDotRadius: 4,
     // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.

From 85fa13aa3a5f8c63e3b8b68660cef8bbe78b0654 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 24 Sep 2026 10:49:33 +0700
Subject: [PATCH 158/781] fix test

---
 tests/unit/DeepLinkHandlerTest.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/DeepLinkHandlerTest.tsx b/tests/unit/DeepLinkHandlerTest.tsx
index a5c74464cffe..8ac87733863a 100644
--- a/tests/unit/DeepLinkHandlerTest.tsx
+++ b/tests/unit/DeepLinkHandlerTest.tsx
@@ -182,7 +182,7 @@ describe('DeepLinkHandler', () => {
             urlChangeHandler?.({url: `new-expensify://r/${PUBLIC_ROOM_ID}`});
         });
 
-        expect(jest.mocked(openReportFromDeepLink).mock.calls.at(-1)?.[8]).toEqual({
+        expect(jest.mocked(openReportFromDeepLink).mock.calls.at(-1)?.[9]).toEqual({
             [reportNameValuePairsKey]: {private_isArchived: archivedAt},
         });
         addEventListenerSpy.mockRestore();

From 69a666ef0bea4c4a335afd005be6e65ed937548c Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 24 Sep 2026 10:43:43 +0200
Subject: [PATCH 159/781] feat: blur the focused tab scene under the Android
 tab bar

Adds a milky glass tint over a light blur.
---
 cspell.json                                   |  1 +
 .../TabBarBlurTarget/index.android.tsx        | 41 ++++++++++
 .../TabBarBlur/TabBarBlurTarget/index.tsx     | 10 +++
 .../TabBarBlur/TabBarBlurTarget/types.ts      |  8 ++
 .../TabBarBlur/TabBarBlurTargetContext.tsx    | 49 ++++++++++++
 .../TabBarBlur/index.android.tsx              | 14 +++-
 .../AppNavigator/Navigators/TabNavigator.tsx  | 77 +++++++++++--------
 src/styles/variables.ts                       |  5 +-
 8 files changed, 168 insertions(+), 37 deletions(-)
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
 create mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx

diff --git a/cspell.json b/cspell.json
index 2125b4863441..e88d52c10dca 100644
--- a/cspell.json
+++ b/cspell.json
@@ -609,6 +609,7 @@
         "devportal",
         "diems",
         "dimen",
+        "dimezis",
         "directfeeds",
         "dispatchable",
         "displaystatus",
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
new file mode 100644
index 000000000000..a870e2783ee9
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
@@ -0,0 +1,41 @@
+import {useTabBarBlurTargetActions} from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {View} from 'react-native';
+
+import {useIsFocused} from '@react-navigation/native';
+import {BlurTargetView} from 'expo-blur';
+import React, {useEffect, useRef} from 'react';
+
+import type TabBarBlurTargetProps from './types';
+
+/**
+ * Wraps a tab scene in the view the floating tab bar's blur samples from. The blur has to point at a sibling of
+ * itself, not a parent, so the scene is the target and the bar stays outside it.
+ */
+function TabBarBlurTarget({children}: TabBarBlurTargetProps) {
+    const styles = useThemeStyles();
+    const targetRef = useRef<View>(null);
+    const isFocused = useIsFocused();
+    const {setBlurTarget} = useTabBarBlurTargetActions();
+
+    useEffect(() => {
+        if (!isFocused) {
+            return;
+        }
+        setBlurTarget(targetRef);
+    }, [isFocused, setBlurTarget]);
+
+    return (
+        <BlurTargetView
+            ref={targetRef}
+            style={styles.flex1}
+            collapsable={false}
+        >
+            {children}
+        </BlurTargetView>
+    );
+}
+
+export default TabBarBlurTarget;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
new file mode 100644
index 000000000000..703f6303bce4
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
@@ -0,0 +1,10 @@
+import type TabBarBlurTargetProps from './types';
+
+/**
+ * The web bar blurs through a CSS backdrop filter, which needs no view to sample from, so the scene renders as is.
+ */
+function TabBarBlurTarget({children}: TabBarBlurTargetProps) {
+    return children;
+}
+
+export default TabBarBlurTarget;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
new file mode 100644
index 000000000000..2260a842c8a3
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
@@ -0,0 +1,8 @@
+import type React from 'react';
+
+type TabBarBlurTargetProps = {
+    /** The tab scene the floating tab bar lays over */
+    children: React.ReactNode;
+};
+
+export default TabBarBlurTargetProps;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx
new file mode 100644
index 000000000000..7006e767a9d7
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx
@@ -0,0 +1,49 @@
+import type {RefObject} from 'react';
+import type {View} from 'react-native';
+
+import React, {createContext, useContext, useState} from 'react';
+
+type BlurTarget = RefObject<View | null> | null;
+
+type TabBarBlurTargetActionsContextType = {
+    setBlurTarget: (blurTarget: BlurTarget) => void;
+};
+
+type TabBarBlurTargetContextProviderProps = {
+    children: React.ReactNode;
+};
+
+const TabBarBlurTargetStateContext = createContext<BlurTarget>(null);
+
+const TabBarBlurTargetActionsContext = createContext<TabBarBlurTargetActionsContextType>({
+    setBlurTarget: () => {},
+});
+
+/**
+ * Tells the floating tab bar which view it lays over. Each tab scene registers its own view when it gains focus,
+ * so the bar always blurs the scene the user is looking at rather than one that is mounted but hidden.
+ */
+function TabBarBlurTargetContextProvider({children}: TabBarBlurTargetContextProviderProps) {
+    const [blurTarget, setBlurTarget] = useState<BlurTarget>(null);
+
+    // Because of the React Compiler we don't need to memoize it manually
+    // eslint-disable-next-line react/jsx-no-constructed-context-values
+    const actionsContextValue = {setBlurTarget};
+
+    return (
+        <TabBarBlurTargetActionsContext.Provider value={actionsContextValue}>
+            <TabBarBlurTargetStateContext.Provider value={blurTarget}>{children}</TabBarBlurTargetStateContext.Provider>
+        </TabBarBlurTargetActionsContext.Provider>
+    );
+}
+
+function useTabBarBlurTarget(): BlurTarget {
+    return useContext(TabBarBlurTargetStateContext);
+}
+
+function useTabBarBlurTargetActions(): TabBarBlurTargetActionsContextType {
+    return useContext(TabBarBlurTargetActionsContext);
+}
+
+export default TabBarBlurTargetContextProvider;
+export {useTabBarBlurTarget, useTabBarBlurTargetActions};
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
index 895bc2c90dd8..f260e2a9ef69 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
@@ -3,21 +3,31 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
+
 import {BlurView} from 'expo-blur';
 import React from 'react';
 
+import {useTabBarBlurTarget} from './TabBarBlurTargetContext';
+
 /**
  * Blurs whatever the floating tab bar covers, so the bar reads as a glass capsule the way UIKit draws it on iOS.
- * Android has no backdrop filter of its own, so the blur comes from a native view behind the row.
+ * Android has no backdrop filter of its own, so the blur comes from a native view that samples the focused tab
+ * scene. Until a scene registers itself there is nothing to sample, and the view paints only its tint. The tints
+ * are expo-blur's white and dark grey materials, which give the milky wash UIKit's glass lays over what it blurs.
  */
 function TabBarBlur() {
     const styles = useThemeStyles();
     const theme = useTheme();
+    const blurTarget = useTabBarBlurTarget();
 
     return (
         <BlurView
             intensity={variables.floatingTabBarBlurIntensity}
-            tint={theme.colorScheme}
+            blurReductionFactor={variables.floatingTabBarBlurReductionFactor}
+            blurMethod={blurTarget ? 'dimezisBlurViewSdk31Plus' : 'none'}
+            blurTarget={blurTarget ?? undefined}
+            tint={theme.colorScheme === CONST.COLOR_SCHEME.DARK ? 'systemThinMaterialDark' : 'systemChromeMaterialLight'}
             style={styles.navigationTabBarBlur}
         />
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index 3a1ffb8b3186..372b7fa4f939 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -1,3 +1,6 @@
+import TabBarBlurTarget from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget';
+import TabBarBlurTargetContextProvider from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext';
+
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 
@@ -11,8 +14,8 @@ import SCREENS from '@src/SCREENS';
 /**
  * Tab Navigator containing Home, Inbox (Reports), Search, Insights, Settings, and Workspaces pages.
  */
-import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
-import type {NavigationAction, Router, TabNavigationState} from '@react-navigation/native';
+import type {BottomTabBarProps, BottomTabNavigationOptions, BottomTabNavigationProp} from '@react-navigation/bottom-tabs';
+import type {NavigationAction, ParamListBase, Router, ScreenLayoutArgs, TabNavigationState} from '@react-navigation/native';
 
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
@@ -25,6 +28,10 @@ import {HomePageScreen, InsightsPageScreen, ReportsSplitNavigatorScreen, Setting
 
 const renderTabBar = ({state}: BottomTabBarProps) => <TabNavigatorBar state={state} />;
 
+const renderTabScreenLayout = (args: ScreenLayoutArgs<ParamListBase, string, BottomTabNavigationOptions, BottomTabNavigationProp<ParamListBase>>) => (
+    <TabBarBlurTarget>{bottomTabScreenLayoutWrapper(args)}</TabBarBlurTarget>
+);
+
 const Tab = createBottomTabNavigator<TabNavigatorParamList>();
 
 /**
@@ -89,38 +96,40 @@ function TabNavigator() {
     };
 
     return (
-        <Tab.Navigator
-            backBehavior="fullHistory"
-            tabBar={renderTabBar}
-            screenOptions={screenOptions}
-            screenLayout={bottomTabScreenLayoutWrapper}
-            UNSTABLE_router={tabRouterOverride}
-        >
-            <Tab.Screen
-                name={SCREENS.HOME}
-                component={HomePageScreen}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
-                component={ReportsSplitNavigatorScreen}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
-                component={SearchFullscreenNavigator}
-            />
-            <Tab.Screen
-                name={SCREENS.INSIGHTS}
-                component={InsightsPageScreen}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
-                component={SettingsSplitNavigatorScreen}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
-                component={WorkspaceNavigatorScreen}
-            />
-        </Tab.Navigator>
+        <TabBarBlurTargetContextProvider>
+            <Tab.Navigator
+                backBehavior="fullHistory"
+                tabBar={renderTabBar}
+                screenOptions={screenOptions}
+                screenLayout={renderTabScreenLayout}
+                UNSTABLE_router={tabRouterOverride}
+            >
+                <Tab.Screen
+                    name={SCREENS.HOME}
+                    component={HomePageScreen}
+                />
+                <Tab.Screen
+                    name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
+                    component={ReportsSplitNavigatorScreen}
+                />
+                <Tab.Screen
+                    name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
+                    component={SearchFullscreenNavigator}
+                />
+                <Tab.Screen
+                    name={SCREENS.INSIGHTS}
+                    component={InsightsPageScreen}
+                />
+                <Tab.Screen
+                    name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
+                    component={SettingsSplitNavigatorScreen}
+                />
+                <Tab.Screen
+                    name={NAVIGATORS.WORKSPACE_NAVIGATOR}
+                    component={WorkspaceNavigatorScreen}
+                />
+            </Tab.Navigator>
+        </TabBarBlurTargetContextProvider>
     );
 }
 
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index b09479591c19..4d037198bb8d 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -43,7 +43,10 @@ export default {
     // Blur the bar lays over what it covers. The web radius is a CSS blur; the Android one is expo-blur's own
     // 0 to 100 intensity, which is not the same unit, so the two are tuned to match rather than shared.
     floatingTabBarBlurRadius: 24,
-    floatingTabBarBlurIntensity: 65,
+    floatingTabBarBlurIntensity: 60,
+    // expo-blur on Android derives its radius as intensity / factor, so this puts the radius at 5, soft enough that
+    // shapes and colors under the bar still show through, without changing the tint the intensity sets.
+    floatingTabBarBlurReductionFactor: 12,
     // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
     floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).

From d2fa37463b82da404b137f01423f94726a7342fe Mon Sep 17 00:00:00 2001
From: "Nyoman Jyotisa (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 25 Sep 2026 03:59:24 +0000
Subject: [PATCH 160/781] Keep ReconnectApp incremental for signed-in users on
 the RECONNECT_APP Pusher event

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>
---
 src/libs/actions/User.ts  | 14 ++++++--------
 tests/actions/UserTest.ts | 27 ++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index c1adf3529dda..f38146dc13ca 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -910,14 +910,12 @@ function subscribeToUserEvents(
     // We have an event to reconnect the App. It is triggered when we detect that the user passed updateID
     // is not in the DB
     PusherUtils.subscribeToMultiEvent(Pusher.TYPE.MULTIPLE_EVENT_TYPE.RECONNECT_APP, () => {
-        // Anonymous public-room sessions already have report actions from OpenReport. A full ReconnectApp
-        // uses setCollection and clears them, which flashes the loading skeleton until GetNewerActions
-        // refills. Pass lastUpdateID so reconnect stays incremental for anonymous users (#97847).
-        if (isAnonymousUser()) {
-            reconnectApp(lastUpdateIDAppliedToClient);
-        } else {
-            reconnectApp();
-        }
+        // This event is broadcast on the account-wide channel, so every signed-in device receives it, not only
+        // the one whose updateID is missing. A full ReconnectApp uses setCollection and clears report actions the
+        // device already holds (#97847, #100791). Pass lastUpdateID so the server can reply incrementally; it
+        // still returns full data when it can't serve that range, and we fall back to a full reconnect when the
+        // client has no lastUpdateID yet.
+        reconnectApp(lastUpdateIDAppliedToClient);
         return Promise.resolve();
     });
 }
diff --git a/tests/actions/UserTest.ts b/tests/actions/UserTest.ts
index 68f64b35f4f8..8f60345a9ee2 100644
--- a/tests/actions/UserTest.ts
+++ b/tests/actions/UserTest.ts
@@ -1081,18 +1081,39 @@ describe('actions/User', () => {
             expect(reconnectAppMock).toHaveBeenCalledWith(lastUpdateID);
         });
 
-        it('calls reconnectApp without updateIDFrom for authenticated users', async () => {
+        it('passes lastUpdateIDAppliedToClient when reconnecting as an authenticated user', async () => {
+            // Given a signed-in device that has already applied updates up to a known ID
+            const lastUpdateID = 42;
+            await Onyx.merge(ONYXKEYS.SESSION, {authTokenType: undefined, accountID: 1, authToken: 'token'});
+            await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, lastUpdateID);
+            await waitForBatchedUpdates();
+
+            UserActions.subscribeToUserEvents(1, 'test@test.com', () => {}, formatPhoneNumber, undefined);
+            await waitForBatchedUpdates();
+
+            // When the account-wide RECONNECT_APP event arrives (for example, because another device signed in)
+            await PusherUtils.triggerMultiEventHandler(Pusher.TYPE.MULTIPLE_EVENT_TYPE.RECONNECT_APP, []);
+            await waitForBatchedUpdates();
+
+            // Then the reconnect is incremental, so a full ReconnectApp doesn't wipe report actions this device already has
+            expect(reconnectAppMock).toHaveBeenCalledWith(lastUpdateID);
+        });
+
+        it('falls back to a full reconnect when the client has no lastUpdateIDAppliedToClient', async () => {
+            // Given a signed-in device that has not applied any updates yet
             await Onyx.merge(ONYXKEYS.SESSION, {authTokenType: undefined, accountID: 1, authToken: 'token'});
-            await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 42);
+            await Onyx.set(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, null);
             await waitForBatchedUpdates();
 
             UserActions.subscribeToUserEvents(1, 'test@test.com', () => {}, formatPhoneNumber, undefined);
             await waitForBatchedUpdates();
 
+            // When the RECONNECT_APP event arrives
             await PusherUtils.triggerMultiEventHandler(Pusher.TYPE.MULTIPLE_EVENT_TYPE.RECONNECT_APP, []);
             await waitForBatchedUpdates();
 
-            expect(reconnectAppMock).toHaveBeenCalledWith();
+            // Then no updateIDFrom is passed, so reconnectApp still does a full reconnect to recover
+            expect(reconnectAppMock).toHaveBeenCalledWith(undefined);
         });
     });
 });

From 3934be63ac606bc78261ef08f22754f92504eda6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 25 Sep 2026 10:24:37 +0430
Subject: [PATCH 161/781] Fix copying non-selectable expense field labels

---
 src/components/MenuItem/MenuItem.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 7c12cc00ec80..a500c21e9de5 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -665,6 +665,7 @@ function MenuItem({
                     <Text
                         style={descriptionTextStyles}
                         numberOfLines={numberOfLinesDescription}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: isTitleSelectable}}
                     >
                         {description}
                     </Text>

From 14d1cc916984a3455b2422e9014632295a3c2f29 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 25 Sep 2026 10:47:54 +0430
Subject: [PATCH 162/781] Restore shared HTML detection for MenuItem titles

---
 src/components/MenuItem/MenuItem.tsx |  2 +-
 tests/ui/components/MenuItemTest.tsx | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index a500c21e9de5..4db8743fe852 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -688,7 +688,7 @@ function MenuItem({
         return Parser.replace(helperText, {shouldEscapeText});
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
-    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && /<[^>]+>/.test(title);
+    const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.isHTML(title);
     const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform() === CONST.PLATFORM.WEB;
 
     const processedTitle = useMemo(() => {
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index ea714260e595..b3343d88ecae 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -64,23 +64,6 @@ describe('MenuItem', () => {
         expect(mockRenderHTML).toHaveBeenCalledWith(expect.objectContaining({isSelectable: true}));
     });
 
-    it('renders an entity-only HTML title as plain text on web', () => {
-        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
-
-        render(
-            <Wrapper>
-                <MenuItem
-                    title="A &amp; B"
-                    shouldRenderAsHTML
-                    isTitleSelectable
-                />
-            </Wrapper>,
-        );
-
-        expect(screen.getByText(/A & B/)).toBeOnTheScreen();
-        expect(mockRenderHTML).not.toHaveBeenCalled();
-    });
-
     it('does not override HTML title selection when the title is not selectable', () => {
         mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
 

From 0154b5e3aff742aa21926fad7a4de141cfc25f2c Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 25 Sep 2026 14:57:58 +0700
Subject: [PATCH 163/781] fix(search): apply merchant conditions to all clauses

---
 src/languages/de.ts                       |   2 +-
 src/languages/el.ts                       |   2 +-
 src/languages/en.ts                       |   2 +-
 src/languages/es.ts                       |   2 +-
 src/languages/fr.ts                       |   2 +-
 src/languages/it.ts                       |   2 +-
 src/languages/ja.ts                       |   2 +-
 src/languages/nl.ts                       |   2 +-
 src/languages/pl.ts                       |   2 +-
 src/languages/pt-BR.ts                    |   2 +-
 src/languages/zh-hans.ts                  |   2 +-
 src/libs/SearchQueryUtils.ts              |  53 +++++-----
 tests/ui/MerchantFilterContentTest.tsx    |  26 +++++
 tests/ui/MerchantFilterPopupTest.tsx      |  15 +++
 tests/unit/Search/SearchQueryUtilsTest.ts | 116 +++++++++++++++++++++-
 15 files changed, 196 insertions(+), 36 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 33466b29dbdb..709429244656 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9564,7 +9564,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
-            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Exakte Übereinstimmungen'},
+            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Gleich'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 96f033f9b1fa..5959c97214c7 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9773,7 +9773,7 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
-            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ακριβής αντιστοιχία'},
+            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ίσο με'},
         },
         display: {
             label: 'Εμφάνιση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index fcb9441fbefa..771185896734 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9651,7 +9651,7 @@ const translations = {
             merchant: {
                 matchType: 'Match type',
                 contains: 'Contains',
-                exactMatch: 'Exactly matches',
+                exactMatch: 'Equal to',
             },
             card: {
                 expensify: 'Expensify',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 4b1a8386c2b4..b385a5599e7d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9432,7 +9432,7 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
-            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Coincide exactamente'},
+            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Igual a'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 42b4b87e7f1a..9058e8d18fd3 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9585,7 +9585,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
-            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Correspond exactement'},
+            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Égal à'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3ac7079b3f30..d6fb36e55a89 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9523,7 +9523,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
-            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Corrisponde esattamente'},
+            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Uguale a'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5d93409e4d53..f634d6a2893d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9401,7 +9401,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
-            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '完全一致'},
+            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '等しい'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b733f0e36e2f..e9bf9bec0627 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9490,7 +9490,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
-            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Komt exact overeen'},
+            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Gelijk aan'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3141649aa4fc..3d138ddc3040 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9514,7 +9514,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
-            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Dokładne dopasowanie'},
+            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Równe'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ddc68dc45fc6..c149f7091ef1 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9490,7 +9490,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
-            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Corresponde exatamente'},
+            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Igual a'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index dd8d8557afc1..c652b829b07d 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9154,7 +9154,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
-            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '完全匹配'},
+            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '等于'},
         },
         display: {
             label: '显示',
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index ba2c71e55ba0..be06d115d5da 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -983,16 +983,18 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
-    const merchantFilters =
-        options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
-    const lastMerchantFilter = merchantFilters.at(-1);
-    const isMerchantValueUnchanged = supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
-    // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
-    const shouldPreserveMerchantFilters =
-        merchantFilters.length > 0 &&
-        isMerchantValueUnchanged &&
-        getMerchantOperator(merchantOperator) ===
-            (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
+    const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const wasMerchantNegated = negativeMerchantFilters.length > 0;
+    const isMerchantNegated = !!supportedFilterValues.merchantNot;
+    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
+    const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+        ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+        : DEFAULT_MERCHANT_OPERATOR;
+    const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1052,22 +1054,27 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
-                    if (filterKey === FILTER_KEYS.MERCHANT && !isNegated) {
-                        if (shouldPreserveMerchantFilters) {
-                            return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
-                        }
-
+                    if (filterKey === FILTER_KEYS.MERCHANT) {
+                        const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
+                        const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
+                        const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
                         if (lastMerchantFilter && isMerchantValueUnchanged) {
-                            // The form string cannot distinguish a list from a Merchant name containing a comma.
-                            const updatedOperator = getMerchantOperator(merchantOperator);
-                            const updatedFilters = lastMerchantFilter.filters.map((filter) => ({...filter, operator: updatedOperator}));
-                            return buildFilterValuesString(FILTER_KEYS.MERCHANT, updatedFilters).trim();
+                            const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
+                            const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
+                            const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
+                            // The single field cannot represent every clause or distinguish lists from names containing commas.
+                            const merchantClauses = filtersToUpdate.map((filter) => {
+                                const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
+                                return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
+                            });
+                            // Different operators can become identical clauses after the change.
+                            return [...new Set(merchantClauses)].join(' ');
                         }
 
-                        operator =
-                            getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-                                ? EXPLICIT_EQUAL_TO_OPERATOR
-                                : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+                        if (!isNegated) {
+                            operator =
+                                selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+                        }
                     }
                     return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
index fb56e7b1a4a9..7075546bdf11 100644
--- a/tests/ui/MerchantFilterContentTest.tsx
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -89,6 +89,32 @@ describe('MerchantFilterContent', () => {
         });
     });
 
+    it('retains the value when changing a stored negative filter back to positive', () => {
+        const onChange = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="Prime"
+                    isNegated
+                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        );
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
+        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Prime',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides match type controls and uses exact matching when the filter is negated', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
index a69b136114c6..51fe742adab5 100644
--- a/tests/ui/MerchantFilterPopupTest.tsx
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -87,6 +87,21 @@ describe('MerchantFilterPopup', () => {
         });
     });
 
+    it('retains the value when changing a stored negative filter back to positive', () => {
+        const {updateFilterForm} = renderMerchantPopup(true, {merchant: undefined, merchantNot: 'Prime', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
+        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Prime',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides the match type and submits exact matching for a negated Merchant', () => {
         const {updateFilterForm} = renderMerchantPopup();
 
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 8f89c8466fa6..65a25d484f4d 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -487,6 +487,32 @@ describe('SearchQueryUtils', () => {
             expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
+        test('preserves multiple merchant clauses when the form value is unchanged', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense merchant*:Amazon merchant*:Uber');
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues, {flatFilters: queryJSON?.flatFilters});
+
+            expect(result).toEqual('type:expense merchant*:Amazon merchant*:Uber');
+        });
+
+        test('applies a changed merchant operator to every merchant clause', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense merchant*:Amazon merchant*:Uber');
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues, {flatFilters: queryJSON?.flatFilters});
+
+            expect(result).toEqual('type:expense merchant=Amazon merchant=Uber');
+        });
+
         test('currencies and categories', () => {
             const filterValues: Partial<SearchAdvancedFiltersForm> = {
                 type: 'expense',
@@ -2862,6 +2888,9 @@ describe('SearchQueryUtils', () => {
                 'merchant=I',
                 'merchant*:I',
                 '-merchant:I',
+                '-merchant:Amazon -merchant:Prime',
+                '-merchant:Amazon,Prime',
+                '-merchant:"Coffee, Shop",Uber',
             ])('preserves Merchant predicates when changing Currency: %s', (input) => {
                 const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
 
@@ -2894,14 +2923,97 @@ describe('SearchQueryUtils', () => {
                 {input: 'merchant="I,Ig"', operator: 'contains', expectedValue: 'I,Ig'},
                 {input: 'merchant*:"Coffee, Shop",Uber', operator: 'eq', expectedValue: ['Coffee, Shop', 'Uber']},
                 {input: 'merchant="Coffee, Shop",Uber', operator: 'contains', expectedValue: ['Coffee, Shop', 'Uber']},
-                {input: 'merchant=I merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
-                {input: 'merchant*:I merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
             ])('preserves Merchant values when changing only the match type: %j', ({input, operator, expectedValue}) => {
                 const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
 
                 expect(updatedQuery.filters).toEqual({operator, left: 'merchant', right: expectedValue});
             });
 
+            test.each<{input: string; operator: MerchantMatchType}>([
+                {input: 'merchant=I merchant*:I,Ig', operator: 'eq'},
+                {input: 'merchant*:I merchant=I,Ig', operator: 'contains'},
+            ])('applies a changed match type to every Merchant predicate: %j', ({input, operator}) => {
+                const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual([
+                    {key: 'merchant', filters: [{operator, value: 'I'}]},
+                    {
+                        key: 'merchant',
+                        filters: [
+                            {operator, value: 'I'},
+                            {operator, value: 'Ig'},
+                        ],
+                    },
+                ]);
+            });
+
+            test.each([
+                'merchant:Amazon merchant:Prime',
+                'merchant=Amazon merchant=Prime',
+                'merchant=Amazon merchant*:Prime',
+                'merchant:Amazon,Prime',
+                'merchant:"Coffee, Shop",Uber merchant:Prime',
+            ])('applies negation to every original Merchant value: %s', (input) => {
+                const originalQuery = buildSearchQueryJSON(input);
+                if (!originalQuery) {
+                    throw new Error('Invalid test query');
+                }
+                const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                const {updatedQuery} = updateQuery(input, {
+                    merchant: undefined,
+                    merchantNot: form.merchantNot ?? form.merchant,
+                    merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                });
+
+                expect(updatedQuery.flatFilters).toEqual(
+                    originalQuery?.flatFilters.map((filter) => ({
+                        ...filter,
+                        filters: filter.filters.map((item) => ({...item, operator: 'neq'})),
+                    })),
+                );
+            });
+
+            test.each(['-merchant:Amazon -merchant:Prime', '-merchant:Amazon,Prime', '-merchant:"Coffee, Shop",Uber -merchant:Prime', 'merchant:Amazon -merchant:Prime'])(
+                'applies positive matching to every original Merchant value: %s',
+                (input) => {
+                    const originalQuery = buildSearchQueryJSON(input);
+                    if (!originalQuery) {
+                        throw new Error('Invalid test query');
+                    }
+                    const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                    const {updatedQuery} = updateQuery(input, {
+                        merchant: form.merchantNot,
+                        merchantNot: undefined,
+                        merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                    });
+
+                    expect(updatedQuery.flatFilters).toEqual(
+                        originalQuery?.flatFilters.map((filter) => ({
+                            ...filter,
+                            filters: filter.filters.map((item) => ({...item, operator: 'eq'})),
+                        })),
+                    );
+                },
+            );
+
+            test.each(['merchant:Amazon merchant:Prime', '-merchant:Amazon -merchant:Prime', 'merchant=Amazon -merchant:Prime'])(
+                'removes every Merchant predicate without changing other filters: %s',
+                (input) => {
+                    const {updatedQuery} = updateQuery(`type:expense description:Lunch ${input}`, {merchant: undefined, merchantNot: undefined});
+
+                    expect(updatedQuery.type).toBe('expense');
+                    expect(updatedQuery.flatFilters).toEqual([{key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]}]);
+                },
+            );
+
+            test('preserves both Merchant values through negation and match type round trips', () => {
+                const negative = updateQuery('merchant:Amazon merchant:Prime', {merchant: undefined, merchantNot: 'Prime', merchantOperator: 'eq'});
+                const positive = updateQuery(buildSearchQueryString(negative.updatedQuery), {merchant: 'Prime', merchantNot: undefined, merchantOperator: 'eq'});
+                const contains = updateQuery(buildSearchQueryString(positive.updatedQuery), {merchantOperator: 'contains'});
+
+                expect(contains.updatedQuery.filters).toEqual(negative.originalQuery.filters);
+            });
+
             test('keeps a Merchant list through successive match type and Currency changes without mutating the original query', () => {
                 const {originalQuery, updatedQuery} = updateQuery('merchant*:I,Ig', {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
                 const currencyUpdate = updateQuery(buildSearchQueryString(updatedQuery), {currency: ['USD']});

From 7286210b67c8625ac3c6750a2078c4b45386b1f2 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 26 Sep 2026 12:19:01 +0430
Subject: [PATCH 164/781] Fix selection of non-copyable content in selectable
 rows

---
 src/components/DotIndicatorMessage.tsx        | 17 ++++++++--
 src/components/FormHelpMessage.tsx            | 11 +++++--
 src/components/MenuItem/MenuItem.tsx          |  2 ++
 .../ReportActionItem/MoneyRequestView.tsx     | 32 +++++++++++--------
 .../ListItem/ExpenseReportListItem.tsx        | 10 ++++--
 .../ExpenseReportListItemRowWide.tsx          |  5 ++-
 .../SearchList/ListItem/GroupHeader.tsx       |  5 ++-
 .../ListItem/ReportListItemHeader.tsx         |  5 ++-
 .../ListItem/UserInfoAndActionButtonRow.tsx   |  4 +--
 .../SearchList/ListItem/UserInfoCell.tsx      |  5 ++-
 .../ListItem/UserInfoCellsWithArrow.tsx       |  2 ++
 .../DataCells/ChatBubbleCell.tsx              | 14 +++++++-
 .../TransactionItemRowRBR.tsx                 |  1 +
 .../TransactionItemRowWide.tsx                |  1 +
 14 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/src/components/DotIndicatorMessage.tsx b/src/components/DotIndicatorMessage.tsx
index f030ad47a61c..51f2946c6611 100644
--- a/src/components/DotIndicatorMessage.tsx
+++ b/src/components/DotIndicatorMessage.tsx
@@ -77,6 +77,8 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectab
     const receiptError = uniqueMessages.find(isReceiptError);
 
     const isTextSelectable = isSelectable ?? (!canUseTouchScreen() || !shouldUseNarrowLayout);
+    const selectionDataSet = isTextSelectable ? undefined : {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true};
+    const receiptSelectionDataSet = isSelectable === false ? selectionDataSet : undefined;
 
     const renderMessage = (message: string | ReceiptError | ReactElement, index: number) => {
         if (isReceiptError(message)) {
@@ -159,14 +161,20 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectab
         );
         if (!isStackedLayout) {
             return (
-                <View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, style]}>
+                <View
+                    style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, style]}
+                    dataSet={receiptSelectionDataSet}
+                >
                     {messageRow}
                     {buttonsRow}
                 </View>
             );
         }
         return (
-            <View style={style}>
+            <View
+                style={style}
+                dataSet={receiptSelectionDataSet}
+            >
                 {messageRow}
                 <View style={styles.mt3}>{buttonsRow}</View>
             </View>
@@ -174,7 +182,10 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectab
     }
 
     return (
-        <View style={[styles.dotIndicatorMessage, style]}>
+        <View
+            style={[styles.dotIndicatorMessage, style]}
+            dataSet={selectionDataSet}
+        >
             <View
                 style={styles.offlineFeedbackErrorDot}
                 accessible={isErrorMessage}
diff --git a/src/components/FormHelpMessage.tsx b/src/components/FormHelpMessage.tsx
index aa5cbf3ca176..8ceca1e130cb 100644
--- a/src/components/FormHelpMessage.tsx
+++ b/src/components/FormHelpMessage.tsx
@@ -8,7 +8,7 @@ import Parser from '@libs/Parser';
 
 import CONST from '@src/CONST';
 
-import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {StyleProp, TextStyle, ViewProps, ViewStyle} from 'react-native';
 
 import isEmpty from 'lodash/isEmpty';
 import React, {useContext, useMemo} from 'react';
@@ -35,6 +35,9 @@ type FormHelpMessageProps = {
     /** Message text style props */
     messageStyle?: StyleProp<TextStyle>;
 
+    /** Data attributes applied to the message container. */
+    dataSet?: ViewProps['dataSet'];
+
     /** Whether to show dot indicator */
     shouldShowRedDotIndicator?: boolean;
 
@@ -59,6 +62,7 @@ function FormHelpMessage({
     isError = true,
     style,
     messageStyle,
+    dataSet,
     shouldShowRedDotIndicator = true,
     shouldRenderMessageAsHTML = false,
     isInfo = false,
@@ -119,7 +123,10 @@ function FormHelpMessage({
     }
 
     return (
-        <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.mb1, style]}>
+        <View
+            style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.mb1, style]}
+            dataSet={dataSet}
+        >
             {isError && shouldShowRedDotIndicator && (
                 <View
                     accessible
diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 4db8743fe852..797827bddd09 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -1249,6 +1249,7 @@ function MenuItem({
                                                 shouldShowRedDotIndicator={!!shouldShowRedDotIndicator}
                                                 message={errorText}
                                                 style={[styles.menuItemError, errorTextStyle]}
+                                                dataSet={isTitleSelectable ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
                                                 shouldRenderMessageAsHTML={shouldRenderErrorAsHTML}
                                             />
                                         )}
@@ -1259,6 +1260,7 @@ function MenuItem({
                                                 message={hintText}
                                                 style={styles.menuItemError}
                                                 messageStyle={hintTextStyle}
+                                                dataSet={isTitleSelectable ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
                                                 shouldRenderMessageAsHTML={shouldRenderHintAsHTML}
                                             />
                                         )}
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 63b137a6844d..60af4714ec8d 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1235,7 +1235,10 @@ function MoneyRequestView({
                     />
                 )}
                 {isCustomUnitOutOfPolicy && isPerDiemRequest && (
-                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.mh4, styles.mb2, styles.userSelectNone]}>
+                    <View
+                        style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.mh4, styles.mb2, styles.userSelectNone]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                    >
                         <Icon
                             src={icons.DotIndicator}
                             fill={theme.danger}
@@ -1641,22 +1644,25 @@ function MoneyRequestView({
                                 accessible={false}
                                 aria-hidden
                                 style={styles.userSelectNone}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {translate('common.billable')}
                             </Text>
                             {!!getErrorForField('billable') && (
-                                <ViolationMessages
-                                    violations={getViolationsForField('billable')}
-                                    containerStyle={[styles.mt1, styles.userSelectNone]}
-                                    textStyle={[styles.ph0]}
-                                    isLast
-                                    isMarkAsCash={isMarkAsCash}
-                                    canEdit={canEdit}
-                                    companyCardPageURL={companyCardPageURL}
-                                    connectionLink={connectionLink}
-                                    routeDistanceMeters={transaction?.comment?.customUnit?.routeDistanceMeters}
-                                    distanceUnit={transaction?.comment?.customUnit?.distanceUnit}
-                                />
+                                <View dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}>
+                                    <ViolationMessages
+                                        violations={getViolationsForField('billable')}
+                                        containerStyle={[styles.mt1, styles.userSelectNone]}
+                                        textStyle={[styles.ph0]}
+                                        isLast
+                                        isMarkAsCash={isMarkAsCash}
+                                        canEdit={canEdit}
+                                        companyCardPageURL={companyCardPageURL}
+                                        connectionLink={connectionLink}
+                                        routeDistanceMeters={transaction?.comment?.customUnit?.routeDistanceMeters}
+                                        distanceUnit={transaction?.comment?.customUnit?.distanceUnit}
+                                    />
+                                </View>
                             )}
                         </View>
                         <Switch
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
index a5992408c117..589efb023cbc 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
@@ -429,7 +429,10 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
     const getDescription = useMemo(() => {
         if (reportItem?.isRejectedReport) {
             return (
-                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}>
+                <View
+                    style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                >
                     <Icon
                         src={expensifyIcons.DotIndicator}
                         fill={theme.danger}
@@ -445,7 +448,10 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
             return;
         }
         return (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}>
+            <View
+                style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.userSelectNone]}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
                 <Icon
                     src={expensifyIcons.DotIndicator}
                     fill={theme.danger}
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
index 4eb329529aa1..d56f31ddd0a0 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
@@ -274,7 +274,10 @@ function ExpenseReportListItemRowWide({
             </View>
         ),
         [CONST.SEARCH.TABLE_COLUMNS.ACTION]: (
-            <View style={[getSearchColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
+            <View
+                style={[getSearchColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
                 <ReportSubmitToPopoverMeasurableAnchor wrapperStyle={styles.w100}>
                     <DeferredActionCell
                         action={item.action}
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index 04eabc350e3b..535a015ce6d4 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -329,7 +329,10 @@ function GroupHeader({
     };
 
     const subHeaderContent = (
-        <View style={[styles.flexColumn, styles.flex1]}>
+        <View
+            style={[styles.flexColumn, styles.flex1, styles.userSelectNone]}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+        >
             <View style={[styles.searchListHeaderContainerStyle, styles.groupSearchListTableContainerStyle, styles.bgTransparent, styles.pl8]}>
                 <SearchTableHeader
                     canSelectMultiple
diff --git a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
index 45972b062cf0..ee1a2b55618d 100644
--- a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
@@ -205,7 +205,10 @@ function HeaderFirstRow<TItem extends ListItem>({
                 )}
             </View>
             {isLargeScreenWidth && (
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
+                <View
+                    style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                >
                     <ActionCell
                         action={reportItem.action}
                         onButtonPress={handleOnButtonPress}
diff --git a/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx b/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
index e30750eca152..c60c19fff292 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoAndActionButtonRow.tsx
@@ -68,8 +68,8 @@ function UserInfoAndActionButtonRow({
             )}
             {!!statusText && !!reportStatusColorStyle && (
                 <View
-                    style={shouldAllowStatusTextSelection ? styles.userSelectText : undefined}
-                    dataSet={shouldAllowStatusTextSelection ? COPYABLE_TEXT_DATA_SET : undefined}
+                    style={shouldAllowStatusTextSelection ? styles.userSelectText : styles.userSelectNone}
+                    dataSet={shouldAllowStatusTextSelection ? COPYABLE_TEXT_DATA_SET : {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 >
                     <StatusBadge
                         text={statusText}
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
index 861d50de6734..ec1786566948 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCell.tsx
@@ -36,7 +36,10 @@ function UserInfoCell({avatar, accountID, displayName, avatarSize, containerStyl
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, containerStyle]}>
-            <View style={styles.userSelectNone}>
+            <View
+                style={styles.userSelectNone}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
                 <UserAvatar
                     imageStyles={styles.alignSelfCenter}
                     size={avatarSize ?? CONST.AVATAR_SIZE.XXX_SMALL}
diff --git a/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx b/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
index f0995613543a..abf59b483ca1 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
@@ -9,6 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import type {AvatarSizeName} from '@styles/utils';
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import type {PersonalDetails} from '@src/types/onyx';
 
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
@@ -80,6 +81,7 @@ function UserInfoCellsWithArrow({
                         <Text
                             testID="UserInfoToIndicator"
                             style={[styles.mutedNormalTextLabel]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {translate('common.conjunctionTo')}
                         </Text>
diff --git a/src/components/TransactionItemRow/DataCells/ChatBubbleCell.tsx b/src/components/TransactionItemRow/DataCells/ChatBubbleCell.tsx
index ebfbf5129ed6..9a5a9046a8f1 100644
--- a/src/components/TransactionItemRow/DataCells/ChatBubbleCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/ChatBubbleCell.tsx
@@ -14,6 +14,7 @@ import {isChatThread} from '@libs/ReportUtils';
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report, ReportAction, ReportActions} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
@@ -61,7 +62,18 @@ function ChatBubbleCell({transaction, containerStyles, isInSingleTransactionRepo
 
     return (
         threadMessages.count > 0 && (
-            <View style={[styles.dFlex, styles.alignItemsCenter, styles.justifyContentCenter, styles.textAlignCenter, StyleUtils.getWidthAndHeightStyle(iconSize), containerStyles]}>
+            <View
+                style={[
+                    styles.dFlex,
+                    styles.alignItemsCenter,
+                    styles.justifyContentCenter,
+                    styles.textAlignCenter,
+                    styles.userSelectNone,
+                    StyleUtils.getWidthAndHeightStyle(iconSize),
+                    containerStyles,
+                ]}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
                 <Icon
                     src={icons.ChatBubbleCounter}
                     additionalStyles={[styles.pAbsolute]}
diff --git a/src/components/TransactionItemRow/TransactionItemRowRBR.tsx b/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
index c84fad77d702..fa9114543d02 100644
--- a/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowRBR.tsx
@@ -93,6 +93,7 @@ function TransactionItemRowRBRInner({transaction, violations, report, containerS
             <View
                 style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.userSelectNone, containerStyles]}
                 testID="TransactionItemRowRBR"
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 <Icon
                     src={icons.DotIndicator}
diff --git a/src/components/TransactionItemRow/TransactionItemRowWide.tsx b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
index 6a3ce6111bd2..8c373a607527 100644
--- a/src/components/TransactionItemRow/TransactionItemRowWide.tsx
+++ b/src/components/TransactionItemRow/TransactionItemRowWide.tsx
@@ -370,6 +370,7 @@ function TransactionItemRowWide({
                     <View
                         key={column}
                         style={[getSearchColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION, {isActionColumnWide: isActionColumnWideProp ?? isDeletedTransaction})]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                     >
                         {!!transactionItem.action && (
                             <DeferredActionCell

From 72db953ab21bbcda4f1844039ba745dc2d283746 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 26 Sep 2026 12:31:49 +0430
Subject: [PATCH 165/781] Fix mobile expense row status  selection

---
 .../ListItem/TransactionListItem/TransactionListItemNarrow.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index d0dccf111227..d9b6bdbab509 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -185,6 +185,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                             stateNum={transactionItem.report?.stateNum}
                             statusNum={transactionItem.report?.statusNum}
                             isSelected={isSelected}
+                            shouldAllowStatusTextSelection
                         />
                         <TransactionItemRow
                             transactionItem={transactionItem}

From 31630f8b24f2ff911ae11514fe78baa6ff92f3a7 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 26 Sep 2026 21:20:14 +0700
Subject: [PATCH 166/781] fix(search): address merchant filter review feedback

- Localize the Merchant pill by passing the value into the contains/equalTo translations
- Rename the exactMatch translation key to equalTo
- Render MerchantFilterContent from the chip popup, keeping its Apply Sentry label and spacing
- Stop saving an unused operator for negated Merchant filters
- Align the Merchant advanced filter branch with the other branches and remount it when the operator changes
- Revert the no-op TextFilterPopup input extraction
- Define the Merchant query builder variables where they are used
- Merge and trim redundant Merchant tests
---
 .../AdvancedFilters/MerchantFilterContent.tsx |  13 +-
 .../SearchAdvancedFiltersContent.tsx          |   8 +-
 .../MerchantMatchTypeSelector.tsx             |   2 +-
 .../FilterDropdowns/MerchantFilterPopup.tsx   |  77 ++-----
 .../FilterDropdowns/TextFilterPopup.tsx       |  23 +-
 src/languages/de.ts                           |   6 +-
 src/languages/el.ts                           |   6 +-
 src/languages/en.ts                           |   4 +-
 src/languages/es.ts                           |   6 +-
 src/languages/fr.ts                           |   6 +-
 src/languages/it.ts                           |   6 +-
 src/languages/ja.ts                           |   6 +-
 src/languages/nl.ts                           |   6 +-
 src/languages/pl.ts                           |   6 +-
 src/languages/pt-BR.ts                        |   6 +-
 src/languages/zh-hans.ts                      |   6 +-
 src/libs/SearchQueryUtils.ts                  |  24 +--
 src/libs/SearchUIUtils.ts                     |   9 +-
 tests/ui/MerchantFilterContentTest.tsx        | 118 ++++-------
 tests/ui/MerchantFilterPopupTest.tsx          | 120 ++---------
 tests/ui/TextInputFilterContentTest.tsx       |  42 ----
 tests/unit/Search/SearchQueryUtilsTest.ts     | 200 +++++-------------
 tests/unit/Search/SearchUIUtilsTest.ts        |  51 ++---
 23 files changed, 260 insertions(+), 491 deletions(-)
 delete mode 100644 tests/ui/TextInputFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
index 5cbff1dc5540..3a646817e684 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -43,12 +43,18 @@ type MerchantFilterContentProps = {
     /** The label used when the filter applies immediately. */
     buttonText?: string;
 
+    /** The Sentry label for the confirmation button. */
+    sentryLabel?: string;
+
     /** Whether the input should receive focus automatically. */
     autoFocus?: boolean;
 
     /** Additional styles for the filter content. */
     style?: StyleProp<ViewStyle>;
 
+    /** Additional styles for the confirmation button. */
+    buttonStyles?: StyleProp<ViewStyle>;
+
     /** Called with the updated Merchant filter form values. */
     onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
 };
@@ -64,8 +70,10 @@ function MerchantFilterContent({
     merchantOperator: initialMerchantOperator,
     buttonSize,
     buttonText,
+    sentryLabel,
     autoFocus,
     style,
+    buttonStyles,
     onChange,
 }: MerchantFilterContentProps) {
     const {translate} = useLocalize();
@@ -105,7 +113,7 @@ function MerchantFilterContent({
         onChange({
             [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
             [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? undefined : merchantOperator,
         });
     };
 
@@ -128,10 +136,11 @@ function MerchantFilterContent({
                 </View>
             </NegatableFilter>
             <Button
-                style={[styles.ph5, styles.pb5]}
+                style={[styles.ph5, styles.pb5, buttonStyles]}
                 variant={CONST.BUTTON_VARIANT.SUCCESS}
                 size={buttonSize}
                 onPress={updateMerchantFilter}
+                sentryLabel={sentryLabel}
             >
                 <Button.KeyboardShortcut />
                 <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index 3f8bea70a745..ff0bad60263a 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -103,17 +103,15 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
     }
 
     if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const MerchantFilter = components.Merchant;
-        const isNegated = !!values?.[FILTER_KEYS.MERCHANT_NOT];
-        const value = values?.[isNegated ? FILTER_KEYS.MERCHANT_NOT : FILTER_KEYS.MERCHANT];
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <MerchantFilter
-                key={`${baseFilterKey}-${merchantOperator}`}
+                key={baseFilterKey}
                 baseFilterKey={baseFilterKey}
                 value={value}
                 isNegated={isNegated}
-                merchantOperator={merchantOperator}
+                merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
                 buttonText={buttonText}
                 onChange={onChange}
             />
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 4275ac9a07ba..4cf7cf356cb3 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -34,7 +34,7 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
         },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('search.filters.merchant.exactMatch'),
+            text: translate('search.filters.merchant.equalTo'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
     ];
diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index bdf6574e9307..33b6faed72d1 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -1,22 +1,18 @@
 /**
  * Edits the Merchant filter value and match type from its search filter chip.
  */
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
-import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
-import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
-import TextInput from '@components/TextInput';
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
 
+import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
-import CONST from '@src/CONST';
+import type CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
-import React, {useState} from 'react';
-import {View} from 'react-native';
+import React from 'react';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
@@ -36,62 +32,35 @@ type MerchantFilterPopupProps = {
 };
 
 function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
+    const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
+    const applySentryLabel = `Search-FilterPopupApply-${baseFilterKey}`;
 
-    const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
-    const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const [value, setValue] = useState(initialValue);
-    const shouldShowMerchantMatchType = !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-
-    const error = useTextFilterValidation(baseFilterKey, value);
-    const filterInput = (
-        <TextInput
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
-        />
-    );
-
-    const applyChanges = () => {
-        if (error) {
-            return;
-        }
-        updateFilterForm({
-            ...getFilterFormValues(baseFilterKey, value, isNegated),
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
-        });
+    const applyChanges = (newValues: Partial<SearchAdvancedFiltersForm>) => {
+        updateFilterForm(newValues);
         closeOverlay();
     };
 
+    // The content renders its own padded Apply button, so the popup only provides the label and the spacing ActionButtons would add.
     return (
         <BasePopup
             label={label}
-            onApply={applyChanges}
-            applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+            shouldShowActionButtons={false}
+            style={styles.pb0}
+            onApply={closeOverlay}
+            applySentryLabel={applySentryLabel}
         >
-            <NegatableFilter
+            <MerchantFilterContent
                 baseFilterKey={baseFilterKey}
+                value={value}
                 isNegated={isNegated}
-                onNegationChange={setIsNegated}
-            >
-                {shouldShowMerchantMatchType ? (
-                    <View>
-                        {filterInput}
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    </View>
-                ) : (
-                    filterInput
-                )}
-            </NegatableFilter>
+                merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
+                buttonText={translate('common.apply')}
+                sentryLabel={applySentryLabel}
+                buttonStyles={styles.mt2}
+                onChange={applyChanges}
+            />
         </BasePopup>
     );
 }
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 98751dbf485b..11200fec643f 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -33,18 +33,6 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const [value, setValue] = useState(initialValue);
 
     const error = useTextFilterValidation(baseFilterKey, value);
-    const filterInput = (
-        <TextInput
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
-        />
-    );
 
     const applyChanges = () => {
         if (error) {
@@ -66,7 +54,16 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                {filterInput}
+                <TextInput
+                    placeholder={label}
+                    value={value}
+                    errorText={error}
+                    hasError={!!error}
+                    onChangeText={setValue}
+                    accessibilityLabel={label}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.ph5]}
+                />
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 75ccc63c325b..f984fe632e00 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9830,7 +9830,11 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
-            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Gleich'},
+            merchant: {
+                matchType: 'Übereinstimmungstyp',
+                contains: (merchant?: string) => (merchant ? `Enthält "${merchant}"` : 'Enthält'),
+                equalTo: (merchant?: string) => (merchant ? `Gleich "${merchant}"` : 'Gleich'),
+            },
             created: 'Erstellt',
             createdDate: 'Erstellungsdatum',
             transactionStatus: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 27ab9f541f44..744ea1664b32 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -10038,7 +10038,11 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
-            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ίσο με'},
+            merchant: {
+                matchType: 'Τύπος αντιστοίχισης',
+                contains: (merchant?: string) => (merchant ? `Περιέχει "${merchant}"` : 'Περιέχει'),
+                equalTo: (merchant?: string) => (merchant ? `Ίσο με "${merchant}"` : 'Ίσο με'),
+            },
             created: 'Δημιουργήθηκε',
             createdDate: 'Ημερομηνία δημιουργίας',
             transactionStatus: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6a30c5f88306..67f38a9ff6c7 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9953,8 +9953,8 @@ const translations = {
             },
             merchant: {
                 matchType: 'Match type',
-                contains: 'Contains',
-                exactMatch: 'Equal to',
+                contains: (merchant?: string) => (merchant ? `Contains "${merchant}"` : 'Contains'),
+                equalTo: (merchant?: string) => (merchant ? `Equal to "${merchant}"` : 'Equal to'),
             },
             card: {
                 expensify: 'Expensify',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a8e54fdee445..b3574d690f3e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9688,7 +9688,11 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
-            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Igual a'},
+            merchant: {
+                matchType: 'Tipo de coincidencia',
+                contains: (merchant) => (merchant ? `Contiene "${merchant}"` : 'Contiene'),
+                equalTo: (merchant) => (merchant ? `Igual a "${merchant}"` : 'Igual a'),
+            },
             created: 'Creado',
             createdDate: 'Fecha de creación',
             transactionStatus: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 25a093806f35..f570b67c4c43 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9852,7 +9852,11 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
-            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Égal à'},
+            merchant: {
+                matchType: 'Type de correspondance',
+                contains: (merchant?: string) => (merchant ? `Contient "${merchant}"` : 'Contient'),
+                equalTo: (merchant?: string) => (merchant ? `Égal à "${merchant}"` : 'Égal à'),
+            },
             created: 'Créé',
             createdDate: 'Date de création',
             transactionStatus: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3771b9bb0a69..ab44e6acf015 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9786,7 +9786,11 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
-            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Uguale a'},
+            merchant: {
+                matchType: 'Tipo di corrispondenza',
+                contains: (merchant?: string) => (merchant ? `Contiene "${merchant}"` : 'Contiene'),
+                equalTo: (merchant?: string) => (merchant ? `Uguale a "${merchant}"` : 'Uguale a'),
+            },
             created: 'Creato',
             createdDate: 'Data di creazione',
             transactionStatus: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index cba9acff13ca..ffe83ccaf121 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9649,7 +9649,11 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
-            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '等しい'},
+            merchant: {
+                matchType: 'マッチタイプ',
+                contains: (merchant?: string) => (merchant ? `"${merchant}"を含む` : '含む'),
+                equalTo: (merchant?: string) => (merchant ? `"${merchant}"に等しい` : '等しい'),
+            },
             created: '作成しました',
             createdDate: '作成日',
             transactionStatus: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index e1aca5b6c068..70d77569eb87 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9753,7 +9753,11 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
-            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Gelijk aan'},
+            merchant: {
+                matchType: 'Overeenkomsttype',
+                contains: (merchant?: string) => (merchant ? `Bevat "${merchant}"` : 'Bevat'),
+                equalTo: (merchant?: string) => (merchant ? `Gelijk aan "${merchant}"` : 'Gelijk aan'),
+            },
             created: 'Aangemaakt',
             createdDate: 'Aanmaakdatum',
             transactionStatus: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f6c7ee0f234b..2fbf38679776 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9772,7 +9772,11 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
-            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Równe'},
+            merchant: {
+                matchType: 'Typ dopasowania',
+                contains: (merchant?: string) => (merchant ? `Zawiera "${merchant}"` : 'Zawiera'),
+                equalTo: (merchant?: string) => (merchant ? `Równe "${merchant}"` : 'Równe'),
+            },
             created: 'Utworzono',
             createdDate: 'Data utworzenia',
             transactionStatus: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index b384b2231441..9d9b012d7d26 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9751,7 +9751,11 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
-            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Igual a'},
+            merchant: {
+                matchType: 'Tipo de correspondência',
+                contains: (merchant?: string) => (merchant ? `Contém "${merchant}"` : 'Contém'),
+                equalTo: (merchant?: string) => (merchant ? `Igual a "${merchant}"` : 'Igual a'),
+            },
             created: 'Criado',
             createdDate: 'Data de criação',
             transactionStatus: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5b4a1356e53b..d9eb4f5fcf54 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9387,7 +9387,11 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
-            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '等于'},
+            merchant: {
+                matchType: '匹配类型',
+                contains: (merchant?: string) => (merchant ? `包含 "${merchant}"` : '包含'),
+                equalTo: (merchant?: string) => (merchant ? `等于 "${merchant}"` : '等于'),
+            },
             created: '已创建',
             createdDate: '创建日期',
             transactionStatus: {
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 2bd3c373b69f..8708d12fd64f 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -1200,18 +1200,6 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
-    const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
-    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-    const wasMerchantNegated = negativeMerchantFilters.length > 0;
-    const isMerchantNegated = !!supportedFilterValues.merchantNot;
-    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
-    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
-    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
-    const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
-        ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-        : DEFAULT_MERCHANT_OPERATOR;
-    const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1277,10 +1265,22 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     if (filterKey === FILTER_KEYS.MERCHANT) {
+                        const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+                        const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+                        const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+                        const wasMerchantNegated = negativeMerchantFilters.length > 0;
+                        const isMerchantNegated = !!supportedFilterValues.merchantNot;
+                        const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+                        const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+                        const selectedMerchantOperator = getMerchantOperator(merchantOperator);
                         const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
                         const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
                         const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
                         if (lastMerchantFilter && isMerchantValueUnchanged) {
+                            const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+                                ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+                                : DEFAULT_MERCHANT_OPERATOR;
+                            const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
                             const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
                             const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
                             const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index b29a29e9d89e..951a012a516b 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5914,8 +5914,8 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.exactMatch' : 'search.filters.merchant.contains';
-        return `${translate(matchTypeKey)} "${merchant}"`;
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.equalTo' : 'search.filters.merchant.contains';
+        return translate(matchTypeKey, merchant);
     }
 
     if (key === FILTER_KEYS.TRANSACTION_STATUS) {
@@ -5970,6 +5970,11 @@ function hasFilterContentValuesChanged(
         return true;
     }
 
+    // The Merchant content also reads its match type.
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        return previousValues?.[FILTER_KEYS.MERCHANT_OPERATOR] !== values?.[FILTER_KEYS.MERCHANT_OPERATOR];
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         return false;
     }
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
index f58051caea92..be459e4789fb 100644
--- a/tests/ui/MerchantFilterContentTest.tsx
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -7,50 +7,47 @@ import MerchantFilterContentPageWrapper from '@pages/Search/SearchAdvancedFilter
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
 
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn(), merchantOperator = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS) {
-    return {
-        onChange,
-        ...render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="I"
-                    isNegated={false}
-                    merchantOperator={merchantOperator}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        ),
-    };
+function renderMerchantFilter({value = 'I', isNegated = false, merchantOperator}: {value?: string; isNegated?: boolean; merchantOperator?: MerchantMatchType} = {}) {
+    const onChange = jest.fn();
+    render(
+        <NavigationContainer>
+            <MerchantFilterContent
+                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                value={value}
+                isNegated={isNegated}
+                merchantOperator={merchantOperator}
+                onChange={onChange}
+            />
+        </NavigationContainer>,
+    );
+    return {onChange};
 }
 
 describe('MerchantFilterContent', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
     it('keeps the merchant input fixed above the match type options', () => {
-        const {onChange} = renderMerchantFilter();
+        // Given a positive Merchant filter
+        const {onChange} = renderMerchantFilter({merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS});
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
+        // When the user edits the value and switches to Equal to
         fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('search.filters.merchant.equalTo'));
 
+        // Then the same input keeps the edited value, so switching the match type does not reset what the user typed
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
         expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
 
+        // When the user confirms
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then the exact operator is submitted with the edited value
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'Ibis',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -58,11 +55,14 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('submits the selected Contains operator', () => {
-        const {onChange} = renderMerchantFilter();
+    it.each([CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, undefined])('submits Contains when the stored operator is %s', (merchantOperator) => {
+        // Given a Merchant filter stored as Contains, or with no operator from an older query
+        const {onChange} = renderMerchantFilter({merchantOperator});
 
+        // When the user confirms without changing the match type
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then Contains is submitted, because it is the default Merchant match type
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -70,13 +70,14 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('applies the Merchant filter directly when the page supplies an Apply label', () => {
+    it('routes the Merchant filter through the advanced filters content with its stored operator', () => {
+        // Given the advanced filters page renders a stored exact Merchant filter with an Apply label
         const onChange = jest.fn();
         render(
             <NavigationContainer>
                 <SearchAdvancedFiltersContent
                     baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    values={{merchant: 'I', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}}
+                    values={{merchant: 'I', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}}
                     buttonText="common.apply"
                     components={{Merchant: MerchantFilterContentPageWrapper, Text: () => null, Amount: () => null, Date: () => null, ReportField: () => null, List: () => null}}
                     onChange={onChange}
@@ -84,57 +85,27 @@ describe('MerchantFilterContent', () => {
             </NavigationContainer>,
         );
 
-        expect(screen.queryByText('common.confirm')).not.toBeOnTheScreen();
+        // When the user applies the filter
         fireEvent.press(screen.getByText('common.apply'));
 
+        // Then the stored exact operator is kept, so the Merchant content received it from the form values
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const onChange = jest.fn();
-        render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="I"
-                    isNegated={false}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        );
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         });
     });
 
     it('retains the value when changing a stored negative filter back to positive', () => {
-        const onChange = jest.fn();
-        render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="Prime"
-                    isNegated
-                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        );
+        // Given a stored negated Merchant filter
+        const {onChange} = renderMerchantFilter({value: 'Prime', isNegated: true});
 
+        // When the user switches it to positive and picks Contains
         fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
-        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
         fireEvent.press(screen.getByText('search.filters.merchant.contains'));
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then the negated value moves to the positive filter instead of being cleared
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'Prime',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -142,23 +113,24 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('hides match type controls and uses exact matching when the filter is negated', () => {
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
+    it('hides the match type and submits no operator when the filter is negated', () => {
+        // Given a positive Merchant filter
+        const {onChange} = renderMerchantFilter({merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS});
 
+        // When the user negates it
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
+        // Then the match type is hidden, because a negated Merchant filter always uses the not-equal operator
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
+        // When the user confirms
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then only the negated value is submitted
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: undefined,
             [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: undefined,
         });
     });
 });
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
index 51fe742adab5..78f6ef3e97b9 100644
--- a/tests/ui/MerchantFilterPopupTest.tsx
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -4,119 +4,39 @@ import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilt
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
 
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup(hasStoredMerchantOperator = true, values: Partial<SearchAdvancedFiltersForm> = {}) {
-    const closeOverlay = jest.fn();
-    const updateFilterForm = jest.fn<void, [Partial<SearchAdvancedFiltersForm>]>();
-
-    const rendered = render(
-        <NavigationContainer>
-            <MerchantFilterPopup
-                baseFilterKey={FILTER_KEYS.MERCHANT}
-                values={{
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
-                    ...values,
-                }}
-                label="common.merchant"
-                closeOverlay={closeOverlay}
-                updateFilterForm={updateFilterForm}
-            />
-        </NavigationContainer>,
-    );
-
-    return {closeOverlay, updateFilterForm, ...rendered};
-}
-
 describe('MerchantFilterPopup', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('shows and submits the Merchant match type', () => {
-        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+    it('applies the Merchant filter and closes the popup', () => {
+        // Given a Merchant chip popup with a stored Contains filter
+        const closeOverlay = jest.fn();
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterPopup
+                    baseFilterKey={FILTER_KEYS.MERCHANT}
+                    values={{[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}}
+                    label="common.merchant"
+                    closeOverlay={closeOverlay}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
+
+        // When the user applies the filter
         fireEvent.press(screen.getByText('common.apply'));
 
+        // Then the popup submits the Merchant values and closes, because the chip applies changes immediately
         expect(updateFilterForm).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-        expect(closeOverlay).toHaveBeenCalledTimes(1);
-    });
-
-    it('keeps the exact operator and edited value when reopened', () => {
-        const first = renderMerchantPopup();
-        fireEvent.changeText(screen.getByLabelText('common.merchant'), 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-        fireEvent.press(screen.getByText('common.apply'));
-        const savedValues = first.updateFilterForm.mock.calls.at(0)?.at(0);
-        first.unmount();
-
-        const reopened = renderMerchantPopup(true, savedValues);
-        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
-        fireEvent.press(screen.getByText('common.apply'));
-        expect(reopened.updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'Ibis',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {updateFilterForm} = renderMerchantPopup(false);
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('retains the value when changing a stored negative filter back to positive', () => {
-        const {updateFilterForm} = renderMerchantPopup(true, {merchant: undefined, merchantNot: 'Prime', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
-        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
-        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'Prime',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
             [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         });
-    });
-
-    it('hides the match type and submits exact matching for a negated Merchant', () => {
-        const {updateFilterForm} = renderMerchantPopup();
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
-
-        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: undefined,
-            [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 });
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
deleted file mode 100644
index 62879fa431a7..000000000000
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {fireEvent, render, screen} from '@testing-library/react-native';
-
-import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
-
-import CONST from '@src/CONST';
-
-import {NavigationContainer} from '@react-navigation/native';
-
-jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
-jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
-
-function renderDescriptionFilter(onChange = jest.fn()) {
-    return {
-        onChange,
-        ...render(
-            <NavigationContainer>
-                <TextInputFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION}
-                    value="I"
-                    isNegated={false}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        ),
-    };
-}
-
-describe('TextInputFilterContent', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('submits a generic Description filter with two onChange arguments and no match type selector', () => {
-        const {onChange} = renderDescriptionFilter();
-
-        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false);
-        expect(onChange.mock.calls.at(0)).toHaveLength(2);
-    });
-});
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 4cb6ca965201..ec24e9e7fe69 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -624,26 +624,14 @@ describe('SearchQueryUtils', () => {
             expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
-        test('defaults a merchant filter without an operator to contains', () => {
-            const filterValues: Partial<SearchAdvancedFiltersForm> = {
-                type: 'expense',
-                merchant: 'Amazon',
-            };
-
-            const result = buildQueryStringFromFilterFormValues(filterValues);
-
-            expect(result).toEqual('type:expense merchant*:Amazon');
-        });
-
-        test('builds contains merchant query when merchant operator is contains', () => {
-            const filterValues: Partial<SearchAdvancedFiltersForm> = {
-                type: 'expense',
-                merchant: 'Amazon',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            };
+        test.each([CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, undefined])('builds a contains merchant query when the merchant operator is %s', (merchantOperator) => {
+            // Given a merchant filter stored as contains, or with no operator
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {type: 'expense', merchant: 'Amazon', merchantOperator};
 
+            // When the query string is built
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
+            // Then it uses contains, because partial matching is the default merchant behavior
             expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
@@ -1397,52 +1385,22 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterFormValuesFromQuery', () => {
-        test('restores exact merchant operator from explicit exact query', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant=Uber');
-
-            if (!queryJSON) {
-                throw new Error('Failed to parse query string');
-            }
-
-            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            });
-        });
-
-        test('restores legacy merchant operator as contains', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant:Uber');
-
-            if (!queryJSON) {
-                throw new Error('Failed to parse query string');
-            }
-
-            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            });
-        });
-
-        test('restores contains merchant operator from query', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant*:Uber');
-
+        test.each([
+            ['merchant=Uber', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+            ['merchant:Uber', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:Uber', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+        ])('restores the merchant operator from %s', (merchantQuery, merchantOperator) => {
+            // Given a query with an explicit exact, legacy, or contains merchant filter
+            const queryJSON = buildSearchQueryJSON(`sortBy:date sortOrder:desc type:expense ${merchantQuery}`);
             if (!queryJSON) {
                 throw new Error('Failed to parse query string');
             }
 
+            // When the form values are built from the query
             const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
 
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            });
+            // Then only `=` restores Equal to, because legacy `:` keeps its partial-match behavior
+            expect(result).toEqual({type: 'expense', merchant: 'Uber', merchantOperator});
         });
 
         test('category filter includes empty values', () => {
@@ -3065,30 +3023,30 @@ describe('SearchQueryUtils', () => {
             }
 
             test.each([
+                // Mixed operators, both orders
                 'merchant="Coffee Shop" merchant*:Coffee',
                 'merchant*:Coffee merchant="Coffee Shop"',
-                'merchant*:Tea merchant="Coffee Shop"',
-                'merchant="Coffee Shop" merchant:Coffee',
+                // Mixed operators with lists and quoted commas
                 'merchant="Coffee Shop",Uber merchant*:Coffee,Tea',
                 'merchant="Coffee, Shop" merchant*:"Coffee, Shop"',
+                // Three clauses, and positive mixed with negated
                 'merchant=I merchant*:I merchant*:g',
                 'merchant=I merchant*:I -merchant:Ig',
+                // Same operator repeated
                 'merchant*:Coffee merchant*:Shop',
-                'merchant*:Amazon,Uber',
-                'merchant:Amazon,Uber',
-                'merchant=Amazon,Uber',
-                'merchant*:"Amazon,Uber"',
-                'merchant="Amazon,Uber"',
-                'merchant*:"Coffee, Shop",Uber',
+                // Single clause of each kind
                 'merchant=I',
                 'merchant*:I',
-                '-merchant:I',
+                'merchant=Amazon,Uber',
+                // Negated
                 '-merchant:Amazon -merchant:Prime',
-                '-merchant:Amazon,Prime',
                 '-merchant:"Coffee, Shop",Uber',
             ])('preserves Merchant predicates when changing Currency: %s', (input) => {
+                // Given a query with Merchant predicates
+                // When only the Currency filter changes
                 const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
 
+                // Then every Merchant predicate is kept as it was and the Currency filter is added
                 expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters.filter((filter) => filter.key === 'merchant'));
                 expect(updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
             });
@@ -4264,46 +4222,23 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('applyContainsOperatorToTextFields', () => {
-        it('should preserve explicit merchant eq as exact match', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');
+        it.each([
+            ['merchant=coffee', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+            ['merchant:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+        ])('should preserve the parsed merchant operator for %s', (merchantQuery, merchantOperator) => {
+            // Given a query with an explicit exact, legacy, or contains merchant filter
+            const queryJSON = buildSearchQueryJSON(`type:expense ${merchantQuery}`);
             if (!queryJSON?.filters) {
                 throw new Error('Expected filters to be defined');
             }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toBe('coffee');
-        });
 
-        it('should preserve legacy merchant operator as contains', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant:coffee');
-            if (!queryJSON?.filters) {
-                throw new Error('Expected filters to be defined');
-            }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-            expect(merchantNode.right).toBe('coffee');
-        });
+            // When text field operators are normalized
+            const merchantNode = findNode(applyContainsOperatorToTextFields(queryJSON.filters), 'merchant');
 
-        it('should preserve merchant contains operator', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant*:coffee');
-            if (!queryJSON?.filters) {
-                throw new Error('Expected filters to be defined');
-            }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-            expect(merchantNode.right).toBe('coffee');
+            // Then the parsed merchant operator is kept, because the parser already maps legacy `:` to contains
+            expect(merchantNode?.operator).toBe(merchantOperator);
+            expect(merchantNode?.right).toBe('coffee');
         });
 
         it('should transform description eq to contains', () => {
@@ -4367,55 +4302,34 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('serializeQueryJSONForBackend', () => {
-        it('should preserve legacy merchant contains operator in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant:coffee');
+        it.each([
+            ['merchant:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant=coffee', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+        ])('should preserve the merchant operator in AST filters for %s', (merchantQuery, merchantOperator) => {
+            // Given a query with a legacy, contains, or explicit exact merchant filter
+            const queryJSON = buildSearchQueryJSON(`type:expense ${merchantQuery}`);
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');
             }
-            const normalizedFilters = applyContainsOperatorToTextFields(queryJSON.filters);
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, filters: normalizedFilters, status: ''}));
-            const merchantNode = findNode(normalizedFilters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-        });
 
-        it('should preserve contains merchant operator in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant*:coffee');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, status: ''}));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-        });
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend(queryJSON);
 
-        it('should preserve explicit merchant exact match', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=I');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, status: ''}));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toBe('I');
+            // Then the merchant filter is sent unchanged with its parsed operator
+            expect(result).toBe(JSON.stringify({...queryJSON, status: ''}));
+            expect(findNode(queryJSON.filters, 'merchant')?.operator).toBe(merchantOperator);
         });
 
-        it('should preserve exact merchant operator in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, value: 'coffee'}];
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
-        });
+        it.each([CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS])('should preserve the %s merchant operator in rawFilterList', (operator) => {
+            // Given a raw merchant filter with an exact or contains operator
+            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator, value: 'coffee'}];
 
-        it('should preserve contains merchant operator in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, value: 'coffee'}];
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend({filters: undefined, rawFilterList});
+
+            // Then the merchant operator is not rewritten
+            expect(result).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
         });
 
         it('should apply contains to description in rawFilterList', () => {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index c097c395650a..6ba3a0ba82ff 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -14246,40 +14246,19 @@ describe('SearchUIUtils', () => {
             expect(result).toBe(translateLocal('common.read'));
         });
 
-        test('includes the exact match type in a Merchant filter label', () => {
-            const result = SearchUIUtils.getDisplayValue(
-                FILTER_KEYS.MERCHANT,
-                {
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-                },
-                CONST.SEARCH.DATA_TYPES.EXPENSE,
-                translateLocal,
-                localeCompare,
-            );
-
-            expect(result).toBe(`${translateLocal('search.filters.merchant.exactMatch')} "I"`);
-        });
-
-        test('includes the contains match type in a Merchant filter label', () => {
-            const result = SearchUIUtils.getDisplayValue(
-                FILTER_KEYS.MERCHANT,
-                {
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-                },
-                CONST.SEARCH.DATA_TYPES.EXPENSE,
-                translateLocal,
-                localeCompare,
-            );
-
-            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
-        });
+        test.each([
+            [CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 'search.filters.merchant.equalTo'],
+            [CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'search.filters.merchant.contains'],
+            [undefined, 'search.filters.merchant.contains'],
+        ] as const)('includes the %s match type in a Merchant filter label', (merchantOperator, translationKey) => {
+            // Given a Merchant filter with an exact, contains, or missing operator
+            const form = {[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator};
 
-        test('defaults a Merchant filter label without an operator to contains', () => {
-            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, {[FILTER_KEYS.MERCHANT]: 'I'}, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
+            // When the filter label is built
+            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, form, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
 
-            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
+            // Then the match type is part of the translated label, so a missing operator reads as contains
+            expect(result).toBe(translateLocal(translationKey, 'I'));
         });
     });
 
@@ -14839,6 +14818,14 @@ describe('hasFilterContentValuesChanged', () => {
             // A text content offers no options, so the search type is nothing to it.
             ignored: [{[SYNTAX_FILTER_KEYS.MERCHANT]: 'a'}, {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', type: CONST.SEARCH.DATA_TYPES.INVOICE}],
         },
+        {
+            kind: 'merchant, reading its match type',
+            filterKey: SYNTAX_FILTER_KEYS.MERCHANT,
+            read: [
+                {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS},
+                {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO},
+            ],
+        },
         {
             kind: 'amount',
             filterKey: SYNTAX_FILTER_KEYS.AMOUNT,

From 80d4f5f54e13139eecc911f89b0ff08c15b83dbd Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 02:50:55 +0100
Subject: [PATCH 167/781] rename patch

---
 patches/victory-native/details.md                               | 2 +-
 ...rops.patch => victory-native+41.21.0+002+canvas-props.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename patches/victory-native/{victory-native+41.21.0+003+canvas-props.patch => victory-native+41.21.0+002+canvas-props.patch} (100%)

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index ec50d403a2d8..e2677f9e4620 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -12,7 +12,7 @@
 - E/App issue: https://github.com/Expensify/App/issues/91883
 - PR introducing patch: https://github.com/Expensify/App/pull/91659
 
-### [victory-native+41.21.0+003+canvas-props.patch](victory-native+41.21.0+003+canvas-props.patch)
+### [victory-native+41.21.0+002+canvas-props.patch](victory-native+41.21.0+002+canvas-props.patch)
 
 - Reason:
   
diff --git a/patches/victory-native/victory-native+41.21.0+003+canvas-props.patch b/patches/victory-native/victory-native+41.21.0+002+canvas-props.patch
similarity index 100%
rename from patches/victory-native/victory-native+41.21.0+003+canvas-props.patch
rename to patches/victory-native/victory-native+41.21.0+002+canvas-props.patch

From 1cc4bf4617b119f216450bf834a1aa9b522d7950 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 03:25:19 +0100
Subject: [PATCH 168/781] remove broken patches - to be applied

---
 ...y-native+41.21.0+001+horizontal-bars.patch | 111 --------
 ...tory-native+41.21.0+002+canvas-props.patch | 248 ------------------
 2 files changed, 359 deletions(-)
 delete mode 100644 patches/victory-native/victory-native+41.21.0+001+horizontal-bars.patch
 delete mode 100644 patches/victory-native/victory-native+41.21.0+002+canvas-props.patch

diff --git a/patches/victory-native/victory-native+41.21.0+001+horizontal-bars.patch b/patches/victory-native/victory-native+41.21.0+001+horizontal-bars.patch
deleted file mode 100644
index 064636ba22be..000000000000
--- a/patches/victory-native/victory-native+41.21.0+001+horizontal-bars.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
-index b486f76..45788f0 100644
---- a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
-+++ b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
-@@ -16,6 +16,7 @@ type BarGroupProps = {
-         groupWidth: number;
-         gapWidth: number;
-     }) => void;
-+    isHorizontal?: boolean;
- };
- export declare function BarGroup({ betweenGroupPadding, withinGroupPadding, chartBounds, roundedCorners, children, onBarSizeChange, barWidth: customBarWidth, barCount, }: BarGroupProps): React.DetailedReactHTMLElement<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>[] | null;
- export declare namespace BarGroup {
-diff --git a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
-index 63b69bc..75641b1 100644
---- a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
-+++ b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
-@@ -1,6 +1,6 @@
- import type { ChartBounds, PointsArray } from "../../types";
- import { type RoundedCorners } from "../../utils/createRoundedRectPath";
--export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number) => {
-+export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number, isHorizontal?: boolean) => {
-     barWidth: number;
-     groupWidth: number;
-     gapWidth: number;
-diff --git a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
-index f46fad7..ad75c04 100644
---- a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
-+++ b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
-@@ -20,6 +20,7 @@ type BarGroupProps = {
-     groupWidth: number;
-     gapWidth: number;
-   }) => void;
-+  isHorizontal?: boolean;
- };
- 
- export function BarGroup({
-@@ -31,6 +32,7 @@ export function BarGroup({
-   onBarSizeChange,
-   barWidth: customBarWidth,
-   barCount,
-+  isHorizontal,
- }: BarGroupProps) {
-   // Collect the bar props
-   const bars = [] as BarGroupBarProps[];
-@@ -49,6 +51,7 @@ export function BarGroup({
-     roundedCorners,
-     customBarWidth,
-     barCount,
-+    isHorizontal,
-   );
- 
-   // Handle bar size change
-diff --git a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
-index 4bfb6d4..9805bfe 100644
---- a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
-+++ b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
-@@ -15,17 +15,19 @@ export const useBarGroupPaths = (
-   roundedCorners?: RoundedCorners,
-   customBarWidth?: number,
-   barCount?: number,
-+  isHorizontal?: boolean,
- ) => {
-   const numGroups = points[0]?.length || 0;
- 
--  const { yScale } = useCartesianChartContext();
-+  const { xScale, yScale } = useCartesianChartContext();
- 
-   const groupWidth = React.useMemo(() => {
-+    const boundSize = isHorizontal ? chartBounds.top - chartBounds.bottom : chartBounds.right - chartBounds.left;
-     return (
--      ((1 - betweenGroupPadding) * (chartBounds.right - chartBounds.left)) /
-+      ((1 - betweenGroupPadding) * boundSize) /
-       Math.max(1, numGroups)
-     );
--  }, [betweenGroupPadding, chartBounds.left, chartBounds.right, numGroups]);
-+  }, [betweenGroupPadding, chartBounds, numGroups, isHorizontal]);
- 
-   const barWidth = React.useMemo(() => {
-     if (customBarWidth) return customBarWidth;
-@@ -46,19 +48,24 @@ export const useBarGroupPaths = (
-       const offset = -groupWidth / 2 + i * (barWidth + gapWidth);
-       pointSet.forEach(({ x, y, yValue }) => {
-         if (typeof y !== "number") return;
--        const barHeight = yScale(0) - y;
-+        const barHeight = isHorizontal ? xScale(0) - x : yScale(0) - y;
-         if (roundedCorners) {
-           const nonUniformRoundedRect = createRoundedRectPath(
--            x + offset,
--            y,
--            barWidth,
--            barHeight,
--            roundedCorners,
-+            isHorizontal ? x : x + offset,
-+            isHorizontal ? y + offset : y,
-+            isHorizontal ? barHeight : barWidth,
-+            isHorizontal ? barWidth : barHeight,
-+            isHorizontal ? {topLeft: roundedCorners.bottomLeft, topRight: roundedCorners.topLeft, bottomLeft: roundedCorners.bottomRight, bottomRight: roundedCorners.topRight} : roundedCorners,
-             Number(yValue),
-           );
-           p.addRRect(nonUniformRoundedRect);
-         } else {
--          p.addRect(Skia.XYWHRect(x + offset, y, barWidth, barHeight));
-+          p.addRect(Skia.XYWHRect(
-+            isHorizontal ? x : x + offset,
-+            isHorizontal ? y + offset : y,
-+            isHorizontal ? barHeight : barWidth,
-+            isHorizontal ? barWidth : barHeight,
-+          ));
-         }
-       });
-       return p;
diff --git a/patches/victory-native/victory-native+41.21.0+002+canvas-props.patch b/patches/victory-native/victory-native+41.21.0+002+canvas-props.patch
deleted file mode 100644
index 7692cce6596d..000000000000
--- a/patches/victory-native/victory-native+41.21.0+002+canvas-props.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-diff --git a/node_modules/victory-native/dist/cartesian/CartesianChart.d.ts b/node_modules/victory-native/dist/cartesian/CartesianChart.d.ts
-index 6802428..b30fdac 100644
---- a/node_modules/victory-native/dist/cartesian/CartesianChart.d.ts
-+++ b/node_modules/victory-native/dist/cartesian/CartesianChart.d.ts
-@@ -8,6 +8,7 @@ import type { ChartPressState, ChartPressStateInit } from "./hooks/useChartPress
- import { type ChartTransformState } from "./hooks/useChartTransformState";
- import { type PanTransformGestureConfig, type PinchTransformGestureConfig } from "./utils/transformGestures";
- import { type ChartLayoutModeProps } from "../shared/ChartLayoutModeProps";
-+import { type ChartCanvasProps } from "../shared/ChartWrapper";
- export type CartesianActionsHandle<T = undefined> = T extends ChartPressState<infer S> ? S extends ChartPressStateInit ? {
-     handleTouch: (v: T, x: number, y: number) => void;
- } : never : never;
-@@ -67,6 +68,7 @@ type CartesianChartProps<RawData extends Record<string, unknown>, XK extends key
-         x: InputFields<RawData>[XK];
-         y: Record<YK, number>;
-     }> | undefined>>;
-+    canvasProps?: ChartCanvasProps;
- } & ChartLayoutModeProps;
- export declare function CartesianChart<RawData extends Record<string, unknown>, XK extends keyof InputFields<RawData>, YK extends keyof NumericalFields<RawData>>({ transformState, children, ref, ...rest }: CartesianChartProps<RawData, XK, YK>): React.JSX.Element;
- export {};
-diff --git a/node_modules/victory-native/dist/cartesian/CartesianChart.js b/node_modules/victory-native/dist/cartesian/CartesianChart.js
-index 839afbd..3b0837a 100644
---- a/node_modules/victory-native/dist/cartesian/CartesianChart.js
-+++ b/node_modules/victory-native/dist/cartesian/CartesianChart.js
-@@ -73,7 +73,7 @@ function CartesianChart(_a) {
-     </CartesianTransformContext_1.CartesianTransformProvider>);
- }
- exports.CartesianChart = CartesianChart;
--function CartesianChartContent({ data, xKey, yKeys, padding, domainPadding, children, renderOutside = () => null, axisOptions, domain, chartPressState, chartPressConfig, gestureHandlerConfig, onChartBoundsChange, onScaleChange, gestureLongPressDelay = 100, xAxis, yAxis, frame, transformState, transformConfig, customGestures, actionsRef, viewport, ref, explicitSize, headless, }) {
-+function CartesianChartContent({ data, xKey, yKeys, padding, domainPadding, children, renderOutside = () => null, axisOptions, domain, chartPressState, chartPressConfig, gestureHandlerConfig, onChartBoundsChange, onScaleChange, gestureLongPressDelay = 100, xAxis, yAxis, frame, transformState, transformConfig, customGestures, actionsRef, viewport, ref, explicitSize, headless, canvasProps, }) {
-     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-     const { size, hasMeasuredLayoutSize, onLayout, isHeadless } = (0, useChartCanvasSize_1.useChartCanvasSize)({ explicitSize, headless });
-     const chartBoundsRef = React.useRef(undefined);
-@@ -498,5 +498,5 @@ function CartesianChartContent({ data, xKey, yKeys, padding, domainPadding, chil
-                 height: primaryYScale.range()[1] - Math.min(primaryYScale.range()[0], 0),
-             }}/>);
-     }
--    return (<ChartWrapper_1.ChartWrapper isHeadless={isHeadless} explicitSize={explicitSize} onLayout={onLayout} hasMeasuredLayoutSize={hasMeasuredLayoutSize} canvasSize={size} canvasRef={canvasRef} chartContent={chartContent} gestureOverlay={gestureOverlay}/>);
-+    return (<ChartWrapper_1.ChartWrapper isHeadless={isHeadless} explicitSize={explicitSize} onLayout={onLayout} hasMeasuredLayoutSize={hasMeasuredLayoutSize} canvasSize={size} canvasRef={canvasRef} chartContent={chartContent} gestureOverlay={gestureOverlay} canvasProps={canvasProps}/>);
- }
-diff --git a/node_modules/victory-native/dist/polar/PolarChart.d.ts b/node_modules/victory-native/dist/polar/PolarChart.d.ts
-index 6cf2971..5b862da 100644
---- a/node_modules/victory-native/dist/polar/PolarChart.d.ts
-+++ b/node_modules/victory-native/dist/polar/PolarChart.d.ts
-@@ -4,6 +4,7 @@ import type { ColorFields, InputFields, NumericalFields, StringKeyOf } from "../
- import { type ChartTransformState } from "../cartesian/hooks/useChartTransformState";
- import { type ChartExplicitSize } from "../shared/ChartExplicitSize";
- import { type ChartLayoutModeProps } from "../shared/ChartLayoutModeProps";
-+import { type ChartCanvasProps } from "../shared/ChartWrapper";
- type PolarChartBaseProps = {
-     onLayout: ({ nativeEvent: { layout } }: LayoutChangeEvent) => void;
-     hasMeasuredLayoutSize: boolean;
-@@ -16,6 +17,7 @@ type PolarChartBaseProps = {
-     transformState?: ChartTransformState;
-     isHeadless: boolean;
-     explicitSize?: ChartExplicitSize;
-+    canvasProps?: ChartCanvasProps;
- };
- type PolarChartProps<RawData extends Record<string, unknown>, LabelKey extends StringKeyOf<InputFields<RawData>>, ValueKey extends StringKeyOf<NumericalFields<RawData>>, ColorKey extends StringKeyOf<ColorFields<RawData>>> = {
-     data: RawData[];
-diff --git a/node_modules/victory-native/dist/polar/PolarChart.js b/node_modules/victory-native/dist/polar/PolarChart.js
-index d6416d0..c990be2 100644
---- a/node_modules/victory-native/dist/polar/PolarChart.js
-+++ b/node_modules/victory-native/dist/polar/PolarChart.js
-@@ -34,7 +34,7 @@ const GestureHandler_1 = require("../shared/GestureHandler");
- const ChartWrapper_1 = require("../shared/ChartWrapper");
- const useChartCanvasSize_1 = require("../shared/useChartCanvasSize");
- const PolarChartBase = (props) => {
--    const { containerStyle, canvasStyle, children, onLayout, hasMeasuredLayoutSize, canvasSize, transformState, isHeadless, explicitSize, } = props;
-+    const { containerStyle, canvasStyle, children, onLayout, hasMeasuredLayoutSize, canvasSize, transformState, isHeadless, explicitSize, canvasProps, } = props;
-     const { width, height } = canvasSize;
-     const Bridge = (0, its_fine_1.useContextBridge)();
-     let composed = react_native_gesture_handler_1.Gesture.Race();
-@@ -44,7 +44,7 @@ const PolarChartBase = (props) => {
-     const chartContent = (<react_native_skia_1.Group matrix={transformState === null || transformState === void 0 ? void 0 : transformState.matrix}>
-       {hasMeasuredLayoutSize && children}
-     </react_native_skia_1.Group>);
--    return (<ChartWrapper_1.ChartWrapper isHeadless={isHeadless} explicitSize={explicitSize} onLayout={onLayout} hasMeasuredLayoutSize={hasMeasuredLayoutSize} canvasSize={canvasSize} containerStyle={containerStyle} canvasStyle={canvasStyle} chartContent={chartContent} wrapCanvasContent={isHeadless ? undefined : (content) => <Bridge>{content}</Bridge>} gestureOverlay={isHeadless ? undefined : (<GestureHandler_1.GestureHandler gesture={composed} dimensions={{ x: 0, y: 0, width, height }}/>)}/>);
-+    return (<ChartWrapper_1.ChartWrapper isHeadless={isHeadless} explicitSize={explicitSize} onLayout={onLayout} hasMeasuredLayoutSize={hasMeasuredLayoutSize} canvasSize={canvasSize} containerStyle={containerStyle} canvasStyle={canvasStyle} canvasProps={canvasProps} chartContent={chartContent} wrapCanvasContent={isHeadless ? undefined : (content) => <Bridge>{content}</Bridge>} gestureOverlay={isHeadless ? undefined : (<GestureHandler_1.GestureHandler gesture={composed} dimensions={{ x: 0, y: 0, width, height }}/>)}/>);
- };
- const PolarChart = (props) => {
-     const { data, labelKey, colorKey, valueKey } = props;
-diff --git a/node_modules/victory-native/dist/shared/ChartWrapper.d.ts b/node_modules/victory-native/dist/shared/ChartWrapper.d.ts
-index 0688ab2..a878191 100644
---- a/node_modules/victory-native/dist/shared/ChartWrapper.d.ts
-+++ b/node_modules/victory-native/dist/shared/ChartWrapper.d.ts
-@@ -1,8 +1,9 @@
- import * as React from "react";
- import { type LayoutChangeEvent, type StyleProp, type ViewStyle } from "react-native";
--import { type CanvasRef } from "@shopify/react-native-skia";
-+import { type CanvasProps, type CanvasRef } from "@shopify/react-native-skia";
- import { type ChartExplicitSize } from "./ChartExplicitSize";
- import { type ChartCanvasSize } from "./chartCanvasSizeUtils";
-+export type ChartCanvasProps = Omit<CanvasProps, "children" | "ref" | "style" | "onLayout">;
- type ChartWrapperProps = {
-     isHeadless: boolean;
-     explicitSize?: ChartExplicitSize;
-@@ -15,6 +16,7 @@ type ChartWrapperProps = {
-     containerStyle?: StyleProp<ViewStyle>;
-     canvasStyle?: StyleProp<ViewStyle>;
-     wrapCanvasContent?: (content: React.ReactNode) => React.ReactNode;
-+    canvasProps?: ChartCanvasProps;
- };
--export declare function ChartWrapper({ isHeadless, explicitSize, onLayout, hasMeasuredLayoutSize, canvasSize, canvasRef, chartContent, gestureOverlay, containerStyle, canvasStyle, wrapCanvasContent, }: ChartWrapperProps): React.JSX.Element;
-+export declare function ChartWrapper({ isHeadless, explicitSize, onLayout, hasMeasuredLayoutSize, canvasSize, canvasRef, chartContent, gestureOverlay, containerStyle, canvasStyle, wrapCanvasContent, canvasProps, }: ChartWrapperProps): React.JSX.Element;
- export {};
-diff --git a/node_modules/victory-native/dist/shared/ChartWrapper.js b/node_modules/victory-native/dist/shared/ChartWrapper.js
-index 5aca3cc..8d9f9ee 100644
---- a/node_modules/victory-native/dist/shared/ChartWrapper.js
-+++ b/node_modules/victory-native/dist/shared/ChartWrapper.js
-@@ -28,7 +28,7 @@ const React = __importStar(require("react"));
- const react_native_1 = require("react-native");
- const react_native_skia_1 = require("@shopify/react-native-skia");
- const react_native_gesture_handler_1 = require("react-native-gesture-handler");
--function ChartWrapper({ isHeadless, explicitSize, onLayout, hasMeasuredLayoutSize, canvasSize, canvasRef, chartContent, gestureOverlay, containerStyle, canvasStyle, wrapCanvasContent, }) {
-+function ChartWrapper({ isHeadless, explicitSize, onLayout, hasMeasuredLayoutSize, canvasSize, canvasRef, chartContent, gestureOverlay, containerStyle, canvasStyle, wrapCanvasContent, canvasProps, }) {
-     if (isHeadless) {
-         return <react_native_skia_1.Group>{chartContent}</react_native_skia_1.Group>;
-     }
-@@ -42,7 +42,7 @@ function ChartWrapper({ isHeadless, explicitSize, onLayout, hasMeasuredLayoutSiz
-                 : null,
-             containerStyle,
-         ]} onLayout={explicitSize ? undefined : onLayout}>
--        <react_native_skia_1.Canvas ref={canvasRef} style={react_native_1.StyleSheet.flatten([
-+        <react_native_skia_1.Canvas {...canvasProps} ref={canvasRef} style={react_native_1.StyleSheet.flatten([
-             styles.flex1,
-             hasMeasuredLayoutSize ? { width, height } : null,
-             canvasStyle,
-diff --git a/node_modules/victory-native/src/cartesian/CartesianChart.tsx b/node_modules/victory-native/src/cartesian/CartesianChart.tsx
-index b1f9a53..73e9aa7 100644
---- a/node_modules/victory-native/src/cartesian/CartesianChart.tsx
-+++ b/node_modules/victory-native/src/cartesian/CartesianChart.tsx
-@@ -53,7 +53,7 @@ import {
- import { downsampleTicks } from "../utils/tickHelpers";
- import { GestureHandler } from "../shared/GestureHandler";
- import { type ChartLayoutModeProps } from "../shared/ChartLayoutModeProps";
--import { ChartWrapper } from "../shared/ChartWrapper";
-+import { ChartWrapper, type ChartCanvasProps } from "../shared/ChartWrapper";
- import { useChartCanvasSize } from "../shared/useChartCanvasSize";
- import { boundsToClip } from "../utils/boundsToClip";
- import { normalizeYAxisTicks } from "../utils/normalizeYAxisTicks";
-@@ -136,6 +136,7 @@ type CartesianChartProps<
-       | undefined
-     >
-   >;
-+  canvasProps?: ChartCanvasProps;
- } & ChartLayoutModeProps;
- 
- export function CartesianChart<
-@@ -188,6 +189,7 @@ function CartesianChartContent<
-   ref,
-   explicitSize,
-   headless,
-+  canvasProps,
- }: CartesianChartProps<RawData, XK, YK>) {
-   const { size, hasMeasuredLayoutSize, onLayout, isHeadless } =
-     useChartCanvasSize({ explicitSize, headless });
-@@ -773,6 +775,7 @@ function CartesianChartContent<
-       canvasRef={canvasRef}
-       chartContent={chartContent}
-       gestureOverlay={gestureOverlay}
-+      canvasProps={canvasProps}
-     />
-   );
- }
-diff --git a/node_modules/victory-native/src/polar/PolarChart.tsx b/node_modules/victory-native/src/polar/PolarChart.tsx
-index 4229d7b..7665633 100644
---- a/node_modules/victory-native/src/polar/PolarChart.tsx
-+++ b/node_modules/victory-native/src/polar/PolarChart.tsx
-@@ -22,7 +22,7 @@ import {
- import { GestureHandler } from "../shared/GestureHandler";
- import { type ChartExplicitSize } from "../shared/ChartExplicitSize";
- import { type ChartLayoutModeProps } from "../shared/ChartLayoutModeProps";
--import { ChartWrapper } from "../shared/ChartWrapper";
-+import { ChartWrapper, type ChartCanvasProps } from "../shared/ChartWrapper";
- import { useChartCanvasSize } from "../shared/useChartCanvasSize";
- 
- type PolarChartBaseProps = {
-@@ -34,6 +34,7 @@ type PolarChartBaseProps = {
-   transformState?: ChartTransformState;
-   isHeadless: boolean;
-   explicitSize?: ChartExplicitSize;
-+  canvasProps?: ChartCanvasProps;
- };
- 
- const PolarChartBase = (
-@@ -49,6 +50,7 @@ const PolarChartBase = (
-     transformState,
-     isHeadless,
-     explicitSize,
-+    canvasProps,
-   } = props;
-   const { width, height } = canvasSize;
-   const Bridge: ContextBridge = useContextBridge();
-@@ -77,6 +79,7 @@ const PolarChartBase = (
-       canvasSize={canvasSize}
-       containerStyle={containerStyle}
-       canvasStyle={canvasStyle}
-+      canvasProps={canvasProps}
-       chartContent={chartContent}
-       wrapCanvasContent={
-         isHeadless ? undefined : (content) => <Bridge>{content}</Bridge>
-diff --git a/node_modules/victory-native/src/shared/ChartWrapper.tsx b/node_modules/victory-native/src/shared/ChartWrapper.tsx
-index ab149e9..b907381 100644
---- a/node_modules/victory-native/src/shared/ChartWrapper.tsx
-+++ b/node_modules/victory-native/src/shared/ChartWrapper.tsx
-@@ -6,11 +6,16 @@ import {
-   type StyleProp,
-   type ViewStyle,
- } from "react-native";
--import { Canvas, Group, type CanvasRef } from "@shopify/react-native-skia";
-+import { Canvas, Group, type CanvasProps, type CanvasRef } from "@shopify/react-native-skia";
- import { GestureHandlerRootView } from "react-native-gesture-handler";
- import { type ChartExplicitSize } from "./ChartExplicitSize";
- import { type ChartCanvasSize } from "./chartCanvasSizeUtils";
- 
-+export type ChartCanvasProps = Omit<
-+  CanvasProps,
-+  "children" | "ref" | "style" | "onLayout"
-+>;
-+
- type ChartWrapperProps = {
-   isHeadless: boolean;
-   explicitSize?: ChartExplicitSize;
-@@ -23,6 +28,7 @@ type ChartWrapperProps = {
-   containerStyle?: StyleProp<ViewStyle>;
-   canvasStyle?: StyleProp<ViewStyle>;
-   wrapCanvasContent?: (content: React.ReactNode) => React.ReactNode;
-+  canvasProps?: ChartCanvasProps;
- };
- 
- export function ChartWrapper({
-@@ -37,6 +43,7 @@ export function ChartWrapper({
-   containerStyle,
-   canvasStyle,
-   wrapCanvasContent,
-+  canvasProps,
- }: ChartWrapperProps) {
-   if (isHeadless) {
-     return <Group>{chartContent}</Group>;
-@@ -58,6 +65,7 @@ export function ChartWrapper({
-         onLayout={explicitSize ? undefined : onLayout}
-       >
-         <Canvas
-+          {...canvasProps}
-           ref={canvasRef}
-           style={StyleSheet.flatten([
-             styles.flex1,

From c417dd0f31ade1a8b4f4e688c71b08dbac83335b Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 04:33:06 +0100
Subject: [PATCH 169/781] reapply horizontal-bars patch

---
 patches/victory-native/details.md             |   2 +-
 ...ry-native+42.0.1+001+horizontal-bars.patch | 186 ++++++++++++++++++
 2 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index e2677f9e4620..b4873870eb1e 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -1,6 +1,6 @@
 # `victory-native` patches
 
-### [victory-native+41.21.0+001+horizontal-bars.patch](victory-native+41.21.0+001+horizontal-bars.patch)
+### [victory-native+42.0.1+001+horizontal-bars.patch](victory-native+42.0.1+001+horizontal-bars.patch)
 
 - Reason:
   
diff --git a/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch b/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch
new file mode 100644
index 000000000000..5fe1f8b254f5
--- /dev/null
+++ b/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch
@@ -0,0 +1,186 @@
+diff --git a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
+index 36915fe..0cb7746 100644
+--- a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
++++ b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts
+@@ -16,6 +16,7 @@ type BarGroupProps = {
+         groupWidth: number;
+         gapWidth: number;
+     }) => void;
++    isHorizontal?: boolean;
+ };
+ export declare function BarGroup({ betweenGroupPadding, withinGroupPadding, chartBounds, roundedCorners, children, onBarSizeChange, barWidth: customBarWidth, barCount, }: BarGroupProps): React.JSX.Element | null;
+ export declare namespace BarGroup {
+diff --git a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
+index 63b69bc..75641b1 100644
+--- a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
++++ b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts
+@@ -1,6 +1,6 @@
+ import type { ChartBounds, PointsArray } from "../../types";
+ import { type RoundedCorners } from "../../utils/createRoundedRectPath";
+-export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number) => {
++export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number, isHorizontal?: boolean) => {
+     barWidth: number;
+     groupWidth: number;
+     gapWidth: number;
+diff --git a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
+index f188ddc..526c5a7 100644
+--- a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
++++ b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx
+@@ -20,6 +20,7 @@ type BarGroupProps = {
+     groupWidth: number;
+     gapWidth: number;
+   }) => void;
++  isHorizontal?: boolean;
+ };
+ 
+ export function BarGroup({
+@@ -31,6 +32,7 @@ export function BarGroup({
+   onBarSizeChange,
+   barWidth: customBarWidth,
+   barCount,
++  isHorizontal,
+ }: BarGroupProps) {
+   // Collect the bar props
+   const bars = [] as BarGroupBarProps[];
+@@ -49,6 +51,7 @@ export function BarGroup({
+     roundedCorners,
+     customBarWidth,
+     barCount,
++    isHorizontal,
+   );
+ 
+   // Handle bar size change
+diff --git a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
+index fafab1a..b2c4329 100644
+--- a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
++++ b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
+@@ -17,10 +17,11 @@ export const useBarGroupPaths = (
+   roundedCorners?: RoundedCorners,
+   customBarWidth?: number,
+   barCount?: number,
++  isHorizontal?: boolean,
+ ) => {
+   const numGroups = points[0]?.length || 0;
+ 
+-  const { yScale } = useCartesianChartContext();
++  const { xScale, yScale } = useCartesianChartContext();
+ 
+   const { barWidth, groupWidth, gapWidth } = getBarGroupDimensions({
+     chartBounds,
+@@ -30,9 +31,11 @@ export const useBarGroupPaths = (
+     barsPerGroup: points.length,
+     customBarWidth,
+     barCount,
++    isHorizontal,
+   });
+ 
+   const paths = React.useMemo(() => {
++    const baselineX = xScale(0);
+     const baselineY = yScale(0);
+ 
+     return points.map((pointSet, i) => {
+@@ -40,11 +43,13 @@ export const useBarGroupPaths = (
+       pointSet.forEach((point) => {
+         const rect = getVerticalBarGroupRect({
+           point,
++          baselineX,
+           baselineY,
+           barWidth,
+           groupWidth,
+           gapWidth,
+           barIndex: i,
++          isHorizontal,
+         });
+         if (!rect) return;
+ 
+@@ -66,7 +71,7 @@ export const useBarGroupPaths = (
+       });
+       return builder.build();
+     });
+-  }, [barWidth, gapWidth, groupWidth, points, roundedCorners, yScale]);
++  }, [barWidth, gapWidth, groupWidth, points, roundedCorners, xScale, yScale, isHorizontal]);
+ 
+   return { barWidth, groupWidth, gapWidth, paths };
+ };
+diff --git a/node_modules/victory-native/src/cartesian/utils/getBarGroupDimensions.ts b/node_modules/victory-native/src/cartesian/utils/getBarGroupDimensions.ts
+index 8ff9f1f..1e6f160 100644
+--- a/node_modules/victory-native/src/cartesian/utils/getBarGroupDimensions.ts
++++ b/node_modules/victory-native/src/cartesian/utils/getBarGroupDimensions.ts
+@@ -2,13 +2,14 @@ import type { ChartBounds } from "../../types";
+ import { getBarGroupDimensionsForAxis } from "./getBarGroupDimensionsForAxis";
+ 
+ export type GetBarGroupDimensionsArgs = {
+-  chartBounds: Pick<ChartBounds, "left" | "right">;
++  chartBounds: ChartBounds;
+   betweenGroupPadding: number;
+   withinGroupPadding: number;
+   groupCount: number;
+   barsPerGroup: number;
+   customBarWidth?: number;
+   barCount?: number;
++  isHorizontal?: boolean,
+ };
+ 
+ export const getBarGroupDimensions = ({
+@@ -19,10 +20,11 @@ export const getBarGroupDimensions = ({
+   barsPerGroup,
+   customBarWidth,
+   barCount,
++  isHorizontal,
+ }: GetBarGroupDimensionsArgs) => {
+   return getBarGroupDimensionsForAxis({
+-    axisStart: chartBounds.left,
+-    axisEnd: chartBounds.right,
++    axisStart: isHorizontal ? chartBounds.bottom : chartBounds.left,
++    axisEnd: isHorizontal ? chartBounds.top : chartBounds.right,
+     betweenGroupPadding,
+     withinGroupPadding,
+     groupCount,
+diff --git a/node_modules/victory-native/src/cartesian/utils/getVerticalBarGroupRect.ts b/node_modules/victory-native/src/cartesian/utils/getVerticalBarGroupRect.ts
+index 37b9467..52f363d 100644
+--- a/node_modules/victory-native/src/cartesian/utils/getVerticalBarGroupRect.ts
++++ b/node_modules/victory-native/src/cartesian/utils/getVerticalBarGroupRect.ts
+@@ -6,18 +6,22 @@ type Point = PointsArray[number];
+ 
+ export const getVerticalBarGroupRect = ({
+   point,
++  baselineX,
+   baselineY,
+   barWidth,
+   groupWidth,
+   gapWidth,
+   barIndex,
++  isHorizontal,
+ }: {
+   point: Point;
++  baselineX: number;
+   baselineY: number;
+   barWidth: number;
+   groupWidth: number;
+   gapWidth: number;
+   barIndex: number;
++  isHorizontal?: boolean;
+ }): VerticalBarRect | null => {
+   const { x, y } = point;
+ 
+@@ -25,8 +29,19 @@ export const getVerticalBarGroupRect = ({
+     return null;
+   }
+ 
++  const offset = getBarGroupOffset({ groupWidth, barWidth, gapWidth, barIndex });
++
++  if (isHorizontal) {
++    return {
++      x: x,
++      y: y + offset,
++      width: baselineX - x,
++      height: barWidth,
++    }
++  }
++
+   return {
+-    x: x + getBarGroupOffset({ groupWidth, barWidth, gapWidth, barIndex }),
++    x: x + offset,
+     y,
+     width: barWidth,
+     height: baselineY - y,

From c48a997945f4590ee194a9e1681f1ef10d267a40 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 04:53:42 +0100
Subject: [PATCH 170/781] fix corner radius

---
 .../victory-native+42.0.1+001+horizontal-bars.patch   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch b/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch
index 5fe1f8b254f5..778f72d5c393 100644
--- a/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch
+++ b/patches/victory-native/victory-native+42.0.1+001+horizontal-bars.patch
@@ -51,7 +51,7 @@ index f188ddc..526c5a7 100644
  
    // Handle bar size change
 diff --git a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
-index fafab1a..b2c4329 100644
+index fafab1a..07da62f 100644
 --- a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
 +++ b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts
 @@ -17,10 +17,11 @@ export const useBarGroupPaths = (
@@ -93,6 +93,15 @@ index fafab1a..b2c4329 100644
          });
          if (!rect) return;
  
+@@ -54,7 +59,7 @@ export const useBarGroupPaths = (
+             rect.y,
+             rect.width,
+             rect.height,
+-            roundedCorners,
++            isHorizontal ? {topLeft: roundedCorners.bottomLeft, topRight: roundedCorners.topLeft, bottomLeft: roundedCorners.bottomRight, bottomRight: roundedCorners.topRight} : roundedCorners,
+             Number(point.yValue),
+           );
+           builder.addRRect(nonUniformRoundedRect);
 @@ -66,7 +71,7 @@ export const useBarGroupPaths = (
        });
        return builder.build();

From 7e18a338bba3ac5e7ac43ad6add9c111e8f91a36 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 04:55:44 +0100
Subject: [PATCH 171/781] revert unrelated changes

---
 .github/actions/javascript/isDeployChecklistLocked/index.js | 6 +++++-
 .github/actions/javascript/proposalPoliceComment/index.js   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/actions/javascript/isDeployChecklistLocked/index.js b/.github/actions/javascript/isDeployChecklistLocked/index.js
index d228861485f1..b1e68e9965bf 100644
--- a/.github/actions/javascript/isDeployChecklistLocked/index.js
+++ b/.github/actions/javascript/isDeployChecklistLocked/index.js
@@ -3433,7 +3433,11 @@ var require_CONST = __commonJS({
         SHIP_CARD: "ship_card",
         REPORT_CARD_FRAUD: "report_card_fraud",
         ISSUE_CARD: "issue_card",
-        UPDATE_CARD: "update_card"
+        UPDATE_CARD: "update_card",
+        UPDATE_PERSONAL_DETAILS: "update_personal_details",
+        ADD_DELEGATE: "add_delegate",
+        UPDATE_DELEGATE: "update_delegate",
+        CHANGE_PRIMARY_LOGIN: "change_primary_login"
       },
       EXPENSIFY_CARD: {
         FEED_NAME: "Expensify Card",
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
index 0d6eafcdd4f6..6c66aba05ee9 100644
--- a/.github/actions/javascript/proposalPoliceComment/index.js
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -24247,7 +24247,11 @@ var require_CONST = __commonJS({
         SHIP_CARD: "ship_card",
         REPORT_CARD_FRAUD: "report_card_fraud",
         ISSUE_CARD: "issue_card",
-        UPDATE_CARD: "update_card"
+        UPDATE_CARD: "update_card",
+        UPDATE_PERSONAL_DETAILS: "update_personal_details",
+        ADD_DELEGATE: "add_delegate",
+        UPDATE_DELEGATE: "update_delegate",
+        CHANGE_PRIMARY_LOGIN: "change_primary_login"
       },
       EXPENSIFY_CARD: {
         FEED_NAME: "Expensify Card",

From e28b7db19b51652e655d0bd140b9c2fd4f816a2c Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 04:57:24 +0100
Subject: [PATCH 172/781] add TODO comment

---
 patches/victory-native/details.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index b4873870eb1e..1c454e780d2b 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -12,6 +12,7 @@
 - E/App issue: https://github.com/Expensify/App/issues/91883
 - PR introducing patch: https://github.com/Expensify/App/pull/91659
 
+// s77rt TODO verify if patch is needed, if not remove canvasProps prop
 ### [victory-native+41.21.0+002+canvas-props.patch](victory-native+41.21.0+002+canvas-props.patch)
 
 - Reason:

From 70aea82efd6f3a031fb7e0bf1824fa2996e677d8 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 06:29:02 +0100
Subject: [PATCH 173/781] add tickCount patch

---
 patches/victory-native/details.md                | 16 ++++++++++++++++
 ...ictory-native+42.0.1+002+tickCount-4121.patch | 13 +++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index 1c454e780d2b..8abd6d85a317 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -12,6 +12,22 @@
 - E/App issue: https://github.com/Expensify/App/issues/91883
 - PR introducing patch: https://github.com/Expensify/App/pull/91659
 
+
+### [victory-native+42.0.1+002+tickCount-4121.patch](victory-native+42.0.1+002+tickCount-4121.patch)
+
+- Reason:
+  
+    ```
+    After updating to v42 the tickCount broke.
+    This was was caused by this commit https://github.com/FormidableLabs/victory-native-xl/pull/664/changes/fcd8affe655878d0bf95ab87c087eab428d4f62d
+    which fixed some bug but caused us another bug. This small patch reverts it. This is a temporarily solution not a real fix.
+    The fix should address both bugs.
+    ```
+  
+- Upstream PR/issue: Not yet.
+- E/App issue: https://github.com/Expensify/App/issues/91883
+- PR introducing patch: https://github.com/Expensify/App/pull/100186
+
 // s77rt TODO verify if patch is needed, if not remove canvasProps prop
 ### [victory-native+41.21.0+002+canvas-props.patch](victory-native+41.21.0+002+canvas-props.patch)
 
diff --git a/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch b/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch
new file mode 100644
index 000000000000..2df5629281c1
--- /dev/null
+++ b/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/victory-native/src/utils/tickHelpers.ts b/node_modules/victory-native/src/utils/tickHelpers.ts
+index 100fb89..ea9fdca 100644
+--- a/node_modules/victory-native/src/utils/tickHelpers.ts
++++ b/node_modules/victory-native/src/utils/tickHelpers.ts
+@@ -17,7 +17,7 @@ export const downsampleTicks = (tickValues: number[], tickCount: number) => {
+   }
+ 
+   if (tickCount <= 0) {
+-    return [];
++    return tickValues;
+   }
+ 
+   if (!Array.isArray(tickValues) || tickValues.length <= tickCount) {

From bd4fbb55a1241724d89b9e6f61b1e29d756d3f54 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 27 Sep 2026 06:35:18 +0100
Subject: [PATCH 174/781] update __goled__ bar charts

---
 ...op-employees-by-spend-truncated-labels.png | Bin 18231 -> 18526 bytes
 .../__golden__/top-employees-by-spend.png     | Bin 13401 -> 13673 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend-truncated-labels.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend-truncated-labels.png
index a934e07abadb3550b2a3b4c2d06b3bb1a2c73a58..3d1eb1a176263b309e40fb3509914e5d0799ec1e 100644
GIT binary patch
literal 18526
zcmdVCcU)85x-|;cR}^_)6_7|#0TB?e&^sbvK#El9Dj=QEkrF@=P^w0X^j<@VNG~BO
zDgshNh;)%&Bal!633mqfKEHeR+4r7v_x;ZIJD>lAthKV%T(dmSc*Yph7kWAx%uEm_
z1_lOZ=<Qqj3=9W~85kIQ{x|}TxL$bU3O){b-Gmzc0saO3Vf!3>XY|t7xXDo7#W~Nw
zaGn8rOU3YU`qHR>kRchfx9WFk$Cicf$+M*kPY!)Nb%^~>+rLKMvx*eg^<<%pmzN)+
zH^(-7>&*kro$*LlSG<|6!6DZ0w_(q}ifV<ve0%72=(DBaJBXBVo*xM>6ZxjnUlP_=
zf31EE^6K(a9AD4qt(^_*dSR~Z|H1&YBoultMihK9)SY2u1s{bsl@EiXC4cHMGBDg1
zI%Eiry<z%4`Bc;dBiVZVv0Agu4KwO&#&k!FXytHzSGwqU1qa1x&ni!A{yO33oAUnF
zw1Eykmx!6&UF%p;&<VI3^4SN#>nE>WZ3wkr3Ar6V?o-PrC`Wv@5;(Dg$nS(TBeO#p
zp!&C!vvVZCmDxLIx%GHkK3XafzPprXozBf=J@sAujoVnIR<tp?zvkf18Fr2Wj~0!E
zipG^BEZV4{E<NbVUe!P|%|yf!tDfddG&FmN;C>@+R68nN^I0}sr$}+UQfu8fC^zG1
zrMR@B%4v<*-j>=?K{4HKbvQb3QUrs&WMCbHG0)S-kv{V3el<2JQo6F+ShF&WOsIPd
zpB+nS@V^y-+>0B)57fb%ntayx((*<lS)AHnRs+jYaj*H7yE}V*ytw;AfBmtXg1u!7
z%aUv*WZJlsNP?L9rGu`cSd#+QX-!?tUh3<@xvq-I>6w{<g|lnNyXRZcyE^B5-3$Ws
zqqyJ58{ypQpk!v|Wk^_7JS>kkWS|uozmxcFk0LeJhafvwJ(!i`zooXgH@Y5r$x^ED
zt~F1&bzZ@_0ijvL%)*#vmEOOo!|65*4DL_BkZCr7H;bq3TJu4n2OpAF3(1tnxB%2>
zv(ftAWXSa5^77CIErce3ClHV@_vdW3!G(uYvK+_6_B1xN)B9Y;>0LgF-Iap&f!D+p
zj>=Wrjyf&3DdsEf{>nNRj@H<ts%6Of86&Es1k4**c=R3B>f@%flKAYnI`BnlQcimx
z?V{r52y^iAs`8DPoezSzs-0gdt|QegtSdEK-vywl63ZvIx3`=oN?Bdw&?p-{=i0>z
z>s@4x{W5`+2J8LxM9{3pBZCcXS`xmujZM84{1CY=wOFKdHxysm{NX}s)^^E^eQ@b!
zFxh!Duw%+Mc0yl5a+nq0H{gLqY==xCw#T#5^5UgX1X_4Ug7kSa1Zn0Se*n#IZ#fk`
z-W6Dcp9IqmvUrV<&6b=vKTg{!<#VK=gHf2{iv7KI!anQIPoQ?!j>GGMee#wC;+s`8
z6fJV#$CKv^LIP9}B&CoYt-Q*r<PGXaq!<*TxYKgZY%MLBOb*maxF)R)6Wvj^UfF5r
z-7r97p=!>O&a>m}Nb9WTA^29d{=-S{1zff4+JrqsN?vuNLDm)Hf)z#~F_X>wld{mh
zpLk(QYT0135yE@%&ADNT<_#CG-1FAMl^a?J+OF7M`S{)sfq?C!O1+kommI8DUP;dW
zdeUa#Gu6@!iKP-kc92dkHIl9F^}?uv>dD}O^^lI@UfHyIXyn-5tx1hI1fT0@$b+<X
zy8=plEsYOq_KOGWC~ggwAw1xYvV!N@v$d`>4&Fn0qY4iYBO@dISlAnGj7<ZdqsG7!
z_2KS%n~0~o)M>Yhx|%`I%eZj+G!h(4de)>f!tb4o)Ql37U}ME%8!H1~WkCBfmsDeG
zvaSW^?gj-VLb8fI*uz?5R!`#vF5f%&k=Gmd_Af-f7eBxD*rMiw6R{3=>gWO`r^S0F
z=+%ZTPhb7dhx8TRcC7-Em^x6tT5X^9_T``9;m<S?&70W0g3r#zPPcz5i%`(x3*(uO
zOFLznu5N^?+l;5ZMuC<MbGA&ES0xR^?Id>XQD3_mWoKnQ+|h9QS$te;XErKY?3>Bh
zG0<>l@VcF6l`7hT7#Tuq$Zz;*Ui|C_lr8p()jLq*&l2*AbR~uquSkC<uS-3+zId-Z
zs-r!hF?L5(+WIoIw77gAY;P^^5)r<(l%kG4SY}M<Hiq#)^|Q0E$j;UdErg+oH6b4@
zTmlB!xAva*_$R@k2BNd;V59kLhbBL?vT*DIOc(7NOH9-H%WSw%SMM#`9sx$~!0z7V
zDYGnK87N1HW^z!c4Z1IvhZy1*tGt%L;x^;@{dQwJF00#;t-&SA$gIU#n5b|C!Sc=G
z$G+ox27P^hd!tZD@T$_U)-~O>3HPrL>)qEj({7j?yBmueEwC38E=4B#Trp`l>mtg|
z#(5D6Im3?5Ad32uM-ek_N1Uh|*>U&+;j^31Ua=>ART`?Z%EO5s>Vpz2$5&S2UNSe$
zTYrEttJ>Y%D_UwgJ>>B#bOyC`i->MZ;KS^!?>TLL7j~vy+vv&8mTc`AG&7T1IT@K}
zX|t#9EERUxI%w^d);h==LjyKRTSwJfg$k`hT)T(RcIOCf^WLS|#d^eGN(G;U=@Hs+
z5l>0kyPM1>Bc0P8v<XHv)VTzfOudo*Oj<;%w#Lun#3Z4JQYUB9=-zgs+xE)o@*W)P
zP-(~LPf@54s;n;8qv(r(!^p1_^!x7xhUBQ{pBVU+pt8(u9av*Z#<PuXO|=AUjawW3
z40TWl8qT1!r3>&wk9vB^if@qeZPmins$?QMEFDEqT$|<Td-;sl*49Y<8)Z~VamqG`
zDXxpx?DbT`o|2HnAYHFu8akDV%ew5S9OJ1o4P}Sr)^8?#@%s?+);IAwcBBl%vhv17
z>+~Ch>fK=f@x9dyd-7cOp4tuT-JCD+oCO$}K_NjgLMQKaal3EKmXdKb3lQ0>rZPoq
zq_5pHQ>0a(LCfo-)y^Yq(Q2C`*P&U&K|yGML%X<tU1M!v&<DmRu5LK@)jN}YWM@M&
zt8&tlwxOz>k2|AE^8+VisRCY^-XgDSB_lfQPH19s>EohkWo0S3N8O2-XWt`oV75ZU
zoCkD6a;M(hvzyJh|AL1hRJh0HKq+5my1X`(^31V!fpy6De%1;^YU1a*GSQLr95i6D
z2-|0}v$?RY&`3g+)Gp?j!<;wVe!=9g`j=j8`B;5^{RZ6UJ{m+qpJ8Sj^7jls;kx5{
zddlWL)TvhjhSt_-bUbJCPmgi=hY5?b=A!<h_JJU^y3XviqRATq9i-_obhUSjS%Com
z;;`R1I?@e;>Z}mkqb`~?1jjayY*sf*kbUV*1evv@R}uyC1N`Yzba7HmT%bwUUL{MH
z@neT##jz?Ce|sj9SbT`NO+>!)7nUqcZZHGG9BRa=T`OIky*IJh{|zNVsTp-mwJ%n*
zwLorx@^f)Cb@!V^?77UGMD%V&r?X&ZF|zgkK=(lg1_#r4*|4Y?8P1au(wt^5w^R7$
zKbRMh>)ZoGVgM@iW<IbW@niaM2mu*AyZCMU;%5zYM@ro>^<?kQ<>A)=dMsB_#vDm7
zGAb=CH1mt&LbG$jb2Y|Zdj0-+tn&(l4l7A67E?#Tr@;j}%zAJ52Y}5CS6L4TfsZ@k
zp>#m~52tYQ#Y&sDnPXNpw{%Cmu&0jP@@v5AO1bu|gqb$L+6|d?ZoBvlhYKqjjlcX;
zyP5Vy2Q%BuJ2=!77}+f6mE`2)Tzz@{M#fhqkr1R2?#ozN)u$(&D}<pM4c(0X)^h`;
zxuu%N4(3XDEiA8*emVGLJ^koq_U=()S8~$j>sKsT#${BS6&05usx$0a&h5-n5<B+l
zA?q7yrKRObBO`p!`0hGgkGprZYj$=7It)z>P{gkEf<5?-m=LnefwV(Z+6BY#Ox(%Y
zjTYU}PU>rfISzeKlkmM2;cOmgnGw9V>6dVdy{J(@$B|ISz@XgyAT_jM@dxAKt!-z*
zhl7@<^lF!P%#_mC^AAv|jrq+rO`G$rvYtQdE>boU`Rv>V%P0{6)E~XA)$lz<5%Wg%
zk{1W32fj6nxDNO9WQPkY;S&~NhE5L=Y^dEk!r1TmjbC(KJhF~g2j#BjmE&GMX)}8l
zkT~EvTq@`0wxb(4FyspQuIN%+ea>L0nRDg*Y`6UQ(%I$;&?YW9xaNZ#cG{`_c%H09
z%IL&oE2%A_dcn(7+DLevI5SfiJ6!Adxc&aNISP@Fw+_x(NL`R@1=B0wlEIZ#f|U5>
zoh^^fIy=Nk9=XCJk*WwoQ_F(dWRYIj_%?Fvp1id{_Zjg)zs>;>3K6>t-J>QeIgXlG
zYa;09K;*Q_+>BEkuDVNvQ#=|Mq=R;gt;~P<5f+nYF?lvcx`OEQ)>!x~I>4*#A$2Vt
zJwF<sys)N(mDq`!Prc^xZjt={%{}d`t5C*Z8sxR2g+z_n;PS?!@!A4c79KevC2MO-
zDL%{KX5-Q8lmNTwnVJUOt{0PFTJ-p+_5t{r7fDPXbCISxP(f9ZHQp0KosJ*!xSz#0
zzig*9<t<Ad582K;$)hynuv41q<R9=@@>o%tubUs&cvPt-isl*pC6*JvBrQc8%2|xa
zmzvKj*iPmX)752;iN)Jz!CvxZ2rHt|l`Qoir9pAF@#bRoiV_0#<2?g&l&)TAR@Mej
zTau_~3h2i<jd+EUYpRig!cs-O!5TW8giKY_fSH`Z07{PO(5q_edVzJ)XiBB6hZio|
z3!9gw9@qcuu8pjv4M4o06$P_AnR&16yXWTGnv838wIId6dK3})pbv%kuHGKAvNEZ1
z_3%%*c`(dkSS=zPS=yj^vZ(SiJW5l`mQ3~upO;F$V(f2cm$xbBOG!96WxKc&FJCAJ
zYgR*IM=nBR<IFWJZceTyn|z&cpDXYiA3)PcA!b!;H}F#84)@y66IQA2%TBS}spUOC
zeq6G-a#_CU>BpOvS&B_<M6=XA*odOr)3|i$9MGWo*UXFFlW+f8TPM4cw+=FdW_Fxm
z^y!`m)6~9=;48Rv$r1dG$e;TDI77iY-@ijC2`8vs@8Ob1_0*XWl##T0LZdOQvFLfa
zq<e}Tk5i#BMnyfJ^Ns~C2|1IMeSVK2JaWU))6z~0#EQi2&$A77-oqE_w_VN6^<WM0
zm~tI~HC<=Jg+CSK7Vm=Ov{>0KB{^iTd`n4T@0Sf|l@VB6rOwWV<9g!@JN;7q$dG$)
z9*uh>H^ay8OlQd<#e9k0T;p6vH$X3%oi29{P6u;>@HRoEGlG;fvv-bWjQkQ0L4^w^
zA#)ovrR*&TPAGtA?QiTt`WJ@G=!>pZC#x@lYZy|!dF<qXS0y(-v*l>D|K>?9CAj9M
zcFMxg7XUT}+`KU5CDm;UxQ&$RO%s&f$I!EO`Gru#64{46?6rB`^mOWw8KHYX%kBD_
zyI=D9ngs2UA>MEiRiKrSB(BGMw8(O`=E9RFLq5MkozuX0Y@1ST>mR??U*9<-_*F@n
z_ehZ@Lj9x;?u%9&l5cQv$*jRQwktUijPY0S{G1OLST>Uuqhn+GPH&D712WE>Lsrg4
zTcG_OEfWUU)hN^F(Cri6?O;Y!A6_S6U<zex?V4PQ!FRg50`j3)ROeoS8zd!%T0fX7
z-mtxB!^rTyy5(1B!wqL_E-%G#1%AWQH6$qHi7%J@d21L?hP**G2%E;YvYO4BJ>Yrp
z*SR*Ni6MMxSvdkX-@m$R08tRf^h!=ACYF|!7~9^fLyAbB*BjmlLA{|-jr5HRo1O+~
zpOr8hvl<f;6gGhRr)UZb85$YjCOoFuGjShTJ0yf$9rA7jC*qBSM9@8<!PKD<U%jBG
zidI--xyqB5MFgRXwJ@WF&jP2as=D8QzXyN!AY+3|rfjR&VOb_fk19G=M~+?I*=&1M
zJHI{XRYkmA1Hy1WS<cVTFVV!fwA-$ORMee;kLo<<vzOplT0Q79_37B?RhPQOEk*Ks
z)pA#Cmtww1pznO+4SOg;a(Sry)7;r`3(xwGQf6s;u&&aDpZ-%s`ClmER1jr*Zg6nx
zZF02@%w14DSIw-;Q8s$Ck~D>3aR||=3Er%&omyNTwM~(i5w+qdaSZUG$wT|*F3fAj
z#5q=Vf+^**cIU~X@oS@a$>4s6422LY*p*Z<T^5#6X_sdYDH@uHBLaL2`0Wsrdk)1n
z!&0rZ2CcM=?Mw5UEEa2B@f25cerSAWoe2OYRj%V!RQImau5RbfaTG+lH5%}st&!b|
z<Jr#`ds72&b&{L)djlmDZ=AZ3v58=zb-o)9Ve3+f%Ib@D*;M2>br~IXBK~DjtCHf8
zmZJp=v7gr^)(3_YIN6C#@l5f07E=sVatn*0bEV_g_qMT6p7PE{UvZh{<aY$TV|Pwi
zz*HAUC#|`98!HZgM(9`zs<0`aD;hs1gs-lq*tW<jNH6>5X#r$&mH&W~l$?PfA2MFI
zRv`=UVcA8011EJ{5P(Pir?O*JZI6(5eS8Xf?XuGhjgv~syWG4v<}UH`hpQ)ty6KzP
zo7mZ<?4L9-X@7*g)(~@&_rD6d{$KFe|BzEGdB>HzuTrLX3>S*8HJo5DY2nB_&d~E0
zRpDUb5^MPx;vb#Nn7gksRn(LF?WDs1u<SX=+MnobV-!cT*bTqL4Ocs^=?AgYPu?GF
zl6&IGv|x+3hI>IXynr1%MJGW+oj)}pmd&hFT)jCm)RjS*R~NBs@ZnUVj8m*=p20qL
zCA`d~fa*-q7F@DVqt<=lM9IOtkNy4I)Tw<|_0o!h{7>@I0+?|<w^B`>_40e~Gps)#
zuNUy$bEjnY!LK_r#}AIO)n<UJdj+}G*}?P+EnnB1I=Gh5*lXvli9T8U+0HItezZ2V
zN(rPRHPSq8B6yu?jZ7<LrA(v?$eB(gb||D2(J>VW!f3GCMrkyFw57dnesQRhFvjB(
z)sy=KF|yg3h{ndo;8l_rc$OUqso4xlA<MFlLjed^7Mp;r4s>61!<GHG3ohpmfGfK~
ztyG%X?926DVzFJBN@!Aois$PpshzjGC}Ra#s+*Cak)y{9Q}~g?^Q8L9s1wHtVK_Hf
zA0ZWGUImaTwC_#Me5&-!5lqef%rAB^eQ&2!Kz)c?JU+Ylxn5V$tK-qKOag!O=iCb3
z>)yEMC!l>%ooT7ASVOpK*t>Wh0^Fd`scqp7s7^d<-BUotLCB?LKGED@GKungHWM*c
ze7pO6p4P&3jAFK=xcHns8nYCTk(98+lmeK{RK*9mH^ain?SVum_nWy^kADuQ*6#Ac
ztBKA9m-tGmaxDyC5M=8qA|8QHF{|J90?1@#f%x^s<dD~8t!{a7a~&CS(I&f)<aN!G
zV=vm<J9|O<hqAnG9qa7{0W0sIj0S0BNv0Hu#yPLg3W5M@-_0&D%*}Rc$l=OPysfbG
zRpqdsr_cPDEuw0?lel81m&{q@+S}dXL?$Ad@4F=?+O2JDBo-AV_ZDQIOGr2)#K-q-
z?s^aN!ot$KL8mEV$nvwZ7LD|AaD6d8+@aOxv5Lt55qkVXH?BqX8kN_`!b}Lt^lP2a
z^F$Dle{H^{%2xYPUTCV<b=|g#RVEVl&lQBtWJ2I|-MqetxmdO1Q|{8<Q=dHS@|k;A
zcX96qmjP(L2-OeEQ}I81Sm?4W!DVOqKfo+YHu_|4&_c5mqbev{b-^|Ft}u}r|GYjb
z!X`7FK*t20(i!jS>Pt!s3!ywZMF!QrX^TGEC~adNYcMs0FP~RF8b7me=WdSvX@qx8
z@$InFr+kQ0=I6*2PFm2)<>b<G6utsi<h?`^bp2j|y1P>_Iahp4>!8siuSIXAxnnnn
zE11i<6n0Es)SYT(-%}y>)Zdtn%yO7}rz!jN_!&8nX`Nvk7i7|P=m{9G%XS`>#my5R
zKV4F5otrB$0N_Ah&8Q%5HcS7ZcMP8+m<`u!T?RmEpPrw{0U**YOS&AObugV5ru~V<
zZ|mwlZ)h!l8$!=L52k#^b=TA8dDsdqkFuQgv;fOfwv>>ig4u-_LId1~xWE876KJ4-
zSeAaP+aXnMf>nf*dtCj#E=&q5StFBB=6Q6)qVAMxm7%1I5D&QBAe?;?<Z0&NnuVE|
z<9;Kb)zlpCP_AN{9iGT5j7WI8r+&Pt%Idqi_M~H2tQz14brz1HVpmXOEi1k$sOTKg
z17YdDv75v+zfNBCT#4*XlR?^Oxiyw-Pu*IrUn8&VUf;z(ti(Hv91Xs*dXS+<>+PrU
z=w-!(0>;0ncer%u<7tkz{wdYoSB<344}d2hc?;4L-^Wu*L!VA5F)(0`Ywdyq@A?1p
za{ZsBhb=9Ahu59Pc@YsuOi?uT<fm?Wrlyx*Fl+yS01iv01{EkY=jP3iF`@@Yv&*|g
z(@^R(8i?EAGD}NAfRy|LcOaIUk?u$Sd&H`r54;)YIMlOt!!)@hKrp=U7dInhjtk@v
zcX|%#&AgzVe29U;>;s3P#d_C(iG!C>In8XhfSyBO$u5ZoI(Z#{%n&)BooiC!(LY~g
zpR^cQG%nR}2E_UU2ZRC&;@dZ!90v*N$)K}SRg~4xWHEb1<Gb+0UON!rJO0$`bvBZA
zG1G4zp1TgZ+3t_xIlQNfntC$mbWv4seUh`7cmrsII|sO(gj79;C3s-n2}V}TkY3j9
zJS}h?$YZ%C^aOuj@sJ_O46d*%E^;3KZ}+PXChS>ln>K+?W?-=R(lU1d(7<#yLc%e`
zcOWln4p-Ddonf6?q#6m6T4Z#6-+kQJd30rEWd*?p>SF$r&wFEDyq@-`SUv|3RDexy
zVCs!YE6nbupSbH%Cq(XI3pw!L(;4$M*GO!ehnWd{duQ@GKnpvs%Ky8h!!OFEWoj2r
zt9zWYVaGG@{6lOq0{b0f;P~PoShQa|JGIZ%!f?M5KCIQ6@k5c=-J5s`d_>HI*^KjQ
zfAoXeh1H(LebKJ!{Taq;e*eSUX6f}eRcJKXKw49u!I3uYzOkhi@MH2EsnO`JQNiaF
z;WLmk`MB9GAv&|8(};muJJ-1NZcumlpf(YO&OhIrBMm+Eha_LqY(X3?$#1%Y7E4F7
z&ngyt6G^L{)l0g<7X2meYmYX2w@dl=rjo&pq@eXb@?O5rzJwk2n|jOL>=nV+)`2rP
zXk$YjoINKFNF`a5AS-Ko9(|{u%7hIblr<8>|LI2_IF!^#{#{4aM3a|j7GrxMpgy?Y
z&*rWp*XVGsIvYIG2t5)IDg0T^!b=rqSY`jbmmjeE#()v{pOxHfuV5cf8bS5paE$)z
zBSNA=rM;3Tiwszej26yu=JrJ~0VQto(j3b=tq_#*bS`J%%L87(`k(-7MXzj+dcGr5
zHMk8{+T`I4j$!Hr%!z!g$%#&VZ_XuTUY`@{dRZkx@dshUgscGOkZn@v(9kJtZE`YV
z@+Uv^10y4-;m?B-<ufVX(8IBWPw;)Wwdzr;x=eQvMMX?s4_?lmN&jZx>C$w7Dt4%B
z>bvxG<~Lk%)detx4*<54OUA>3!%@{+ey_^Kw{gtk-EBnw4+lLfl_yM5T@u5={>nan
zegtgDrYW>9CHJO?Wv!X{#!_Ewi$+6@porM(_}cg@Ng*S7Gq7r>-Qr%ex`*{a@E~um
zFFur|^;kqc2(qNzmiV@Af=S5>Xg~;_2`|;Jg(y>0g!sacmXm+?0wlJ8kgM!>T}|0F
z7T?-RuKfJ)ZuWTi%XznouYyH<ZC3WlE%OPVJGG4@B(y2+vKgh-!xm^~C)anBEg|vC
z_f!}eWgm;1*heuXroPOtR8xbbzbp<E7#}K*H!{~ub%kkTn;&St(CT@yyQ|KK@9ey2
zSw_{Div89@8*$Nwz*X~pIiV|^=Z7R@t&J~6wp=K}l|&qg1hcs^aOGy!TX8+RnlB+f
zf<5N#fA~2)j4`-jkQxV=+-%<R7p->&mwcBy75O4@B?^%&LbAEoD{gFn>A8(S<l1<X
z`UOFaSCU(*-@2|VcuiIvAufI4Zi>02voe+j$Th&sG`-X1Gy!Q@s8oo&*5qe+&tl|Z
zpmV#BFg+n%P<awN6n5~Sk#l9qhY5%Nl}qz-EJ0caZ6+bruyL%eWTSR>cV=E2VZ8rw
zmezF}f4c%8R09N}4hm7*%3+^f(tI3OzwhN*=%Q}Je3A7%@8MH^(?%B6wIGUOo(pzm
zTLm+h@_~}@Bw$^uokKvX_T~IuG<}XhS3U#gYUFImtBF}?qmBVo@91d(VO|MsbXS%D
z6r#X4%BmMxbYdXF)!fJH%Vns(g<-;%d=}hdG}~8PizVPx1h0r2K42H)scXX2R|I)6
zm!_qqJ><>v?(m5vp7ncuW{M~K<InYF*@Lo|74MpAc##{iRHIiDf31-mf`>LZ6^mcn
zGl^eTRB2?fn+I#B`oWF~Ao&KDW#ckDs_sxe1VpoqPrnRTg0TQJ@_}CGYM?uPH~fnv
z8!fTHi`|sfNiV=%;^Gt<zC<irmjI5*FE;DDD{=6yq<QQY_z!~Z3#^RT_|G2KRRsz!
ze$mJ{scm@JBy-ez`;QnSef{E>FR$ixC`%P1D?1(`UtvRV0v$hw4E|kiwm7Y|n^Cc&
zmvrP7X>q_^2r6~rT+U>Xu9WEvaejl{g937)cbs6-R_r_PWg+?!1bE(OConM3e}2$3
z-g{@q%2lHyrW`DBlDC3l_7_t8(yuj|!t0?B4aK3>vHRWt=42NwlJ|kgRrY^?8M#{i
z_2(=>cAc9Cxl{k3>fi2k$k4l_Uyr+w-Zhb-QKGNUUeS)B7kr^zAYE$RqG-YHxc#6j
z6FrU!G!^RAxZ1}4acc<cM1Qmm=h~)t!$pvE>6zV9a>PIsi65sYRAsUEbX4^JAXxlE
z)4&w_ugDy~fAtyU<(?ZcirYsMWt~p=6VG<*@dri<b{1hXnYfV3emtrR;JKq=H;S)f
zni?LWO61Fw&ban$<%v1N?P~UO1oC-k6nDYfX8ri|AQKoH>>3@0xF-UP!AqU3Pn3Nq
zEDp+L26tBa5xg8%z@?B^3mGT(xe&`3@LOTzMobMM{VM&cp3k5=dp+;X9A)^C3V=v_
zl8pf9J$Dr7Jq?he=T3p%VCMy2&MlmF^gag0DEcqG-aKY{AG>#gt6Cwhu}1Iw>h_V2
zs5-dC)cj1j$wi+1`@6F~K5H3z_dkUq!UiVRXs{dwcRn2(T#{4^*O=>Ct-YM9JMM<c
zYuptNN<H%U$T>^kzN%via8*v^1E`VubAC2PG*9cBIqlUIH@ASFD?3vwZoM;>a^#J7
zEFkI3d~NL*o?C0U^Cl8&wGe`KTh*2P-C3lC&>;jM2SvIpa?Xc@(3!A#!LX@Ij<Agf
zK-viKri_*rm-hYq#>&LZ)Hm;C&&t78eza(GEFUdlUhA+!gM$)G6(`~GjXA*egM4hq
z*@6dcVTSrvg#`94LbO+w{!CIQy|M(_r;Uc~T;X3Fh<w&GDUfd*F^AQ{DXTVK)AJq=
zG>gWsL%F%RWex7-*A*AL$+($l#n=}kFf9o)IBVVTIHT;w_}`;mY;v?8;A`qqb+RQI
zhd@|fs039lPT-EAgZo=6f1)MO$@-7$2AQuXh2*0*;Hds*e2K;h&I{T$<a<9cX76MT
zgr!2tdsT6kRC-PfJZU$d68We@u!u&Y-TbVsE+}!~u4%mtBuW1Ej#u2}3$kV)R(YSF
zeV&=7py5OI32>#!^S6FpT-wfkG~9CYrX|sfGGeN>!R!}~qtp38$y~_46};~NA;DnQ
zhdk)ythEbhc+I%zWWK{k4><s8RbD~<3{FY^b3p+j9}p7ETyKD+|61{m)_|=fQ?ZP|
zdIIM;wDR8Z527-XIzZ$Q7jk_*cCSkLWTYxkK}^(#{^aUb5&;zu5GW9Q64H<a6TR%G
zxn7+$))2i6omnF}b@~cIf$kc(2d7oUxK!LbGv{}~w!!?0=fchNRfNH5cUe0RF9RcO
z?bnLHjpei~NmxuZODj`s2BU4PryP2cyAuzv0ALR0UGBc3bE0EywUP@q_$0)mVKG)#
z?wnY;nv(M7F&{R(;Czcj3PeU)d-d)?S-3n6hK>&of)_P{Smkg!K4sw$Xewqfa>`w{
zdiIx!ng%KPb7w9k;s{h<-#aEQQ?{UeL5N<9KBfustGC{!Gq6H{D`B1^SZ8u`YsSTz
zY`mBRlhF`lPr5qB6di5uf;DupP57v~<1i65EhH*z1T-JT!MF78I>XA{%Wor6I;|T8
zg5XLovipBi?xT9rmDDU3iz20vxA!(=8$qJL+1yx3OfIr#=LFa%bY;@m!0O}S7_Oed
z*^HqjUn&KqwAdQoortcjCu-IXI*}^HFr>v}EB|r<`Sug+<!IzP@$<P^^S|NNB3^4(
z-L%0s(NlM3zF80#L-zo__x_`p3rxayEgd_XcbvB4f<WuW;`o8Q{;${~tD<WgdqL$I
zI`%X)%6EG<2C`qTVGjK_87%)@Icqs!4Wb(e7>Pf*a%3*pB+TJ!J18JdDx9;|d+_`t
zMH7D4#}LLEQeqz8T&TnfOH%z^&0bPg4xe!83ZO15X?7}*GkXib+n+w4{ZZW5h_i3E
zk88h}J)y1~Ub4HpWG`!E;^fT%`cC<f;Tz5BmU5PM-~D)e^-o6D!q+y!*XiZ!{qqNe
z?g$X99O#*1|I)a$kr+|17S28oWx{d%Er;x%ISINabSyTM$>5mpCO#%R=l26|(I04!
zZ9H>-l}`JDTLLEds-}l&idDcS>e4chk_`WXQ@rcOLHx#Gox+2qXWMj)zXvDBeFjV!
zfXR@g>-Q$r;}DUJfwlNvQ``Z43Er!t^t>MW;U9BH(2XRsMs0!PObPXNl}ypy&NKbP
zv7#vLF*k0?-S2z~c>A*79W#gjmnu+a$Pt3eXf9BQpolLgv<aWCNzt`2aZ#Iu2!0lQ
zph#I+OIwR|!8Pe{xjW~I=@qtEu2(r}>bAEL#x7(1E`eS_O-&M4C3UEj4Los=78j+d
z*)PR6CB%)2JGTDI1f*X5CSGv?+n7@r3d9oR>#HxUxb)6JAf!ryl`lp|OVc;}TVIqX
zkj3xjeE1MBjq#HJ@LWuO)wL63&gP-bYCzQ)n%ylgk&4CJyx63(u&9yUdUY0R>nZZ9
z)2;NvIMd&uCf##EmncRLJ^H6lB_^ijft**RH2eHiZeF5~xW-Y>xVid4FJLDtBFuCf
zcv>`dWr{h~C|u#I!dC#?jns92u9GD<%+Kg!PFjCwMwJ@{uua)Kz~>)0Pr4fZvM4eV
zC{m?$RfY{`4@924^NJ6MK!yCy*Uug9Pk-%C4~*G+;rEj{&lQcl_J<@&-hy2*J0IDS
z!z&Oc%<K9b5P(UYZiF-~HYftZ$=oh{Sx=?6{?YI-Q!xT4`F0iVJe&Ydn$n*hi=XB3
zLzrJ-J4~_sBV~mxI^9zfvE<_mNJi6<5xQWQ&jQLNv&K$xL*c+BWIXz2*i+Use`bei
zc=;3->y;dX%9<PIe>nD{!EX%}OSxBFkUzLllVD_ATvujzcj7M-`Hh)7_aMdB&AYdb
z>t18j*MDvhcC(;fm1}MNHw5LE#ta+-fIhI2rES972`JvcrYaVlrUtyXi2VGyvs?;3
znn0!mnSd^Q0!8l?AISKI0B1mY&{&XF>3MVMbSvONN&vlyktcGova#2GA3FtD8_zYJ
zIbf9#l(+`XQBfK7mH&1TebX#?wvez{=QwoA&$W%n@d0RI7Cryl@&%@#q7LX2+&3f?
zCmTeiH5G>Io#s~)*{H+hlM09h@dhwDJtyh3=dMZP!T-Q|N^XYDyVgKrciy90udGV7
z;x59y{lZR##g>2C6%y{4T3!~`)fLOrQjxkWC}?>5_M2Y2>~sD2LAy%)*KzD7s*J1-
zloC%rzvS9lbZ>$8A6mOd2H}^r4ql|BD5hHpFL3s;NZy<J5z-14l)`~h#-wt~0w6)o
zCG`@{S!$v^i@$3Jc9BOa--CjN4XnKWuIKYSgA>!#z)O~cT-$T98XftsEZ6S?HqJc}
zFq@e6-s@ceG~f3H?48gjVAKB=9~x!Fj}r5PGXCwTBb?5^zTpD2pSt=pgNi5WCLnYU
z-2?>Tk4aIgZ&S;Dbs`6lz3{GWmFg?n?+e0avwx<txg`d}D^;b`J(oeYRXEJZN=Sdh
zASn2$L?x$hB<JL|Kg9AcfS-Z#Rn-v@*lt(-PW>bUL%CwP3do874Vwc1@@EK$=oQ$@
z*4NNR4)ghkJ7)X6iP%=34}^d5GY4BJehhu&F!WC049qb$w4D#>LJe$<Bv;o;j?W=L
zU|_kW{MqQ0vsmA9s}-R=>dJlvqX0Nj6MQ^VQfYB>`+je*+ys{y4e8~D2;F-~Pf^)N
zFJ%8LHMdSd-5^izCzXId4hS`<#i4rk%NZ6x(AIvfVBhCh=PrN(h>h(x;rjcFD*R$B
zJ!O&pJY;C$!&dKDtQ)e=Zz_O{ZZfL+fn&|xOKQJ*QvFlU!-!1&h12CN<e*n4b1L#N
zqVI42XBysv9ZOV&_W+DCn#T|w|9}YMU_d5_+Wc*!qn6mm6q&q^xl@lITDd0H7>I<y
z{0Ju)qH;Z;%80ZHe<jfClC@1>xtLANynfpavGIr}35ze)C>lpal?u^|nx5?Q8H#?!
zuO3VQ)nZwjVpi!BT|*oPgvJeV%hRnR*#x$4xVo6TbhOVuZ5IHa2*OBj3ew$X3X$(@
zEAEK{|C$@*)di?og}*`N@*~6)YvGfz2auU_1w=9j%v%QZbL0Y<u{tM5MJaIEj<8sj
zZ)@`P3hFX}bnG-MgtN?KEYJjqKje?6#|N6GdFGLDYhj5CP`X$bfV-!V^cbB~*45wM
zndMCC@iqzhzge6-+e?%%SiOo@cYy=Q(AX^wq{=>8I<MyQIOBm{POh&qxwDVD?^?n$
ztkRTpflwwJ*jzlg@%CkpZ+t;zjhd1e5|7oQfWq8Cn=WLDL<1IrF4-Z@aQ>OCvU-fp
zN!{7I&6=E~i8!#kE8%@VijOYJ{3D(Ctnpu<6D4qT?m$_CObH!=AiI^^Rx17%YiOg6
zAN!OO2UBSh#kAnQx9&x5@qSKD>A06e0CZJ{x8CtVfXp|xqza_EA+N1$;H~NS`RFdt
zS@{G7Wz~T%Qs2%e5m0eH@_PxV@@)8^V4M;G06Iciq`N`*TfYeJeDVNQ3Ghzpi**NT
zgn#}lQj?~ll32C&CN0z4zSjULB2-yzBLD)2F^O`cIN7>Z5DEx)RmR}p<)QIzLMgCA
zIc|R;FA$2*+zrboP2oY)v(ET;KF;2opW51QYvYjXvrvRO3)Js$|Ab&z^@CyK(e!JY
zh%@Z01wh>-QF0Hjk=zMiKR7ZSXEyr&x#OrP3`V@yhdAQ9wPo>wSzwg(@lrHR{By4e
z5zv(7+VoUW*5RvXpXKLNIZR%xrIqn0DVj8o&A^R|fjH&CvnA2^X*}ITK-OEhgQ{Q*
z+!IY0`1Jg|owwlJ5n!ueI(F<v!wK)O2H8fJ8p!s}(S7X-I50*=N2iyUoxKIQKAyrp
z@#Sgn3w<73c(RD=m46dlg$*nP8BFkt@yl9-a(%#ak4jAs?cB&d+I1R;smiT?>B(Iv
z46%(&-Xx~jj&N<83=cZx2?MmP!10^x`bT$cZb!Iz>^@Uw3;3=2Dn<E&puF(rWMs8m
zd1Xi^lIEmAK<g*nDpG&;_h<ClUHT$Th7siU1t5~Ud@)bPsd=%2NEx5NCIf>>X)j=r
zkOe8nchFt8zRdV{NW(Dv^CtX%BDMaht@r;AOZKnb@H3!BKRJ4X9LMlpYTps^k5=RV
zLYtx<;rj<5mIq`*{TI33%#MX`uMEDy#sQ-17{Hd}n4P3vyB|!~V3>pJBaK(b70#^_
zJa$VA#NP!E8@rA+YTzX#qM{+$f>Lotcd#@>eqNEz!X&dZU7eyEqh!dwz%_c-^7_!5
z+JEXpE{E^Y+O8W77%l=sn8d=m6bxHZy5Q8-sf{3Q#eltLtoVi5(C)8z{E$3R4uR@y
z^qT`$mK4?)M_*UMz1YP8Jxl^9cA8q8m!W3${;z$x+7W!Q9Efr#Vf_1?f~+j|8=T-w
z3_^zcyShtP*^>7idTdhBeXk9?3C~`{j)f7o@wmR->J6%kqhd1<?9%**Afn*Fq;Cjm
z7e7qdkqW>%FE@5@7}iYz|08IFQx_?4YI?e0tC*4Um<j=Uk!l!Q`L3Z9GfxSRJf#ju
zFUG+YZF7j;FHJK1n9X?sdLp9NAlsBJr_mZzIouC8RDgseF$_a>7G^1}H_@#tbU|Ja
zh)(!!#;jLJWVL@V5f@(#+Dxbc1rxG4$4coj$s_h`LaCiI;j18>zk_GMZ+jJv=e0f>
zL1r9fnd_;@E2sW`>qf-3o1+!ooqIz~jY4bjB4wnE>w}cC+}-9zQVi-w#|_M&3y4K#
zZ{l<NPN8UP$2-#l(t=6fEr2gnN@j-e(=R!cDY-NiVmfk#iRq67K=r$Ec!gcEkWvTk
zWng;#j~-*l{$Qt{Zl(JVfGfCzFsuQn5=*}kc@=~qK<jvGx8Ax}d8zZ2W|`cXo{eRg
z>c78jCcM?V^NsXi_3}UQHT%;2k)Xq)fL#uFA3-3mB7S{92<FPLo@rjRYzwLtM@z+?
zEh*wjMFFPG^a^`(C!;Y|Ykz$EhIXq-^zm(ymj`?QF2Qtl!NmOf&?6b}HF>V(pNZwG
zv+fTdFRoQE5pfz~VB$j{oI~(mp<tR!xm6U`HQmX1qEhY(wniEmS@K8X1fz$itp&V`
z24+yjRkw_-tughs6--RsB_a3fxYGj~fxDdy%$vZnX$fi&ZORo9^vjls9xY-s3V5kO
z&RJ|0G%%-f{^F=_FiV^5DBx%IrUosMpy7v(v;jj5l@j6DIUtr`{aA-hN{UO)M;~k<
zDR-6IpU=NXR$)YJSAa&>B0nM?GV_Sv0}!H|x|M0Ifa<i?8t=}n<nQd#$i`yn<AoMW
z6$5T024q%d8r30hvylzkn645Y4J0@(Vp<7cdx1oj<74fL2NotU(`Y~0b~{>Q%+jPl
zL8UX5HBj7tApj`rz-dbW-tPXmgFB!jP{#<djy2st{3Np+$1TaN^wol!?RwdhKd)r4
zhYSzxFW$b5&B_ws)wK&=t#{*qKghhHj|25v5jJ?Mc}8T9-tJBd=YigByOqYi#BYA)
z>y%wETS=;wJ`3McIz;Dx1O``E+0#V#f@{Qi?4zPc+g)6#K0B5H!5f_6krDKeljcuw
zUToA-4%gBdJGQJ4bQ{`xZH+|gXPJ@D0Ugez;I9v?z(S&8KCb3^_bw|TvnKW;!)s<l
zZUYB3<eIb*I7{a>XQR5E?FWMC-fQdT)lx-^O3m%ru6e*>SirxitIxj(TrmL--35Zw
z9cV=b9g6+iVs+Co(ypehP3&j_|M{yhoW=6yodzQ%_yPxYu0p_$ylV87-(L4`YqM|L
z&CQAhFt31aFNn7PLWvBYzeRH-(3fRq%?!GpXs@;Y>b2iZK!ng8*_1;^7b70<dXo$%
z1CN6FD$2+zS|i(-1hYW%`U~XmjgMs<)i53R;M{XLc~kVJw5I`|y7Ebu%LAT=R1OIp
zWD-#eKN)wK`^+20zrem|5w(&iJ$WVrd(N^bTSN83e5Z~X)nEJb{GsrdaxN>*UdtOS
z?LsfL-#vN_KR_gW>-uFI(oNh}?Dos*w9i~pysg>YrElaD`}Dv;e4|EHyReY=+^u(4
z@J2)MAA#f-&Ap@id9RvB`!S8B&Q9J}B-HF!S!Gi_^&eO^%&oSuIBb{I2hiGpE!wH-
z;?0{R!qK9VvRn%e8JYHP9r!PG@rH(Gxtx`zC60~@Y;0pc7DEZQJDiHUP1+k?7S+}U
zWt#_*2fkmZ*vQ&TcvUVzbTjlYE%97m_W@5jxU*5YNhNF~k2PlAp!)U`Na-%0mxpqG
zzSA$5wOwqD@m33u@W`xv8bO(z+x6~`FVA?In39b2N=Xqym-XkIZev<;U(J&ttko~p
zd#~oQk60dxxsY#QZ$#+7OxqzEI#ygJ@5(UmEpsh+*~G}p%b($Z6r!6)k)ua9O0?YH
zUW%zR&&<qR5#4DZ=#4jFn$8T>SJv$Lp_^sutW{`F8emh!9g6p}(qP5`IyFbg%V>Bj
zqH28@1G!=QhAAqVJUyl$>n;z)1m1F<A_fD5svC(uXvHgn%u&?RkK2BF-P23F7#4!r
zaZF!}j`CKN(;DX-LBme2n8bg*Onx4NsDG=M#s6t>D+R|+h>xq-gwHJ>3^59s$1KX=
zh(AuMkT=Lu6Ms<zc`dD1M)M|1iX?u_G(&=h8M@Yud-V1=GqOfMeq3DEApFoNEkWVC
zV5buwZ)G=OFcR}Cy=$9fOkua>N>~)~9?F>NI%#euyDsRLd_bTs7skpKUBe%Q60{+%
z-PlrPU^x1V{{I5_IJ&xLBuOjHH+u9EYfuFtSymkwzU*8pFe`w=%*&6%UEgab$wsmR
z4c|e!F)-VBkhh`Zv9ZCmt|HqzB(oL%eQr78V{$$~JNGZ|@901Kdq;o7@6G->zc>5;
zFFG}JJ{qMCO}b<1BC#TRSmcww0GCvnZHbp3KSK|tX~dEtv~bueKp*zTPk0cKCu=$_
z$U=7IDGa}mCo!T_Xyhz|@YJW;1hjYHDvfFbQNxLk`XYGl$R@({Gql&lp%}Sgaagvt
zDzEE`C<}wxVH3S4lIPJihVhSF2J$%45^dY`Gs+P8vZmm#zW#NhliNV6P%+ZoX{?CQ
zd~rPI;39mA^~_hlIc2-4X{%~05O$K9>ve!*NOV}k#B_7w5tsa{D^M_aK6NbWUO6{Y
zS&2EOtK6EB)+dS(hW4)!otHYlPvqEdJTC6}xjPbOf2We?w8_@=HQ(f#A$taGRprA&
zp<D$5)fkd(m`x2E4}O-vH6zupm!y#h*$mg8Y}UKe4<oHE5SBW)4jkYtpPd}l$-*|P
z{AH<{K4hhZtTan}OnS?t89izlh4amjax_UT`EV^O^P1yMeMD=OI4`FSZ$Cq}-Cuf)
zVZtSq4r*h`+K|TUu*P;2UOTf<tM$HG_%k6PKEvfE3@c=0uz6|TV|DpK_p7kfy8Cet
z?R5wPXe^?<?x9`fVAU!P6_p`l8CIy<+pY~O8PWI0*NCDj?Fc7hv!t|6vw!Pto`h0d
zy4~nsZ60;^XYxiaO?E%Bb6Qa{cI+Vu20X+wfo=2~rT(IL*4n^iumRm!%-Q_m)0H$O
z^AIcfaYYmO&V4?9eBT09J5bIFGp@?74fDu5nQ>>J-|jem@5zgRAiQUR9oW;*(kv_c
zCAr6*p<G${@QD?7y9ObY_Re*~@M<$Kp_1M9c5I*l@Ue>u3d;`^wl`UYE;sL%;!CP3
z0aG2~yxxu<qJ0^bO-n2hY4nv&CpOwBIZ&VSL!`XxE{SELpQ#?L3jT0Pn_EKt_(1vH
z418&OsgS}(-+DvkIBIBPLCJ^s@<D2YOAe5rm)7~X6<pAZFN`{j^eoEQvr_XSzr^4|
ztb$C_l29&digm**{+EmfBwbzXmOrnS>$#Qmt9GzCwJX@LVjsM22#;{2Y7n)UN%-Dt
z&8Of;dN>amzW;$hzRQ4w)LkDf7~Y%w8rZKOfAjQ1jbe>k3D-OQlNE@IlX>Yum58qN
zq}t?KTD5IG&69X2a$TFpFRLL^V~#e#>yz{L$GhqL8%0L<^vm*!blb2PH1}ER(Qu!Y
z++!8I{lqV6RbnzF9~uq>QKy!t`GH;UFlAf9pJ!y*R;44(?-MYj$q_Jlt1T<~w~KTj
zQhdgdIvFn^bI3fKAb!e;Y?(ibLqDkb`?>V4#@1hu|41XoJ$X`!LScSx--f@NVa8yo
zUZ3x9BJHKhj8r^cwQS2CJ`6<wz_w^vUV=)jFV^dQb@zHoaI^kn)mzWjn1Xd4#p0*G
zDb|_iPsZ;w*f#MhjxBpHwHj&%y1j}}qP@)w48%|u3M%24f9obn4GRoBe${14Qhz#0
zlX(uWk!DgpP{E>j*VPp@HUjo&uVPQ|l0_ExvSJmIGX&F?XNQF{y4#EiU;`O}{<PuF
zjEqKjLggeE6e?F#WQ;B5kN?)+MJ76IB$RB-rY|oh&fN%|IiG#t2s^GEx$<jqEWd*H
zK!8x8C4mh+pBz`1-dAjT!&_3=0MHan$5#56WMGSf=76mOmNQj$rsGv2*HoY-MLzae
zbBJXvSake*kJV>#KRzP#n&pP&KgrQPo>6gEQthY=Hukt$c)O(aTP3h#jxPK&SX=x2
zV$q8mEOQM!wKREd0f~%TB@ckup+S!wCM^PO<9U{0HoNjej@nzFjFIz*549tOrmuPW
zV-h>Ww_cUBi+m;6Z0?nqdQm7_4!C!Tn)06aY-Z(iTwfdufPEG^eE5)L!^+l!mTLas
zqRi2^HKr0(HAXFEYwK>0W6;T@KD|YBYDnJ=FIM>8y&W5zy$7VHG5(QmN@<E1Cc6NJ
zGFVzZxcv8)eFrVGDZL^%g}uZ$6l!2ppPI~SLaZgh9C=DicrTUI>K2<jg*m5-iaUDb
zLR&jc_GFr@+0%@fD@*LJ!Uh@2;fD;fnJd~0x89xMD!y%?X_OhT{mkK|wcjXLj~2Hl
zk$GeSVw{%n(ycGY;&s;<=rt}e+V)<#o1}lwLk7aJ{aXA)csHQL8Q$yt_8p)3+rj;9
j!m9iGHvSJkMLU{gIMH%vWt8r1WPqya+$z6$|LOk)Pap%?

literal 18231
zcmdVCcRXC*zb;OC2+|M)DMSmBXhD=jkRf^>Er>c=)EG65gdiEc4$+MvdKo2&h#-0y
zT@ZB)2~!vuerxjieD6Kyckb(V?)ThtfA^mJGiL9-_N=w`TJQJsex7INm9Dlr69Xp$
z9UUDL<lbF<I=TaebaeE6$Buv_ZWoi?zz4mzzWN=y(w_4x;L9QJI}pQT;9t<OhcD^q
zF3>^l-Zp%kzBUyQWJqk<|3&`xaOTXhC(qX|UOfJs|Cn%=D}z`YTA1}PJEhWPSge*b
z9*7wwi8a+mO$^u6j6fe69AbU({_CYn6<wz<@Lhevr+kOxcBSLn28*Z01-^^NWd(i^
zgKj;(bz>%dE2EbjB=B=Fs8_ap$SAS?5a>?w^Wo(K;4^INlrB9T-2>r6hP0y$^sL|`
z|BmuuaH{C!f8|r>cy#yi#H0mzvC3g34^eX$pOmR9_~w;O?xZ4d^15_GyqLFC%!*fV
zoeesu-QI;HzSq4Bp5rxz)`P-e5<C@Iau^@4rb!UK%B;upE&SjeROk)XK~(*Uu4O%c
zP7uPtbmB&p8o1JjxAmaQ!^cWwtgjzt7x%o->BSMt^Y>-e$FpCcjGelg6(XZv4{Xm~
zCjOLJHw-I7`nb#P+_QNy(nvB9HN!x;{M=38wutqNTSm1OO6v&UIt#Jj8d$`l*#5l<
zvZIKU;_W!K=>BK5lVajJy$->l6iOQ0-#1Zl-=#n;FArBA!IRLGeOp{~J3@M63>{zh
zICyD&*QfR6egA!KGz$G__i+F&d|$>~o@E_7w;!NaYo%m`sFD#k!G3GDKDevugl%lw
z+#)%92jOLpL@;VEN9S!gZ%t1LmlYeT=|?up?p&EtTvs!@nrPgvYZ?Sqg75f4YlEY1
zAoP7U;)_!Krc9-zrK({k_7t1DDKH&Tyux~t#6HYA)F295I?{kQk3Y$Z-uK5gr3Q5;
zI|Mhi_*EyCnCDEM*=cYl_(sN@>svg3kS?t91WRGk{M4{nDlrOq4}m!HWx16JMw|_=
zhF1DkE>bC>3phM}nv}Lr36_$UF7~)rxab)CZpRGiv@X7HPQKqz)Yi;i3e8pz+1Wtk
znwRmGG0E4$eifjqM3%y=D6=injMkMQdyU%Ziu{oAjI^ALqb!Au#ro<DjC_zW^-aRB
zFT`=ogQ9nrDKde`E;LGEzIi|2c|5?gWn^P?k=fszgn!GYa1AfLv%Br`v2(#KrVMST
zyWzP!%f6>&UP*SLFrASK(v3_k-8YOfF6(=`zimDBXg=3?Y2yiU&-6)1$ST+A;s7&V
znAJ!-e95Gxf9gy@73{<ks&Yacl~@zAyYOvaWvP3Ay3vBRFiB#j#h;(_BXVUD#YQSy
zcE!m-RKIm|G!Hu+U7tm4{gLXbcX#&p+D-T%TOmX)eCB>Lv$$n8m)b*@Hg+VAT8&C|
zQ?e)c$`SUw@MiA~TlV+75xM(&yVj{0c?vBXOIABgd@FHDR)5xobyKBjO3@13ZY7Xn
z+iTKYgM{Nv6H2BF@%yH^d%+Z!rH@pNSJ8v7VzJA8yGW<sKkv(Oa#rm;rHa*-l41gF
z7o`xnswm^SU9%?NO1_oF>)2XY5PodYR4=>6VIzT$x+9>3<qi31*R=hN7soX(;G{F1
zExq(}TFAh6nW~c-O_d4VN3E`rq}x5SyU=;n^C9(HN{@z|GCIez4sL|xa;e84_}r!g
z{n8{@7bwKEPy}E1K5<_%O&rXJqQaFd9=VYFI|5OXa>0e`>DSEIqEru3!eJwBgZz+*
z3bNEh2+7S~@a6?&Y1D92H<)DBv&e?Rjn=~gh8D)f%1TN`!$VGEUx<_-vNqEi`$foj
zf_K&!$$#=D1gve1D4n5g?~n5_TmnTpo-dD(qWVT{F7rVOx;n++WnD$6rg?3h^SQ7H
z=D`jLe$Z68KvT2&A>M_*{j-Z96ps0V&2;;uqQc6<c?CjQ-`^`>LtABEeD$pAr&1^?
zG?efQ%*ER1!L;aLfA<)MNS$iga7IgaQ8YKXD`Ve7yV>ma-d-g4$s$Njj~E^)CaNHB
zz0*$XdH;%vZ+mo{SSoEEYIrI?hc>La(!Jz5IqX_b#J%yV`+m0)->PzF(mIs;N@eVi
zBCu>YM;kZZNwgtyi^ri;`*ET5%T2LJxv@3hEF^LlrsTm3(SH*fhUsqa(nJjPje6=?
zCmEOow!2kAeS34$ssegV#;XDgdJN+=5j@H8v_^%dajE7qaaAX`G{uh>p#)^hu=xI_
zdQ+`K-n4n8zMQ`UAt_cVuZ~`ioh2*7PKWc{;OaRspZe-5(sY4FZ<Q=*>+sGFre%*(
zaaz4~tX@n^X%~sm>;_BS$vpOWA+?8kFf{k)^K|Wkl95V*&=y7Sgp<R!rZPfF6~#5i
zVEg8Je_XsXdodf4`|;7Q@jcQd|CywLfo^5=49`$`gAd1i=C#eW(>q6TSQj74n6lhX
zDr`albXnaAcg{lICpnQiyB{AHdVhknF*v!vy8<E+BDXg57ZT4C=sTs<&ck+oa`Bv;
zxhAZAYQ?7pwq^~(JG_76t&>?d6hu!KRzpnY-@Dyk9=W2VObZ4p6rBaHdP76~l3Jxb
zU4$6)$lh){Z{fQJ4K3}0z%-i<p-8z}*TCi<$v4{wyjcg;W0&W9W$qzdR&j*Sq5B$V
zkdKGB;SG1peaA|qA^HKn!}ihgqKdcYBOF~|BrEC+hEehozfr5fk=j78%^Vhz(tN0P
zEUO=pN@XBwz<(xA5a-8YAqdjKf}hhG2c#pCA=b(J1bf3I6e_=NDZ39jX!m1br3gJ1
zNW9Is1(N>wh+R)s_~D~ClbM}ThyA%3$*lq<<AD$77Bask^-SIMCVyV^|JVYaX+`sB
zVe`f8bqo%PRA_Jd9bz-nvez?63*F1jOQD5es}8JBo=-3`UJXB$(%}5f*HSvBW|dP;
z(5zlyli1h0XCz`BtkN2Hv=%mLj56}qN-yd4b4%juu5(Vk<yzwxE6#VVu-h%QC&SsI
z!mqkhL?q$5pc$86W^fDG3iT>>`@h!OC%b;2qi64=JR1~4C62^kVv|ggy7$AHXW_H^
z3VBQW8>$LF2YE$guNcejw42TyrTcz^kQ^oqA#0`N?*)IV_8j(d8>>~HIj1x`xuv|}
zLV76#fo~PG3?v2m<0>uX3Fx9)moMG5RgY!1vFjN(jNZ;tC6#bzg6lnM^=;>UyL{&f
zKk@#;xs0KD%I3b*?QHeo(b2*(X70wdM>E%K<9BhdmK2gIo91D?(pw=^E-F4Jk77$U
zfmXOj-#{RUc=?th4w;#O#nB|{tP~9nSg-A9%%s9m>uEQ%21~gnT+>Frcs7GAm1Lx8
z-rgj#w7;_JSZr;YtT_2z8^k(7oO(0*y2=fob{1rFNeCU?GWx1-g1uNy)Ut-P(*58m
z-u--V`n6a)T7H%C8<ml|IdndnH?xRUe80RKCe&SsYJV`&dytN<u8PO^2&<^KT!xF6
zoD>)(WPmE8gL^bfa5)D~FLNFmLVbwZ+Rrv&>!wAx$k^8dgkNV~i>*{xGT8wnWce%%
z&RSSlWUOV0cIWla$xI_U#Wr4C`n$QwloSBTbjxFPUs=HC|2)jh56}&r{uM-ZTd`Gu
zV`UPqU27Pm1~=Md_^tPjD9C6Tx!kcuO^BK9l~cmQT{^3={;LY)^PT-)GA0P0gITJ!
zDR+E{L})VcRSYYe;D=tF!7o!;gwMATxvc^*xK>}7p^-t(^C$fc9;@h0!cQk(<h!{+
zXd^tYCq7B&MkA7^k;=S7*{(v7N_v$BwXo4{zpznOH)Ax1M-ZVwRffa9)$qCIqlA{w
z-6-K=RBG^kAd6y2b2f-X1Cb2WJ-iG*gbhN!x5uf#r*cN!8n-uH^+?8P^5uQ<UQGBA
z>MXB^5WkqVzji~Br5)IXiw>z0h4Q2ggRIanzqJ`GKh<q)D<LyQ7S-)JZZy5Kts-hw
zJ%=bWM^roKaHeq*pP9uvef};fYFP;tgG6g-LEq2WMRP0aD<u<Ot}#a#2Q_C82U{RO
z%gfOmso6_B)S95+AmU15H@>)O+6D_IYWRmwjcn<N3#KoIy6cns{rN62mM100T8SD=
zrL1h=vOOk?-h5Cd%Cc*>I8=@ia0M-8?3r+5f9=$FOcS-j8;_g$I&90Gs3W4qrD$J|
zmer_UBXbiGfTW4nRF&OaUG#hUa~kaC9&+FE`pg|)41*DB^P-3owR^=__U^%7ajNWi
z41DVf6>GhhyHDvt5>}F|?;)(LC3Qf!v`XJiR2+M6wGs5&2D5teG2y*c#y$%f$G+5@
zcloeDytQHBOf%7>sr>QVkezlDA}K=CXSQr6HDJPL>bi3$zjf_H-TNi^I>{x<`*hJA
z=St-Qo6a*wF!RV>4Yjtml;Bg@YYs`hNrBogEmSw?te5A2h0rIZa^nXMpL5g$Svuif
zw@n@keeV~&H{V-^Qv#{YZK75kK^p{!@&xP9og8K!g~`=AD9WvsgkHC^G%`RNS-TEw
zzs-T3-~GZp;nV%*gqheQ*Aiot{@m%atf#V{4i@l1tTHn>&vK!36wL)7a+Yv4>xJ{W
z<Mk3>>FB<%K8Or!AnV55d3r$VrsC}<dwb)7g6eX$Rg<GbxuF5u*P}V)?vDl3ca!9O
z)(ZW&zm6D4IIMPXusE5MtQNR?v1iB%7f@~QmX?Cl?bKt2p6l7kS=t2{<$Z}gpXbP%
zj-D^jUj12L3D0<&DS40jiE<ASbN0N6lkWS*rba`kS@!#^2V_4G^9&8lFBf$Ab_8p5
zcKukw;h6h9u3F`GuC6+4_=B}VT3B2TWKk%Y@JKEMLq_B}w2SbIWe=yCqufk8ACSvK
zLc4{dc~Z0Azj+fy5foNLzninQOuPOYu`%ycAD<R_|8Rk}v+`pl|6TOFz;a)?ot(bs
z9bWXVA(n;fVyN|ubgUEz9J2RM>H2d|mQ_9HgXlwT5q{j0;t-9PXl#)Le=258rQTvd
z3mXfov0ncb#NYl!MDT+0NBSq=0&nr7p`tf0=<1z1l~LM1(WUup{><6)CksPtg2fsV
zD<oD|aS6m7NAUcAUkEPpjuPFNcXH}0|8yW)gX>)ZZ!$kinievsrg=>9;AIMK>?m(y
zOIg{#={Q4k>w+)&UziOiz1*yMac;Y$;`|!pGo{WuN=LYAJci%Lf7~Q(HY^8fX=zc$
zP~xlX`((tldG(!nkR7v<P08egzkmD87xqKn2c;Cdz<g8|rML@uK_#9tD+3uG!Q$?H
zJkBk2GuwBfMiRDh=JY#9p5#2sqh#28kDDCS^A34Za=0nFYeB!Mbv?w=#3Ko*GvPQm
zZCP(|{GeTYN}?FVOHw+WQ8Up2Ycn#8#k7#*Hykd5(UdY`x8)1-ON~9m%t{Ekw>eYb
zHJN=`Sq|7aHdgkonO<w-sJw*Wr>tO>P8B&La^DuMKtT|W=Tm>CqB&ABk`j4CHbcAK
zLQG0ZcEJV~+T=ET1u{`dUL8s~P2D7#{P3y&;Uh;}{asI4ujMhc_pJuI1I*>)!nQp(
z=`^dyn<>VybMiL~0=K**0|>sN(?cNg!KGUdu9DW8B4d`zWXY3D?z{7tt!le{#U1$W
z@^;6iDOu;pOBBLz1re5pPdm$<L&lcq`?^J2h$Y3aW%ey+b9C1fm6RI$TB0xYnqOf)
zeqtc8$y&(a16_iVp<qj)?isb{#M-3VPGMm~W3%kdV&UPTVc)TvC>YGp$}H~*br&<i
z5TyhAxM|Ospjb7Q^5NsJ;}lOkr(5rI0U?(UJ=I|5yyQ-57*c#@Ye(#F(5YVPyWOU)
z3d4S+uFlkYRC3m=PhG~emO482jAW|FLhI)2$YfXPG+`8KxZnl<&Q`VY1h$>>E6}m7
zc3*fYOd3Bv8*<=7IJbGiIqsakEwM9o7Hp82da^n9G;JZI&C>h!W}lDdxlv^{@iX2K
zKZ!)QuQ!_ndV3QvEiFRU9vh5_AM$?GJ+{x!!zBcG^FwkX9tvKU%O8`*Ft1}lT%`p;
z|B2`vHQZ2&1Uz{5Rsj6*GR5ZdS&0k!i1^eug(izsm024b21a*<63dv3qa;{Y<`iXi
zO?}EO%EZ2?q(UE7>pC*-?LVm$)IJp%{d(ZFxjQxjhFy;99TBp5P?aCUJ+r7d(-=^!
zIQ`ygxLPW5g}2DOU8V)%;u-X=f@NvN9~5?%c2y+<C5L`~bcP4_-<tB@64i)_YWZ>V
zmMc$E2|CX%SW#W&nIHFPS%iB_jzRlrIy#Ff8kDiDGL0S?0-GVn7rDCUT+3+*c(<^k
zQ@WUr4#er5oozwE3m<6Q4c-0dFd8LiFw5oyKK^f|v-+=KnzXB{ht-mvxa(V5W``e%
z=(o>Gi%($XvOLfLQF*2^Jk0v%q`A2$rm1K7hTQAF#&t0ZkaiyokI`V%HP!<(p6dRK
z|6-?Zy%wWWXkDHcFPb!S^x>c@eIBRAPM3B0$m1hIV<@D4<7G*KHMlDL2$!XP((DN^
zMr9VmA>AUPR6WIeWhvEX+rC?T#@z>E8BQB{U#pQko}$-(nu_aSc`cTw`G>VEJ?-69
z<KpHU({Jy?Nh3AC3vW{2wH14ga9OGq{B_AC{%9$vUf>5Xy?^G=GeLIJ^ULz-e|+n>
z{AafByDHq8Bd)Cin$+{HPuZ~?&E>PSng3vPr5n}K&+qexH2p4oqfg?l4CTr>aR0~W
zEWwkZYv}2EOYSs~&goi?x8l~-6cHxu*3L8*Qdf>T2))xmGLzE)Z1Fb{!?HLkjdU=G
zTmQd6?!*j;0OuV2md{0#qKw?!s{8YNG|HF@5f1?X`xMs;ek*CLJQR6=daw$_NLsI&
z?uHGUD@E0*vOIr%18|)ExPz;CKiFAa^hUf6A3d}TB0%Roj;m3*Q?f@{zb_S-4Q?13
zX+^Wyi<+2vzGu)z>H{WoN(ny_MS(U2#L<Eogi}INCGLwwfyq+u@b))7&cs`$_6e+T
zw~x0Jl$IXZyNwrG9<8vihDy2L&HobfHJ(p&rY^gUv;{~(p`~TLDepl;QLBW!D+LD9
zB1s$v={%)4zjNe1EDO>271Njg9>==E;R+sSKKAHPe*P8e+A#Z6*<c)E>S86}<^~1s
z>zm$tX%({MmUo43wO+jiUEihHmlW8n550rvL<vjzuH95fe_YE});SOvjdUjTo$wEh
zh~XYCJvat;`EtMh#{hELGHdj!U>-l8u)MfQE8-~3WBnrkU3HON&r;F?&wzx4BPzT6
zc3Dpv3dGS2IfDV)z{gIemE~&+@i}j@l$m05bhBDoNIaeWAfsD)rPth55>aXi6I)?i
zG`6(7=;2`<0Ecr}GBn&aGb_KN(i$yxa4IYN<3+H~>FG^$UVa=#fx(R=ZZ|bG#-C>w
zhcFz!#r6A^!Yx_|&RbYO<N{R6#2tSL!Wnn{ew2x$6k}n1`&PnvuClDK%2_d4Y3+da
zEh*vPmsZv{t+fjb!1#<DC?~l^ufCa@?c<7K*FdDEYjuhX>+5x_uuX`cC<L+J1WXX0
zkmz*?_<N(`&t|cN2P?ZpBV%KCVW{Ea3;UH92OX+A`IGoM`oF&!TtE!l>S<X{sRjcI
zdRTsK9qUW<1MyY(>dm_!pF9~4y{RLh8JUpyCf9(UUqkEO(3F9@`$&7Imc3{VvaF`r
zN}WM_86Xz)L`|OA?#}#j;c?BUhBmc64ZMUyHu%vaCb5~+lDihnGv1+n@;>YLcRs48
zHIyJ?z8`4Qu8==Jp5d*mouo<Yy3c1iGf`tH>5Pog+~srJijVGqtWsQDG}8a+jK=Gj
zw|rnR2*U=|nAVh(GkJIb#xv<D&jA-08);S3iiJo`P4TgiX8c$nD|f%O_^qASyS-sQ
zJ@KP0y>I406z$V%+B>oO0-L2VKpk{9$Z842kjP}>U`=pfl`9oW+!!>GaIe=2QEc7>
zM+bCFa6J$MfT&7M7P}MpqInRr%!RE6`ql1T4pVOeNHLhYLP1bh<YU=-k_sZUE*lK8
z^04Lq^iE>27!7Gwi13nxf9-Q{qc!mkt@%>zsRE)>n3>tCaF>M|d%uA%DWJeFLZu~O
ztC!M$+4~1>YR7(Cq|Lo-aGU(w3@{g2Ne^DNuulYBFb5bkO)edb!Kc=$<+DdTKg^g`
zey!I#r}pQ8xRcDF`P=D?=5IPWg4oqxpmL{M`i~_JfI+jh`~ovlQ&WE|u|Mz;T0R0Y
z(<X_OP*9N6pO?i2QkICM<mB>=J|<4i^A!`gvnNlw(k=tptzyg-Tq)HM&-^Ed|8GcC
zZLP}(`XpW}?jbreeASZrFP`Fg!uexLM`)V*Cxrxtb6Nrr;dIzh_tCKYuxVbjQ~(9G
z!cI#eRJ3cQg%^h<8=yT79T0{m$T>a>fqSJioBu4OO=6hlg{*fblq|2>M8hC^kf!Le
z4j(ckK$T>7vNbqiuf@Q$T7-o~TA@0fv2&dnYDpkJh$$<pmL<Z(uQvdV&66J7w)&QO
zc|Sk69pg#eew5k6e{m*T@vT}Ccs73;sR709L(s9p<!TCi8wP!l+He1NBN)~F!_;Oi
zh%P`{tP6|iKOAptxJ>qF3DDaeWcj9l7pcg-E(4J5MyW+9Z%;@`9Ba)C)~<Za6~PB8
zTYl!({oHZ+U*|0*ur4?pk@Cr3ayJG;oKu<}_y-3;=4N7|v?@*OYgnYOr~4SxMrYU7
z2|TX5ay0iG?N^<i%+ebn0EPviodYDZ(@U{=fW!>7s8SB}Vs^RfvX%Fv*B^*ja~Hs#
zHM`1&o@r183mxPa0SJ`Xwp5HpNj*GaB4Ldx$Yg0Ti+yeh^AQ3$`825K#Q8zrqbd?b
z04rb6ldh-M`M``1-y>T{r=--K8d6Z~;!-6DtN--$nUN<Y{!;7i3P6BXL)g{sv?|{X
z9>_p)Hb<)DqFj?)Xz3Tnn1S~{J_@5s`e2NUD?75WA|OQI<=%*bVE5?q4Jp!OO7{Yn
zOx0+JkhRh$K}o^wcN=(FA6=H|kO;nxu0aDDsPAyZ`OFNN`!*0>H+RZrReip_j#o0p
zs0Fete6_7!Uc`NIF{J1&u(Pf<8JRH<whZp+zFBYDNz~@~g)(@qo^>REY!K<M)O{Rd
z)t{NImIT%U)Fv`)d}t^a*+hA_>kHSfkbjtHV&p=34q;$C-ru#+h#q==SAo1-E9F0S
zl;YKEqM><DAC&0;R~JN_*%+BKGJ}@?k^mL-?D|GudCs`+1#_M5WT7Mr${>dEEEh*!
z)$_Z6xo|Pve1Pv($bG)-WY60(+&rlQcUW|ll9XN^4)9Jm&t7KWr~!3lVPV2JT@`QK
zi{vXRFV}O1JUh$II_%0-(3Mx5%1LB8ZWLgYz_&8;>kMIFvV~TH22&Q;8$w2p8DU3?
z%Zv0tn0K;vk7*|NwRXy9mc`1H3>FgpkX>F{Jl+{M^p9A7<UstLBt<AZV3ps{RCaTF
zH3LfTjz_-`xqwLmN%c)ZM1<{;yTw(F7KpRUyjj`LdaQJAUa?DNE9-G#)Af#B5|Nd*
zx=rtR(Adj0eKTeWW=J{N)a=;|GyrC9`QmSci*iuY3z*hy88-2FJ}KEWzysyJLkx=6
zSfA4cRc6TE=Rrhn9Df^hb4A!~yjlgz!n-n^-&k=+aayqgx*re=4MQT`&r3lW6UF1o
zVq@LEHmZR_-wGjl?OjV|@K2kaU5YTsptQ~PC0`AK0I4(Fa@LauJTt)RHJ@LapWhpI
zsTTga@A|dM4DHpy4@&Nvp!$7SZE9#>;;+XmmZV8!#_al9Hd%sf!obL^=lLLu#M?92
z5yB{|{SPky!WO`j6+_4?{WGV1$?<7v#BwhKvnV`zWk$wA=+SXGW7E;AS<tJ-D;D@A
zuK!*)cYi|Ve9Q(Z0C!(C1<VVmgi}+~5q#pk>-CJmpAZ*}MtiL)PI6q}e^D2I`ig?w
z=b~#!Y5${OTi2rIt{Z@ygYjnmy5i*wDp(-J0=lU9Oa2vzzP`_EX5`K6)p1UvVMCnL
z>~Vgz_In7>y97Ww9wG5w&|zVrkt|E2df)<7aXwVMCs?yBFE7c}Lrc{+0X!}d$(w~{
zfna;A;{Bv#GrGq`5zXEkwUUC;rDnS$O@R;nM~Q3S#!|iTql>%g<TN=E6v_w)%u>F-
zol0hW;JM};KFlp&h!!kKlum!Y96iN0RWX{+s=n=;4FWPQdG0?ggUf0lz$VDM&e2L3
z|FpA7c<=nsrQuWSr?VmJn@<=g%sIQTSTOr+ZE9-Hb5h+K=W6dUFds8~w36bNLC<|2
zS-933K$)7^Fa8>GYLnm;Fb=q>vU#9H0@_ZV<slA~+tu#4B)Hd?Z+_hEF@m+4y`|Nw
zuk@3elU7{YX*&d63CtOmjU$uKeEtm-2!;*gYC?*N$2o)Nzd)u)ncViZSm)n?d+Ypr
ziKcwrnC_ytrxYmjhai9FXGa-J#RGN;|292){))5rBo?93iQNuywY6oSqWEf5{&|K2
zbQ1R9?!G%y0m5hM{V6%9u4n&^P@M$?p_OPnmiD?7gfW6olU$aVS*1Rgzw6-V{;B;w
zKM!$n1?mTt3bV3Ip>4`IaFK-dTx*jm%s3@+p`x{G*I&zhpL@p%*}8zRjV=Y4h49d%
zcSSz=(=0;|D6hhLE@r*cH0vk;k24OWKYi!mx+qZe_%PG6S_(JC_R~O8W=vS5SRCi#
z!26K&+lT4sGE|gRlir)<&S-mfexXSUf0~}2;aJqyf7x#YTA*&nhB6DkW}OqI{)QL0
zM>{&x?#XmOSj_xkn55w6y!dM?Z!c=U@ZIou1#V~}dq8;He#$aobBpm>!wImr89kXm
zG4;P2vxGPLzjjPUG_@wIODM-iL>s*6Zhs>O3SRQ}6T<h!Te1yND3;Ycgm1&IpHWcr
z3_BkP$eIk7vfil+xtENnw9kxi<)ytA14FR52++yB{YUT@%wtiY`~XMjX-A^P3NnQ)
z3e}PZX#|Nf`{k^6?VY7cMQGplKN!a6IzTB^7KuCbbakr$qvR~e(bxqGH}Ej}ODfJ;
zf=9M&3-08k5_~CI41k=!T7aLUqbrpICropwwh3!fy~{WLzQ6ir)hNO1N7EljR7wYI
zG}knoRbPbclhW9$m8c)CsuETPXG6B47>Mhg3xH;7mouAPaCUMXsvshTmqxFTar>zf
zqx$eN+J<+L%~Mcy{~hNRXU=5~TN)1g&ahnlui=PyQZS9=R^Mn;mrgSRYZE(@*j%=u
zAZe~>HLaF}wg04WfUryN53^OS_=D|4a!rm7X?BPU54|f{0Nc2)NWwAx?F~~l2ndD3
zKp(2ipD6;VP_z?T`u_U^)^x?ZuRlW?LdVhU#A+Z>xJ_Zy5t0s0;a8&Twaa>ts9z~L
zl2-%XcM6LT#-9ejLwe>r$E)-(%n!R<s$GE06V3fr2m)<>q!NW+!kPm?m{;MJdM1x!
zfe+<#$L7zUeI0YB+f-G3yB=ZmZEv;4uW^_9AnD<^T+^SrD*izbrCESMNJ~v6RGL`(
zv}o&S_(go%EY{FMUW3?Nya?aPs7(Mw9!=O;6x&s{Uf<DhJ`Mo}o}r=gd4lKM6tq!T
zQ$#u>zh6aSlFBXTX9zlnE8>t?Kxl@-{h!!g&WTTaQ@GY>!KBGk(o`Q2f07%$)>=QF
z6nL-qTRJ-Y%aJBIk5a_^obT#=NECiH+h(0CbTe4vZSZb=>k8JLJJc?T8ztJ`+u19g
z)kOj8ua3rfn48a$Nt^m!7L9yDeAjdV?fzqBHanUAt+1$g65nCUQK#jsvjD@rwt+Uv
zq0E%K6*9|yj6ObmIGxF_qx=yKUFfZ-5GbE^yyP<EfW~oSFk;!s<_QqBrcE1l5ko&*
z^+WXDMrvr+j)sIN`_@~StevAR(puV&&o6ED+CTgkg>GKulfM7uLRY-l`uT{*#Jlh>
zYGgCRq+GIzBQ06X<s9*&JpLVktZnw!D!_nFIGu@2Sv>@@7~om}AgIE94^dS=@n+c8
z$j%^+Pe@2kEkY+<7qHjGF2%l8KcAn@vEzdj9e+hzI|p}JXy^!GH=p3WRtPRI0%{UX
z?3x=G(5yj<OW)7{a*Y$<sfE#kCIBibLdiw6lv`|lH|ceCVR$TnD9b!el>fgnq&VR_
z-hVlVh+OU65Jdn;^5hhi_><eet81{5G3G2SsL|YqkLc}={+s;fwvHLVljNvtjN(*>
zr@)5S$5f0G`GLoa=;(;&Xx^3)6cI6Ya;gI?DVL<=&4;yEp$ivAX_vXcQ1+E$;7U+X
zaDQq*-}dAAI`ZM=UOo%RD0EY36Y*bM_8qASw1pJtp6Wm=JLvLNl<`?$4RTvex4<^@
zHogKdw2Y^@1O6kXM^()BPZ4e~J{ge8EJJQp^els-Q(62rDCzzq_xtx+(a1%3cz?UK
zetl(W7lo00Ot->cDetkm6W|H?;Y55zGd-Ph?-vfkbMNZPp-Alck+eMP<;B*rRh>Mp
zh4`-J3ed0PCv|OZVo-W5a@BXdwHxhd6Z7HFvBGQ72}VaH%YxEq1t{IKQ@S?7EjNj;
zv?b%YXr<t_lk}|l`Z%BErpUia-V=9~U#$EX*L+P&4d-5lF${Kip9M7b-<R6GZKKUb
z*b{K)jDJ+Tf7;ME*ySm3IN@Yk+4?aa7g}uppnS+MxigfoAASH0;vTr=i61sT^lC!r
z!oH1}kgazlAjajrR1B7z^a#<*rs-Tt=~Pnz5!aTj_Bjw)zJt0#6EX}W*B>^OzUJH+
zQli(i{14gxsbjC1mNES+?sOY|6(I8%c2*%!CbA}F_6HkyNHtVR2bkX?h|k6mA0r>B
zC4r&b&-xGMi#8ii;-c1ggMTca^S8beTAbb)RvAhr^AhULpi%?gnC0rjTZG@~?KDgc
z<lDqym*KioDV*|`3=ma8^Wkh0=5zB4=-cIwfVNb&_cONEP~SKo7z<2*N#TB-dKjW<
zSEx<?PNhn_U_Yv?pC8Ov-10Debx{#SDUhg2#u0KK`hUF&@&Ms@+*!8M?~-N$%t45O
zulIYv)+<;D3z=mg@aNJ}3Aem9i@-Fx4OLNPJMYM;KtO5^{ipD#C_6?1i!SnwE=Z)q
z{Pez>gh~LkmVK1K3UgZly{+aC0XUMsy-gEw=fFXl(hVrRNRE?51Djqe7RS!Z392F_
z{|9B^Gs}OrEUabK<?mSV>Tp?5ya`}lC1EveoKp!IIt_8JhO+($m3}y0VqE_N!6(ak
z-mAf)0(!N$2!$zRN$SdjM@&&0N~gt?c&%R?ju5<gO?MaQS`Q)R1E&!_#kqIEtTqI8
zc6U=u>x)X-NHvCrCctKAp+~(W7Puyw@}BP=D=G6ASElWOyj<O+BM}hqaJhvIXCGAn
zX}mn)=rbUv`7NCXEbKt(vt3s1>&nJaM!?H~$o*d-K!t$6WMPqaaDrFN2q@-&M#118
zC#!}e5S*J;%kULW<F;witfbcunCR$wR)-yR#T$<pA=Z(8X$Pp(iRzY?GGq;YBF7$w
zEe=ICr#|X(+uZt<0FEYxG(c(Ik8f2zO*cGB`J4%FPWUTxXCjJy&82bS-}Df<|6hz~
zQTeE=G}$iS{aa%`V~l>UUxP9H;R~bv5VQeHUj1t^5R0px<&{>v4y~5Ys_d1omOoGF
zP756Yo|Mbh9^OjH(|<9ef!|JtYTiN*9QBtLy8d}t<6Bun!=35r=1l_OM#EX3XB8E;
zFT%q?>}t3TbTz<b9ykD>>4bV10%<L+`wC$0b2L{@CT=rTY$?|qQ6tC%-)w?P-pu1I
zsqE|sZKwIc4;0fUmY5Yq%hx#1EyJS4@=RoPUHVH0706ew0l`JJtocZ_1fVhe9tZ4~
zb|m?$D>n4ZGB`iP-Wml9+~Q*TZPhZbx~CEVRwr}Qvo<mO0@-j20C5w@Mwg}j-$ymz
zyfppBK^;(tZ#ic5UElnvWNH8=7ug=oota*i{8O1Q1IW#w#Dh0{820A^(s$Xyx?<v1
zT!{BG1FX6i9t3iQ!}P2s8Oh2*LPL2UZ3fb_wRZwJEl&YVcK(oIRaXN>cwwoXQx<&R
ztUCfKtbf9a^*{Tbz#ItM%N%OFp^$~12IE@DCIj}uh9}cj^nm~F<fvOUuuGyC9d-Nd
zy|~+;Rte~R#U>4z#iqh3;)_3c7k=S@aOuli>aW}tHdBoa?YU^0@3PIY!n${Rc}}nX
zLBSF(95S@fThQ{Qg!J3ybb+BL90OyY9A7=3;ac+7jH!Sr6!pTl{b5_-#|{WLsFvn@
z{*$CxZY!(SzVEd4ISz`*2*CK7pCG=Hq_MYspw*)`Gy8sBB>kU6L~B@D$8j-b^Zn?b
z%8782_S3-%zlnn{o&UPzB(2ub|MzMgn_bJIa-WfXLW|}TW8PMp%1^ij3Tq8Sx5FT#
zj-s6phvldHb`ZiU%H-X;!4VmCFj-wg|Hp(pKZ$?+^qhRa%E^jYCI0868OheEnQS}t
zYMgRSX6khVv3f#*Kf55nx6S|w_jC;dLU%kZ@ZRzM{!YboRB(L+;oG+{7bn*~)YhV~
zte90nPkhxV4-e<aI+)bNWyggj_CEe#kO-@2g5pSG+ke;GP7HnDJ_O7Uf)2{L8eLud
zkSBZez>xYsPA;wgbaDZlV|UeOU~L52l44fPm)<3$4A~TIe0T@Rlp>8X607Hf#2kr8
z7fUK(i*i|A6<cjx@G6?N@oy<b)pqr^o7jB3$iRGJXs<Ou&P=}qxSTSCh4ftRyj#!o
z@~%`gb{B?~H_2<6p3Y_1RSM-Y<mCk+FYoiomA#K*dExaZP#}g|SU&z{C@{v&3@G#q
zfY1eAArU#-uo5;DXId&B1k!(9E@<vKFy8^oBRc1WK>RuG%Mc*t8II&fbB>0F0ZlR<
zsE+A&>a>ERIMt=;CRvm<DbcE8>Yn3jo~VFmYUqb|9wAP{Fw9jKFHR^xcXb*BibNs1
zRjm+&tb@@4E;ao4%nVj%f`sn}MxEgn9qaD81!*88c7mgtN|tDO0WCcTXoFRXj0r*#
zelJ`;i&+OU+#s6ftFkBv(YG*+|MKv}AdGRTYp^vRIFA@u7!9`TyN-&vdTf{u#2xY7
z-mX&5F@QTq7^Ov7z<1g7LFimQuW4z|0juO58e7U3=VqoZb}Ql3W52yEs|`T1y8K0$
zbti6%FVw@*;jV(bMVTf4ZnAh9Ep~V+tEL7jou&oSidxdZ#jC%#oR*%rGQD2*SoMV0
z@4cTYZuH7Q(P9q={qO}~jv4}HKgmagYH)QPXZk>(Y)}cP2-=Ahn6CU~2jzzmN#u=G
z*GcXjlkr)G9AJ?IEejg@7MPQ2gVA6lAM!xRTDbbd04$~BhYWq{35t_#U|q@4h_IyT
zB$|}_=kJ9jp(!Z<y8r%4oQI{adJ}JrfS7&`h*M(T!MU0eN4!ZO;rKB3-c~ILFwGMP
zmnD9__6ekk<y!}Y<#J<V<Im0M+rISKe~_f#daMBKZ5a4@G2D7_JkmPsj}T=Q2K%r4
zF4(_%ku4ISif{HlARE$sz}|cY=8n$bpO!}>*@lO)pv;jA3&3$FFHOJLQS-Q~+@=Z$
z_z*HF4VZVjJ~tAXzj<$b3d*USGs$?DQf)2`+gi5-T9|>wkn)rdm1g?C00G;vPSK)P
z%}7d0<J>v)ZvM0|Al7p<)ws5d4TGRjCS^k@n>SR$$%D^oXD(Xv@{*hPx1EZLaV|t)
zZI;Ash3=8UU0h)NQK|^SS8lSPm~ioMFFo?D2&y_@+FMYa%inzv*g&%yC~(nll)LQ=
zjAw!G!+G9a7wB~mV42{mnpds?^~swPTFoSi!$yDqj{Q2uDsag>DH#h)8&M|czK=QT
zK+i~coBqz@e)7<o!nSOL*`p(@?k@^-oacM+sR~rFfPerYMVBl^3k(!71njAYMHELy
z!AozzoBVa%)2VHV>$Mn%+qX2$0eRlg-0Lb5gvp$l#Io2j#i@$1rj5T`$9JQsBNKQ^
zn?djD3jt(5$c8y}g@wjSM}yQ#OGXxVGGdj6=8QxpCmew51PC(J2P2m`uiw<t#Fiv#
z4y>m?qX0{tgHDSk%gm$NnvI!)gX+u}GH&_z4YK8i*W#}JR>Pxq>5QvF{bZhW^u{Dv
zl%|tSPo_I;wD!t=iwt9^O>K|^D(2y%M`&*5xn!K=Z0dCvFFD_zUuj~{YU)J}njzqG
zKNfgNdY2LXUm6#9<Y~{0W+HB$R)qf~tu)}nkAoL$QeDs#+c@C09lnFC27coBg{Pzu
z#lOcAu;@1E+ny`5?sl~8Gmrv17ziwV$**UNE3sX(o;0&#n>v%BVaqY_><w&vUX#wt
zEl-!_Y;{fgH+7|KXm;a9PhBSdc%1^;y%~m+3S|3w_Z!LIm(DM?$p+N%fB9T&jZ~yi
zCp?OaI*KxO$wHT9RY4ZYOJHSSWbpIg;+WQvs+Rgw<%s>pF-;X!2Z#uX$05tg0JU~c
zwXHzvLL+h=2}eCWaDcFvYQ(7^sbcf-BRkQ|%8b8YuxO@*Dg)e;!a$+}Hq`3>w&<F5
z;R6@QSapUN5lKPQX)CK$pkSe7LQ6l*4T6G7&TFpj&Vgr>6MjA+DZ8cqvRlDL0mSzi
zRDr#``cRWcW<}vF+D5Jq;{%mKdTbohZ@)+zw(U<3Tpt8JjkvCbp#p375g_jtl^6Y*
zWc$5fr-trM%gMeC7Ph3Y+sn+52Z^^_rGq!e;J}}4B2`_T>e-#lw(IKZG6eh|-HmuI
z3Q2)n^phYI-0ZzuzfnVy{Vw5^S4G_lC<lAQK6o$XN{pg>Z;JB@aFq;N&xD!)g1K<?
zYav@H_u8M8wBoghK?ekrK8^uB=YGb`fX%0xa$rjYoYI|51ZHLo3y&_4&u%Fw5TA|3
z76X@UL@Y0GRlm^?>6)7O%U_G!zn-Ry+hQyE9;O_9Ps;$DRm;!E`K)jNt0@ZTw1h6K
zb^k8Pr1&SnnI>*ydVz(B_WA>Be?b|A%w(ePTB4mH<V^Jb;P|7{#VylZ-@pXb(zss=
z5+sd~#868+WN-!GohzDCoMz)8G*;ShXIL*b<1E*MY9-4+0bBH)Aha@>(nCKx3lzrh
z(-BDTWDa^(chZrFM6@+ZWv87F(jLWN?=MNKcmaP4oZu+@*skHmdl-JC8|c)M4G*iX
zdjR2l0a&IpRgM~2nxg>fK!wgU!+%e6z-NmbiCY4hBfu+U{IDhDj~f_pp4#cRih%u{
zkVIxL0yZxJO%0#r(d(*Y-oDkPu->l;!{fKC3*T>7?Ge@wFzxQ+rvg0ViQMhKdfmmm
zl#i+3VOG6%`0RUzHfYR+$IAA~<<+L;&n`zAA4#V_b@DxfOQb$)_G82Ro|~gkzMLB_
zAMV=TF>*ig>bZ)n*J)}0du)g`5=&?C8zziH994C?EG1*MBLq3K6`bkew<M7^l?PrD
z;C=gpvg3bv2l{Iyt+*K7|El5!UfxGp<tVdPH?^QAX>2!BX3I|o`x{8Nxo-MKZqb{X
zkwmxK&8KbQziz5WoP7Uy_G!WIsYBmRPN6Y9l9GZ{l(>;cEw1lZ4ks0b^Cc#{s(_*+
zV^{KYT1JaS<!g%64da2N0HLR+-*ewZU<W3j9yrK4*o4vF#~2|uCQHBm>}d#I>t<kP
z@WO|_`<4%Wnu+VC=>*9hw#9BP<^EYP!Nh1K4xKXoHV#b>-q>6#3(cW}g-y&H3{f99
z*7Q!yJv{+oO&9Ec|Ku5Q<fss^N(}v)y99OuMscRzGI;LHkbvUtnn;G=<hP~itw(#;
zXJq=N$ZxSsRLGV+sd=fpF{k0Kv^=)UZk}LyyIFB8wJ2TXsML?*C!8VplRQhyC%1VF
zEk1w%Rxe{cIL8sYjbVNKk=+}-;97lsUP6l_G)*V)*+x~{d|Z86RKUExs<LXO3vTu7
zDYnH8>F;?XJ?PI42BzS(gwv;H2b;f}H-`k>@UOh?VG;S4>y?2Q0T{V3y}!Txd0}1c
zulz0er#L<LmmxOiucZISs!8|yuQ%HNiAH_&V;M}HHSC@1u0Q=noGz2D2(>%BZR(iG
zpi|yuB={esyOjj3v@RR15yV=(yCQq`0_uq0YTizNt&7iNTMVgU=|c#U_FBP*urNP`
z^<K;I>ro>?ZhBTJs#@AYA1*O1uMdH;Jo>di1*1Uc#NPN67jgkcM|Y%y_WuGf_|O5b
z5<Kfc29Ka=fotH~)E{s7q&l*}U->+tnz3w61)KSDWh23^3ycihvQ=Z|&H?pz)R~QL
zue@R;$xnHzMOj<s4Q$>(X5^HW!2L7)LgGXqpl0$3WX_j06X?EQ>*CO0R9{m$YY2RU
z`la3PR?<q~w+4$DFk~1DGNcTby8Vfzth~i%NcP~*6ZEXhbkf6XCNAB3Y%pm<{IL44
ztQ8vbVEmw5{AM|GUQo&B=Uv3<%_NHn%S)Fg*V#{>Es3?V%Bjojx8g2COUa(^9LJb1
zNEz+9x51p-MK$CdoXZ!VwX)^$xYg&QQ#_-!mg$uzE@d4EN4ZzPoL2;RhQ&m*hK1TW
zVzKM}QX0qmuWP)F(eu=OWBaZFQ**Gy5y^9dyf*YBpfW+yE>${+ROB-)VhoIt9wF~<
zLnQK@N2`ROH6*Ew3aqtfiT7@a&P47jZwHsn#<B6lI5dkyt<zk33a1P#9Nflhm{&-6
zC?`~N<h`>2!E;l8fm^}rqudfjV+?TxlDa#vHJ+T1J+ag?z{}R-iyoeoP0ppft_s39
z>a=&&nj7JFUW&V5_bjw5Z&*Lu$SjFKAV<pQE<wEHP5iOj=NC_WU_VwEHtUC7LQT((
zMP#p@cZ_!vC#?Kx8BandEnV%iBTpA7?fVvWqC$Qb8%>vAhR@<dU8X7)G=dj=xk2A3
zRa)-YU9TA|RKerzmDlId7`7gxFQweHuj>r~>5FKK>?;u}!~z}MN5}nlTt}$-T-Lua
z?p)V343fT?7`dTg86`~^%V34{-&LKcV#2q}mA<`o$0=BeUKk!>&x3r{5^U+B7o6i*
zO^kNL1<%GeS&^@%lnK?oHld_eH(bq6GTvX}E_zYlfcdgy*Fy(=7RGQ+jO<fxLd4*<
zg5kesqMKBk?B*qfoL^Hu^B49RQ*w4yRPGq+I~b5=pD{3;7*JwUKr2m2ci`cJS0+oR
z%O5q^5lk~m1o!*>z!k-Xr32H?0vI;V7Gpf9Xt?i2HUwfPx!h^(WbW=46|DL^TuAVm
zu1z+WKDNbQvfC4Tn>A>Efom6((@dJOU*)(P`qa9oUb_UrY&O4zCZjO0AjQQKSyHsA
zKmD|!#+lk?af)k+;*agg0Pko%o~HhShqj5p1&EjVwRy?}MoJ8Uj5a}RP*u}F$VEiR
zV5a&;1<mbWP`(I!wcXiE_#`qnX9(R3zJW2do=$(((uN7el<BNa9Y4-6((J*qGA+RF
zL{K5GbYM*|R!s!I(*HJ3?hgt^rO_?PVNpTRLqdT~;e-|_E>RTQ9NJR$<%?QV!>na3
zQR&3xZa3WiMzjLdLa<<Kx6DY+O1~siPmhPZ&<%!bG}W|A5%j=K$$G98@|f+tW}8w{
zNi%85HZ#a?Sl{{=KPPs*uAr0!hu6a=zYNhhu|Bq_K<%487|;-~=mS=h;a$_@cR3B!
z@NU>HlP*{rBLyA<9g$vc-#T?k+0Pnm`lQ&WYSpoV3n77~HJy>h<bErPnudzqEyfJU
zacyEWVeg!Ph=`%9{7Qq-h#`t%h`w}3Wtjig9e(LFX$Ob8Rr6F-S?RAlX-B$D;GyUK
z5LNCkJjpp}tCcKeDq<^8Yp%0&qGb`<-H3}#ZFYSXKBHtL(Ah=!&fVfMoSJ>{A{6s5
zrGm6JvOUHEvoj8#wn{De`m%?8%6|^LDTQn{(<w0<E9MzD-xQ4a^b}fpoGCt&du1Df
zo7vgUSq*G|jCI3D2yx!{?$Vul!$=}CSR=~XJTDg)-tdo}-2^==A2KodX&pz$tvtPQ
zCe<K*V6A{qwsN+NeSUo??9I6r!jYMqrZ)Ybu10yevhT?T>9Q0c)MbaoBMV&VltK>~
zW*vO=wTLi&a9q#-{!#6u;?R3l;V+0ITBoS?385_?xSMA^H8^(I@Nzc&vl>F>xG|;u
zna3#x#%d?NpZ-f5)O*YViv9mUa{4dOXj4gnX&_nCt>`W2EFDBu`)=u-2T%VWPg-&U

diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png
index 7fbdc5cd98bf29bb92ac022df1d0bd6b4d7d06f6..088854b04d9016f6f7ae2525638ed2f3f16a250c 100644
GIT binary patch
literal 13673
zcmdUW2UL?=mv$&#umCo&Q7nK00!lAZ1Oe$iKp-G0H8g=x0s)kZC{h$DO7ATsL0TXX
zP!SQ4p3tjEODIx832okR@Au8D_0L~st(kw#uof%jeb0H%*?T|F-e>QfmqrF!Y{xDh
z1A#zn+V}67fIy5zAP_?r>mR^3?pNNq124=zYT9P3z+W)y;}^hZ1|JhGH4vtQdmaS3
z4AQ=L*DN4yaWpW%Y<l!yrSr$*R6W0V)z7DsKx&}7s%Ho9owYH3m6P?;HnXLqaYzdd
zsdIs$t3A-VXb5c7=+wEhCm(a3ddy+Xs(bm$Ni{V_ZNV#&YdcKZM_)UreXG5`76Luj
zpZK^#evQz0-D!0)LvnUNSmzaz5m?CydmJ8k0Zmvkn*lH9Bf{t#$vtVr00KQY%P0(d
zh*ncQ0s@5@vjW=!-8#m=3A|`t$pS`yyz$?BP!bDK%P!<@hdmQzZxbtCU=4MAHIH26
z^k%<Qv@F>Vf$CJa#5`K<cRD`XD({w6u)AT5(q#aB3`k<3OJl<F3izDY=ARVbwrLBU
z_;SCQx$7MJD%w3i`}ffUbI#f(!M@S?(tsqgrY(7mOy9=C8ZbqrrQ3MePHa@1{OxyQ
zwgeNtU?tPGKCJ01apU6H!OhX&?ZhZ=O&yhn^m?R!#!SOHUirPO)^Q88ktWU;>hsAG
zddJr?9ljN;ED9l*9Bh+)&;vDh33y-9++B6wrsia!n^Kj1)s2DMY)Cn$qy}h(PB_A8
z?$aet^XbVZ#Qq+x%6Ak(T^P~uha%CMC(c_|>=pEpx@xX{{w)2oLkLn8n5(?M=7WDc
z=cR2j)91#PAz{oDKkQ1a;}em%lk;gsx`1VP)tfrB9#<*lgJ$QxY2LV=k>d3!0`E3(
zf6%QO(NY#<_mnqaQaq*c;d@&CCQ<s)SJ#o++2Wxo7vg!FQyq|Dn4W0NVx7uP=vbTQ
z+*F{CRA{pV+<n~G-xeMtcK%LYUv)uyYOdi-r@7yf0W@HvmOLPn{|R{l1d1)YlSP|q
zlCSXX_2hfQpYK1H*U8n<3+TvYX*D0Q`Lb~O1P9j2@3VL)hD>%9_}WY%SlN;3|0<0K
zZ$l(#pWk}ygkzn^N#h4P@xHBHlaLzM2<8157`kI9Z#HzL4Khh77{60G@{AClS2bt_
zNaQWBOVY+@V0<3iFwXVs&m-T1L-7jL?iQ55T{P<UR7Sw09D1nU_&9jq=*&_Q+U~k`
ziqw)x?bS3y=!OMbEH<0B236v_w#-XfWqXf*_+^_sPADu8-_kUl{XyIb4S-B(#bW#q
z^breJG_*8@Z;RP3ccf(dJGFNy#;N3^I{A8wZgZn@%6qVoi)27<2VWm;gaXPzR(oYg
zjAvpzcocNvZBzF@EbX+tmENJeKiEZ$H2}CAVw~Y7=ER@gBPX5{&|X&FPv~oq)gLbC
zB)(u^l3uIxly)EMuS(+c*{B_oSQJ4Ah2r;VYb*lVp$JN5m7`1C=tj8szIpum^qM$j
zN=2nmdO5iCDM4Z#Q2+WUUK$u0)DbA0R$(bJmQmv8e!9waO_QoeDIK}sQ{^y}d~qx^
ztAw4euV<=n4Tt#}yR-W=TtM5jF~h1NUA`?@CtmELM5XZ*?1zN>c3oAldIA4DU)-){
z=h(sPjJks>Q03r+KKId{3FUgnAC~U#HyqF(RH%KFlA=;KuM;h6xFi~FX?b5Iv}<rk
z5tc23+^W^gkiH*ZDYf=ZVn>&K?xn14B0pjCOD1el90cl;V>n}kTln7Hp|q`_n2W`5
z!=Jjzq?(+5>)V@eaX&s}psb;9)l`fJJ5Y2(eqkfUK?3I};yFHcrkWrsZm|>f>MYNN
z;&2BC+QSt_WSw840zWR1AFvxU*!Idbtv1d{vt_YSsoj=|+abT4t6s*KM*gZ+SpLBf
zpZDzN&odcqnfQx}OVJ*qaD#ElDyPtFu#>yVUE?=&h$|`NyBIA;YsO%2xA8Z(hzKd)
zjbE=QJSZymaV#;!Ezu_8I_E5K`<0)N0go5DtG+hKDC!38Y{<wxpW3$8MItx-4-9K2
zt~S@$=;&$#Y@jtZBz{9!p}f&=#@X)4n~sh-6tKq3vPKX{wTW>?bpP4UYYbUFIy(?g
z950&?fN7X$=Gk)=Yt-&rwe~w;&cuZKJg%OKp$E#^J)c&+^@D#M7z8XqgEomYWd(`y
z8OpcctlB2gA|*3Ur|j+H^O{JJh670|aB060_ByD_1!Q&-#yVF3X5kXr%Anno_aRyM
zj#R1flp;b{4cS)tGNzZPqMSQ^u*Qj$@~>7-QM9H#aa`Y2Ay}uI4rR)PX~rrM)C&<U
zUUx!a#mlvuT#KGw3oTJEeM!N{^~(5?Can!>1C!RisY(Anz_M(|--V^@PVsFm*7;0R
z5e_)M_q$38KBOw-qObqL!Zff2_kjj;+U)^uaUn6=cwfy~G04htvGg#etyTGi*+ENq
z3OIT9{AN)_Y`w<*{Ifs>#i{$32@ihD$MBAK_nx{){v?m=B%bTshgvE6tT%n7(mE|N
zDF7GoYai?{@?BEeQ0F}02~u-&3x6a>f{-b7{S<fNKwQak(}O1}wt+dAJ-}C9<htd#
z;=lZ^z+lm&60mqW4Jc<CZb$5_FJH*i?m6no)F?e=n#iqiBd*`N;>UX>M9E&9=P)ly
ztFVJi6w^rcbL)@xJf{=?eT0*isiK5gJDBZD>FVXaSkh+ie?Oj`TVbxhCdhxjWO9$i
zb^E#A-d@wDbe5AibvaNox26A`gJWppJ$28zyRy48_Has<v8+w-d)^f9RDPGez6HS;
zf*pdR%FuOq;(Y9^rzn+5klzeNL>e4B&PJy%+B*NvaS%xA<^xBgGY=n8x1cJ$3FFEo
zt#L|u>+I<X>2;>G6?G|#OuHS^-+b-qXsdBi@I#y6_Cg9@hIdf=@N$di&da)`Zv95&
zy?*80<1u$&ulpRGifby(uKjU>7@^+bUj0PM%wl{=i9VU^J}o(A57$p@Y`G9~5jX15
zZ$4|6rGWzQimCHTQ{#@+j1w1ADEQ=XN2Nn5M8Y$cJt3*YZj%>ML;kj=Uo(*-7_*lx
zgd^4K+m4@)mHiz(7D6(y8wVU-iu*w!zu>&T{}?**U_VVzY2!7*SI4xkgL~{J3+N*U
zz!n1YL${}h82xzVEt-g^b)!Kt2Oo8cs){XvzZB9&OnqpfB4;3UU)&!@xYrN$UC~xy
z3!%F_VQC?&<#w9MIMxo8;R0N!ZSq}nun@*v@I2dP1mzeFK$W0SRgP_rjV($KKW3$1
zJ5^@zX)!!@kCFlbKej$I+e;lClBPZ0x1s7TXDedTvM6Hsnol1>R~B?>kH@%?IFA?%
zU(ibokEFp=hZ43=f*Lbv>HctPw<JHiL3Vb((dp-7f$RKp6%lJyK86jvwbSfu^Sy>s
zp-<xMh8aMYEeGk59{5~$TCA-ea$m&L^?qguIN3B;fK2mi7mlgj@nc(7F_N?k$p7Rc
zq)!}qbc?zP#C}B4EJvd!-nLi^UaSRukMU9~IZqhQ8CW-+2iRrpa#l5CCt<VNHjRea
zSP(Z$CT`##ZrwoXu3E#+Gl4+Pyv#&!R^Gzv@50~VgJo|JzYDCHR+;3{_JD`a3arHY
z&?C%~19Gh#|B-Mqy4L8R8mdU`yUs_ML0vD>jf^d<Ct$fc`pImUd`S_H;F>s(DqayW
zp>7{fLiUFyP3Ji)CRm6qe5=fMYqOD<>*EA{@+m?;WN8<9BxRrKwy0uMnvnNcA0J$w
zcIwo1sEm(pQc~&eU4MhLykj_PzK&fJMgQ4W&I`rBWJUgn&9|7%4yRsourWsQx<NdD
zJEYzSCF}8;pKWQ_Ft_spqUW}5yuL|7TmD_-jtg;cc55__R!!}x^MrZYPadW2&p2&9
zp#Z0Zt{Y#OiRPF3M20x?ffrd_RcM1>%>H;gPDoIgoEJCjCL?OoptsjCmtXYlzIM-u
zz<5c0&Tc|R|MmGjapnHspTZNn36aX%i0T<}>ylSmX#tduO~>GZ1s+AB%x&ZNb!vQb
z$%YxFK?pY&`2$XKTjHkbEQ<|4p`eG#Y!z3%6BE3CdFWEgWniN-`uHci=H;yg{*7B^
zi^J8XonlZJde%#Bol>`)*iSL{>tNU4bA7ImpC_y=*tZ-)tU@28`{weyOs*~`*7;)v
zp?=Lm)HA?QhwoZJWr-56```!l<hTY^t6^N*6jdjlJu!J6ZK&K=;n{!*4gQVs-u#tW
zwj?_)+MQ_^WF8u_Xx_fFuc+Olq8vasIq`-)@phXU)#diBg+HmE)zlL+k_z4*pVf^&
zwz1qlRH{#g|A?NR9sfbfv_)DO5;mg1k1=og3A;<7m40i2+9pq2Uhc1x+gA52vHb4s
zgW0cNpJXHV8g~3<)yFSHy?t(~jo<GP@!g)gEj?c7uhZ+0D`r$FqT{ql!A9xeN=iy9
z1DaP;ZgbyM%&P?!8OX#!Dow7tZkImnZ{+H2ozH(A1#2<*{$t3-sd3S-4&ggrLacUA
z#QA&X?sN~h1IC?p>>4APCTbNG^AZe*lXKeJWiRQbwuvJ+36Rg;Zql$+&GP%9*Xd9g
zVIhqNLU0LR!iSWHAV&GoHkrllb$;ZImv0~A2G=Ke{O3m)oLs(SUAc}NdvZ-vNb$Os
zqPLIqqkUNg+ySUI%|N>+cEra0TSt$Q>}aX3W(F2m^c(*4Zgi@QhmuLl^950I&xc27
z9On3|SDf>{WNKUinM3?Q9~&xVo*&6BUBW@=trMx$Pvy%DP5$}lAtx_aL4#69(S@dU
zc{`Zbc!<u67?c&({b9V{uW8}NEY+Z6n=V01Vu{>$EN9mOkjn0(?{i0kHiZR*YK`}P
z`&$F3)_1t43axO-MZk5F`Ke1u80l0Qop`+eQqHrz2*l>A&R=h(X6o&$`iAj7g$UoJ
zoOeYxnl-ghK@cbR(b|eWi4Wb~uH)5<+L^M#5++S7ndo9WWVZUW!$lb{ul7fa!&SYV
z9`#mYg{B02K57J-?P^%naVIyqdU;3y+m8}e^dl0HW~9lcp;|>lCP~`dQmd@cm&vXl
z8pn6ZS`owO!Ev#kZ&%b^W9*x0dWq%<urGsEOq*5&Num<EVk~VVdu(S{GC#lC!g=nc
zlV`vk-o2&f+4ZgQjQ+|&N%+{uyE=xtFf*0iQ7(WIO|3%MU2BKYJb|@CZ<0|FZOJ5B
zU}}xrsM59|da%-17rdX9R&N7^PY$Fw1h2M2t*q9N8V>nsr>LD<Je~keRb5fko#l|n
z_31g2CWVm-{;^T)XWJ;$@3U*IQ!Bz(WDEd-3{|?LHn^4)uVj5~`6?`<0ND$oCh@b)
zr5nR+*o06w`mKAF!I}tvwz))O%7;XXq`8r0kxKn~PQ7wwy)D)@WK)HfsV(cg`|g!g
z$PbP9JS^7_ivY`kqr=LGF=ta+cLLpZr6Q&o;H2kzaOYtIoIy?Xj1yKLX^4_7wYYch
zPXM}<sP0E}lCkT^w1ACz@F=>_(y;KNdOaY_kq@lBID)f7JLqumm{<kYn#3FKZ&c{_
z@bue;e(tn*j4^dE&kylyI_u!k+7oHlUKF?xjTv31;$D#&piye-uDDxDqWY3E$lM>L
z?c|Z{+&;IVBEOd}70hf4nDSXj+0Z(Lpf`3#SsV>CH9)PdTUiGkw!Az|zymDSDymXt
zUFOM&c%PsA?wzCgh7B3{!-9Hd4(5pxIJdrEBAC*(K(eWY3Sgj+sA&diNfF&}+B%wA
z5uz02LjB5ypT6Gj3;<PW6Dxc6)G5rH7DCl1!RK6h;+yQ`vF$j17o+hI^3VrUv_qfA
zSP^u48$Z@*_;z!lNB<JegH&;VfEKs9!;W-^IIZ_QbI_Guc*h~kGkqeii*zoAWO4l5
zoKfI=g@QcSkr&1g!jte2OC0!MdB&O&+(BO}Q+__A%&nN~rnRs(e*QbEN;1@+@Mx|l
zJC}}-#>O?zh{y<+FB4aE^p&?=*nnLWRG24l?UagL?J@(K&%f_K$lmcJKs$cFwHsd#
znD)Rq{y5O=kFNVw+0O!a+;7oaug$WofCmrZ-23Oegtb{XczOoxuNlCgz+~vB)1E6V
zDTcE@`ud=XaB9TVE@XMGc?+-!BNckc1SEn2Uhx5U{`X1&MdXhxd7GOhSV1*ag+)b^
zT1?&H7Z_TmR*EVszmX*vPq)B&6BEw1QmB?t&5tVqCFT%_8*oQ)PL7_3e=W&D>can|
z#Mb{l?{@kjoI!Owt#Eq7+#34FGyM$G5ztd~OjG{SWGnepMxOSQaMJaw&E)v5s9WJc
zu5Y(`+_WHndYHQW(*f_+B7y+&4JAlhRGXT}UDb$bw{j~eBWU8R+0GqWTSF~AWHuF?
z{0#go>{#3OuL?XfNL6wR6I^FI)(A+s>li(6s9LeT)*wG*Qrk(EI5|Pj8fFc0Zv?K7
zJ>@GEV`7M<XBbn={Wv9y<fQ5Q=qfE2IgS=%`1?xY=vR`Jm+Rp;D{9RBDm*i@96b@~
z3`W+X&KjJe>q+WTvXWl^SN2N$iN7z(H0tmcemR*;a=85Ql##u>2mBZa-4uwy;BW7{
zq1seMP6C1f;S`R9edK!RGdK3-4IbAH#H)9KZ30KO5ZIJgaZo@x;?L_YCL<51li|kB
zn#^XF9?&5sZv}a~R=fQCX7AdZX)mwyJ57LDm6qPSefual`Lq{cc-z6svHgNKgoI3d
zeM=YoB1!omhNp)S?t`-hwhwBrm_9O_|A3EDO>l-YFnqrv)Jnd}XjVx&!d&+Dpd-H~
z&*O<QRqwS&$8TZz^5)}A(O*sg8|G>if6FyHxK2|@6-%G#Djc*SF`s1M6f9d23IQ3p
zB(6`W)n)8vsI-H$7;er^DHMT>rtB#0kd#i!)n}LJVrsfm_7S5ViN-LNu^)auo1i<s
z@R*D9(<?v=VNa`hE@xd0I0Y!}R#)|DlnAI)9T3JxRT)8}Q(x#BIDaFTEqOxy_f;U>
z`ygw~y%Yobd#1eR`?CeN!lNcM=p!!6Xm>`hfB$6X%zQg!?=R^ez+rZoG=UZTiwUm3
zWe*Y()I+RuV=;Qy(-`TxzZw5C9^br8l)Q_VZ$kaLj}l@0p$eE?Lu0j>L17yJTmu)E
z4>lNQd2a5n`@aM32#bgq>*+ls<uh~R>THxV<EE;P>gYtB<>3*j8?}cEsj5zJ|Cc1P
z)k?)cbE#{UBMq*AHI=ni;6W4X6wWaNrO$7r`O7OjqEv>--eH=L{@?_Kfn6U>^CBU5
zaNNSSUh;B)MjiV(Yv}1NAYX3TA(%=M0I8yIC08wStCg|vrBQG)qtuIkB8v4`VuR~w
z-HtlXMqsJfk)m^e=E5$Q=X+;njLEi;CBhJNg|SK;+@y7oPygeSd4uaTpI8<CM3w<v
zu+NPANXjT(5cwXUp3AI*wa<>7&^&xg^(lZr8I7*fA$7OF)VV%q@f0|jf%p=z2-Vl`
z<8OWW=cHFJoD#w-*%y%<K-8;QpS?%OXF(9n8qs^51-tjy_jjATfc!Yf3uOwD+xtUK
zaV~%34C%Ji7}+H35Bd_F^AQm^)41P{*<LP`rvB`##&c(Nvlf+&;44{v`Ql5(u1zE)
zakWiHB{hArU*L#q$t^EG-TZ~$5~}m@NnP9Y+P0i+YF1v}{qF7$<-<IHl$e<f)BsNu
zX8aEEbo#kojB$PoS(wo{2LRHI$UJ`3D^{a!@VS#88E5^)lnlsRv!(}+Gd&iYoR}Z5
zInt>qW`U`vlt)IX>IbGx`2)=Klm+B&+cjWoGRn;yAk85Yx8ALJKhchBc{vVr7UAo^
zdjyoLRP#5AKK)52FLKqm=$_xvHw>bY<1zq$Wp(0)-f3vOqSr*iG+V`H5^h$WIAp8@
zcLA_P*n>lciFxS6$SHa_!9{`G7!v1Y%R{ydS6k3px^<+I`EW$nFI(lYpIU#-g{X>2
zSmOHyD3$pXqwviZv;o6Mx6q4|=6^Pkg-`0yO>zQU2zpSkw4$se*;6Qa`rUoiHab?r
zF3vyEQa(Xa87#EkIjLvQ1`OZatIGFQfP#}xdFklBn)cRco1D0{5!o_jY-RQG;ltCV
zVgeI2qtmO~!Q5DVBNLOnxjD<h#d<?_sXu0cDgX1UJ^zlY%94KJBS*S+$7-}G9<DzE
zV)OPZ$Ma{IKcJ&ZP+_9Dt9+H4;PapsGq#eFapPUF&VCbHngp;rr?>6o)1Zlj!0BF*
zopZ3=SPQh+5!L`Y;I3!V0awxLJ4=Z>QUUlNR%bdyQU=?A8}*M|S76eolUUaK?O(mA
z&AMpdhQn%@LHI%m5}XWTzDZY2;io<wM&T|q`cQ-87$Zh0PC77qC-j_x0H85)9e&F4
zyjKD|je*Xus*=a6<fY_2UIX~~`-`2xpW9^azOMj^!!!V%t04)6_2n7fi(1m>c7R_{
zRXzRz4+^tRXLM#;D4*Z>GaGSZTMZ~lG4j%97mV`1R}vHukB=09so8|G`4w0Jq#}IM
z$i5ct!trh17l?j73IWki8>eVwc+&tMZ=9BcgFw_v?J|5q*py##+w9ttdPccLIhMmB
zo;~?U(j^IL%|u=liuK-006AIQ@$o<;sj6WORjr7Md)+e?Oy;_-KR0PQey<~vMeh^f
zmoDGntjnJcazli^)jy+xqttTxnFpaU$HG{PZas}LTwyAE*K(au|FxjiZq@13Ee5Tt
ze>tZUAMhUw8nH9dN6RkKck^f$Sp`jvVl56!q`MmKrm4iSae%H$>6A4gH>?9V8&(gx
zxMM5Oe_k;AsB`$fiBIbzggYD<a6SCh22&E<+`ZBcUDMxppPGCf(vxnj!vH?K7M;nl
zDlGk-EF3nW`IpE+rYGDez3mt31sTBq5O`Tili+A~XJODEzx$LQFajFCe4|<G{`?bV
z_^Y>q>%WV|Ge=mW=^@d7z&CMzbZL?QFDaY;X$b{&$<DgeB1z!nrw`sb!5MyA0L(l;
zsZHih%FD)JQqIbLBgcc%1b+YmVpPk=LMWr#DYkep$BbdWxuR|FQj-8U`N)LSWjg&0
zmWnZ`f*`hUa=V9Zjld31fe^;o@t^2nHHxfHqzx_=muv(AxKfp*OO|oyk4;`BJ2@cE
z14&(@OKf7V!ucg&{`AlZr20{D4sG_PaD;yO3~)Ki{2OM(34Romaum>im+*kQ%_(MQ
zQ9$`&VNS{V$g3s*HdQ6*G|Fg;`+ZMiKn=j+-(QR+Z28dF_}7ymp-wFNF9DDH*OL#a
zQOZ0)$)>Z=U;@tU?C=k6OnF!)sUPYYiZ)Sybhz+qhtl}>CH2pE@BfV?K?aH)fP45q
zyCc!nn?hp6)@g=HXYx`d>vdw?-V`2raFXtgH2+O}myjh3<ODfc=)C~%XS&wil(RXQ
zFVT5z%5)b*_A1jsIA=pcw=z^LRBuhbh@1|#X*{XQv`-i-$ltC9gFXQfIf#{&<7OG9
z%N~USb)7yGtC5jdd#gPcC+i=F3K;+cwftucfb>t^s^%%fGlE2)(#M_m6Eu37r3&DV
zIeN^!<|fa{6Nkg!bblou10A}i%a`d9U!FwxF=i$}mmdQTBR=7TMu@7>gi+)nlRY09
zX(<fRrZ4B}7cwIVh{3bOy6t<esn_H2ij!wq1%XwB8JpOc;N&t9g7;;e0us4h;2IzZ
zKnO`Y`$H!3>0+ohR=NLMtZe}*<oW;RlPcMTvTu`5C6#7Oy2FD$8|6R$3W1&u1BYDz
zZ2T<{bdjEwyY1!9S;vfRJR4Ii`wXD25{Pd9j`W=W0HA}od~jyZyR#68Vg5RvWCjC{
zCF{aoVL<H+&-Zft2@pdxpb2L`mCgf8mOGq4M0Qz~9z?Zc%J6!2yf&Wj3n0d`fabg)
zk1dwyCohI5V1S%xISNo!%Jakb3pUwIs%PlK3N^-Gm;r9-WENeKy*V5VoPS+t$EZ7}
zX=+i+=#Qk&;Or-!XPax3+5}*U`Nm&i#?w9ro!yh^JntRpPqlmjoFReO&zUD@VUngl
z{0fd7xePd^!^2&epzhHa<G8ZN)Dxbl;WN*LrKS4*A%MRQPybn9x~1ltK$Pw)%sASE
zM%L^2LZGKW+;oS;Ts#_?*BmHAXy_<-RVcr{4aO8Pd^|zdz}LbphPFho&H?TtrZ8#6
zi6M*{An*(T4-4n5ub1A-h_=tZV}2k?C#NJ9t^spncQ_~L89fzXq<gnk>UyM=8K{p=
zNCstSAawhv02uJcqt%I)P=>Gv^msZgOobg(`UQ3pG{Jn~rOiHD7@RKfGwU9Y;79&3
z6CzD2k4LiTuhSK=OdH{tV8Onx04h5vez%MpIFtT(Vr`d+5b)AtECc^7>@r)uck3vh
z`iq$caz`F00V`xKCf+E9mC}jCdM6-pt`dJ0Bu77pBSYPb(+q%<FLPQ?&%;`qZf`lc
z=)K9605dQ+=iNJIdP@uOAIDK(qW{q?J=IY?4>L&`z$QRix5I&G{6F5T6vbsR>1Pdn
zW<00W+l4F0_218R(pMk9s2OJv8y3X{RF<hD)}EHo=ePft8^~YL2Hg+o^%e&h7*(I6
z=CY{h{G-dB{4V~g_E1KhuHBDR6wo~YB-?WZqY3x2uUr8q2SZ3Cj<|l5p<}06U+iM}
z@B(?bqEL)S8sCSfQc=ZmN1|vUajTo0&b0oDssq&zCh_so^Q$Y~n)isMmwq5knFy&>
z0oh>Bk;~dZW;IhYQ?jxT|7oa>hDfRv(4{Aqfl`zSkkICE3Mo#nTl*CiO$0J}L`6an
z+Wm+r$E9IeZCcwUY;kG5P5B_dwkc-!WzP@}I|zm?rm84G%3ULpN^Oe2m*`Y^4jWk5
zNg3QWHm<7fAEE(y2*{VEX9P&OcZA3J(8SN5KND-!S&+(}vHU=@Pd5?kI0sZF=7Abh
zQF*ye#X0dx{IA}UhLD?9+u<8a;zT7`gKnNP*#58RK}e$j%5juNBN1B|HIT?PZN$N=
zPU#vumA#+Uiobjnq(cXLQsCjWo~~K`|E4H~ciAODs_Y3ep5x#OkFpI+Lk2;1N)jm%
z<k((rCvH^=Wc`;?y<gEb$>`3Rj_wZ?DxZkzp)^75rSCdQ8x=eB5*7)&+<*hixucP5
zg<3ltXJJe6p3?RU&9rS%oXD3+Is2RF4~EQUl`mGKjt#o|HEXtfbF6S7zV?y!{(UmA
z-qyi=Trjz}_%4#xIvq_cx-#oL)rUURY=4{&OIm)Wt*liy=EmTnmgCtRC?*9?p;(ym
z9Y0H@y2CoyBmVr;*(fu_`?;2LkAubB&r`XseQYxg#ZSkkms%}mH+T|KM!-U?tw2`!
ztwe=Pf9a)C0t)NYZ-<Bw<5Mbd99%bW!MhQUMEPmVFNExw8_$Ey&CT1V4)+NLDv@2U
zjRwgBe`)g=+tI{!M^j77A~kij$Nq9>xh_IrLBRI<Iw!B*@LfzO$dhqj-?jGqHnrkP
zeNLs@BDY^%l#b3>zBASpZaOCA-@mv0qHaINk*MXI17u1|_knD~)`qq4O|hQ$PU|Lx
z#Dk6-#C~jnGS>|x2J0Eo+#KbrK&5G!Ryo-{9TE_rq&!I`*0XUPnl3E$U7lyd4tV>>
zk@7)zI!2y!-<GEQ0b3@k7{C-a7I%4S>wrh2ewUS{WCGT@H$VKeCwvt_K<uMs>2=nn
z^t!o{<1NBpCSOCIjPK4H>zO5Jp5V=~7!S4ZtAlonB`;+J1L=6kqs(`AHC~ksyW!!V
ztMD^Fb*I+?r4M%U5!5|@^TlH2@-PPR^P<I{Lhj>dzY5_g_}1^E6@`7nXcMMASMno<
ztcC`29_3O1K~lGJ<A6!us&TWo+f-(4{PC=kZkA5e4x`P=4usE8Bw~53Ga+fnHaoke
z-HzFQ`Jzu6FZT0d--72kmtU{1TvtBNue4t1$!k~z2xK1LCf1KWgCPM>qIr;_hK^T#
zZrJY4B}7Ef{F*uNOFeDWic1AIgs$8L2qfsIrnOZjYmxIQYyTN%pf*eH`|wsxT^$b8
zhD!hl5Bo2g1nWgd>9P}V);WzU*ItDt9V{>UmSFi(tKI3(h|f#-^*Enjz-4x+{$Fiz
zpSSrR6(g{XUi2U99Y&w__W)J+j1yIt`CWjL(E2y1KV=p-Qt*w{32l}5U=gaWq-blU
zQ9HJ~rS6dD-yddsp^Eo-0WYl=XHdKdUn89%R_o^s2?z=iOj9<vxccslL3U;g<I4SK
zirgRO0Hr?*paz!iGXrw(Y)4n=!4}RiaEj)Xm*@bcqr!!B`S`q%-O-X#h0=F(&eVk=
zbBF0^NUc3##5^&j(XAK(r#Qk}3(b*x-$vhJ>GhHLaF#@%3_I-YUyK~~qt}E+l!C~M
zf1^zls2rJ_M<%|nvWooPR^`~MS*5F&=c!VH^&j@}pT~Ocn+mXSlsq^Haqt){t&pHG
zBbUjP!IjnH$JU34n<U)q1-$dXi<C^3M|3*`M2VQ1Dpv3+GYdL?JTd)kF1wHry1{dQ
z{f3aTZQbz=;p^gt4xF6y75{t~oA#_XW#`uxsi|=nP14As>gqV>mNZ3D+k2MHCjCSd
zogy_)C|d)?$~F%i3Rr#0+Tue|%MHTmsVVs2_PK8>Q}XxG#>l<7ckv~Qfpt=_ZZ-6H
zeEvQ`(%0jlqS9><(r#65sor_f(y5V5ae&SFAd$z}jv9NX%B1W8Q_<|-Kg`L212t`+
zu=J>FQ=e^JOj!^N@Ezq<pih;uqHYrl&vszhK?kW{QhUg>#xO8w)A>PW10skfwW#8y
zTDR&Cn_P8()C9j*z%6IB593&%fE=uW!nlTjKnlS*n_jI_s`Djn&!(ZKDUi+O3>78U
zGkn;RCQ?ep<2Mb^m2iM|;M4D3{qk0@rr!PzH|ov->W&$RMNXyN-h(Rq*=t+9ao#v<
z$(hhx*jH%J)vEW=4bnV>wejM5k0U-D^VUrURL_U7CAy(383oqnT)l=CYdRmZ*fRE6
zP5#<dgBm%XvK&u+t>xW*Vn6!9@)aa(pm<l`tsO}}l>&LH;QREr;J>;+r3&)iVTYj=
z4L!!~QM#X8es0`<A0bn#1hxQ<RpRvXkJQ+Y@Jm#+$vbHO<u_Wk@{cVv?<p!J1i#V5
z_gGgZnWxH@cp^9=<hVs?_2|(w?o?aIquzo&nZV%qCc*UXuZ24-G^tWTCwUc=r2$lH
zn8Tit!|_U+Jfj&qv3+>|wrg1a)@xYc9c;BDbiQGfulSqkQorB9@^;}gx6JRngJV%q
zzqn<LYL5gNT4Gnd5<{q~uY_+5jk`T^6B7^l9SgKW0&Q|Ncznn0caC<ozMD36OBt|!
z+UIMNX7P8FU69%Oxb||&rwBjJy1ns@u3?X&d2JuL>K5=(;@*j@C#*%Ppm%VuTu0s!
z%Vi0^<kG(A9=*ouoi-sHtgTX<-XE&7+@;N@M0IQ51cC}U<{a<Ef(xC5JYwGC#*Ag(
zwEzO75|JOpo@5D)8lPFHbTNoUk2xr}SG&x_(vsyz_2xbtl?KTXSc}3Yb(B2z8YWPh
zqB{Yf^b!M67YU1BY69T*Jy7he?wni~OR87gT^sxd;_C0*w4sJ$5EHgBH9k@F&foc(
z3nH1Fg`pv|51J$L8sUX{#3^iJj)Z^n(N4H;I>+pfp6ShTG>W&zV%!Ns0-BBIS9g~C
z27;D|pUp*Flg1kq4LA3uwduXm{z}_H?n58;{#@in!-nbs3bVVj<AiK*ZuolelNY-4
zTimr8UVi&sUZoDg)oRK%HWT7#;WFj_BpmE!gQYjoHS|OCGnKa$r++Oc<tc2!pi0V7
zfH>uWgm4qObRhqj=aljZ^Cff-#NW0;`Je|5qmJw~5)VebD)wg$8!e2r7p+kG^25~i
zVNY^;OJ>iHbGG#EWtvw<sRC{j=-Q<XGsTg6?61Mwn;N@zIoqf>7G4t2vPOP7oB5`N
zVy@wkzqHll>1&WFN!_+P!02{d!q8V1uO8`IUExgqo`PROtojQJ3w5742*Ls#gJ#Q0
zD^7&{fvFhYa8lpd0W;&#8V8Y*xSQkLK$l|5`ha>0&?DWBoQK2Rh7CefX&AH45HzZ#
z<&g@L94E8cM=y%V+8!jtp&8?d+|P_|Fme$pK5UeZAG#YDaiogZ|9K>=b6*YJ-eKZ=
zzsNRd-5<XaFG3y}OVDi*5fw1Eh~-8jn>DH$>{8S7fA*XPx^np~{xk(T@;(ezX%jiG
zby#G2j8gY#Rn$Jt>1Z?O`!BAh8vxzbGKdr4VM|{`GFJCRQ}&?vzB<t2m;dWeW+-Be
z6+KXSx5TNjk2E#)A(J8P7^Com8usibh4Ag?z6RRpZ3Qs}AbuycD2>_nW(M9}?nujC
zM}3`tlbm5;-1<}jmwfV)h<21;tpROslI+UKdjs6R!SlFc&%dC|$F<~G)PCv@pldVp
zwj~-lTDT+AwhBMW!PbjMTl+R)LyO<25Ud(QsGial$@@$F|GI+c7YV)iV0CUb8_kj*
z(CiAtMjyRT9KLL50f$%F?r()FB&*0or!55S1$ZpP?%vrBJ|L9#0A0^IQE{HW(EaF7
zu7sg2|Lq&0$=J4;G#=V`VMbRjZmf7PbSHA@y<F|g?a)oi%0MT`;0OcfEgOVod`GMv
zj95OaMKwZL_PAi@Em5+bJ@4u~djZReii$S#4*o3USrHm1Y34omS~*Qo7wDE=-_F^F
z)CuU$uFv;R;9ovjfiy~6N3cX0*2X6FNP{m9R6oh~xyO=;|4KXH-eEs0(&%N^-pItF
zYYy?dZ){Nb(8hSk)Uv4aTnE;wp<!>xMv1)|K*9>0Shir_N#27^WT;>dZ-J8u#`Qx=
z?8PB$<5I&6VsvBc(M1I1@uKJu7HFIF(i!%B9!a6L@b>4Ji%2hx)zKG**x57`mJ!B(
zf{XJhoA7m{qqS@i`w6bjE{5!z!V;DH4ry0<_?`!*R_>wr>J6b-Zi}^LYG=WGsU(7u
z@$xNvmM;WlM_A1{{1HVka;K^m!5zJGL3N7$`<YtlqbET!=1Zi#y2A8zQ`+9uAquwG
zf)f3^I*Isv=8d^qZ__Kc?>FzPEdEx0sjMVFQpmef|Cq^nkG{E;?}fFIGO)nFSQ!hh
zBBy}zKeP(wpA}`4w+$Vy$qfuZ_UuAs&;u~j4F(~lrEkLrxeBz$PUo0dPXj3k`VV#f
qE-(L2KhOWY8z2$&&y#$@0ml)N(}RkY)1ttaAZ-nUdl<C`&;A8lKk~T%

literal 13401
zcmdsec{r4P)c>t$QIaQ8%IJv_LS+kCQb@9oeXC?&!`Qb7rBH;j%Qg%%S;jWTC`H)~
zV=&fan`y{0WPk6wr{{V9`2DWmyIk*k{od>Cx?FRw-~0PL=X}mN-*Y}a)zwyKW94B5
z0Dw*7)=hl?*n<QBrtSm#z$>nQzIFwFn7s7WRRDD7={fL(*-J$OegOOzbl|}g05}6^
z+`JC=OQ(<cd&3#q&5QQuX%9ZD+}d+c)8qq>^3kKJ(i|+t7DqYZM^lE(uvjIm6TP4m
zJ5+}i!#b5BZm2Tr8JXU^`9gvDz&&<mm0P#Yd=YqH7ZQ4gpQ$|ITZrItNJf*a#&l=K
zOo*G^l860tTxs5=F%fVgjYoY@d%<5oFgJS-czS^o4xXHd42RZ|tE<Zd0CzcAg~5~O
zD%V*6AWZK9xH8}pD+?F+qn7hO`=zq_Y{k{qXP$@Wji(5^L5d^P*RcgHHK?f*!#ZR6
zrPXq`@s2SRxVc2~#aA{SN?IG+Hb&}9K%-wWHzbDf2k(vc*VuoLt)mw^3uv6g`Oa-b
zhy1Bwwy_b)#d}gn!wGiM)=>?7QWDm7$Vopae1Vog)E^`BnpYbxBYU6C5wR%7ME#&y
z*~5q-L2UmE#Tln1Lo)IWzsknM+&A9MRj2oD?z6p-%h(4U!udY8d)T<+iMA2@j8mIv
z3@QzLn;>rQL@Mw`EOhJfZ?N}uq*xYpzj(n)+o2}OFnYFRH|$1u7z;0pqut)TCEB#C
zeAvI>upY&r4mCu~H@Kxot<q=ALoK}wt4Ahs?(qbW1xg3YHL|uC{+5akPXvTq%?tM3
z;lW5B6veLMbvQYWThUiZ5B5>k?B*DAe9rzu0lbR($Wb9nsnxHV-c#fE$_HHx-I^LA
zWCMPDA~^OGb5S#hhBD7j=l5`1AU&&bYLxNAzHk$3t@1wadF<fsA!~nwtc&RwRg@9Z
zhE`Qa8#?8^81{&(U&?hND7eny(Ul4xTEeoJE+zRXY2F3^JkqCFu+oaDO6t`+J9--W
zx6^!5%O2#|T{K0qh@{Z)f>|&5FSb{IAF$rlpPHJAdFF^-n+eK+{&u$)#p^;op0l@D
zi(a;)RVnSLC3vrA|7likm!!Dvl-Y0R(tn7sfrwl}&=z2NMx9I=#EtgDphQfg<2jvL
z8t@5uE4&m*=ehg&!Ivyu&8vz%<gp!wiF8=#7Y9gi&x}JCM0`c0-ChW2od}LhpEweH
zX|2tv8dG<&rnOaaoju;sHXs!Z3wXKVJzqTcj6m#LuVB2-%ItZ4kH2_0^cXDE<Ru5k
zuSrk069c{M=0*fF`w`r+B|XyVC3%&VMyADSfv&5&qJs3@O4m2g(us<%(b}#<w-c<g
zcAn1fQVbfl8Q*tz45lmqKv^|pnWwKle9!hYDMdhIL1D47pP-~gDeUU+ZrGOGq_|7E
zPSmru#a~<4<C?LWFCBErGIV$9MnWE;etUsc-BHJC?S}ZaWx~p*Lzvk_f+7a75b`!;
z#DKA}63?JVA-IzH5Id2r83Z_L^i8pm=+{cSw(|%rH%y7?p-RLMHxIEet2K_dcgX;4
zOtFv}nSZvy1_~!bhEkomE|Q{|AjW$YsYWqQwDqxF=xtq*)F2XI+ZmaG<M$MH8=LB!
zK6|(hRAGmL{hB`O4aw1;u~K$cDDFs56hp384P7hXQfou=yU#YV3io;?J1nb9NPQpP
zNywXWY)O%Ydzk1ntfvahZ42(2-3w&`!crI0!s`%SV)W6h(q;X?xzq{nHoFR;%VJj5
zRu8cPbDJx%T*+D9pH8UCI2WA3ja1(ms=7m0@Efm0xR0gfN38qDJb%*t^6lB+2Jf;4
zQ-Yf7A7-}`K*K@5+X7Yi?XWLWJzAS*>Biy-375xaH(QWeDw>vl+SVHS+95lR)rM)1
z4EnS)5Fr?^%3WPF_^Oe%Ri>ilRcp(kbEwexJ|0(Vt>mZfqZW%DHs>^yLZ`b@<wC0h
ze5fVtyIUn85>tYt`KCz<%=8|GY;WhV@P04Jt*OW<Ex)*y?6Vt>|EaGkn{iwF4)MuO
zOV&`=mp1tZg3ki+{noXNlp#%<sMxEnkR+(<9R^#n>n(?rH$V1sWx6To=~pdu6u%1!
zy7PR2cFgulaEtU57w0WkVYK{a_jL{8%dhuiLsxdSadd_KtHwVSublm`hPY``BOuf|
z*uGZrqgz*lShi$SSc;Oab*dY=?t??~J$#z%Zc=DVBhTu-zo$WbtY>`TqClk@#rJFe
z0YlN=vvO(%;F@-RE*LWw!)rJE-doH?^XG<ceNk}A8rWE2Lrzo`RyrC_Nv9WAnHJa4
z_xeW{kE|xDs$LDY&hj(W7%ZFI+!&vj+!ZQv`D;;H*R_65uy4f$n=biXE2qTsZ7Dqb
zR%}Cyq0fKIO;L||megRAwsNCP)-dRfmxg}zDsLr~U=U10x4#)Z3};XxsL7hxf%%CU
zSZK^v#iv6EE9#<3z+%|4bA7O&Rh;g~;m!p_oMPyFR_g#>bIg4Rxf?8Nz}Jz*ud%VP
zuxl~ts${k_S=FMZZj58Ihm;a{EtAJ}^PnOA<i+V|2_1M90fZ%EYg%Zh(>0NVHhgPT
zQ0Tbv74wY|kdzUqyPF|(BSAZm=O^7Xt7v?dqgDYnc4fwUuDD<6nrmRW7<~w3iMr`J
zT6?3S!St+#uxHY2VW__f_qKNoW~DEh>d7(~A)pZ*4=W=1tj%`o-Pl-xV70xR%idS*
z?8}%NDs6_~HXTxZC&G<jDziJ!fpF?IlCk#5hh=)>1RN);+T~mW7hZ`u@s5@M1G0_b
zT_M*YAxVLoBE7vUgC|$H0RWjfcKUj3Y+U~_-(8Euklokk6?fk04^<l2^}EeQ%k)_I
z>V5KkA6kDGJspIDKfK%#ynqgUK;&&G9MiE}OY|K>nTPHon-!Ks*yO7T{q}Yj2=8=n
zY_9g6+bfQ&rX$6SF`bsL-eAqEw^qrioAG2)p=LFYYxRg58Ov>1f+3?51V;S6II!$z
zA^C0IKbu=@*}UEKvRQ|_lRWW3g)u*@s@Z><fG^{=HY;=u^&`?73csL+q6`?c{#?+L
zrUv>sIN<5KA8Y)!C(wZ_pOv!6k6ZYRQhdIE+I?2|lL<hw5QLBkl5XD|uudEp_L<-!
zu2V9z#eX)1Ugev`a%o>ar{S)+^SD9N90N|LUn^IP9Ghb0)9f3O<pFxE+c7%bn_dmw
zzNg42XV3kXKJV{pH7xOb>YLop0#Bh$m=_@H>n&(iZbb|qb~<HjjiD--ky23rX=pTX
z$q_H*Ro7ri(9RMw%Lb#Y_l%ScVlqF)5J%5aS}TXV#+aK)VVasH`XRr%^9l>Mkx4<Z
z>s8Zdv#-r;i`?cJwYv+vN_q#&%D_nR(r2NoKeu|M=#fI8b310floS8}2jEo+AA&HX
zKdHS>6N|(H7@}<72PxF6im@+gX$WV@rA&FrJRPNukVTS{wWj0SjnRDup?shTPi;{T
z2zRzmE`Fvj&Th+E-%4n<mK$1Vbu<_N(^_4n3rMZT<pn}+N<l;6cC;ty&mt@uc4e4)
z3)|0G1?G)??5s}5balPqs^>n{dH%Sh;7#Ks1l`d7{d(%KGn8G9kNLd>zxMA>FHd;A
z-Ju8i(C9i!J>O`}#W&Kb?C}laDHn-DE8doYUoIeMeMKK^*I8HscIYxvPCs<n<f^k4
zW^7yH=05H2s9O$IlS$mx`ZJVH#n-uW%hS~EiJ)`Mf({=HZN42~SDGw$G?%D!VXW0T
zZ!ss;SZp|~au4C%G3gu}JW_thfIM%-Nycc#WlLyT;3FEu^nA@qAA>ppM`g??&%>Q;
z3AYM?K>;Z*ITFFxolR+B%d9K67=hm!m6v;w7HBp)w!IaiSjP!U=*eXkgw}?ds$80*
z)<$!H5K@GU=@maehDO?Tbo$kH*!3nPiS*&jeWji~c_AQbvKkws8Pi4e!6zvG3@V5^
zd?LHA({g35zSgYrey!N4fDLuu1|{dHE57sawwkLN#Clsz!+A0CcA{JFn&T-+oA*Ho
zow<t?A+mX5gP#1Fosi<{&q7hx&jWAS%%y3`m&vW?(?&P9B(QFSw=LzpOFZz|*=M#_
zGdI62`n{@kE-VO<)ujKC*mq61u74TnVyTqo@l3$+OY6cb#CX_w3x9@b$1!ko1LHs9
zn1mY{s`DyD^E@oO;`99lW%8u}uc#Q2k`?lHW;Ec&?#2%VTY8rwz0NuqcPBJ>TWXuZ
zAXomtxu4U3?txwrztR~h8TjQsUdg%Hk$i~lpx$lIayxNT0gYB!?^`qpY1F2M`bGN?
zta7M7ol9YR17(&}bv<FFHE_3gLp1H2#(E^nMw>I{^YRTVjiD;%!tjU)62abG_QMCM
ziB?pXiT1g<0ugk-A-~#2gN|cLiAc0{$t`<{3^FeM_H9dH5s_Y^p-3>rBX1UYJP3D(
zdzH3;v+Cb*!McyAX&e+ydi^3h&Xpo0YNMIITt%T%i8;9mW>tNod-pqCi%&%#0*%|{
zgr2U9TL%b&ygHv*q@8x5v|GmufqdHs$YFZFxI4~rZ$L)wN_#sixosG0;4D)}n@>AW
z6_nBLrp7uBHP~0r^C(^SNz-B<@vjz}4Maz+^7%DWcon>BuK3c4oh27L%vO@bW_yjb
zqi-ZsN{DFAy*XL8*8in0Xh7BM2mJ~d0ktzK9Vv^a=iZo;a$G5_I+iojGa?@*x=-=x
zkg}}Sqep-G6|=^}N_$R&wr!;H?6}hK4ooUO#>m708Gx9ZrbNvx&p@^v6C1Z^iLte)
z_nGg|_tB19oq_eml_&^b^~@tu7X9!;Re>q1yjQb7{(Q{Sky}Lr_mfBwepYH-M_M1=
zAV#1_y^yn%Qm>KFR~x*4>U1k9Fsti@G4b=E{l+z;RU<f3e(-)(Dd&RO&$kfTZWvdb
zud&H_xhwjm=2h1w>C(@hbiZJlaipeX(HtJW+_!dW99M!s8EveKCQf-@g}xADc~00j
zg_iC%g0<;_`Co&%j@0(1Y(6fxX{ihxvtnq{ivrJ&7LRA2>DUQ)SURou)zfia#@czH
z@ex<mJyNqIR}!c5tUuSGwOR#zl58!0G<EgmXqN1aFB+v>e|T=7WQN_UcYY9;1HST!
zI}8mE*1fY1%@+_PJHW7(V7OGaG~MCpyPu*7Ld$Vx^rEO~?b{Ds<{v-KW<ITU8kyEI
ztJ(;p52fWhi=Uh_Zx+E=<mWdmXx`SGI)K@DGFG%NgQ5fJ&taT}EADYJuSl=`p=pr?
zkA`co_<AeMuv`57TpLc_lSLhr>N(~4_r0u6%d-xu>T1P0Yp{g81_gZ)7h^=s?HI;t
zrOvBVqG>R$(5S|R(JVRjZJMehP7sJEi^R9&8jo&fg~(0V#h&ypYJOf1Pgt4ys>*tZ
zO~G|U&`QQE#lO$i5_HLkd;Zrg6Eh2>Ma>;s2Oc(L;T0LdrCMXiA3r=m?DmuR)rxH`
z(i==F-+e&HV_geDJDCGj15VY4-a!nr!i!uq@LNH~fJxbFkLkiJ*M#}gzP*l0)*w#v
zZSyzQI}%@2N!{QJmTmJjt&Yo(Tu94z8WGm}^F5dP>x6W0he6OcYd(&3?=_-HyX&KB
zu0k$k;sd`^Z?R#1#plj1J<--7=#V13WZrJPy10%@Q^us*%C^gPa)()i4;I3XeEI5Z
zufLb~=D?z`sEEN(zi6r-Ln>)h+fX=dKd3Srutrb-!ZEbViYufa=j>ZL@(N8s6Rw}C
zwwqnwtuOlV;}V<vR1v+CE<Zcm2gh&C?+R#a2QrLWs_4QOD?-}N)4z1~Yhi<A{K-ck
zs7WiVWy!pH)m^T_K_4l_9mklU-wWdP=9tw@YS1|ER}B{BChE_g^+{jW$c;Wi9@3iI
z2x$t~zQ6S9w)-+P)tYy@&x|jUzjC#m)2O!c%J8vYKzW{$t8_$(fpf@O*fGABlfxr-
zH#^~v&aHB&#MC=@n{^p)6#YXc-_|x@H8ynak&y3a4xj1ew9MjxDPoDL^;}d>ij1Ek
z_;9G*$F#hy4)D89Bjtv%ZAAjSvH|eieeAB?;D!>=dNif8xS7^9-9@TWz#&G?<vJtq
z#{?%KVUhe|pjfRoAru1s{12-VC41J!80zakKpZB(O<s#v<A$jxLR#oPsCSpTz@w*|
z&Ldo$-@Z&fH0Nzvs2Q0O2CE2iQP#pjLJ4h#E{NxH|4S-h;iX4_l_AD+i&0OM&6)1+
zSUE7sGGmq{$zHr}`QfY7pLSsZQG#Z?2el5UgBh4|DX%BDqyOTOZJE$W^zeFdW}79_
z6VpO9aX5Pc`7T{c8pRI)ohr5DQUb3<cA5{t7QrdW!3j6%6v2=<0Dv)0`N|tG)lD{P
zQ9h;&6$u&BnEf-(&U4pMHjQ0+&^Pe1(+Jvj)0jE$-jFz`wn#O!JE^Yw&<Cm}W?R`N
zPn+>F{l1el(mZJD@%s*gRi|8T&(>+E+}MY*3M%I8{Nva0sX_(#<l9Zte+KMu|3ghg
zY`_t5_@^wZ@WmGOj6KS|9yt}cZjK?Dq|4pR%;vnnc&;{6BY}ky?rlAMX@q>ghNRbh
z6RL75mtqfi7JHe5*FFB^tkMoJzQyVx)xkx&-B^n7yy}P7cjY=h-8T0eu6xvXa>xTW
zA}lPd3x}7G^tR&K3@>8HZQIx*tgK6%Cr^sv6h2cggjtVE{Z%TBwz^yU$RHO^t&)pW
zim8wb%VJI7bVnRe;&Ma)N<PzLwKog<gql(4GU7LQ{2ym|6i(a~h|Ass+<p1|tmB+j
z+UUUDUasEo71Q(fQcO3mM;>&kf5r#EP0lM+enb~GOzKE9;(_F4PZ%8dvEHSYmTbRV
z^Q2J?R7K+@cCjkj>}8Yz&=1vW@4imIKZhDQt*Scy7COzQM++ejSU^SJ!<G0(DsvbD
z(#VO=%}j9SOHkc+-)-0TLO+kz{JM-(KZH8=_ekF^%!S{K%RcJ?Y539;En-E}HP)}<
zl6y`NcHW)lL$Cr$sl+za=;Af8v+r1b3tu^gH3=p^mg}s4p%8!+`Ak4AU;DBZA~xxK
zVZf`S_Yh|r4})T#$32Ynyqa#*@<To{a@|vopNsS3NR2cYe`8`;Ik~u;5uAicPp&o^
z!!xurB0T(>s+wAx8+*AN>o~U`+kZ>F8mt8a0rUVhG51>1<)aR(X1sud-$;{Lk)}!b
zKDA16X-8Lu+!0-y)1ch5pANz6th2b#<lIgB+2Rb0Q&(9Kil0eJ<$C0lOSvg86OdXj
zb<UKhfzIOUL9dWw)fEMeb|#5TJpdd%dK*7g=RT$`H;pjoWkEs)9|n|TSF$r@uZ~eq
zC?`S6V16As6YPv&&b|$4Z_k}K)fR&-tfg^G@E8za%0TNyc?a;W{;#_)G9-|VcYht~
zx~nIUIKpm2T03xwu97N3gt;LO|9-GNZ{U%UI#7HQT*R5MyeL6x+`x6C7U)9c)K8=V
z;Bfk0)m?=YKYaMlW%j1O)tWuQKved$mA0T<Z+W3|0TN_g-8T{J&iP{Z4)UDnv8t9<
z>Y`p%j@8q>SIhQ=y>-IF40OYs|6xq2UH~J{CD#8prlyq$UP71k3r}D+1pK7(1s6EN
zq^?44C+G^hrkBsq$_gtEz14^A@K1MSiH#3uZ5#CCRsv2qIyY$96i~3<;^(+xpMjVC
zW!Z&+6ZD)<KD-Kc2v+7lAV?sIf2OQ#+QRoq!a^tjpp3P1t9Z!C6&nS8!AU?OE9F7X
z!(UD%)<yiC9Mc|_Umoj8#$Kd@0Hgz5{vy#5?J(u*kh3JQR`KmV7RtW->kaIApS2}U
zB_1~D6?l>D;}zx5c+lLGL09|>Q+Atey73<(O0*v-|KWlF!s6vv011TKJgK6oo_f6P
z5woNiG{+wrPi1%PkctPbwB|G}M@oUO5BpBCPI+7{jhpagJ+wUKttNco3GSh5&4?Qp
z7uN-0;eP6ckd`UoWHN1P$80|f3s?z#o;=dI{7qTw2M;*w|N40Ue~DD7;jhm`*F8Rm
z^l}JydoqXGiSsd1-;>G=xkFv`=#g_~di9zMFsmY(PXk)e%MSHw*JH1JETq8)6>@uk
zbgB6I07kcd?BIGTNe>{XgJxU51O^v?s+B5Y9@_cF264C%0~tTk9&_5P7;&z?`y^5X
zk{P321T)%d4T7Q39eTh4cw@W2G!FO)LKAH4-8C0t;ri=Iws478074Z4I#c?jgDZmh
z?>F!t5=;JmgK_cW@w}&(w?Rz)H3Z{(%0up=V248}8z2NSuSLB=AT=R#;%S|@TMg+l
zKsf$erQMtZw!OS%5i1@a&Ve1NEg0ki<eXrfIi2?wsi#x3%Pt2?HokO02xMzyXMgZK
zmB9C^X`)gtYE0;2drI%gqU<yC&DaSaoFN>ZjYOKDa)0uspiHbVDVri;`&xcgUhZ-p
z!8dyDEmSM&b49R*a@vEzh)Y0dlzKEom`DW}#r`#~{+Ki@JmKiVjS2X)7~t2)3HdhW
zyr7gyPl6VoOO@l+9bBfht#NG&6%PCzn8H2{Tg@dQq_wufm7awitP%X+Y1J9Q+IZC2
z%VlH643-F>An9KHqC_6T%El+Knmh%8)2J~Fn~Uh+gg5^3XWC^@G*Z3`<zyZ)bQbW#
zC6G@V=iGY8T=FUSC=h0l=Sd7{{N>-YdvYU52g81aym5hv>qJJz`YoZ~BQ3S<z|Kik
z$gvz9_zj{)&TX>*DcPhJfkr3Dt3!Ux=uo+a@9HXbwBZ_-{dE{PqXV}(n(|+rz{q{N
zWrOo0J@cL4+YHHiELP+{A#2El{{2O+f3xv=uu2Z-b|y=B`nQ$FJyNb9Qvqb@CG&Us
zAHI@gC9NXTd8Pg=Adp@Hl1CxvY^fAgTb!~SOtq@9Vz<>HW96;M4K^%BEql6wf0Dc(
zH$*gj96zpdC+VfyAUFZWbI1cuVL@0aA^Hr8vlh~dp~Ub4K;;1Kahy!F++?WCtAN%F
zrAk29*rxC36);=;eJ1}^$S@N(Ks^Ca4}#Bk3p_}MRm$xN3xGPwk_UZG*)ubxvVwwX
zTo|-9==yOJ8c6WhKs3(dg&yWlKuGi*`}Kg9Q%D1tZ1(X(XBfuA%AUOG88G=%R(K1l
zB&bg)tj@`fz4wrYjsIz;)Yo^xruMIkC&q8}E1Aa|=-;XY-9euO^t$-t!SJL%j$=A=
z7J0sXM;?R_%AEa3_dgbyxRfI%|IGw%@IrOM>?^rXek3WQ)O4zz%FW#2i$H`2GZ%38
z)xRcpQ@!Dm3W@f&On3m`*c!wI@SWZJ2#hDc;!@b{(?W?btNY}vhRH6jqqk~Wnm|NZ
zAIRp}9dYPga)F8b6-s_a?&qc;R$h~Y0Lgv77W$1-bJ-URO$V5NNp-*qOwac)LAsNv
z;;WKl3TuY)^`C6=`*k0IV}OUTFwv``yhjf}83y6y&<83rz_S;6fjc2LZ#fYRqRe}s
zq5Y&ax{fSgcuX);Rvt$m`Q^!qC29+e@ss`~z#i3iBql(S%BgI7_C~(?{s3=F`&OZ&
zx1dpT|Br+Zh=u%junb!FNOUi_Q!9LT$y(b!FFd^F6gi4QH`3F4^!Dxj(zvg_7U=u_
zc&m8~z;hY{&i22ajc{&&3MgYNyFO2eR?F?%(_w|$E6MisPd(}%soCgzq6qcxXU;|5
zH0M32e5{cJ4k%~X@`?0)eS2qHWZ_ioz|PxIrTSLtEg%&DlR5ju4ltRczSq+!g0=6!
z38TAjKok76Ir%HkqxS4B89Pn%90u+FhYhG9W&Eb?s-WC=u`;=RfD#m5`f$TbXM-O;
z$OVz`QwS7%_VvF&^w(|4C+$~Qg~RHg)Sl;YhJ-hOgaDF#edX7->F<X!!LbpL_w2(-
z|9P3Gr{vi`!;Ru!dq=3aKq=mM;cxdSDVmtd-sjKp1-jS*1?eAph049%?XZF|Z2cXX
zPb<}OU~;bx4QP7*)~mY5=aJ4Pnj;+Yw>19j0mF4S^M5^-_ywdA<<tTp91(kSuSS!e
z0^?Uf*QOjc<O?^eBNxa>4|oq&p6M8FJ}Cvfe)JnVcWXcB&+Q(kFjiQ1E&}gh@i*V4
zrz~ghY4(%oD3}@?7GyF312KRcfB(rR>6JOSXFLOi9O2JG$<qs8F9-uP$Q2h3Lddzx
z3(9s}l5(g-8#wa<ieZHl@p}Q0#S_fHRV}B}g`s<YKcZk}k^%f4>DJSi`>MVk_&t&$
zgqyVsPY6eViyv<s{k2V<uED1mkJ!}e?0IMO8#nK);K-G<Wd)u@6<L<M3gCB{k$HCd
zEe@Ev=Gz7V0h}}M<T!xSP<GRB%J@Qb6S(aq7=TreLJ9rr*N0=Bo4~pU5~-}GR|XMU
z;NfI&QU43rJuc@W*R4=Dz)%VZLQeEQLqUo~f1E0p3)g$CK60tL&c+AZ(oT)4%|Ty4
zI>2G^>Rp8G0@CH@@2`OuNxT&(1v?{|b~gKncsbQvQ?SiqRAP?$n()WDYPZ~%5&KZC
z_umRQs`tZ!8$2GxadH*ipj7e5Q#~V@_nY(9UN@9xuWrfJndvlY?&K|}e5aDIDD(-%
zw;vFwRAWo=Wp2Z5m@Qv>&x*enV%DSKkI7?_6UCQ3A4hMZPkr_>kg7<l@P69wb~{CY
zZI)!t-^mA`sCy)bE4E7p>!xi+p%`4Vj_%X8{CK<2oRQ7d){`7LdJ)mZ>bGZDX{>oC
z`@P)~R;p#JjrAUuJ*dz~IB)5NPcW}uEfsk&9mV&MnJf0bbtjXkIsUdxe63MVPL9)9
zL9Crvy10h0FHVZlW?GlMP+J#DbQKmA?H$h7EQuS=E>3MJCymh>b1X&z+XO~rch0*G
zB^Sk-O9YWiovaY}c5Aql3?`3VF{_9PA4oH<9utag%25?b{(DK37iFras$BX-ZP27r
z8+32#O6*X%4Q}DDg{|(CoCLWuE@S1($)bj}IEyu%I<4TkweIIE%ZR0(EalXDuG8l=
z&_sQOo#jmiC2+pieW4bkBFmOnn{$>`m`C-Y#?$Z8xVQYd4=M&FgT`5Sr0-@A!{V>_
zxTN$>=<a6Xr@U`E{A^stf~8s%zYMZ?`r-94FGk`iL1E(H9iPobe%6=Tg$s3t9Vm3l
z`m^HcDp#^L%l`eS(5_L>$C1t-l8kBPIZeT2wr{mXse@o8+-S4k6)gDbKRtMmI#88C
zyi)ZOeF|BDa<Y@Le27K!Tqah#+{Qhyl-;@yw)*DkM}y(|RDDy^Hw#O@mSY6hFL^P3
zbWqsT_)G^I*Ta%iv2Sf~4?a~p<ZzFM7`RodJNL>I8<Wwj<&-32-Rx<-o(9`vlgHq2
z3#g)xD=m)}-8CXz)7~O1=KGEsxrJnQ&h=Z;6GE=N)g{$a1KtqYYl~~A{<ZJ36Cvxw
zm6d%;%^GSo<^fr0#cwRzYW#v3beY!9FE2aXdcn?4%+u#fmNL5b#*FRCw~1MuV{fqP
z9l3A0j`L7AP0w_^llGFg@Vg0OM!bGI8EiX{z`hRDfd$+38cfnM@Q)mDNmg7(fsjqh
zTvQwS1)0|Kb|IODWgj)D#cloE!?YTvN53ZU%Z`F4Z`#twtS9D-ic<Yaj4MjIq+y6x
zG#?yD62}(KzwtwbM}$jm(mrt+AI*lKAz!UtEGJk^Ht$s=Zc5l+kS)ThsA$WEaD-K$
zzHG0+&xxf>hb&{G*iQRxL^54z8fx#Liy5PS`i=Na8Kz$GNnf2h-CgZ$WN2|gc{(Zv
zgg++*<k3Wlrjd$V<s%<Ip56Ik0E)PTH*gi{4}Z0E=*VXBNa&C3bdJvR+l1lb=`#OK
zX?mON8I9X_Zt30+s`pu-&~R>s%f&R?owu!Hx&QQLVxGq6kHLz-zU61%5#>x!*ck#)
z^96?Agl#WXQMfqfksd2Tprl9IwGBaQs8(FRRV0)_st$CDY}?})g?(d=%j-`K8Zp7T
za1<InT)YkTEBDscHni<^bVEJ~k5SVzGb#{2E()KXw@k<@`5r7RDqnyE8)@_bJ=IU2
z%rYAE(B=A~W@Q#5@`!Rd&xm3tnCWH(W3FBn?BCr453vf)@n+R7`MIA|TZagQR!9k<
zdZc0fghWFlpF55x&AlsYOn&!ardK11?W*~m<9BxY35Fiuo_HSN)dzbkaxz%^#x69t
zK4E!5b&SroGQQ5IH$NhJBLwzDqNHOOl6hLz9nu7UB-ji`wOiu)&R@QKW+p1;Y6mAz
zhw+#g)TxGpBDhs(z`dei%$-TG-k9({BSA3B2B${tE+|FwA>OFmP=TD0a9T^*l4tO>
znM1B)c=PwyuTy*Z4Z&6hiD)=R+hn6Lo_#SWPXEW#ejh-CM1lUEuV=AZcZi6TxPGt;
z(oWxR*fGBxd8jg^%`P%B%E^Pk#N(&U7cx`)W)Qq@Ru)nUb&|vhn{l2?N7k+6g?_hX
z?Du~=>?|jv0X14(2g*%Br<CtA|5ikdC&w0L%<^sc2bhiVB(+TT^kN9b>LE)KsN54d
z(#scoY9*a}jO*^LOvNU2JZLYSe{D(6=$JG*)Agcu!bMlNXEyFQH_G(pV=xfu_4=Rw
z+>yk8ZFmj6qTDh}jT<CcS@Koy365%K`&EMg(_p_uPB0e!w^MYLzAeFe1ISjj^(`fF
z;rqUNYC6_R*A5#Af;$Oruyg@P$!vZ;kAIERJ!QE$m8^cfTtuoq38q~GZ%P-6O||Vv
z)}kg6RY5()2H><twk)Ob^_>MB(Jr2W`DfDlN+XTgSC*YToH3+DAX^U%@IUs-PN{pV
z_v7mLX_lqF^h9%*MuIsEJnH>8vfH!0sc4jmt1+T&6Sy;9+ISEocG|wQC4y95+o{u6
z=>hpItt)B9R{GkbIRTXBjU{6A0u^KcCgj;nO(nTSI378!xpwg#EtAE^wOzqV``j0L
zlJxYD_vUFF%<R5#18S89^WN-ec+(f1Xz#)mI?@F=ft#|Qk7U)Q9amp!8Hz1yyf^C*
zzJnqKgeuG(0ST6oRoa^>AdhNpvM_5on2%IqnomA-=pd<N#@a|fNTt*blLJy4g7H4s
zr8rI#-u(XQg(}A#G4rIhpk&A1?-_>Tz1??SmmNF_NM2+WzFVVGtr^<BUar=r_)@}L
zHM5)tBQI7^J0wsEPkWrq3UVUarbUCs_7BD@UAt(yj7JCmP-Me9CqQgh?^X^G3>g&~
zy81L~R7zv-`B?HX_xj?q#$Oz(5nts%N?R@pR-;Z<^vi<SO(!*vQ;YY{_aFlohzU}t
zptgm9YU8zCx)9rINh@C^hB`<|o2+D{e};&=8bnOyCdw`Zf6FEWfq@8KV|AUCZ0Ch8
zCT3dcRYXq~8V?wnEL&QX8m37*eVt@Skz>hJL7naExbig({rpXA`N^!tkbSy*7m#5S
zMk(L*o)+4<M+vXKa>P5k<41RvK<sYqCG_u(Tr*YLZsP;P-XfATZ7ILfF7N(}Gy9#}
zx;HL35aK{5p%*A@w3Yb%e7#%|(Q{GiA^9NPn99elSa3=$ju;_+O$5xsKxX#Hdg0jI
zR_2Vu^w@4uoA~LsPvezJ!gJMwY3l)WCu=k=Ya?Qbm38G?*L*L?Wt;_RrNuI^(6`N$
zyI6#*bkZxb%V5INWE(m9tnt(H*LL1DTVF9dWEFA)qzV(23K|3r%dADx7K;YDfX;m^
zT$hHMiQmmc33U&2z$G#G#q>PyCqU$2IRR|X=x{n~iu{KUzeu7WGfv>@O^nj&{t?f0
zQWDyo$Yt{?{dJymRBZSAt$NlmOjo;Z$h}7(n>1NsIOmi&{!Xdc$2n>acaeQz=Z4$l
zhOn2E*G+H`6OJR%XZg=M)w3B<UXkCm8K1v;;g*;6MhcqeiUmj$tNZ#P#|$fLS$v;h
zBt2<Rmc^9L1{oT-F=VR?LJSF>UvG$e`W)`>zb=$g-M?aQ-4|G4FElmO6R<MH{mR&*
zhRFD&rmmTAHltG_B($X7qBeS&RE9V;=%NG@a>;s?mtN18W{RkFs$es6wp?!urrEBy
zK8}3s)Kpbkw+^xZ-(}tDcemb*UYNCYU8DUYD+?#T`w?Q+8QD(S{D$9zdulBMXCZEM
z6ng;*q|jl4mhR=ZWm%|ouHZxbT)%gI$1eqhUMnTeZx6<}kJdN;`XFuetxsWmF?}g%
zu-v&YWOXGmz@^m^WEO_bjV>MwP9gaaGGn$6kApszsVV<)Gp+u~Hy+VIy$Z402V>oT
z+z~X#*;c5Hdf|M&Q&4ss9Jd`{f&H}az4>XZaWInlq3PMXA(@cb(?E8>Rwf>WceA+T
z<vN^PG~BdqpOIVU{XBUCTVgtQdZ-x{*MlX*Mno@ztk3SXg&!|fxQ_E0N<`n#>$Drn
zN<+QTJieZcaU%4SpYL^5+KU9cmgD<(GW{~rSG$E%p1zBw4t{h#CE9y1B4DjYL1s9Q
zlI3R+QE;d4QT>g&<<v5JthTzz>rub0gTZ(^tlF4wH8in>twkYKnP(-db;fKb3*wKr
zlXArg9!4j5C<ZsK#T+OKIH~?_rSN^GT<LCI^t^G4v)bkk{<2MKC%ym1T3i+qx3dxm
zamghs-Id0c4C&;J)Q4y0?Extp5ux^(Tn#|!UF}L3Y(R$oe1W*YJ8BlHQ>Q)h!OSdy
zjls`9R-oQcB_z7GQrHyO?9b>sim8*F`SX-=FIX(tdZKP6dbLhf<e9Idrej=P)Hw&`
zo8@9|{f0iKfqQ)W*yD}ODq9K+_q()SyO{s+bm&H?pE>6H_xk`-IMi7Ia{rs!5KvX>
g|M&lBnc8Jq<U15J#W8gqoD86$s(ll!ayR^607so#8vp<R


From 816b1ed98180f688677758c6c5f5ca0d8b7c3570 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 11:14:32 +0700
Subject: [PATCH 175/781] refactor: getReimbursedMessage

---
 src/libs/OptionsListUtils/index.ts         | 8 +++-----
 src/libs/ReportActionsUtils.ts             | 4 ++--
 src/libs/ReportAlternateTextUtils.ts       | 3 +--
 tests/unit/OptionsListUtilsTest.tsx        | 5 +++++
 tests/unit/ReportActionsUtilsTest.ts       | 6 +++---
 tests/unit/ReportAlternateTextUtilsTest.ts | 2 ++
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts
index 841bc09669a7..e759bee49c27 100644
--- a/src/libs/OptionsListUtils/index.ts
+++ b/src/libs/OptionsListUtils/index.ts
@@ -244,8 +244,7 @@ type GetAlternateTextConfig = {
     sortedActions?: Record<string, ReportAction[]>;
     isTrackIntentUser?: boolean;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
-    // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
-    currentUserAccountID?: number;
+    currentUserAccountID: number;
     rules: OnyxCollection<Rule>;
 };
 
@@ -383,8 +382,7 @@ type CreateOptionParams = {
     conciergeReportID: string | undefined;
     // TODO: Remove optional (?) once all callers pass sortedActions. Refactor issue: https://github.com/Expensify/App/issues/66381
     sortedActions?: Record<string, ReportAction[]>;
-    // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
-    currentUserAccountID?: number;
+    currentUserAccountID: number;
     // TODO: Remove optional (?) once all callers pass pendingDeleteMemberAccountIDs. Refactor issue: https://github.com/Expensify/App/issues/66421
     pendingDeleteMemberAccountIDs?: string[];
 };
@@ -2010,7 +2008,7 @@ function prepareReportOptionsForDisplay(
         translate: LocalizedTranslate;
         convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
         dateFnsLocale: DateFnsLocale | undefined;
-        currentUserAccountID?: number;
+        currentUserAccountID: number;
     },
     conciergeReportID: string | undefined,
     sortedActions: Record<string, ReportAction[]> | undefined,
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index ad5d46836d28..f9e600ef4308 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -518,9 +518,9 @@ function getReimbursedMessage(
     submitterLoginParam: string | undefined,
     actorLoginParam: string | undefined,
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'],
-    currentUserAccountID?: number,
+    currentUserAccountID: number,
 ): string {
-    const effectiveCurrentUserAccountID = currentUserAccountID ?? deprecatedCurrentUserAccountID ?? CONST.DEFAULT_NUMBER_ID;
+    const effectiveCurrentUserAccountID = currentUserAccountID;
     const submitterLogin = submitterLoginParam ?? '';
     const actorLogin = actorLoginParam ?? '';
     const originalMessage = getOriginalMessage(reportAction) as OriginalMessageReimbursed | undefined;
diff --git a/src/libs/ReportAlternateTextUtils.ts b/src/libs/ReportAlternateTextUtils.ts
index 074520ebce65..26d83300708b 100644
--- a/src/libs/ReportAlternateTextUtils.ts
+++ b/src/libs/ReportAlternateTextUtils.ts
@@ -488,8 +488,7 @@ function getLastMessageTextForReport({
     isTrackIntentUser?: boolean;
     // TODO: Remove optional (?) once all callers pass sortedActions. Refactor issue: https://github.com/Expensify/App/issues/66381
     sortedActions?: Record<string, ReportAction[]>;
-    // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
-    currentUserAccountID?: number;
+    currentUserAccountID: number;
     rules: OnyxCollection<Rule>;
 }): string {
     const reportID = report?.reportID;
diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx
index aaa8ede9b903..2570ed732778 100644
--- a/tests/unit/OptionsListUtilsTest.tsx
+++ b/tests/unit/OptionsListUtilsTest.tsx
@@ -2497,6 +2497,7 @@ describe('OptionsListUtils', () => {
                 ...createOption({
                     dateFnsLocale: undefined,
                     convertToDisplayString,
+                    currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     accountIDs: [PARITY_ACCOUNT_ID],
                     personalDetails: PARITY_PERSONAL_DETAILS,
                     report: PARITY_REPORT,
@@ -2567,6 +2568,7 @@ describe('OptionsListUtils', () => {
             const withConcierge = createOption({
                 dateFnsLocale: undefined,
                 convertToDisplayString,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                 accountIDs: [PARITY_ACCOUNT_ID],
                 personalDetails: PARITY_PERSONAL_DETAILS,
                 report: PARITY_REPORT,
@@ -6953,6 +6955,7 @@ describe('OptionsListUtils', () => {
             const result = createOption({
                 dateFnsLocale: undefined,
                 convertToDisplayString,
+                currentUserAccountID: 1,
                 conciergeReportID: undefined,
                 accountIDs: [1, 2],
                 personalDetails: PERSONAL_DETAILS,
@@ -7028,6 +7031,7 @@ describe('OptionsListUtils', () => {
             const result = createOption({
                 dateFnsLocale: undefined,
                 convertToDisplayString,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                 conciergeReportID: undefined,
                 accountIDs: [1, 2],
                 personalDetails: PERSONAL_DETAILS,
@@ -9997,6 +10001,7 @@ describe('OptionsListUtils', () => {
             const result = createOption({
                 dateFnsLocale: undefined,
                 convertToDisplayString,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                 conciergeReportID: undefined,
                 accountIDs: [1, 2],
                 personalDetails: PERSONAL_DETAILS,
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 9c09557266ca..35e234580710 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -5737,7 +5737,7 @@ describe('ReportActionsUtils', () => {
                 creditedCurrency: 'USD',
             });
 
-            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, undefined, undefined, convertToDisplayString);
+            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, undefined, undefined, convertToDisplayString, 2);
 
             // Then the message reports the credited amount instead of the report total and names both accounts
             expect(result).toBe(translateLocal('iou.reimbursedCrossBorder', {amount: '$80.50', debitBankAccount: '9999', creditBankAccount: '5678'}));
@@ -5752,7 +5752,7 @@ describe('ReportActionsUtils', () => {
                 creditedAmount: 8050,
             });
 
-            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, undefined, undefined, convertToDisplayString);
+            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, undefined, undefined, convertToDisplayString, 2);
 
             // Then we describe the payment without an amount rather than guessing a currency
             expect(result).toBe(
@@ -5774,7 +5774,7 @@ describe('ReportActionsUtils', () => {
                 creditedCurrency: 'USD',
             });
 
-            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, 'submitter@expensify.com', undefined, convertToDisplayString);
+            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, 2, 'submitter@expensify.com', undefined, convertToDisplayString, 2);
 
             // Then the message announces the submitter taking the report off hold rather than the credited amount
             expect(result).toBe(
diff --git a/tests/unit/ReportAlternateTextUtilsTest.ts b/tests/unit/ReportAlternateTextUtilsTest.ts
index b0903686d9da..57a491a44497 100644
--- a/tests/unit/ReportAlternateTextUtilsTest.ts
+++ b/tests/unit/ReportAlternateTextUtilsTest.ts
@@ -2023,6 +2023,7 @@ describe('ReportAlternateTextUtils', () => {
                 isReportArchived: false,
                 lastAction: addCommentAction,
                 currentUserLogin: CURRENT_USER_LOGIN,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
             });
 
             // Then the mention should fall back to the hidden placeholder
@@ -2395,6 +2396,7 @@ describe('ReportAlternateTextUtils', () => {
                     isReportArchived: true,
 
                     currentUserLogin: '',
+                    currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                 });
 
                 expect(lastMessage).toContain('UnavailableMarker');

From a64a1d305162b86023d0753d901a99d3a3aa7561 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 11:23:08 +0700
Subject: [PATCH 176/781] fix: unit test

---
 tests/unit/ReportActionsUtilsTest.ts | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 35e234580710..3c0fec75e991 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -5691,6 +5691,13 @@ describe('ReportActionsUtils', () => {
                 message: [],
             }) as ReportAction;
 
+        const buildFastACHAction = () =>
+            buildReimbursedAction({
+                paymentMethod: 'Fast_ACH',
+                creditBankAccountLast4: '1111',
+                expectedDate: '2025-03-15',
+            });
+
         it('shows the funding bank account from the masked accountNumber when debitBankAccountLast4 is absent', () => {
             // Given a reimbursed action carrying the raw masked accountNumber, as delivered by real-time Pusher updates
             const action = buildReimbursedAction({
@@ -5838,6 +5845,46 @@ describe('ReportActionsUtils', () => {
             const resultOtherUser = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, ownerAccountID, submitterLogin, undefined, convertToDisplayString, 999);
             expect(resultOtherUser).toContain(submitterLogin);
         });
+
+        it('names the submitter when the signed-in session owns the report but the current user does not', async () => {
+            // Given a signed-in session whose account owns the report
+            const ownerAccountID = 42;
+            const submitterLogin = 'submitter@example.com';
+            const action = buildFastACHAction();
+            await Onyx.merge(ONYXKEYS.SESSION, {accountID: ownerAccountID});
+            await waitForBatchedUpdates();
+
+            // When the message is built for a different current user
+            const result = ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, ownerAccountID, submitterLogin, undefined, convertToDisplayString, 999);
+
+            // Then it names the submitter, and matches what the same call produces with no session at all
+            expect(result).toContain(submitterLogin);
+            expect(result).not.toContain('your');
+
+            await Onyx.set(ONYXKEYS.SESSION, null);
+            await waitForBatchedUpdates();
+            expect(ReportActionsUtils.getReimbursedMessage(translateLocal, undefined, action, ownerAccountID, submitterLogin, undefined, convertToDisplayString, 999)).toBe(result);
+        });
+
+        it('shows "your" wording when the report has no owner and the current user is unknown', () => {
+            // Given a report with no owner, so the submitter also resolves to the default account ID
+            const submitterLogin = 'submitter@example.com';
+
+            // When the current user is unknown and passed as the default account ID
+            const result = ReportActionsUtils.getReimbursedMessage(
+                translateLocal,
+                undefined,
+                buildFastACHAction(),
+                undefined,
+                submitterLogin,
+                undefined,
+                convertToDisplayString,
+                CONST.DEFAULT_NUMBER_ID,
+            );
+
+            // Then both sides resolve to the same ID and the message addresses the current user directly
+            expect(result).toContain('your');
+        });
     });
 
     describe('getAutoReimbursementMessage', () => {

From d1f6fc643dcac0193f623c0c581b4f059db09189 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 11:27:43 +0700
Subject: [PATCH 177/781] fix: add test

---
 tests/unit/OptionsListUtilsTest.tsx | 46 +++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx
index 2570ed732778..e5e552a985b1 100644
--- a/tests/unit/OptionsListUtilsTest.tsx
+++ b/tests/unit/OptionsListUtilsTest.tsx
@@ -5624,6 +5624,52 @@ describe('OptionsListUtils', () => {
             expect(result).toBe('hello');
         });
 
+        /**
+         * Writes an expense report whose last visible action reimburses `ownerAccountID`, and returns the
+         * alternate text getAlternateText builds for `currentUserAccountID`. Each case needs its own
+         * reportID because the module-level report-action caches survive Onyx.clear().
+         */
+        const getReimbursedAlternateText = async (reportID: string, ownerAccountID: number, currentUserAccountID: number) => {
+            const report: Report = {
+                reportID,
+                reportName: 'Expense Report',
+                type: CONST.REPORT.TYPE.EXPENSE,
+                ownerAccountID,
+                // Empty so getAlternateText falls through to getLastMessageTextForReport instead of reusing lastMessageText.
+                lastMessageText: '',
+                lastActionType: CONST.REPORT.ACTIONS.TYPE.REIMBURSED,
+                lastVisibleActionCreated: '2024-01-01 10:00:00.000',
+            };
+            const reimbursed = buildAction(CONST.REPORT.ACTIONS.TYPE.REIMBURSED, 3, {
+                paymentMethod: 'Fast_ACH',
+                creditBankAccountLast4: '1111',
+                expectedDate: '2025-03-15',
+            });
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, report);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[reimbursed.reportActionID]: reimbursed});
+            await waitForBatchedUpdates();
+
+            const option: OptionData = {reportID, keyForList: '', isMoneyRequestReport: true};
+            return getAlternateText(option, {showChatPreviewLine: true}, buildConfig(reimbursed, reportID, {currentUserAccountID}));
+        };
+
+        it('should address the current user directly when they own the reimbursed report', async () => {
+            // Given a reimbursement paid to account 42, previewed by account 42
+            const alternateText = await getReimbursedAlternateText('alternate-text-reimbursed-own', 42, 42);
+
+            // Then the preview names their own account rather than spelling out whose it is
+            expect(alternateText).toContain('your bank account ending in 1111');
+        });
+
+        it('should name the report owner in the reimbursed preview when someone else owns the report', async () => {
+            // Given the same reimbursement paid to account 3, previewed by account 999
+            const alternateText = await getReimbursedAlternateText('alternate-text-reimbursed-other', 3, 999);
+
+            // Then the preview names the owner instead of addressing the viewer
+            expect(alternateText).toContain("peterparker@expensify.com's bank account ending in 1111");
+            expect(alternateText).not.toContain('your bank account');
+        });
+
         it('should omit the actor prefix when the last action is a report preview', async () => {
             await setReport(buildRoomReport({lastActionType: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, lastMessageText: 'owes $10'}));
             const preview = buildAction(CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, 3);

From d29d9c3609f9141c03ae941cc3c5cb553228f5f4 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:05:42 +0700
Subject: [PATCH 178/781] refactor: startOrStopChronosTimer

---
 src/libs/actions/Chronos.ts          |  2 +-
 tests/unit/ChronosTimerActionTest.ts | 65 +++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Chronos.ts b/src/libs/actions/Chronos.ts
index 1a9436049e00..2499961f2405 100644
--- a/src/libs/actions/Chronos.ts
+++ b/src/libs/actions/Chronos.ts
@@ -91,7 +91,7 @@ const startOrStopChronosTimer = (report: Report, currentUserAccountID: number, p
     const lastMessageText = formatReportLastMessageText(getReportActionMessage(reportAction)?.text ?? '');
 
     // Capture the report's current last-visible message so we can restore it if the optimistic comment fails to send.
-    const previousLastVisibleAction = getLastVisibleAction(reportID);
+    const previousLastVisibleAction = getLastVisibleAction(reportID, undefined, {}, undefined, undefined, currentUserAccountID);
     const {lastMessageText: previousLastMessageText = ''} = getLastVisibleMessage(reportID);
     const failureReport: Partial<Report> = previousLastMessageText
         ? {lastMessageText: previousLastMessageText, lastVisibleActionCreated: previousLastVisibleAction?.created, lastActorAccountID: previousLastVisibleAction?.actorAccountID}
diff --git a/tests/unit/ChronosTimerActionTest.ts b/tests/unit/ChronosTimerActionTest.ts
index 7bc5698c1fbd..0fc8892962dc 100644
--- a/tests/unit/ChronosTimerActionTest.ts
+++ b/tests/unit/ChronosTimerActionTest.ts
@@ -2,12 +2,17 @@ import {startOrStopChronosTimer} from '@libs/actions/Chronos';
 import {write} from '@libs/API';
 import {WRITE_COMMANDS} from '@libs/API/types';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
+import type {Report, ReportAction} from '@src/types/onyx';
 import type {OnyxData} from '@src/types/onyx/Request';
 
 import type {OnyxKey, OnyxUpdate} from 'react-native-onyx';
 
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
 jest.mock('@libs/API');
 
 const mockWrite = jest.mocked(write);
@@ -24,6 +29,14 @@ function getWriteOptions(): OnyxData<OnyxKey> {
     return options;
 }
 
+function getReportUpdate(updates: Array<OnyxUpdate<OnyxKey>> | undefined, reportID: string): Partial<Report> | undefined {
+    const update = updates?.find((u) => u.key === `${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    if (!update || !('value' in update) || typeof update.value !== 'object' || update.value === null) {
+        return undefined;
+    }
+    return update.value as Partial<Report>;
+}
+
 function getChronosNVPStartTime(updates: Array<OnyxUpdate<OnyxKey>> | undefined): string | undefined {
     const update = updates?.find((u) => u.key === ONYXKEYS.NVP_CHRONOS_TIME_TRACKING);
     if (!update || !('value' in update) || typeof update.value !== 'object' || update.value === null) {
@@ -60,6 +73,56 @@ describe('startOrStopChronosTimer', () => {
         expect(getChronosNVPStartTime(failureData)).toBe('');
     });
 
+    it('restores the last visible action that the acting user could see when the send fails', async () => {
+        const WHISPER_TARGET_ACCOUNT_ID = 777;
+        const COMMENT_ACTOR_ACCOUNT_ID = 888;
+
+        const comment: ReportAction = {
+            reportActionID: 'chronosComment',
+            reportID: TEST_REPORT.reportID,
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+            actorAccountID: COMMENT_ACTOR_ACCOUNT_ID,
+            created: '2026-07-13 09:00:00.000',
+            message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+            originalMessage: {html: 'Older comment'},
+        };
+
+        /** Newer than `comment`, and only the whispered-to account can see it. */
+        const whisper: ReportAction = {
+            reportActionID: 'chronosWhisper',
+            reportID: TEST_REPORT.reportID,
+            actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+            actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+            created: '2026-07-13 09:30:00.000',
+            message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+            originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+        };
+
+        // Given a Chronos report whose newest action is a whisper aimed at one account
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${TEST_REPORT.reportID}`, {[comment.reportActionID]: comment, [whisper.reportActionID]: whisper});
+        await waitForBatchedUpdates();
+
+        // When the whispered-to account starts the timer
+        startOrStopChronosTimer(TEST_REPORT, WHISPER_TARGET_ACCOUNT_ID, null);
+
+        // Then the failure data restores the whisper, which is the newest action that account can see
+        expect(getReportUpdate(getWriteOptions().failureData, TEST_REPORT.reportID)).toMatchObject({
+            lastVisibleActionCreated: whisper.created,
+            lastActorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+        });
+
+        jest.clearAllMocks();
+
+        // When somebody the whisper does not target starts the timer
+        startOrStopChronosTimer(TEST_REPORT, COMMENT_ACTOR_ACCOUNT_ID, null);
+
+        // Then the whisper is invisible to them, so the older comment is restored instead
+        expect(getReportUpdate(getWriteOptions().failureData, TEST_REPORT.reportID)).toMatchObject({
+            lastVisibleActionCreated: comment.created,
+            lastActorAccountID: COMMENT_ACTOR_ACCOUNT_ID,
+        });
+    });
+
     it('optimistically stops the timer when one is running', () => {
         // When stopping a running timer (previous startTime present)
         startOrStopChronosTimer(TEST_REPORT, TEST_ACCOUNT_ID, TEST_START_TIME);

From 6dd66ab381c29ceb8b0eb9dcd0e521d0816e3ef5 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:11:01 +0700
Subject: [PATCH 179/781] refactor: updateSplitTransactions

---
 src/libs/actions/IOU/SplitTransactionUpdate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU/SplitTransactionUpdate.ts b/src/libs/actions/IOU/SplitTransactionUpdate.ts
index 4311e3cbcb88..60793c98a309 100644
--- a/src/libs/actions/IOU/SplitTransactionUpdate.ts
+++ b/src/libs/actions/IOU/SplitTransactionUpdate.ts
@@ -405,7 +405,7 @@ function updateSplitTransactions({
     const expenseReportNameValuePairs = allReportNameValuePairsList?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${expenseReport?.reportID}`];
     const isArchivedExpenseReport = isArchivedReport(expenseReportNameValuePairs);
     const canUserPerformWriteAction = chatReport ? !!canUserPerformWriteActionReportUtils(chatReport, isArchivedExpenseReport) : true;
-    const lastVisibleAction = getLastVisibleAction(expenseReport?.reportID, canUserPerformWriteAction);
+    const lastVisibleAction = getLastVisibleAction(expenseReport?.reportID, canUserPerformWriteAction, {}, undefined, undefined, currentUserPersonalDetails.accountID);
     const isTransactionOnHold = isOnHold(originalTransaction);
     const holdReportAction = getReportAction(firstIOU?.childReportID, `${originalTransaction?.comment?.hold ?? ''}`);
 

From 0015338562d079095525d7c185d0003b36ba66e9 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:15:30 +0700
Subject: [PATCH 180/781] refactor: addAttachmentWithComment

---
 src/libs/actions/Report/index.ts |  2 +-
 tests/actions/ReportTest.ts      | 70 ++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 862425100c7e..5044c0d353dd 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -994,7 +994,7 @@ function addActions({
 
     // Check if the last visible action is from Concierge with unresolved followups
     // If so, optimistically resolve them by adding the updated action to optimisticReportActions
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID);
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, undefined, {}, undefined, undefined, currentUserAccountID);
     const lastActorAccountID = lastVisibleAction?.actorAccountID;
     const lastActionReportActionID = lastVisibleAction?.reportActionID;
     const resolvedAction = buildOptimisticResolvedFollowups(lastVisibleAction);
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 444f1492f998..e4205d83c7c4 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -1964,6 +1964,76 @@ describe('actions/Report', () => {
         TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.DELETE_COMMENT, 0);
     });
 
+    it('resolves Concierge followups only when the Concierge message is the last action the user can see', async () => {
+        const CONCIERGE_ACTION_ID = 'conciergeFollowups';
+        const WHISPER_TARGET_ACCOUNT_ID = 505;
+        const UNRESOLVED_HTML = `<p>Here is some helpful information.</p>\n<followup-list>\n  <followup><followup-text>First?</followup-text></followup>\n</followup-list>`;
+
+        /** Seeds a report whose Concierge message carries unresolved followups, below a newer whisper for one account. */
+        const seedReport = async (reportID: string) => {
+            const conciergeAction: OnyxTypes.ReportAction = {
+                reportActionID: CONCIERGE_ACTION_ID,
+                reportID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                actorAccountID: CONST.ACCOUNT_ID.CONCIERGE,
+                created: '2026-09-01 10:00:00.000',
+                message: [{type: CONST.REPORT.MESSAGE.TYPE.COMMENT, html: UNRESOLVED_HTML, text: 'Here is some helpful information.'}],
+                originalMessage: {html: UNRESOLVED_HTML},
+            };
+            const whisper: OnyxTypes.ReportAction = {
+                reportActionID: 'conciergeWhisper',
+                reportID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                created: '2026-09-01 11:00:00.000',
+                message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+                originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+            };
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[CONCIERGE_ACTION_ID]: conciergeAction, [whisper.reportActionID]: whisper});
+            await waitForBatchedUpdates();
+        };
+
+        const getConciergeHtml = async (reportID: string) => {
+            const actions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}` as const);
+            const message = actions?.[CONCIERGE_ACTION_ID]?.message;
+            return Array.isArray(message) ? message.at(0)?.html : undefined;
+        };
+
+        // Given the whisper is visible to the commenting user, so it outranks the Concierge message
+        const whisperVisibleReportID = '60001';
+        await seedReport(whisperVisibleReportID);
+        Report.addAttachmentWithComment({
+            report: {...createRandomReport(60001, undefined), reportID: whisperVisibleReportID},
+            notifyReportID: whisperVisibleReportID,
+            ancestors: [],
+            attachments: new File([''], 'a.txt', {type: 'text/plain'}),
+            currentUserAccountID: WHISPER_TARGET_ACCOUNT_ID,
+            delegateAccountID: undefined,
+            conciergeReportID: undefined,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the followups stay unresolved, because the Concierge message is not the last action
+        expect(await getConciergeHtml(whisperVisibleReportID)).toContain('<followup-list>');
+
+        // Given the whisper targets somebody else, leaving the Concierge message last
+        const whisperHiddenReportID = '60002';
+        await seedReport(whisperHiddenReportID);
+        Report.addAttachmentWithComment({
+            report: {...createRandomReport(60002, undefined), reportID: whisperHiddenReportID},
+            notifyReportID: whisperHiddenReportID,
+            ancestors: [],
+            attachments: new File([''], 'b.txt', {type: 'text/plain'}),
+            currentUserAccountID: WHISPER_TARGET_ACCOUNT_ID + 1,
+            delegateAccountID: undefined,
+            conciergeReportID: undefined,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the followups are optimistically marked resolved
+        expect(await getConciergeHtml(whisperHiddenReportID)).toContain('<followup-list selected>');
+    });
+
     it('should send not DeleteComment request and remove AddTextAndAttachment accordingly', async () => {
         global.fetch = TestHelper.createGlobalFetchMock({
             headers: new Headers({

From 6daaed9fdd226d60a8a45f5782a23a21aa7ac5ca Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:25:22 +0700
Subject: [PATCH 181/781] refactor: getCleanUpTransactionThreadReportOnyxData

---
 src/libs/actions/IOU/DeleteMoneyRequest.ts    |  2 +-
 .../actions/IOUTest/DeleteMoneyRequestTest.ts | 75 +++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU/DeleteMoneyRequest.ts b/src/libs/actions/IOU/DeleteMoneyRequest.ts
index 85c41fad56eb..95b7d8a585b2 100644
--- a/src/libs/actions/IOU/DeleteMoneyRequest.ts
+++ b/src/libs/actions/IOU/DeleteMoneyRequest.ts
@@ -737,7 +737,7 @@ function getCleanUpTransactionThreadReportOnyxData({
 
             canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(chatReport, isChatIOUReportArchived ?? isArchivedExpenseReport);
         }
-        const lastVisibleAction = getLastVisibleAction(iouReportID, canUserPerformWriteAction);
+        const lastVisibleAction = getLastVisibleAction(iouReportID, canUserPerformWriteAction, {}, undefined, undefined, currentUserAccountID);
 
         const {childVisibleActionCount, childCommenterCount, childLastVisibleActionCreated, childOldestFourAccountIDs} = updateOptimisticParentReportAction(
             reportPreviewAction,
diff --git a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
index 38a4430fe6f0..4b25af04aa86 100644
--- a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
+++ b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
@@ -2372,5 +2372,80 @@ describe('actions/IOU/DeleteMoneyRequest', () => {
             expect(result.optimisticData.some((entry) => entry.key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS))).toBe(false);
             expect(result.failureData.some((entry) => entry.key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS))).toBe(false);
         });
+
+        it("resolves the report preview's last visible action from the acting user's own visibility", async () => {
+            const CHAT_REPORT_ID = '70001';
+            const IOU_REPORT_ID = '70002';
+            const WHISPER_TARGET_ACCOUNT_ID = 808;
+
+            const olderIOUAction: ReportAction = {
+                ...createRandomReportAction(10),
+                reportActionID: 'deleteOlderAction',
+                reportID: IOU_REPORT_ID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                created: '2026-10-01 10:00:00.000',
+                message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+                originalMessage: {html: 'Older comment'},
+            };
+            /** Newer than `olderIOUAction`, and only the whispered-to account can see it. */
+            const whisper: ReportAction = {
+                ...createRandomReportAction(11),
+                reportActionID: 'deleteWhisper',
+                reportID: IOU_REPORT_ID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                created: '2026-10-01 12:00:00.000',
+                message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+                originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+            };
+            const previewAction: ReportAction = {
+                ...createRandomReportAction(12),
+                reportActionID: 'deletePreview',
+                reportID: CHAT_REPORT_ID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
+                childVisibleActionCount: 2,
+                originalMessage: {linkedReportID: IOU_REPORT_ID},
+            };
+            // The money-request action being deleted; its reportID is what resolves the IOU report below.
+            const deletedIOUAction: ReportAction = {
+                ...createRandomReportAction(13),
+                reportActionID: 'deletedIOU',
+                reportID: IOU_REPORT_ID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                childVisibleActionCount: 1,
+                originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, IOUTransactionID: '70003', amount: 100, currency: 'USD', IOUReportID: IOU_REPORT_ID},
+            };
+
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${CHAT_REPORT_ID}`, {...createRandomReport(70001, undefined), reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${IOU_REPORT_ID}`, {
+                ...createRandomReport(70002, undefined),
+                reportID: IOU_REPORT_ID,
+                type: CONST.REPORT.TYPE.EXPENSE,
+                chatReportID: CHAT_REPORT_ID,
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHAT_REPORT_ID}`, {[previewAction.reportActionID]: previewAction});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`, {
+                [olderIOUAction.reportActionID]: olderIOUAction,
+                [whisper.reportActionID]: whisper,
+                [deletedIOUAction.reportActionID]: deletedIOUAction,
+            });
+            await waitForBatchedUpdates();
+
+            const getPreviewCreated = (currentUserAccountID: number) => {
+                const result = getCleanUpTransactionThreadReportOnyxData({
+                    shouldDeleteTransactionThread: false,
+                    reportAction: deletedIOUAction,
+                    currentUserAccountID,
+                });
+                const entry = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHAT_REPORT_ID}`);
+                const value = entry?.value as Record<string, Partial<ReportAction>> | undefined;
+                return value?.[previewAction.reportActionID]?.childLastVisibleActionCreated;
+            };
+
+            // Given the whisper targets the deleting user, it is the newest action they can see
+            expect(getPreviewCreated(WHISPER_TARGET_ACCOUNT_ID)).toBe(whisper.created);
+
+            // Given the whisper targets somebody else, it is invisible and the older comment wins
+            expect(getPreviewCreated(WHISPER_TARGET_ACCOUNT_ID + 1)).toBe(olderIOUAction.created);
+        });
     });
 });

From 53aeb0923d839d782176a9ee9503dd49e0f001f5 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:26:19 +0700
Subject: [PATCH 182/781] fix: lint

---
 tests/unit/ChronosTimerActionTest.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/unit/ChronosTimerActionTest.ts b/tests/unit/ChronosTimerActionTest.ts
index 0fc8892962dc..992a76ee06b2 100644
--- a/tests/unit/ChronosTimerActionTest.ts
+++ b/tests/unit/ChronosTimerActionTest.ts
@@ -29,12 +29,17 @@ function getWriteOptions(): OnyxData<OnyxKey> {
     return options;
 }
 
-function getReportUpdate(updates: Array<OnyxUpdate<OnyxKey>> | undefined, reportID: string): Partial<Report> | undefined {
+/** Reads back the last-visible-action fields the report update restores, narrowing instead of asserting the Onyx value's type. */
+function getRestoredLastAction(updates: Array<OnyxUpdate<OnyxKey>> | undefined, reportID: string) {
     const update = updates?.find((u) => u.key === `${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     if (!update || !('value' in update) || typeof update.value !== 'object' || update.value === null) {
         return undefined;
     }
-    return update.value as Partial<Report>;
+    const {value} = update;
+    return {
+        lastVisibleActionCreated: 'lastVisibleActionCreated' in value && typeof value.lastVisibleActionCreated === 'string' ? value.lastVisibleActionCreated : undefined,
+        lastActorAccountID: 'lastActorAccountID' in value && typeof value.lastActorAccountID === 'number' ? value.lastActorAccountID : undefined,
+    };
 }
 
 function getChronosNVPStartTime(updates: Array<OnyxUpdate<OnyxKey>> | undefined): string | undefined {
@@ -106,7 +111,7 @@ describe('startOrStopChronosTimer', () => {
         startOrStopChronosTimer(TEST_REPORT, WHISPER_TARGET_ACCOUNT_ID, null);
 
         // Then the failure data restores the whisper, which is the newest action that account can see
-        expect(getReportUpdate(getWriteOptions().failureData, TEST_REPORT.reportID)).toMatchObject({
+        expect(getRestoredLastAction(getWriteOptions().failureData, TEST_REPORT.reportID)).toEqual({
             lastVisibleActionCreated: whisper.created,
             lastActorAccountID: WHISPER_TARGET_ACCOUNT_ID,
         });
@@ -117,7 +122,7 @@ describe('startOrStopChronosTimer', () => {
         startOrStopChronosTimer(TEST_REPORT, COMMENT_ACTOR_ACCOUNT_ID, null);
 
         // Then the whisper is invisible to them, so the older comment is restored instead
-        expect(getReportUpdate(getWriteOptions().failureData, TEST_REPORT.reportID)).toMatchObject({
+        expect(getRestoredLastAction(getWriteOptions().failureData, TEST_REPORT.reportID)).toEqual({
             lastVisibleActionCreated: comment.created,
             lastActorAccountID: COMMENT_ACTOR_ACCOUNT_ID,
         });

From 4fbc8dfc04220f3e97a26dd7310901d68908054a Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 15:59:03 +0700
Subject: [PATCH 183/781] fix: lint and resolve comment

---
 tests/actions/IOUTest/DeleteMoneyRequestTest.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
index 4b25af04aa86..80f150652f70 100644
--- a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
+++ b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
@@ -34,6 +34,7 @@ import createRandomTransaction from '../../utils/collections/transaction';
 import getOnyxValue from '../../utils/getOnyxValue';
 import PusherHelper from '../../utils/PusherHelper';
 import {createGlobalFetchMock, formatPhoneNumber, getCurrencyDecimalsLocal, getCurrencySymbolLocal, getOnyxData, setPersonalDetails, signInWithTestUser} from '../../utils/TestHelper';
+import {isObject} from '../../utils/typeGuards';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 const topMostReportID = '23423423';
@@ -2405,7 +2406,7 @@ describe('actions/IOU/DeleteMoneyRequest', () => {
                 childVisibleActionCount: 2,
                 originalMessage: {linkedReportID: IOU_REPORT_ID},
             };
-            // The money-request action being deleted; its reportID is what resolves the IOU report below.
+            // The money-request action being deleted. Its reportID is what resolves the IOU report below.
             const deletedIOUAction: ReportAction = {
                 ...createRandomReportAction(13),
                 reportActionID: 'deletedIOU',
@@ -2437,8 +2438,15 @@ describe('actions/IOU/DeleteMoneyRequest', () => {
                     currentUserAccountID,
                 });
                 const entry = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHAT_REPORT_ID}`);
-                const value = entry?.value as Record<string, Partial<ReportAction>> | undefined;
-                return value?.[previewAction.reportActionID]?.childLastVisibleActionCreated;
+                const value: unknown = entry && 'value' in entry ? entry.value : undefined;
+                if (!isObject(value)) {
+                    return undefined;
+                }
+                const updatedPreview = value[previewAction.reportActionID];
+                if (!isObject(updatedPreview) || typeof updatedPreview.childLastVisibleActionCreated !== 'string') {
+                    return undefined;
+                }
+                return updatedPreview.childLastVisibleActionCreated;
             };
 
             // Given the whisper targets the deleting user, it is the newest action they can see

From fe04e99b7e12e348a2f1ec588f4c54cf9aea2898 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 16:36:38 +0700
Subject: [PATCH 184/781] refactor: deleteMoneyRequest

---
 src/libs/actions/IOU/DeleteMoneyRequest.ts |  8 +++-
 src/libs/actions/Report/index.ts           |  4 +-
 tests/actions/ReportTest.ts                | 54 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU/DeleteMoneyRequest.ts b/src/libs/actions/IOU/DeleteMoneyRequest.ts
index 85c41fad56eb..17713840d1a4 100644
--- a/src/libs/actions/IOU/DeleteMoneyRequest.ts
+++ b/src/libs/actions/IOU/DeleteMoneyRequest.ts
@@ -954,7 +954,13 @@ function deleteMoneyRequest({
         }
 
         const optimisticReportActions = reportPreviewAction?.reportActionID ? {[reportPreviewAction.reportActionID]: null} : {};
-        const optimisticLastReportData = optimisticReportLastData(iouReport?.chatReportID ?? String(CONST.DEFAULT_NUMBER_ID), optimisticReportActions, canUserPerformWriteAction);
+        const optimisticLastReportData = optimisticReportLastData(
+            iouReport?.chatReportID ?? String(CONST.DEFAULT_NUMBER_ID),
+            optimisticReportActions,
+            canUserPerformWriteAction,
+            undefined,
+            currentUserAccountID,
+        );
 
         if (chatReport) {
             optimisticData.push({
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 862425100c7e..896401c466dd 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -5829,9 +5829,11 @@ function optimisticReportLastData(
     optimisticReportActions: Record<string, NullishDeep<ReportAction> | null> = {},
     canUserPerformWriteAction?: boolean,
     isReportArchived?: boolean,
+    // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
+    currentUserAccountID?: number,
 ) {
     const lastMessageText = getLastVisibleMessage(reportID, isReportArchived, optimisticReportActions).lastMessageText ?? '';
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, canUserPerformWriteAction, optimisticReportActions);
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, canUserPerformWriteAction, optimisticReportActions, undefined, undefined, currentUserAccountID);
     return {
         lastMessageText,
         lastVisibleActionCreated: lastVisibleAction?.created ?? '',
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 444f1492f998..e72fa14e15b2 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -11401,4 +11401,58 @@ describe('actions/Report', () => {
             });
         });
     });
+
+    describe('optimisticReportLastData', () => {
+        const REPORT_ID = '95001';
+        const WHISPER_TARGET_ACCOUNT_ID = 606;
+        const COMMENT_ACTOR_ACCOUNT_ID = 707;
+
+        const comment: OnyxTypes.ReportAction = {
+            reportActionID: 'lastDataComment',
+            reportID: REPORT_ID,
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+            actorAccountID: COMMENT_ACTOR_ACCOUNT_ID,
+            created: '2027-01-01 10:00:00.000',
+            message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+            originalMessage: {html: 'Older comment'},
+        };
+
+        /** Newer than `comment`, and only the whispered-to account can see it. */
+        const whisper: OnyxTypes.ReportAction = {
+            reportActionID: 'lastDataWhisper',
+            reportID: REPORT_ID,
+            actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+            actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+            created: '2027-01-01 12:00:00.000',
+            message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+            originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+        };
+
+        beforeEach(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[comment.reportActionID]: comment, [whisper.reportActionID]: whisper});
+            await waitForBatchedUpdates();
+        });
+
+        // `lastMessageText` is resolved by a separate helper that still reads the signed-in account, so only the
+        // action-derived fields are asserted here.
+        it('should point the last visible action at the whisper when the user is the one it targets', () => {
+            // Given a report whose newest action is a whisper aimed at the user
+            // When the optimistic last-report data is built for that user
+            const result = Report.optimisticReportLastData(REPORT_ID, {}, true, false, WHISPER_TARGET_ACCOUNT_ID);
+
+            // Then the action fields describe the whisper
+            expect(result.lastVisibleActionCreated).toBe(whisper.created);
+            expect(result.lastActorAccountID).toBe(WHISPER_TARGET_ACCOUNT_ID);
+        });
+
+        it('should skip the whisper and point at the older comment when it targets somebody else', () => {
+            // Given the same report, seen by an account the whisper does not target
+            // When the optimistic last-report data is built for that account
+            const result = Report.optimisticReportLastData(REPORT_ID, {}, true, false, WHISPER_TARGET_ACCOUNT_ID + 1);
+
+            // Then the whisper is invisible and the action fields describe the older comment
+            expect(result.lastVisibleActionCreated).toBe(comment.created);
+            expect(result.lastActorAccountID).toBe(COMMENT_ACTOR_ACCOUNT_ID);
+        });
+    });
 });

From 9b821ee1a777d266b66b2a6f84a5113649ffe7fb Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 16:44:21 +0700
Subject: [PATCH 185/781] refactor: deleteReportComment

---
 src/libs/actions/Report/index.ts              |  9 +-
 .../PopoverReportActionContextMenu.tsx        |  1 +
 tests/actions/AttachmentTest.ts               |  4 +-
 tests/actions/ReportTest.ts                   | 97 +++++++++++++++----
 tests/ui/UnreadIndicatorsTest.tsx             |  4 +-
 5 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 896401c466dd..7551dcf0db7c 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3381,6 +3381,7 @@ function deleteReportComment(
     isOriginalReportArchived: boolean | undefined,
     currentEmail: string,
     isOffline: boolean,
+    currentUserAccountID: number,
     visibleReportActionsDataParam?: VisibleReportActionsDerivedValue,
 ) {
     const reportID = report?.reportID;
@@ -3484,7 +3485,13 @@ function deleteReportComment(
     // If we are deleting the last visible message, let's find the previous visible one (or set an empty one if there are none) and update the lastMessageText in the LHN.
     // Similarly, if we are deleting the last read comment we will want to update the lastVisibleActionCreated to use the previous visible message.
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
-    const optimisticLastReportData = optimisticReportLastData(originalReportID, optimisticReportActions as ReportActions, canUserPerformWriteAction, isOriginalReportArchived);
+    const optimisticLastReportData = optimisticReportLastData(
+        originalReportID,
+        optimisticReportActions as ReportActions,
+        canUserPerformWriteAction,
+        isOriginalReportArchived,
+        currentUserAccountID,
+    );
 
     const optimisticReport: Partial<Report> = {
         ...optimisticLastReportData,
diff --git a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
index e5ca3a3d9ba4..847b0fdaa48b 100644
--- a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -440,6 +440,7 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro
                     isOriginalReportArchived,
                     email ?? '',
                     isOffline,
+                    currentUserAccountID,
                     visibleReportActionsData ?? undefined,
                 );
             };
diff --git a/tests/actions/AttachmentTest.ts b/tests/actions/AttachmentTest.ts
index 7f386edcd0b9..0e29cf9c7bb8 100644
--- a/tests/actions/AttachmentTest.ts
+++ b/tests/actions/AttachmentTest.ts
@@ -300,7 +300,7 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false);
+        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
         await waitForBatchedUpdates();
 
         // Then the attachment should be removed
@@ -363,7 +363,7 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false);
+        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
         await waitForBatchedUpdates();
 
         const removedAttachment = attachments?.[`${ONYXKEYS.COLLECTION.ATTACHMENT}${attachmentID}`];
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index e72fa14e15b2..de814ac074c1 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -904,7 +904,7 @@ describe('actions/Report', () => {
             .then(() => {
                 rerender(report);
                 // If the user deletes a comment that is before the last read
-                Report.deleteReportComment(report, {...reportActions[200]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false);
+                Report.deleteReportComment(report, {...reportActions[200]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
                 return waitForBatchedUpdates();
             })
             .then(() => {
@@ -923,7 +923,7 @@ describe('actions/Report', () => {
 
                 rerender(report);
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
-                Report.deleteReportComment(report, {...reportActions[400]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false);
+                Report.deleteReportComment(report, {...reportActions[400]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
                 return waitForBatchedUpdates();
             })
             .then(() => getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))
@@ -1679,7 +1679,7 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1736,7 +1736,7 @@ describe('actions/Report', () => {
         expect(persistedRequests?.at(0)?.command).toBe(WRITE_COMMANDS.ADD_COMMENT);
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, currentUserEmail, false);
+        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, currentUserEmail, false, 1);
         await waitForBatchedUpdates();
 
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1806,7 +1806,7 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+        Report.deleteReportComment(originalReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -1865,7 +1865,7 @@ describe('actions/Report', () => {
                 }),
             );
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         jest.runOnlyPendingTimers();
         await waitForBatchedUpdates();
@@ -1941,7 +1941,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2025,7 +2025,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2242,7 +2242,7 @@ describe('actions/Report', () => {
             }),
         };
 
-        Report.deleteReportComment(REPORT, commentAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, undefined);
+        Report.deleteReportComment(REPORT, commentAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2328,7 +2328,7 @@ describe('actions/Report', () => {
         };
 
         // Delete comment B — only whisper B (at commentB + 1) should be marked deleted
-        Report.deleteReportComment(REPORT, commentBAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, undefined);
+        Report.deleteReportComment(REPORT, commentBAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2427,7 +2427,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2529,7 +2529,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -2592,7 +2592,7 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors({reportID: REPORT_ID}));
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         expect(PersistedRequests.getAll().length).toBe(3);
 
@@ -2839,8 +2839,8 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors(report));
 
-        Report.deleteReportComment(report, mentionAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
-        Report.deleteReportComment(report, mentionAction2, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+        Report.deleteReportComment(report, mentionAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment(report, mentionAction2, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
 
@@ -2877,7 +2877,7 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -2895,7 +2895,7 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID, reportActionID: 'action-999'});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false);
+            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -11455,4 +11455,67 @@ describe('actions/Report', () => {
             expect(result.lastActorAccountID).toBe(COMMENT_ACTOR_ACCOUNT_ID);
         });
     });
+
+    describe('deleteReportComment last-visible-action resolution', () => {
+        it("should resolve the report's remaining last visible action from the deleting user's own visibility", async () => {
+            global.fetch = TestHelper.createGlobalFetchMock();
+            const REPORT_ID = '96001';
+            const WHISPER_TARGET_ACCOUNT_ID = 808;
+
+            const buildActions = (idBase: number) => ({
+                deletedComment: {
+                    reportActionID: `${idBase + 1}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-02-01 09:00:00.000',
+                    message: [{type: 'COMMENT', html: 'Comment being deleted', text: 'Comment being deleted'}],
+                    originalMessage: {html: 'Comment being deleted'},
+                } as OnyxTypes.ReportAction,
+                olderComment: {
+                    reportActionID: `${idBase + 2}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-02-01 10:00:00.000',
+                    message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+                    originalMessage: {html: 'Older comment'},
+                } as OnyxTypes.ReportAction,
+                /** Newer than `olderComment`, and only the whispered-to account can see it. */
+                whisper: {
+                    reportActionID: `${idBase + 3}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-02-01 12:00:00.000',
+                    message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+                    originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+                } as OnyxTypes.ReportAction,
+            });
+
+            const deleteAs = async (currentUserAccountID: number, idBase: number) => {
+                const {deletedComment, olderComment, whisper} = buildActions(idBase);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, lastVisibleActionCreated: ''});
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {
+                    [deletedComment.reportActionID]: deletedComment,
+                    [olderComment.reportActionID]: olderComment,
+                    [whisper.reportActionID]: whisper,
+                });
+                await waitForBatchedUpdates();
+
+                Report.deleteReportComment({reportID: REPORT_ID}, deletedComment, undefined, undefined, [], undefined, undefined, '', false, currentUserAccountID);
+                await waitForBatchedUpdates();
+
+                return (await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))?.lastVisibleActionCreated;
+            };
+
+            // Given a report whose newest remaining action is a whisper aimed at the deleting user
+            // Then the report tracks the whisper, which that user can see
+            expect(await deleteAs(WHISPER_TARGET_ACCOUNT_ID, 96010)).toBe('2027-02-01 12:00:00.000');
+
+            // Given the same report deleted by somebody the whisper does not target
+            // Then the whisper is invisible to them and the older comment is tracked instead
+            expect(await deleteAs(WHISPER_TARGET_ACCOUNT_ID + 1, 96020)).toBe('2027-02-01 10:00:00.000');
+        });
+    });
 });
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index 0060df9c11e9..042bd8b6d706 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -708,7 +708,7 @@ describe('Unread Indicators', () => {
 
                     const report = await OnyxUtils.get(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`);
                     if (lastReportAction) {
-                        deleteReportComment(report, lastReportAction, undefined, undefined, [], undefined, undefined, '', false);
+                        deleteReportComment(report, lastReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
                     }
                     return waitForBatchedUpdates();
                 })
@@ -764,7 +764,7 @@ describe('Unread Indicators', () => {
 
             await waitForBatchedUpdates();
 
-            deleteReportComment(report, firstNewReportAction, undefined, undefined, [], undefined, undefined, '', false);
+            deleteReportComment(report, firstNewReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
             await waitForBatchedUpdates();
         }

From 2cbdc717582832694692a427aacb4c631c2773f1 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 16:46:53 +0700
Subject: [PATCH 186/781] refactor: deleteTask

---
 src/libs/actions/TaskDeletion.ts |  8 +++-
 tests/actions/TaskTest.ts        | 64 ++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/TaskDeletion.ts b/src/libs/actions/TaskDeletion.ts
index ee843b7bc532..f7e1119c932e 100644
--- a/src/libs/actions/TaskDeletion.ts
+++ b/src/libs/actions/TaskDeletion.ts
@@ -107,7 +107,13 @@ function deleteTask(
     };
     const optimisticReportActions = parentReportAction?.reportActionID ? {[parentReportAction?.reportActionID]: optimisticReportAction} : {};
 
-    const optimisticLastReportData = optimisticReportLastData(parentReport?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), optimisticReportActions, canUserPerformWriteAction);
+    const optimisticLastReportData = optimisticReportLastData(
+        parentReport?.reportID ?? String(CONST.DEFAULT_NUMBER_ID),
+        optimisticReportActions,
+        canUserPerformWriteAction,
+        undefined,
+        currentUserAccountID,
+    );
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
diff --git a/tests/actions/TaskTest.ts b/tests/actions/TaskTest.ts
index 3c8e91f3b707..13d1673e82e9 100644
--- a/tests/actions/TaskTest.ts
+++ b/tests/actions/TaskTest.ts
@@ -1942,6 +1942,70 @@ describe('actions/Task', () => {
             const cancelAction = getRequiredReportAction(reportActionsUpdate, CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED);
             expect(cancelAction.delegateAccountID).toBeUndefined();
         });
+
+        it("should resolve the parent report's last visible action from the acting user's own visibility", async () => {
+            const parentReportID = 'parent_report_delete_whisper';
+            const taskReportID = 'task_report_delete_whisper';
+            const WHISPER_TARGET_ACCOUNT_ID = 909;
+
+            const taskReport = {
+                reportID: taskReportID,
+                type: CONST.REPORT.TYPE.TASK,
+                reportName: 'Whisper visibility task',
+                parentReportID,
+                parentReportActionID: '90001',
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                ownerAccountID: mockCurrentUserAccountID,
+            };
+            const parentReport = {reportID: parentReportID, type: CONST.REPORT.TYPE.CHAT};
+            const parentReportAction = createMock<OnyxEntry<ReportAction>>({reportActionID: '90001', reportID: parentReportID, childReportID: taskReportID});
+
+            const olderComment = createMock<ReportAction>({
+                reportActionID: '90002',
+                reportID: parentReportID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                created: '2027-03-01 10:00:00.000',
+                message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+            });
+            /** Newer than `olderComment`, and only the whispered-to account can see it. */
+            const whisper = createMock<ReportAction>({
+                reportActionID: '90003',
+                reportID: parentReportID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                created: '2027-03-01 12:00:00.000',
+                message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+                originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+            });
+
+            // Given a parent report whose newest action is a whisper aimed at one account
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`, taskReport);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, parentReport);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
+                    [olderComment.reportActionID]: olderComment,
+                    [whisper.reportActionID]: whisper,
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            const deleteAsAndReadParentUpdate = async (currentUserAccountID: number) => {
+                mockWrite.mockClear();
+                deleteTask(taskReport, parentReport, false, currentUserAccountID, false, parentReportAction, 'concierge_123', undefined, undefined);
+                await waitForBatchedUpdatesWithAct();
+
+                const update = getRequiredOnyxUpdate(getRequiredWriteOnyxData(), 'optimisticData', `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}` as const);
+                return 'value' in update && update.value && typeof update.value === 'object' && 'lastVisibleActionCreated' in update.value
+                    ? update.value.lastVisibleActionCreated
+                    : undefined;
+            };
+
+            // When the whispered-to account deletes the task, the whisper is the newest action they can see
+            expect(await deleteAsAndReadParentUpdate(WHISPER_TARGET_ACCOUNT_ID)).toBe(whisper.created);
+
+            // When somebody the whisper does not target deletes it, the older comment is tracked instead
+            expect(await deleteAsAndReadParentUpdate(WHISPER_TARGET_ACCOUNT_ID + 1)).toBe(olderComment.created);
+        });
     });
 
     describe('getShareDestination', () => {

From fdd5a53c83777148fc1ec996892ff4bd87e7c635 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 17:18:17 +0700
Subject: [PATCH 187/781] refactor: flagComment

---
 src/libs/actions/Report/index.ts     |  9 +++-
 src/pages/DynamicFlagCommentPage.tsx |  2 +-
 tests/actions/ReportTest.ts          | 63 ++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 7551dcf0db7c..e7ff78fd5173 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -5849,7 +5849,13 @@ function optimisticReportLastData(
 }
 
 /** Flag a comment as offensive */
-function flagComment(reportAction: OnyxEntry<ReportAction>, severity: string, originalReport: OnyxEntry<Report> | undefined, isOriginalReportArchived: boolean | undefined) {
+function flagComment(
+    reportAction: OnyxEntry<ReportAction>,
+    severity: string,
+    originalReport: OnyxEntry<Report> | undefined,
+    isOriginalReportArchived: boolean | undefined,
+    currentUserAccountID: number,
+) {
     const originalReportID = originalReport?.reportID;
     const message = ReportActionsUtils.getReportActionMessage(reportAction);
 
@@ -5910,6 +5916,7 @@ function flagComment(reportAction: OnyxEntry<ReportAction>, severity: string, or
         } as ReportActions,
         canUserPerformWriteAction,
         isOriginalReportArchived,
+        currentUserAccountID,
     );
 
     const optimisticReport: Partial<Report> = {
diff --git a/src/pages/DynamicFlagCommentPage.tsx b/src/pages/DynamicFlagCommentPage.tsx
index 234be63bfba6..c39ca57cf150 100644
--- a/src/pages/DynamicFlagCommentPage.tsx
+++ b/src/pages/DynamicFlagCommentPage.tsx
@@ -124,7 +124,7 @@ function DynamicFlagCommentPage({parentReportAction, report, parentReport, repor
 
     const flagComment = (severity: Severity) => {
         if (reportAction && canFlagReportAction(reportAction, reportID, currentUserAccountID)) {
-            flagCommentUtil(reportAction, severity, originalReport, isOriginalReportArchived);
+            flagCommentUtil(reportAction, severity, originalReport, isOriginalReportArchived, currentUserAccountID);
         }
 
         if (superWideRHPRouteKeys.length > 0 || wideRHPRouteKeys.length > 0) {
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index de814ac074c1..8e0f26244135 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -11518,4 +11518,67 @@ describe('actions/Report', () => {
             expect(await deleteAs(WHISPER_TARGET_ACCOUNT_ID + 1, 96020)).toBe('2027-02-01 10:00:00.000');
         });
     });
+
+    describe('flagComment last-visible-action resolution', () => {
+        it("should resolve the report's last visible action from the flagging user's own visibility", async () => {
+            global.fetch = TestHelper.createGlobalFetchMock();
+            const REPORT_ID = '97001';
+            const WHISPER_TARGET_ACCOUNT_ID = 707;
+
+            const buildActions = (idBase: number) => ({
+                flaggedComment: {
+                    reportActionID: `${idBase + 1}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-04-01 09:00:00.000',
+                    message: [{type: 'COMMENT', html: 'Comment being flagged', text: 'Comment being flagged'}],
+                    originalMessage: {html: 'Comment being flagged'},
+                } as OnyxTypes.ReportAction,
+                olderComment: {
+                    reportActionID: `${idBase + 2}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-04-01 10:00:00.000',
+                    message: [{type: 'COMMENT', html: 'Older comment', text: 'Older comment'}],
+                    originalMessage: {html: 'Older comment'},
+                } as OnyxTypes.ReportAction,
+                /** Newer than `olderComment`, and only the whispered-to account can see it. */
+                whisper: {
+                    reportActionID: `${idBase + 3}`,
+                    reportID: REPORT_ID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                    actorAccountID: WHISPER_TARGET_ACCOUNT_ID,
+                    created: '2027-04-01 12:00:00.000',
+                    message: [{type: 'COMMENT', html: 'changed the amount', text: 'changed the amount', whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]}],
+                    originalMessage: {whisperedTo: [WHISPER_TARGET_ACCOUNT_ID]},
+                } as OnyxTypes.ReportAction,
+            });
+
+            const flagAs = async (currentUserAccountID: number, idBase: number) => {
+                const {flaggedComment, olderComment, whisper} = buildActions(idBase);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, lastVisibleActionCreated: ''});
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {
+                    [flaggedComment.reportActionID]: flaggedComment,
+                    [olderComment.reportActionID]: olderComment,
+                    [whisper.reportActionID]: whisper,
+                });
+                await waitForBatchedUpdates();
+
+                Report.flagComment(flaggedComment, CONST.MODERATION.FLAG_SEVERITY_HARASSMENT, {reportID: REPORT_ID}, false, currentUserAccountID);
+                await waitForBatchedUpdates();
+
+                return (await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))?.lastVisibleActionCreated;
+            };
+
+            // Given a report whose newest action is a whisper aimed at the flagging user
+            // Then the report tracks the whisper, which that user can see
+            expect(await flagAs(WHISPER_TARGET_ACCOUNT_ID, 97010)).toBe('2027-04-01 12:00:00.000');
+
+            // Given the same report flagged by somebody the whisper does not target
+            // Then the whisper is invisible to them and the older comment is tracked instead
+            expect(await flagAs(WHISPER_TARGET_ACCOUNT_ID + 1, 97020)).toBe('2027-04-01 10:00:00.000');
+        });
+    });
 });

From 79ed39ed86a779b69d9f94e8952a6f8291aa1aba Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 17:35:46 +0700
Subject: [PATCH 188/781] refactor: make currentUserAccountID required in
 optimisticReportLastData

---
 src/libs/actions/IOU/DeleteMoneyRequest.ts | 3 +--
 src/libs/actions/Report/index.ts           | 7 +++----
 src/libs/actions/TaskDeletion.ts           | 3 +--
 tests/actions/ReportTest.ts                | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/libs/actions/IOU/DeleteMoneyRequest.ts b/src/libs/actions/IOU/DeleteMoneyRequest.ts
index 17713840d1a4..66a0332395d4 100644
--- a/src/libs/actions/IOU/DeleteMoneyRequest.ts
+++ b/src/libs/actions/IOU/DeleteMoneyRequest.ts
@@ -956,10 +956,9 @@ function deleteMoneyRequest({
         const optimisticReportActions = reportPreviewAction?.reportActionID ? {[reportPreviewAction.reportActionID]: null} : {};
         const optimisticLastReportData = optimisticReportLastData(
             iouReport?.chatReportID ?? String(CONST.DEFAULT_NUMBER_ID),
+            currentUserAccountID,
             optimisticReportActions,
             canUserPerformWriteAction,
-            undefined,
-            currentUserAccountID,
         );
 
         if (chatReport) {
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index e7ff78fd5173..95f638451abb 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3487,10 +3487,10 @@ function deleteReportComment(
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
     const optimisticLastReportData = optimisticReportLastData(
         originalReportID,
+        currentUserAccountID,
         optimisticReportActions as ReportActions,
         canUserPerformWriteAction,
         isOriginalReportArchived,
-        currentUserAccountID,
     );
 
     const optimisticReport: Partial<Report> = {
@@ -5833,11 +5833,10 @@ function removeFromGroupChat(report: Report, accountIDList: number[]) {
 
 function optimisticReportLastData(
     reportID: string,
+    currentUserAccountID: number,
     optimisticReportActions: Record<string, NullishDeep<ReportAction> | null> = {},
     canUserPerformWriteAction?: boolean,
     isReportArchived?: boolean,
-    // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
-    currentUserAccountID?: number,
 ) {
     const lastMessageText = getLastVisibleMessage(reportID, isReportArchived, optimisticReportActions).lastMessageText ?? '';
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, canUserPerformWriteAction, optimisticReportActions, undefined, undefined, currentUserAccountID);
@@ -5911,12 +5910,12 @@ function flagComment(
 
     const optimisticLastReportData = optimisticReportLastData(
         originalReportID ?? String(CONST.DEFAULT_NUMBER_ID),
+        currentUserAccountID,
         {
             [reportActionID]: {...reportAction, message: [updatedMessage], pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
         } as ReportActions,
         canUserPerformWriteAction,
         isOriginalReportArchived,
-        currentUserAccountID,
     );
 
     const optimisticReport: Partial<Report> = {
diff --git a/src/libs/actions/TaskDeletion.ts b/src/libs/actions/TaskDeletion.ts
index f7e1119c932e..10aa39ff9b66 100644
--- a/src/libs/actions/TaskDeletion.ts
+++ b/src/libs/actions/TaskDeletion.ts
@@ -109,10 +109,9 @@ function deleteTask(
 
     const optimisticLastReportData = optimisticReportLastData(
         parentReport?.reportID ?? String(CONST.DEFAULT_NUMBER_ID),
+        currentUserAccountID,
         optimisticReportActions,
         canUserPerformWriteAction,
-        undefined,
-        currentUserAccountID,
     );
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
         {
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 8e0f26244135..e630868ed78a 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -11438,7 +11438,7 @@ describe('actions/Report', () => {
         it('should point the last visible action at the whisper when the user is the one it targets', () => {
             // Given a report whose newest action is a whisper aimed at the user
             // When the optimistic last-report data is built for that user
-            const result = Report.optimisticReportLastData(REPORT_ID, {}, true, false, WHISPER_TARGET_ACCOUNT_ID);
+            const result = Report.optimisticReportLastData(REPORT_ID, WHISPER_TARGET_ACCOUNT_ID, {}, true, false);
 
             // Then the action fields describe the whisper
             expect(result.lastVisibleActionCreated).toBe(whisper.created);
@@ -11448,7 +11448,7 @@ describe('actions/Report', () => {
         it('should skip the whisper and point at the older comment when it targets somebody else', () => {
             // Given the same report, seen by an account the whisper does not target
             // When the optimistic last-report data is built for that account
-            const result = Report.optimisticReportLastData(REPORT_ID, {}, true, false, WHISPER_TARGET_ACCOUNT_ID + 1);
+            const result = Report.optimisticReportLastData(REPORT_ID, WHISPER_TARGET_ACCOUNT_ID + 1, {}, true, false);
 
             // Then the whisper is invisible and the action fields describe the older comment
             expect(result.lastVisibleActionCreated).toBe(comment.created);

From 185c53daca8e6788171bc417930765eb60d0ccca Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 17:52:18 +0700
Subject: [PATCH 189/781] fix: lint

---
 src/libs/actions/Report/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 95f638451abb..8474cec19434 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3371,6 +3371,7 @@ function broadcastUserIsLeavingRoom(reportID: string, currentUserAccountID: numb
 }
 
 /** Deletes a comment from the report, basically sets it as empty string */
+// eslint-disable-next-line @typescript-eslint/max-params
 function deleteReportComment(
     report: OnyxEntry<Report>,
     reportAction: ReportAction,

From 9b56c5607917c659100c863d54f7a80bc265c423 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 17:56:13 +0700
Subject: [PATCH 190/781] refactor: update deleteReportComment params

---
 src/libs/actions/Report/index.ts              |  41 +--
 .../PopoverReportActionContextMenu.tsx        |  10 +-
 tests/actions/AttachmentTest.ts               |  26 +-
 tests/actions/ReportTest.ts                   | 236 ++++++++++++++++--
 tests/ui/UnreadIndicatorsTest.tsx             |  26 +-
 5 files changed, 298 insertions(+), 41 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 8474cec19434..17f847e62452 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3370,21 +3370,34 @@ function broadcastUserIsLeavingRoom(reportID: string, currentUserAccountID: numb
     Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, leavingStatus);
 }
 
+type DeleteReportCommentParams = {
+    report: OnyxEntry<Report>;
+    reportAction: ReportAction;
+    originalReportActions: OnyxEntry<ReportActions>;
+    reportActions: OnyxEntry<ReportActions>;
+    ancestors: Ancestor[];
+    isReportArchived: boolean | undefined;
+    isOriginalReportArchived: boolean | undefined;
+    currentEmail: string;
+    isOffline: boolean;
+    currentUserAccountID: number;
+    visibleReportActionsDataParam?: VisibleReportActionsDerivedValue;
+};
+
 /** Deletes a comment from the report, basically sets it as empty string */
-// eslint-disable-next-line @typescript-eslint/max-params
-function deleteReportComment(
-    report: OnyxEntry<Report>,
-    reportAction: ReportAction,
-    originalReportActions: OnyxEntry<ReportActions>,
-    reportActions: OnyxEntry<ReportActions>,
-    ancestors: Ancestor[],
-    isReportArchived: boolean | undefined,
-    isOriginalReportArchived: boolean | undefined,
-    currentEmail: string,
-    isOffline: boolean,
-    currentUserAccountID: number,
-    visibleReportActionsDataParam?: VisibleReportActionsDerivedValue,
-) {
+function deleteReportComment({
+    report,
+    reportAction,
+    originalReportActions,
+    reportActions,
+    ancestors,
+    isReportArchived,
+    isOriginalReportArchived,
+    currentEmail,
+    isOffline,
+    currentUserAccountID,
+    visibleReportActionsDataParam,
+}: DeleteReportCommentParams) {
     const reportID = report?.reportID;
     const originalReportID = getOriginalReportID(reportID, reportAction, reportActions, isOffline);
     const reportActionID = reportAction.reportActionID;
diff --git a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 847b0fdaa48b..23e19db3f188 100644
--- a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -430,19 +430,19 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro
             });
         } else if (reportAction) {
             callbackWhenDeleteModalHide.current = () => {
-                deleteReportComment(
+                deleteReportComment({
                     report,
                     reportAction,
                     originalReportActions,
                     reportActions,
-                    ancestorsRef.current,
+                    ancestors: ancestorsRef.current,
                     isReportArchived,
                     isOriginalReportArchived,
-                    email ?? '',
+                    currentEmail: email ?? '',
                     isOffline,
                     currentUserAccountID,
-                    visibleReportActionsData ?? undefined,
-                );
+                    visibleReportActionsDataParam: visibleReportActionsData ?? undefined,
+                });
             };
         }
 
diff --git a/tests/actions/AttachmentTest.ts b/tests/actions/AttachmentTest.ts
index 0e29cf9c7bb8..0a9f813e3470 100644
--- a/tests/actions/AttachmentTest.ts
+++ b/tests/actions/AttachmentTest.ts
@@ -300,7 +300,18 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
+        deleteReportComment({
+            report: {reportID},
+            reportAction: attachmentAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: false,
+            isOriginalReportArchived: false,
+            currentEmail: 'test@user.com',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         // Then the attachment should be removed
@@ -363,7 +374,18 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
+        deleteReportComment({
+            report: {reportID},
+            reportAction: attachmentAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: false,
+            isOriginalReportArchived: false,
+            currentEmail: 'test@user.com',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         const removedAttachment = attachments?.[`${ONYXKEYS.COLLECTION.ATTACHMENT}${attachmentID}`];
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index e630868ed78a..0c17c74aa9d1 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -904,7 +904,18 @@ describe('actions/Report', () => {
             .then(() => {
                 rerender(report);
                 // If the user deletes a comment that is before the last read
-                Report.deleteReportComment(report, {...reportActions[200]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
+                Report.deleteReportComment({
+                    report,
+                    reportAction: {...reportActions[200]},
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: ancestors.current,
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: USER_1_LOGIN,
+                    isOffline: false,
+                    currentUserAccountID: 1,
+                });
                 return waitForBatchedUpdates();
             })
             .then(() => {
@@ -923,7 +934,18 @@ describe('actions/Report', () => {
 
                 rerender(report);
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
-                Report.deleteReportComment(report, {...reportActions[400]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
+                Report.deleteReportComment({
+                    report,
+                    reportAction: {...reportActions[400]},
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: ancestors.current,
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: USER_1_LOGIN,
+                    isOffline: false,
+                    currentUserAccountID: 1,
+                });
                 return waitForBatchedUpdates();
             })
             .then(() => getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))
@@ -1679,7 +1701,18 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1736,7 +1769,18 @@ describe('actions/Report', () => {
         expect(persistedRequests?.at(0)?.command).toBe(WRITE_COMMANDS.ADD_COMMENT);
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, currentUserEmail, false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: currentUserEmail,
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1806,7 +1850,18 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -1865,7 +1920,18 @@ describe('actions/Report', () => {
                 }),
             );
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         jest.runOnlyPendingTimers();
         await waitForBatchedUpdates();
@@ -1941,7 +2007,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2025,7 +2102,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2242,7 +2330,19 @@ describe('actions/Report', () => {
             }),
         };
 
-        Report.deleteReportComment(REPORT, commentAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: commentAction,
+            originalReportActions: reportActionsForReport,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+            visibleReportActionsDataParam: undefined,
+        });
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2328,7 +2428,19 @@ describe('actions/Report', () => {
         };
 
         // Delete comment B — only whisper B (at commentB + 1) should be marked deleted
-        Report.deleteReportComment(REPORT, commentBAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: commentBAction,
+            originalReportActions: reportActionsForReport,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+            visibleReportActionsDataParam: undefined,
+        });
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2427,7 +2539,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2529,7 +2652,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -2592,7 +2726,18 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors({reportID: REPORT_ID}));
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         expect(PersistedRequests.getAll().length).toBe(3);
 
@@ -2839,8 +2984,30 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors(report));
 
-        Report.deleteReportComment(report, mentionAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
-        Report.deleteReportComment(report, mentionAction2, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report,
+            reportAction: mentionAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
+        Report.deleteReportComment({
+            report,
+            reportAction: mentionAction2,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
 
@@ -2877,7 +3044,18 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+            Report.deleteReportComment({
+                report: parentReport,
+                reportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: ancestors.current,
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -2895,7 +3073,18 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID, reportActionID: 'action-999'});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+            Report.deleteReportComment({
+                report: parentReport,
+                reportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: ancestors.current,
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -11503,7 +11692,18 @@ describe('actions/Report', () => {
                 });
                 await waitForBatchedUpdates();
 
-                Report.deleteReportComment({reportID: REPORT_ID}, deletedComment, undefined, undefined, [], undefined, undefined, '', false, currentUserAccountID);
+                Report.deleteReportComment({
+                    report: {reportID: REPORT_ID},
+                    reportAction: deletedComment,
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: [],
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: '',
+                    isOffline: false,
+                    currentUserAccountID,
+                });
                 await waitForBatchedUpdates();
 
                 return (await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))?.lastVisibleActionCreated;
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index 042bd8b6d706..3c662449d2c5 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -708,7 +708,18 @@ describe('Unread Indicators', () => {
 
                     const report = await OnyxUtils.get(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`);
                     if (lastReportAction) {
-                        deleteReportComment(report, lastReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+                        deleteReportComment({
+                            report,
+                            reportAction: lastReportAction,
+                            originalReportActions: undefined,
+                            reportActions: undefined,
+                            ancestors: [],
+                            isReportArchived: undefined,
+                            isOriginalReportArchived: undefined,
+                            currentEmail: '',
+                            isOffline: false,
+                            currentUserAccountID: 1,
+                        });
                     }
                     return waitForBatchedUpdates();
                 })
@@ -764,7 +775,18 @@ describe('Unread Indicators', () => {
 
             await waitForBatchedUpdates();
 
-            deleteReportComment(report, firstNewReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+            deleteReportComment({
+                report,
+                reportAction: firstNewReportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: [],
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
 
             await waitForBatchedUpdates();
         }

From c99af17756cbe633f7e33080d8352771757413ef Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 17:58:14 +0700
Subject: [PATCH 191/781] Revert "refactor: update deleteReportComment params"

This reverts commit 9b56c5607917c659100c863d54f7a80bc265c423.
---
 src/libs/actions/Report/index.ts              |  41 ++-
 .../PopoverReportActionContextMenu.tsx        |  10 +-
 tests/actions/AttachmentTest.ts               |  26 +-
 tests/actions/ReportTest.ts                   | 236 ++----------------
 tests/ui/UnreadIndicatorsTest.tsx             |  26 +-
 5 files changed, 41 insertions(+), 298 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 17f847e62452..8474cec19434 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3370,34 +3370,21 @@ function broadcastUserIsLeavingRoom(reportID: string, currentUserAccountID: numb
     Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, leavingStatus);
 }
 
-type DeleteReportCommentParams = {
-    report: OnyxEntry<Report>;
-    reportAction: ReportAction;
-    originalReportActions: OnyxEntry<ReportActions>;
-    reportActions: OnyxEntry<ReportActions>;
-    ancestors: Ancestor[];
-    isReportArchived: boolean | undefined;
-    isOriginalReportArchived: boolean | undefined;
-    currentEmail: string;
-    isOffline: boolean;
-    currentUserAccountID: number;
-    visibleReportActionsDataParam?: VisibleReportActionsDerivedValue;
-};
-
 /** Deletes a comment from the report, basically sets it as empty string */
-function deleteReportComment({
-    report,
-    reportAction,
-    originalReportActions,
-    reportActions,
-    ancestors,
-    isReportArchived,
-    isOriginalReportArchived,
-    currentEmail,
-    isOffline,
-    currentUserAccountID,
-    visibleReportActionsDataParam,
-}: DeleteReportCommentParams) {
+// eslint-disable-next-line @typescript-eslint/max-params
+function deleteReportComment(
+    report: OnyxEntry<Report>,
+    reportAction: ReportAction,
+    originalReportActions: OnyxEntry<ReportActions>,
+    reportActions: OnyxEntry<ReportActions>,
+    ancestors: Ancestor[],
+    isReportArchived: boolean | undefined,
+    isOriginalReportArchived: boolean | undefined,
+    currentEmail: string,
+    isOffline: boolean,
+    currentUserAccountID: number,
+    visibleReportActionsDataParam?: VisibleReportActionsDerivedValue,
+) {
     const reportID = report?.reportID;
     const originalReportID = getOriginalReportID(reportID, reportAction, reportActions, isOffline);
     const reportActionID = reportAction.reportActionID;
diff --git a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 23e19db3f188..847b0fdaa48b 100644
--- a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -430,19 +430,19 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro
             });
         } else if (reportAction) {
             callbackWhenDeleteModalHide.current = () => {
-                deleteReportComment({
+                deleteReportComment(
                     report,
                     reportAction,
                     originalReportActions,
                     reportActions,
-                    ancestors: ancestorsRef.current,
+                    ancestorsRef.current,
                     isReportArchived,
                     isOriginalReportArchived,
-                    currentEmail: email ?? '',
+                    email ?? '',
                     isOffline,
                     currentUserAccountID,
-                    visibleReportActionsDataParam: visibleReportActionsData ?? undefined,
-                });
+                    visibleReportActionsData ?? undefined,
+                );
             };
         }
 
diff --git a/tests/actions/AttachmentTest.ts b/tests/actions/AttachmentTest.ts
index 0a9f813e3470..0e29cf9c7bb8 100644
--- a/tests/actions/AttachmentTest.ts
+++ b/tests/actions/AttachmentTest.ts
@@ -300,18 +300,7 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({
-            report: {reportID},
-            reportAction: attachmentAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: false,
-            isOriginalReportArchived: false,
-            currentEmail: 'test@user.com',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
         await waitForBatchedUpdates();
 
         // Then the attachment should be removed
@@ -374,18 +363,7 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({
-            report: {reportID},
-            reportAction: attachmentAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: false,
-            isOriginalReportArchived: false,
-            currentEmail: 'test@user.com',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
         await waitForBatchedUpdates();
 
         const removedAttachment = attachments?.[`${ONYXKEYS.COLLECTION.ATTACHMENT}${attachmentID}`];
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 0c17c74aa9d1..e630868ed78a 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -904,18 +904,7 @@ describe('actions/Report', () => {
             .then(() => {
                 rerender(report);
                 // If the user deletes a comment that is before the last read
-                Report.deleteReportComment({
-                    report,
-                    reportAction: {...reportActions[200]},
-                    originalReportActions: undefined,
-                    reportActions: undefined,
-                    ancestors: ancestors.current,
-                    isReportArchived: undefined,
-                    isOriginalReportArchived: undefined,
-                    currentEmail: USER_1_LOGIN,
-                    isOffline: false,
-                    currentUserAccountID: 1,
-                });
+                Report.deleteReportComment(report, {...reportActions[200]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
                 return waitForBatchedUpdates();
             })
             .then(() => {
@@ -934,18 +923,7 @@ describe('actions/Report', () => {
 
                 rerender(report);
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
-                Report.deleteReportComment({
-                    report,
-                    reportAction: {...reportActions[400]},
-                    originalReportActions: undefined,
-                    reportActions: undefined,
-                    ancestors: ancestors.current,
-                    isReportArchived: undefined,
-                    isOriginalReportArchived: undefined,
-                    currentEmail: USER_1_LOGIN,
-                    isOffline: false,
-                    currentUserAccountID: 1,
-                });
+                Report.deleteReportComment(report, {...reportActions[400]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
                 return waitForBatchedUpdates();
             })
             .then(() => getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))
@@ -1701,18 +1679,7 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment({
-            report: originalReport,
-            reportAction: newReportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1769,18 +1736,7 @@ describe('actions/Report', () => {
         expect(persistedRequests?.at(0)?.command).toBe(WRITE_COMMANDS.ADD_COMMENT);
 
         rerender(originalReport);
-        Report.deleteReportComment({
-            report: originalReport,
-            reportAction: newReportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: currentUserEmail,
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, currentUserEmail, false, 1);
         await waitForBatchedUpdates();
 
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1850,18 +1806,7 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment({
-            report: originalReport,
-            reportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(originalReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -1920,18 +1865,7 @@ describe('actions/Report', () => {
                 }),
             );
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         jest.runOnlyPendingTimers();
         await waitForBatchedUpdates();
@@ -2007,18 +1941,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction: newReportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2102,18 +2025,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction: newReportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2330,19 +2242,7 @@ describe('actions/Report', () => {
             }),
         };
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction: commentAction,
-            originalReportActions: reportActionsForReport,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-            visibleReportActionsDataParam: undefined,
-        });
+        Report.deleteReportComment(REPORT, commentAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2428,19 +2328,7 @@ describe('actions/Report', () => {
         };
 
         // Delete comment B — only whisper B (at commentB + 1) should be marked deleted
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction: commentBAction,
-            originalReportActions: reportActionsForReport,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-            visibleReportActionsDataParam: undefined,
-        });
+        Report.deleteReportComment(REPORT, commentBAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2539,18 +2427,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction: newReportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2652,18 +2529,7 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: [],
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -2726,18 +2592,7 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors({reportID: REPORT_ID}));
 
-        Report.deleteReportComment({
-            report: REPORT,
-            reportAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         expect(PersistedRequests.getAll().length).toBe(3);
 
@@ -2984,30 +2839,8 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors(report));
 
-        Report.deleteReportComment({
-            report,
-            reportAction: mentionAction,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
-        Report.deleteReportComment({
-            report,
-            reportAction: mentionAction2,
-            originalReportActions: undefined,
-            reportActions: undefined,
-            ancestors: ancestors.current,
-            isReportArchived: undefined,
-            isOriginalReportArchived: undefined,
-            currentEmail: '',
-            isOffline: false,
-            currentUserAccountID: 1,
-        });
+        Report.deleteReportComment(report, mentionAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment(report, mentionAction2, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
 
         await waitForBatchedUpdates();
 
@@ -3044,18 +2877,7 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment({
-                report: parentReport,
-                reportAction,
-                originalReportActions: undefined,
-                reportActions: undefined,
-                ancestors: ancestors.current,
-                isReportArchived: undefined,
-                isOriginalReportArchived: undefined,
-                currentEmail: '',
-                isOffline: false,
-                currentUserAccountID: 1,
-            });
+            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -3073,18 +2895,7 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID, reportActionID: 'action-999'});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment({
-                report: parentReport,
-                reportAction,
-                originalReportActions: undefined,
-                reportActions: undefined,
-                ancestors: ancestors.current,
-                isReportArchived: undefined,
-                isOriginalReportArchived: undefined,
-                currentEmail: '',
-                isOffline: false,
-                currentUserAccountID: 1,
-            });
+            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -11692,18 +11503,7 @@ describe('actions/Report', () => {
                 });
                 await waitForBatchedUpdates();
 
-                Report.deleteReportComment({
-                    report: {reportID: REPORT_ID},
-                    reportAction: deletedComment,
-                    originalReportActions: undefined,
-                    reportActions: undefined,
-                    ancestors: [],
-                    isReportArchived: undefined,
-                    isOriginalReportArchived: undefined,
-                    currentEmail: '',
-                    isOffline: false,
-                    currentUserAccountID,
-                });
+                Report.deleteReportComment({reportID: REPORT_ID}, deletedComment, undefined, undefined, [], undefined, undefined, '', false, currentUserAccountID);
                 await waitForBatchedUpdates();
 
                 return (await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))?.lastVisibleActionCreated;
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index 3c662449d2c5..042bd8b6d706 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -708,18 +708,7 @@ describe('Unread Indicators', () => {
 
                     const report = await OnyxUtils.get(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`);
                     if (lastReportAction) {
-                        deleteReportComment({
-                            report,
-                            reportAction: lastReportAction,
-                            originalReportActions: undefined,
-                            reportActions: undefined,
-                            ancestors: [],
-                            isReportArchived: undefined,
-                            isOriginalReportArchived: undefined,
-                            currentEmail: '',
-                            isOffline: false,
-                            currentUserAccountID: 1,
-                        });
+                        deleteReportComment(report, lastReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
                     }
                     return waitForBatchedUpdates();
                 })
@@ -775,18 +764,7 @@ describe('Unread Indicators', () => {
 
             await waitForBatchedUpdates();
 
-            deleteReportComment({
-                report,
-                reportAction: firstNewReportAction,
-                originalReportActions: undefined,
-                reportActions: undefined,
-                ancestors: [],
-                isReportArchived: undefined,
-                isOriginalReportArchived: undefined,
-                currentEmail: '',
-                isOffline: false,
-                currentUserAccountID: 1,
-            });
+            deleteReportComment(report, firstNewReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
 
             await waitForBatchedUpdates();
         }

From 8d1f11424cebac773ca409dd7943356e3b976ced Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 28 Sep 2026 18:02:15 +0700
Subject: [PATCH 192/781] fix: add comment

---
 src/libs/actions/Report/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 8474cec19434..3f28010c3256 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3371,6 +3371,7 @@ function broadcastUserIsLeavingRoom(reportID: string, currentUserAccountID: numb
 }
 
 /** Deletes a comment from the report, basically sets it as empty string */
+// TODO: Convert these positional params into a single object param, like the sibling actions in this file already use. That also removes the need for the suppression below. Refactor issue: https://github.com/Expensify/App/issues/66408
 // eslint-disable-next-line @typescript-eslint/max-params
 function deleteReportComment(
     report: OnyxEntry<Report>,

From 7b287ce8adc8060df78d75a9c83a5ee930f69262 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Mon, 28 Sep 2026 13:38:51 +0100
Subject: [PATCH 193/781] fix: show previous unit in commuter exclusion
 changelog

---
 src/libs/ReportActionsUtils.ts       |  5 +++--
 src/types/onyx/OriginalMessage.ts    |  3 +++
 tests/unit/ReportActionsUtilsTest.ts | 23 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index ad5d46836d28..785cd9efdf45 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -4535,7 +4535,7 @@ function getUpdatedCommuterExclusionsMessage(translate: LocalizedTranslate, repo
     if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_COMMUTER_EXCLUSIONS)) {
         return getReportActionText(reportAction);
     }
-    const {newValue, unit, oldValue, updatedField} = getOriginalMessage(reportAction) ?? {};
+    const {newValue, unit, oldValue, oldUnit, updatedField} = getOriginalMessage(reportAction) ?? {};
 
     if (updatedField === CONST.POLICY.COMMUTER_EXCLUSION_TYPE.METHOD) {
         let previousMethod: string;
@@ -4564,7 +4564,8 @@ function getUpdatedCommuterExclusionsMessage(translate: LocalizedTranslate, repo
             return translate('workspaceActions.commuterExclusions.setFixedDistance', {formattedDistance});
         }
 
-        const formattedOldDistance = getFormattedDistanceInUnits(Number(oldValue ?? 0), distanceUnit, translate);
+        const oldDistanceUnit = oldUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS || oldUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? oldUnit : distanceUnit;
+        const formattedOldDistance = getFormattedDistanceInUnits(Number(oldValue ?? 0), oldDistanceUnit, translate);
         return translate('workspaceActions.commuterExclusions.changedFixedDistance', {formattedOldDistance, formattedNewDistance: formattedDistance});
     }
 
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 8ec7782e7572..a0e1e20088a2 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -574,6 +574,9 @@ type OriginalMessagePolicyChangeLog = {
      */
     unit?: string;
 
+    /** Previous distance unit when a commuter-exclusion distance changes units */
+    oldUnit?: string;
+
     /** Start date of the custom unit rate (yyyy-MM-dd), used in ADD actions */
     startDate?: string;
 
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 9c09557266ca..b651d092878b 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -4496,6 +4496,29 @@ describe('ReportActionsUtils', () => {
         ])('names both the new and the previous method for %s from %s', (newValue, oldValue, expected) => {
             expect(getUpdatedCommuterExclusionsMessage(translateLocal, buildMethodChangeAction(newValue, oldValue))).toBe(expected);
         });
+
+        it('formats the previous distance using its original unit after a unit change', () => {
+            // Given a unit-only commuter exclusion change from 5 miles to 5 kilometers
+            const action = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_COMMUTER_EXCLUSIONS,
+                reportActionID: '1',
+                created: '',
+                originalMessage: {
+                    updatedField: CONST.POLICY.COMMUTER_EXCLUSION_TYPE.FIXED_DISTANCE,
+                    newValue: 5,
+                    oldValue: 5,
+                    unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS,
+                    oldUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+                },
+                message: [],
+            } as ReportAction;
+
+            // When NewDot formats the workspace audit action
+            const message = getUpdatedCommuterExclusionsMessage(translateLocal, action);
+
+            // Then it preserves each value's own unit in the message
+            expect(message).toBe('changed fixed distance exclusion to 5.00 kilometers per claim (previously 5.00 miles)');
+        });
     });
 
     describe('getUpdatedCardFeedLiabilityMessage', () => {

From 5a2106a15bd96082017e52416e206687a9331fb1 Mon Sep 17 00:00:00 2001
From: "Nyoman Jyotisa (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 28 Sep 2026 18:02:30 +0000
Subject: [PATCH 194/781] Remove outdated '(anonymous users)' note from
 lastUpdateIDAppliedToClient comment

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>
---
 src/libs/actions/User.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index f38146dc13ca..60915bf4f4ee 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -86,7 +86,7 @@ Onyx.connectWithoutView({
     },
 });
 
-// This value is used in the handler for a RECONNECT_APP Pusher event (anonymous users), so it's not possible to use useOnyx().
+// This value is used in the handler for a RECONNECT_APP Pusher event, so it's not possible to use useOnyx().
 let lastUpdateIDAppliedToClient: OnyxEntry<number>;
 Onyx.connectWithoutView({
     key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,

From 8d3c1442c68d417d0ea6b124f7306a648a937cfb Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Mon, 28 Sep 2026 19:35:35 +0000
Subject: [PATCH 195/781] Update comments

---
 src/libs/actions/MergeTransaction.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index 10f6e78cbf1d..7edba6d8c40c 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -284,11 +284,10 @@ function getTransactionsForMerging({
     }
 
     // Candidate discovery:
-    // - Admins: The list of eligible expenses now includes expenses from the same submitter across all of their draft
-    //   reports where the admin has access. This replaces the previous same-report-only shortcut so admins can initiate
-    //   cross-report merges from either the card or cash expense.
-    // - Managers (non-admin approvers): Still limited to same-report transactions on the processing report they
-    //   triggered the merge from, as they review one report at a time.
+    // - Admins: See expenses from the same submitter across the submitter's open reports and submitted reports pending
+    //   final approval that the admin can access, so admins can merge a card and cash expense on different reports.
+    // - Managers (non-admin approvers): Limited to same-report transactions on the processing report they triggered
+    //   the merge from, as they review one report at a time.
     // - Submitters will see all their editable expenses, including their IOUs/unreported expenses.
     // IOU:
     // - There are no admins/approvers outside of the submitter in these cases, so there’s no consideration for different roles.
@@ -296,7 +295,6 @@ function getTransactionsForMerging({
     const isAdmin = isPolicyAdmin(policy, currentUserLogin);
     const isManager = isReportManager(report);
 
-    // Managers (non-admin approvers) reviewing a processing report still see only same-report transactions.
     if (isPaidGroupPolicy(policy) && isManager && !isAdmin && !isCurrentUserSubmitter(report)) {
         const eligibleTransactions = reportTransactions.filter((transaction): transaction is Transaction => {
             if (!transaction || transaction.transactionID === transactionID) {

From 76ea84607834caee39b8514c95508e37d18cf9ca Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Mon, 28 Sep 2026 19:37:55 +0000
Subject: [PATCH 196/781] Add test for submitted case

---
 tests/actions/MergeTransactionTest.ts | 84 +++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/tests/actions/MergeTransactionTest.ts b/tests/actions/MergeTransactionTest.ts
index 28f75ce0d206..5d47a7318d0b 100644
--- a/tests/actions/MergeTransactionTest.ts
+++ b/tests/actions/MergeTransactionTest.ts
@@ -1886,6 +1886,90 @@ describe('getTransactionsForMerging', () => {
         expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(true);
     });
 
+    it('should allow admin to see cash candidates from a submitted report pending final approval in the same workspace (offline)', async () => {
+        // Given an admin user, an open draft report, and a submitted report awaiting approval in the same workspace
+        const adminLogin = 'admin@test.com';
+        const submitterAccountID = 42;
+
+        const policy = {
+            ...createRandomPolicy(1),
+            id: 'workspace-1',
+            type: CONST.POLICY.TYPE.TEAM,
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+
+        const targetReport = {
+            ...createExpenseReport(1),
+            reportID: 'target-report-1',
+            policyID: 'workspace-1',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+        const submittedReport = {
+            ...createExpenseReport(2),
+            reportID: 'submitted-report-2',
+            policyID: 'workspace-1',
+            ownerAccountID: submitterAccountID,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+        };
+
+        const targetTransaction = {
+            ...createRandomTransaction(1),
+            transactionID: 'card-tx-1',
+            reportID: 'target-report-1',
+            cardNumber: '1234',
+            bank: undefined,
+        };
+
+        const candidateTransaction = {
+            ...createRandomTransaction(2),
+            transactionID: 'cash-tx-2',
+            reportID: 'submitted-report-2',
+            cardNumber: undefined,
+            bank: undefined,
+            managedCard: false,
+            amount: 500,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`, targetReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${submittedReport.reportID}`, submittedReport);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        await waitForBatchedUpdates();
+
+        const allTransactions = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`]: targetTransaction,
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${candidateTransaction.transactionID}`]: candidateTransaction,
+        };
+        const allPolicies = {
+            [`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
+        };
+        const allReports = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`]: targetReport,
+            [`${ONYXKEYS.COLLECTION.REPORT}${submittedReport.reportID}`]: submittedReport,
+        };
+
+        // When the admin requests merge candidates offline
+        getTransactionsForMerging({
+            isOffline: true,
+            targetTransaction,
+            transactions: allTransactions,
+            reportTransactions: [],
+            policy,
+            report: targetReport,
+            currentUserLogin: adminLogin,
+            rules: undefined,
+            allPolicies,
+            allReports,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the cash candidate from the submitted report appears in eligible transactions, because admins can still edit reports before final approval
+        const mergeTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${targetTransaction.transactionID}`);
+        expect(mergeTransaction?.eligibleTransactions?.some((t) => t.transactionID === candidateTransaction.transactionID)).toBe(true);
+    });
+
     it('should NOT allow admin to see candidates from another workspace where they are not an admin (offline)', async () => {
         // Given an admin in workspace-1 but only a member in workspace-2
         const adminLogin = 'admin@test.com';

From 3c95faa92ba2f2b9cf0bd92623858df89e904de0 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 28 Sep 2026 22:06:50 +0000
Subject: [PATCH 197/781] Add a clear after date to vacation delegates and move
 them to the Profile page

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 .../settings/Delegate-when-out-of-office.md   |  22 +-
 src/CONST/index.ts                            |   1 +
 src/ONYXKEYS.ts                               |   3 +
 src/ROUTES.ts                                 |  10 +-
 src/SCREENS.ts                                |   4 +-
 src/components/VacationDelegateForm.tsx       | 129 ++++++
 src/components/VacationDelegateMenuItem.tsx   |  15 +-
 src/languages/de.ts                           |   4 +
 src/languages/el.ts                           |   4 +
 src/languages/en.ts                           |   4 +
 src/languages/es.ts                           |   4 +
 src/languages/fr.ts                           |   4 +
 src/languages/it.ts                           |   4 +
 src/languages/ja.ts                           |   4 +
 src/languages/nl.ts                           |   4 +
 src/languages/pl.ts                           |   4 +
 src/languages/pt-BR.ts                        |   4 +
 src/languages/zh-hans.ts                      |   4 +
 .../parameters/SetVacationDelegateParams.ts   |   3 +
 .../ModalStackNavigators/index.tsx            |   6 +-
 .../linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts  |   1 +
 .../RELATIONS/SETTINGS_TO_RHP.ts              |   1 +
 src/libs/Navigation/linkingConfig/config.ts   |   7 +
 src/libs/Navigation/types.ts                  |   5 +
 src/libs/VacationDelegateUtils.ts             |  54 +++
 src/libs/actions/Domain.ts                    |  24 +-
 src/libs/actions/VacationDelegate.ts          |  26 +-
 .../Members/DomainMemberDetailsPage.tsx       |  14 +-
 .../DomainMemberVacationDelegateFormPage.tsx  |  87 ++++
 .../DomainMemberVacationDelegatePage.tsx      |  30 +-
 .../Profile/CustomStatus/StatusPage.tsx       |  27 --
 .../CustomStatus/VacationDelegateFormPage.tsx | 123 ++++++
 .../index.tsx                                 |  15 +-
 .../CustomStatus/VacationDelegatePage.tsx     |  84 +---
 src/pages/settings/Profile/ProfilePage.tsx    |  31 +-
 src/types/form/VacationDelegateForm.ts        |  24 ++
 src/types/form/index.ts                       |   1 +
 src/types/onyx/VacationDelegate.ts            |   9 +
 tests/actions/DomainTest.ts                   |  48 ++-
 tests/actions/VacationDelegateTest.ts         |  48 +++
 tests/ui/ProfilePageTest.tsx                  |  37 ++
 tests/ui/VacationDelegateFormPageTest.tsx     | 386 ++++++++++++++++++
 ...ationDelegateMissingWorkspacesPageTest.tsx |  24 ++
 tests/ui/VacationDelegatePageTest.tsx         | 251 +-----------
 .../VacationDelegateMenuItemTest.tsx          |  33 ++
 tests/unit/libs/VacationDelegateUtilsTest.ts  |  58 +++
 46 files changed, 1304 insertions(+), 381 deletions(-)
 create mode 100644 src/components/VacationDelegateForm.tsx
 create mode 100644 src/libs/VacationDelegateUtils.ts
 create mode 100644 src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
 create mode 100644 src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
 create mode 100644 src/types/form/VacationDelegateForm.ts
 create mode 100644 tests/ui/VacationDelegateFormPageTest.tsx
 create mode 100644 tests/unit/libs/VacationDelegateUtilsTest.ts

diff --git a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
index dcc4212e3991..1caaf08f33f7 100644
--- a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
+++ b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
@@ -2,14 +2,14 @@
 title: Delegate When Out of Office
 description: Set a vacation delegate to approve reports on your behalf while you're away.
 keywords: [New Expensify, delegate approvals, out-of-office approver, vacation, out of office, approval delegation, temporary delegate, vacation delegate, copilot vs delegate, copilot, shared access, proxy, behalf of]
-internalScope: Audience is all members. Covers assigning and removing your own vacation delegate from your profile status. Does not cover Copilot access or Expensify Classic delegates.
+internalScope: Audience is all members. Covers assigning, scheduling the end of, and removing your own vacation delegate from your profile. Does not cover Copilot access or Expensify Classic delegates.
 ---
 
 # Delegate When Out of Office 
 
 If you're out of the office or on vacation, you can assign a vacation delegate to handle your approvals while you're away.
 
-A vacation delegate can approve reports on your behalf. Once assigned, any reports sent to you for approval will be automatically redirected to your delegate. When you're back, just remove the delegate to resume handling your own reports.
+A vacation delegate can approve reports on your behalf. Once assigned, any reports sent to you for approval will be automatically redirected to your delegate. Pick a **Clear after** date and the delegate is removed automatically at the end of that day, so reports come back to you when you return.
 
 All delegate actions are tracked in the report history for full visibility.
 
@@ -17,19 +17,19 @@ All delegate actions are tracked in the report history for full visibility.
 
 ## How to assign a vacation delegate
 
-1. Go to **Account > Profile > Status**.
-2. Under **Vacation delegate**, enter the email address or phone number of your delegate.
-3. Click **Save**.
+1. Go to **Account > Profile > Vacation delegate**.
+2. Select the member who should approve on your behalf.
+3. Optional (recommended): Under **Clear after**, pick the last day the delegate should cover.
+4. Click **Save**.
 
-Once set, any reports or chats that would normally come to you will be redirected to your delegate. You can view every action they take in the report's history and comments.
+Once set, any reports or chats that would normally come to you will be redirected to your delegate. You can view every action they take in the report's history and comments. The delegate and the date it clears are shown under **Vacation delegate** on your profile.
 
 ## How to remove a vacation delegate
 
-When you're ready to take back control of your reports:
+If you set a **Clear after** date, the delegate is removed automatically. To remove it sooner:
 
-1. Go to **Account > Profile > Status**.
-2. Under **Vacation delegate**, clear the delegate's email or phone number.
-3. Click **Save**.
+1. Go to **Account > Profile > Vacation delegate**.
+2. Click **Remove vacation delegate**.
 
 ---
 
@@ -49,7 +49,7 @@ Your delegate can assign their own vacation delegate too. This ensures approvals
 
 ## If I clear my status, does that remove my vacation delegate?
 
-No. Clearing your status won't affect your delegate. You'll need to manually remove them when you're back.
+No. Clearing your status won't affect your delegate. Set a **Clear after** date on your vacation delegate, or remove them when you're back.
 
 ## What if my delegate isn’t in the same workspace?
 
diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index b5abc0f4084b..845a4b7e6d24 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9957,6 +9957,7 @@ const CONST = {
             DISPLAY_NAME: 'SettingsProfile-DisplayName',
             CONTACT_METHODS: 'SettingsProfile-ContactMethods',
             STATUS: 'SettingsProfile-Status',
+            VACATION_DELEGATE: 'SettingsProfile-VacationDelegate',
             PRONOUNS: 'SettingsProfile-Pronouns',
             TIMEZONE: 'SettingsProfile-Timezone',
             SHARE_CODE: 'SettingsProfile-ShareCode',
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index aa1fffc6b9c9..a194840337bb 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1180,6 +1180,8 @@ const ONYXKEYS = {
         SETTINGS_STATUS_SET_FORM_DRAFT: 'settingsStatusSetFormDraft',
         SETTINGS_STATUS_CLEAR_DATE_FORM: 'settingsStatusClearDateForm',
         SETTINGS_STATUS_CLEAR_DATE_FORM_DRAFT: 'settingsStatusClearDateFormDraft',
+        VACATION_DELEGATE_FORM: 'vacationDelegateForm',
+        VACATION_DELEGATE_FORM_DRAFT: 'vacationDelegateFormDraft',
         CHANGE_BILLING_CURRENCY_FORM: 'billingCurrencyForm',
         CHANGE_BILLING_CURRENCY_FORM_DRAFT: 'billingCurrencyFormDraft',
         PRIVATE_NOTES_FORM: 'privateNotesForm',
@@ -1417,6 +1419,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.WAYPOINT_FORM]: FormTypes.WaypointForm;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM]: FormTypes.SettingsStatusSetForm;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_CLEAR_DATE_FORM]: FormTypes.SettingsStatusClearDateForm;
+    [ONYXKEYS.FORMS.VACATION_DELEGATE_FORM]: FormTypes.VacationDelegateForm;
     [ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM]: FormTypes.ChangeBillingCurrencyForm;
     [ONYXKEYS.FORMS.PRIVATE_NOTES_FORM]: FormTypes.PrivateNotesForm;
     [ONYXKEYS.FORMS.I_KNOW_A_TEACHER_FORM]: FormTypes.IKnowTeacherForm;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 40eb53dd6ede..90b605323b17 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2650,8 +2650,9 @@ const ROUTES = {
     SETTINGS_STATUS_CLEAR_AFTER: 'settings/profile/status/clear-after',
     SETTINGS_STATUS_CLEAR_AFTER_DATE: 'settings/profile/status/clear-after/date',
     SETTINGS_STATUS_CLEAR_AFTER_TIME: 'settings/profile/status/clear-after/time',
-    SETTINGS_VACATION_DELEGATE: 'settings/profile/status/vacation-delegate',
-    SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES: 'settings/profile/status/vacation-delegate/missing-workspaces',
+    SETTINGS_VACATION_DELEGATE: 'settings/profile/vacation-delegate',
+    SETTINGS_VACATION_DELEGATE_SELECT: 'settings/profile/vacation-delegate/select',
+    SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES: 'settings/profile/vacation-delegate/missing-workspaces',
     SETTINGS_TROUBLESHOOT: 'settings/troubleshoot',
     SETTINGS_HELP: 'settings/help',
 
@@ -5352,6 +5353,11 @@ const ROUTES = {
         getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/members/${accountID}/vacation-delegate` as const,
     },
 
+    DOMAIN_VACATION_DELEGATE_SELECT: {
+        route: 'domain/:domainAccountID/members/:accountID/vacation-delegate/select',
+        getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/members/${accountID}/vacation-delegate/select` as const,
+    },
+
     MULTIFACTOR_AUTHENTICATION_AUTHORIZE_TRANSACTION: {
         route: 'multifactor-authentication/authorize-transaction/:transactionID',
         getRoute: (transactionID: string) => `multifactor-authentication/authorize-transaction/${transactionID}` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index f39a2448a606..7a4c856d199e 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -113,7 +113,8 @@ const SCREENS = {
             STATUS_CLEAR_AFTER: 'Settings_Status_Clear_After',
             STATUS_CLEAR_AFTER_DATE: 'Settings_Status_Clear_After_Date',
             STATUS_CLEAR_AFTER_TIME: 'Settings_Status_Clear_After_Time',
-            VACATION_DELEGATE: 'Settings_Status_Vacation_Delegate',
+            VACATION_DELEGATE: 'Settings_Profile_Vacation_Delegate',
+            VACATION_DELEGATE_SELECT: 'Settings_Profile_Vacation_Delegate_Select',
             VACATION_DELEGATE_MISSING_WORKSPACES: 'Settings_Status_Vacation_Delegate_Missing_Workspaces',
             STATUS: 'Settings_Status',
             PRONOUNS: 'Settings_Pronouns',
@@ -1190,6 +1191,7 @@ const SCREENS = {
         MEMBERS: 'Domain_Members',
         MEMBER_DETAILS: 'Member_Details',
         VACATION_DELEGATE: 'Vacation_Delegate',
+        VACATION_DELEGATE_SELECT: 'Vacation_Delegate_Select',
         RESET_DOMAIN: 'Domain_Reset',
         ADD_MEMBER: 'Domain_Add_Member',
         MEMBERS_SETTINGS: 'Members_Settings',
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
new file mode 100644
index 000000000000..caa9b0af7903
--- /dev/null
+++ b/src/components/VacationDelegateForm.tsx
@@ -0,0 +1,129 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {formatVacationDelegateClearDate, getVacationDelegateClearAfter, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {getDatePassedError} from '@libs/ValidationUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/VacationDelegateForm';
+import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import type {FormInputErrors, FormOnyxValues} from './Form/types';
+
+import DatePicker from './DatePicker';
+import FormProvider from './Form/FormProvider';
+import InputWrapper from './Form/InputWrapper';
+import MenuItemAction from './MenuItem/presets/MenuItemAction';
+import Text from './Text';
+import VacationDelegateMenuItem from './VacationDelegateMenuItem';
+
+type VacationDelegateFormProps = {
+    /** The saved vacation delegate */
+    vacationDelegate?: BaseVacationDelegate;
+
+    /** Text shown above the form */
+    description?: string;
+
+    /** Opens the member selection screen. The picked member is stored in the form draft. */
+    onChangeDelegate: () => void;
+
+    /**
+     * Saves the picked delegate
+     * @param delegate - Login of the picked delegate
+     * @param clearAfter - UTC datetime (yyyy-MM-dd HH:mm:ss) when the delegate clears, or undefined when it never clears
+     */
+    onSubmit: (delegate: string, clearAfter: string | undefined) => void;
+
+    /** Removes the saved delegate */
+    onRemove: () => void;
+
+    /** Errors left by the last change to the saved delegate */
+    errors?: Errors;
+
+    /** Pending action of the last change to the saved delegate */
+    pendingAction?: PendingAction;
+
+    /** Dismisses `errors` */
+    onCloseError?: () => void;
+};
+
+function VacationDelegateForm({vacationDelegate, description, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
+    const styles = useThemeStyles();
+    const {translate, dateFnsLocale} = useLocalize();
+    const icons = useMemoizedLazyExpensifyIcons(['Trashcan']);
+    const {timezone} = useCurrentUserPersonalDetails();
+    const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
+
+    const savedDelegate = isVacationDelegateExpired(vacationDelegate?.clearAfter) ? undefined : vacationDelegate?.delegate;
+    const savedClearDate = savedDelegate ? getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected) : '';
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty draft means no member was picked yet
+    const delegate = draftValues?.[INPUT_IDS.DELEGATE] || savedDelegate;
+    const formattedClearDate = formatVacationDelegateClearDate(draftValues?.[INPUT_IDS.CLEAR_AFTER_DATE] ?? savedClearDate, dateFnsLocale);
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM> => {
+        const formErrors: FormInputErrors<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM> = {};
+        const dateError = values[INPUT_IDS.CLEAR_AFTER_DATE] ? getDatePassedError(translate, values[INPUT_IDS.CLEAR_AFTER_DATE]) : '';
+        if (dateError) {
+            formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = dateError;
+        }
+        return formErrors;
+    };
+
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM>) => {
+        if (!delegate) {
+            return;
+        }
+
+        onSubmit(delegate, getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], timezone?.selected));
+    };
+
+    return (
+        <FormProvider
+            formID={ONYXKEYS.FORMS.VACATION_DELEGATE_FORM}
+            style={styles.flexGrow1}
+            onSubmit={submit}
+            validate={validate}
+            submitButtonText={translate('common.save')}
+            submitButtonStyles={styles.ph5}
+            isSubmitDisabled={!delegate}
+            enabledWhenOffline
+            shouldHideFixErrorsAlert
+        >
+            {!!description && <Text style={[styles.mh5, styles.mb4]}>{description}</Text>}
+            <VacationDelegateMenuItem
+                vacationDelegate={{delegate}}
+                errors={errors}
+                pendingAction={pendingAction}
+                onCloseError={onCloseError}
+                onPress={onChangeDelegate}
+            />
+            <View style={[styles.ph5, styles.mt4]}>
+                <InputWrapper
+                    InputComponent={DatePicker}
+                    inputID={INPUT_IDS.CLEAR_AFTER_DATE}
+                    label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
+                    defaultValue={savedClearDate}
+                    minDate={new Date()}
+                    shouldSaveDraft
+                />
+                {!!formattedClearDate && <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDate)}</Text>}
+            </View>
+            {!!savedDelegate && (
+                <MenuItemAction
+                    title={translate('statusPage.vacationDelegate.removeDelegate')}
+                    icon={icons.Trashcan}
+                    onPress={onRemove}
+                />
+            )}
+        </FormProvider>
+    );
+}
+
+export default VacationDelegateForm;
diff --git a/src/components/VacationDelegateMenuItem.tsx b/src/components/VacationDelegateMenuItem.tsx
index ff3c58528440..86f17470a16f 100644
--- a/src/components/VacationDelegateMenuItem.tsx
+++ b/src/components/VacationDelegateMenuItem.tsx
@@ -1,9 +1,11 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useVacationDelegatePersonalDetails from '@hooks/useVacationDelegatePersonalDetails';
 
 import getVacationDelegateDisplayName from '@libs/getVacationDelegateDisplayName';
+import {formatVacationDelegateClearDate, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
 import CONST from '@src/CONST';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
@@ -29,7 +31,7 @@ type VacationDelegateSectionProps = {
     /**
      * Callback used to clear/reset errors related to the vacation delegate
      */
-    onCloseError: () => void;
+    onCloseError?: () => void;
 
     /**
      * Callback triggered when the section is pressed.
@@ -40,15 +42,18 @@ type VacationDelegateSectionProps = {
 
 function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCloseError, onPress}: VacationDelegateSectionProps) {
     const styles = useThemeStyles();
-    const {translate, formatPhoneNumber} = useLocalize();
+    const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['FallbackAvatar']);
+    const {timezone} = useCurrentUserPersonalDetails();
 
-    const hasVacationDelegate = !!vacationDelegate?.delegate;
+    const hasVacationDelegate = !!vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate?.clearAfter);
     const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(vacationDelegate?.delegate);
 
     const rawDelegateLogin = vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '';
     const delegateDisplayName = getVacationDelegateDisplayName(rawDelegateLogin, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber);
-    const delegateDescription = formatPhoneNumber(rawDelegateLogin);
+    const clearDate = formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected), dateFnsLocale);
+    const untilText = clearDate ? translate('statusPage.vacationDelegate.until', clearDate) : '';
+    const delegateDescription = [formatPhoneNumber(rawDelegateLogin), untilText].filter(Boolean).join('\n');
 
     return (
         <OfflineWithFeedback
@@ -73,7 +78,7 @@ function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCl
                         </MenuItem.Leading>
                         <MenuItem.Content>
                             <MenuItem.Title>{delegateDisplayName}</MenuItem.Title>
-                            {!!delegateDescription && <MenuItem.Description numberOfLines={1}>{delegateDescription}</MenuItem.Description>}
+                            {!!delegateDescription && <MenuItem.Description numberOfLines={untilText ? 2 : 1}>{delegateDescription}</MenuItem.Description>}
                         </MenuItem.Content>
                         <MenuItem.Trailing>
                             <MenuItem.Chevron />
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 1b8f0e88be85..a4190759f992 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -3861,6 +3861,10 @@ ${amount} für ${merchant} – ${date}`,
                 `<strong>${delegate}</strong> ist kein Mitglied der unten aufgeführten Arbeitsbereiche. Admins der Arbeitsbereiche, die Sie nicht verwalten, werden gebeten, die Person hinzuzufügen. Möchten Sie die Person jetzt zu den Arbeitsbereichen einladen, in denen Sie Admin sind?`,
             youAreAMemberOf: 'Sie sind Mitglied dieser Arbeitsbereiche:',
             youAreAnAdminOf: 'Sie sind Admin dieser Arbeitsbereiche:',
+            clearAfterRecommended: 'Löschen nach (empfohlen)',
+            willClearOn: (date: string) => `Die Urlaubsvertretung wird am ${date} entfernt.`,
+            until: (date: string) => `Bis ${date}`,
+            removeDelegate: 'Urlaubsvertretung entfernen',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 150e5abc1e95..c0df52507877 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -3911,6 +3911,10 @@ ${amount} για ${merchant} - ${date}`,
                 `Ο/Η <strong>${delegate}</strong> δεν είναι μέλος των παρακάτω χώρων εργασίας. Θα ζητηθεί από τους διαχειριστές των χώρων εργασίας που δεν διαχειρίζεστε να τον/την προσθέσουν. Θέλετε να τον/την προσκαλέσετε τώρα σε αυτούς που διαχειρίζεστε ως διαχειριστής;`,
             youAreAMemberOf: 'Είστε μέλος αυτών των χώρων εργασίας:',
             youAreAnAdminOf: 'Είστε διαχειριστής αυτών των χώρων εργασίας:',
+            clearAfterRecommended: 'Εκκαθάριση μετά από (συνιστάται)',
+            willClearOn: (date: string) => `Ο εκπρόσωπος διακοπών θα καταργηθεί στις ${date}.`,
+            until: (date: string) => `Έως ${date}`,
+            removeDelegate: 'Κατάργηση εκπροσώπου διακοπών',
         },
     },
     stepCounter: (step, total, text) => {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 467b9a867020..6da3472e8c4f 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3973,6 +3973,10 @@ const translations = {
                 `<strong>${delegate}</strong> isn't a member of the workspaces below. Admins of the workspaces you don't manage will be asked to add them. Do you want to invite them to the ones you are an admin of now?`,
             youAreAMemberOf: 'You are a member of these workspaces:',
             youAreAnAdminOf: 'You are an admin of these workspaces:',
+            clearAfterRecommended: 'Clear after (recommended)',
+            willClearOn: (date: string) => `Vacation delegate will clear on ${date}.`,
+            until: (date: string) => `Until ${date}`,
+            removeDelegate: 'Remove vacation delegate',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index f8b9b288a7d6..1379743076d0 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3779,6 +3779,10 @@ ${amount} para ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> no es miembro de los siguientes espacios de trabajo. Se pedirá a los administradores de los espacios de trabajo que no gestiona que lo agreguen. ¿Desea invitarlo ahora a los espacios de trabajo en los que es administrador?`,
             youAreAMemberOf: 'Usted es miembro de estos espacios de trabajo:',
             youAreAnAdminOf: 'Usted es administrador de estos espacios de trabajo:',
+            clearAfterRecommended: 'Borrar después de (recomendado)',
+            willClearOn: (date: string) => `El delegado de vacaciones se eliminará el ${date}.`,
+            until: (date: string) => `Hasta el ${date}`,
+            removeDelegate: 'Eliminar delegado de vacaciones',
         },
     },
     stepCounter: (step, total, text) => {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 25aa1b34cabc..263ca6e4933c 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -3869,6 +3869,10 @@ ${amount} pour ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> n'est pas membre des espaces de travail ci-dessous. Les administrateurs des espaces de travail que vous ne gérez pas seront invités à l'ajouter. Voulez-vous l'inviter dès maintenant à ceux dont vous êtes administrateur ?`,
             youAreAMemberOf: 'Vous êtes membre de ces espaces de travail :',
             youAreAnAdminOf: 'Vous êtes administrateur de ces espaces de travail :',
+            clearAfterRecommended: 'Effacer après (recommandé)',
+            willClearOn: (date: string) => `Le délégué de vacances sera supprimé le ${date}.`,
+            until: (date: string) => `Jusqu’au ${date}`,
+            removeDelegate: 'Supprimer le délégué de vacances',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 6064e9b5cc38..37d6575ebf97 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -3842,6 +3842,10 @@ ${amount} per ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> non è membro degli spazi di lavoro elencati di seguito. Agli amministratori degli spazi di lavoro che non gestisci verrà chiesto di aggiungerlo. Vuoi invitarlo ora in quelli di cui sei amministratore?`,
             youAreAMemberOf: 'Sei membro di questi spazi di lavoro:',
             youAreAnAdminOf: 'Sei amministratore di questi spazi di lavoro:',
+            clearAfterRecommended: 'Cancella dopo (consigliato)',
+            willClearOn: (date: string) => `La delega ferie verrà rimossa il ${date}.`,
+            until: (date: string) => `Fino al ${date}`,
+            removeDelegate: 'Rimuovi delega ferie',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 042a7c0d4ab0..335360623851 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -3811,6 +3811,10 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
                 `<strong>${delegate}</strong>は以下のワークスペースのメンバーではありません。あなたが管理していないワークスペースの管理者に追加を依頼します。あなたが管理者になっているワークスペースには今すぐ招待しますか？`,
             youAreAMemberOf: 'あなたはこれらのワークスペースのメンバーです：',
             youAreAnAdminOf: 'あなたはこれらのワークスペースの管理者です：',
+            clearAfterRecommended: 'クリア日（推奨）',
+            willClearOn: (date: string) => `休暇代理人は${date}に解除されます。`,
+            until: (date: string) => `${date}まで`,
+            removeDelegate: '休暇代理人を削除',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index eae278301c6c..682476d39dde 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -3844,6 +3844,10 @@ ${amount} voor ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> is geen lid van de onderstaande werkruimtes. Beheerders van de werkruimtes die je niet beheert, wordt gevraagd diegene toe te voegen. Wil je diegene nu uitnodigen voor de werkruimtes waar je beheerder van bent?`,
             youAreAMemberOf: 'Je bent lid van deze werkruimtes:',
             youAreAnAdminOf: 'Je bent beheerder van deze werkruimtes:',
+            clearAfterRecommended: 'Wissen na (aanbevolen)',
+            willClearOn: (date: string) => `De vertegenwoordiger tijdens vakantie wordt gewist op ${date}.`,
+            until: (date: string) => `Tot ${date}`,
+            removeDelegate: 'Vertegenwoordiger tijdens vakantie verwijderen',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 482f1f887b4a..057cfe15a4be 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -3873,6 +3873,10 @@ ${amount} dla ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> nie jest członkiem poniższych przestrzeni roboczych. Administratorzy przestrzeni roboczych, którymi nie zarządzasz, zostaną poproszeni o dodanie tej osoby. Czy chcesz zaprosić tę osobę do przestrzeni, w których jesteś administratorem?`,
             youAreAMemberOf: 'Jesteś członkiem tych przestrzeni roboczych:',
             youAreAnAdminOf: 'Jesteś administratorem tych przestrzeni roboczych:',
+            clearAfterRecommended: 'Wyczyść po (zalecane)',
+            willClearOn: (date: string) => `Zastępca urlopowy zostanie usunięty ${date}.`,
+            until: (date: string) => `Do ${date}`,
+            removeDelegate: 'Usuń zastępcę urlopowego',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ce56c5cad2bc..d69f8dc7e152 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -3831,6 +3831,10 @@ ${amount} para ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> não é membro dos workspaces abaixo. Os admins dos workspaces que você não gerencia serão solicitados a adicioná-lo(a). Deseja convidá-lo(a) agora para os workspaces em que você é admin?`,
             youAreAMemberOf: 'Você é membro destes workspaces:',
             youAreAnAdminOf: 'Você é admin destes workspaces:',
+            clearAfterRecommended: 'Limpar após (recomendado)',
+            willClearOn: (date: string) => `O delegado de férias será removido em ${date}.`,
+            until: (date: string) => `Até ${date}`,
+            removeDelegate: 'Remover delegado de férias',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index ba103eb5ca9e..419603777b44 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -3719,6 +3719,10 @@ ${amount}，商户：${merchant} - 日期：${date}`,
                 `<strong>${delegate}</strong> 不是以下工作区的成员。系统会请求你未管理的工作区的管理员将其添加进来。你要现在邀请他们加入你管理的工作区吗？`,
             youAreAMemberOf: '你是这些工作区的成员：',
             youAreAnAdminOf: '你是这些工作区的管理员：',
+            clearAfterRecommended: '清除日期（推荐）',
+            willClearOn: (date: string) => `休假代理将于 ${date} 清除。`,
+            until: (date: string) => `直到 ${date}`,
+            removeDelegate: '移除休假代理',
         },
     },
     stepCounter: (step: number, total?: number, text?: string) => {
diff --git a/src/libs/API/parameters/SetVacationDelegateParams.ts b/src/libs/API/parameters/SetVacationDelegateParams.ts
index d149f370d5c5..eb5abb05c555 100644
--- a/src/libs/API/parameters/SetVacationDelegateParams.ts
+++ b/src/libs/API/parameters/SetVacationDelegateParams.ts
@@ -2,6 +2,9 @@ type SetVacationDelegateParams = {
     creator: string;
     vacationerEmail?: string;
     vacationDelegateEmail: string;
+
+    /** UTC datetime (yyyy-MM-dd HH:mm:ss) when the backend should clear the vacation delegate */
+    clearAfter?: string;
     overridePolicyDiffWarning: boolean;
     domainAccountID?: number;
 };
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 126cbac1a383..7689f03c411c 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -529,7 +529,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default,
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default,
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/SetTimePage').default,
-    [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/VacationDelegatePage').default,
+    [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/VacationDelegateFormPage').default,
+    [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/VacationDelegatePage').default,
     [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_MISSING_WORKSPACES]: () =>
         require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage').default,
     [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/SubscriptionSize').default,
@@ -1257,7 +1258,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.DOMAIN.ADD_ADMIN]: () => require<ReactComponentModule>('../../../../pages/domain/Admins/DomainAddAdminPage').default,
     [SCREENS.DOMAIN.MEMBER_DETAILS]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainMemberDetailsPage').default,
     [SCREENS.DOMAIN.RESET_DOMAIN]: () => require<ReactComponentModule>('../../../../pages/domain/DomainResetPage').default,
-    [SCREENS.DOMAIN.VACATION_DELEGATE]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainMemberVacationDelegatePage').default,
+    [SCREENS.DOMAIN.VACATION_DELEGATE]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainMemberVacationDelegateFormPage').default,
+    [SCREENS.DOMAIN.VACATION_DELEGATE_SELECT]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainMemberVacationDelegatePage').default,
     [SCREENS.DOMAIN.ADD_MEMBER]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainAddMemberPage').default,
     [SCREENS.DOMAIN.MEMBERS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainMembersSettingsPage').default,
     [SCREENS.DOMAIN.MEMBERS_SETTINGS_TWO_FACTOR_AUTH]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainRequireTwoFactorAuthPage').default,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
index 572d7444556e..17f92ba79351 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
@@ -14,6 +14,7 @@ const DOMAIN_TO_RHP: Partial<Record<keyof DomainSplitNavigatorParamList, string[
         SCREENS.DOMAIN.MEMBERS_SETTINGS,
         SCREENS.DOMAIN.MEMBERS_SETTINGS_TWO_FACTOR_AUTH,
         SCREENS.DOMAIN.VACATION_DELEGATE,
+        SCREENS.DOMAIN.VACATION_DELEGATE_SELECT,
         SCREENS.DOMAIN.MEMBER_FORCE_TWO_FACTOR_AUTH,
         SCREENS.DOMAIN.MEMBER_RESET_TWO_FACTOR_AUTH,
         SCREENS.DOMAIN.MEMBER_LOCK_ACCOUNT,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
index 055766708097..e9c54891b615 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
@@ -12,6 +12,7 @@ const SETTINGS_TO_RHP: Partial<Record<keyof SettingsSplitNavigatorParamList, str
         SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE,
         SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME,
         SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE,
+        SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT,
         SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_MISSING_WORKSPACES,
         SCREENS.SETTINGS.PROFILE.STATUS,
         SCREENS.SETTINGS.PROFILE.PRONOUNS,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 96c19f3e1504..88ddc3b4c162 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -519,6 +519,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             path: ROUTES.SETTINGS_VACATION_DELEGATE,
                             exact: true,
                         },
+                        [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT]: {
+                            path: ROUTES.SETTINGS_VACATION_DELEGATE_SELECT,
+                            exact: true,
+                        },
                         [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_MISSING_WORKSPACES]: {
                             path: ROUTES.SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES,
                             exact: true,
@@ -1555,6 +1559,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.DOMAIN.VACATION_DELEGATE]: {
                             path: ROUTES.DOMAIN_VACATION_DELEGATE.route,
                         },
+                        [SCREENS.DOMAIN.VACATION_DELEGATE_SELECT]: {
+                            path: ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.route,
+                        },
                         [SCREENS.DOMAIN.ADD_MEMBER]: {
                             path: ROUTES.DOMAIN_ADD_MEMBER.route,
                         },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 201be0b09617..f38d3ce23f85 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -341,6 +341,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: undefined;
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: undefined;
     [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE]: undefined;
+    [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT]: undefined;
     [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_MISSING_WORKSPACES]: undefined;
     [SCREENS.WORKSPACE.CURRENCY]: {
         isForcedToChangeCurrency?: boolean;
@@ -2104,6 +2105,10 @@ type SettingsNavigatorParamList = {
         domainAccountID: number;
         accountID: number;
     };
+    [SCREENS.DOMAIN.VACATION_DELEGATE_SELECT]: {
+        domainAccountID: number;
+        accountID: number;
+    };
     [SCREENS.DOMAIN.MEMBER_FORCE_TWO_FACTOR_AUTH]: {
         domainAccountID: number;
         accountID: number;
diff --git a/src/libs/VacationDelegateUtils.ts b/src/libs/VacationDelegateUtils.ts
new file mode 100644
index 000000000000..cef40ef540d6
--- /dev/null
+++ b/src/libs/VacationDelegateUtils.ts
@@ -0,0 +1,54 @@
+import CONST from '@src/CONST';
+import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
+
+import type {Locale as DateFnsLocale} from 'date-fns';
+
+import {format, isValid, parse} from 'date-fns';
+
+import DateUtils from './DateUtils';
+
+/**
+ * Converts the date picked for the vacation delegate to clear on (yyyy-MM-dd) into the UTC datetime the backend expects.
+ * The delegate stays active for the whole picked day, so this is the end of that day in the given timezone.
+ */
+function getVacationDelegateClearAfter(clearDate: string | undefined, timezone: SelectedTimezone | undefined): string | undefined {
+    if (!clearDate) {
+        return undefined;
+    }
+
+    return DateUtils.normalizeDateToEndOfDay(clearDate, timezone ?? CONST.DEFAULT_TIME_ZONE.selected);
+}
+
+/**
+ * Converts the UTC datetime the vacation delegate clears after back into the day (yyyy-MM-dd) it clears on in the given timezone.
+ */
+function getVacationDelegateClearDate(clearAfter: string | undefined, timezone: SelectedTimezone | undefined): string {
+    if (!clearAfter) {
+        return '';
+    }
+
+    return DateUtils.formatUTCDateTimeToDateInTimezone(clearAfter, timezone ?? CONST.DEFAULT_TIME_ZONE.selected);
+}
+
+/**
+ * Formats a clear date (yyyy-MM-dd) for display, e.g. "Oct 1, 2026".
+ */
+function formatVacationDelegateClearDate(clearDate: string, dateFnsLocale: DateFnsLocale | undefined): string {
+    const date = parse(clearDate, CONST.DATE.FNS_FORMAT_STRING, new Date());
+    if (!isValid(date)) {
+        return '';
+    }
+
+    return format(date, CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT, {locale: dateFnsLocale});
+}
+
+/**
+ * Whether the vacation delegate's clearAfter datetime has passed. The backend clears the delegate at that time, so this only covers
+ * the gap before its update reaches the client.
+ */
+function isVacationDelegateExpired(clearAfter: string | undefined): boolean {
+    // Both values are UTC in the database format, so they compare as strings.
+    return !!clearAfter && clearAfter <= DateUtils.getDBTime();
+}
+
+export {getVacationDelegateClearAfter, getVacationDelegateClearDate, formatVacationDelegateClearDate, isVacationDelegateExpired};
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index d950eb15f721..f0fc6f31b7c5 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1660,7 +1660,18 @@ function clearValidateDomainTwoFactorCodeError() {
     Onyx.set(ONYXKEYS.VALIDATE_DOMAIN_TWO_FACTOR_CODE, null);
 }
 
-function setDomainVacationDelegate(domainAccountID: number, domainMemberAccountID: number, creator: string, vacationer: string, delegate: string, vacationDelegate?: BaseVacationDelegate) {
+/**
+ * @param clearAfter - UTC datetime (yyyy-MM-dd HH:mm:ss) when the backend should clear the delegate. No value means it never clears.
+ */
+function setDomainVacationDelegate(
+    domainAccountID: number,
+    domainMemberAccountID: number,
+    creator: string,
+    vacationer: string,
+    delegate: string,
+    vacationDelegate?: BaseVacationDelegate,
+    clearAfter?: string,
+) {
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1669,9 +1680,11 @@ function setDomainVacationDelegate(domainAccountID: number, domainMemberAccountI
                 [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: {
                     delegate,
                     creator,
+                    clearAfter: clearAfter ?? null,
                     previousDelegate: vacationDelegate?.delegate,
+                    previousClearAfter: vacationDelegate?.clearAfter ?? null,
                 },
-            } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, BaseVacationDelegate>,
+            } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>,
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1704,6 +1717,7 @@ function setDomainVacationDelegate(domainAccountID: number, domainMemberAccountI
             value: {
                 [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: {
                     previousDelegate: null,
+                    previousClearAfter: null,
                 },
             } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>,
         },
@@ -1760,6 +1774,7 @@ function setDomainVacationDelegate(domainAccountID: number, domainMemberAccountI
         creator,
         vacationerEmail: vacationer,
         vacationDelegateEmail: delegate,
+        clearAfter,
         overridePolicyDiffWarning: true,
         domainAccountID,
     };
@@ -1776,7 +1791,9 @@ function deleteDomainVacationDelegate(domainAccountID: number, domainMemberAccou
                 [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: {
                     creator: null,
                     delegate: null,
+                    clearAfter: null,
                     previousDelegate: vacationDelegate?.delegate,
+                    previousClearAfter: vacationDelegate?.clearAfter ?? null,
                 },
             } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>,
         },
@@ -1864,10 +1881,11 @@ function deleteDomainVacationDelegate(domainAccountID: number, domainMemberAccou
     API.write(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, {vacationerEmail: vacationer, domainAccountID}, {optimisticData, successData, failureData});
 }
 
-function clearVacationDelegateError(domainAccountID: number, domainMemberAccountID: number, domainMemberEmail: string, previousDelegate?: string) {
+function clearVacationDelegateError(domainAccountID: number, domainMemberAccountID: number, domainMemberEmail: string, previousDelegate?: string, previousClearAfter?: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: {
             delegate: previousDelegate ?? null,
+            clearAfter: previousClearAfter ?? null,
         },
     } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>);
 
diff --git a/src/libs/actions/VacationDelegate.ts b/src/libs/actions/VacationDelegate.ts
index fb2247b32693..cb2c8eb38727 100644
--- a/src/libs/actions/VacationDelegate.ts
+++ b/src/libs/actions/VacationDelegate.ts
@@ -27,11 +27,15 @@ import {addMembersToWorkspace} from './Policy/Member';
 type SetVacationDelegateOptions = {
     creator: string;
     delegate: string;
+
+    /** UTC datetime (yyyy-MM-dd HH:mm:ss) when the backend should clear the delegate. No value means it never clears. */
+    clearAfter?: string;
     currentDelegate?: string;
+    currentClearAfter?: string;
     shouldOverridePolicyDiffWarning?: boolean;
 };
 
-async function setVacationDelegate({creator, delegate, currentDelegate, shouldOverridePolicyDiffWarning = false}: SetVacationDelegateOptions) {
+async function setVacationDelegate({creator, delegate, clearAfter, currentDelegate, currentClearAfter, shouldOverridePolicyDiffWarning = false}: SetVacationDelegateOptions) {
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -39,11 +43,14 @@ async function setVacationDelegate({creator, delegate, currentDelegate, shouldOv
             value: {
                 creator,
                 delegate,
+                clearAfter: clearAfter ?? null,
                 errors: null,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 previousDelegate: currentDelegate ?? null,
+                previousClearAfter: currentClearAfter ?? null,
                 policyDiff: null,
                 pendingDelegate: null,
+                pendingClearAfter: null,
             },
         },
     ];
@@ -56,8 +63,10 @@ async function setVacationDelegate({creator, delegate, currentDelegate, shouldOv
                 errors: null,
                 pendingAction: null,
                 previousDelegate: null,
+                previousClearAfter: null,
                 policyDiff: null,
                 pendingDelegate: null,
+                pendingClearAfter: null,
             },
         },
     ];
@@ -76,6 +85,7 @@ async function setVacationDelegate({creator, delegate, currentDelegate, shouldOv
     const parameters: SetVacationDelegateParams = {
         creator,
         vacationDelegateEmail: delegate,
+        clearAfter,
         overridePolicyDiffWarning: shouldOverridePolicyDiffWarning,
     };
 
@@ -106,7 +116,9 @@ async function setVacationDelegate({creator, delegate, currentDelegate, shouldOv
         Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
             errors: null,
             delegate: currentDelegate ?? null,
+            clearAfter: currentClearAfter ?? null,
             pendingDelegate: delegate,
+            pendingClearAfter: clearAfter ?? null,
             policyDiff: response.data.policyDiff,
             pendingAction: null,
         });
@@ -122,7 +134,7 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
         return;
     }
 
-    const {creator, delegate} = vacationDelegate;
+    const {creator, delegate, clearAfter} = vacationDelegate;
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -130,11 +142,14 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
             value: {
                 creator: null,
                 delegate: null,
+                clearAfter: null,
                 errors: null,
                 previousDelegate: vacationDelegate?.delegate,
+                previousClearAfter: clearAfter ?? null,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 policyDiff: null,
                 pendingDelegate: null,
+                pendingClearAfter: null,
             },
         },
     ];
@@ -147,6 +162,7 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
                 errors: null,
                 pendingAction: null,
                 previousDelegate: null,
+                previousClearAfter: null,
             },
         },
     ];
@@ -158,6 +174,7 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
             value: {
                 creator,
                 delegate,
+                clearAfter,
                 errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('statusPage.vacationDelegateError'),
                 pendingAction: null,
             },
@@ -167,14 +184,17 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
     API.write(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, null, {optimisticData, successData, failureData});
 }
 
-function clearVacationDelegateError(previousDelegate?: string) {
+function clearVacationDelegateError(previousDelegate?: string, previousClearAfter?: string) {
     Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
         errors: null,
         pendingAction: null,
         delegate: previousDelegate ?? null,
+        clearAfter: previousClearAfter ?? null,
         previousDelegate: null,
+        previousClearAfter: null,
         policyDiff: null,
         pendingDelegate: null,
+        pendingClearAfter: null,
     });
 }
 
diff --git a/src/pages/domain/Members/DomainMemberDetailsPage.tsx b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
index e2b202899662..86bb9fbe1368 100644
--- a/src/pages/domain/Members/DomainMemberDetailsPage.tsx
+++ b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
@@ -21,8 +21,10 @@ import {
     closeUserAccount,
     setTwoFactorAuthExemptEmailForDomain,
 } from '@libs/actions/Domain';
+import {clearDraftValues} from '@libs/actions/FormActions';
 import {requestUnlockAccount} from '@libs/actions/User';
 import {getLatestError} from '@libs/ErrorUtils';
+import {isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -168,10 +170,18 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
                 </OfflineWithFeedback>
                 <VacationDelegateMenuItem
                     vacationDelegate={vacationDelegate}
-                    onPress={() => Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID))}
+                    onPress={() => {
+                        clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+                        // With no delegate there is nothing to show on the form yet, so go straight to picking one.
+                        Navigation.navigate(
+                            vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate.clearAfter)
+                                ? ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID)
+                                : ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID),
+                        );
+                    }}
                     pendingAction={domainPendingActions?.member?.[memberLogin]?.vacationDelegate}
                     errors={getLatestError(domainErrors?.memberErrors?.[memberLogin]?.vacationDelegateErrors)}
-                    onCloseError={() => clearVacationDelegateError(domainAccountID, accountID, memberLogin, vacationDelegate?.previousDelegate)}
+                    onCloseError={() => clearVacationDelegateError(domainAccountID, accountID, memberLogin, vacationDelegate?.previousDelegate, vacationDelegate?.previousClearAfter)}
                 />
                 {!!domainSettings?.twoFactorAuthRequired && (
                     <ToggleSettingOptionRow
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
new file mode 100644
index 000000000000..d623fe2a3398
--- /dev/null
+++ b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
@@ -0,0 +1,87 @@
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import VacationDelegateForm from '@components/VacationDelegateForm';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
+
+import {clearDraftValues} from '@libs/actions/FormActions';
+import Navigation from '@libs/Navigation/Navigation';
+
+import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+
+import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+
+import {deleteDomainVacationDelegate, setDomainVacationDelegate} from '@userActions/Domain';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+import {vacationDelegateSelector} from '@selectors/Domain';
+import React from 'react';
+
+type DomainMemberVacationDelegateFormPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
+
+function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDelegateFormPageProps) {
+    const {domainAccountID, accountID} = route.params;
+    const {translate} = useLocalize();
+
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+
+    const [vacationDelegate] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
+        selector: vacationDelegateSelector(accountID),
+    });
+
+    const [personalDetails] = usePersonalDetail(accountID);
+    const memberLogin = personalDetails?.login;
+
+    const goBackToMemberDetails = () => {
+        clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+        Navigation.goBack(ROUTES.DOMAIN_MEMBER_DETAILS.getRoute(domainAccountID, accountID));
+    };
+
+    const onSubmit = (delegate: string, clearAfter: string | undefined) => {
+        if (!memberLogin) {
+            return;
+        }
+
+        setDomainVacationDelegate(domainAccountID, accountID, currentUserLogin ?? '', memberLogin, delegate, vacationDelegate, clearAfter);
+        goBackToMemberDetails();
+    };
+
+    const onRemove = () => {
+        if (!memberLogin || !vacationDelegate) {
+            return;
+        }
+
+        deleteDomainVacationDelegate(domainAccountID, accountID, memberLogin, vacationDelegate);
+        goBackToMemberDetails();
+    };
+
+    return (
+        <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom
+                testID="DomainMemberVacationDelegateFormPage"
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('common.vacationDelegate')}
+                    onBackButtonPress={goBackToMemberDetails}
+                />
+                <VacationDelegateForm
+                    vacationDelegate={vacationDelegate}
+                    onChangeDelegate={() => Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID))}
+                    onSubmit={onSubmit}
+                    onRemove={onRemove}
+                />
+            </ScreenWrapper>
+        </DomainNotFoundPageWrapper>
+    );
+}
+
+export default DomainMemberVacationDelegateFormPage;
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
index 704f53ecac29..ea70afb247f7 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
@@ -1,10 +1,10 @@
 import BaseVacationDelegateSelectionComponent from '@components/BaseVacationDelegateSelectionComponent';
 import ScreenWrapper from '@components/ScreenWrapper';
 
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 
+import {setDraftValues} from '@libs/actions/FormActions';
 import Navigation from '@libs/Navigation/Navigation';
 
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -12,28 +12,31 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
 
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 
-import {deleteDomainVacationDelegate, setDomainVacationDelegate} from '@userActions/Domain';
-
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import type {VacationDelegateForm} from '@src/types/form';
+import INPUT_IDS from '@src/types/form/VacationDelegateForm';
 import type {Participant} from '@src/types/onyx/IOU';
 
+import type {OnyxEntry} from 'react-native-onyx';
+
 import {vacationDelegateSelector} from '@selectors/Domain';
 import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
-type DomainMemberVacationDelegatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
+type DomainMemberVacationDelegatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE_SELECT>;
+
+const draftDelegateSelector = (draft: OnyxEntry<VacationDelegateForm>) => draft?.[INPUT_IDS.DELEGATE];
 
 function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegatePageProps) {
     const {domainAccountID, accountID} = route.params;
     const {translate} = useLocalize();
 
-    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
-
     const [vacationDelegate] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: vacationDelegateSelector(accountID),
     });
+    const [draftDelegate] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {selector: draftDelegateSelector});
 
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
         selector: personalDetailsSelector(accountID),
@@ -47,14 +50,9 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
             return;
         }
 
-        if (delegateLogin === vacationDelegate?.delegate) {
-            deleteDomainVacationDelegate(domainAccountID, accountID, memberLogin, vacationDelegate);
-            Navigation.goBack(ROUTES.DOMAIN_MEMBER_DETAILS.getRoute(domainAccountID, accountID));
-            return;
-        }
-
-        setDomainVacationDelegate(domainAccountID, accountID, currentUserLogin ?? '', memberLogin, delegateLogin, vacationDelegate);
-        Navigation.goBack(ROUTES.DOMAIN_MEMBER_DETAILS.getRoute(domainAccountID, accountID));
+        // The pick is only saved from the form, where the clear after date is chosen too.
+        setDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM, {[INPUT_IDS.DELEGATE]: delegateLogin});
+        Navigation.goBack(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID));
     };
 
     return (
@@ -64,10 +62,10 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
                 testID="DomainMemberVacationDelegate"
             >
                 <BaseVacationDelegateSelectionComponent
-                    vacationDelegate={vacationDelegate}
+                    vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
                     headerTitle={translate('common.vacationDelegate')}
                     onSelectRow={onSelectRow}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.DOMAIN_MEMBER_DETAILS.getRoute(domainAccountID, accountID))}
+                    onBackButtonPress={() => Navigation.goBack()}
                     cannotSetDelegateMessage={translate('domain.members.cannotSetVacationDelegateForMember', memberLogin ?? '')}
                     additionalExcludeLogins={memberLogin ? {[memberLogin]: true} : undefined}
                 />
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
index 813c0630b014..4f4d4fe7d58e 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
@@ -1,5 +1,4 @@
 import Button from '@components/Button';
-import DelegatorList from '@components/DelegatorList';
 import EmojiPickerButtonDropdown from '@components/EmojiPicker/EmojiPickerButtonDropdown';
 import FixedFooter from '@components/FixedFooter';
 import FormProvider from '@components/Form/FormProvider';
@@ -11,7 +10,6 @@ import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
-import VacationDelegateMenuItem from '@components/VacationDelegateMenuItem';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -27,11 +25,9 @@ import {isMobileChrome} from '@libs/Browser';
 import DateUtils from '@libs/DateUtils';
 import focusAfterModalClose from '@libs/focusAfterModalClose';
 import focusComposerWithDelay from '@libs/focusComposerWithDelay';
-import getVacationDelegateErrors from '@libs/getVacationDelegateErrors';
 import Navigation from '@libs/Navigation/Navigation';
 
 import {clearCustomStatus, clearDraftCustomStatus, updateCustomStatus, updateDraftCustomStatus} from '@userActions/User';
-import {clearVacationDelegateError} from '@userActions/VacationDelegate';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -66,8 +62,6 @@ function StatusPage() {
     const formRef = useRef<FormRef>(null);
     const [brickRoadIndicator, setBrickRoadIndicator] = useState<ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>>();
 
-    const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-    const hasActiveDelegations = !!vacationDelegate?.delegatorFor?.length;
     const isFormLoading = !!formState?.isLoading;
 
     const currentUserEmojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';
@@ -244,27 +238,6 @@ function StatusPage() {
                         />
                     )}
                 </View>
-                <View style={[styles.mb2, styles.mt6]}>
-                    <Text style={[styles.headerText, styles.mh5, styles.mb2]}>{translate('common.vacationDelegate')}</Text>
-                    {hasActiveDelegations ? (
-                        <DelegatorList
-                            delegators={vacationDelegate?.delegatorFor}
-                            message={translate('statusPage.cannotSetVacationDelegate')}
-                        />
-                    ) : (
-                        <>
-                            <Text style={[styles.mh5, styles.mb1]}>{translate('statusPage.setVacationDelegate')}</Text>
-                            <VacationDelegateMenuItem
-                                vacationDelegate={vacationDelegate}
-                                errors={getVacationDelegateErrors(vacationDelegate)}
-                                pendingAction={vacationDelegate?.pendingAction}
-                                onCloseError={() => clearVacationDelegateError(vacationDelegate?.previousDelegate)}
-                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE)}
-                            />
-                        </>
-                    )}
-                </View>
-
                 {isInLandscapeMode && saveButton}
             </FormProvider>
 
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
new file mode 100644
index 000000000000..a5a752e52aaa
--- /dev/null
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
@@ -0,0 +1,123 @@
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import VacationDelegateForm from '@components/VacationDelegateForm';
+
+import useConfirmModal from '@hooks/useConfirmModal';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+
+import {clearDraftValues} from '@libs/actions/FormActions';
+import {clearVacationDelegateError, deleteVacationDelegate, setVacationDelegate} from '@libs/actions/VacationDelegate';
+import getVacationDelegateErrors from '@libs/getVacationDelegateErrors';
+import Navigation from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import {useNavigation} from '@react-navigation/native';
+import React, {useRef} from 'react';
+
+function goBackToProfile() {
+    clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+    Navigation.goBack(ROUTES.SETTINGS_PROFILE.route);
+}
+
+function VacationDelegateFormPage() {
+    const {translate} = useLocalize();
+    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
+    const {showConfirmModal} = useConfirmModal();
+    const navigation = useNavigation();
+
+    const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+
+    const isSubmittingRef = useRef(false);
+
+    const showErrorModal = async (delegateToRestore?: string, clearAfterToRestore?: string, message?: string) => {
+        await showConfirmModal({
+            title: translate('statusPage.addVacationDelegate'),
+            prompt: message ?? translate('statusPage.vacationDelegateError'),
+            confirmText: translate('common.buttonConfirm'),
+            shouldShowCancelButton: false,
+        });
+
+        clearVacationDelegateError(delegateToRestore, clearAfterToRestore);
+    };
+
+    const onSubmit = (delegate: string, clearAfter: string | undefined) => {
+        if (isSubmittingRef.current) {
+            return;
+        }
+
+        isSubmittingRef.current = true;
+        const hasUnconfirmedChange = !!vacationDelegate?.pendingAction || !isEmptyObject(vacationDelegate?.errors) || !!vacationDelegate?.policyDiff;
+        const currentDelegate = hasUnconfirmedChange ? vacationDelegate?.previousDelegate : vacationDelegate?.delegate;
+        const currentClearAfter = hasUnconfirmedChange ? vacationDelegate?.previousClearAfter : vacationDelegate?.clearAfter;
+        setVacationDelegate({creator: currentUserLogin, delegate, clearAfter, currentDelegate, currentClearAfter})
+            .then((response) => {
+                if (!navigation.isFocused()) {
+                    if (response?.data?.policyDiff) {
+                        clearVacationDelegateError(currentDelegate, currentClearAfter);
+                    }
+                    return;
+                }
+
+                if (response?.data?.policyDiff) {
+                    Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES);
+                    return;
+                }
+
+                // The action leaves the failure on the NVP for the profile page's red brick road, but the user is still on this screen,
+                // so report it where they are. Dismissing the modal restores the previous delegate, exactly as dismissing that error would.
+                if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                    showErrorModal(currentDelegate, currentClearAfter, response?.jsonCode === CONST.JSON_CODE.EXP_ERROR ? response.message : undefined);
+                    return;
+                }
+
+                goBackToProfile();
+            })
+            .catch(() => {
+                if (!navigation.isFocused()) {
+                    clearVacationDelegateError(currentDelegate, currentClearAfter);
+                    return;
+                }
+
+                showErrorModal(currentDelegate, currentClearAfter);
+            })
+            .finally(() => {
+                isSubmittingRef.current = false;
+            });
+    };
+
+    const onRemove = () => {
+        deleteVacationDelegate(vacationDelegate);
+        goBackToProfile();
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom
+            testID="VacationDelegateFormPage"
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.vacationDelegate')}
+                onBackButtonPress={goBackToProfile}
+            />
+            <VacationDelegateForm
+                vacationDelegate={vacationDelegate}
+                description={translate('statusPage.setVacationDelegate')}
+                onChangeDelegate={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT)}
+                onSubmit={onSubmit}
+                onRemove={onRemove}
+                errors={getVacationDelegateErrors(vacationDelegate)}
+                pendingAction={vacationDelegate?.pendingAction}
+                onCloseError={() => clearVacationDelegateError(vacationDelegate?.previousDelegate, vacationDelegate?.previousClearAfter)}
+            />
+        </ScreenWrapper>
+    );
+}
+
+export default VacationDelegateFormPage;
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
index 9668e61dab40..5cf1fdefe535 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {clearDraftValues} from '@libs/actions/FormActions';
 import {openWorkspaceMembersPage} from '@libs/actions/Policy/Member';
 import {clearVacationDelegateError, inviteVacationDelegateToWorkspaces, setVacationDelegate} from '@libs/actions/VacationDelegate';
 import Navigation from '@libs/Navigation/Navigation';
@@ -37,6 +38,7 @@ import WorkspaceSection from './WorkspaceSection';
 
 type ScreenInput = {
     delegate: string;
+    clearAfter?: string;
     policyDiff: VacationDelegatePolicyDiff;
 };
 
@@ -52,7 +54,9 @@ function VacationDelegateMissingWorkspacesPage() {
 
     const creator = currentUserPersonalDetails.login ?? '';
     const delegate = submittedInput?.delegate ?? vacationDelegate?.pendingDelegate ?? '';
+    const clearAfter = submittedInput ? submittedInput.clearAfter : vacationDelegate?.pendingClearAfter;
     const previousDelegate = vacationDelegate?.previousDelegate;
+    const previousClearAfter = vacationDelegate?.previousClearAfter;
     const policyDiff = submittedInput?.policyDiff ?? vacationDelegate?.policyDiff;
     const adminPolicies = policyDiff?.adminPolicies ?? [];
     const nonAdminPolicies = policyDiff?.nonAdminPolicies ?? [];
@@ -89,8 +93,8 @@ function VacationDelegateMissingWorkspacesPage() {
 
     usePreventRemove(!!policyDiff, ({data}: {data: {action: NavigationAction}}) => {
         if (!isSubmittingRef.current && policyDiff) {
-            setSubmittedInput({delegate, policyDiff});
-            clearVacationDelegateError(previousDelegate);
+            setSubmittedInput({delegate, clearAfter, policyDiff});
+            clearVacationDelegateError(previousDelegate, previousClearAfter);
         }
 
         navigation.dispatch(data.action);
@@ -126,9 +130,10 @@ function VacationDelegateMissingWorkspacesPage() {
             });
         }
 
-        setSubmittedInput({delegate, policyDiff});
-        setVacationDelegate({creator, delegate, currentDelegate: previousDelegate, shouldOverridePolicyDiffWarning: true});
-        Navigation.goBack(ROUTES.SETTINGS_STATUS);
+        setSubmittedInput({delegate, clearAfter, policyDiff});
+        setVacationDelegate({creator, delegate, clearAfter, currentDelegate: previousDelegate, currentClearAfter: previousClearAfter, shouldOverridePolicyDiffWarning: true});
+        clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+        Navigation.goBack(ROUTES.SETTINGS_PROFILE.route);
     };
 
     return (
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
index d87256cec670..07260bb0542c 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
@@ -1,92 +1,38 @@
 import BaseVacationDelegateSelectionComponent from '@components/BaseVacationDelegateSelectionComponent';
 import ScreenWrapper from '@components/ScreenWrapper';
 
-import useConfirmModal from '@hooks/useConfirmModal';
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 
-import {clearVacationDelegateError, deleteVacationDelegate, setVacationDelegate} from '@libs/actions/VacationDelegate';
+import {setDraftValues} from '@libs/actions/FormActions';
 import Navigation from '@libs/Navigation/Navigation';
 
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {VacationDelegateForm} from '@src/types/form';
+import INPUT_IDS from '@src/types/form/VacationDelegateForm';
 import type {Participant} from '@src/types/onyx/IOU';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import {useNavigation} from '@react-navigation/native';
-import React, {useRef} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+
+import React from 'react';
+
+const draftDelegateSelector = (draft: OnyxEntry<VacationDelegateForm>) => draft?.[INPUT_IDS.DELEGATE];
 
 function VacationDelegatePage() {
     const {translate} = useLocalize();
-    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
-    const {showConfirmModal} = useConfirmModal();
-    const navigation = useNavigation();
 
     const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-
-    const isSelectingRef = useRef(false);
-
-    const showErrorModal = async (delegateToRestore?: string, message?: string) => {
-        await showConfirmModal({
-            title: translate('statusPage.addVacationDelegate'),
-            prompt: message ?? translate('statusPage.vacationDelegateError'),
-            confirmText: translate('common.buttonConfirm'),
-            shouldShowCancelButton: false,
-        });
-
-        clearVacationDelegateError(delegateToRestore);
-    };
+    const [draftDelegate] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {selector: draftDelegateSelector});
 
     const onSelectRow = (option: Participant) => {
-        if (isSelectingRef.current) {
+        if (!option?.login) {
             return;
         }
 
-        if (option?.login === vacationDelegate?.delegate) {
-            deleteVacationDelegate(vacationDelegate);
-            Navigation.goBack(ROUTES.SETTINGS_STATUS);
-            return;
-        }
-
-        isSelectingRef.current = true;
-        const hasUnconfirmedChange = !!vacationDelegate?.pendingAction || !isEmptyObject(vacationDelegate?.errors) || !!vacationDelegate?.policyDiff;
-        const currentDelegate = hasUnconfirmedChange ? vacationDelegate?.previousDelegate : vacationDelegate?.delegate;
-        setVacationDelegate({creator: currentUserLogin, delegate: option?.login ?? '', currentDelegate})
-            .then((response) => {
-                if (!navigation.isFocused()) {
-                    if (response?.data?.policyDiff) {
-                        clearVacationDelegateError(currentDelegate);
-                    }
-                    return;
-                }
-
-                if (response?.data?.policyDiff) {
-                    Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES);
-                    return;
-                }
-
-                // The action leaves the failure on the NVP for the profile page's red brick road, but the user is still on this screen,
-                // so report it where they are. Dismissing the modal restores the previous delegate, exactly as dismissing that error would.
-                if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                    showErrorModal(currentDelegate, response?.jsonCode === CONST.JSON_CODE.EXP_ERROR ? response.message : undefined);
-                    return;
-                }
-
-                Navigation.goBack(ROUTES.SETTINGS_STATUS);
-            })
-            .catch(() => {
-                if (!navigation.isFocused()) {
-                    clearVacationDelegateError(currentDelegate);
-                    return;
-                }
-
-                showErrorModal(currentDelegate);
-            })
-            .finally(() => {
-                isSelectingRef.current = false;
-            });
+        // The pick is only saved from the form, where the clear after date is chosen too.
+        setDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM, {[INPUT_IDS.DELEGATE]: option.login});
+        Navigation.goBack(ROUTES.SETTINGS_VACATION_DELEGATE);
     };
 
     return (
@@ -96,10 +42,10 @@ function VacationDelegatePage() {
             shouldShowOfflineIndicator={false}
         >
             <BaseVacationDelegateSelectionComponent
-                vacationDelegate={vacationDelegate}
+                vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
                 onSelectRow={onSelectRow}
                 headerTitle={translate('common.vacationDelegate')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_STATUS)}
+                onBackButtonPress={() => Navigation.goBack()}
                 cannotSetDelegateMessage={translate('statusPage.cannotSetVacationDelegate')}
                 includeCurrentUser={false}
             />
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index fbe2ff443f38..a8b3e03db4d3 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -29,7 +29,10 @@ import useScrollEnabled from '@hooks/useScrollEnabled';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useVacationDelegatePersonalDetails from '@hooks/useVacationDelegatePersonalDetails';
 
+import {clearDraftValues} from '@libs/actions/FormActions';
+import getVacationDelegateDisplayName from '@libs/getVacationDelegateDisplayName';
 import getVacationDelegateErrors from '@libs/getVacationDelegateErrors';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -37,6 +40,7 @@ import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigat
 import type {SettingsSplitNavigatorParamList} from '@libs/Navigation/types';
 import {getFormattedAddress, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import {expensifyLoginsSelector, getContactMethodsOptions, getLoginListBrickRoadIndicator} from '@libs/UserUtils';
+import {formatVacationDelegateClearDate, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
 import useTimeSensitiveHomeAddress from '@pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress';
 
@@ -67,7 +71,7 @@ function ProfilePage() {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {translate, formatPhoneNumber} = useLocalize();
+    const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {safeAreaPaddingBottomStyle} = useSafeAreaPaddings();
     const scrollEnabled = useScrollEnabled();
@@ -99,12 +103,21 @@ function ProfilePage() {
     const [commuterExclusionsWorkspaceName] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: homeAndOfficeCommuterExclusionPolicyNameSelector});
 
     const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+    const hasVacationDelegate = !!vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate?.clearAfter);
+    const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(hasVacationDelegate ? vacationDelegate?.delegate : undefined);
+    const vacationDelegateName = hasVacationDelegate
+        ? getVacationDelegateDisplayName(vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '', vacationDelegatePersonalDetails?.displayName, formatPhoneNumber)
+        : '';
+    const vacationDelegateClearDate = hasVacationDelegate
+        ? formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
+        : '';
     const {isActingAsDelegate} = useDelegateNoAccessState();
     const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
     const publicOptions: Array<{
         description: string;
         title: string;
         pageRoute?: Route;
+        onPress?: () => void;
         brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
         testID?: string;
         sentryLabel?: string;
@@ -131,10 +144,22 @@ function ProfilePage() {
             description: translate('statusPage.status'),
             title: emojiCode ? `${emojiCode} ${currentUserPersonalDetails?.status?.text ?? ''}` : '',
             pageRoute: ROUTES.SETTINGS_STATUS,
-            brickRoadIndicator: isEmptyObject(getVacationDelegateErrors(vacationDelegate)) ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
             testID: 'status-menu-item',
             sentryLabel: CONST.SENTRY_LABEL.SETTINGS_PROFILE.STATUS,
         },
+        {
+            description: translate('common.vacationDelegate'),
+            title: vacationDelegateClearDate ? `${vacationDelegateName} · ${translate('statusPage.vacationDelegate.until', vacationDelegateClearDate)}` : vacationDelegateName,
+            // With no delegate there is nothing to show on the form yet, so go straight to picking one.
+            pageRoute: hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT,
+            onPress: () => {
+                clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+                Navigation.navigate(hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
+            },
+            brickRoadIndicator: isEmptyObject(getVacationDelegateErrors(vacationDelegate)) ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
+            testID: 'vacation-delegate-menu-item',
+            sentryLabel: CONST.SENTRY_LABEL.SETTINGS_PROFILE.VACATION_DELEGATE,
+        },
         ...(isAgentAccount === false
             ? [
                   {
@@ -279,7 +304,7 @@ function ProfilePage() {
                                 return (
                                     <MenuItemSectionRoot
                                         key={detail.testID}
-                                        onPress={pageRoute ? () => Navigation.navigate(pageRoute) : undefined}
+                                        onPress={detail.onPress ?? (pageRoute ? () => Navigation.navigate(pageRoute) : undefined)}
                                         testID={detail?.testID}
                                         sentryLabel={detail.sentryLabel}
                                     >
diff --git a/src/types/form/VacationDelegateForm.ts b/src/types/form/VacationDelegateForm.ts
new file mode 100644
index 000000000000..3c6bb6b2906a
--- /dev/null
+++ b/src/types/form/VacationDelegateForm.ts
@@ -0,0 +1,24 @@
+import type {ValueOf} from 'type-fest';
+
+import type Form from './Form';
+
+const INPUT_IDS = {
+    /** Delegate picked on the member selection screen, before it is saved */
+    DELEGATE: 'delegate',
+
+    /** Day (yyyy-MM-dd) the vacation delegate clears on, in the timezone of the person setting it */
+    CLEAR_AFTER_DATE: 'clearAfterDate',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type VacationDelegateForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.DELEGATE]: string;
+        [INPUT_IDS.CLEAR_AFTER_DATE]: string;
+    }
+>;
+
+export type {VacationDelegateForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 47b94b46c3e7..bbacf3aa50b1 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -37,6 +37,7 @@ export type {DebugTransactionViolationForm} from './DebugTransactionViolationFor
 export type {RoomNameForm} from './RoomNameForm';
 export type {SettingsStatusClearDateForm} from './SettingsStatusClearDateForm';
 export type {SettingsStatusSetForm} from './SettingsStatusSetForm';
+export type {VacationDelegateForm} from './VacationDelegateForm';
 export type {WaypointForm} from './WaypointForm';
 export type {WorkspaceInviteMessageForm} from './WorkspaceInviteMessageForm';
 export type {WorkspaceCategoryForm} from './WorkspaceCategoryForm';
diff --git a/src/types/onyx/VacationDelegate.ts b/src/types/onyx/VacationDelegate.ts
index 565181bce169..639c86b37f9c 100644
--- a/src/types/onyx/VacationDelegate.ts
+++ b/src/types/onyx/VacationDelegate.ts
@@ -23,6 +23,12 @@ type BaseVacationDelegate = {
     /** Previous delegate for rollback on failure */
     previousDelegate?: string;
 
+    /** When the backend clears the vacation delegate, as a UTC datetime (yyyy-MM-dd HH:mm:ss). No value means it never clears. */
+    clearAfter?: string;
+
+    /** Previous clearAfter for rollback on failure */
+    previousClearAfter?: string;
+
     /** Workspaces the delegate is missing from, captured from the 305 response. Client-only. */
     policyDiff?: VacationDelegatePolicyDiff;
 
@@ -31,6 +37,9 @@ type BaseVacationDelegate = {
      * Kept apart from `delegate` so an abandoned step never makes an unsaved pick read as saved. Client-only.
      */
     pendingDelegate?: string;
+
+    /** Clear after datetime picked with `pendingDelegate`, so the missing workspaces step can send it again. Client-only. */
+    pendingClearAfter?: string;
 };
 
 /** Information about vacation delegate with offline feedback */
diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index fdb1d6937351..348a44789864 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -761,7 +761,7 @@ describe('actions/Domain', () => {
                     optimisticData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
-                            value: {[PRIVATE_VACATION_DELEGATE_KEY]: {delegate, creator, previousDelegate: undefined}},
+                            value: {[PRIVATE_VACATION_DELEGATE_KEY]: {delegate, creator, clearAfter: null, previousDelegate: undefined, previousClearAfter: null}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
@@ -775,7 +775,7 @@ describe('actions/Domain', () => {
                     successData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
-                            value: {[PRIVATE_VACATION_DELEGATE_KEY]: {previousDelegate: null}},
+                            value: {[PRIVATE_VACATION_DELEGATE_KEY]: {previousDelegate: null, previousClearAfter: null}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -834,6 +834,46 @@ describe('actions/Domain', () => {
         });
     });
 
+    describe('setDomainVacationDelegate with clearAfter', () => {
+        it('sends clearAfter and keeps the old one for rollback', () => {
+            // Given a domain member whose delegate already clears on a date
+            const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
+            const domainAccountID = 123;
+            const domainMemberAccountID = 456;
+            const vacationer = 'vacationer@test.com';
+            const clearAfter = '2026-10-02 06:59:59';
+            const vacationDelegate: BaseVacationDelegate = {delegate: 'old@test.com', creator: 'admin@test.com', clearAfter: '2026-09-30 06:59:59'};
+            const PRIVATE_VACATION_DELEGATE_KEY =
+                `${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}` as const satisfies `${typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${string}`;
+
+            // When the admin saves a new delegate with a new clear after datetime
+            setDomainVacationDelegate(domainAccountID, domainMemberAccountID, 'admin@test.com', vacationer, 'new@test.com', vacationDelegate, clearAfter);
+
+            // Then the backend gets the datetime to clear the delegate at, and the old datetime is kept so dismissing an error can restore it
+            expect(apiWriteSpy).toHaveBeenCalledWith(
+                WRITE_COMMANDS.SET_VACATION_DELEGATE,
+                expect.objectContaining({vacationDelegateEmail: 'new@test.com', clearAfter}),
+                expect.objectContaining({
+                    optimisticData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                            value: {
+                                [PRIVATE_VACATION_DELEGATE_KEY]: expect.objectContaining({
+                                    delegate: 'new@test.com',
+                                    clearAfter,
+                                    previousDelegate: 'old@test.com',
+                                    previousClearAfter: '2026-09-30 06:59:59',
+                                }),
+                            },
+                        }),
+                    ]),
+                }),
+            );
+
+            apiWriteSpy.mockRestore();
+        });
+    });
+
     describe('deleteDomainVacationDelegate', () => {
         it('deleteDomainVacationDelegate - sends DELETE_VACATION_DELEGATE request with correct data', () => {
             const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
@@ -853,7 +893,9 @@ describe('actions/Domain', () => {
                     optimisticData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
-                            value: {[PRIVATE_VACATION_DELEGATE_KEY]: {creator: null, delegate: null, previousDelegate: vacationDelegate.delegate}},
+                            value: {
+                                [PRIVATE_VACATION_DELEGATE_KEY]: {creator: null, delegate: null, clearAfter: null, previousDelegate: vacationDelegate.delegate, previousClearAfter: null},
+                            },
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
diff --git a/tests/actions/VacationDelegateTest.ts b/tests/actions/VacationDelegateTest.ts
index 9fb4c261e0c7..fe5be969f750 100644
--- a/tests/actions/VacationDelegateTest.ts
+++ b/tests/actions/VacationDelegateTest.ts
@@ -215,6 +215,31 @@ describe('actions/VacationDelegate', () => {
             expect(vacationDelegate?.pendingDelegate).toBe('delegate@test.com');
         });
 
+        it('parks the picked clear after datetime next to the pick on a 305 and puts the saved one back', async () => {
+            // Given a saved delegate that clears on one date, and a mocked 305 for a pick that clears on another
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: 'admin@test.com', delegate: 'old@test.com', clearAfter: '2026-09-30 06:59:59'});
+            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => ({
+                jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING,
+                data: {policyDiff: {adminPolicies: ['1'], nonAdminPolicies: []}},
+            }));
+
+            // When the new delegate is picked with its clear after datetime
+            await setVacationDelegate({
+                creator: 'admin@test.com',
+                delegate: 'delegate@test.com',
+                clearAfter: '2026-10-02 06:59:59',
+                currentDelegate: 'old@test.com',
+                currentClearAfter: '2026-09-30 06:59:59',
+            });
+            await waitForBatchedUpdates();
+
+            // Then the saved datetime stays in place, since the backend saved nothing, and the picked one waits with the pick
+            // so the missing workspaces step can send it again
+            const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+            expect(vacationDelegate?.clearAfter).toBe('2026-09-30 06:59:59');
+            expect(vacationDelegate?.pendingClearAfter).toBe('2026-10-02 06:59:59');
+        });
+
         it('applies the failureData it could not attach when the response fails, since the caller may have already navigated away', async () => {
             // Given a mocked non-305 error response, with no failureData attached to the request (see the first test
             // above), so the action has to apply it itself instead of relying on a caller that may no longer be mounted
@@ -351,5 +376,28 @@ describe('actions/VacationDelegate', () => {
             expect(vacationDelegate?.policyDiff).toBeFalsy();
             expect(vacationDelegate?.pendingDelegate).toBeFalsy();
         });
+
+        it('restores the previous clear after datetime along with the previous delegate', async () => {
+            // Given a failed change that replaced both the delegate and the datetime it clears after
+            const timestamp = 123;
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
+                delegate: 'delegate@test.com',
+                clearAfter: '2026-10-02 06:59:59',
+                previousDelegate: 'old@test.com',
+                previousClearAfter: '2026-09-30 06:59:59',
+                pendingClearAfter: '2026-10-02 06:59:59',
+                errors: {[timestamp]: 'Some error'},
+            });
+
+            // When the error is dismissed
+            clearVacationDelegateError('old@test.com', '2026-09-30 06:59:59');
+            await waitForBatchedUpdates();
+
+            // Then the last confirmed datetime is back, so the profile does not show a date the backend never saved
+            const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+            expect(vacationDelegate?.clearAfter).toBe('2026-09-30 06:59:59');
+            expect(vacationDelegate?.previousClearAfter).toBeFalsy();
+            expect(vacationDelegate?.pendingClearAfter).toBeFalsy();
+        });
     });
 });
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index 65c74b67d065..6c0b22138a22 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -325,6 +325,43 @@ describe('ProfilePage - agent account', () => {
         expect(screen.getByText('Private')).toBeDefined();
     });
 
+    it('opens the member picker from the vacation delegate row when no delegate is set', async () => {
+        // Given a user with no vacation delegate
+        await setupUser('user@expensify.com');
+
+        renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the vacation delegate row is pressed
+        // MenuItem only forwards the press to onPress when it receives an event, so pass a minimal one.
+        fireEvent.press(screen.getByTestId('vacation-delegate-menu-item'), {nativeEvent: {}});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the member picker opens directly, since the form has nothing to show until a member is picked
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
+    });
+
+    it('shows the vacation delegate and when it clears, and opens the form from the row', async () => {
+        // Given a user whose vacation delegate clears in the future
+        await setupUser('user@expensify.com');
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: 'user@expensify.com', delegate: 'delegate@expensify.com', clearAfter: '2999-01-02 07:59:59'});
+        });
+
+        renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the row shows the delegate and the end date, so the user can see reports are routed elsewhere
+        expect(screen.getByText(/delegate@expensify\.com · Until/)).toBeDefined();
+
+        // When the row is pressed
+        fireEvent.press(screen.getByTestId('vacation-delegate-menu-item'), {nativeEvent: {}});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the form opens, where the date can be changed or the delegate removed
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE);
+    });
+
     it('shows AI prompt section with prompt text for agent account', async () => {
         const accountID = 123;
         await setupUser('testbot_123@expensify.ai', true);
diff --git a/tests/ui/VacationDelegateFormPageTest.tsx b/tests/ui/VacationDelegateFormPageTest.tsx
new file mode 100644
index 000000000000..d7c454b002c7
--- /dev/null
+++ b/tests/ui/VacationDelegateFormPageTest.tsx
@@ -0,0 +1,386 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+
+import VacationDelegateFormPage from '@pages/settings/Profile/CustomStatus/VacationDelegateFormPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+import type * as ReactNavigation from '@react-navigation/native';
+// eslint-disable-next-line no-restricted-imports -- React Native Pressable/Text are required only to type the actual Jest module export; this does not import them at runtime.
+import type {Pressable as ReactNativePressable, Text as ReactNativeText} from 'react-native';
+
+import {createNavigationContainerRef, NavigationContainer} from '@react-navigation/native';
+import {createStackNavigator} from '@react-navigation/stack';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const CREATOR_ACCOUNT_ID = 1;
+const CREATOR_EMAIL = 'creator@example.com';
+const DELEGATE_A_EMAIL = 'delegateA@example.com';
+const DELEGATE_B_EMAIL = 'delegateB@example.com';
+const ORIGINAL_DELEGATE_EMAIL = 'original@example.com';
+const CLEAR_AFTER = '2026-10-02 06:59:59';
+const ORIGINAL_CLEAR_AFTER = '2026-09-30 06:59:59';
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation: typeof ReactNavigation = jest.requireActual('@react-navigation/native');
+
+    return {
+        ...actualNavigation,
+        useRoute: jest.fn(() => ({params: {}})),
+        usePreventRemove: jest.fn(),
+    };
+});
+
+// The real confirm modal is bridged through the global modal system, which needs Navigation methods this file's
+// lightweight Navigation mock doesn't provide. Stub the hook instead so tests can assert on what VacationDelegateFormPage
+// asks it to show without pulling in that machinery.
+const mockShowConfirmModal = jest.fn();
+jest.mock('@hooks/useConfirmModal', () =>
+    jest.fn(() => ({
+        showConfirmModal: mockShowConfirmModal,
+    })),
+);
+
+// Replaces the real form, with its date picker and member row, with plain pressable buttons so tests can
+// simulate rapid saves on VacationDelegateFormPage's onSubmit without driving the full form UI.
+jest.mock('@components/VacationDelegateForm', () => {
+    const ReactMock = jest.requireActual<typeof React>('react');
+    const {Pressable, Text} = jest.requireActual<{Pressable: typeof ReactNativePressable; Text: typeof ReactNativeText}>('react-native');
+
+    return ({onSubmit, onRemove}: {onSubmit: (delegate: string, clearAfter: string | undefined) => void; onRemove: () => void}) =>
+        ReactMock.createElement(
+            ReactMock.Fragment,
+            null,
+            ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSubmit('delegateA@example.com', undefined)}, ReactMock.createElement(Text, null, 'select-a')),
+            ReactMock.createElement(Pressable, {testID: 'select-delegate-b', onPress: () => onSubmit('delegateB@example.com', undefined)}, ReactMock.createElement(Text, null, 'select-b')),
+            ReactMock.createElement(
+                Pressable,
+                {testID: 'select-delegate-b-with-date', onPress: () => onSubmit('delegateB@example.com', '2026-10-02 06:59:59')},
+                ReactMock.createElement(Text, null, 'select-b-with-date'),
+            ),
+            ReactMock.createElement(Pressable, {testID: 'remove-delegate', onPress: onRemove}, ReactMock.createElement(Text, null, 'remove')),
+        );
+});
+
+function renderPage() {
+    return render(
+        <NavigationContainer>
+            <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider]}>
+                <VacationDelegateFormPage />
+            </ComposeProviders>
+        </NavigationContainer>,
+    );
+}
+
+// A real Stack.Navigator so pushing "Other" genuinely blurs VacationDelegateFormPage's own useNavigation().isFocused(),
+// unlike renderPage() above where the page is the sole, permanently-focused screen.
+type TestParamList = {
+    VacationDelegate: undefined;
+    Other: undefined;
+};
+const Stack = createStackNavigator<TestParamList>();
+const testNavigationRef = createNavigationContainerRef<TestParamList>();
+
+function renderPageWithStack() {
+    return render(
+        <NavigationContainer ref={testNavigationRef}>
+            <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider]}>
+                <Stack.Navigator initialRouteName="VacationDelegate">
+                    <Stack.Screen
+                        name="VacationDelegate"
+                        component={VacationDelegateFormPage}
+                    />
+                    <Stack.Screen
+                        name="Other"
+                        component={() => null}
+                    />
+                </Stack.Navigator>
+            </ComposeProviders>
+        </NavigationContainer>,
+    );
+}
+
+describe('VacationDelegateFormPage', () => {
+    let apiSideEffectSpy: jest.SpyInstance;
+
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        mockShowConfirmModal.mockReset().mockResolvedValue({action: 'CLOSE'});
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.EN);
+        });
+        await TestHelper.signInWithTestUser(CREATOR_ACCOUNT_ID, CREATOR_EMAIL);
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    afterEach(async () => {
+        jest.restoreAllMocks();
+        await act(async () => {
+            await Onyx.clear();
+        });
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('calls setVacationDelegate once for a single selection', async () => {
+        // Given a signed-in creator (see beforeEach) and a side-effect request mocked to succeed, so only what the
+        // page sends and does next is under test
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS}));
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a delegate row is tapped
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then setVacationDelegate is sent exactly once with the mapped params, and the page navigates back to the profile page
+        expect(apiSideEffectSpy).toHaveBeenCalledTimes(1);
+        expect(apiSideEffectSpy).toHaveBeenCalledWith(
+            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({creator: CREATOR_EMAIL, vacationDelegateEmail: DELEGATE_A_EMAIL}),
+            expect.anything(),
+        );
+        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
+    });
+
+    it('sends the clear after datetime and keeps the confirmed one for rollback', async () => {
+        // Given a saved delegate that already clears on a date, and a request that never resolves so the optimistic write stays in place
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: ORIGINAL_DELEGATE_EMAIL, clearAfter: ORIGINAL_CLEAR_AFTER});
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a new delegate is saved with a clear after date
+        fireEvent.press(screen.getByTestId('select-delegate-b-with-date'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the backend gets the datetime to clear the delegate at, and the confirmed datetime is kept so a failure can restore it
+        expect(apiSideEffectSpy).toHaveBeenLastCalledWith(
+            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL, clearAfter: CLEAR_AFTER}),
+            expect.objectContaining({
+                optimisticData: [
+                    expect.objectContaining({
+                        value: expect.objectContaining({
+                            delegate: DELEGATE_B_EMAIL,
+                            clearAfter: CLEAR_AFTER,
+                            previousDelegate: ORIGINAL_DELEGATE_EMAIL,
+                            previousClearAfter: ORIGINAL_CLEAR_AFTER,
+                        }),
+                    }),
+                ],
+            }),
+        );
+    });
+
+    it('removes the saved delegate and goes back to the profile page', async () => {
+        // Given a saved delegate
+        const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
+        jest.mocked(Navigation.goBack).mockClear();
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: ORIGINAL_DELEGATE_EMAIL});
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the remove button is pressed
+        fireEvent.press(screen.getByTestId('remove-delegate'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the delegate is deleted, since removal now lives on the form instead of re-picking the same member
+        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, null, expect.anything());
+        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
+    });
+
+    it('surfaces the EXP_ERROR response message in the error modal and restores the previous delegate on dismissal', async () => {
+        // Given a response carrying a server-provided EXP_ERROR message, since a regression once dropped this message
+        // for the generic copy and this page owns the guarantee that it reaches the user
+        const EXP_ERROR_MESSAGE = 'This delegate has already been assigned as your submitsTo approver.';
+        apiSideEffectSpy = jest
+            .spyOn(require('@libs/API'), 'makeRequestWithSideEffects')
+            .mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.EXP_ERROR, message: EXP_ERROR_MESSAGE}));
+        // jest.mock's factory functions (unlike jest.spyOn) are not reset by jest.restoreAllMocks() in afterEach, so call counts otherwise leak across tests in this file.
+        jest.mocked(Navigation.goBack).mockClear();
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a delegate row is tapped and the request fails
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the server's own message reaches the error modal, the page does not navigate away, and no delegate or error is left behind
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(expect.objectContaining({prompt: EXP_ERROR_MESSAGE}));
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+
+        const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+        expect(vacationDelegate?.delegate).toBeFalsy();
+        expect(vacationDelegate?.errors).toBeFalsy();
+    });
+
+    it('falls back to the generic error copy when the response carries no EXP_ERROR message', async () => {
+        // Given a failure response with no server-provided message, e.g. a non-EXP_ERROR failure or a transport rejection
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.BAD_REQUEST}));
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a delegate row is tapped and the request fails
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the generic translation is used instead of a blank or missing prompt
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(expect.objectContaining({prompt: TestHelper.translateLocal('statusPage.vacationDelegateError')}));
+    });
+
+    it('ignores a second row selection while the first request is still pending', async () => {
+        // Given a request that never resolves, so the first pick stays "in flight" for the duration of the test
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a second row is tapped before the first request settles
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        fireEvent.press(screen.getByTestId('select-delegate-b'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then only the first pick is sent, so a fast double tap cannot fire two overlapping requests
+        expect(apiSideEffectSpy).toHaveBeenCalledTimes(1);
+        expect(apiSideEffectSpy).toHaveBeenCalledWith(
+            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({vacationDelegateEmail: DELEGATE_A_EMAIL}),
+            expect.anything(),
+        );
+    });
+
+    it('rolls back the optimistic delegate instead of leaving a stuck pending row when the request rejects', async () => {
+        // Given a request that rejects outright, simulating a transport failure (e.g. connection dropped after the tap)
+        // rather than a resolved response with a jsonCode
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.reject(new Error('Failed to fetch')));
+        // jest.mock's factory functions (unlike jest.spyOn) are not reset by jest.restoreAllMocks() in afterEach, so call counts otherwise leak across tests in this file.
+        jest.mocked(Navigation.goBack).mockClear();
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a delegate row is tapped and the request rejects
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the optimistic delegate and any error are rolled back instead of left stuck, and the page does not navigate away
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+        const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+        expect(vacationDelegate?.pendingAction).toBeFalsy();
+        expect(vacationDelegate?.delegate).toBeFalsy();
+        expect(vacationDelegate?.errors).toBeFalsy();
+
+        // When the same row is tapped again after the failed request has settled
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the new tap is not ignored as "still pending", since the earlier request already settled
+        expect(apiSideEffectSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it('rolls back to the last confirmed delegate, not to an unconfirmed one, when a previous change is still unresolved', async () => {
+        // Given a request that never resolves, so the optimistic write for the second selection stays in place for the
+        // assertion, and an NVP already left in the state a failed change the user has not dismissed leaves behind: delegateA shown but never saved
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
+                creator: CREATOR_EMAIL,
+                delegate: DELEGATE_A_EMAIL,
+                previousDelegate: ORIGINAL_DELEGATE_EMAIL,
+                errors: getMicroSecondOnyxErrorWithTranslationKey('statusPage.vacationDelegateError'),
+            });
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When a different delegate is picked
+        fireEvent.press(screen.getByTestId('select-delegate-b'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the rollback target is the original confirmed delegate, not the unconfirmed delegateA; the API call is
+        // mocked out, so the optimistic data it was handed is where that target is visible
+        expect(apiSideEffectSpy).toHaveBeenLastCalledWith(
+            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL}),
+            expect.objectContaining({
+                optimisticData: [expect.objectContaining({value: expect.objectContaining({delegate: DELEGATE_B_EMAIL, previousDelegate: ORIGINAL_DELEGATE_EMAIL})})],
+            }),
+        );
+    });
+
+    it('rolls back the optimistic delegate instead of leaving an unconfirmed policy diff behind when the screen loses focus before the response resolves', async () => {
+        // Given a request whose resolution is held open, so the screen can navigate away before it settles
+        let resolveSideEffect: (response: {jsonCode: number; data?: {policyDiff: unknown}}) => void = () => {};
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(
+            () =>
+                new Promise((resolve) => {
+                    resolveSideEffect = resolve;
+                }),
+        );
+        jest.mocked(Navigation.navigate).mockClear();
+
+        renderPageWithStack();
+        await waitForBatchedUpdatesWithAct();
+
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // When the screen loses focus before the request settles, simulating the user swiping the RHP away (or otherwise navigating off this screen)
+        await act(async () => {
+            testNavigationRef.current?.navigate('Other');
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the request then resolves with a 305 policy diff warning
+        await act(async () => {
+            resolveSideEffect({jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff: {adminPolicies: [], nonAdminPolicies: []}}});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the missing-workspaces step is not pushed onto whatever the user navigated to instead, since there's no longer a
+        // screen to carry them into it, and the optimistic delegate/policy diff are rolled back rather than left unconfirmed
+        expect(Navigation.navigate).not.toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES);
+
+        const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+        expect(vacationDelegate?.delegate).toBeFalsy();
+        expect(vacationDelegate?.policyDiff).toBeFalsy();
+        expect(vacationDelegate?.pendingAction).toBeFalsy();
+        expect(vacationDelegate?.errors).toBeFalsy();
+    });
+});
diff --git a/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx b/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
index a7ea242effcf..41600baf6015 100644
--- a/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
+++ b/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
@@ -534,6 +534,30 @@ describe('VacationDelegateMissingWorkspacesPage', () => {
         expect(rows.at(1)).toHaveTextContent('Zebra Workspace');
     });
 
+    it('sends the clear after datetime picked on the form again and returns to the profile page', async () => {
+        // Given a 305 that parked a pick made with a clear after date, since the form step is gone by the time this step saves it
+        const clearAfter = '2026-10-02 06:59:59';
+        await seedVacationDelegate({adminPolicies: [], nonAdminPolicies: [MEMBER_POLICY_ID]});
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {pendingClearAfter: clearAfter});
+        });
+        const goBackSpy = jest.spyOn(Navigation, 'goBack').mockImplementation(() => {});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When Confirm is pressed
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('common.confirm')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the date is saved with the delegate instead of being dropped, and the user lands back on the profile page
+        expect(apiWriteSpy).toHaveBeenCalledWith(
+            WRITE_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({vacationDelegateEmail: DELEGATE_EMAIL, clearAfter, overridePolicyDiffWarning: true}),
+            expect.anything(),
+        );
+        expect(goBackSpy).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
+    });
+
     it('still asks the backend to email the non-admin workspaces when Skip is pressed on a mixed diff', async () => {
         // Given a mixed policy diff, since Skip only skips the invites the user controls: the owners of the
         // workspaces they don't administer are still emailed, matching Classic
diff --git a/tests/ui/VacationDelegatePageTest.tsx b/tests/ui/VacationDelegatePageTest.tsx
index 7faeaf2f7cfd..d73010af7feb 100644
--- a/tests/ui/VacationDelegatePageTest.tsx
+++ b/tests/ui/VacationDelegatePageTest.tsx
@@ -5,8 +5,6 @@ import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersona
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
-import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
-import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 
 import VacationDelegatePage from '@pages/settings/Profile/CustomStatus/VacationDelegatePage';
@@ -15,12 +13,10 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
-import type * as ReactNavigation from '@react-navigation/native';
 // eslint-disable-next-line no-restricted-imports -- React Native Pressable/Text are required only to type the actual Jest module export; this does not import them at runtime.
 import type {Pressable as ReactNativePressable, Text as ReactNativeText} from 'react-native';
 
-import {createNavigationContainerRef, NavigationContainer} from '@react-navigation/native';
-import {createStackNavigator} from '@react-navigation/stack';
+import {NavigationContainer} from '@react-navigation/native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
@@ -31,8 +27,6 @@ import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'
 const CREATOR_ACCOUNT_ID = 1;
 const CREATOR_EMAIL = 'creator@example.com';
 const DELEGATE_A_EMAIL = 'delegateA@example.com';
-const DELEGATE_B_EMAIL = 'delegateB@example.com';
-const ORIGINAL_DELEGATE_EMAIL = 'original@example.com';
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
@@ -42,39 +36,14 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     isNavigationReady: jest.fn(() => Promise.resolve()),
 }));
 
-jest.mock('@react-navigation/native', () => {
-    const actualNavigation: typeof ReactNavigation = jest.requireActual('@react-navigation/native');
-
-    return {
-        ...actualNavigation,
-        useRoute: jest.fn(() => ({params: {}})),
-        usePreventRemove: jest.fn(),
-    };
-});
-
-// The real confirm modal is bridged through the global modal system, which needs Navigation methods this file's
-// lightweight Navigation mock doesn't provide. Stub the hook instead so tests can assert on what VacationDelegatePage
-// asks it to show without pulling in that machinery.
-const mockShowConfirmModal = jest.fn();
-jest.mock('@hooks/useConfirmModal', () =>
-    jest.fn(() => ({
-        showConfirmModal: mockShowConfirmModal,
-    })),
-);
-
-// Replaces the real, personal-details-backed selection list with two plain pressable rows so tests can
-// simulate rapid row taps on VacationDelegatePage's onSelectRow without driving the full list UI.
+// Replaces the real, personal-details-backed selection list with a plain pressable row so tests can
+// simulate a row tap on VacationDelegatePage's onSelectRow without driving the full list UI.
 jest.mock('@components/BaseVacationDelegateSelectionComponent', () => {
     const ReactMock = jest.requireActual<typeof React>('react');
     const {Pressable, Text} = jest.requireActual<{Pressable: typeof ReactNativePressable; Text: typeof ReactNativeText}>('react-native');
 
     return ({onSelectRow}: {onSelectRow: (option: {login: string}) => void}) =>
-        ReactMock.createElement(
-            ReactMock.Fragment,
-            null,
-            ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSelectRow({login: 'delegateA@example.com'})}, ReactMock.createElement(Text, null, 'select-a')),
-            ReactMock.createElement(Pressable, {testID: 'select-delegate-b', onPress: () => onSelectRow({login: 'delegateB@example.com'})}, ReactMock.createElement(Text, null, 'select-b')),
-        );
+        ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSelectRow({login: 'delegateA@example.com'})}, ReactMock.createElement(Text, null, 'select-a'));
 });
 
 function renderPage() {
@@ -87,43 +56,13 @@ function renderPage() {
     );
 }
 
-// A real Stack.Navigator so pushing "Other" genuinely blurs VacationDelegatePage's own useNavigation().isFocused(),
-// unlike renderPage() above where the page is the sole, permanently-focused screen.
-type TestParamList = {
-    VacationDelegate: undefined;
-    Other: undefined;
-};
-const Stack = createStackNavigator<TestParamList>();
-const testNavigationRef = createNavigationContainerRef<TestParamList>();
-
-function renderPageWithStack() {
-    return render(
-        <NavigationContainer ref={testNavigationRef}>
-            <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider]}>
-                <Stack.Navigator initialRouteName="VacationDelegate">
-                    <Stack.Screen
-                        name="VacationDelegate"
-                        component={VacationDelegatePage}
-                    />
-                    <Stack.Screen
-                        name="Other"
-                        component={() => null}
-                    />
-                </Stack.Navigator>
-            </ComposeProviders>
-        </NavigationContainer>,
-    );
-}
-
 describe('VacationDelegatePage', () => {
-    let apiSideEffectSpy: jest.SpyInstance;
-
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
     });
 
     beforeEach(async () => {
-        mockShowConfirmModal.mockReset().mockResolvedValue({action: 'CLOSE'});
+        jest.mocked(Navigation.goBack).mockClear();
         await act(async () => {
             await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.EN);
         });
@@ -139,187 +78,41 @@ describe('VacationDelegatePage', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
-    it('calls setVacationDelegate once for a single selection', async () => {
-        // Given a signed-in creator (see beforeEach) and a side-effect request mocked to succeed, so only what the
-        // page sends and does next is under test
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS}));
+    it('stores the picked member on the form instead of saving it', async () => {
+        // Given a picker with no saved delegate, and the API spied on so any save would be visible
+        const apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects');
 
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        // When a delegate row is tapped
+        // When a member is picked
         fireEvent.press(screen.getByTestId('select-delegate-a'));
         await waitForBatchedUpdatesWithAct();
 
-        // Then setVacationDelegate is sent exactly once with the mapped params, and the page navigates back to the status page
-        expect(apiSideEffectSpy).toHaveBeenCalledTimes(1);
-        expect(apiSideEffectSpy).toHaveBeenCalledWith(
-            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
-            expect.objectContaining({creator: CREATOR_EMAIL, vacationDelegateEmail: DELEGATE_A_EMAIL}),
-            expect.anything(),
-        );
-        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_STATUS);
+        // Then nothing is saved yet, since the clear after date is chosen on the form, and the pick is handed to the form
+        expect(apiSideEffectSpy).not.toHaveBeenCalled();
+        const draft = await getOnyxValue(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
+        expect(draft?.delegate).toBe(DELEGATE_A_EMAIL);
+        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE);
     });
 
-    it('surfaces the EXP_ERROR response message in the error modal and restores the previous delegate on dismissal', async () => {
-        // Given a response carrying a server-provided EXP_ERROR message, since a regression once dropped this message
-        // for the generic copy and this page owns the guarantee that it reaches the user
-        const EXP_ERROR_MESSAGE = 'This delegate has already been assigned as your submitsTo approver.';
-        apiSideEffectSpy = jest
-            .spyOn(require('@libs/API'), 'makeRequestWithSideEffects')
-            .mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.EXP_ERROR, message: EXP_ERROR_MESSAGE}));
-        // jest.mock's factory functions (unlike jest.spyOn) are not reset by jest.restoreAllMocks() in afterEach, so call counts otherwise leak across tests in this file.
-        jest.mocked(Navigation.goBack).mockClear();
-
-        renderPage();
-        await waitForBatchedUpdatesWithAct();
-
-        // When a delegate row is tapped and the request fails
-        fireEvent.press(screen.getByTestId('select-delegate-a'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the server's own message reaches the error modal, the page does not navigate away, and no delegate or error is left behind
-        expect(mockShowConfirmModal).toHaveBeenCalledWith(expect.objectContaining({prompt: EXP_ERROR_MESSAGE}));
-        expect(Navigation.goBack).not.toHaveBeenCalled();
-
-        const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-        expect(vacationDelegate?.delegate).toBeFalsy();
-        expect(vacationDelegate?.errors).toBeFalsy();
-    });
-
-    it('falls back to the generic error copy when the response carries no EXP_ERROR message', async () => {
-        // Given a failure response with no server-provided message, e.g. a non-EXP_ERROR failure or a transport rejection
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.BAD_REQUEST}));
-
-        renderPage();
-        await waitForBatchedUpdatesWithAct();
-
-        // When a delegate row is tapped and the request fails
-        fireEvent.press(screen.getByTestId('select-delegate-a'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the generic translation is used instead of a blank or missing prompt
-        expect(mockShowConfirmModal).toHaveBeenCalledWith(expect.objectContaining({prompt: TestHelper.translateLocal('statusPage.vacationDelegateError')}));
-    });
-
-    it('ignores a second row selection while the first request is still pending', async () => {
-        // Given a request that never resolves, so the first pick stays "in flight" for the duration of the test
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
-
-        renderPage();
-        await waitForBatchedUpdatesWithAct();
-
-        // When a second row is tapped before the first request settles
-        fireEvent.press(screen.getByTestId('select-delegate-a'));
-        fireEvent.press(screen.getByTestId('select-delegate-b'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then only the first pick is sent, so a fast double tap cannot fire two overlapping requests
-        expect(apiSideEffectSpy).toHaveBeenCalledTimes(1);
-        expect(apiSideEffectSpy).toHaveBeenCalledWith(
-            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
-            expect.objectContaining({vacationDelegateEmail: DELEGATE_A_EMAIL}),
-            expect.anything(),
-        );
-    });
-
-    it('rolls back the optimistic delegate instead of leaving a stuck pending row when the request rejects', async () => {
-        // Given a request that rejects outright, simulating a transport failure (e.g. connection dropped after the tap)
-        // rather than a resolved response with a jsonCode
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.reject(new Error('Failed to fetch')));
-        // jest.mock's factory functions (unlike jest.spyOn) are not reset by jest.restoreAllMocks() in afterEach, so call counts otherwise leak across tests in this file.
-        jest.mocked(Navigation.goBack).mockClear();
-
-        renderPage();
-        await waitForBatchedUpdatesWithAct();
-
-        // When a delegate row is tapped and the request rejects
-        fireEvent.press(screen.getByTestId('select-delegate-a'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the optimistic delegate and any error are rolled back instead of left stuck, and the page does not navigate away
-        expect(Navigation.goBack).not.toHaveBeenCalled();
-        const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-        expect(vacationDelegate?.pendingAction).toBeFalsy();
-        expect(vacationDelegate?.delegate).toBeFalsy();
-        expect(vacationDelegate?.errors).toBeFalsy();
-
-        // When the same row is tapped again after the failed request has settled
-        fireEvent.press(screen.getByTestId('select-delegate-a'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the new tap is not ignored as "still pending", since the earlier request already settled
-        expect(apiSideEffectSpy).toHaveBeenCalledTimes(2);
-    });
-
-    it('rolls back to the last confirmed delegate, not to an unconfirmed one, when a previous change is still unresolved', async () => {
-        // Given a request that never resolves, so the optimistic write for the second selection stays in place for the
-        // assertion, and an NVP already left in the state a failed change the user has not dismissed leaves behind: delegateA shown but never saved
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
+    it('does not delete the saved delegate when the same member is picked again', async () => {
+        // Given the member being picked is already the saved delegate
+        const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write');
         await act(async () => {
-            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                creator: CREATOR_EMAIL,
-                delegate: DELEGATE_A_EMAIL,
-                previousDelegate: ORIGINAL_DELEGATE_EMAIL,
-                errors: getMicroSecondOnyxErrorWithTranslationKey('statusPage.vacationDelegateError'),
-            });
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: DELEGATE_A_EMAIL});
         });
 
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        // When a different delegate is picked
-        fireEvent.press(screen.getByTestId('select-delegate-b'));
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the rollback target is the original confirmed delegate, not the unconfirmed delegateA; the API call is
-        // mocked out, so the optimistic data it was handed is where that target is visible
-        expect(apiSideEffectSpy).toHaveBeenLastCalledWith(
-            SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
-            expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL}),
-            expect.objectContaining({
-                optimisticData: [expect.objectContaining({value: expect.objectContaining({delegate: DELEGATE_B_EMAIL, previousDelegate: ORIGINAL_DELEGATE_EMAIL})})],
-            }),
-        );
-    });
-
-    it('rolls back the optimistic delegate instead of leaving an unconfirmed policy diff behind when the screen loses focus before the response resolves', async () => {
-        // Given a request whose resolution is held open, so the screen can navigate away before it settles
-        let resolveSideEffect: (response: {jsonCode: number; data?: {policyDiff: unknown}}) => void = () => {};
-        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(
-            () =>
-                new Promise((resolve) => {
-                    resolveSideEffect = resolve;
-                }),
-        );
-        jest.mocked(Navigation.navigate).mockClear();
-
-        renderPageWithStack();
-        await waitForBatchedUpdatesWithAct();
-
+        // When that member is picked
         fireEvent.press(screen.getByTestId('select-delegate-a'));
         await waitForBatchedUpdatesWithAct();
 
-        // When the screen loses focus before the request settles, simulating the user swiping the RHP away (or otherwise navigating off this screen)
-        await act(async () => {
-            testNavigationRef.current?.navigate('Other');
-            await waitForBatchedUpdatesWithAct();
-        });
-
-        // When the request then resolves with a 305 policy diff warning
-        await act(async () => {
-            resolveSideEffect({jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff: {adminPolicies: [], nonAdminPolicies: []}}});
-            await waitForBatchedUpdatesWithAct();
-        });
-
-        // Then the missing-workspaces step is not pushed onto whatever the user navigated to instead, since there's no longer a
-        // screen to carry them into it, and the optimistic delegate/policy diff are rolled back rather than left unconfirmed
-        expect(Navigation.navigate).not.toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES);
-
+        // Then the delegate is kept, since removing it is now the form's remove button, not a quiet side effect of re-picking
+        expect(apiWriteSpy).not.toHaveBeenCalled();
         const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-        expect(vacationDelegate?.delegate).toBeFalsy();
-        expect(vacationDelegate?.policyDiff).toBeFalsy();
-        expect(vacationDelegate?.pendingAction).toBeFalsy();
-        expect(vacationDelegate?.errors).toBeFalsy();
+        expect(vacationDelegate?.delegate).toBe(DELEGATE_A_EMAIL);
     });
 });
diff --git a/tests/unit/components/VacationDelegateMenuItemTest.tsx b/tests/unit/components/VacationDelegateMenuItemTest.tsx
index 76da533e9261..6240ecabe43a 100644
--- a/tests/unit/components/VacationDelegateMenuItemTest.tsx
+++ b/tests/unit/components/VacationDelegateMenuItemTest.tsx
@@ -246,4 +246,37 @@ describe('VacationDelegateMenuItem', () => {
         // Then the empty state shows at once instead of a blank field for the duration of the request
         expect(screen.getByText('common.vacationDelegate')).toBeTruthy();
     });
+
+    it('shows the empty state for a delegate whose clear after datetime has passed', () => {
+        // Given a delegate whose clear after datetime is in the past, before the backend's clear has reached the client
+        mockUseVacationDelegatePersonalDetails.mockReturnValue({accountID: 42, login: EMAIL_DELEGATE, displayName: 'Jane Doe'});
+
+        // When the menu item renders it
+        render(
+            <VacationDelegateMenuItem
+                vacationDelegate={{delegate: EMAIL_DELEGATE, clearAfter: '2000-01-01 00:00:00'}}
+                onPress={jest.fn()}
+            />,
+        );
+
+        // Then it is not shown as an active delegate, since approvals no longer go to them
+        expect(screen.queryByText('Jane Doe')).toBeNull();
+        expect(screen.getByText('common.vacationDelegate')).toBeTruthy();
+    });
+
+    it('shows when the delegate clears', () => {
+        // Given a delegate that clears in the future
+        mockUseVacationDelegatePersonalDetails.mockReturnValue({accountID: 42, login: EMAIL_DELEGATE, displayName: 'Jane Doe'});
+
+        // When the menu item renders it
+        render(
+            <VacationDelegateMenuItem
+                vacationDelegate={{delegate: EMAIL_DELEGATE, clearAfter: '2999-01-02 07:59:59'}}
+                onPress={jest.fn()}
+            />,
+        );
+
+        // Then the "until" line is shown under the login, so the vacationer and admins can see when it ends
+        expect(screen.getByText(`${EMAIL_DELEGATE}\nstatusPage.vacationDelegate.until`)).toBeTruthy();
+    });
 });
diff --git a/tests/unit/libs/VacationDelegateUtilsTest.ts b/tests/unit/libs/VacationDelegateUtilsTest.ts
new file mode 100644
index 000000000000..6f0a2bb31e7c
--- /dev/null
+++ b/tests/unit/libs/VacationDelegateUtilsTest.ts
@@ -0,0 +1,58 @@
+import {formatVacationDelegateClearDate, getVacationDelegateClearAfter, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+
+describe('VacationDelegateUtils', () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date('2026-09-28T12:00:00Z'));
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    describe('getVacationDelegateClearAfter', () => {
+        it('converts the picked day to the UTC end of that day in the given timezone', () => {
+            // Given a day picked in Los Angeles, where Oct 1 ends at 06:59:59 UTC on Oct 2 during daylight saving time
+            // When it is converted for the backend
+            // Then the delegate stays active for the whole picked day, not just until midnight UTC
+            expect(getVacationDelegateClearAfter('2026-10-01', 'America/Los_Angeles')).toBe('2026-10-02 06:59:59');
+        });
+
+        it('returns undefined when no day is picked, so the delegate never clears', () => {
+            // Given no picked day
+            // When it is converted for the backend
+            // Then nothing is sent, since the date is optional
+            expect(getVacationDelegateClearAfter('', 'America/Los_Angeles')).toBeUndefined();
+        });
+    });
+
+    describe('getVacationDelegateClearDate', () => {
+        it('converts the UTC clear after datetime back into the picked day', () => {
+            // Given the datetime the backend stored for a day picked in Los Angeles
+            // When it is read back in the same timezone
+            // Then it shows the day that was picked, not the next UTC day
+            expect(getVacationDelegateClearDate('2026-10-02 06:59:59', 'America/Los_Angeles')).toBe('2026-10-01');
+        });
+    });
+
+    describe('formatVacationDelegateClearDate', () => {
+        it('formats the day for display and ignores an invalid one', () => {
+            // Given a valid and an invalid day
+            // When they are formatted
+            // Then the valid one reads as a short date and the invalid one shows nothing instead of throwing
+            expect(formatVacationDelegateClearDate('2026-10-01', undefined)).toBe('Oct 1, 2026');
+            expect(formatVacationDelegateClearDate('not a date', undefined)).toBe('');
+        });
+    });
+
+    describe('isVacationDelegateExpired', () => {
+        it('is true only once the clear after datetime has passed', () => {
+            // Given the current time is 2026-09-28 12:00 UTC
+            // When a time before it, a time after it, and no time are checked
+            // Then only the past one counts as expired, so a delegate that never clears stays active
+            expect(isVacationDelegateExpired('2026-09-28 11:59:59')).toBe(true);
+            expect(isVacationDelegateExpired('2026-09-28 12:00:01')).toBe(false);
+            expect(isVacationDelegateExpired(undefined)).toBe(false);
+        });
+    });
+});

From 5cffbfc934a38bd9d5c17b8dee63c7c893d53666 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 29 Sep 2026 01:08:27 +0000
Subject: [PATCH 198/781] Match the vacation delegate mockups: show the
 delegate as a pill, add a Choose delegate label, and keep the empty date
 label inside the input

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/DatePicker/index.tsx           |   3 +-
 src/components/DatePicker/types.ts            |   7 ++
 src/components/VacationDelegateForm.tsx       |   2 +
 src/components/VacationDelegateMenuItem.tsx   | 106 +++++++++++++-----
 src/languages/de.ts                           |   3 +-
 src/languages/el.ts                           |   3 +-
 src/languages/en.ts                           |   3 +-
 src/languages/es.ts                           |   3 +-
 src/languages/fr.ts                           |   3 +-
 src/languages/it.ts                           |   3 +-
 src/languages/ja.ts                           |   3 +-
 src/languages/nl.ts                           |   3 +-
 src/languages/pl.ts                           |   3 +-
 src/languages/pt-BR.ts                        |   3 +-
 src/languages/zh-hans.ts                      |   3 +-
 src/pages/settings/Profile/ProfilePage.tsx    |  52 ++++++---
 tests/ui/ProfilePageTest.tsx                  |   3 +-
 .../VacationDelegateMenuItemTest.tsx          |  38 +++----
 18 files changed, 170 insertions(+), 74 deletions(-)

diff --git a/src/components/DatePicker/index.tsx b/src/components/DatePicker/index.tsx
index c228d91bd00f..feb75af8775c 100644
--- a/src/components/DatePicker/index.tsx
+++ b/src/components/DatePicker/index.tsx
@@ -52,6 +52,7 @@ function DatePicker({
     rightHandSideComponent,
     onPickerVisibilityChange,
     shouldHideCalendarIcon = false,
+    shouldForceActiveLabel = true,
 }: DateInputWithPickerProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Calendar']);
     const styles = useThemeStyles();
@@ -233,7 +234,7 @@ function DatePicker({
                 <TextInput
                     ref={combinedTextInputRef}
                     inputID={inputID}
-                    forceActiveLabel
+                    forceActiveLabel={shouldForceActiveLabel}
                     icon={selectedDate || shouldHideCalendarIcon ? null : icons.Calendar}
                     iconContainerStyle={styles.pr0}
                     label={label}
diff --git a/src/components/DatePicker/types.ts b/src/components/DatePicker/types.ts
index 8f54da70932f..03b477c37f71 100644
--- a/src/components/DatePicker/types.ts
+++ b/src/components/DatePicker/types.ts
@@ -82,6 +82,13 @@ type DateInputWithPickerProps = DatePickerBaseProps &
          * @default false
          */
         shouldHideCalendarIcon?: boolean;
+
+        /**
+         * Keeps the label above the input even when it is empty and not focused, so the date format placeholder always shows.
+         * Pass `false` to let the empty label sit inside the input, like a regular text input.
+         * @default true
+         */
+        shouldForceActiveLabel?: boolean;
     };
 
 type DatePickerProps = {
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index caa9b0af7903..2b02d4550ecf 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -99,6 +99,7 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             {!!description && <Text style={[styles.mh5, styles.mb4]}>{description}</Text>}
             <VacationDelegateMenuItem
                 vacationDelegate={{delegate}}
+                label={translate('statusPage.vacationDelegate.chooseDelegate')}
                 errors={errors}
                 pendingAction={pendingAction}
                 onCloseError={onCloseError}
@@ -111,6 +112,7 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
                     label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
                     defaultValue={savedClearDate}
                     minDate={new Date()}
+                    shouldForceActiveLabel={false}
                     shouldSaveDraft
                 />
                 {!!formattedClearDate && <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDate)}</Text>}
diff --git a/src/components/VacationDelegateMenuItem.tsx b/src/components/VacationDelegateMenuItem.tsx
index 86f17470a16f..7440edb40139 100644
--- a/src/components/VacationDelegateMenuItem.tsx
+++ b/src/components/VacationDelegateMenuItem.tsx
@@ -5,23 +5,82 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useVacationDelegatePersonalDetails from '@hooks/useVacationDelegatePersonalDetails';
 
 import getVacationDelegateDisplayName from '@libs/getVacationDelegateDisplayName';
+import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {formatVacationDelegateClearDate, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
-import CONST from '@src/CONST';
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
+import type CONST from '@src/CONST';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
 
+import type {ValueOf} from 'type-fest';
+
 import React from 'react';
 
-import UserAvatar from './Avatar/UserAvatar';
 import MenuItem from './MenuItem';
 import MenuItemField from './MenuItem/presets/MenuItemField';
-import MenuItemWithLabel from './MenuItem/presets/MenuItemWithLabel';
 import OfflineWithFeedback from './OfflineWithFeedback';
+import UserPill from './UserPill';
+
+type VacationDelegateMenuItemRowProps = {
+    /** Text above the delegate, naming what the row holds */
+    label: string;
+
+    /** Name shown in the delegate's pill */
+    displayName: string;
+
+    /** Avatar shown in the delegate's pill */
+    avatar?: AvatarSource;
+
+    /** Account ID of the delegate */
+    accountID?: number;
+
+    /** Login of the delegate */
+    login?: string;
+
+    /** Text under the pill saying when the delegate clears */
+    untilText?: string;
+
+    /** Indicator shown next to the chevron */
+    brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
+};
+
+/**
+ * The line of a set vacation delegate, without a `MenuItem.Root` of its own: the label, the delegate as a pill, and when it clears.
+ * The pill is not a text leaf, so the `Root` around it should get an `accessibilityLabel` that names the delegate.
+ */
+function VacationDelegateMenuItemRow({label, displayName, avatar, accountID, login, untilText, brickRoadIndicator}: VacationDelegateMenuItemRowProps) {
+    const styles = useThemeStyles();
+    const icons = useMemoizedLazyExpensifyIcons(['FallbackAvatar']);
+
+    return (
+        <MenuItem.Row>
+            <MenuItem.Content>
+                <MenuItem.FieldName>{label}</MenuItem.FieldName>
+                <UserPill
+                    avatar={avatar ?? icons.FallbackAvatar}
+                    displayName={displayName}
+                    accountID={accountID}
+                    email={login}
+                    style={styles.userPillStandalone}
+                />
+                {!!untilText && <MenuItem.Description>{untilText}</MenuItem.Description>}
+            </MenuItem.Content>
+            <MenuItem.Trailing>
+                {!!brickRoadIndicator && <MenuItem.BrickRoadIndicator status={brickRoadIndicator} />}
+                <MenuItem.Chevron />
+            </MenuItem.Trailing>
+        </MenuItem.Row>
+    );
+}
 
 type VacationDelegateSectionProps = {
     vacationDelegate?: BaseVacationDelegate;
 
+    /** Text above the delegate. Defaults to "Vacation delegate" */
+    label?: string;
+
     /** Errors related to setting the vacation delegate */
     errors?: Errors;
 
@@ -40,12 +99,12 @@ type VacationDelegateSectionProps = {
     onPress: () => void;
 };
 
-function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCloseError, onPress}: VacationDelegateSectionProps) {
+function VacationDelegateMenuItemPreset({vacationDelegate, label, errors, pendingAction, onCloseError, onPress}: VacationDelegateSectionProps) {
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
-    const icons = useMemoizedLazyExpensifyIcons(['FallbackAvatar']);
     const {timezone} = useCurrentUserPersonalDetails();
 
+    const rowLabel = label ?? translate('common.vacationDelegate');
     const hasVacationDelegate = !!vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate?.clearAfter);
     const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(vacationDelegate?.delegate);
 
@@ -53,7 +112,6 @@ function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCl
     const delegateDisplayName = getVacationDelegateDisplayName(rawDelegateLogin, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber);
     const clearDate = formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected), dateFnsLocale);
     const untilText = clearDate ? translate('statusPage.vacationDelegate.until', clearDate) : '';
-    const delegateDescription = [formatPhoneNumber(rawDelegateLogin), untilText].filter(Boolean).join('\n');
 
     return (
         <OfflineWithFeedback
@@ -61,33 +119,25 @@ function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCl
             errors={errors}
             errorRowStyles={styles.mh5}
             onClose={onCloseError}
-            style={hasVacationDelegate && styles.mt4}
             shouldHideOnDelete={false}
         >
             {hasVacationDelegate ? (
-                <MenuItemWithLabel
-                    label={translate('common.vacationDelegate')}
-                    onPress={onPress}
+                <MenuItem.Root
+                    onPress={callFunctionIfActionIsAllowed(onPress)}
+                    accessibilityLabel={[rowLabel, delegateDisplayName, untilText].filter(Boolean).join(', ')}
                 >
-                    <MenuItem.Row>
-                        <MenuItem.Leading>
-                            <UserAvatar
-                                source={vacationDelegatePersonalDetails?.avatar ?? icons.FallbackAvatar}
-                                accountID={vacationDelegatePersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID}
-                            />
-                        </MenuItem.Leading>
-                        <MenuItem.Content>
-                            <MenuItem.Title>{delegateDisplayName}</MenuItem.Title>
-                            {!!delegateDescription && <MenuItem.Description numberOfLines={untilText ? 2 : 1}>{delegateDescription}</MenuItem.Description>}
-                        </MenuItem.Content>
-                        <MenuItem.Trailing>
-                            <MenuItem.Chevron />
-                        </MenuItem.Trailing>
-                    </MenuItem.Row>
-                </MenuItemWithLabel>
+                    <VacationDelegateMenuItemRow
+                        label={rowLabel}
+                        displayName={delegateDisplayName}
+                        avatar={vacationDelegatePersonalDetails?.avatar}
+                        accountID={vacationDelegatePersonalDetails?.accountID}
+                        login={rawDelegateLogin}
+                        untilText={untilText}
+                    />
+                </MenuItem.Root>
             ) : (
                 <MenuItemField
-                    name={translate('common.vacationDelegate')}
+                    name={rowLabel}
                     onPress={onPress}
                 />
             )}
@@ -95,4 +145,6 @@ function VacationDelegateMenuItem({vacationDelegate, errors, pendingAction, onCl
     );
 }
 
+const VacationDelegateMenuItem = Object.assign(VacationDelegateMenuItemPreset, {Row: VacationDelegateMenuItemRow});
+
 export default VacationDelegateMenuItem;
diff --git a/src/languages/de.ts b/src/languages/de.ts
index a4190759f992..437caf4bae5c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -3861,8 +3861,9 @@ ${amount} für ${merchant} – ${date}`,
                 `<strong>${delegate}</strong> ist kein Mitglied der unten aufgeführten Arbeitsbereiche. Admins der Arbeitsbereiche, die Sie nicht verwalten, werden gebeten, die Person hinzuzufügen. Möchten Sie die Person jetzt zu den Arbeitsbereichen einladen, in denen Sie Admin sind?`,
             youAreAMemberOf: 'Sie sind Mitglied dieser Arbeitsbereiche:',
             youAreAnAdminOf: 'Sie sind Admin dieser Arbeitsbereiche:',
+            chooseDelegate: 'Vertretung auswählen',
             clearAfterRecommended: 'Löschen nach (empfohlen)',
-            willClearOn: (date: string) => `Die Urlaubsvertretung wird am ${date} entfernt.`,
+            willClearOn: (date: string) => `Die Urlaubsvertretung wird am ${date} entfernt`,
             until: (date: string) => `Bis ${date}`,
             removeDelegate: 'Urlaubsvertretung entfernen',
         },
diff --git a/src/languages/el.ts b/src/languages/el.ts
index c0df52507877..7dc64aeebc47 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -3911,8 +3911,9 @@ ${amount} για ${merchant} - ${date}`,
                 `Ο/Η <strong>${delegate}</strong> δεν είναι μέλος των παρακάτω χώρων εργασίας. Θα ζητηθεί από τους διαχειριστές των χώρων εργασίας που δεν διαχειρίζεστε να τον/την προσθέσουν. Θέλετε να τον/την προσκαλέσετε τώρα σε αυτούς που διαχειρίζεστε ως διαχειριστής;`,
             youAreAMemberOf: 'Είστε μέλος αυτών των χώρων εργασίας:',
             youAreAnAdminOf: 'Είστε διαχειριστής αυτών των χώρων εργασίας:',
+            chooseDelegate: 'Επιλέξτε αναπληρωτή',
             clearAfterRecommended: 'Εκκαθάριση μετά από (συνιστάται)',
-            willClearOn: (date: string) => `Ο εκπρόσωπος διακοπών θα καταργηθεί στις ${date}.`,
+            willClearOn: (date: string) => `Ο εκπρόσωπος διακοπών θα καταργηθεί στις ${date}`,
             until: (date: string) => `Έως ${date}`,
             removeDelegate: 'Κατάργηση εκπροσώπου διακοπών',
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6da3472e8c4f..4bb0b6720bbf 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3973,8 +3973,9 @@ const translations = {
                 `<strong>${delegate}</strong> isn't a member of the workspaces below. Admins of the workspaces you don't manage will be asked to add them. Do you want to invite them to the ones you are an admin of now?`,
             youAreAMemberOf: 'You are a member of these workspaces:',
             youAreAnAdminOf: 'You are an admin of these workspaces:',
+            chooseDelegate: 'Choose delegate',
             clearAfterRecommended: 'Clear after (recommended)',
-            willClearOn: (date: string) => `Vacation delegate will clear on ${date}.`,
+            willClearOn: (date: string) => `Vacation delegate will clear on ${date}`,
             until: (date: string) => `Until ${date}`,
             removeDelegate: 'Remove vacation delegate',
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1379743076d0..65835143e38a 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3779,8 +3779,9 @@ ${amount} para ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> no es miembro de los siguientes espacios de trabajo. Se pedirá a los administradores de los espacios de trabajo que no gestiona que lo agreguen. ¿Desea invitarlo ahora a los espacios de trabajo en los que es administrador?`,
             youAreAMemberOf: 'Usted es miembro de estos espacios de trabajo:',
             youAreAnAdminOf: 'Usted es administrador de estos espacios de trabajo:',
+            chooseDelegate: 'Elegir delegado',
             clearAfterRecommended: 'Borrar después de (recomendado)',
-            willClearOn: (date: string) => `El delegado de vacaciones se eliminará el ${date}.`,
+            willClearOn: (date: string) => `El delegado de vacaciones se eliminará el ${date}`,
             until: (date: string) => `Hasta el ${date}`,
             removeDelegate: 'Eliminar delegado de vacaciones',
         },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 263ca6e4933c..0c701d9ee741 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -3869,8 +3869,9 @@ ${amount} pour ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> n'est pas membre des espaces de travail ci-dessous. Les administrateurs des espaces de travail que vous ne gérez pas seront invités à l'ajouter. Voulez-vous l'inviter dès maintenant à ceux dont vous êtes administrateur ?`,
             youAreAMemberOf: 'Vous êtes membre de ces espaces de travail :',
             youAreAnAdminOf: 'Vous êtes administrateur de ces espaces de travail :',
+            chooseDelegate: 'Choisir un délégué',
             clearAfterRecommended: 'Effacer après (recommandé)',
-            willClearOn: (date: string) => `Le délégué de vacances sera supprimé le ${date}.`,
+            willClearOn: (date: string) => `Le délégué de vacances sera supprimé le ${date}`,
             until: (date: string) => `Jusqu’au ${date}`,
             removeDelegate: 'Supprimer le délégué de vacances',
         },
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 37d6575ebf97..481e794fa8c2 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -3842,8 +3842,9 @@ ${amount} per ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> non è membro degli spazi di lavoro elencati di seguito. Agli amministratori degli spazi di lavoro che non gestisci verrà chiesto di aggiungerlo. Vuoi invitarlo ora in quelli di cui sei amministratore?`,
             youAreAMemberOf: 'Sei membro di questi spazi di lavoro:',
             youAreAnAdminOf: 'Sei amministratore di questi spazi di lavoro:',
+            chooseDelegate: 'Scegli delegato',
             clearAfterRecommended: 'Cancella dopo (consigliato)',
-            willClearOn: (date: string) => `La delega ferie verrà rimossa il ${date}.`,
+            willClearOn: (date: string) => `La delega ferie verrà rimossa il ${date}`,
             until: (date: string) => `Fino al ${date}`,
             removeDelegate: 'Rimuovi delega ferie',
         },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 335360623851..23e2672fb73e 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -3811,8 +3811,9 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
                 `<strong>${delegate}</strong>は以下のワークスペースのメンバーではありません。あなたが管理していないワークスペースの管理者に追加を依頼します。あなたが管理者になっているワークスペースには今すぐ招待しますか？`,
             youAreAMemberOf: 'あなたはこれらのワークスペースのメンバーです：',
             youAreAnAdminOf: 'あなたはこれらのワークスペースの管理者です：',
+            chooseDelegate: '代理人を選択',
             clearAfterRecommended: 'クリア日（推奨）',
-            willClearOn: (date: string) => `休暇代理人は${date}に解除されます。`,
+            willClearOn: (date: string) => `休暇代理人は${date}に解除されます`,
             until: (date: string) => `${date}まで`,
             removeDelegate: '休暇代理人を削除',
         },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 682476d39dde..cc775dc8a743 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -3844,8 +3844,9 @@ ${amount} voor ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> is geen lid van de onderstaande werkruimtes. Beheerders van de werkruimtes die je niet beheert, wordt gevraagd diegene toe te voegen. Wil je diegene nu uitnodigen voor de werkruimtes waar je beheerder van bent?`,
             youAreAMemberOf: 'Je bent lid van deze werkruimtes:',
             youAreAnAdminOf: 'Je bent beheerder van deze werkruimtes:',
+            chooseDelegate: 'Gedelegeerde kiezen',
             clearAfterRecommended: 'Wissen na (aanbevolen)',
-            willClearOn: (date: string) => `De vertegenwoordiger tijdens vakantie wordt gewist op ${date}.`,
+            willClearOn: (date: string) => `De vertegenwoordiger tijdens vakantie wordt gewist op ${date}`,
             until: (date: string) => `Tot ${date}`,
             removeDelegate: 'Vertegenwoordiger tijdens vakantie verwijderen',
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 057cfe15a4be..84575180ea28 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -3873,8 +3873,9 @@ ${amount} dla ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> nie jest członkiem poniższych przestrzeni roboczych. Administratorzy przestrzeni roboczych, którymi nie zarządzasz, zostaną poproszeni o dodanie tej osoby. Czy chcesz zaprosić tę osobę do przestrzeni, w których jesteś administratorem?`,
             youAreAMemberOf: 'Jesteś członkiem tych przestrzeni roboczych:',
             youAreAnAdminOf: 'Jesteś administratorem tych przestrzeni roboczych:',
+            chooseDelegate: 'Wybierz zastępcę',
             clearAfterRecommended: 'Wyczyść po (zalecane)',
-            willClearOn: (date: string) => `Zastępca urlopowy zostanie usunięty ${date}.`,
+            willClearOn: (date: string) => `Zastępca urlopowy zostanie usunięty ${date}`,
             until: (date: string) => `Do ${date}`,
             removeDelegate: 'Usuń zastępcę urlopowego',
         },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index d69f8dc7e152..0e02130d8f5a 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -3831,8 +3831,9 @@ ${amount} para ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> não é membro dos workspaces abaixo. Os admins dos workspaces que você não gerencia serão solicitados a adicioná-lo(a). Deseja convidá-lo(a) agora para os workspaces em que você é admin?`,
             youAreAMemberOf: 'Você é membro destes workspaces:',
             youAreAnAdminOf: 'Você é admin destes workspaces:',
+            chooseDelegate: 'Escolher delegado',
             clearAfterRecommended: 'Limpar após (recomendado)',
-            willClearOn: (date: string) => `O delegado de férias será removido em ${date}.`,
+            willClearOn: (date: string) => `O delegado de férias será removido em ${date}`,
             until: (date: string) => `Até ${date}`,
             removeDelegate: 'Remover delegado de férias',
         },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 419603777b44..c99e62f254cb 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -3719,8 +3719,9 @@ ${amount}，商户：${merchant} - 日期：${date}`,
                 `<strong>${delegate}</strong> 不是以下工作区的成员。系统会请求你未管理的工作区的管理员将其添加进来。你要现在邀请他们加入你管理的工作区吗？`,
             youAreAMemberOf: '你是这些工作区的成员：',
             youAreAnAdminOf: '你是这些工作区的管理员：',
+            chooseDelegate: '选择代理人',
             clearAfterRecommended: '清除日期（推荐）',
-            willClearOn: (date: string) => `休假代理将于 ${date} 清除。`,
+            willClearOn: (date: string) => `休假代理将于 ${date} 清除`,
             until: (date: string) => `直到 ${date}`,
             removeDelegate: '移除休假代理',
         },
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index a8b3e03db4d3..18bb2b46a7aa 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -15,6 +15,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
+import VacationDelegateMenuItem from '@components/VacationDelegateMenuItem';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDocumentTitle from '@hooks/useDocumentTitle';
@@ -55,7 +56,7 @@ import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import type {ComponentRef} from 'react';
+import type {ComponentRef, ReactNode} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import type {ScrollView as RNScrollView} from 'react-native';
 import type {ValueOf} from 'type-fest';
@@ -111,6 +112,8 @@ function ProfilePage() {
     const vacationDelegateClearDate = hasVacationDelegate
         ? formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
         : '';
+    const vacationDelegateUntilText = vacationDelegateClearDate ? translate('statusPage.vacationDelegate.until', vacationDelegateClearDate) : '';
+    const vacationDelegateBrickRoadIndicator = isEmptyObject(getVacationDelegateErrors(vacationDelegate)) ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const {isActingAsDelegate} = useDelegateNoAccessState();
     const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
     const publicOptions: Array<{
@@ -121,6 +124,12 @@ function ProfilePage() {
         brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
         testID?: string;
         sentryLabel?: string;
+
+        /** Replaces the default name and value line, for a value that is not plain text */
+        content?: ReactNode;
+
+        /** Accessibility label for a row whose `content` is not plain text */
+        accessibilityLabel?: string;
     }> = [
         {
             description: translate('displayNamePage.headerTitle'),
@@ -149,14 +158,26 @@ function ProfilePage() {
         },
         {
             description: translate('common.vacationDelegate'),
-            title: vacationDelegateClearDate ? `${vacationDelegateName} · ${translate('statusPage.vacationDelegate.until', vacationDelegateClearDate)}` : vacationDelegateName,
+            title: vacationDelegateName,
+            content: hasVacationDelegate ? (
+                <VacationDelegateMenuItem.Row
+                    label={translate('common.vacationDelegate')}
+                    displayName={vacationDelegateName}
+                    avatar={vacationDelegatePersonalDetails?.avatar}
+                    accountID={vacationDelegatePersonalDetails?.accountID}
+                    login={vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate}
+                    untilText={vacationDelegateUntilText}
+                    brickRoadIndicator={vacationDelegateBrickRoadIndicator}
+                />
+            ) : undefined,
+            accessibilityLabel: hasVacationDelegate ? [translate('common.vacationDelegate'), vacationDelegateName, vacationDelegateUntilText].filter(Boolean).join(', ') : undefined,
             // With no delegate there is nothing to show on the form yet, so go straight to picking one.
             pageRoute: hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT,
             onPress: () => {
                 clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
                 Navigation.navigate(hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
             },
-            brickRoadIndicator: isEmptyObject(getVacationDelegateErrors(vacationDelegate)) ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
+            brickRoadIndicator: vacationDelegateBrickRoadIndicator,
             testID: 'vacation-delegate-menu-item',
             sentryLabel: CONST.SENTRY_LABEL.SETTINGS_PROFILE.VACATION_DELEGATE,
         },
@@ -307,18 +328,21 @@ function ProfilePage() {
                                         onPress={detail.onPress ?? (pageRoute ? () => Navigation.navigate(pageRoute) : undefined)}
                                         testID={detail?.testID}
                                         sentryLabel={detail.sentryLabel}
+                                        accessibilityLabel={detail.accessibilityLabel}
                                     >
-                                        <MenuItemField.Row
-                                            name={detail.description}
-                                            value={detail.title}
-                                        >
-                                            {(!!detail.brickRoadIndicator || !!pageRoute) && (
-                                                <>
-                                                    {!!detail.brickRoadIndicator && <MenuItem.BrickRoadIndicator status={detail.brickRoadIndicator} />}
-                                                    {!!pageRoute && <MenuItem.Chevron />}
-                                                </>
-                                            )}
-                                        </MenuItemField.Row>
+                                        {detail.content ?? (
+                                            <MenuItemField.Row
+                                                name={detail.description}
+                                                value={detail.title}
+                                            >
+                                                {(!!detail.brickRoadIndicator || !!pageRoute) && (
+                                                    <>
+                                                        {!!detail.brickRoadIndicator && <MenuItem.BrickRoadIndicator status={detail.brickRoadIndicator} />}
+                                                        {!!pageRoute && <MenuItem.Chevron />}
+                                                    </>
+                                                )}
+                                            </MenuItemField.Row>
+                                        )}
                                     </MenuItemSectionRoot>
                                 );
                             })}
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index 6c0b22138a22..ba74d7c8f7e9 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -352,7 +352,8 @@ describe('ProfilePage - agent account', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Then the row shows the delegate and the end date, so the user can see reports are routed elsewhere
-        expect(screen.getByText(/delegate@expensify\.com · Until/)).toBeDefined();
+        expect(screen.getByText('delegate@expensify.com')).toBeDefined();
+        expect(screen.getByText(/^Until /)).toBeDefined();
 
         // When the row is pressed
         fireEvent.press(screen.getByTestId('vacation-delegate-menu-item'), {nativeEvent: {}});
diff --git a/tests/unit/components/VacationDelegateMenuItemTest.tsx b/tests/unit/components/VacationDelegateMenuItemTest.tsx
index 6240ecabe43a..eb4c118a4b86 100644
--- a/tests/unit/components/VacationDelegateMenuItemTest.tsx
+++ b/tests/unit/components/VacationDelegateMenuItemTest.tsx
@@ -109,9 +109,8 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem(EMAIL_DELEGATE);
 
-            // Then the name, email, and avatar all show as-is, since an email login has no SMS artifacts to strip
+            // Then the pill shows the name and avatar as-is, since an email login has no SMS artifacts to strip
             expect(screen.getByText('Jane Doe')).toBeTruthy();
-            expect(screen.getByText(EMAIL_DELEGATE)).toBeTruthy();
             expect(lastAvatarProps().accountID).toBe(42);
             expect(screen.queryByText(/@expensify\.sms/)).toBeNull();
         });
@@ -129,8 +128,8 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem(PHONE_DELEGATE_WITH_SMS_DOMAIN);
 
-            // Then the title is formatted into the localized number rather than shown as the raw E.164 login it is
-            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(2);
+            // Then the pill is formatted into the localized number rather than shown as the raw E.164 login it is
+            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(1);
             expect(screen.queryByText(PHONE_DELEGATE_RAW)).toBeNull();
             expect(lastAvatarProps().accountID).toBe(43);
             expect(screen.queryByText(/@expensify\.sms/)).toBeNull();
@@ -149,13 +148,13 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem(PHONE_DELEGATE_WITH_SMS_DOMAIN);
 
-            // Then the title is still localized instead of reaching the screen as a raw E.164 number, which is
+            // Then the pill is still localized instead of reaching the screen as a raw E.164 number, which is
             // what used to happen because stripping the domain alone isn't the same as detecting a phone number
-            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(2);
+            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(1);
             expect(screen.queryByText(PHONE_DELEGATE_RAW)).toBeNull();
         });
 
-        it('keeps the name a phone-number account did set, and localizes the number below it', () => {
+        it('keeps the name a phone-number account did set', () => {
             // Given a phone-number account that did set a real display name of its own
             const personalDetails: PersonalDetails = {
                 accountID: 44,
@@ -167,10 +166,10 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem(PHONE_DELEGATE_WITH_SMS_DOMAIN);
 
-            // Then the real name is left untouched and only the number below it is localized, so formatting logic
-            // built for the no-name case doesn't clobber a name the account actually has
+            // Then the pill shows the real name untouched, so formatting logic built for the no-name case doesn't
+            // clobber a name the account actually has
             expect(screen.getByText('Jane Doe')).toBeTruthy();
-            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(1);
+            expect(screen.queryByText(PHONE_DELEGATE_LOCALIZED)).toBeNull();
             expect(screen.queryByText(PHONE_DELEGATE_RAW)).toBeNull();
         });
 
@@ -187,16 +186,14 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem('9789942470@expensify.sms');
 
-            // Then the title is localized rather than left as the raw E.164 display name, and the login below it
-            // still shows in its stored national form
+            // Then the pill is localized rather than left as the raw E.164 display name
             expect(screen.getByText(PHONE_DELEGATE_LOCALIZED)).toBeTruthy();
-            expect(screen.getByText('9789942470')).toBeTruthy();
             expect(screen.queryByText(PHONE_DELEGATE_RAW)).toBeNull();
         });
     });
 
     describe('new account (personal details missing, e.g. after cache clear)', () => {
-        it('renders the raw email as title and description when no personal details exist', () => {
+        it('renders the raw email in the pill when no personal details exist', () => {
             // Given a new account with no personal details loaded yet (e.g. right after a cache clear), for an
             // email delegate
             mockUseVacationDelegatePersonalDetails.mockReturnValue(undefined);
@@ -204,9 +201,9 @@ describe('VacationDelegateMenuItem', () => {
             // When the menu item renders that delegate
             renderMenuItem(EMAIL_DELEGATE);
 
-            // Then the raw email is used for both title and description, since there is no name to fall back on
-            // and an email login has nothing to format
-            expect(textOccurrences(EMAIL_DELEGATE)).toBe(2);
+            // Then the pill shows the raw email, since there is no name to fall back on and an email login has
+            // nothing to format
+            expect(textOccurrences(EMAIL_DELEGATE)).toBe(1);
             expect(screen.queryByText(/@expensify\.sms/)).toBeNull();
         });
 
@@ -220,7 +217,7 @@ describe('VacationDelegateMenuItem', () => {
 
             // Then the number is still localized from the login alone, rather than showing the raw E.164 login
             // or leaking its SMS domain
-            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(2);
+            expect(textOccurrences(PHONE_DELEGATE_LOCALIZED)).toBe(1);
             expect(screen.queryByText(PHONE_DELEGATE_RAW)).toBeNull();
             expect(screen.queryByText(/@expensify\.sms/)).toBeNull();
         });
@@ -276,7 +273,8 @@ describe('VacationDelegateMenuItem', () => {
             />,
         );
 
-        // Then the "until" line is shown under the login, so the vacationer and admins can see when it ends
-        expect(screen.getByText(`${EMAIL_DELEGATE}\nstatusPage.vacationDelegate.until`)).toBeTruthy();
+        // Then the "until" line is shown under the pill, so the vacationer and admins can see when it ends
+        expect(screen.getByText('Jane Doe')).toBeTruthy();
+        expect(screen.getByText('statusPage.vacationDelegate.until')).toBeTruthy();
     });
 });

From 88dacc97ee1e3ce1afe86ed3234908fc5708128e Mon Sep 17 00:00:00 2001
From: "Eugene Voloshchak (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 29 Sep 2026 12:45:06 +0000
Subject: [PATCH 199/781] Export expanded group selections through the group
 query for templates

beginExportWithTemplate only recognised a collapsed group_ stub, so an
expanded group (one entry per loaded child tagged isSelectedViaGroup)
fell through to the loaded IDs and silently dropped children that limit:
left unloaded. Use isGroupSelection, as handleCSVExport already does.

Also keep templates hidden when a group selection is mixed with
individually picked expenses, since a template export carries either the
group query or an ID list, not both.

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>
---
 src/hooks/useSearchBulkActions.ts             | 12 ++++-
 .../hooks/useSearchBulkActionsExportTest.ts   | 44 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index c24c5967c35d..66a023ad5880 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -959,7 +959,9 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     true,
                 );
             } else {
-                const isGroupExport = !!queryJSON?.groupBy && selectedTransactionsKeys.some((key) => key.startsWith(CONST.SEARCH.GROUP_PREFIX));
+                // Match `handleCSVExport`: an expanded group is stored as one entry per loaded child (tagged `isSelectedViaGroup`) rather than a `group_` stub,
+                // and it must still export through the group query, otherwise children that `limit:` left unloaded are silently dropped.
+                const isGroupExport = !!queryJSON?.groupBy && Object.entries(selectedTransactions).some(([key, transaction]) => isGroupSelection(key, transaction));
                 queueExportSearchWithTemplate(
                     {
                         templateName,
@@ -2216,7 +2218,13 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             });
 
             // A group selection is exported through a query filter (see `addSelectedGroupsFilter`) rather than a list of IDs, so the templates work for it just like they do for an individual selection.
-            if (!allSelectedAreDeleted) {
+            // A template export sends either that query or an ID list, never both, so a selection mixing a group with individually picked expenses keeps only "Current view" rather than dropping one side.
+            const selectedEntries = Object.entries(selectedTransactions);
+            const hasMixedGroupSelection =
+                isGroupedSearch &&
+                selectedEntries.some(([key, transaction]) => isGroupSelection(key, transaction)) &&
+                selectedEntries.some(([key, transaction]) => !isGroupSelection(key, transaction));
+            if (!allSelectedAreDeleted && !hasMixedGroupSelection) {
                 // Builds a single export sub-menu item for a template. `isDefaultTemplate` picks the icon and `addSeparatorBefore` draws the divider at the top of each group.
                 const buildExportOption = (template: ExportTemplate, isDefaultTemplate: boolean, addSeparatorBefore: boolean): ExportMenuItem => {
                     // The basic export is a plain CSV download, so it uses its own handler rather than the template export flow
diff --git a/tests/unit/hooks/useSearchBulkActionsExportTest.ts b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
index 9e2e00c78af5..87931992d9cd 100644
--- a/tests/unit/hooks/useSearchBulkActionsExportTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
@@ -6,7 +6,7 @@ import type {SearchQueryJSON, SelectedReports, SelectedTransactions} from '@comp
 import useSearchBulkActions from '@hooks/useSearchBulkActions';
 
 import {markAsManuallyExported} from '@libs/actions/Report';
-import {exportSearchItemsToCSV, exportToIntegrationOnSearch, getExportTemplates} from '@libs/actions/Search';
+import {exportSearchItemsToCSV, exportToIntegrationOnSearch, getExportTemplates, queueExportSearchWithTemplate} from '@libs/actions/Search';
 import type * as ReportSecondaryActionUtilsModule from '@libs/ReportSecondaryActionUtils';
 
 import CONST from '@src/CONST';
@@ -1258,6 +1258,48 @@ describe('useSearchBulkActions - export options', () => {
         });
     });
 
+    it('exports an expanded group through the group query when a template is picked', async () => {
+        // Given an expanded group selected through its header, stored as one entry per loaded child rather than a `group_` stub
+        mockSelectedTransactions = {
+            tx1: makeSelectedTransaction({
+                groupKey: `${CONST.SEARCH.GROUP_PREFIX}category`,
+                isSelectedViaGroup: true,
+            }),
+        };
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportOptionByText(result.current.headerButtonsOptions, 'Custom template')).toBeDefined();
+        });
+
+        // When a template is picked
+        getExportOptionByText(result.current.headerButtonsOptions, 'Custom template')?.onSelected?.();
+
+        // Then it exports through the grouped query instead of the loaded IDs, so children that `limit:` left unloaded are not dropped
+        expect(queueExportSearchWithTemplate).toHaveBeenCalledTimes(1);
+        const [parameters] = jest.mocked(queueExportSearchWithTemplate).mock.calls.at(0) ?? [];
+        expect(parameters?.transactionIDList).toEqual([]);
+        expect(parameters?.reportIDList).toEqual([]);
+        expect(JSON.parse(parameters?.jsonQuery ?? '{}')).toEqual(expect.objectContaining({groupBy: CONST.SEARCH.GROUP_BY.CATEGORY}));
+    });
+
+    it('hides templates when a group selection is mixed with individually picked expenses', async () => {
+        // Given a group selected through its header alongside an expense picked on its own from another group
+        mockSelectedTransactions = {
+            [`${CONST.SEARCH.GROUP_PREFIX}category`]: makeSelectedTransaction(),
+            tx2: makeSelectedTransaction(),
+        };
+
+        // When the export options are built
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        // Then only "Current view" is offered, because a template export sends either the group query or an ID list and would drop one side
+        await waitFor(() => {
+            expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView']);
+        });
+    });
+
     it('offers Current view as the only plain-CSV export on a grouped search', async () => {
         mockSelectedTransactions = {tx1: makeSelectedTransaction()};
 

From b3272ae7c7b6ef16c380c49ab2f3b6c25b76632b Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 30 Sep 2026 11:01:23 +0700
Subject: [PATCH 200/781] test(search): expect contains for merchant filter in
 compare parser test

---
 tests/unit/SearchParserTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index e3bb3f1454ee..acbc906cbd44 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1709,7 +1709,7 @@ const compareTests = [
             groupBy: CONST.SEARCH.GROUP_BY.CATEGORY,
             compare: CONST.SEARCH.COMPARE.PREVIOUS_PERIOD,
             filters: {
-                operator: 'eq',
+                operator: 'contains',
                 left: 'merchant',
                 right: 'Amazon',
             },

From 4ecae1498807914a59eef13965d25c16831e8ba5 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 30 Sep 2026 04:21:18 +0000
Subject: [PATCH 201/781] Fix vacation delegate navigation and match the date
 input to the mockups

- Title both member pickers "Choose delegate".
- Push the form from a picker opened straight from Profile or member details, and pop only the form on back, so back returns to the picker.
- Close the whole RHP after Invite or Skip on the missing workspaces step. Its removal guard now replays the blocked action through the navigation container; replaying it through the screen stamped the screen's key as the source, so the root stack dropped it.
- Keep a solid calendar icon on the clear after input after a date is picked, and hide its clear button.
- Tighten the gap under the delegate row and give the remove button the same top spacing with or without the clear-on note.

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/DatePicker/index.tsx           |  4 +-
 src/components/DatePicker/types.ts            |  7 ++
 src/components/VacationDelegateForm.tsx       | 23 ++++--
 .../DomainMemberVacationDelegateFormPage.tsx  |  8 +-
 .../DomainMemberVacationDelegatePage.tsx      | 15 +++-
 .../CustomStatus/VacationDelegateFormPage.tsx |  8 +-
 .../index.tsx                                 | 11 +--
 .../CustomStatus/VacationDelegatePage.tsx     | 14 +++-
 tests/ui/VacationDelegateFormPageTest.tsx     | 22 ++++++
 ...ationDelegateMissingWorkspacesPageTest.tsx | 76 +++++++++++++++++--
 tests/ui/VacationDelegatePageTest.tsx         | 54 +++++++++++--
 11 files changed, 208 insertions(+), 34 deletions(-)

diff --git a/src/components/DatePicker/index.tsx b/src/components/DatePicker/index.tsx
index feb75af8775c..c4ea4f0acaa9 100644
--- a/src/components/DatePicker/index.tsx
+++ b/src/components/DatePicker/index.tsx
@@ -52,7 +52,9 @@ function DatePicker({
     rightHandSideComponent,
     onPickerVisibilityChange,
     shouldHideCalendarIcon = false,
+    shouldKeepCalendarIconWhenSelected = false,
     shouldForceActiveLabel = true,
+    icon,
 }: DateInputWithPickerProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Calendar']);
     const styles = useThemeStyles();
@@ -235,7 +237,7 @@ function DatePicker({
                     ref={combinedTextInputRef}
                     inputID={inputID}
                     forceActiveLabel={shouldForceActiveLabel}
-                    icon={selectedDate || shouldHideCalendarIcon ? null : icons.Calendar}
+                    icon={(selectedDate && !shouldKeepCalendarIconWhenSelected) || shouldHideCalendarIcon ? null : (icon ?? icons.Calendar)}
                     iconContainerStyle={styles.pr0}
                     label={label}
                     accessibilityLabel={label}
diff --git a/src/components/DatePicker/types.ts b/src/components/DatePicker/types.ts
index 03b477c37f71..992ab8e202ef 100644
--- a/src/components/DatePicker/types.ts
+++ b/src/components/DatePicker/types.ts
@@ -83,6 +83,13 @@ type DateInputWithPickerProps = DatePickerBaseProps &
          */
         shouldHideCalendarIcon?: boolean;
 
+        /**
+         * Keeps the trailing calendar icon once a date is picked, instead of leaving that space to the clear button.
+         * Pair it with `shouldHideClearButton` when the date should only be changed through the picker.
+         * @default false
+         */
+        shouldKeepCalendarIconWhenSelected?: boolean;
+
         /**
          * Keeps the label above the input even when it is empty and not focused, so the date format placeholder always shows.
          * Pass `false` to let the empty label sit inside the input, like a regular text input.
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 2b02d4550ecf..aef8ec2d9237 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -57,7 +57,7 @@ type VacationDelegateFormProps = {
 function VacationDelegateForm({vacationDelegate, description, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
     const styles = useThemeStyles();
     const {translate, dateFnsLocale} = useLocalize();
-    const icons = useMemoizedLazyExpensifyIcons(['Trashcan']);
+    const icons = useMemoizedLazyExpensifyIcons(['CalendarSolid', 'Trashcan']);
     const {timezone} = useCurrentUserPersonalDetails();
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
 
@@ -105,24 +105,31 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
                 onCloseError={onCloseError}
                 onPress={onChangeDelegate}
             />
-            <View style={[styles.ph5, styles.mt4]}>
+            <View style={styles.ph5}>
+                {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups */}
                 <InputWrapper
                     InputComponent={DatePicker}
                     inputID={INPUT_IDS.CLEAR_AFTER_DATE}
                     label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
                     defaultValue={savedClearDate}
                     minDate={new Date()}
+                    icon={icons.CalendarSolid}
                     shouldForceActiveLabel={false}
+                    shouldKeepCalendarIconWhenSelected
+                    shouldHideClearButton
                     shouldSaveDraft
                 />
-                {!!formattedClearDate && <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDate)}</Text>}
+                {/* The bottom margin matches the date input's own, so the remove button below sits the same distance from whichever is last */}
+                {!!formattedClearDate && <Text style={[styles.textLabelSupporting, styles.mt2, styles.mb2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDate)}</Text>}
             </View>
             {!!savedDelegate && (
-                <MenuItemAction
-                    title={translate('statusPage.vacationDelegate.removeDelegate')}
-                    icon={icons.Trashcan}
-                    onPress={onRemove}
-                />
+                <View style={styles.mt4}>
+                    <MenuItemAction
+                        title={translate('statusPage.vacationDelegate.removeDelegate')}
+                        icon={icons.Trashcan}
+                        onPress={onRemove}
+                    />
+                </View>
             )}
         </FormProvider>
     );
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
index d623fe2a3398..785e932cf637 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
@@ -44,6 +44,12 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
         Navigation.goBack(ROUTES.DOMAIN_MEMBER_DETAILS.getRoute(domainAccountID, accountID));
     };
 
+    // Pops only this form, so a member picker opened straight from the member details page is shown again.
+    const goBack = () => {
+        clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+        Navigation.goBack();
+    };
+
     const onSubmit = (delegate: string, clearAfter: string | undefined) => {
         if (!memberLogin) {
             return;
@@ -71,7 +77,7 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
             >
                 <HeaderWithBackButton
                     title={translate('common.vacationDelegate')}
-                    onBackButtonPress={goBackToMemberDetails}
+                    onBackButtonPress={goBack}
                 />
                 <VacationDelegateForm
                     vacationDelegate={vacationDelegate}
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
index ea70afb247f7..48cffd4754f2 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
@@ -14,13 +14,14 @@ import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
+import SCREENS from '@src/SCREENS';
 import type {VacationDelegateForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/VacationDelegateForm';
 import type {Participant} from '@src/types/onyx/IOU';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
+import {useNavigationState} from '@react-navigation/native';
 import {vacationDelegateSelector} from '@selectors/Domain';
 import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
@@ -37,6 +38,7 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
         selector: vacationDelegateSelector(accountID),
     });
     const [draftDelegate] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {selector: draftDelegateSelector});
+    const isFormInStack = useNavigationState((state) => state.routes.some((stackRoute) => stackRoute.name === SCREENS.DOMAIN.VACATION_DELEGATE));
 
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
         selector: personalDetailsSelector(accountID),
@@ -52,7 +54,14 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
 
         // The pick is only saved from the form, where the clear after date is chosen too.
         setDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM, {[INPUT_IDS.DELEGATE]: delegateLogin});
-        Navigation.goBack(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID));
+
+        // Opened from the form's delegate row, so go back to it. Opened straight from the member details page, the form comes
+        // next, so push it and keep this picker under it for the form's back button.
+        if (isFormInStack) {
+            Navigation.goBack(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID));
+            return;
+        }
+        Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID));
     };
 
     return (
@@ -63,7 +72,7 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
             >
                 <BaseVacationDelegateSelectionComponent
                     vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
-                    headerTitle={translate('common.vacationDelegate')}
+                    headerTitle={translate('statusPage.vacationDelegate.chooseDelegate')}
                     onSelectRow={onSelectRow}
                     onBackButtonPress={() => Navigation.goBack()}
                     cannotSetDelegateMessage={translate('domain.members.cannotSetVacationDelegateForMember', memberLogin ?? '')}
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
index a5a752e52aaa..9d0d6545f77d 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
@@ -25,6 +25,12 @@ function goBackToProfile() {
     Navigation.goBack(ROUTES.SETTINGS_PROFILE.route);
 }
 
+// Pops only this form, so a member picker opened straight from Profile is shown again.
+function goBack() {
+    clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+    Navigation.goBack();
+}
+
 function VacationDelegateFormPage() {
     const {translate} = useLocalize();
     const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
@@ -104,7 +110,7 @@ function VacationDelegateFormPage() {
         >
             <HeaderWithBackButton
                 title={translate('common.vacationDelegate')}
-                onBackButtonPress={goBackToProfile}
+                onBackButtonPress={goBack}
             />
             <VacationDelegateForm
                 vacationDelegate={vacationDelegate}
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
index 5cf1fdefe535..c91e3e2deb1a 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx
@@ -16,7 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {clearDraftValues} from '@libs/actions/FormActions';
 import {openWorkspaceMembersPage} from '@libs/actions/Policy/Member';
 import {clearVacationDelegateError, inviteVacationDelegateToWorkspaces, setVacationDelegate} from '@libs/actions/VacationDelegate';
-import Navigation from '@libs/Navigation/Navigation';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 
@@ -29,7 +29,7 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import type {NavigationAction} from '@react-navigation/native';
 
-import {useNavigation, usePreventRemove} from '@react-navigation/native';
+import {usePreventRemove} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
 
 import MissingWorkspacesFooter from './MissingWorkspacesFooter';
@@ -45,7 +45,6 @@ type ScreenInput = {
 function VacationDelegateMissingWorkspacesPage() {
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber} = useLocalize();
-    const navigation = useNavigation();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
 
     const [vacationDelegate, vacationDelegateMetadata] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
@@ -97,7 +96,9 @@ function VacationDelegateMissingWorkspacesPage() {
             clearVacationDelegateError(previousDelegate, previousClearAfter);
         }
 
-        navigation.dispatch(data.action);
+        // Replayed through the container: this screen's own dispatch stamps its key as the action's source, and a stack
+        // above this one (e.g. the root when the whole RHP closes) can't find that key, so it would drop the action.
+        navigationRef.dispatch(data.action);
     });
 
     if (!submittedInput && isLoadingOnyxValue(vacationDelegateMetadata)) {
@@ -133,7 +134,7 @@ function VacationDelegateMissingWorkspacesPage() {
         setSubmittedInput({delegate, clearAfter, policyDiff});
         setVacationDelegate({creator, delegate, clearAfter, currentDelegate: previousDelegate, currentClearAfter: previousClearAfter, shouldOverridePolicyDiffWarning: true});
         clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
-        Navigation.goBack(ROUTES.SETTINGS_PROFILE.route);
+        Navigation.dismissModal();
     };
 
     return (
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
index 07260bb0542c..73e269f378ed 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
@@ -9,12 +9,14 @@ import Navigation from '@libs/Navigation/Navigation';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 import type {VacationDelegateForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/VacationDelegateForm';
 import type {Participant} from '@src/types/onyx/IOU';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
+import {useNavigationState} from '@react-navigation/native';
 import React from 'react';
 
 const draftDelegateSelector = (draft: OnyxEntry<VacationDelegateForm>) => draft?.[INPUT_IDS.DELEGATE];
@@ -24,6 +26,7 @@ function VacationDelegatePage() {
 
     const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
     const [draftDelegate] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {selector: draftDelegateSelector});
+    const isFormInStack = useNavigationState((state) => state.routes.some((route) => route.name === SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE));
 
     const onSelectRow = (option: Participant) => {
         if (!option?.login) {
@@ -32,7 +35,14 @@ function VacationDelegatePage() {
 
         // The pick is only saved from the form, where the clear after date is chosen too.
         setDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM, {[INPUT_IDS.DELEGATE]: option.login});
-        Navigation.goBack(ROUTES.SETTINGS_VACATION_DELEGATE);
+
+        // Opened from the form's delegate row, so go back to it. Opened straight from Profile, the form comes next, so push it
+        // and keep this picker under it for the form's back button.
+        if (isFormInStack) {
+            Navigation.goBack(ROUTES.SETTINGS_VACATION_DELEGATE);
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE);
     };
 
     return (
@@ -44,7 +54,7 @@ function VacationDelegatePage() {
             <BaseVacationDelegateSelectionComponent
                 vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
                 onSelectRow={onSelectRow}
-                headerTitle={translate('common.vacationDelegate')}
+                headerTitle={translate('statusPage.vacationDelegate.chooseDelegate')}
                 onBackButtonPress={() => Navigation.goBack()}
                 cannotSetDelegateMessage={translate('statusPage.cannotSetVacationDelegate')}
                 includeCurrentUser={false}
diff --git a/tests/ui/VacationDelegateFormPageTest.tsx b/tests/ui/VacationDelegateFormPageTest.tsx
index d7c454b002c7..2e86d9859789 100644
--- a/tests/ui/VacationDelegateFormPageTest.tsx
+++ b/tests/ui/VacationDelegateFormPageTest.tsx
@@ -39,6 +39,7 @@ const ORIGINAL_CLEAR_AFTER = '2026-09-30 06:59:59';
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     goBack: jest.fn(),
+    getTopmostReportId: jest.fn(),
     getActiveRoute: jest.fn(() => ''),
     getActiveRouteWithoutParams: jest.fn(() => ''),
     isNavigationReady: jest.fn(() => Promise.resolve()),
@@ -222,6 +223,27 @@ describe('VacationDelegateFormPage', () => {
         expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
     });
 
+    it('pops only the form and drops the unsaved pick when the header back button is pressed', async () => {
+        // Given a member picked on the picker but not saved yet
+        jest.mocked(Navigation.goBack).mockClear();
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {delegate: DELEGATE_A_EMAIL});
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the header back button is pressed
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then only this screen is popped, so a picker opened straight from Profile shows again instead of the whole RHP closing,
+        // and the unsaved pick is cleared on the way out
+        expect(Navigation.goBack).toHaveBeenCalledWith();
+        const draft = await getOnyxValue(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
+        expect(draft?.delegate).toBeFalsy();
+    });
+
     it('surfaces the EXP_ERROR response message in the error modal and restores the previous delegate on dismissal', async () => {
         // Given a response carrying a server-provided EXP_ERROR message, since a regression once dropped this message
         // for the generic copy and this page owns the guarantee that it reaches the user
diff --git a/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx b/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
index 41600baf6015..c738159ff2d8 100644
--- a/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
+++ b/tests/ui/VacationDelegateMissingWorkspacesPageTest.tsx
@@ -534,14 +534,14 @@ describe('VacationDelegateMissingWorkspacesPage', () => {
         expect(rows.at(1)).toHaveTextContent('Zebra Workspace');
     });
 
-    it('sends the clear after datetime picked on the form again and returns to the profile page', async () => {
+    it('sends the clear after datetime picked on the form again and closes the flow', async () => {
         // Given a 305 that parked a pick made with a clear after date, since the form step is gone by the time this step saves it
         const clearAfter = '2026-10-02 06:59:59';
         await seedVacationDelegate({adminPolicies: [], nonAdminPolicies: [MEMBER_POLICY_ID]});
         await act(async () => {
             await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {pendingClearAfter: clearAfter});
         });
-        const goBackSpy = jest.spyOn(Navigation, 'goBack').mockImplementation(() => {});
+        const dismissModalSpy = jest.spyOn(Navigation, 'dismissModal').mockImplementation(() => {});
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
@@ -549,13 +549,75 @@ describe('VacationDelegateMissingWorkspacesPage', () => {
         fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('common.confirm')}));
         await waitForBatchedUpdatesWithAct();
 
-        // Then the date is saved with the delegate instead of being dropped, and the user lands back on the profile page
+        // Then the date is saved with the delegate instead of being dropped, and the whole RHP closes back onto the profile page
         expect(apiWriteSpy).toHaveBeenCalledWith(
             WRITE_COMMANDS.SET_VACATION_DELEGATE,
             expect.objectContaining({vacationDelegateEmail: DELEGATE_EMAIL, clearAfter, overridePolicyDiffWarning: true}),
             expect.anything(),
         );
-        expect(goBackSpy).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
+        expect(dismissModalSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it('closes the flow and clears the form draft when Skip is pressed', async () => {
+        // Given the admin-of step with a pick still in the form draft
+        await seedVacationDelegate({adminPolicies: [ADMIN_POLICY_ID], nonAdminPolicies: []});
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {delegate: DELEGATE_EMAIL});
+        });
+        const dismissModalSpy = jest.spyOn(Navigation, 'dismissModal').mockImplementation(() => {});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When Skip is pressed
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('common.skip')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the delegate is saved and the whole RHP closes, so the form and picker under this step don't linger, and the draft is gone
+        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.SET_VACATION_DELEGATE, expect.objectContaining({overridePolicyDiffWarning: true}), expect.anything());
+        expect(dismissModalSpy).toHaveBeenCalledTimes(1);
+        const draft = await getOnyxValue(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
+        expect(draft?.delegate).toBeFalsy();
+    });
+
+    it('closes the flow and clears the form draft when Invite is pressed', async () => {
+        // Given the admin-of step with a pick still in the form draft
+        await seedVacationDelegate({adminPolicies: [ADMIN_POLICY_ID], nonAdminPolicies: []});
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT, {delegate: DELEGATE_EMAIL});
+        });
+        const dismissModalSpy = jest.spyOn(Navigation, 'dismissModal').mockImplementation(() => {});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When Invite is pressed
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('common.invite')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the delegate is invited and saved, the whole RHP closes, and the draft is gone
+        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.ADD_MEMBERS_TO_WORKSPACE, expect.anything(), expect.anything());
+        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.SET_VACATION_DELEGATE, expect.objectContaining({overridePolicyDiffWarning: true}), expect.anything());
+        expect(dismissModalSpy).toHaveBeenCalledTimes(1);
+        const draft = await getOnyxValue(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
+        expect(draft?.delegate).toBeFalsy();
+    });
+
+    it('replays the blocked action through the navigation container so a navigator above this stack can still apply it', async () => {
+        // Given the step is guarding its removal
+        await seedVacationDelegate({adminPolicies: [], nonAdminPolicies: [MEMBER_POLICY_ID]});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+        const containerDispatchSpy = jest.spyOn(navigationRef, 'dispatch').mockImplementation(() => {});
+        const blockedAction = {type: CONST.NAVIGATION.ACTION_TYPE.DISMISS_MODAL};
+
+        // When the guard lets a blocked action through, such as the one closing the whole RHP
+        await act(async () => {
+            mockPreventRemoveCallback?.({data: {action: blockedAction}});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then it is replayed as is through the container. Replaying it through this screen would stamp the screen's key on it as
+        // its source, and the root stack, which can't find that key among its own routes, would drop it and leave the RHP open
+        expect(containerDispatchSpy).toHaveBeenCalledWith(blockedAction);
     });
 
     it('still asks the backend to email the non-admin workspaces when Skip is pressed on a mixed diff', async () => {
@@ -608,9 +670,9 @@ describe('VacationDelegateMissingWorkspacesPage', () => {
     });
 
     it('keeps rendering what was submitted when the flow state is cleared underneath it', async () => {
-        // Given Navigation.goBack stubbed out, so the screen stays mounted past submission the same way it does in
-        // the real app, where navigation only pops this screen once the transition finishes
-        jest.spyOn(Navigation, 'goBack').mockImplementation(() => {});
+        // Given Navigation.dismissModal stubbed out, so the screen stays mounted past submission the same way it does in
+        // the real app, where navigation only removes this screen once the transition finishes
+        jest.spyOn(Navigation, 'dismissModal').mockImplementation(() => {});
         await seedVacationDelegate({adminPolicies: [], nonAdminPolicies: [MEMBER_POLICY_ID]});
         renderPage();
         await waitForBatchedUpdatesWithAct();
diff --git a/tests/ui/VacationDelegatePageTest.tsx b/tests/ui/VacationDelegatePageTest.tsx
index d73010af7feb..6a77c4f48523 100644
--- a/tests/ui/VacationDelegatePageTest.tsx
+++ b/tests/ui/VacationDelegatePageTest.tsx
@@ -6,12 +6,15 @@ import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
 import Navigation from '@libs/Navigation/Navigation';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
 import VacationDelegatePage from '@pages/settings/Profile/CustomStatus/VacationDelegatePage';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 
 // eslint-disable-next-line no-restricted-imports -- React Native Pressable/Text are required only to type the actual Jest module export; this does not import them at runtime.
 import type {Pressable as ReactNativePressable, Text as ReactNativeText} from 'react-native';
@@ -28,6 +31,8 @@ const CREATOR_ACCOUNT_ID = 1;
 const CREATOR_EMAIL = 'creator@example.com';
 const DELEGATE_A_EMAIL = 'delegateA@example.com';
 
+const Stack = createPlatformStackNavigator<SettingsNavigatorParamList>();
+
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     goBack: jest.fn(),
@@ -46,11 +51,31 @@ jest.mock('@components/BaseVacationDelegateSelectionComponent', () => {
         ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSelectRow({login: 'delegateA@example.com'})}, ReactMock.createElement(Text, null, 'select-a'));
 });
 
-function renderPage() {
+/**
+ * Renders the picker in a stack, with the form under it when `isFormInStack` is set, which is how the stack looks when the
+ * picker is opened from the form's delegate row rather than straight from Profile.
+ */
+function renderPage(isFormInStack = false) {
+    const initialState = isFormInStack
+        ? {
+              index: 1,
+              routes: [{name: SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE}, {name: SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT}],
+          }
+        : undefined;
+
     return render(
-        <NavigationContainer>
+        <NavigationContainer initialState={initialState}>
             <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider]}>
-                <VacationDelegatePage />
+                <Stack.Navigator initialRouteName={SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT}>
+                    <Stack.Screen
+                        name={SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE}
+                        component={() => null}
+                    />
+                    <Stack.Screen
+                        name={SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_SELECT}
+                        component={VacationDelegatePage}
+                    />
+                </Stack.Navigator>
             </ComposeProviders>
         </NavigationContainer>,
     );
@@ -63,6 +88,7 @@ describe('VacationDelegatePage', () => {
 
     beforeEach(async () => {
         jest.mocked(Navigation.goBack).mockClear();
+        jest.mocked(Navigation.navigate).mockClear();
         await act(async () => {
             await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.EN);
         });
@@ -78,8 +104,8 @@ describe('VacationDelegatePage', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
-    it('stores the picked member on the form instead of saving it', async () => {
-        // Given a picker with no saved delegate, and the API spied on so any save would be visible
+    it('stores the picked member on the form instead of saving it, and opens the form on top of the picker', async () => {
+        // Given a picker opened straight from Profile with no saved delegate, and the API spied on so any save would be visible
         const apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects');
 
         renderPage();
@@ -89,11 +115,27 @@ describe('VacationDelegatePage', () => {
         fireEvent.press(screen.getByTestId('select-delegate-a'));
         await waitForBatchedUpdatesWithAct();
 
-        // Then nothing is saved yet, since the clear after date is chosen on the form, and the pick is handed to the form
+        // Then nothing is saved yet, since the clear after date is chosen on the form, and the pick is handed to the form.
+        // The form is pushed rather than swapped in for the picker, so its back button returns to the picker
         expect(apiSideEffectSpy).not.toHaveBeenCalled();
         const draft = await getOnyxValue(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
         expect(draft?.delegate).toBe(DELEGATE_A_EMAIL);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE);
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('goes back to the form when the picker was opened from it', async () => {
+        // Given the picker was opened from the form's delegate row, so the form is already under it
+        renderPage(true);
+        await waitForBatchedUpdatesWithAct();
+
+        // When a member is picked
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the picker pops back to that form instead of pushing a second one on top
         expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE);
+        expect(Navigation.navigate).not.toHaveBeenCalled();
     });
 
     it('does not delete the saved delegate when the same member is picked again', async () => {

From 7adbdd0a732731a6cc000dd2b6536eb101972b57 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 10:28:57 +0200
Subject: [PATCH 202/781] feat: native Material tab bar on Android, flat
 floating bar on mobile web

Drops the blur layer and expo-blur, and removes dead reveal and lazy-split code.
---
 cspell.json                                   |   1 -
 package-lock.json                             |  12 -
 package.json                                  |   1 -
 patches/react-native-screens/details.md       |  19 +-
 ...s+4.25.0+003+tabs-container-reattach.patch |  34 +++
 ...s+4.25.0+004+bold-selected-tab-label.patch |  28 ++
 ...s+7.16.2+002+android-tab-item-colors.patch | 113 ++++++++
 patches/react-navigation/details.md           |  10 +
 .../TabBarBlurTarget/index.android.tsx        |  41 ---
 .../TabBarBlur/TabBarBlurTarget/index.tsx     |  10 -
 .../TabBarBlur/TabBarBlurTarget/types.ts      |   8 -
 .../TabBarBlur/TabBarBlurTargetContext.tsx    |  49 ----
 .../TabBarBlur/index.android.tsx              |  36 ---
 .../NavigationTabBar/TabBarBlur/index.tsx     |  23 --
 .../Navigation/NavigationTabBar/index.tsx     |   2 -
 .../{index.ios.ts => index.native.ts}         |   2 +-
 .../index.ts                                  |   4 +-
 ...B_SCREENS.ios.ts => TAB_SCREENS.native.ts} |   2 +-
 .../Navigators/TabNavigator.android.tsx       | 270 ++++++++++++++++++
 .../Navigators/TabNavigator.ios.tsx           |  92 +++---
 .../AppNavigator/Navigators/TabNavigator.tsx  | 158 +++++-----
 .../Navigators/TabNavigatorBar.tsx            |  35 ++-
 .../Navigators/tabScreens.native.tsx          |  18 --
 .../AppNavigator/Navigators/tabScreens.tsx    |  62 ----
 .../PlatformStackNavigation/ScreenLayout.tsx  |  18 +-
 src/libs/Navigation/closingScreens.ts         |  42 ---
 .../helpers/getLeafScreenNameAfterPop.ts      |  30 --
 .../Navigation/helpers/isTabRouteAtRoot.ts    |   1 -
 .../inbox/sidebar/NavigationTabBarAvatar.tsx  |  11 +-
 src/styles/index.ts                           |  44 +--
 src/styles/theme/themes/dark.ts               |   3 +-
 src/styles/theme/themes/light.ts              |   3 +-
 src/styles/theme/types.ts                     |   2 +-
 src/styles/variables.ts                       |  16 +-
 .../buildTabNavigatorNestedStateTests.ts      |  27 +-
 35 files changed, 706 insertions(+), 521 deletions(-)
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+003+tabs-container-reattach.patch
 create mode 100644 patches/react-native-screens/react-native-screens+4.25.0+004+bold-selected-tab-label.patch
 create mode 100644 patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
 delete mode 100644 src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx
 rename src/hooks/useFloatingTabBarContentInsetStyle/{index.ios.ts => index.native.ts} (54%)
 rename src/libs/Navigation/AppNavigator/Navigators/{TAB_SCREENS.ios.ts => TAB_SCREENS.native.ts} (79%)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx
 delete mode 100644 src/libs/Navigation/closingScreens.ts
 delete mode 100644 src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts

diff --git a/cspell.json b/cspell.json
index e88d52c10dca..2125b4863441 100644
--- a/cspell.json
+++ b/cspell.json
@@ -609,7 +609,6 @@
         "devportal",
         "diems",
         "dimen",
-        "dimezis",
         "directfeeds",
         "dispatchable",
         "displaystatus",
diff --git a/package-lock.json b/package-lock.json
index 8c5be366abbc..1e05d3c26ea8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,6 @@
         "expo": "57.0.8",
         "expo-asset": "57.0.7",
         "expo-audio": "57.0.3",
-        "expo-blur": "57.0.3",
         "expo-font": "57.0.1",
         "expo-image": "57.0.1",
         "expo-image-manipulator": "57.0.6",
@@ -27116,17 +27115,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/expo-blur": {
-      "version": "57.0.3",
-      "resolved": "https://registry.npmjs.org/expo-blur/-/expo-blur-57.0.3.tgz",
-      "integrity": "sha512-uyBeJwxIuXzWXXNrnRub5pcF8VzQsiOz0VBTWDpMG2UztmaFyfAz6pI/GCwRtWpHhiOpLoJj79WLdg1GMB+9cg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/expo-constants": {
       "version": "57.0.7",
       "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-57.0.7.tgz",
diff --git a/package.json b/package.json
index cd7cf6199a2a..3ef520d45993 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,6 @@
     "expo": "57.0.8",
     "expo-asset": "57.0.7",
     "expo-audio": "57.0.3",
-    "expo-blur": "57.0.3",
     "expo-font": "57.0.1",
     "expo-image": "57.0.1",
     "expo-image-manipulator": "57.0.6",
diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 3900d5eaec4a..84486ba44601 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -7,11 +7,24 @@
 - E/App issue: [#93842](https://github.com/Expensify/App/issues/93842)
 - PR introducing patch: [#98632](https://github.com/Expensify/App/pull/98632)
 
-
 ### [react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch](react-native-screens+4.25.0+002+animate-hiding-the-native-tab-bar.patch)
 
 - Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES` at both call sites, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart.
 - Upstream PR/issue: not reported yet.
-- E/App issue: n/a — found while building the native tab bar in `TabNavigator.ios.tsx`.
-- PR introducing patch: n/a
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
+
+### [react-native-screens+4.25.0+003+tabs-container-reattach.patch](react-native-screens+4.25.0+003+tabs-container-reattach.patch)
+
+- Reason: Pushing any opaque screen onto the root native stack over the tab navigator leaves the tab content permanently blank once that screen is popped. `ScreenStack.kt` computes a null `visibleBottom` when the new top is opaque and then removes every wrapper below it, so the whole `TAB_NAVIGATOR` `ScreenStackFragment` is removed rather than detached, taking its child FragmentManager and the selected tab's `TabsScreenFragment` with it. On the pop, `TabsContainer.onAttachedToWindow` calls `setupFragmentManager()`, which hands back a fresh and empty child FragmentManager, and then `flushPendingUpdates()`, which is guarded by `invalidationFlags.any()`. Nothing invalidated the container, because the JS side sends no new navigation state when the selected tab did not change, so the flush is a no-op and the content FrameLayout stays empty forever. The patch re-adds the selected tab's fragment to the new FragmentManager on re-attach.
+- The same re-attach also trips `ColorSchemeCoordinator.setup`, which opens with `check(!isSetUp)`. `teardown()` is the only thing that clears the flag and the package never calls it, and the re-attach does not always come with a matching detach, so the patch calls `teardown()` both from `onDetachedFromWindow` and immediately before `setup()`.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
+
+### [react-native-screens+4.25.0+004+bold-selected-tab-label.patch](react-native-screens+4.25.0+004+bold-selected-tab-label.patch)
 
+- Reason: The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected, so the patch gives the large label the bold weight of the same font family.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+003+tabs-container-reattach.patch b/patches/react-native-screens/react-native-screens+4.25.0+003+tabs-container-reattach.patch
new file mode 100644
index 000000000000..9232a3c76fde
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+003+tabs-container-reattach.patch
@@ -0,0 +1,34 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+index 3342c41..ee3829e 100644
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+@@ -267,6 +267,21 @@ class TabsContainer internal constructor(
+         setupFragmentManager()
+         flushPendingUpdates()
+ 
++        // Pushing an opaque screen over the tab host removes this view's own fragment, which destroys the child
++        // FragmentManager that held the selected tab. setupFragmentManager hands back a fresh, empty one and
++        // nothing else re-adds the tab, because navState still names it and so the JS side sends no update.
++        // Without this the content area stays empty until another tab is picked.
++        val selectedFragment = if (navState.isNotEmpty()) getFragmentForScreenKey(navState.selectedScreenKey) else null
++        if (selectedFragment != null && !selectedFragment.isAdded) {
++            requireFragmentManager
++                .createTransactionWithReordering()
++                .add(contentView.id, selectedFragment)
++                .commitNowAllowingStateLoss()
++        }
++
++        // A re-attach does not always come with a matching detach, and setup() throws on a second call, so the
++        // coordinator is reset first. teardown() does nothing when it was never set up.
++        colorSchemeCoordinator.teardown()
+         colorSchemeCoordinator.setup(this) { uiNightMode ->
+             applyDayNightUiMode(uiNightMode)
+         }
+@@ -275,6 +290,7 @@ class TabsContainer internal constructor(
+     override fun onDetachedFromWindow() {
+         super.onDetachedFromWindow()
+         teardownFragmentManager()
++        colorSchemeCoordinator.teardown()
+     }
+ 
+     override fun onConfigurationChanged(newConfig: Configuration?) {
diff --git a/patches/react-native-screens/react-native-screens+4.25.0+004+bold-selected-tab-label.patch b/patches/react-native-screens/react-native-screens+4.25.0+004+bold-selected-tab-label.patch
new file mode 100644
index 000000000000..a5287c5822ec
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.25.0+004+bold-selected-tab-label.patch
@@ -0,0 +1,28 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+@@ -145,6 +145,15 @@
+                     context.assets,
+                 )
+ 
++            // The selected tab's label is drawn bold, the way the app marks a selected tab everywhere else.
++            val activeFontFamily =
++                ReactFontManager.getInstance().getTypeface(
++                    tabBarAppearance?.tabBarItemTitleFontFamily ?: "",
++                    maxOf(fontWeight, 700),
++                    isFontStyleItalic,
++                    context.assets,
++                )
++
+             /*
+                 Short explanation about computations we're doing below.
+                 R.dimen, has defined value in SP, getDimension converts it to pixels, and by default
+@@ -167,7 +176,7 @@
+ 
+             // Active
+             largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
+-            largeLabel.typeface = fontFamily
++            largeLabel.typeface = activeFontFamily
+         }
+     }
+ 
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
new file mode 100644
index 000000000000..f7e43f14b342
--- /dev/null
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
@@ -0,0 +1,113 @@
+diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+index 1183c51..303635c 100644
+--- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
++++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+@@ -160,7 +160,7 @@ export function NativeBottomTabView({
+     ios: PlatformColor('label'),
+     default: colors.text
+   });
+-  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined;
++  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? (typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined);
+   const onTransitionStart = ({
+     closing,
+     route
+@@ -253,11 +253,11 @@ export function NativeBottomTabView({
+           tabBarItemBadgeBackgroundColor: badgeBackgroundColor
+         };
+         const normalTabItemAppearance = {
+-          tabBarItemTitleFontColor: inactiveTintColor ?? fontColor,
++          tabBarItemTitleFontColor: currentOptions.tabBarInactiveLabelColor ?? inactiveTintColor ?? fontColor,
+           tabBarItemIconColor: inactiveTintColor
+         };
+         const selectedTabItemAppearance = {
+-          tabBarItemTitleFontColor: activeTintColor,
++          tabBarItemTitleFontColor: currentOptions.tabBarActiveLabelColor ?? activeTintColor,
+           tabBarItemIconColor: activeTintColor
+         };
+         const icon = typeof tabBarIcon === 'function' ? getPlatformIcon(tabBarIcon({
+diff --git a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
+index 5a502c2..a071119 100644
+--- a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
++++ b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
+@@ -156,6 +156,18 @@ export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
+      * @platform android
+      */
+     tabBarInactiveTintColor?: ColorValue;
++    /**
++     * Color for the label in the active tab, overriding `tabBarActiveTintColor` for the label only.
++     *
++     * @platform android
++     */
++    tabBarActiveLabelColor?: ColorValue;
++    /**
++     * Color for the label in the inactive tabs, overriding `tabBarInactiveTintColor` for the label only.
++     *
++     * @platform android
++     */
++    tabBarInactiveLabelColor?: ColorValue;
+     /**
+      * Background color of the active indicator.
+      *
+diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
+index 287dea3..0f06b2b 100644
+--- a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
++++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
+@@ -262,10 +262,10 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
+     });
+ 
+   const activeIndicatorColor =
+-    (currentOptions?.tabBarActiveIndicatorColor ??
+-    typeof activeTintColor === 'string')
++    currentOptions?.tabBarActiveIndicatorColor ??
++    (typeof activeTintColor === 'string'
+       ? Color(activeTintColor)?.alpha(0.1).string()
+-      : undefined;
++      : undefined);
+ 
+   const onTransitionStart = ({
+     closing,
+@@ -387,13 +387,17 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
+ 
+           const normalTabItemAppearance: TabsScreenItemStateAppearanceAndroid =
+             {
+-              tabBarItemTitleFontColor: inactiveTintColor ?? fontColor,
++              tabBarItemTitleFontColor:
++                currentOptions.tabBarInactiveLabelColor ??
++                inactiveTintColor ??
++                fontColor,
+               tabBarItemIconColor: inactiveTintColor,
+             };
+ 
+           const selectedTabItemAppearance: TabsScreenItemStateAppearanceAndroid =
+             {
+-              tabBarItemTitleFontColor: activeTintColor,
++              tabBarItemTitleFontColor:
++                currentOptions.tabBarActiveLabelColor ?? activeTintColor,
+               tabBarItemIconColor: activeTintColor,
+             };
+ 
+diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
+index a2471f5..d9df793 100644
+--- a/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
++++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
+@@ -200,6 +200,20 @@ export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
+    */
+   tabBarInactiveTintColor?: ColorValue;
+ 
++  /**
++   * Color for the label in the active tab, overriding `tabBarActiveTintColor` for the label only.
++   *
++   * @platform android
++   */
++  tabBarActiveLabelColor?: ColorValue;
++
++  /**
++   * Color for the label in the inactive tabs, overriding `tabBarInactiveTintColor` for the label only.
++   *
++   * @platform android
++   */
++  tabBarInactiveLabelColor?: ColorValue;
++
+   /**
+    * Background color of the active indicator.
+    *
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index ff4aae0c72e9..2a12aec1e444 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -67,3 +67,13 @@
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/issues/11145
 - E/App issue: [#94571](https://github.com/Expensify/App/issues/94571)
 - PR Introducing Patch: [#95980](https://github.com/Expensify/App/pull/95980)
+
+### [@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch](@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch)
+
+- Reason: Lets the native Android tab bar take the colors from the design, where the selected tab's icon and active indicator are green and its label keeps the regular text color.
+    - `tabBarActiveIndicatorColor` was never applied: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence.
+    - `tabBarActiveTintColor` and `tabBarInactiveTintColor` each color an icon and its label together. The patch adds Android-only `tabBarActiveLabelColor` and `tabBarInactiveLabelColor`, which override the tint for the label only. The native `TabsScreenItemStateAppearanceAndroid` already takes separate title and icon colors, so nothing native changes.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
+- PR Updating Patch: N/A
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
deleted file mode 100644
index a870e2783ee9..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.android.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {useTabBarBlurTargetActions} from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext';
-
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import type {View} from 'react-native';
-
-import {useIsFocused} from '@react-navigation/native';
-import {BlurTargetView} from 'expo-blur';
-import React, {useEffect, useRef} from 'react';
-
-import type TabBarBlurTargetProps from './types';
-
-/**
- * Wraps a tab scene in the view the floating tab bar's blur samples from. The blur has to point at a sibling of
- * itself, not a parent, so the scene is the target and the bar stays outside it.
- */
-function TabBarBlurTarget({children}: TabBarBlurTargetProps) {
-    const styles = useThemeStyles();
-    const targetRef = useRef<View>(null);
-    const isFocused = useIsFocused();
-    const {setBlurTarget} = useTabBarBlurTargetActions();
-
-    useEffect(() => {
-        if (!isFocused) {
-            return;
-        }
-        setBlurTarget(targetRef);
-    }, [isFocused, setBlurTarget]);
-
-    return (
-        <BlurTargetView
-            ref={targetRef}
-            style={styles.flex1}
-            collapsable={false}
-        >
-            {children}
-        </BlurTargetView>
-    );
-}
-
-export default TabBarBlurTarget;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
deleted file mode 100644
index 703f6303bce4..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/index.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import type TabBarBlurTargetProps from './types';
-
-/**
- * The web bar blurs through a CSS backdrop filter, which needs no view to sample from, so the scene renders as is.
- */
-function TabBarBlurTarget({children}: TabBarBlurTargetProps) {
-    return children;
-}
-
-export default TabBarBlurTarget;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
deleted file mode 100644
index 2260a842c8a3..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type React from 'react';
-
-type TabBarBlurTargetProps = {
-    /** The tab scene the floating tab bar lays over */
-    children: React.ReactNode;
-};
-
-export default TabBarBlurTargetProps;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx
deleted file mode 100644
index 7006e767a9d7..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import type {RefObject} from 'react';
-import type {View} from 'react-native';
-
-import React, {createContext, useContext, useState} from 'react';
-
-type BlurTarget = RefObject<View | null> | null;
-
-type TabBarBlurTargetActionsContextType = {
-    setBlurTarget: (blurTarget: BlurTarget) => void;
-};
-
-type TabBarBlurTargetContextProviderProps = {
-    children: React.ReactNode;
-};
-
-const TabBarBlurTargetStateContext = createContext<BlurTarget>(null);
-
-const TabBarBlurTargetActionsContext = createContext<TabBarBlurTargetActionsContextType>({
-    setBlurTarget: () => {},
-});
-
-/**
- * Tells the floating tab bar which view it lays over. Each tab scene registers its own view when it gains focus,
- * so the bar always blurs the scene the user is looking at rather than one that is mounted but hidden.
- */
-function TabBarBlurTargetContextProvider({children}: TabBarBlurTargetContextProviderProps) {
-    const [blurTarget, setBlurTarget] = useState<BlurTarget>(null);
-
-    // Because of the React Compiler we don't need to memoize it manually
-    // eslint-disable-next-line react/jsx-no-constructed-context-values
-    const actionsContextValue = {setBlurTarget};
-
-    return (
-        <TabBarBlurTargetActionsContext.Provider value={actionsContextValue}>
-            <TabBarBlurTargetStateContext.Provider value={blurTarget}>{children}</TabBarBlurTargetStateContext.Provider>
-        </TabBarBlurTargetActionsContext.Provider>
-    );
-}
-
-function useTabBarBlurTarget(): BlurTarget {
-    return useContext(TabBarBlurTargetStateContext);
-}
-
-function useTabBarBlurTargetActions(): TabBarBlurTargetActionsContextType {
-    return useContext(TabBarBlurTargetActionsContext);
-}
-
-export default TabBarBlurTargetContextProvider;
-export {useTabBarBlurTarget, useTabBarBlurTargetActions};
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
deleted file mode 100644
index f260e2a9ef69..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.android.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import variables from '@styles/variables';
-
-import CONST from '@src/CONST';
-
-import {BlurView} from 'expo-blur';
-import React from 'react';
-
-import {useTabBarBlurTarget} from './TabBarBlurTargetContext';
-
-/**
- * Blurs whatever the floating tab bar covers, so the bar reads as a glass capsule the way UIKit draws it on iOS.
- * Android has no backdrop filter of its own, so the blur comes from a native view that samples the focused tab
- * scene. Until a scene registers itself there is nothing to sample, and the view paints only its tint. The tints
- * are expo-blur's white and dark grey materials, which give the milky wash UIKit's glass lays over what it blurs.
- */
-function TabBarBlur() {
-    const styles = useThemeStyles();
-    const theme = useTheme();
-    const blurTarget = useTabBarBlurTarget();
-
-    return (
-        <BlurView
-            intensity={variables.floatingTabBarBlurIntensity}
-            blurReductionFactor={variables.floatingTabBarBlurReductionFactor}
-            blurMethod={blurTarget ? 'dimezisBlurViewSdk31Plus' : 'none'}
-            blurTarget={blurTarget ?? undefined}
-            tint={theme.colorScheme === CONST.COLOR_SCHEME.DARK ? 'systemThinMaterialDark' : 'systemChromeMaterialLight'}
-            style={styles.navigationTabBarBlur}
-        />
-    );
-}
-
-export default TabBarBlur;
diff --git a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx b/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx
deleted file mode 100644
index cb0af14f37cc..000000000000
--- a/src/components/Navigation/NavigationTabBar/TabBarBlur/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import variables from '@styles/variables';
-
-import type {ViewStyle} from 'react-native';
-
-import React from 'react';
-import {View} from 'react-native';
-
-/**
- * Blurs whatever the floating tab bar covers, so the bar reads as a glass capsule the way UIKit draws it on iOS.
- * The web build gets the effect from the CSS backdrop filter, which react-native-web forwards and prefixes but
- * React Native's own style types do not carry.
- */
-const backdropFilterStyle = {backdropFilter: `blur(${variables.floatingTabBarBlurRadius}px)`} as ViewStyle;
-
-function TabBarBlur() {
-    const styles = useThemeStyles();
-
-    return <View style={[styles.navigationTabBarBlur, backdropFilterStyle]} />;
-}
-
-export default TabBarBlur;
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 85de538cc13a..1d6da466e63d 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -35,7 +35,6 @@ import InboxTabButton from './InboxTabButton';
 import InsightsTabButton from './InsightsTabButton';
 import NAVIGATION_TABS from './NAVIGATION_TABS';
 import SearchTabButton from './SearchTabButton';
-import TabBarBlur from './TabBarBlur';
 import TabBarItem from './TabBarItem';
 import WorkspacesTabButton from './WorkspacesTabButton';
 
@@ -162,7 +161,6 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                 style={styles.navigationTabBarContainer}
                 testID="NavigationTabBar"
             >
-                <TabBarBlur />
                 <PressableWithFeedback
                     onPress={navigateToNewDotHome}
                     role={CONST.ROLE.TAB}
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.ios.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
similarity index 54%
rename from src/hooks/useFloatingTabBarContentInsetStyle/index.ios.ts
rename to src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
index 34bcc8a5a9a4..dafac08c0109 100644
--- a/src/hooks/useFloatingTabBarContentInsetStyle/index.ios.ts
+++ b/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
@@ -1,6 +1,6 @@
 import type {StyleProp, ViewStyle} from 'react-native';
 
-/** The native tab bar reports its own height through the safe area, so no extra content padding is needed. */
+/** The native tab bar keeps content clear of itself, through the safe area on iOS and by laying it out above the bar on Android, so no extra content padding is needed. */
 function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
     return undefined;
 }
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
index 12c4971b5243..11b196072f9b 100644
--- a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
+++ b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
@@ -5,8 +5,8 @@ import type {StyleProp, ViewStyle} from 'react-native';
 
 /**
  * Bottom padding a tab root screen's scrollable content needs so its last row settles above the floating tab
- * bar instead of under it. Android and mobile web draw that bar in JS; iOS takes the sibling module, because
- * UITabBar reports its own height through the safe area and needs no extra room.
+ * bar instead of under it. Mobile web draws that bar in JS; iOS and Android take the sibling module, because
+ * the native bar keeps the content clear of itself and needs no extra room.
  */
 function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
     const styles = useThemeStyles();
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
similarity index 79%
rename from src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
rename to src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
index 575fc430519b..bf40bfd4cc23 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
@@ -1,6 +1,6 @@
 /**
  * Ordered list of screen names registered inside TabNavigator.
- * This must match the Tab.Screen order in TabNavigator.ios.tsx, where the order is also the order the native
+ * This must match the Tab.Screen order in TabNavigator.ios.tsx and TabNavigator.android.tsx, where the order is also the order the native
  * tab bar draws its items in, so Workspaces comes before Account.
  * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
  */
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
new file mode 100644
index 000000000000..ebbc2ed08711
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
@@ -0,0 +1,270 @@
+import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
+import homeIcon from '@assets/images/native-tab-icons/home.png';
+import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
+import profileIcon from '@assets/images/native-tab-icons/profile.png';
+import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
+
+import FloatingCameraButton from '@components/FloatingCameraButton';
+import FloatingGPSButton from '@components/FloatingGPSButton';
+import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
+import DebugTabView from '@components/Navigation/DebugTabView';
+import NavigationTabBar from '@components/Navigation/NavigationTabBar';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
+
+import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
+import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
+import type {TabNavigatorParamList} from '@libs/Navigation/types';
+import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
+
+import HomePage from '@pages/home/HomePage';
+import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
+
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+
+import type {NativeBottomTabIcon, NativeBottomTabNavigationOptions, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
+import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+
+import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
+import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
+import React, {useEffect} from 'react';
+import {View} from 'react-native';
+import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+
+import ReportsSplitNavigator from './ReportsSplitNavigator';
+import SearchFullscreenNavigator from './SearchFullscreenNavigator';
+import SettingsSplitNavigator from './SettingsSplitNavigator';
+import WorkspaceNavigator from './WorkspaceNavigator';
+
+/**
+ * Tab Navigator backed by Material's BottomNavigationView, with the Material 3 active indicator pill, ripples, and
+ * Material badges for the status dots. Wide layouts keep the JS side bar, since the native bar cannot be moved to
+ * the side of the screen.
+ */
+const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
+
+/**
+ * Plain glyphs, recolored by the bar's own icon tint for both selection states. The account tab uses the profile
+ * glyph rather than the avatar, because Android tints every tab icon and would flatten a photo to a silhouette.
+ */
+const HOME_TAB_ICON = {type: 'image', source: homeIcon} as const satisfies NativeBottomTabIcon;
+const INBOX_TAB_ICON = {type: 'image', source: inboxIcon} as const satisfies NativeBottomTabIcon;
+const SPEND_TAB_ICON = {type: 'image', source: receiptMultipleIcon} as const satisfies NativeBottomTabIcon;
+const WORKSPACES_TAB_ICON = {type: 'image', source: buildingsIcon} as const satisfies NativeBottomTabIcon;
+const ACCOUNT_TAB_ICON = {type: 'image', source: profileIcon} as const satisfies NativeBottomTabIcon;
+
+/** An empty badge value makes Material draw its small dot badge instead of a number. */
+const STATUS_DOT_BADGE = '';
+
+/**
+ * Root-level tab screens where the swipe-back gesture should be disabled.
+ * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
+ * WORKSPACE.INITIAL is intentionally excluded — swiping back from it returns to the workspace list.
+ */
+const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
+
+type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
+
+/** stale === false distinguishes a fully realized NavigationState from a PartialState. */
+function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
+    return state?.stale === false;
+}
+
+/** Shows a status as a Material dot badge in its own color, or no badge at all. */
+function getStatusBadgeOptions(dotColor: string | undefined): Pick<NativeBottomTabNavigationOptions, 'tabBarBadge' | 'tabBarBadgeStyle'> {
+    if (!dotColor) {
+        return {tabBarBadge: undefined};
+    }
+    return {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}};
+}
+
+/**
+ * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
+ * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
+ * navigator's screen options instead of being unmounted.
+ */
+function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
+    const styles = useThemeStyles();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+    const activeRoute = state.routes[state.index];
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    // The buttons follow whatever the navigator decided for the bar itself.
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
+
+    if (!shouldUseNarrowLayout) {
+        return (
+            <View style={[styles.flex1, styles.flexRow]}>
+                <View
+                    style={styles.tabNavigatorBarContainer}
+                    pointerEvents="box-none"
+                >
+                    <NavigationTabBar selectedTab={selectedTab} />
+                </View>
+                <View style={styles.flex1}>{children}</View>
+            </View>
+        );
+    }
+
+    return (
+        <View style={styles.flex1}>
+            {children}
+            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
+            {shouldShowNativeTabBar && (
+                <Animated.View
+                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
+                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
+                    style={styles.nativeAndroidTabBarFloatingButtons(bottomInset)}
+                    pointerEvents="box-none"
+                >
+                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
+                        <NavigationTabBarFloatingActionButton />
+                    </View>
+                    <FloatingGPSButton />
+                    <FloatingCameraButton />
+                </Animated.View>
+            )}
+        </View>
+    );
+}
+
+const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
+
+function TabNavigator() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
+    const {translate} = useLocalize();
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
+    const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
+    const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
+    const navigation = useNavigation();
+    const parentNavigation = navigation.getParent();
+    const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
+    const route = useRoute();
+    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
+    // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
+    // mounts, so the nearest navigation listener context is still the parent stack's.
+    const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
+    const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
+    const activeTabRouteName = isRealizedNavigationState(tabState) ? activeTabRoute?.name : SCREENS.HOME;
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
+
+    let inboxDotColor: string | undefined;
+    if (chatTabBrickRoad) {
+        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
+    }
+    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
+    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
+
+    useEffect(() => {
+        if (!shouldUseNarrowLayout || !parentNavigation) {
+            return;
+        }
+        const isRootScreen = TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(focusedRouteName ?? '');
+        parentNavigation.setOptions({gestureEnabled: !isRootScreen});
+    }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
+
+    useEffect(() => {
+        if (!isRealizedNavigationState(tabState)) {
+            return;
+        }
+        setPreservedNavigatorState(route.key, tabState);
+    }, [tabState, route.key]);
+
+    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
+    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
+    useEffect(() => {
+        let spans;
+        if (selectedTab === NAVIGATION_TABS.INBOX) {
+            spans = INBOX_TAB_SPAN_IDS;
+        } else if (selectedTab === NAVIGATION_TABS.SEARCH) {
+            spans = REPORTS_TAB_SPAN_IDS;
+        }
+        cancelTabNavigationSpans(spans);
+    }, [selectedTab]);
+
+    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
+    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
+    // state by overriding the bottom-tab router's getInitialState — the same pattern SplitRouter
+    // uses for its split navigators.
+    const tabRouterOverride = <Action extends NavigationAction>(
+        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
+    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
+        getInitialState: (configOptions) => {
+            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
+            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
+        },
+    });
+
+    // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
+    // selected tab has the menu icon color and a bold label in the regular text color, the others the plain icon
+    // color and a supporting text label. The bar takes the raised surface tone with no top border.
+    const screenOptions = {
+        headerShown: false,
+        tabBarActiveTintColor: theme.iconMenu,
+        tabBarInactiveTintColor: theme.icon,
+        tabBarActiveLabelColor: theme.text,
+        tabBarInactiveLabelColor: theme.textSupporting,
+        tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
+        tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
+        tabBarLabelVisibilityMode: 'labeled' as const,
+        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
+        tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.highlightBG},
+    };
+
+    return (
+        <Tab.Navigator
+            backBehavior="fullHistory"
+            layout={renderNativeTabLayout}
+            screenLayout={nativeBottomTabScreenLayoutWrapper}
+            screenOptions={screenOptions}
+            UNSTABLE_router={tabRouterOverride}
+        >
+            <Tab.Screen
+                name={SCREENS.HOME}
+                component={HomePage}
+                options={{tabBarLabel: translate('common.home'), tabBarIcon: HOME_TAB_ICON}}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
+                component={ReportsSplitNavigator}
+                options={{tabBarLabel: translate('common.inbox'), tabBarIcon: INBOX_TAB_ICON, ...getStatusBadgeOptions(inboxDotColor)}}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
+                component={SearchFullscreenNavigator}
+                options={{tabBarLabel: translate('common.spend'), tabBarIcon: SPEND_TAB_ICON}}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
+                component={WorkspaceNavigator}
+                options={{tabBarLabel: translate('common.workspacesTabTitle'), tabBarIcon: WORKSPACES_TAB_ICON, ...getStatusBadgeOptions(workspacesDotColor)}}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
+                component={SettingsSplitNavigator}
+                options={{tabBarLabel: translate('initialSettingsPage.account'), tabBarIcon: ACCOUNT_TAB_ICON, ...getStatusBadgeOptions(accountDotColor)}}
+            />
+        </Tab.Navigator>
+    );
+}
+
+export default TabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index 5fb6b230a614..f91dc85244fa 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -88,6 +88,19 @@ const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.
 
 type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
 
+/** The recolored tab icons, with the signature of everything baked into them. */
+type TintedTabIcons = {signature: string; icons: Record<string, TintedTabIconPair>};
+
+/** The account tab's avatar in both selection states, with the signature of everything baked into them. */
+type CircularAvatarIcons = {signature: string; uri: string; active: AvatarTabIcon; inactive: AvatarTabIcon};
+
+/**
+ * The last icons drawn, kept outside the component so a remounted navigator starts from them instead of waiting
+ * for Skia again. While a new theme or language is being drawn, the bar keeps showing these.
+ */
+let lastTintedIcons: TintedTabIcons | undefined;
+let lastCircularAvatar: CircularAvatarIcons | undefined;
+
 /** stale === false distinguishes a fully realized NavigationState from a PartialState. */
 function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
     return state?.stale === false;
@@ -100,14 +113,14 @@ type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTab
 type AvatarTabIcon = {uri: string; width: number; height: number};
 
 /** Paints the status dot in the glyph's top right corner, where a native badge would have sat. */
-function drawStatusDot(canvas: SkCanvas, glyphRight: number, scale: number, color: string) {
+function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, scale: number, color: string) {
     const radius = variables.nativeTabIconDotRadius * scale;
     const paint = Skia.Paint();
     paint.setColor(Skia.Color(color));
-    canvas.drawCircle(glyphRight - radius, radius, radius, paint);
+    canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
 }
 
-/** The label's own face, matching what the bar drew before it became native: Expensify Neue, bold when selected. */
+/** The label's face: Expensify Neue, bold when selected. */
 function getLabelFont(isSelected: boolean, scale: number) {
     const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
         weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
@@ -168,12 +181,16 @@ async function createTabIcon(
         return undefined;
     }
 
-    const glyphWidth = image.width();
-    const glyphHeight = image.height();
+    // The glyph assets are 24 pt and are drawn at the floating bar's glyph size, the one the JS bar uses.
+    const glyphWidth = variables.iconFloatingTabBar * scale;
+    const glyphHeight = variables.iconFloatingTabBar * scale;
+    // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
+    // every label lands at the same height.
+    const glyphTop = ((variables.avatarFloatingTabBar - variables.iconFloatingTabBar) / 2) * scale;
     const gap = variables.nativeTabIconLabelGap * scale;
     const labelSize = measureLabel(label, isSelected, scale);
     const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
-    const canvasHeight = Math.ceil(glyphHeight + gap + labelSize.height);
+    const canvasHeight = Math.ceil(glyphTop + glyphHeight + gap + labelSize.height);
     const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
 
     if (!surface) {
@@ -187,13 +204,13 @@ async function createTabIcon(
 
     const canvas = surface.getCanvas();
     const glyphLeft = (canvasWidth - glyphWidth) / 2;
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, glyphWidth, glyphHeight), Skia.XYWHRect(glyphLeft, 0, glyphWidth, glyphHeight), paint);
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphWidth, glyphHeight), paint);
 
     if (dotColor) {
-        drawStatusDot(canvas, glyphLeft + glyphWidth, scale, dotColor);
+        drawStatusDot(canvas, glyphLeft + glyphWidth, glyphTop, scale, dotColor);
     }
 
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphHeight + gap);
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphHeight + gap);
 
     surface.flush();
 
@@ -209,16 +226,18 @@ async function createTabIcon(
 
 /**
  * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI. It fills the same canvas as every other tab icon, so the avatar
- * is drawn at the size of the glyphs next to it.
+ * circle off-screen and handed over as a data URI. Its canvas is as tall as every other tab icon's, with the avatar
+ * a little larger than the glyphs next to it, since a circle reads smaller than a glyph of the same box.
  */
 async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<AvatarTabIcon | undefined> {
     const response = await fetch(uri);
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = variables.nativeTabIconScale;
-    const avatarSize = variables.iconBottomBar * scale;
-    const gap = variables.nativeTabIconLabelGap * scale;
+    const avatarSize = variables.avatarFloatingTabBar * scale;
+    // The avatar overhangs a glyph by the same amount above and below, so its gap to the label shrinks by
+    // that much and the label lands where every other tab's does.
+    const gap = (variables.nativeTabIconLabelGap - (variables.avatarFloatingTabBar - variables.iconFloatingTabBar) / 2) * scale;
     const labelSize = measureLabel(label, isSelected, scale);
     const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
     const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
@@ -244,7 +263,7 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     canvas.restore();
 
     if (dotColor) {
-        drawStatusDot(canvas, avatarLeft + avatarSize, scale, dotColor);
+        drawStatusDot(canvas, avatarLeft + avatarSize, 0, scale, dotColor);
     }
 
     drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
@@ -267,14 +286,14 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
  * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
  * navigator's screen options instead of being unmounted.
  */
-function NativeTabLayout({children, state}: NativeTabLayoutProps) {
+function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const styles = useThemeStyles();
     const activeRoute = state.routes[state.index];
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeRoute) && !isBlockingViewVisible;
+    // The buttons follow whatever the navigator decided for the bar itself.
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
 
     if (!shouldUseNarrowLayout) {
         return (
@@ -361,15 +380,17 @@ function TabNavigator() {
     // language change redraws them.
     const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, inboxDotColor, workspacesDotColor, accountDotColor, ...Object.values(tabLabels)].join('|');
 
-    const [tintedIcons, setTintedIcons] = useState<{signature: string; icons: Record<string, TintedTabIconPair>}>();
-    const tintedIconsForTheme = tintedIcons?.signature === iconsSignature ? tintedIcons.icons : undefined;
+    const [tintedIcons, setTintedIcons] = useState<TintedTabIcons | undefined>(lastTintedIcons);
+    // The template icons the bar would fall back to render black on iOS 26, which ignores the inactive tint, so
+    // the bar is held back until the first recolored set exists.
+    const areTabIconsReady = !!tintedIcons;
 
     useEffect(() => {
         let isActive = true;
         const inactiveColor = theme.icon;
         const activeColor = theme.iconMenu;
-        // The label colors the bar drew before it became native: the supporting tone when idle, the plain text
-        // tone when selected. Both come from the theme, so light and dark each get their own pair.
+        // The supporting tone when idle, the plain text tone when selected, taken from the theme so light and dark
+        // each get their own pair.
         const inactiveLabelColor = theme.textSupporting;
         const activeLabelColor = theme.text;
         const signature = iconsSignature;
@@ -396,9 +417,16 @@ function TabNavigator() {
                         icons[result.name] = {inactive: result.inactive, active: result.active};
                     }
                 }
-                setTintedIcons({signature, icons});
+                lastTintedIcons = {signature, icons};
+                setTintedIcons(lastTintedIcons);
             })
-            .catch(() => {});
+            .catch(() => {
+                // A failed draw still lets the bar show, on the template icons, rather than keeping it hidden.
+                if (!isActive) {
+                    return;
+                }
+                setTintedIcons((previous) => previous ?? {signature, icons: {}});
+            });
 
         return () => {
             isActive = false;
@@ -406,9 +434,9 @@ function TabNavigator() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [iconsSignature]);
 
-    /** Falls back to the template icon until both tinted copies are ready, so a tab is never left without one. */
+    /** Falls back to the template icon for a tab whose tinted copies could not be drawn, so it is never left without one. */
     const getTabBarIcon = (name: string, fallbackIcon: NativeBottomTabIcon) => {
-        const pair = tintedIconsForTheme?.[name];
+        const pair = tintedIcons?.icons[name];
         if (!pair) {
             return fallbackIcon;
         }
@@ -421,8 +449,9 @@ function TabNavigator() {
     });
     const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
     const avatarSignature = [avatarURI, accountDotColor, tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR], theme.textSupporting, theme.text].join('|');
-    const [circularAvatar, setCircularAvatar] = useState<{signature: string; active: AvatarTabIcon; inactive: AvatarTabIcon}>();
-    const avatarPair = circularAvatar?.signature === avatarSignature ? circularAvatar : undefined;
+    const [circularAvatar, setCircularAvatar] = useState<CircularAvatarIcons | undefined>(lastCircularAvatar);
+    // An avatar drawn for another user is never shown, while a stale dot or label is, until the redraw lands.
+    const avatarPair = circularAvatar?.uri === avatarURI ? circularAvatar : undefined;
     const toAvatarIcon = (icon: AvatarTabIcon): NativeBottomTabIcon => ({
         type: 'image',
         source: {uri: icon.uri, width: icon.width, height: icon.height, scale: variables.nativeTabIconScale},
@@ -444,7 +473,8 @@ function TabNavigator() {
                 if (!isActive || !inactive || !active) {
                     return;
                 }
-                setCircularAvatar({signature, active, inactive});
+                lastCircularAvatar = {signature, uri: avatarURI, active, inactive};
+                setCircularAvatar(lastCircularAvatar);
             })
             .catch(() => {});
 
@@ -499,10 +529,8 @@ function TabNavigator() {
         tabBarActiveTintColor: theme.iconMenu,
         tabBarInactiveTintColor: theme.icon,
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        // Pushed through setOptions instead, each tab kept the value it was left with, and the bar spent the first
-        // frame after a tab switch in the previous tab's state. The background only lands on iOS 18 and below;
-        // iOS 26 keeps its own glass material.
-        tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
+        // The background only lands on iOS 18 and below; iOS 26 keeps its own glass material.
+        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
         tabBarControllerMode: 'tabBar' as const,
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
         tabBarMinimizeBehavior: 'none' as const,
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index 372b7fa4f939..d77a12be149d 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -1,36 +1,78 @@
-import TabBarBlurTarget from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTarget';
-import TabBarBlurTargetContextProvider from '@components/Navigation/NavigationTabBar/TabBarBlur/TabBarBlurTargetContext';
+import ActivityIndicator from '@components/ActivityIndicator';
 
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
+import {getSpan} from '@libs/telemetry/activeSpans';
 
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 /**
  * Tab Navigator containing Home, Inbox (Reports), Search, Insights, Settings, and Workspaces pages.
  */
-import type {BottomTabBarProps, BottomTabNavigationOptions, BottomTabNavigationProp} from '@react-navigation/bottom-tabs';
-import type {NavigationAction, ParamListBase, Router, ScreenLayoutArgs, TabNavigationState} from '@react-navigation/native';
+import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
 
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
-import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
-import React, {useEffect} from 'react';
+import {findFocusedRoute, useNavigation, useNavigationState} from '@react-navigation/native';
+import React, {lazy, Suspense, useEffect} from 'react';
+import {View} from 'react-native';
 
 // Do not lazy load Search navigator for performance reasons
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
 import TabNavigatorBar from './TabNavigatorBar';
-import {HomePageScreen, InsightsPageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen} from './tabScreens';
 
-const renderTabBar = ({state}: BottomTabBarProps) => <TabNavigatorBar state={state} />;
+const LazyHomePage = lazy(() => import('@pages/home/HomePage'));
+const LazyReportsSplitNavigator = lazy(() => import('./ReportsSplitNavigator'));
+const LazySettingsSplitNavigator = lazy(() => import('./SettingsSplitNavigator'));
+const LazyWorkspaceNavigator = lazy(() => import('./WorkspaceNavigator'));
+const LazyInsightsPage = lazy(() => import('@pages/Insights/InsightsPage'));
+
+type LazyFallbackProps = {
+    /** Sentry span to tag when this fallback renders. */
+    tabSpanName?: string;
+};
+
+function LazyFallback({tabSpanName}: LazyFallbackProps) {
+    const styles = useThemeStyles();
+
+    // Lets Sentry split slow tab navigations into "lazy chunk fetch" vs "screen render" buckets.
+    useEffect(() => {
+        if (!tabSpanName) {
+            return;
+        }
+        getSpan(tabSpanName)?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_LAZY_TAB_FALLBACK_SHOWN, true);
+    }, [tabSpanName]);
+
+    return (
+        <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.appBG]}>
+            <ActivityIndicator size="large" />
+        </View>
+    );
+}
+
+function withSuspense<P extends Record<string, unknown>>(LazyComponent: React.LazyExoticComponent<React.ComponentType<P>>, tabSpanName?: string) {
+    function SuspenseWrapper(props: P) {
+        return (
+            <Suspense fallback={<LazyFallback tabSpanName={tabSpanName} />}>
+                <LazyComponent {...props} />
+            </Suspense>
+        );
+    }
+    return SuspenseWrapper;
+}
 
-const renderTabScreenLayout = (args: ScreenLayoutArgs<ParamListBase, string, BottomTabNavigationOptions, BottomTabNavigationProp<ParamListBase>>) => (
-    <TabBarBlurTarget>{bottomTabScreenLayoutWrapper(args)}</TabBarBlurTarget>
-);
+const HomePageScreen = withSuspense(LazyHomePage);
+const ReportsSplitNavigatorScreen = withSuspense(LazyReportsSplitNavigator, CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB);
+const SettingsSplitNavigatorScreen = withSuspense(LazySettingsSplitNavigator);
+const WorkspaceNavigatorScreen = withSuspense(LazyWorkspaceNavigator);
+const InsightsPageScreen = withSuspense(LazyInsightsPage);
+
+const renderTabBar = ({state}: BottomTabBarProps) => <TabNavigatorBar state={state} />;
 
 const Tab = createBottomTabNavigator<TabNavigatorParamList>();
 
@@ -54,12 +96,6 @@ function TabNavigator() {
     const navigation = useNavigation();
     const parentNavigation = navigation.getParent();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
-    const route = useRoute();
-    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
-    // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
-    // mounts, so the nearest navigation listener context is still the parent stack's.
-    const tabState = useNavigationState((parentState) => parentState.routes.find((r) => r.key === route.key)?.state);
-
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
             return;
@@ -68,27 +104,6 @@ function TabNavigator() {
         parentNavigation.setOptions({gestureEnabled: !isRootScreen});
     }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
 
-    useEffect(() => {
-        // stale === false distinguishes a fully realized NavigationState from a PartialState.
-        if (!tabState || tabState.stale !== false) {
-            return;
-        }
-        setPreservedNavigatorState(route.key, tabState);
-    }, [tabState, route.key]);
-
-    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
-    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
-    // state by overriding the bottom-tab router's getInitialState - the same pattern SplitRouter
-    // uses for its split navigators.
-    const tabRouterOverride = <Action extends NavigationAction>(
-        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
-    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
-        getInitialState: (configOptions) => {
-            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
-            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
-        },
-    });
-
     const screenOptions = {
         ...TAB_SCREEN_OPTIONS_BASE,
         sceneStyle: {flex: 1, backgroundColor: theme.appBG},
@@ -96,40 +111,37 @@ function TabNavigator() {
     };
 
     return (
-        <TabBarBlurTargetContextProvider>
-            <Tab.Navigator
-                backBehavior="fullHistory"
-                tabBar={renderTabBar}
-                screenOptions={screenOptions}
-                screenLayout={renderTabScreenLayout}
-                UNSTABLE_router={tabRouterOverride}
-            >
-                <Tab.Screen
-                    name={SCREENS.HOME}
-                    component={HomePageScreen}
-                />
-                <Tab.Screen
-                    name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
-                    component={ReportsSplitNavigatorScreen}
-                />
-                <Tab.Screen
-                    name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
-                    component={SearchFullscreenNavigator}
-                />
-                <Tab.Screen
-                    name={SCREENS.INSIGHTS}
-                    component={InsightsPageScreen}
-                />
-                <Tab.Screen
-                    name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
-                    component={SettingsSplitNavigatorScreen}
-                />
-                <Tab.Screen
-                    name={NAVIGATORS.WORKSPACE_NAVIGATOR}
-                    component={WorkspaceNavigatorScreen}
-                />
-            </Tab.Navigator>
-        </TabBarBlurTargetContextProvider>
+        <Tab.Navigator
+            backBehavior="fullHistory"
+            tabBar={renderTabBar}
+            screenOptions={screenOptions}
+            screenLayout={bottomTabScreenLayoutWrapper}
+        >
+            <Tab.Screen
+                name={SCREENS.HOME}
+                component={HomePageScreen}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
+                component={ReportsSplitNavigatorScreen}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
+                component={SearchFullscreenNavigator}
+            />
+            <Tab.Screen
+                name={SCREENS.INSIGHTS}
+                component={InsightsPageScreen}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
+                component={SettingsSplitNavigatorScreen}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
+                component={WorkspaceNavigatorScreen}
+            />
+        </Tab.Navigator>
     );
 }
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index 3dbea5a6399a..9b46ffd6e246 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -3,14 +3,13 @@ import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
+import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getIsAnyScreenClosing, subscribeToClosingScreens} from '@libs/Navigation/closingScreens';
-import getLeafScreenNameAfterPop from '@libs/Navigation/helpers/getLeafScreenNameAfterPop';
-import isTabRouteAtRoot, {isAtTabRootLevel} from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import SCREENS from '@src/SCREENS';
@@ -18,7 +17,7 @@ import SCREENS from '@src/SCREENS';
 import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
 import type {ValueOf} from 'type-fest';
 
-import React, {useEffect, useSyncExternalStore} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
 const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
@@ -40,15 +39,27 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
     const activeRoute = state.routes[state.index];
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     const isAtRoot = isTabRouteAtRoot(activeRoute);
-    // --- Narrow-only visibility logic (hooks must run unconditionally per Rules of Hooks) ---
+    // --- Narrow-only animation logic (hooks must run unconditionally per Rules of Hooks) ---
+    // On native, screens also render the tab bar via bottomContent for swipe-back animations.
+    // Delay showing this navigator's tab bar only when navigating back from a deeper screen
+    // (where the tab bar was hidden). Keep it visible during tab switches so it doesn't flash.
+    // Guard with shouldUseNarrowLayout so prevShouldHide stays false in wide layout,
+    // preventing false shouldApplyDelay triggers on layout transitions (e.g. web resize).
     const shouldHide = shouldUseNarrowLayout && (!isAtRoot || isBlockingViewVisible);
+    const prevTabIndex = usePrevious(state.index);
+    const prevShouldHide = usePrevious(shouldHide);
+    const stateKey = `${state.index}-${isAtRoot}`;
+    const [animationDoneKey, setAnimationDoneKey] = useState(stateKey);
 
-    // Navigation state only changes once a pop commits, which on an interactive swipe is the moment the gesture
-    // ends. Waiting for it makes the bar drop into place after the screen has already arrived. Watching for the
-    // pop instead puts the bar under the incoming screen for the whole gesture, and an aborted swipe settles the
-    // screen without a state change, so the bar goes back to hidden on its own.
-    const isAnyScreenClosing = useSyncExternalStore(subscribeToClosingScreens, getIsAnyScreenClosing, getIsAnyScreenClosing);
-    const shouldRevealDuringPop = isAnyScreenClosing && !isBlockingViewVisible && isAtTabRootLevel(getLeafScreenNameAfterPop(activeRoute?.state));
+    const tabChanged = prevTabIndex !== state.index;
+    const shouldApplyDelay = !tabChanged && prevShouldHide && !shouldHide;
+
+    useEffect(() => {
+        const frameId = requestAnimationFrame(() => {
+            setAnimationDoneKey(stateKey);
+        });
+        return () => cancelAnimationFrame(frameId);
+    }, [stateKey]);
 
     // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
     // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
@@ -56,7 +67,7 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
         cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
     }, [selectedTab]);
 
-    const isHidden = shouldHide && !shouldRevealDuringPop;
+    const isHidden = shouldHide || (shouldApplyDelay && animationDoneKey !== stateKey);
 
     if (shouldUseNarrowLayout) {
         // Negative marginTop overlays the tab bar on content (zero flex space) to prevent layout shifts.
diff --git a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
deleted file mode 100644
index eb463eb261e7..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.native.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import HomePage from '@pages/home/HomePage';
-import InsightsPage from '@pages/Insights/InsightsPage';
-
-import ReportsSplitNavigator from './ReportsSplitNavigator';
-import SettingsSplitNavigator from './SettingsSplitNavigator';
-import WorkspaceNavigator from './WorkspaceNavigator';
-
-/**
- * The tab screens handed over as they are. Code splitting buys nothing here, the whole bundle is already on the
- * device, and going through `lazy` would put a spinner in front of a tab the first time it is opened.
- */
-const HomePageScreen = HomePage;
-const ReportsSplitNavigatorScreen = ReportsSplitNavigator;
-const SettingsSplitNavigatorScreen = SettingsSplitNavigator;
-const WorkspaceNavigatorScreen = WorkspaceNavigator;
-const InsightsPageScreen = InsightsPage;
-
-export {HomePageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen, InsightsPageScreen};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx b/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx
deleted file mode 100644
index bcc19d174e6a..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/tabScreens.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import ActivityIndicator from '@components/ActivityIndicator';
-
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import {getSpan} from '@libs/telemetry/activeSpans';
-
-import CONST from '@src/CONST';
-
-import React, {lazy, Suspense, useEffect} from 'react';
-import {View} from 'react-native';
-
-/**
- * The tab screens, code split so a tab's chunk is fetched the first time it is opened. Native has no chunks to
- * fetch, so it takes the sibling module that hands the components over directly and never shows the fallback.
- */
-const LazyHomePage = lazy(() => import('@pages/home/HomePage'));
-const LazyReportsSplitNavigator = lazy(() => import('./ReportsSplitNavigator'));
-const LazySettingsSplitNavigator = lazy(() => import('./SettingsSplitNavigator'));
-const LazyWorkspaceNavigator = lazy(() => import('./WorkspaceNavigator'));
-const LazyInsightsPage = lazy(() => import('@pages/Insights/InsightsPage'));
-
-type LazyFallbackProps = {
-    /** Sentry span to tag when this fallback renders. */
-    tabSpanName?: string;
-};
-
-function LazyFallback({tabSpanName}: LazyFallbackProps) {
-    const styles = useThemeStyles();
-
-    // Lets Sentry split slow tab navigations into "lazy chunk fetch" vs "screen render" buckets.
-    useEffect(() => {
-        if (!tabSpanName) {
-            return;
-        }
-        getSpan(tabSpanName)?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_LAZY_TAB_FALLBACK_SHOWN, true);
-    }, [tabSpanName]);
-
-    return (
-        <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.appBG]}>
-            <ActivityIndicator size="large" />
-        </View>
-    );
-}
-
-function withSuspense<P extends Record<string, unknown>>(LazyComponent: React.LazyExoticComponent<React.ComponentType<P>>, tabSpanName?: string) {
-    function SuspenseWrapper(props: P) {
-        return (
-            <Suspense fallback={<LazyFallback tabSpanName={tabSpanName} />}>
-                <LazyComponent {...props} />
-            </Suspense>
-        );
-    }
-    return SuspenseWrapper;
-}
-
-const HomePageScreen = withSuspense(LazyHomePage);
-const ReportsSplitNavigatorScreen = withSuspense(LazyReportsSplitNavigator, CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB);
-const SettingsSplitNavigatorScreen = withSuspense(LazySettingsSplitNavigator);
-const WorkspaceNavigatorScreen = withSuspense(LazyWorkspaceNavigator);
-const InsightsPageScreen = withSuspense(LazyInsightsPage);
-
-export {HomePageScreen, ReportsSplitNavigatorScreen, SettingsSplitNavigatorScreen, WorkspaceNavigatorScreen, InsightsPageScreen};
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index 0efebb03962b..2b74f7b4b002 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -1,4 +1,3 @@
-import {markScreenClosing, markScreenSettled} from '@libs/Navigation/closingScreens';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {TransitionHandle} from '@libs/Navigation/TransitionTracker';
 
@@ -14,7 +13,7 @@ import type {PlatformSpecificNavigationOptions, PlatformStackNavigationOptions}
 // it's used with. Keeping this minimal means passing a real (properly-typed) navigation prop into it - e.g. from
 // bottomTabScreenLayoutWrapper below - needs no unsafe cast, since every navigator's `addListener` structurally satisfies it.
 type TransitionAwareNavigation = {
-    addListener(type: 'transitionStart' | 'transitionEnd', callback: (event: {data?: {closing?: boolean}}) => void): () => void;
+    addListener(type: 'transitionStart' | 'transitionEnd', callback: () => void): () => void;
 };
 
 // screenLayout is invoked as a render function (not JSX), so we need this wrapper to create a proper React component boundary for hooks.
@@ -57,27 +56,19 @@ type ScreenLayoutProps = ScreenLayoutArgs<
     TransitionAwareNavigation
 >;
 
-function ScreenLayout({children, navigation, route}: ScreenLayoutProps) {
+function ScreenLayout({children, navigation}: ScreenLayoutProps) {
     const transitionHandleRef = useRef<TransitionHandle | null>(null);
     // Net-count overlapping starts so a single handle spans rapid back/forward re-fires — no decrement-to-zero seam for `runAfterTransitions` to flush through, and `transitionEnd` for the wrong leg can't end the active one.
     const pendingTransitionsRef = useRef(0);
 
     useLayoutEffect(() => {
-        const transitionStartListener = navigation.addListener('transitionStart', (event) => {
-            // A closing transition starts as soon as an interactive swipe does, which is the only chance anything
-            // drawn outside the screens has to react before the pop commits.
-            if (event.data?.closing) {
-                markScreenClosing(route.key);
-            } else {
-                markScreenSettled(route.key);
-            }
+        const transitionStartListener = navigation.addListener('transitionStart', () => {
             pendingTransitionsRef.current += 1;
             if (!transitionHandleRef.current) {
                 transitionHandleRef.current = TransitionTracker.startTransition('navigation');
             }
         });
         const transitionEndListener = navigation.addListener('transitionEnd', () => {
-            markScreenSettled(route.key);
             if (pendingTransitionsRef.current > 0) {
                 pendingTransitionsRef.current -= 1;
             }
@@ -90,7 +81,6 @@ function ScreenLayout({children, navigation, route}: ScreenLayoutProps) {
         return () => {
             transitionStartListener();
             transitionEndListener();
-            markScreenSettled(route.key);
             const handleToEnd = transitionHandleRef.current;
             transitionHandleRef.current = null;
             pendingTransitionsRef.current = 0;
@@ -102,7 +92,7 @@ function ScreenLayout({children, navigation, route}: ScreenLayoutProps) {
                 TransitionTracker.endTransition(handleToEnd);
             });
         };
-    }, [navigation, route.key]);
+    }, [navigation]);
 
     return children;
 }
diff --git a/src/libs/Navigation/closingScreens.ts b/src/libs/Navigation/closingScreens.ts
deleted file mode 100644
index e27f5d7382f3..000000000000
--- a/src/libs/Navigation/closingScreens.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Tracks which screens are in the middle of closing, so UI drawn outside the screens can react to a pop while it
- * is still running. Navigation state only changes once a pop commits, which on an interactive iOS swipe is the
- * moment the gesture ends, far too late for anything that has to travel with the screen.
- */
-const closingRouteKeys = new Set<string>();
-const listeners = new Set<() => void>();
-
-function emit() {
-    for (const listener of listeners) {
-        listener();
-    }
-}
-
-function subscribeToClosingScreens(listener: () => void): () => void {
-    listeners.add(listener);
-    return () => {
-        listeners.delete(listener);
-    };
-}
-
-function getIsAnyScreenClosing(): boolean {
-    return closingRouteKeys.size > 0;
-}
-
-function markScreenClosing(routeKey: string) {
-    if (closingRouteKeys.has(routeKey)) {
-        return;
-    }
-    closingRouteKeys.add(routeKey);
-    emit();
-}
-
-/** Called when the screen settles, which covers a finished pop as much as a gesture the user aborted. */
-function markScreenSettled(routeKey: string) {
-    if (!closingRouteKeys.delete(routeKey)) {
-        return;
-    }
-    emit();
-}
-
-export {subscribeToClosingScreens, getIsAnyScreenClosing, markScreenClosing, markScreenSettled};
diff --git a/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts b/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts
deleted file mode 100644
index 689327b2cfb5..000000000000
--- a/src/libs/Navigation/helpers/getLeafScreenNameAfterPop.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type {NavigationState, PartialState} from '@react-navigation/native';
-
-import getFocusedLeafScreenName from './getFocusedLeafScreenName';
-
-/**
- * Leaf screen name the focused route chain would resolve to if the deepest stack with something to pop popped once.
- * Returns undefined when nothing in the chain can be popped.
- */
-function getLeafScreenNameAfterPop(state: NavigationState | PartialState<NavigationState> | undefined): string | undefined {
-    if (!state?.routes?.length) {
-        return undefined;
-    }
-    // PartialState (e.g. from getStateFromPath on cold-start) may omit index; React Navigation treats the last route as focused.
-    const focusedIndex = state.index ?? state.routes.length - 1;
-    const focused = state.routes[focusedIndex];
-
-    // The innermost stack is the one the gesture pops, so it wins over anything above it.
-    const deeperName = focused?.state ? getLeafScreenNameAfterPop(focused.state) : undefined;
-    if (deeperName) {
-        return deeperName;
-    }
-
-    if (focusedIndex <= 0) {
-        return undefined;
-    }
-    const previous = state.routes[focusedIndex - 1];
-    return previous?.state ? getFocusedLeafScreenName(previous.state) : previous?.name;
-}
-
-export default getLeafScreenNameAfterPop;
diff --git a/src/libs/Navigation/helpers/isTabRouteAtRoot.ts b/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
index b1de3b57e942..d24291aeaa13 100644
--- a/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
+++ b/src/libs/Navigation/helpers/isTabRouteAtRoot.ts
@@ -58,4 +58,3 @@ function isTabRouteAtRoot(route: TabRouteLike | undefined): boolean {
 }
 
 export default isTabRouteAtRoot;
-export {isAtTabRootLevel};
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index ffb69bac45a4..ddca563685f4 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -45,17 +45,24 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
         >
             {({hovered}) => (
                 <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
-                    <View style={styles.tn0Half}>
+                    <View style={shouldUseNarrowLayout ? styles.navigationTabBarAvatar : styles.tn0Half}>
                         <AccountNavigationAvatar
                             // The floating bar marks the selected tab with a pill behind the whole item, so the
                             // avatar's own ring would double up on it. The side bar has no pill and keeps it.
                             isSelected={!shouldUseNarrowLayout && (isSelected || hovered)}
                             isHovered={hovered}
+                            size={shouldUseNarrowLayout ? CONST.AVATAR_SIZE.X_SMALL : CONST.AVATAR_SIZE.SMALL}
                         />
                     </View>
                     <Text
                         numberOfLines={2}
-                        style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}
+                        style={[
+                            styles.textSmall,
+                            styles.textAlignCenter,
+                            isSelected ? styles.textBold : styles.textSupporting,
+                            shouldUseNarrowLayout ? styles.mt1 : styles.mt0Half,
+                            styles.navigationTabBarLabel,
+                        ]}
                     >
                         {translate('initialSettingsPage.account')}
                     </Text>
diff --git a/src/styles/index.ts b/src/styles/index.ts
index b7511bc36852..086027555672 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -730,14 +730,14 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
-        // The narrow tab bar is a capsule floating above the screen content, drawn by Android and mobile web.
-        // iOS hands the bottom bar over to UIKit, which paints its own material, so nothing here reaches it.
+        // The narrow tab bar on mobile web is a flat capsule floating above the screen content. iOS and Android hand
+        // the bottom bar over to their native tab bars, so nothing here reaches them.
         navigationTabBarContainer: {
             flexDirection: 'row',
             height: variables.floatingTabBarHeight,
             marginHorizontal: variables.floatingTabBarHorizontalInset,
             borderRadius: variables.componentBorderRadiusCircle,
-            backgroundColor: theme.floatingTabBarBG,
+            backgroundColor: theme.appBG,
             borderWidth: variables.hairlineBorderWidth,
             borderColor: theme.border,
             // Insets the row so the selected item's capsule keeps a margin inside the bar's rounded edge.
@@ -746,33 +746,23 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'hidden',
         },
 
-        // Sits behind the row and inside the container's rounded clip, so the blur stops at the capsule's edge.
-        navigationTabBarBlur: {
-            position: 'absolute',
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: 0,
-        },
-
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
-            // The padding widens the pill while the matching negative margin keeps it from taking that width
-            // away from the label, so the pill reaches past its tab instead of squeezing what it wraps.
+            // Spans the whole tab and a little past it, the way the native iOS bar draws its selection. The padding
+            // matches the negative margin, so the label keeps the tab's width to wrap in, selected or not.
+            alignSelf: 'stretch',
             paddingHorizontal: variables.floatingTabBarSelectedOverhang,
             marginHorizontal: -variables.floatingTabBarSelectedOverhang,
         },
 
         // Ends a tab root screen's scrollable content above the floating bar, so its last row stays reachable
-        // while everything scrolled past it still passes behind the glass.
+        // while everything scrolled past it still passes under the bar.
         floatingTabBarContentInset: {
             paddingBottom: variables.floatingTabBarContentInset,
         },
 
-        // Used both for a tab's pressable and for the wrapper around its icon and label. As the wrapper it sizes
-        // to those two rather than to the tab's share of the bar, so a long label pushes the selected pill past
-        // its tab instead of spilling out of it.
+        // Used both for a tab's pressable and for the wrapper around its icon and label.
         navigationTabBarItem: {
             height: '100%',
             display: 'flex',
@@ -780,6 +770,12 @@ const staticStyles = (theme: ThemeColors) =>
             alignItems: 'center',
         },
 
+        // Lets the floating bar's avatar overflow the glyph box evenly above and below, so its label lines up
+        // with the labels of the icons next to it and its centre with theirs.
+        navigationTabBarAvatar: {
+            marginVertical: (variables.iconFloatingTabBar - variables.avatarFloatingTabBar) / 2,
+        },
+
         // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
         // against it without taking part in the tab screen's layout.
         nativeTabBarFloatingButtons: {
@@ -6838,6 +6834,18 @@ const staticStyles = (theme: ThemeColors) =>
 
 const dynamicStyles = (theme: ThemeColors) =>
     ({
+        // Android's native bar is Material's 80 dp row plus the system gesture inset, so the strip the floating
+        // buttons hang from sits above both, with Material's 16 dp gap between the FAB and the bar.
+        nativeAndroidTabBarFloatingButtons: (bottomInset: number) =>
+            ({
+                position: 'absolute',
+                right: 0,
+                bottom: variables.androidNativeTabBarHeight + bottomInset + spacing.gap4.gap,
+                left: 0,
+                height: 0,
+                zIndex: 10,
+            }) satisfies ViewStyle,
+
         getSplitListItemAmountStyle: (inputMarginLeft: number, amountWidth: number | string) => ({
             marginLeft: inputMarginLeft,
             width: amountWidth,
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 7848f94d9776..9407c5c5355e 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -58,8 +58,9 @@ const darkTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
-    floatingTabBarBG: 'rgba(6,27,9,0.70)',
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
+    // green700 at 50%
+    androidTabBarActiveIndicatorBG: 'rgba(8,82,57,0.50)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
     textDark: colors.productDark100,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 77eb5620a411..85cb7bfc20c8 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -58,8 +58,9 @@ const lightTheme = {
     signInSidebar: colors.green800,
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
-    floatingTabBarBG: 'rgba(252,251,249,0.70)',
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
+    // green100 at 50%
+    androidTabBarActiveIndicatorBG: 'rgba(177,242,214,0.50)',
     heading: colors.productLight900,
     textLight: colors.white,
     textDark: colors.productLight900,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 2ebe4017eb6d..3586eb5b2f96 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -65,8 +65,8 @@ type ThemeColors = {
     signInSidebar: Color;
     sidebar: Color;
     sidebarHover: Color;
-    floatingTabBarBG: Color;
     floatingTabBarSelectedBG: Color;
+    androidTabBarActiveIndicatorBG: Color;
     heading: Color;
     textLight: Color;
     textDark: Color;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 4d037198bb8d..d30f9ec7f6d6 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -36,17 +36,9 @@ export default {
     bottomTabHeight: 72,
     floatingTabBarHeight,
     floatingTabBarHorizontalInset: 16,
-    // How far the selected pill reaches past the icon and label. Measured off the iOS glass bubble, where the
-    // account tab's 121px label sits in a 222px bubble, so 17pt a side.
-    floatingTabBarSelectedOverhang: 17,
+    // How far the selected pill reaches past its tab on each side, whatever the label's length.
+    floatingTabBarSelectedOverhang: 4,
     floatingTabBarBottomInset,
-    // Blur the bar lays over what it covers. The web radius is a CSS blur; the Android one is expo-blur's own
-    // 0 to 100 intensity, which is not the same unit, so the two are tuned to match rather than shared.
-    floatingTabBarBlurRadius: 24,
-    floatingTabBarBlurIntensity: 60,
-    // expo-blur on Android derives its radius as intensity / factor, so this puts the radius at 5, soft enough that
-    // shapes and colors under the bar still show through, without changing the tint the intensity sets.
-    floatingTabBarBlurReductionFactor: 12,
     // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
     floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
@@ -119,12 +111,16 @@ export default {
     iconBottomBar: 24,
     /** Glyph size in the floating tab bar, smaller than the side bar's so each item keeps padding above and below it. */
     iconFloatingTabBar: 20,
+    /** Account avatar size in the floating tab bar. A circle reads smaller than a glyph of the same box, so it is larger. */
+    avatarFloatingTabBar: avatarSizes.avatarSizeXSmall,
     /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
     nativeTabIconDotRadius: 4,
     // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.
     nativeTabIconLabelGap: 6,
     /** Pixel density the native tab bar icons are rasterized at. */
     nativeTabIconScale: 3,
+    /** Height of Material's BottomNavigationView row on Android, without the gesture inset under it. */
+    androidNativeTabBarHeight: 80,
     iconHeader: 48,
     iconSection: 68,
     iouAmountTextSize: 40,
diff --git a/tests/navigation/buildTabNavigatorNestedStateTests.ts b/tests/navigation/buildTabNavigatorNestedStateTests.ts
index 2220c0f73ac8..aaedcaff3ada 100644
--- a/tests/navigation/buildTabNavigatorNestedStateTests.ts
+++ b/tests/navigation/buildTabNavigatorNestedStateTests.ts
@@ -5,23 +5,22 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 describe('buildTabNavigatorNestedState', () => {
-    it('returns state with all 6 tab routes', () => {
+    it('returns state with every tab route, in the order the navigator registers them', () => {
+        // Given the tab screens the navigator registers on the current platform
+        // When the nested state is built for one of them
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR});
-        expect(result.routes).toHaveLength(TAB_SCREENS.length);
-        const routeNames = result.routes.map((r) => r.name);
-        expect(routeNames).toEqual([
-            SCREENS.HOME,
-            NAVIGATORS.REPORTS_SPLIT_NAVIGATOR,
-            NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR,
-            SCREENS.INSIGHTS,
-            NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
-            NAVIGATORS.WORKSPACE_NAVIGATOR,
-        ]);
+
+        // Then it holds a route for every tab, in the same order, since the native tab bars draw their items in it
+        expect(result.routes.map((r) => r.name)).toEqual([...TAB_SCREENS]);
     });
 
-    it('sets index to the position of the selected tab (SETTINGS = 4)', () => {
+    it('sets index to the position of the selected tab', () => {
+        // Given the settings tab, whose position differs between platforms
+        // When the nested state is built for it
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR});
-        expect(result.index).toBe(4);
+
+        // Then the index points at that tab's own route
+        expect(result.index).toBe(TAB_SCREENS.indexOf(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR));
     });
 
     it('falls back to index 0 for an unknown tab name', () => {
@@ -40,7 +39,7 @@ describe('buildTabNavigatorNestedState', () => {
     it('copies params from selectedTabRoute onto the matched route only', () => {
         const params = {screen: 'SomeScreen'};
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, params});
-        expect(result.routes.at(4)?.params).toEqual(params);
+        expect(result.routes.at(TAB_SCREENS.indexOf(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR))?.params).toEqual(params);
         expect(result.routes.at(0)?.params).toBeUndefined();
         expect(result.routes.at(1)?.params).toBeUndefined();
     });

From 4f891cc67bd1685c363e681d004aa2ecee70c006 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 11:16:09 +0200
Subject: [PATCH 203/781] refactor: share native tab navigator code, lay out
 the mWeb bar via bottomContent

Drops the content inset hook and ties the dark indicator to selectedOptionBG.
---
 .../Navigation/NavigationTabBar/index.tsx     |   8 +-
 .../TabBarBottomContent/index.native.tsx      |   6 +
 .../Navigation/TabBarBottomContent/index.tsx  |  33 +++
 .../Navigation/TabBarBottomContent/types.ts   |   9 +
 .../Tables/WorkspaceListTable/index.tsx       |   4 +-
 src/components/WorkspaceListLayout.tsx        |   4 +
 .../index.native.ts                           |   8 -
 .../index.ts                                  |  18 --
 .../NativeTabNavigator/NATIVE_TAB_ICONS.ts    |  21 ++
 .../NativeTabNavigator/NativeTabLayout.tsx    |  84 +++++++
 .../useNativeTabNavigator.ts                  | 110 +++++++++
 .../Navigators/TabNavigator.android.tsx       | 217 +++---------------
 .../Navigators/TabNavigator.ios.tsx           | 208 ++---------------
 src/pages/Insights/InsightsDashboard.tsx      |   7 +-
 src/pages/Search/SearchPageNarrow/index.tsx   |  10 +-
 src/pages/domain/DomainInitialPage.tsx        |   8 +-
 src/pages/home/HomePage.tsx                   |   8 +-
 src/pages/inbox/sidebar/BaseSidebarScreen.tsx |   4 +
 src/pages/inbox/sidebar/SidebarLinks.tsx      |  10 +-
 src/pages/settings/InitialSettingsPage.tsx    |   9 +-
 src/pages/workspace/WorkspaceInitialPage.tsx  |   8 +-
 src/styles/index.ts                           |  26 +--
 src/styles/theme/themes/dark.ts               |   2 +-
 src/styles/theme/themes/light.ts              |   2 +-
 src/styles/utils/index.ts                     |   2 -
 src/styles/variables.ts                       |   8 +-
 tests/ui/BaseSidebarScreenTest.tsx            |   1 +
 tests/ui/InitialSettingsPageTest.tsx          |   8 +
 tests/ui/WorkspaceInitialPageTest.tsx         |   1 +
 29 files changed, 394 insertions(+), 450 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/index.native.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/index.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/types.ts
 delete mode 100644 src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
 delete mode 100644 src/hooks/useFloatingTabBarContentInsetStyle/index.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts

diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 1d6da466e63d..1a4755b490bc 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -48,8 +48,8 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     const {translate} = useLocalize();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const {isBetaEnabled} = usePermissions();
-    // iOS drives its bar from the native tab navigator, which registers five items and leaves Insights out, so the
-    // wide layout's own bar must not offer a tab the navigator cannot route to.
+    // The native tab navigators register five items and leave Insights out, so the wide layout's own bar must not
+    // offer a tab the navigator cannot route to.
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE) && (TAB_SCREENS as readonly string[]).includes(SCREENS.INSIGHTS);
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['ExpensifyAppIcon', 'Home']);
 
@@ -73,8 +73,8 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
         });
     };
 
-    // The navigator drops shouldShowFloatingButtons while it hides the bar, and the debug view rides along
-    // so it cannot linger over a screen the bar has already left.
+    // shouldShowFloatingButtons is false for the swipe-back duplicate tab bar rendered via
+    // bottomContent — gating the debug view on it prevents it from appearing in that copy too.
     const shouldShowDebugTabView = !!isDebugModeEnabled && shouldShowFloatingButtons;
 
     if (!shouldUseNarrowLayout) {
diff --git a/src/components/Navigation/TabBarBottomContent/index.native.tsx b/src/components/Navigation/TabBarBottomContent/index.native.tsx
new file mode 100644
index 000000000000..b423035245d5
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/index.native.tsx
@@ -0,0 +1,6 @@
+/** The native tab bars keep the screen content clear of themselves, so a tab root screen needs no copy of the bar. */
+function TabBarBottomContent() {
+    return null;
+}
+
+export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/index.tsx b/src/components/Navigation/TabBarBottomContent/index.tsx
new file mode 100644
index 000000000000..94ce7c321fc2
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/index.tsx
@@ -0,0 +1,33 @@
+import NavigationTabBar from '@components/Navigation/NavigationTabBar';
+
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import type TabBarBottomContentProps from './types';
+
+/**
+ * A copy of the floating tab bar in a tab root screen's own layout, so the screen's content ends above the bar the
+ * navigator draws over it, and the bar travels with the screen while it slides in or out.
+ */
+function TabBarBottomContent({selectedTab}: TabBarBottomContentProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+
+    if (!shouldUseNarrowLayout) {
+        return null;
+    }
+
+    return (
+        <View style={styles.floatingTabBarBottomInset}>
+            <NavigationTabBar
+                selectedTab={selectedTab}
+                shouldShowFloatingButtons={false}
+            />
+        </View>
+    );
+}
+
+export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/types.ts b/src/components/Navigation/TabBarBottomContent/types.ts
new file mode 100644
index 000000000000..30f7b28d1650
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/types.ts
@@ -0,0 +1,9 @@
+import type NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+
+import type {ValueOf} from 'type-fest';
+
+type TabBarBottomContentProps = {
+    selectedTab: ValueOf<typeof NAVIGATION_TABS>;
+};
+
+export default TabBarBottomContentProps;
diff --git a/src/components/Tables/WorkspaceListTable/index.tsx b/src/components/Tables/WorkspaceListTable/index.tsx
index c33b533989ab..504682a3e635 100644
--- a/src/components/Tables/WorkspaceListTable/index.tsx
+++ b/src/components/Tables/WorkspaceListTable/index.tsx
@@ -1,7 +1,6 @@
 import type {CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
 
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
@@ -74,7 +73,6 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
     const {isRestrictedPolicyCreation} = usePreferredPolicy();
     const illustrations = useMemoizedLazyIllustrations(['PlanetWithMobileApp']);
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
     const workspaceTableColumns: Array<TableColumn<WorkspaceTableColumnKey>> = [
@@ -224,7 +222,7 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
             />
 
             <Table.Header />
-            <Table.Body contentContainerStyle={floatingTabBarContentInsetStyle} />
+            <Table.Body />
         </Table>
     );
 }
diff --git a/src/components/WorkspaceListLayout.tsx b/src/components/WorkspaceListLayout.tsx
index e5a3ab23b321..ce180ea0d91d 100644
--- a/src/components/WorkspaceListLayout.tsx
+++ b/src/components/WorkspaceListLayout.tsx
@@ -16,6 +16,8 @@ import React from 'react';
 import {View} from 'react-native';
 
 import {useDebugTabViewHeight} from './Navigation/DebugTabView';
+import NAVIGATION_TABS from './Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from './Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from './Navigation/TopBarWithLoadingBar';
 import OfflineIndicator from './OfflineIndicator';
 import ScreenWrapper from './ScreenWrapper';
@@ -117,6 +119,8 @@ function WorkspaceListLayout({children, activeTabKey, headerButton, headerCompon
             shouldEnableMaxHeight
             shouldEnablePickerAvoiding={false}
             enableEdgeToEdgeBottomSafeAreaPadding={false}
+            bottomContentStyle={styles.overflowVisible}
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
         >
             <View style={[styles.flex1, styles.flexRow]}>
                 <View style={[styles.flex1]}>
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
deleted file mode 100644
index dafac08c0109..000000000000
--- a/src/hooks/useFloatingTabBarContentInsetStyle/index.native.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {StyleProp, ViewStyle} from 'react-native';
-
-/** The native tab bar keeps content clear of itself, through the safe area on iOS and by laying it out above the bar on Android, so no extra content padding is needed. */
-function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
-    return undefined;
-}
-
-export default useFloatingTabBarContentInsetStyle;
diff --git a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts b/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
deleted file mode 100644
index 11b196072f9b..000000000000
--- a/src/hooks/useFloatingTabBarContentInsetStyle/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import type {StyleProp, ViewStyle} from 'react-native';
-
-/**
- * Bottom padding a tab root screen's scrollable content needs so its last row settles above the floating tab
- * bar instead of under it. Mobile web draws that bar in JS; iOS and Android take the sibling module, because
- * the native bar keeps the content clear of itself and needs no extra room.
- */
-function useFloatingTabBarContentInsetStyle(): StyleProp<ViewStyle> {
-    const styles = useThemeStyles();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-
-    return shouldUseNarrowLayout ? styles.floatingTabBarContentInset : undefined;
-}
-
-export default useFloatingTabBarContentInsetStyle;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
new file mode 100644
index 000000000000..ffbdb2f47cb9
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
@@ -0,0 +1,21 @@
+import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
+import homeIcon from '@assets/images/native-tab-icons/home.png';
+import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
+import profileIcon from '@assets/images/native-tab-icons/profile.png';
+import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
+
+/** The glyph each native tab draws, keyed by the tab's route name. The bar tints them for both selection states. */
+const NATIVE_TAB_ICONS = {
+    [SCREENS.HOME]: {type: 'image', source: homeIcon},
+    [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: {type: 'image', source: inboxIcon},
+    [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: {type: 'image', source: receiptMultipleIcon},
+    [NAVIGATORS.WORKSPACE_NAVIGATOR]: {type: 'image', source: buildingsIcon},
+    [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: {type: 'image', source: profileIcon},
+} as const satisfies Record<string, NativeBottomTabIcon>;
+
+export default NATIVE_TAB_ICONS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
new file mode 100644
index 000000000000..e6f5048de235
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -0,0 +1,84 @@
+import FloatingCameraButton from '@components/FloatingCameraButton';
+import FloatingGPSButton from '@components/FloatingGPSButton';
+import DebugTabView from '@components/Navigation/DebugTabView';
+import NavigationTabBar from '@components/Navigation/NavigationTabBar';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import useOnyx from '@hooks/useOnyx';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+
+import type {NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
+
+import React from 'react';
+import {View} from 'react-native';
+import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+
+type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0] & {
+    /** Distance from the bottom edge of the screen to the strip the floating buttons hang from, given the bottom safe area inset. */
+    getFloatingButtonsBottom: (bottomInset: number) => number;
+};
+
+/**
+ * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
+ * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
+ * navigator's screen options instead of being unmounted.
+ */
+function NativeTabLayout({children, state, descriptors, getFloatingButtonsBottom}: NativeTabLayoutProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
+    const styles = useThemeStyles();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+    const activeRoute = state.routes[state.index];
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    // The buttons follow whatever the navigator decided for the bar itself.
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
+
+    if (!shouldUseNarrowLayout) {
+        return (
+            <View style={[styles.flex1, styles.flexRow]}>
+                <View
+                    style={styles.tabNavigatorBarContainer}
+                    pointerEvents="box-none"
+                >
+                    <NavigationTabBar selectedTab={selectedTab} />
+                </View>
+                <View style={styles.flex1}>{children}</View>
+            </View>
+        );
+    }
+
+    return (
+        <View style={styles.flex1}>
+            {children}
+            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
+            {shouldShowNativeTabBar && (
+                // The buttons belong to the bar, so they fade with it rather than appearing in place. They leave
+                // faster than they come in, so they stop covering a bar that is still sliding out.
+                <Animated.View
+                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
+                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
+                    style={styles.nativeTabBarFloatingButtons(getFloatingButtonsBottom(bottomInset))}
+                    pointerEvents="box-none"
+                >
+                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
+                        <NavigationTabBarFloatingActionButton />
+                    </View>
+                    <FloatingGPSButton />
+                    <FloatingCameraButton />
+                </Animated.View>
+            )}
+        </View>
+    );
+}
+
+export default NativeTabLayout;
+export type {NativeTabLayoutProps};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
new file mode 100644
index 000000000000..e1f8c06975f0
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -0,0 +1,110 @@
+import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
+import useTheme from '@hooks/useTheme';
+import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
+
+import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
+import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import type {TabNavigatorParamList} from '@libs/Navigation/types';
+import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
+
+import CONST from '@src/CONST';
+import SCREENS from '@src/SCREENS';
+
+import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+import type {ValueOf} from 'type-fest';
+
+import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
+import {useEffect} from 'react';
+
+/**
+ * Root-level tab screens where the swipe-back gesture should be disabled.
+ * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
+ * WORKSPACE.INITIAL is intentionally excluded, since swiping back from it returns to the workspace list.
+ */
+const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
+
+const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
+    [NAVIGATION_TABS.INBOX]: INBOX_TAB_SPAN_IDS,
+    [NAVIGATION_TABS.SEARCH]: REPORTS_TAB_SPAN_IDS,
+};
+
+/** stale === false distinguishes a fully realized NavigationState from a PartialState. */
+function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
+    return state?.stale === false;
+}
+
+/**
+ * The state both native tab navigators share: whether the native bar shows, the status dot color of each tab that
+ * has one, and a router override that restores the tab state after the navigator is remounted. It also keeps the
+ * parent stack's swipe-back gesture, the preserved tab state and the tab-navigation spans in sync with the focused tab.
+ */
+function useNativeTabNavigator() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
+    const theme = useTheme();
+    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
+    const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
+    const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
+    const navigation = useNavigation();
+    const parentNavigation = navigation.getParent();
+    const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
+    const route = useRoute();
+    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
+    // `useNavigationState((s) => s)` here because the navigator's body runs before <Tab.Navigator>
+    // mounts, so the nearest navigation listener context is still the parent stack's.
+    const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
+    const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
+
+    let inboxDotColor: string | undefined;
+    if (chatTabBrickRoad) {
+        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
+    }
+    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
+    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
+
+    useEffect(() => {
+        if (!shouldUseNarrowLayout || !parentNavigation) {
+            return;
+        }
+        const isRootScreen = TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(focusedRouteName ?? '');
+        parentNavigation.setOptions({gestureEnabled: !isRootScreen});
+    }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
+
+    useEffect(() => {
+        if (!isRealizedNavigationState(tabState)) {
+            return;
+        }
+        setPreservedNavigatorState(route.key, tabState);
+    }, [tabState, route.key]);
+
+    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
+    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
+    useEffect(() => {
+        cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
+    }, [selectedTab]);
+
+    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
+    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
+    // state by overriding the bottom-tab router's getInitialState, the same pattern SplitRouter
+    // uses for its split navigators.
+    const tabRouterOverride = <Action extends NavigationAction>(
+        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
+    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
+        getInitialState: (configOptions) => {
+            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
+            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
+        },
+    });
+
+    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride};
+}
+
+export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
index ebbc2ed08711..9387848965af 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
@@ -1,50 +1,27 @@
-import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
-import homeIcon from '@assets/images/native-tab-icons/home.png';
-import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
-import profileIcon from '@assets/images/native-tab-icons/profile.png';
-import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
-
-import FloatingCameraButton from '@components/FloatingCameraButton';
-import FloatingGPSButton from '@components/FloatingGPSButton';
-import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
-import DebugTabView from '@components/Navigation/DebugTabView';
-import NavigationTabBar from '@components/Navigation/NavigationTabBar';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
-
-import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
-import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
-import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
-import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import HomePage from '@pages/home/HomePage';
-import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
-import CONST from '@src/CONST';
+import variables from '@styles/variables';
+
 import NAVIGATORS from '@src/NAVIGATORS';
-import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
-import type {NativeBottomTabIcon, NativeBottomTabNavigationOptions, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
-import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
 
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
-import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
-import React, {useEffect} from 'react';
-import {View} from 'react-native';
-import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+import React from 'react';
+
+import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
+import NATIVE_TAB_ICONS from './NativeTabNavigator/NATIVE_TAB_ICONS';
+import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
 import SettingsSplitNavigator from './SettingsSplitNavigator';
@@ -57,33 +34,9 @@ import WorkspaceNavigator from './WorkspaceNavigator';
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
-/**
- * Plain glyphs, recolored by the bar's own icon tint for both selection states. The account tab uses the profile
- * glyph rather than the avatar, because Android tints every tab icon and would flatten a photo to a silhouette.
- */
-const HOME_TAB_ICON = {type: 'image', source: homeIcon} as const satisfies NativeBottomTabIcon;
-const INBOX_TAB_ICON = {type: 'image', source: inboxIcon} as const satisfies NativeBottomTabIcon;
-const SPEND_TAB_ICON = {type: 'image', source: receiptMultipleIcon} as const satisfies NativeBottomTabIcon;
-const WORKSPACES_TAB_ICON = {type: 'image', source: buildingsIcon} as const satisfies NativeBottomTabIcon;
-const ACCOUNT_TAB_ICON = {type: 'image', source: profileIcon} as const satisfies NativeBottomTabIcon;
-
 /** An empty badge value makes Material draw its small dot badge instead of a number. */
 const STATUS_DOT_BADGE = '';
 
-/**
- * Root-level tab screens where the swipe-back gesture should be disabled.
- * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
- * WORKSPACE.INITIAL is intentionally excluded — swiping back from it returns to the workspace list.
- */
-const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
-
-type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
-
-/** stale === false distinguishes a fully realized NavigationState from a PartialState. */
-function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
-    return state?.stale === false;
-}
-
 /** Shows a status as a Material dot badge in its own color, or no badge at all. */
 function getStatusBadgeOptions(dotColor: string | undefined): Pick<NativeBottomTabNavigationOptions, 'tabBarBadge' | 'tabBarBadgeStyle'> {
     if (!dotColor) {
@@ -92,132 +45,26 @@ function getStatusBadgeOptions(dotColor: string | undefined): Pick<NativeBottomT
     return {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}};
 }
 
-/**
- * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
- * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
- * navigator's screen options instead of being unmounted.
- */
-function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
-    const styles = useThemeStyles();
-    const {bottom: bottomInset} = useSafeAreaInsets();
-    const activeRoute = state.routes[state.index];
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    // The buttons follow whatever the navigator decided for the bar itself.
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
-
-    if (!shouldUseNarrowLayout) {
-        return (
-            <View style={[styles.flex1, styles.flexRow]}>
-                <View
-                    style={styles.tabNavigatorBarContainer}
-                    pointerEvents="box-none"
-                >
-                    <NavigationTabBar selectedTab={selectedTab} />
-                </View>
-                <View style={styles.flex1}>{children}</View>
-            </View>
-        );
-    }
-
-    return (
-        <View style={styles.flex1}>
-            {children}
-            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
-            {shouldShowNativeTabBar && (
-                <Animated.View
-                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
-                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
-                    style={styles.nativeAndroidTabBarFloatingButtons(bottomInset)}
-                    pointerEvents="box-none"
-                >
-                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
-                        <NavigationTabBarFloatingActionButton />
-                    </View>
-                    <FloatingGPSButton />
-                    <FloatingCameraButton />
-                </Animated.View>
-            )}
-        </View>
-    );
-}
+/** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
+const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
 
-const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
+const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingButtonsBottom'>) => (
+    <NativeTabLayout
+        {...props}
+        getFloatingButtonsBottom={getFloatingButtonsBottom}
+    />
+);
 
 function TabNavigator() {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
-    const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
-    const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
-    const navigation = useNavigation();
-    const parentNavigation = navigation.getParent();
-    const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
-    const route = useRoute();
-    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
-    // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
-    // mounts, so the nearest navigation listener context is still the parent stack's.
-    const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
-    const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
-    const activeTabRouteName = isRealizedNavigationState(tabState) ? activeTabRoute?.name : SCREENS.HOME;
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
-
-    let inboxDotColor: string | undefined;
-    if (chatTabBrickRoad) {
-        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
-    }
-    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
-    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
-
-    useEffect(() => {
-        if (!shouldUseNarrowLayout || !parentNavigation) {
-            return;
-        }
-        const isRootScreen = TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(focusedRouteName ?? '');
-        parentNavigation.setOptions({gestureEnabled: !isRootScreen});
-    }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
-
-    useEffect(() => {
-        if (!isRealizedNavigationState(tabState)) {
-            return;
-        }
-        setPreservedNavigatorState(route.key, tabState);
-    }, [tabState, route.key]);
-
-    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
-    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
-    useEffect(() => {
-        let spans;
-        if (selectedTab === NAVIGATION_TABS.INBOX) {
-            spans = INBOX_TAB_SPAN_IDS;
-        } else if (selectedTab === NAVIGATION_TABS.SEARCH) {
-            spans = REPORTS_TAB_SPAN_IDS;
-        }
-        cancelTabNavigationSpans(spans);
-    }, [selectedTab]);
-
-    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
-    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
-    // state by overriding the bottom-tab router's getInitialState — the same pattern SplitRouter
-    // uses for its split navigators.
-    const tabRouterOverride = <Action extends NavigationAction>(
-        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
-    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
-        getInitialState: (configOptions) => {
-            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
-            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
-        },
-    });
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride} = useNativeTabNavigator();
 
     // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
     // selected tab has the menu icon color and a bold label in the regular text color, the others the plain icon
     // color and a supporting text label. The bar takes the raised surface tone with no top border.
-    const screenOptions = {
+    const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
         tabBarActiveTintColor: theme.iconMenu,
         tabBarInactiveTintColor: theme.icon,
@@ -225,9 +72,9 @@ function TabNavigator() {
         tabBarInactiveLabelColor: theme.textSupporting,
         tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
         tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
-        tabBarLabelVisibilityMode: 'labeled' as const,
+        tabBarLabelVisibilityMode: 'labeled',
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar ? ('flex' as const) : ('none' as const), backgroundColor: theme.highlightBG},
+        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.highlightBG},
     };
 
     return (
@@ -241,27 +88,39 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={{tabBarLabel: translate('common.home'), tabBarIcon: HOME_TAB_ICON}}
+                options={{tabBarLabel: translate('common.home'), tabBarIcon: NATIVE_TAB_ICONS[SCREENS.HOME]}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
-                options={{tabBarLabel: translate('common.inbox'), tabBarIcon: INBOX_TAB_ICON, ...getStatusBadgeOptions(inboxDotColor)}}
+                options={{
+                    tabBarLabel: translate('common.inbox'),
+                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.REPORTS_SPLIT_NAVIGATOR],
+                    ...getStatusBadgeOptions(inboxDotColor),
+                }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={{tabBarLabel: translate('common.spend'), tabBarIcon: SPEND_TAB_ICON}}
+                options={{tabBarLabel: translate('common.spend'), tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
-                options={{tabBarLabel: translate('common.workspacesTabTitle'), tabBarIcon: WORKSPACES_TAB_ICON, ...getStatusBadgeOptions(workspacesDotColor)}}
+                options={{
+                    tabBarLabel: translate('common.workspacesTabTitle'),
+                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.WORKSPACE_NAVIGATOR],
+                    ...getStatusBadgeOptions(workspacesDotColor),
+                }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
-                options={{tabBarLabel: translate('initialSettingsPage.account'), tabBarIcon: ACCOUNT_TAB_ICON, ...getStatusBadgeOptions(accountDotColor)}}
+                options={{
+                    tabBarLabel: translate('initialSettingsPage.account'),
+                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR],
+                    ...getStatusBadgeOptions(accountDotColor),
+                }}
             />
         </Tab.Navigator>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index f91dc85244fa..218a97fd29f0 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -1,57 +1,33 @@
-import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
-import homeIcon from '@assets/images/native-tab-icons/home.png';
-import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
-import profileIcon from '@assets/images/native-tab-icons/profile.png';
-import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
-
-import FloatingCameraButton from '@components/FloatingCameraButton';
-import FloatingGPSButton from '@components/FloatingGPSButton';
-import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
-import DebugTabView from '@components/Navigation/DebugTabView';
-import NavigationTabBar from '@components/Navigation/NavigationTabBar';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
-
-import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
-import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
-import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
 import {getAvatarURL} from '@libs/UserAvatarUtils';
 
 import HomePage from '@pages/home/HomePage';
-import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
 import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 
-import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
-import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
-import type {NativeBottomTabIcon, NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
-import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
+import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas} from '@shopify/react-native-skia';
 import type {ImageSourcePropType} from 'react-native';
 
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
-import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {BlendMode, ClipOp, FontWeight, ImageFormat, Skia} from '@shopify/react-native-skia';
 import React, {useEffect, useState} from 'react';
-import {Image, View} from 'react-native';
-import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+import {Image} from 'react-native';
 
+import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
+
+import NATIVE_TAB_ICONS from './NativeTabNavigator/NATIVE_TAB_ICONS';
+import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
 import SettingsSplitNavigator from './SettingsSplitNavigator';
@@ -63,31 +39,6 @@ import WorkspaceNavigator from './WorkspaceNavigator';
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
-/** Template icons, so the selected tab picks up the active color through the bar's own tint. */
-const HOME_TAB_ICON = {type: 'image', source: homeIcon} as const satisfies NativeBottomTabIcon;
-const INBOX_TAB_ICON = {type: 'image', source: inboxIcon} as const satisfies NativeBottomTabIcon;
-const SPEND_TAB_ICON = {type: 'image', source: receiptMultipleIcon} as const satisfies NativeBottomTabIcon;
-const WORKSPACES_TAB_ICON = {type: 'image', source: buildingsIcon} as const satisfies NativeBottomTabIcon;
-const ACCOUNT_TAB_ICON = {type: 'image', source: profileIcon} as const satisfies NativeBottomTabIcon;
-
-/** Every template icon the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
-const TAB_ICONS = [
-    [SCREENS.HOME, homeIcon],
-    [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, inboxIcon],
-    [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, receiptMultipleIcon],
-    [NAVIGATORS.WORKSPACE_NAVIGATOR, buildingsIcon],
-    [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, profileIcon],
-] as const;
-
-/**
- * Root-level tab screens where the swipe-back gesture should be disabled.
- * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
- * WORKSPACE.INITIAL is intentionally excluded — swiping back from it returns to the workspace list.
- */
-const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
-
-type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
-
 /** The recolored tab icons, with the signature of everything baked into them. */
 type TintedTabIcons = {signature: string; icons: Record<string, TintedTabIconPair>};
 
@@ -101,11 +52,6 @@ type CircularAvatarIcons = {signature: string; uri: string; active: AvatarTabIco
 let lastTintedIcons: TintedTabIcons | undefined;
 let lastCircularAvatar: CircularAvatarIcons | undefined;
 
-/** stale === false distinguishes a fully realized NavigationState from a PartialState. */
-function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
-    return state?.stale === false;
-}
-
 /** The recolored copies of one tab icon, one per selection state. */
 type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
@@ -281,89 +227,23 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     return {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale};
 }
 
-/**
- * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
- * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
- * navigator's screen options instead of being unmounted.
- */
-function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
-    const styles = useThemeStyles();
-    const activeRoute = state.routes[state.index];
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    // The buttons follow whatever the navigator decided for the bar itself.
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
-
-    if (!shouldUseNarrowLayout) {
-        return (
-            <View style={[styles.flex1, styles.flexRow]}>
-                <View
-                    style={styles.tabNavigatorBarContainer}
-                    pointerEvents="box-none"
-                >
-                    <NavigationTabBar selectedTab={selectedTab} />
-                </View>
-                <View style={styles.flex1}>{children}</View>
-            </View>
-        );
-    }
+/** Every glyph the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
+const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
 
-    return (
-        <View style={styles.flex1}>
-            {children}
-            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
-            {shouldShowNativeTabBar && (
-                // The buttons belong to the bar, so they fade with it rather than appearing in place. UIKit animates
-                // the bar itself over roughly the 0.35s it gives every bar, which the FAB's own timing already
-                // matches on the way in; it leaves faster so it stops covering the bar that is still sliding out.
-                <Animated.View
-                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
-                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
-                    style={styles.nativeTabBarFloatingButtons}
-                    pointerEvents="box-none"
-                >
-                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
-                        <NavigationTabBarFloatingActionButton />
-                    </View>
-                    <FloatingGPSButton />
-                    <FloatingCameraButton />
-                </Animated.View>
-            )}
-        </View>
-    );
-}
+const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
 
-const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
+const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingButtonsBottom'>) => (
+    <NativeTabLayout
+        {...props}
+        getFloatingButtonsBottom={getFloatingButtonsBottom}
+    />
+);
 
 function TabNavigator() {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {translate} = useLocalize();
     const theme = useTheme();
-    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
-    const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
-    const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const navigation = useNavigation();
-    const parentNavigation = navigation.getParent();
-    const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
-    const route = useRoute();
-    // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
-    // `useNavigationState((s) => s)` here because TabNavigator's body runs before <Tab.Navigator>
-    // mounts, so the nearest navigation listener context is still the parent stack's.
-    const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
-    const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
-    const activeTabRouteName = isRealizedNavigationState(tabState) ? activeTabRoute?.name : SCREENS.HOME;
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRouteName ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
-
-    let inboxDotColor: string | undefined;
-    if (chatTabBrickRoad) {
-        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
-    }
-    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
-    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride} = useNativeTabNavigator();
     const dotColors: Record<string, string | undefined> = {
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
@@ -435,10 +315,10 @@ function TabNavigator() {
     }, [iconsSignature]);
 
     /** Falls back to the template icon for a tab whose tinted copies could not be drawn, so it is never left without one. */
-    const getTabBarIcon = (name: string, fallbackIcon: NativeBottomTabIcon) => {
+    const getTabBarIcon = (name: keyof typeof NATIVE_TAB_ICONS) => {
         const pair = tintedIcons?.icons[name];
         if (!pair) {
-            return fallbackIcon;
+            return NATIVE_TAB_ICONS[name];
         }
         return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
     };
@@ -484,46 +364,6 @@ function TabNavigator() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [avatarSignature]);
 
-    useEffect(() => {
-        if (!shouldUseNarrowLayout || !parentNavigation) {
-            return;
-        }
-        const isRootScreen = TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(focusedRouteName ?? '');
-        parentNavigation.setOptions({gestureEnabled: !isRootScreen});
-    }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
-
-    useEffect(() => {
-        if (!isRealizedNavigationState(tabState)) {
-            return;
-        }
-        setPreservedNavigatorState(route.key, tabState);
-    }, [tabState, route.key]);
-
-    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
-    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
-    useEffect(() => {
-        let spans;
-        if (selectedTab === NAVIGATION_TABS.INBOX) {
-            spans = INBOX_TAB_SPAN_IDS;
-        } else if (selectedTab === NAVIGATION_TABS.SEARCH) {
-            spans = REPORTS_TAB_SPAN_IDS;
-        }
-        cancelTabNavigationSpans(spans);
-    }, [selectedTab]);
-
-    // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
-    // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
-    // state by overriding the bottom-tab router's getInitialState — the same pattern SplitRouter
-    // uses for its split navigators.
-    const tabRouterOverride = <Action extends NavigationAction>(
-        originalRouter: Router<TabNavigationState<TabNavigatorParamList>, Action>,
-    ): Partial<Router<TabNavigationState<TabNavigatorParamList>, Action>> => ({
-        getInitialState: (configOptions) => {
-            const preserved = getPreservedNavigatorState<TabNavigationState<TabNavigatorParamList>>(route.key);
-            return preserved ? originalRouter.getRehydratedState(preserved, configOptions) : originalRouter.getInitialState(configOptions);
-        },
-    });
-
     const screenOptions = {
         headerShown: false,
         tabBarActiveTintColor: theme.iconMenu,
@@ -547,27 +387,27 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.HOME, HOME_TAB_ICON)}}
+                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.HOME)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
                 options={{
                     tabBarLabel: '',
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, INBOX_TAB_ICON),
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR),
                 }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SPEND_TAB_ICON)}}
+                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
                 options={{
                     tabBarLabel: '',
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR, WORKSPACES_TAB_ICON),
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR),
                 }}
             />
             <Tab.Screen
@@ -577,7 +417,7 @@ function TabNavigator() {
                     tabBarLabel: '',
                     tabBarIcon: avatarPair
                         ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive)
-                        : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, ACCOUNT_TAB_ICON),
+                        : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
                 }}
             />
         </Tab.Navigator>
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index f2de7991eab1..943dfa433a3e 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,11 +1,12 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -55,7 +56,6 @@ type InsightsDashboardContentProps = {
 
 function InsightsDashboardContent({dashboardID, hash, state, filters, onRetry, onGroupByChange}: InsightsDashboardContentProps) {
     const styles = useThemeStyles();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const theme = useTheme();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -107,7 +107,7 @@ function InsightsDashboardContent({dashboardID, hash, state, filters, onRetry, o
 
     return (
         <ScrollView
-            contentContainerStyle={[styles.flexGrow1, styles.ph5, styles.pb5, floatingTabBarContentInsetStyle]}
+            contentContainerStyle={[styles.flexGrow1, styles.ph5, styles.pb5]}
             addBottomSafeAreaPadding
         >
             <View style={styles.insightsDashboardLayout}>
@@ -180,6 +180,7 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
         <ScreenWrapper
             shouldShowOfflineIndicatorInWideScreen
             enableEdgeToEdgeBottomSafeAreaPadding={false}
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
             testID="InsightsPage"
         >
             <TopBar
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 91c2f19c5e40..edf7b49e5cd3 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -1,5 +1,7 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import PulsingView from '@components/PulsingView';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -15,7 +17,6 @@ import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useLoadingBarVisibility} from '@hooks/useInFlightRequests';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -76,6 +77,8 @@ type SearchPageNarrowProps = {
     isOverlayActive: boolean;
 };
 
+const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SEARCH} />;
+
 function SearchPageNarrow({
     queryJSON,
     searchResults,
@@ -97,7 +100,6 @@ function SearchPageNarrow({
     const {translate} = useLocalize();
     const {windowHeight} = useWindowDimensions();
     const styles = useThemeStyles();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const StyleUtils = useStyleUtils();
     const {clearSelectedTransactions} = useSearchSelectionActions();
     const {shouldUseLiveData} = useSearchResultsContext();
@@ -244,7 +246,7 @@ function SearchPageNarrow({
     const isDataLoaded = shouldUseLiveData || isSearchDataLoaded(searchResults, queryJSON);
     // Use the request state because `isLoading` also covers temporary UI loading that should not keep this bar visible.
     const shouldShowLoadingState = !isOffline && (!isDataLoaded || isSearchPending(searchResults));
-    const contentContainerStyle = [!isMobileSelectionModeEnabled && styles.searchListContentContainerStyles(hasFilterBars), floatingTabBarContentInsetStyle];
+    const contentContainerStyle = !isMobileSelectionModeEnabled ? styles.searchListContentContainerStyles(hasFilterBars) : undefined;
 
     const shouldRenderLayoutProbe = (isOverlayActive || !isHeaderInteractive) && !searchOverlayContent;
 
@@ -263,6 +265,8 @@ function SearchPageNarrow({
                     shouldEnableMaxHeight
                     offlineIndicatorStyle={styles.mtAuto}
                     shouldShowOfflineIndicator={!!searchResults}
+                    bottomContent={tabBarContent}
+                    bottomContentStyle={styles.overflowVisible}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index f8996096591e..64187a0751d4 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -1,12 +1,13 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDocumentTitle from '@hooks/useDocumentTitle';
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -46,7 +47,6 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
     const {singleExecution, isExecuting} = useSingleExecution();
     const activeRoute = useNavigationState((state) => findFocusedRoute(state)?.name);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {translate} = useLocalize();
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const domainAccountID = route.params?.domainAccountID;
@@ -102,6 +102,8 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
         <ScreenWrapper
             testID="DomainInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
+            bottomContentStyle={styles.overflowVisible}
         >
             <FullPageNotFoundView
                 onBackButtonPress={() => Navigation.dismissModal()}
@@ -119,7 +121,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView contentContainerStyle={[styles.flexColumn, floatingTabBarContentInsetStyle]}>
+                <ScrollView contentContainerStyle={styles.flexColumn}>
                     <View style={[styles.pb4, styles.mh3, styles.mt3]}>
                         {/*
                             Ideally we should use MenuList component for MenuItems with singleExecution/Navigation actions.
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 37e64daae6d3..55dd8d0cfda3 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,11 +1,12 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useDocumentTitle from '@hooks/useDocumentTitle';
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import {useAppLoadSkeletonVisibility} from '@hooks/useInFlightRequests';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -40,7 +41,6 @@ const RIGHT_COLUMN_TEST_ID = 'homePageRightColumn';
 
 function HomePage() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
@@ -141,6 +141,8 @@ function HomePage() {
                     shouldShowOfflineIndicatorInWideScreen
                     testID="HomePage"
                     enableEdgeToEdgeBottomSafeAreaPadding={false}
+                    bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.HOME} />}
+                    bottomContentStyle={styles.overflowVisible}
                 >
                     <TopBar
                         breadcrumbLabel={translate('common.home')}
@@ -149,7 +151,7 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
-                        contentContainerStyle={[styles.homePageContentContainer, floatingTabBarContentInsetStyle]}
+                        contentContainerStyle={styles.homePageContentContainer}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >
diff --git a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
index d59654609135..dd92d4ecd347 100644
--- a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
+++ b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
@@ -1,3 +1,5 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -38,6 +40,8 @@ function BaseSidebarScreen() {
             shouldEnableKeyboardAvoidingView={false}
             style={[styles.sidebar, isMobile() ? styles.userSelectNone : {}]}
             testID="BaseSidebarScreen"
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INBOX} />}
+            bottomContentStyle={styles.overflowVisible}
         >
             {({insets}) => (
                 <>
diff --git a/src/pages/inbox/sidebar/SidebarLinks.tsx b/src/pages/inbox/sidebar/SidebarLinks.tsx
index b3a8b235c55c..6af8512410a8 100644
--- a/src/pages/inbox/sidebar/SidebarLinks.tsx
+++ b/src/pages/inbox/sidebar/SidebarLinks.tsx
@@ -2,7 +2,6 @@ import LHNEmptyState from '@components/LHNOptionsList/LHNEmptyState';
 import LHNOptionsList from '@components/LHNOptionsList/LHNOptionsList';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {useSidebarOrderedReportsActions} from '@hooks/useSidebarOrderedReports';
@@ -16,8 +15,6 @@ import {cancelSpan} from '@libs/telemetry/activeSpans';
 
 import * as ReportActionContextMenu from '@pages/inbox/report/ContextMenu/ReportActionContextMenu';
 
-import variables from '@styles/variables';
-
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -47,7 +44,6 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {setStickyReportID} = useSidebarOrderedReportsActions();
     const [isLoadingReportData = true] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
 
@@ -83,11 +79,7 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
 
     const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
 
-    // The floating tab bar covers the end of the list above the home indicator, so its footprint adds to the safe
-    // area padding instead of replacing it. Only the platforms that draw that bar in JS report an inset.
-    const safeAreaMarginBottom = StyleUtils.getSafeAreaMargins(insets).marginBottom;
-    const safeAreaPaddingBottom = typeof safeAreaMarginBottom === 'number' ? safeAreaMarginBottom : 0;
-    const contentContainerStyles = StyleSheet.flatten([styles.pt2, {paddingBottom: safeAreaPaddingBottom + (floatingTabBarContentInsetStyle ? variables.floatingTabBarContentInset : 0)}]);
+    const contentContainerStyles = StyleSheet.flatten([styles.pt2, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]);
 
     const shouldShowEmptyLHN = optionListItems.length === 0;
 
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index a7ae7b41251d..0940a3450b95 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -1,6 +1,8 @@
 import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherButton from '@components/AccountSwitcherButton';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -9,7 +11,6 @@ import Text from '@components/Text';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePrevious from '@hooks/usePrevious';
@@ -46,8 +47,8 @@ type InitialSettingsPageProps = WithCurrentUserPersonalDetailsProps;
 
 function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPageProps) {
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
+    const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SETTINGS} />;
     const styles = useThemeStyles();
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
@@ -153,6 +154,8 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             includeSafeAreaPaddingBottom
             testID="InitialSettingsPage"
             shouldEnableKeyboardAvoidingView={false}
+            bottomContent={tabBarContent}
+            bottomContentStyle={styles.overflowVisible}
         >
             <TopBarWithLoadingBar
                 breadcrumbLabel={translate('initialSettingsPage.account')}
@@ -170,7 +173,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 ref={scrollViewRef}
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
-                contentContainerStyle={[styles.w100, floatingTabBarContentInsetStyle]}
+                contentContainerStyle={[styles.w100]}
                 showsVerticalScrollIndicator={false}
             >
                 {headerContent}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index e09d970530f4..5beb127fe3d2 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -1,13 +1,14 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
 import useCardFeedErrors from '@hooks/useCardFeedErrors';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
-import useFloatingTabBarContentInsetStyle from '@hooks/useFloatingTabBarContentInsetStyle';
 import useGetReceiptPartnersIntegrationData from '@hooks/useGetReceiptPartnersIntegrationData';
 import useIsWorkspacesTabFocused from '@hooks/useIsWorkspacesTabFocused';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -68,7 +69,6 @@ function dismissError(policyID: string | undefined, pendingAction: PendingAction
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const floatingTabBarContentInsetStyle = useFloatingTabBarContentInsetStyle();
     const {translate} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
     const {isBetaEnabled} = usePermissions();
@@ -224,6 +224,8 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         <ScreenWrapper
             testID="WorkspaceInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
+            bottomContentStyle={styles.overflowVisible}
         >
             <FullPageNotFoundView
                 onBackButtonPress={goBackFromWorkspaceSettingPages}
@@ -245,7 +247,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14, floatingTabBarContentInsetStyle]}>
+                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14]}>
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
                         onClose={() => dismissError(policyID, policy?.pendingAction)}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index edafb3dc2af1..5365e6d571b3 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -768,10 +768,9 @@ const staticStyles = (theme: ThemeColors) =>
             marginHorizontal: -variables.floatingTabBarSelectedOverhang,
         },
 
-        // Ends a tab root screen's scrollable content above the floating bar, so its last row stays reachable
-        // while everything scrolled past it still passes under the bar.
-        floatingTabBarContentInset: {
-            paddingBottom: variables.floatingTabBarContentInset,
+        // The gap between the floating bar and the bottom edge of the screen.
+        floatingTabBarBottomInset: {
+            paddingBottom: variables.floatingTabBarBottomInset,
         },
 
         // Used both for a tab's pressable and for the wrapper around its icon and label.
@@ -788,17 +787,6 @@ const staticStyles = (theme: ThemeColors) =>
             marginVertical: (variables.iconFloatingTabBar - variables.avatarFloatingTabBar) / 2,
         },
 
-        // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
-        // against it without taking part in the tab screen's layout.
-        nativeTabBarFloatingButtons: {
-            position: 'absolute',
-            right: 0,
-            bottom: variables.bottomTabHeight + spacing.gap3.gap,
-            left: 0,
-            height: 0,
-            zIndex: 10,
-        },
-
         navigationTabBarFABItem: {
             display: 'flex',
             justifyContent: 'center',
@@ -6916,13 +6904,13 @@ const staticStyles = (theme: ThemeColors) =>
 
 const dynamicStyles = (theme: ThemeColors) =>
     ({
-        // Android's native bar is Material's 80 dp row plus the system gesture inset, so the strip the floating
-        // buttons hang from sits above both, with Material's 16 dp gap between the FAB and the bar.
-        nativeAndroidTabBarFloatingButtons: (bottomInset: number) =>
+        // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
+        // against it without taking part in the tab screen's layout.
+        nativeTabBarFloatingButtons: (bottom: number) =>
             ({
                 position: 'absolute',
                 right: 0,
-                bottom: variables.androidNativeTabBarHeight + bottomInset + spacing.gap4.gap,
+                bottom,
                 left: 0,
                 height: 0,
                 zIndex: 10,
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 8d3426cd5cf1..ead5cb0e6631 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -59,7 +59,7 @@ const darkTheme = {
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
-    // green700 at 50%
+    // selectedOptionBG (green700) at 50%
     androidTabBarActiveIndicatorBG: 'rgba(8,82,57,0.50)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 080a8525e420..481c0c1ff453 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -59,7 +59,7 @@ const lightTheme = {
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
-    // green100 at 50%
+    // selectedOptionBG (green100) at 50%
     androidTabBarActiveIndicatorBG: 'rgba(177,242,214,0.50)',
     heading: colors.productLight900,
     textLight: colors.white,
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index ad157d46470f..860fc9f0f785 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -2521,8 +2521,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         }
     },
 
-    // The negative top margin keeps the bar out of the layout flow, so the screen content it floats above
-    // reaches the bottom edge of the screen instead of ending where the bar starts.
     getTabBarNarrowStyle: (safeAreaPaddingBottom: number): ViewStyle => ({
         overflow: 'visible',
         marginTop: -(variables.floatingTabBarHeight + variables.floatingTabBarBottomInset + safeAreaPaddingBottom),
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 285d1d37f55c..e3c99ec84149 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -39,8 +39,6 @@ export default {
     // How far the selected pill reaches past its tab on each side, whatever the label's length.
     floatingTabBarSelectedOverhang: 4,
     floatingTabBarBottomInset,
-    // Vertical space the floating bar takes over the content it hides, so scrollable content can end above it.
-    floatingTabBarContentInset: floatingTabBarHeight + floatingTabBarBottomInset,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
     debugTabViewHeight: 64,
     contentHeaderHeight: getValueUsingPixelRatio(72, 100),
@@ -119,8 +117,10 @@ export default {
     nativeTabIconLabelGap: 6,
     /** Pixel density the native tab bar icons are rasterized at. */
     nativeTabIconScale: 3,
-    /** Height of Material's BottomNavigationView row on Android, without the gesture inset under it. */
-    androidNativeTabBarHeight: 80,
+    /** Material's 80 dp BottomNavigationView row plus the 16 dp Material keeps between a FAB and the bar, without the gesture inset under it. */
+    androidNativeTabBarFloatingButtonsBottom: 96,
+    /** UITabBar with the home indicator inset under it, plus a 12 pt gap to the floating buttons. */
+    iosNativeTabBarFloatingButtonsBottom: 84,
     iconHeader: 48,
     iconSection: 68,
     iouAmountTextSize: 40,
diff --git a/tests/ui/BaseSidebarScreenTest.tsx b/tests/ui/BaseSidebarScreenTest.tsx
index eaf55a117f57..1daf35d456c8 100644
--- a/tests/ui/BaseSidebarScreenTest.tsx
+++ b/tests/ui/BaseSidebarScreenTest.tsx
@@ -43,6 +43,7 @@ jest.mock('@components/ScreenWrapper', () => {
 });
 
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => () => null);
+jest.mock('@components/Navigation/TabBarBottomContent', () => () => null);
 jest.mock('@pages/inbox/sidebar/InboxTabSelector', () => () => null);
 jest.mock('@components/OptionsListSkeletonView', () => {
     const ReactModule = jest.requireActual<typeof React>('react');
diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index b5f8f38ece19..a5cef1a0dfff 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -85,6 +85,14 @@ jest.mock('@components/AccountSwitcherSkeletonView', () => {
     return MockAccountSwitcherSkeletonView;
 });
 
+jest.mock('@components/Navigation/TabBarBottomContent', () => {
+    function MockTabBarBottomContent() {
+        return null;
+    }
+    MockTabBarBottomContent.displayName = 'TabBarBottomContent';
+    return MockTabBarBottomContent;
+});
+
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => {
     function MockTopBarWithLoadingBar() {
         return null;
diff --git a/tests/ui/WorkspaceInitialPageTest.tsx b/tests/ui/WorkspaceInitialPageTest.tsx
index bd6e7a5f51b4..d056856626cb 100644
--- a/tests/ui/WorkspaceInitialPageTest.tsx
+++ b/tests/ui/WorkspaceInitialPageTest.tsx
@@ -66,6 +66,7 @@ jest.mock('@hooks/useWorkspaceAccountID', () => jest.fn());
 jest.mock('@components/BlockingViews/FullPageNotFoundView', () => (props: {children: React.ReactNode; shouldShow: boolean}) => mockFullPageNotFoundView(props));
 jest.mock('@components/HeaderWithBackButton', () => jest.fn());
 jest.mock('@components/HighlightableMenuItem', () => jest.fn());
+jest.mock('@components/Navigation/TabBarBottomContent', () => jest.fn());
 jest.mock(
     '@components/OfflineWithFeedback',
     () =>

From 161e4e720b192976126c808be61f0bc0c7b29cdc Mon Sep 17 00:00:00 2001
From: KJ21-ENG <140263938+KJ21-ENG@users.noreply.github.com>
Date: Wed, 30 Sep 2026 14:47:29 +0530
Subject: [PATCH 204/781] Address reviewer findings in deployment and UI
 assertion cleanup

---
 .../getDeployPullRequestList.ts               |   6 +-
 .../getDeployPullRequestList/index.js         |   6 +-
 src/components/AutoSubmitModal.tsx            |   3 +-
 .../EmojiPicker/CategoryShortcutButton.tsx    |   8 +-
 .../tooling/getDeployPullRequestList.test.ts  |   3 +
 tests/ui/components/ConfirmationPageTest.tsx  |  79 +++++++++
 .../IOURequestStepConfirmationPageTest.tsx    |  63 -------
 tests/unit/CategoryShortcutBarTest.tsx        | 166 ++++++++++++++++++
 tests/unit/EmojiPickerMenuTest.tsx            |  97 +---------
 9 files changed, 264 insertions(+), 167 deletions(-)
 create mode 100644 tests/ui/components/ConfirmationPageTest.tsx
 create mode 100644 tests/unit/CategoryShortcutBarTest.tsx

diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
index 99882df715bd..25ac16ad11fb 100644
--- a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
+++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -84,9 +84,9 @@ async function run() {
         }
         core.setOutput('MOBILE_EXPENSIFY_PR_LIST', mobileExpensifyPRList);
     } catch (error) {
-        const failure = error instanceof Error ? error : String(error);
-        console.error(failure instanceof Error ? failure.message : failure);
-        core.setFailed(failure);
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(message);
+        core.setFailed(error instanceof Error ? error : message);
     }
 }
 
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index a6a784bfee67..84ab57084645 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -26271,9 +26271,9 @@ async function run() {
     }
     setOutput("MOBILE_EXPENSIFY_PR_LIST", mobileExpensifyPRList);
   } catch (error2) {
-    const failure = error2 instanceof Error ? error2 : String(error2);
-    console.error(failure instanceof Error ? failure.message : failure);
-    setFailed(failure);
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    console.error(message);
+    setFailed(error2 instanceof Error ? error2 : message);
   }
 }
 if (import.meta.main) {
diff --git a/src/components/AutoSubmitModal.tsx b/src/components/AutoSubmitModal.tsx
index 4801727b74fe..14f23760e0d0 100644
--- a/src/components/AutoSubmitModal.tsx
+++ b/src/components/AutoSubmitModal.tsx
@@ -16,6 +16,7 @@ import {dismissASAPSubmitExplanation} from '@userActions/User';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type IconAsset from '@src/types/utils/IconAsset';
 
 import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
@@ -45,7 +46,7 @@ function AutoSubmitModal() {
                     descriptionTranslationKey: 'autoSubmitModal.pendingExpensesDescription',
                 },
             ] satisfies Array<{
-                icon: (typeof illustrations)['PaperAirplane' | 'Pencil'];
+                icon: IconAsset;
                 titleTranslationKey: TranslationPaths;
                 descriptionTranslationKey: TranslationPaths;
             }>,
diff --git a/src/components/EmojiPicker/CategoryShortcutButton.tsx b/src/components/EmojiPicker/CategoryShortcutButton.tsx
index c26adc9654fd..44790c1606cb 100644
--- a/src/components/EmojiPicker/CategoryShortcutButton.tsx
+++ b/src/components/EmojiPicker/CategoryShortcutButton.tsx
@@ -8,6 +8,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getButtonState from '@libs/getButtonState';
+import Log from '@libs/Log';
 
 import variables from '@styles/variables';
 
@@ -50,8 +51,11 @@ function CategoryShortcutButton({code, icon, onPress, isSelected = false}: Categ
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const [isHighlighted, setIsHighlighted] = useState(false);
-    const translationKey = CATEGORY_TRANSLATION_KEYS.get(code) ?? FALLBACK_CATEGORY_TRANSLATION_KEY;
-    const label = translate(translationKey);
+    const translationKey = CATEGORY_TRANSLATION_KEYS.get(code);
+    if (!translationKey) {
+        Log.alert(`No emoji category translation mapped for code: ${code}`);
+    }
+    const label = translate(translationKey ?? FALLBACK_CATEGORY_TRANSLATION_KEY);
 
     return (
         <Tooltip
diff --git a/tests/tooling/getDeployPullRequestList.test.ts b/tests/tooling/getDeployPullRequestList.test.ts
index 434bd8c95c8d..2cb87bbc4a83 100644
--- a/tests/tooling/getDeployPullRequestList.test.ts
+++ b/tests/tooling/getDeployPullRequestList.test.ts
@@ -39,10 +39,13 @@ afterEach(() => {
 describe('getDeployPullRequestList', () => {
     for (const {name, rejection, expectedConsoleValue} of rejectionCases) {
         it(`reports a rejected ${name} without a secondary failure`, async () => {
+            // Given release lookup can reject with an Error or a non-Error value.
             paginateSpy.mockRejectedValueOnce(rejection);
 
+            // When deployment-list generation encounters that rejection.
             await expect(run()).resolves.toBeUndefined();
 
+            // Then reporting preserves Error identity and safely normalizes every other shape.
             expect(consoleErrorSpy).toHaveBeenCalledTimes(1);
             expect(consoleErrorSpy).toHaveBeenCalledWith(expectedConsoleValue);
             expect(setFailedSpy).toHaveBeenCalledTimes(1);
diff --git a/tests/ui/components/ConfirmationPageTest.tsx b/tests/ui/components/ConfirmationPageTest.tsx
new file mode 100644
index 000000000000..ac6d11ce3976
--- /dev/null
+++ b/tests/ui/components/ConfirmationPageTest.tsx
@@ -0,0 +1,79 @@
+import {render} from '@testing-library/react-native';
+
+import ConfirmationPage from '@components/ConfirmationPage';
+import type {ConfirmationPageProps} from '@components/ConfirmationPage';
+import Lottie from '@components/Lottie';
+
+import React from 'react';
+// Use React Native Animated to exercise the native Animated.Value dimension accepted by ViewStyle.
+// eslint-disable-next-line no-restricted-imports
+import {Animated} from 'react-native';
+
+jest.mock('@components/Lottie', () => ({
+    __esModule: true,
+    default: jest.fn(() => null),
+}));
+
+function renderConfirmationAndGetWebStyle(illustrationStyle?: ConfirmationPageProps['illustrationStyle']) {
+    render(
+        <ConfirmationPage
+            heading="Done"
+            illustrationStyle={illustrationStyle}
+        />,
+    );
+    const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
+    expect(lottieProps).toBeDefined();
+    if (!lottieProps) {
+        throw new Error('ConfirmationPage did not render Lottie');
+    }
+    return lottieProps.webStyle;
+}
+
+describe('ConfirmationPage Lottie web dimensions', () => {
+    afterEach(() => {
+        jest.mocked(Lottie).mockClear();
+    });
+
+    it('preserves compatible dimensions and independently defaults absent dimensions', () => {
+        // Given the default dimensions remain available for independently missing width and height.
+        const defaults = renderConfirmationAndGetWebStyle();
+        expect(defaults).toBeDefined();
+        expect(defaults?.width).toBeDefined();
+        expect(defaults?.height).toBeDefined();
+
+        // When styles provide supported web dimensions, including a zero width and percentages.
+        const zeroWidthStyle = renderConfirmationAndGetWebStyle({width: 0, height: 96});
+        const percentageHeightStyle = renderConfirmationAndGetWebStyle({width: 48, height: '75%'});
+        const missingHeightStyle = renderConfirmationAndGetWebStyle({width: '50%'});
+        const missingWidthStyle = renderConfirmationAndGetWebStyle({height: 64});
+
+        // Then supported dimensions survive and each omitted dimension retains its default.
+        expect(zeroWidthStyle).toMatchObject({width: 0, height: 96});
+        expect(percentageHeightStyle).toMatchObject({width: 48, height: '75%'});
+        expect(missingHeightStyle).toMatchObject({width: '50%', height: defaults?.height});
+        expect(missingWidthStyle).toMatchObject({width: defaults?.width, height: 64});
+    });
+
+    it('defaults an animated width only at the web boundary and preserves the native style', () => {
+        // Given a native animated width cannot be passed to the web animation renderer.
+        const defaultWebStyle = renderConfirmationAndGetWebStyle();
+        expect(defaultWebStyle).toBeDefined();
+        if (!defaultWebStyle) {
+            throw new Error('ConfirmationPage did not provide default Lottie web dimensions');
+        }
+        const animatedWidth = new Animated.Value(40);
+
+        // When the shared component receives both animated and supported dimensions.
+        render(
+            <ConfirmationPage
+                heading="Done"
+                illustrationStyle={{width: animatedWidth, height: '75%'}}
+            />,
+        );
+        const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
+        expect(lottieProps).toBeDefined();
+        // Then only the web width falls back while the native animation keeps its style.
+        expect(lottieProps?.webStyle).toEqual({width: defaultWebStyle.width, height: '75%'});
+        expect(lottieProps?.style).toEqual(expect.arrayContaining([expect.objectContaining({width: animatedWidth, height: '75%'})]));
+    });
+});
diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
index 8fab676e73e5..61fadcd4b4e4 100644
--- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
+++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
@@ -1,11 +1,8 @@
 import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 
-import ConfirmationPage from '@components/ConfirmationPage';
-import type {ConfirmationPageProps} from '@components/ConfirmationPage';
 import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import HTMLEngineProvider from '@components/HTMLEngineProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import Lottie from '@components/Lottie';
 import * as ConfirmAction from '@components/MoneyRequestConfirmationList/confirmAction';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import type {ParticipantPickerProps} from '@components/ParticipantPicker/types';
@@ -33,9 +30,6 @@ import type {WaypointCollection} from '@src/types/onyx/Transaction';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
-// Use React Native Animated to exercise the native Animated.Value dimension accepted by ViewStyle.
-// eslint-disable-next-line no-restricted-imports
-import {Animated} from 'react-native';
 import Onyx from 'react-native-onyx';
 import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
 
@@ -47,11 +41,6 @@ import createMockScreenNavigation from '../../utils/createMockScreenNavigation';
 import {setupGlobalFetchMock, signInWithTestUser, translateLocal} from '../../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
 
-jest.mock('@components/Lottie', () => ({
-    __esModule: true,
-    default: jest.fn(() => null),
-}));
-
 jest.mock('@rnmapbox/maps', () => {
     return {
         default: jest.fn(),
@@ -325,21 +314,6 @@ function createWaypoints(startAddress: string, endAddress: string): WaypointColl
     };
 }
 
-function renderConfirmationAndGetWebStyle(illustrationStyle?: ConfirmationPageProps['illustrationStyle']) {
-    render(
-        <ConfirmationPage
-            heading="Done"
-            illustrationStyle={illustrationStyle}
-        />,
-    );
-    const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
-    expect(lottieProps).toBeDefined();
-    if (!lottieProps) {
-        throw new Error('ConfirmationPage did not render Lottie');
-    }
-    return lottieProps.webStyle;
-}
-
 const DEFAULT_SPLIT_TRANSACTION: Transaction = {
     amount: 0,
     isAmountSet: true,
@@ -364,43 +338,6 @@ const DEFAULT_SPLIT_TRANSACTION: Transaction = {
     transactionID: TRANSACTION_ID,
 };
 
-describe('ConfirmationPage Lottie web dimensions', () => {
-    afterEach(() => {
-        jest.mocked(Lottie).mockClear();
-    });
-
-    it('preserves compatible dimensions and independently defaults absent dimensions', () => {
-        const defaults = renderConfirmationAndGetWebStyle();
-        expect(defaults).toBeDefined();
-        expect(defaults?.width).toBeDefined();
-        expect(defaults?.height).toBeDefined();
-
-        expect(renderConfirmationAndGetWebStyle({width: 0, height: 96})).toMatchObject({width: 0, height: 96});
-        expect(renderConfirmationAndGetWebStyle({width: 48, height: '75%'})).toMatchObject({width: 48, height: '75%'});
-        expect(renderConfirmationAndGetWebStyle({width: '50%'})).toMatchObject({width: '50%', height: defaults?.height});
-        expect(renderConfirmationAndGetWebStyle({height: 64})).toMatchObject({width: defaults?.width, height: 64});
-    });
-
-    it('defaults an animated width only at the web boundary and preserves the native style', () => {
-        const defaultWebStyle = renderConfirmationAndGetWebStyle();
-        expect(defaultWebStyle).toBeDefined();
-        if (!defaultWebStyle) {
-            throw new Error('ConfirmationPage did not provide default Lottie web dimensions');
-        }
-        const animatedWidth = new Animated.Value(40);
-        render(
-            <ConfirmationPage
-                heading="Done"
-                illustrationStyle={{width: animatedWidth, height: '75%'}}
-            />,
-        );
-        const lottieProps = jest.mocked(Lottie).mock.calls.at(-1)?.at(0);
-        expect(lottieProps).toBeDefined();
-        expect(lottieProps?.webStyle).toEqual({width: defaultWebStyle.width, height: '75%'});
-        expect(lottieProps?.style).toEqual(expect.arrayContaining([expect.objectContaining({width: animatedWidth, height: '75%'})]));
-    });
-});
-
 describe('IOURequestStepConfirmationPageTest', () => {
     // Writes fired during render (e.g. UpdatePreferredLocale) must not hit the real network and leave retry backoff across tests
     setupGlobalFetchMock();
diff --git a/tests/unit/CategoryShortcutBarTest.tsx b/tests/unit/CategoryShortcutBarTest.tsx
new file mode 100644
index 000000000000..9d3b12636d02
--- /dev/null
+++ b/tests/unit/CategoryShortcutBarTest.tsx
@@ -0,0 +1,166 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import emojis, {categoryFrequentlyUsed} from '@assets/emojis';
+
+import CategoryShortcutBar from '@components/EmojiPicker/CategoryShortcutBar';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import Tooltip from '@components/Tooltip';
+import type {TooltipExtendedProps} from '@components/Tooltip/types';
+
+import {getHeaderEmojis} from '@libs/EmojiUtils';
+import Log from '@libs/Log';
+
+import IntlStore from '@src/languages/IntlStore';
+import type {TranslationPaths} from '@src/languages/types';
+import {defaultTheme} from '@src/styles/theme';
+
+import React from 'react';
+
+import {translateLocal} from '../utils/TestHelper';
+
+jest.mock('@components/Tooltip', () => ({
+    __esModule: true,
+    default: jest.fn(({children}: TooltipExtendedProps) => children),
+}));
+
+const productionHeaders = getHeaderEmojis([categoryFrequentlyUsed, ...emojis]);
+const expectedTranslationPaths: TranslationPaths[] = [
+    'emojiPicker.headers.frequentlyUsed',
+    'emojiPicker.headers.smileysAndEmotion',
+    'emojiPicker.headers.animalsAndNature',
+    'emojiPicker.headers.foodAndDrink',
+    'emojiPicker.headers.travelAndPlaces',
+    'emojiPicker.headers.activities',
+    'emojiPicker.headers.objects',
+    'emojiPicker.headers.symbols',
+    'emojiPicker.headers.flags',
+];
+
+describe('CategoryShortcutBar', () => {
+    const alertSpy = jest.spyOn(Log, 'alert').mockImplementation(() => {});
+
+    beforeEach(async () => {
+        await IntlStore.load('en');
+        jest.mocked(Tooltip).mockClear();
+        alertSpy.mockClear();
+    });
+
+    afterAll(() => {
+        alertSpy.mockRestore();
+    });
+
+    it('uses the production translation for every category tooltip and accessible label', () => {
+        // Given the production headers are the source of every category shortcut.
+        const onPress = jest.fn();
+
+        // When every production category appears in the shortcut bar.
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={productionHeaders}
+                    onPress={onPress}
+                />
+            </LocaleContextProvider>,
+        );
+
+        // Then every header has its own translation and none takes the unmapped fallback.
+        const expectedLabels = expectedTranslationPaths.map((path) => translateLocal(path));
+        const tooltipLabels = jest
+            .mocked(Tooltip)
+            .mock.calls.slice(-productionHeaders.length)
+            .map(([props]) => props.text);
+        expect(tooltipLabels).toEqual(expectedLabels);
+        expect(screen.getAllByRole('button')).toHaveLength(expectedLabels.length);
+        for (const label of expectedLabels) {
+            expect(screen.getByRole('button', {name: label})).toBeVisible();
+        }
+        expect(alertSpy).not.toHaveBeenCalled();
+    });
+
+    it('alerts for an unmapped category while providing the frequently-used fallback label', () => {
+        // Given a future category can reach the bar before a translation is mapped.
+        const unknownHeader = {...categoryFrequentlyUsed, code: 'unknownCategory', index: -1};
+
+        // When that unmapped category is rendered.
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={[unknownHeader]}
+                    onPress={jest.fn()}
+                />
+            </LocaleContextProvider>,
+        );
+
+        // Then the fallback remains usable and the missing mapping cannot silently ship.
+        const fallbackLabel = translateLocal('emojiPicker.headers.frequentlyUsed');
+        expect(screen.getByRole('button', {name: fallbackLabel})).not.toBeSelected();
+        expect(jest.mocked(Tooltip).mock.calls.at(-1)?.[0].text).toBe(fallbackLabel);
+        expect(alertSpy).toHaveBeenCalledWith('No emoji category translation mapped for code: unknownCategory');
+    });
+
+    it('exposes the selected category through its accessible state', () => {
+        // Given a category is selected by its production header index.
+        const selectedHeader = productionHeaders.at(1);
+        if (!selectedHeader) {
+            throw new Error('The smileys emoji header is missing');
+        }
+
+        // When the bar receives that selected index.
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={productionHeaders}
+                    selectedIndex={selectedHeader.index}
+                    onPress={jest.fn()}
+                />
+            </LocaleContextProvider>,
+        );
+
+        // Then assistive technology can distinguish selected and unselected shortcuts.
+        expect(screen.getByRole('button', {name: translateLocal('emojiPicker.headers.smileysAndEmotion'), selected: true})).toBeSelected();
+        expect(screen.getByRole('button', {name: translateLocal('emojiPicker.headers.frequentlyUsed'), selected: false})).not.toBeSelected();
+    });
+
+    it('passes the category index to the press handler', () => {
+        // Given shortcut presses must select the matching category in the emoji list.
+        const onPress = jest.fn();
+        const header = {...categoryFrequentlyUsed, index: 42};
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={[header]}
+                    onPress={onPress}
+                />
+            </LocaleContextProvider>,
+        );
+
+        // When the user presses that category's shortcut.
+        fireEvent.press(screen.getByRole('button', {name: translateLocal('emojiPicker.headers.frequentlyUsed')}));
+
+        // Then the bar reports the header index rather than its position in the shortcut array.
+        expect(onPress).toHaveBeenCalledTimes(1);
+        expect(onPress).toHaveBeenCalledWith(header.index);
+    });
+
+    it('highlights a shortcut only while it is hovered', () => {
+        // Given a shortcut starts without hover highlighting.
+        render(
+            <LocaleContextProvider>
+                <CategoryShortcutBar
+                    headerEmojis={[{...categoryFrequentlyUsed, index: 0}]}
+                    onPress={jest.fn()}
+                />
+            </LocaleContextProvider>,
+        );
+        const button = screen.getByRole('button', {name: translateLocal('emojiPicker.headers.frequentlyUsed')});
+        const highlight = {backgroundColor: defaultTheme.buttonDefaultBG};
+        expect(button).not.toHaveStyle(highlight);
+
+        // When the pointer enters and then leaves the shortcut.
+        fireEvent(button, 'hoverIn');
+        // Then the hover style appears while the pointer is inside and clears on exit.
+        expect(button).toHaveStyle(highlight);
+        fireEvent(button, 'hoverOut');
+        expect(button).not.toHaveStyle(highlight);
+    });
+});
diff --git a/tests/unit/EmojiPickerMenuTest.tsx b/tests/unit/EmojiPickerMenuTest.tsx
index a6147bc7c1a5..7d1b404b0344 100644
--- a/tests/unit/EmojiPickerMenuTest.tsx
+++ b/tests/unit/EmojiPickerMenuTest.tsx
@@ -1,5 +1,3 @@
-import {fireEvent, render, screen, waitFor} from '@testing-library/react-native';
-
 /**
  * Fallback option 1: tests the frequently-used dedupe logic end-to-end by calling
  * processFrequentlyUsedEmojis + mergeEmojisWithFrequentlyUsedEmojis directly rather than
@@ -8,103 +6,12 @@ import {fireEvent, render, screen, waitFor} from '@testing-library/react-native'
  * [RED] before commit 12: hexcode-only entries are filtered by the current impl, so the
  * merged list is missing one entry and the summed count is wrong.
  */
-import emojis, {categoryFrequentlyUsed} from '@assets/emojis';
-
-import CategoryShortcutBar from '@components/EmojiPicker/CategoryShortcutBar';
-import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import Tooltip from '@components/Tooltip';
-import type {TooltipExtendedProps} from '@components/Tooltip/types';
+import emojis from '@assets/emojis';
 
-import {getHeaderEmojis, mergeEmojisWithFrequentlyUsedEmojis, processFrequentlyUsedEmojis} from '@libs/EmojiUtils';
+import {mergeEmojisWithFrequentlyUsedEmojis, processFrequentlyUsedEmojis} from '@libs/EmojiUtils';
 
-import IntlStore from '@src/languages/IntlStore';
-import type {TranslationPaths} from '@src/languages/types';
 import type FrequentlyUsedEmoji from '@src/types/onyx/FrequentlyUsedEmoji';
 
-import React from 'react';
-
-import {translateLocal} from '../utils/TestHelper';
-
-jest.mock('@components/Tooltip', () => ({
-    __esModule: true,
-    default: jest.fn(({children}: TooltipExtendedProps) => children),
-}));
-
-describe('CategoryShortcutBar labels', () => {
-    it('uses production labels for every header and the frequently-used fallback for an unknown code', async () => {
-        await IntlStore.load('en');
-        const onPress = jest.fn();
-        const productionHeaders = getHeaderEmojis([categoryFrequentlyUsed, ...emojis]);
-        expect(productionHeaders.map(({code}) => code)).toEqual([
-            'frequentlyUsed',
-            'smileysAndEmotion',
-            'animalsAndNature',
-            'foodAndDrink',
-            'travelAndPlaces',
-            'activities',
-            'objects',
-            'symbols',
-            'flags',
-        ]);
-        const frequentlyUsedHeader = productionHeaders.at(0);
-        expect(frequentlyUsedHeader).toBeDefined();
-        if (!frequentlyUsedHeader) {
-            throw new Error('The frequently-used emoji header is missing');
-        }
-        const headerEmojis = [...productionHeaders, {...frequentlyUsedHeader, code: 'unknownCategory', index: -1}];
-        const expectedTranslationPaths: TranslationPaths[] = [
-            'emojiPicker.headers.frequentlyUsed',
-            'emojiPicker.headers.smileysAndEmotion',
-            'emojiPicker.headers.animalsAndNature',
-            'emojiPicker.headers.foodAndDrink',
-            'emojiPicker.headers.travelAndPlaces',
-            'emojiPicker.headers.activities',
-            'emojiPicker.headers.objects',
-            'emojiPicker.headers.symbols',
-            'emojiPicker.headers.flags',
-        ];
-        const selectedHeader = productionHeaders.at(1);
-        expect(selectedHeader).toBeDefined();
-        if (!selectedHeader) {
-            throw new Error('The smileys emoji header is missing');
-        }
-
-        jest.mocked(Tooltip).mockClear();
-        render(
-            <LocaleContextProvider>
-                <CategoryShortcutBar
-                    headerEmojis={headerEmojis}
-                    selectedIndex={selectedHeader.index}
-                    onPress={onPress}
-                />
-            </LocaleContextProvider>,
-        );
-
-        for (const translationPath of expectedTranslationPaths) {
-            const label = translateLocal(translationPath);
-            const expectedCount = translationPath === 'emojiPicker.headers.frequentlyUsed' ? 2 : 1;
-            await waitFor(() => {
-                const tooltipLabels = jest
-                    .mocked(Tooltip)
-                    .mock.calls.slice(-headerEmojis.length)
-                    .map(([tooltipProps]) => tooltipProps.text);
-                expect(tooltipLabels.filter((tooltipLabel) => tooltipLabel === label)).toHaveLength(expectedCount);
-                expect(screen.getAllByLabelText(label)).toHaveLength(expectedCount);
-            });
-        }
-
-        const frequentlyUsedButtons = screen.getAllByLabelText(translateLocal('emojiPicker.headers.frequentlyUsed'));
-        expect(frequentlyUsedButtons.at(-1)?.props.accessibilityState).toMatchObject({disabled: false, selected: undefined});
-
-        const selectedButton = screen.getByLabelText(translateLocal('emojiPicker.headers.smileysAndEmotion'));
-        expect(selectedButton.props.accessibilityState).toMatchObject({disabled: false, selected: true});
-        fireEvent(selectedButton, 'hoverIn');
-        fireEvent(selectedButton, 'hoverOut');
-        fireEvent.press(selectedButton);
-        expect(onPress).toHaveBeenCalledWith(selectedHeader.index);
-    });
-});
-
 describe('EmojiPickerMenu frequently used dedupe', () => {
     it('collapses mixed-format frequently used entries to one picker entry per emoji', () => {
         const frequentlyUsedEmojis: FrequentlyUsedEmoji[] = [

From aab43168cc2ef02bd45720156ab6bcda28e1cd0e Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 13:34:43 +0200
Subject: [PATCH 205/781] fix: start tab navigation spans from native tab bar
 presses

---
 .../NavigationTabBar/InboxTabButton.tsx       | 17 +----
 .../NavigationTabBar/SearchTabButton.tsx      | 10 +--
 .../NativeTabNavigator/tabScreenListeners.ts  | 37 +++++++++++
 .../useNativeTabNavigator.ts                  |  7 ++-
 .../Navigators/TabNavigator.android.tsx       |  3 +-
 .../Navigators/TabNavigator.ios.tsx           |  3 +-
 src/libs/telemetry/startTabNavigationSpans.ts | 37 +++++++++++
 tests/unit/nativeTabScreenListenersTest.ts    | 63 +++++++++++++++++++
 8 files changed, 150 insertions(+), 27 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
 create mode 100644 src/libs/telemetry/startTabNavigationSpans.ts
 create mode 100644 tests/unit/nativeTabScreenListenersTest.ts

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index e884e8de7956..1476cc214c74 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -12,7 +12,8 @@ import {getTabNavigatorStateKey, isReportsTabPreloaded} from '@libs/Navigation/h
 import Navigation, {startOpenReportSpan} from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
 import {isDeletedAction} from '@libs/ReportActionsUtils';
-import {getSpan, startSpan} from '@libs/telemetry/activeSpans';
+import {getSpan} from '@libs/telemetry/activeSpans';
+import {startNavigateToInboxTabSpan} from '@libs/telemetry/startTabNavigationSpans';
 
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -33,20 +34,6 @@ import getStringParam from './getStringParam';
 import NAVIGATION_TABS from './NAVIGATION_TABS';
 import TabBarItem from './TabBarItem';
 
-function startNavigateToInboxTabSpan({isWideLayout}: {isWideLayout: boolean}) {
-    startSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB, {
-        name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
-        op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
-        forceTransaction: true,
-        // Read before the tab navigation is dispatched, because jumping to the tab drops its preloaded key.
-        attributes: {
-            [CONST.TELEMETRY.ATTRIBUTE_WIDE_LAYOUT]: isWideLayout,
-            [CONST.TELEMETRY.ATTRIBUTE_IS_PRELOADED]: isReportsTabPreloaded(navigationRef.getRootState()),
-            [CONST.TELEMETRY.ATTRIBUTE_WAITED_ON_OPEN_REPORT]: false,
-        },
-    });
-}
-
 function markNavigateToInboxTabWaitedOnOpenReport() {
     getSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB)?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_WAITED_ON_OPEN_REPORT, true);
 }
diff --git a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
index 72308f304f1f..6cb649aca30f 100644
--- a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
@@ -8,8 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import clearSelectedText from '@libs/clearSelectedText/clearSelectedText';
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import Navigation from '@libs/Navigation/Navigation';
-import {startSpan} from '@libs/telemetry/activeSpans';
-import {startNavigateToReportsSpans} from '@libs/telemetry/navigateToReportsSpans';
+import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
 
 import navigationRef from '@navigation/navigationRef';
 
@@ -44,12 +43,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
         }
         clearSelectedText();
         interceptAnonymousUser(() => {
-            startSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, {
-                name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS,
-                op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS,
-                forceTransaction: true,
-            });
-            startNavigateToReportsSpans();
+            startNavigateToReportsTabSpans();
 
             Navigation.navigate(getSearchTabRoute(navigationRef.getRootState(), lastSearchParams, lastExpensesSearchQuery));
         });
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
new file mode 100644
index 000000000000..85c0f54871b4
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
@@ -0,0 +1,37 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+
+import type {ValueOf} from 'type-fest';
+
+/**
+ * Starts the tab-navigation spans of the tabs that have them. The native bar never renders InboxTabButton or
+ * SearchTabButton, which start these spans on the JS tab bar, so its taps start them here instead.
+ */
+const NAVIGATION_TAB_TO_SPAN_START: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, () => void>> = {
+    [NAVIGATION_TABS.INBOX]: () => startNavigateToInboxTabSpan({isWideLayout: false}),
+    [NAVIGATION_TABS.SEARCH]: startNavigateToReportsTabSpans,
+};
+
+type TabScreenListenerProps = {
+    route: {name: string};
+    navigation: {isFocused: () => boolean};
+};
+
+/**
+ * Native tabs emit `tabPress` when a user tap reaches JS, before the navigator switches to that tab. A tap on the
+ * already focused tab also emits it, and starts no span, the same as a JS tab button pressed on its own tab.
+ */
+function tabScreenListeners({route, navigation}: TabScreenListenerProps) {
+    return {
+        tabPress: () => {
+            if (navigation.isFocused()) {
+                return;
+            }
+            NAVIGATION_TAB_TO_SPAN_START[ROUTE_TO_NAVIGATION_TAB[route.name]]?.();
+        },
+    };
+}
+
+export default tabScreenListeners;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index e1f8c06975f0..3b72abe07786 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -22,6 +22,8 @@ import type {ValueOf} from 'type-fest';
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {useEffect} from 'react';
 
+import tabScreenListeners from './tabScreenListeners';
+
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
@@ -42,7 +44,8 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 /**
  * The state both native tab navigators share: whether the native bar shows, the status dot color of each tab that
  * has one, and a router override that restores the tab state after the navigator is remounted. It also keeps the
- * parent stack's swipe-back gesture, the preserved tab state and the tab-navigation spans in sync with the focused tab.
+ * parent stack's swipe-back gesture, the preserved tab state and the tab-navigation spans in sync with the focused tab,
+ * and returns the screen listeners that start those spans on a native bar tap.
  */
 function useNativeTabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -104,7 +107,7 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride};
+    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
index 9387848965af..315a6f82a8ed 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
@@ -59,7 +59,7 @@ function TabNavigator() {
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
 
     // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
     // selected tab has the menu icon color and a bold label in the regular text color, the others the plain icon
@@ -84,6 +84,7 @@ function TabNavigator() {
             screenLayout={nativeBottomTabScreenLayoutWrapper}
             screenOptions={screenOptions}
             UNSTABLE_router={tabRouterOverride}
+            screenListeners={tabScreenListeners}
         >
             <Tab.Screen
                 name={SCREENS.HOME}
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index 218a97fd29f0..fdab8b684cc6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -243,7 +243,7 @@ function TabNavigator() {
     const {translate} = useLocalize();
     const theme = useTheme();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
     const dotColors: Record<string, string | undefined> = {
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
@@ -383,6 +383,7 @@ function TabNavigator() {
             screenLayout={nativeBottomTabScreenLayoutWrapper}
             screenOptions={screenOptions}
             UNSTABLE_router={tabRouterOverride}
+            screenListeners={tabScreenListeners}
         >
             <Tab.Screen
                 name={SCREENS.HOME}
diff --git a/src/libs/telemetry/startTabNavigationSpans.ts b/src/libs/telemetry/startTabNavigationSpans.ts
new file mode 100644
index 000000000000..59817a74b9ba
--- /dev/null
+++ b/src/libs/telemetry/startTabNavigationSpans.ts
@@ -0,0 +1,37 @@
+import {isReportsTabPreloaded} from '@libs/Navigation/helpers/tabNavigatorUtils';
+
+import navigationRef from '@navigation/navigationRef';
+
+import CONST from '@src/CONST';
+
+import {startSpan} from './activeSpans';
+import {startNavigateToReportsSpans} from './navigateToReportsSpans';
+
+/**
+ * Starts ManualNavigateToInboxTab at the tab tap. Call it before the tab navigation is dispatched, because the
+ * preloaded state it records is dropped once the tab is jumped to.
+ */
+function startNavigateToInboxTabSpan({isWideLayout}: {isWideLayout: boolean}) {
+    startSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB, {
+        name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
+        op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
+        forceTransaction: true,
+        attributes: {
+            [CONST.TELEMETRY.ATTRIBUTE_WIDE_LAYOUT]: isWideLayout,
+            [CONST.TELEMETRY.ATTRIBUTE_IS_PRELOADED]: isReportsTabPreloaded(navigationRef.getRootState()),
+            [CONST.TELEMETRY.ATTRIBUTE_WAITED_ON_OPEN_REPORT]: false,
+        },
+    });
+}
+
+/** Starts the legacy ManualNavigateToReports span and its FirstPaint/ContentLoad split at the tab tap. */
+function startNavigateToReportsTabSpans() {
+    startSpan(CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, {
+        name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS,
+        op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS,
+        forceTransaction: true,
+    });
+    startNavigateToReportsSpans();
+}
+
+export {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans};
diff --git a/tests/unit/nativeTabScreenListenersTest.ts b/tests/unit/nativeTabScreenListenersTest.ts
new file mode 100644
index 000000000000..f16f5c891c7b
--- /dev/null
+++ b/tests/unit/nativeTabScreenListenersTest.ts
@@ -0,0 +1,63 @@
+import tabScreenListeners from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners';
+import {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+jest.mock('@libs/telemetry/startTabNavigationSpans', () => ({
+    startNavigateToInboxTabSpan: jest.fn(),
+    startNavigateToReportsTabSpans: jest.fn(),
+}));
+
+function pressTab(routeName: string, isFocused: boolean) {
+    tabScreenListeners({route: {name: routeName}, navigation: {isFocused: () => isFocused}}).tabPress();
+}
+
+describe('tabScreenListeners', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('starts the inbox tab span when the Inbox tab is pressed from another tab', () => {
+        // Given the native bar, which never renders InboxTabButton, so the span has to start from the tab press
+        // When the user presses Inbox while another tab is focused
+        pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, false);
+
+        // Then the same span the JS tab button starts is started, tagged as a narrow layout tap
+        expect(startNavigateToInboxTabSpan).toHaveBeenCalledWith({isWideLayout: false});
+        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+    });
+
+    it('starts the reports tab spans when the Spend tab is pressed from another tab', () => {
+        // Given the native bar, which never renders SearchTabButton
+        // When the user presses Spend while another tab is focused
+        pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, false);
+
+        // Then the legacy span and its FirstPaint/ContentLoad split are started, as on the JS tab button
+        expect(startNavigateToReportsTabSpans).toHaveBeenCalledTimes(1);
+        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
+    });
+
+    it('starts no span when the already focused tab is pressed again', () => {
+        // Given native tabs also emit tabPress for a tap on the focused tab
+        // When the user presses Inbox and Spend while each is already focused
+        pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, true);
+        pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, true);
+
+        // Then nothing starts, because no navigation follows that would end the spans
+        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
+        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+    });
+
+    it('starts no span for tabs without a navigation span', () => {
+        // Given Home, Workspaces and Account have no tab navigation span
+        // When the user presses each of them from another tab
+        pressTab(SCREENS.HOME, false);
+        pressTab(NAVIGATORS.WORKSPACE_NAVIGATOR, false);
+        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, false);
+
+        // Then no tab navigation span starts
+        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
+        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+    });
+});

From 2782a2250d29efd17fc890a97e6817b9df028292 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 13:39:01 +0200
Subject: [PATCH 206/781] fix: larger iOS native tab icons, softer Android tab
 pill

---
 .../AppNavigator/Navigators/TabNavigator.ios.tsx     | 12 ++++++------
 src/styles/theme/themes/dark.ts                      |  4 ++--
 src/styles/theme/themes/light.ts                     |  4 ++--
 src/styles/variables.ts                              |  4 ++++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index fdab8b684cc6..12827d2f55bf 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -127,12 +127,12 @@ async function createTabIcon(
         return undefined;
     }
 
-    // The glyph assets are 24 pt and are drawn at the floating bar's glyph size, the one the JS bar uses.
-    const glyphWidth = variables.iconFloatingTabBar * scale;
-    const glyphHeight = variables.iconFloatingTabBar * scale;
+    // The glyph assets are 24 pt and are drawn at the native bar's glyph size.
+    const glyphWidth = variables.iconNativeTabBarIOS * scale;
+    const glyphHeight = variables.iconNativeTabBarIOS * scale;
     // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
     // every label lands at the same height.
-    const glyphTop = ((variables.avatarFloatingTabBar - variables.iconFloatingTabBar) / 2) * scale;
+    const glyphTop = ((variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
     const gap = variables.nativeTabIconLabelGap * scale;
     const labelSize = measureLabel(label, isSelected, scale);
     const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
@@ -180,10 +180,10 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
     const image = Skia.Image.MakeImageFromEncoded(encodedImage);
     const scale = variables.nativeTabIconScale;
-    const avatarSize = variables.avatarFloatingTabBar * scale;
+    const avatarSize = variables.avatarNativeTabBarIOS * scale;
     // The avatar overhangs a glyph by the same amount above and below, so its gap to the label shrinks by
     // that much and the label lands where every other tab's does.
-    const gap = (variables.nativeTabIconLabelGap - (variables.avatarFloatingTabBar - variables.iconFloatingTabBar) / 2) * scale;
+    const gap = (variables.nativeTabIconLabelGap - (variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
     const labelSize = measureLabel(label, isSelected, scale);
     const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
     const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index ead5cb0e6631..92281a8a91b3 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -59,8 +59,8 @@ const darkTheme = {
     sidebar: colors.productDark100,
     sidebarHover: colors.productDark300,
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
-    // selectedOptionBG (green700) at 50%
-    androidTabBarActiveIndicatorBG: 'rgba(8,82,57,0.50)',
+    // selectedOptionBG (green700) at 40%
+    androidTabBarActiveIndicatorBG: 'rgba(8,82,57,0.40)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
     textDark: colors.productDark100,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 481c0c1ff453..1960210b9bb5 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -59,8 +59,8 @@ const lightTheme = {
     sidebar: colors.productLight100,
     sidebarHover: colors.productLight300,
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
-    // selectedOptionBG (green100) at 50%
-    androidTabBarActiveIndicatorBG: 'rgba(177,242,214,0.50)',
+    // selectedOptionBG (green100) at 40%
+    androidTabBarActiveIndicatorBG: 'rgba(177,242,214,0.40)',
     heading: colors.productLight900,
     textLight: colors.white,
     textDark: colors.productLight900,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index e3c99ec84149..b8f92b71b591 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -111,6 +111,10 @@ export default {
     iconFloatingTabBar: 20,
     /** Account avatar size in the floating tab bar. A circle reads smaller than a glyph of the same box, so it is larger. */
     avatarFloatingTabBar: avatarSizes.avatarSizeXSmall,
+    /** Glyph size in the iOS native tab bar. UITabBar gives each item more room than the JS bar, so its glyphs are larger. */
+    iconNativeTabBarIOS: 22,
+    /** Account avatar size in the iOS native tab bar, larger than its glyphs by the same amount as on the JS bar. */
+    avatarNativeTabBarIOS: 26,
     /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
     nativeTabIconDotRadius: 4,
     // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.

From 44c3fb4faf02273534c9de887d543a8a16b702eb Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 15:29:21 +0200
Subject: [PATCH 207/781] feat: Insights tab on the native bar with the beta,
 Account avatar on Android

---
 assets/images/native-tab-icons/insights.png   | Bin 0 -> 371 bytes
 .../images/native-tab-icons/insights@2x.png   | Bin 0 -> 649 bytes
 .../images/native-tab-icons/insights@3x.png   | Bin 0 -> 975 bytes
 patches/react-native-screens/details.md       |   7 +
 ...+4.28.0+003+no-android-tab-icon-tint.patch |  33 +++
 ...tom-tabs+7.16.2+003+hidden-tab-items.patch | 137 ++++++++++++
 patches/react-navigation/details.md           |   8 +
 src/components/Navigation/TopBar.tsx          |  34 ++-
 .../Navigation/TopBarWithLoadingBar.tsx       |   3 +-
 .../index.native.ts                           |  16 ++
 src/hooks/useIsSettingsDrawnOverTabs/index.ts |   6 +
 .../NativeTabNavigator/NATIVE_TAB_ICONS.ts    |   2 +
 .../NativeTabNavigator/useAndroidTabIcons.ts  | 209 ++++++++++++++++++
 .../useNativeTabNavigator.ts                  |  27 ++-
 .../Navigators/TAB_SCREENS.native.ts          |  12 +-
 .../Navigators/TabNavigator.android.tsx       |  27 ++-
 .../Navigators/TabNavigator.ios.tsx           |  13 +-
 src/pages/settings/InitialSettingsPage.tsx    |  15 +-
 18 files changed, 530 insertions(+), 19 deletions(-)
 create mode 100644 assets/images/native-tab-icons/insights.png
 create mode 100644 assets/images/native-tab-icons/insights@2x.png
 create mode 100644 assets/images/native-tab-icons/insights@3x.png
 create mode 100644 patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
 create mode 100644 patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
 create mode 100644 src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
 create mode 100644 src/hooks/useIsSettingsDrawnOverTabs/index.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts

diff --git a/assets/images/native-tab-icons/insights.png b/assets/images/native-tab-icons/insights.png
new file mode 100644
index 0000000000000000000000000000000000000000..9787cdd1bbd8e30249f39e1b95ab6162a3bbf8a4
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0B}qg<RCt`dmBC6vK@>pGB5UnNKOzb816pX%Ch!OR4K)g)PY6rM
z*3lwYL9TRR5@G#C;5XPpaOA>_46pZ|Gt+xsxSN?f=fKR|83>OCFbBp!8z_f@s=x&>
z06NzA1E8$@1#W<SSMVwD9f2&Z`F>>1<OC?DfeXMRuu1@I6G%>hgE+VhzNIWwjsnT+
zI6-gABIO}i03{oK<^We70?C#wnB^cCnc`zdxbhVInBvO-K~qbTQu^fF6u$%ryy87?
z!NfzL9CE3jmrXopEKqveH*uANplu5(IS7uT=kS#w{4?&LPcnk9fO^txy30UtpLSjM
zfZ;#jubPn>QqT?9mRq0i(wxc60saBhe8AB-)Q{nl?s$1tq%oya|6IkL#~Sy*R`8!b
Re}Di0002ovPDHLkV1h7Vo!|ff

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/insights@2x.png b/assets/images/native-tab-icons/insights@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..22c775d075e71ab6947e9c65b6d76dbc56987924
GIT binary patch
literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVhJ4r-ARCt{2m`!U_K@^6ciYb2l03m8s(5)ifiILiNqn0WNF2sd_
zf;%hz3A<<))$~Kf-%#9%J8_}df*ZvKjE3UYNZrRH7tSKw-g`4QcjjgW`og;j$;|tZ
znK?5DhNB7KJ@65D3fu$62t<d04j?gifw#aNV02jFP6IQ*Ja7vbN%+o%gzyq`OUH4p
z1G*eu0PTbzO9{UjHvkazYv7oR;1ysFX!Z%vDF`6IFW{oh@YjIt907^~2(SxG77czB
zcsao2HUI?p3!EP`d==OlaAI2kqWdiOo;a)PP&@z-U?WfXlfX{F32g(2=@A<hoKF@e
za{=((q}aW(Fp(<&0d8l7ziw#~mjG|Fic~WIfUfS*J$hg<yh{K9?#2g?E??gQ0$7d@
ze${e#*8m^lgFg=p;9Y$1oqzy-1GV0PPdNym1aL$lia2@{9f}V;TM~dXJq{gUA#{L7
z=m5_g0oe2(U@@iJ!4nSxilJ|oxrtr)VG_WM2f@V9(RF{1Top1GK9RPOe|iv344#vz
zTK6EJ^zlj-K+S`I(#Myw07i1Q4a@eIv>MQ>x(7ie#rH8##nXS`D{v4)O?wbndi)QV
zBB$0vIeF3)y?8!*5PnNvaRay2hgsa(nxT-+4GE$RoWYW+B`>E<;5e2Q?TNJ#PMcM2
z?K{(ygZ887IUgP0rKqA+aof`Mpq{5l*;I5dxvWd8l_T^IZ6aJTx!aVfF?}sP(l$*)
jy`Z1n$a;+IivaZ>(AHorVxlk-00000NkvXXu0mjfu`Uvc

literal 0
HcmV?d00001

diff --git a/assets/images/native-tab-icons/insights@3x.png b/assets/images/native-tab-icons/insights@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d5f365b1ec41bdc0c1923241fe482ae5d80a197
GIT binary patch
literal 975
zcmV;=12FuFP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qbfk{L`RCt{2oJ&YmK^Vt>nPyg6%jiW>ZCdqMM2fu=C23K#wykBU
z>+H2_<D!%nMGq<{qJ2=*CfY<nQ5L<ZD0)aqPkNY6Onky6y!W1aJu~wiJ%9MG6#35&
z&zzZWzB7<KEdtI0H-YoO9-tAZ3LQ*?W&wSG8OHs<4WJE}!5G!yEO7q!AK)TTO~N$|
zSPaaL`1{u*0?PDdU<nCOIj{=Y4_pP_W(;BwI0lsE`5U*20AxJ?904j(rc$6DI1PM_
zFc1sR1)w3n0BTU6$v`XcvcLg6aSX`%H_$>Ll>zO*ha$t<N6j^$A=?SR1dpl%9>x&d
z7a$|^-Z<A_CISa#A~XpDWZmTw&O)Fk=D@xIS?_QGrv~VC5H<uLJ8{>>31>6#%Td@6
zfQFU;v8<Eofu9b8h5}^WJyJNU9m5F?$i8Tn77J&tqd7+tAnR+zz?lTx_Yh74AnO%{
z0_ye@Obeh3g}_-STY#|y$QIwGN8MXJ@(4!@AnRRG0JVCCqY02L&gE3)2zKS80Z@Ow
zgMhXGa5Mq3Zpap7Jn%FHL`SwD4T0boWq{6Q3u0@?CI$5GoNd?w*ryZ_)+e$p3`4;&
ziU55C<_s5NpJG5~1d>bJ_0OSP$JbXB15zO$B@L5QKvjX^7?f*S3MjWiE)Y!;0BubH
z<<_<oP;NCT0AxISP&VcVBJ?M*ML}Q_&_|<mXoL=F0{=J7)c%?`fo*#xbCy|so?sY-
zo|^A5d!rzv3FOyAQ0UF73256goL74l1T}%2wFaH3S_MH(AV+Euo&bDN5Y~A1XBm4W
zol+3kc=mA$Q0Tg}3E;Jb04kB5Ju^o9teB?qoeF~cax+D!0(hq&yleML2VGHWS1<tA
zZW-z4Om`Iw!j*fX)PVA7<tW|24oF*bEb3A)pt#*h%%4-<Rxqfzd`HF<s}{(CzDc;>
z1M_gC<-j)ugDloRe0(b2C=HG#VYc6xY;+AL6Vi7DgN|zZ>DDGZt2!ZbQm-skf@pq#
zwzxvyR`x5UpemPj(x9?MV5jt3s!=U)PXU|<as`G;l}U$w=Di#~*Eh|we^jpu*(E>s
z0Om2UU9Q7OoJxQ-z)2~J#|5QNYRGlIua|JCQaM)XkOR6`1pu*+>?L5g%yp4ZACj&q
xa{1AEX}xKZCNA6Qwn2WT?#`c7sZtS_{sKvC8Y-o+g315@002ovPDHLkV1injpa1{>

literal 0
HcmV?d00001

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index a8cc5f438fde..dd61413a37ac 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -13,3 +13,10 @@
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
+
+### [react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch](react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch)
+
+- Reason: The Android account tab shows the user's avatar. `TabsAppearanceApplicator` assigns `bottomNavigationView.itemIconTintList` unconditionally, and a `ColorStateList` tint is `SRC_IN`, so it flattens the avatar to a solid silhouette in the tint color. React Navigation's `tinted: false` only reaches iOS, since `getPlatformIcon` in `@react-navigation/bottom-tabs` always hands Android a plain `imageSource`. The patch drops the icon tint list so Android draws every icon bitmap as supplied. The App recolors the glyphs off-screen in Skia for both selection states, so they keep the design's colors. Label colors are untouched and keep coming from `tabBarItemTitleFontColor`.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch b/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
new file mode 100644
index 000000000000..0e2a6405da10
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
@@ -0,0 +1,33 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+index 70a24c4..874eb63 100644
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+@@ -63,24 +63,10 @@ internal class TabsAppearanceApplicator(
+         bottomNavigationView.itemTextColor = ColorStateList(states, fontColors)
+ 
+         // Icon color
+-        val iconDisabledColor =
+-            tabBarAppearance?.disabled?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconFocusedColor =
+-            tabBarAppearance?.focused?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconSelectedColor =
+-            tabBarAppearance?.selected?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSecondaryContainer)
+-
+-        val iconNormalColor =
+-            tabBarAppearance?.normal?.tabBarItemIconColor
+-                ?: resolveColorAttr(context, R.attr.colorOnSurfaceVariant)
+-
+-        val iconColors = intArrayOf(iconDisabledColor, iconSelectedColor, iconFocusedColor, iconNormalColor)
+-        bottomNavigationView.itemIconTintList = ColorStateList(states, iconColors)
++        // Every tab icon arrives as a bitmap that already carries its own colors: the recolored glyph and the user's
++        // avatar on the account tab. A tint list paints over all of it with a single color, so no tint is applied and
++        // the bitmap is drawn as supplied, which is how `tinted: false` already behaves on iOS.
++        bottomNavigationView.itemIconTintList = null
+ 
+         // LabelVisibilityMode
+         // From docs: can be one of LABEL_VISIBILITY_AUTO, LABEL_VISIBILITY_SELECTED, LABEL_VISIBILITY_LABELED, or LABEL_VISIBILITY_UNLABELED
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
new file mode 100644
index 000000000000..7f4710b1bc8a
--- /dev/null
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
@@ -0,0 +1,137 @@
+diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+index 303635c..6ccaad5 100644
+--- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
++++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+@@ -4,11 +4,12 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
+ import { CommonActions, NavigationMetaContext, StackActions, useTheme } from '@react-navigation/native';
+ import Color from 'color';
+ import * as React from 'react';
+-import { Platform, PlatformColor } from 'react-native';
++import { Platform, PlatformColor, StyleSheet, View } from 'react-native';
++import { Freeze } from 'react-freeze';
+ import { Tabs } from 'react-native-screens';
+ import { Deferred } from "./Deferred.js";
+ import { NativeScreen } from "./NativeScreen/NativeScreen.js";
+-import { jsx as _jsx } from "react/jsx-runtime";
++import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+ const meta = {
+   type: 'native-tabs'
+ };
+@@ -32,9 +33,23 @@ export function NativeBottomTabView({
+     fonts
+   } = useTheme();
+   const focusedRouteKey = state.routes[state.index].key;
++  // A route with `tabBarItemHidden` gets no native tab item. While it is focused, it is drawn over the native host
++  // and the tab bar is hidden, and the host keeps the last focused visible tab selected underneath.
++  const isRouteHidden = route => descriptors[route.key]?.options.tabBarItemHidden === true;
++  const isFocusedRouteHidden = isRouteHidden(state.routes[state.index]);
++  const lastVisibleRouteKeyRef = React.useRef(undefined);
++  if (!isFocusedRouteHidden) {
++    lastVisibleRouteKeyRef.current = focusedRouteKey;
++  }
++  const nativeSelectedRouteKey = isFocusedRouteHidden ? lastVisibleRouteKeyRef.current ?? state.routes.find(route => !isRouteHidden(route))?.key ?? focusedRouteKey : focusedRouteKey;
++  // Hidden routes stay mounted once visited, frozen while another tab is focused, the same as the native tabs.
++  const visitedHiddenRouteKeysRef = React.useRef(new Set());
++  if (isFocusedRouteHidden) {
++    visitedHiddenRouteKeysRef.current.add(focusedRouteKey);
++  }
+   const [nativeState, dispatch] = React.useReducer(reducer, {
+     confirmed: {
+-      routeKey: focusedRouteKey,
++      routeKey: nativeSelectedRouteKey,
+       provenance: 0
+     }
+   });
+@@ -189,17 +204,17 @@ export function NativeBottomTabView({
+   const tabBarMinimizeBehavior = currentOptions.tabBarMinimizeBehavior === 'auto' ? 'automatic' : currentOptions.tabBarMinimizeBehavior === 'none' ? 'never' : currentOptions.tabBarMinimizeBehavior;
+   const shouldHideTabBar = currentOptions.tabBarStyle?.display === 'none';
+   const bottomAccessory = currentOptions.bottomAccessory;
+-  return /*#__PURE__*/_jsx(SafeAreaProviderCompat, {
+-    children: /*#__PURE__*/_jsx(Tabs.Host, {
++  return /*#__PURE__*/_jsxs(SafeAreaProviderCompat, {
++    children: [/*#__PURE__*/_jsx(Tabs.Host, {
+       navStateRequest: {
+-        selectedScreenKey: focusedRouteKey,
++        selectedScreenKey: nativeSelectedRouteKey,
+         baseProvenance: nativeState.confirmed.provenance
+       },
+       rejectStaleNavStateUpdates: true,
+       onTabSelected: onTabSelected,
+       onTabSelectionRejected: onTabSelectionRejected,
+       onTabSelectionPrevented: onTabSelectionPrevented,
+-      tabBarHidden: shouldHideTabBar,
++      tabBarHidden: shouldHideTabBar || isFocusedRouteHidden,
+       colorScheme: dark ? 'dark' : 'light',
+       ios: {
+         bottomAccessory: bottomAccessory ? environment => bottomAccessory({
+@@ -210,6 +225,9 @@ export function NativeBottomTabView({
+         tabBarTintColor: activeTintColor
+       },
+       children: state.routes.map((route, index) => {
++        if (isRouteHidden(route)) {
++          return null;
++        }
+         const {
+           options,
+           render,
+@@ -363,9 +381,43 @@ export function NativeBottomTabView({
+           })
+         }, route.key);
+       })
+-    })
++    }, "native-tabs-host"), ...state.routes.map((route, index) => {
++      if (!isRouteHidden(route) || !visitedHiddenRouteKeysRef.current.has(route.key)) {
++        return null;
++      }
++      const {
++        options,
++        render,
++        navigation
++      } = descriptors[route.key];
++      const isFocused = state.index === index;
++      return /*#__PURE__*/_jsx(View, {
++        style: [StyleSheet.absoluteFill, {
++          backgroundColor: colors.background
++        }, !isFocused && styles.hiddenRoute],
++        pointerEvents: isFocused ? 'auto' : 'none',
++        children: /*#__PURE__*/_jsx(Freeze, {
++          freeze: !isFocused,
++          children: /*#__PURE__*/_jsx(ScreenWithHeader, {
++            isFocused: isFocused,
++            route: route,
++            navigation: navigation,
++            options: options,
++            children: /*#__PURE__*/_jsx(NavigationMetaContext.Provider, {
++              value: meta,
++              children: render()
++            })
++          })
++        })
++      }, route.key);
++    })]
+   });
+ }
++const styles = StyleSheet.create({
++  hiddenRoute: {
++    display: 'none'
++  }
++});
+ function ScreenWithHeader({
+   isFocused,
+   route,
+diff --git a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
+index a071119..390f594 100644
+--- a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
++++ b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
+@@ -78,6 +78,11 @@ type IconIOSSfSymbol = {
+ };
+ export type NativeBottomTabIcon = IconIOSSfSymbol | IconImage;
+ export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
++    /**
++     * Whether the tab gets no item in the native tab bar. While a hidden tab is focused, it is drawn over the
++     * native tabs and the tab bar is hidden.
++     */
++    tabBarItemHidden?: boolean;
+     /**
+      * Title text for the screen.
+      */
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index cf27750b5f07..ba47f69be53b 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -78,6 +78,14 @@
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A
 
+### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
+
+- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited and is frozen while another tab is focused. Nothing native changes.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
+- PR Updating Patch: N/A
+
 ### [@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch](@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch)
 
 - Reason: On the web floating RHP each stacked card draws its own drop shadow through the interpolator's `cardStyle` (`getRHPExtendedCardFrame`). `CardA11yWrapper` puts `overflow: hidden` on every card that is not on top, and the wrapper is sized to the navigator frame, so it clips the shadow of the card under the focused one. Opening an expense over an expense report cut the report card's left and bottom shadow. The patch moves that clip from `CardA11yWrapper` to the `Animated.View` in `Card` that receives `cardStyle`. That view paints the shadow, and `overflow: hidden` does not clip an element's own shadow, so the shadow stays and the content is still clipped. `CardContainer` passes `active` down to `Card`.
diff --git a/src/components/Navigation/TopBar.tsx b/src/components/Navigation/TopBar.tsx
index 16163c9ad1c2..90dff1001aab 100644
--- a/src/components/Navigation/TopBar.tsx
+++ b/src/components/Navigation/TopBar.tsx
@@ -1,3 +1,4 @@
+import Icon from '@components/Icon';
 import LoadingBar from '@components/LoadingBar';
 import {PressableWithoutFeedback} from '@components/Pressable';
 import SearchButton from '@components/Search/SearchRouter/SearchButton';
@@ -7,8 +8,10 @@ import {useWideRHPState} from '@components/WideRHPContextProvider';
 
 import useContentHeaderHeight from '@hooks/useContentHeaderHeight';
 import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import SignInButton from '@pages/inbox/sidebar/SignInButton';
@@ -37,12 +40,25 @@ type TopBarProps = {
     cancelSearch?: () => void;
     children?: React.ReactNode;
     breadcrumbAnimatedStyle?: StyleProp<AnimatedStyle<ViewStyle>>;
+    /** Shows a back arrow before the breadcrumb that calls this when pressed. */
+    onBackButtonPress?: () => void;
 };
 
 const authTokenTypeSelector = (session: OnyxEntry<Session>) => session && {authTokenType: session.authTokenType};
 
-function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpButton = false, cancelSearch, shouldShowLoadingBar, children, breadcrumbAnimatedStyle}: TopBarProps) {
+function TopBar({
+    breadcrumbLabel,
+    shouldDisplaySearch = true,
+    shouldDisplayHelpButton = false,
+    cancelSearch,
+    shouldShowLoadingBar,
+    children,
+    breadcrumbAnimatedStyle,
+    onBackButtonPress,
+}: TopBarProps) {
     const styles = useThemeStyles();
+    const theme = useTheme();
+    const icons = useMemoizedLazyExpensifyIcons(['BackArrow']);
     const {translate} = useLocalize();
     const [session] = useOnyx(ONYXKEYS.SESSION, {selector: authTokenTypeSelector});
     const isAnonymousUser = isAnonymousUserUtil(session);
@@ -58,11 +74,25 @@ function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpB
     return (
         <View style={[styles.w100, styles.zIndex10]}>
             <View
-                style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ml5, styles.mr3, contentHeaderHeightStyle]}
+                style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, onBackButtonPress ? styles.ml2 : styles.ml5, styles.mr3, contentHeaderHeightStyle]}
                 dataSet={{dragArea: true}}
                 onTouchStart={isInLandscapeMode ? () => Keyboard.dismiss() : undefined}
             >
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.pr2]}>
+                    {!!onBackButtonPress && (
+                        <PressableWithoutFeedback
+                            onPress={onBackButtonPress}
+                            style={styles.touchableButtonImage}
+                            role={CONST.ROLE.BUTTON}
+                            accessibilityLabel={translate('common.back')}
+                            sentryLabel={CONST.SENTRY_LABEL.HEADER.BACK_BUTTON}
+                        >
+                            <Icon
+                                src={icons.BackArrow}
+                                fill={theme.icon}
+                            />
+                        </PressableWithoutFeedback>
+                    )}
                     <Animated.View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, breadcrumbAnimatedStyle]}>
                         <Text
                             numberOfLines={1}
diff --git a/src/components/Navigation/TopBarWithLoadingBar.tsx b/src/components/Navigation/TopBarWithLoadingBar.tsx
index 58061613f96f..41e4fcd97440 100644
--- a/src/components/Navigation/TopBarWithLoadingBar.tsx
+++ b/src/components/Navigation/TopBarWithLoadingBar.tsx
@@ -12,7 +12,7 @@ type TopBarWithLoadingBarProps = Omit<TopBarProps, 'shouldShowLoadingBar'>;
  * A thin wrapper around TopBar that encapsulates useLoadingBarVisibility().
  * Use this in places where shouldShowLoadingBar is NOT passed explicitly by the parent.
  */
-function TopBarWithLoadingBar({breadcrumbLabel, shouldDisplaySearch, shouldDisplayHelpButton, cancelSearch, children}: TopBarWithLoadingBarProps) {
+function TopBarWithLoadingBar({breadcrumbLabel, shouldDisplaySearch, shouldDisplayHelpButton, cancelSearch, onBackButtonPress, children}: TopBarWithLoadingBarProps) {
     const shouldShowLoadingBar = useLoadingBarVisibility();
     return (
         <TopBar
@@ -20,6 +20,7 @@ function TopBarWithLoadingBar({breadcrumbLabel, shouldDisplaySearch, shouldDispl
             shouldDisplaySearch={shouldDisplaySearch}
             shouldDisplayHelpButton={shouldDisplayHelpButton}
             cancelSearch={cancelSearch}
+            onBackButtonPress={onBackButtonPress}
             shouldShowLoadingBar={shouldShowLoadingBar}
         >
             {children}
diff --git a/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts b/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
new file mode 100644
index 000000000000..8220fdd02a41
--- /dev/null
+++ b/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
@@ -0,0 +1,16 @@
+import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+
+import CONST from '@src/CONST';
+
+/**
+ * With the Insights beta the native tab bar has no Account item, so the Account tab is drawn over the other tabs
+ * as a full screen with the bar hidden, and it needs its own way back.
+ */
+function useIsSettingsDrawnOverTabs() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBetaEnabled} = usePermissions();
+    return shouldUseNarrowLayout && isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+}
+
+export default useIsSettingsDrawnOverTabs;
diff --git a/src/hooks/useIsSettingsDrawnOverTabs/index.ts b/src/hooks/useIsSettingsDrawnOverTabs/index.ts
new file mode 100644
index 000000000000..7229ecc8f572
--- /dev/null
+++ b/src/hooks/useIsSettingsDrawnOverTabs/index.ts
@@ -0,0 +1,6 @@
+/** On web the Account tab stays a tab root screen above the JS tab bar, whether or not the bar shows its item. */
+function useIsSettingsDrawnOverTabs() {
+    return false;
+}
+
+export default useIsSettingsDrawnOverTabs;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
index ffbdb2f47cb9..c462369d097e 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
@@ -1,6 +1,7 @@
 import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
 import homeIcon from '@assets/images/native-tab-icons/home.png';
 import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
+import insightsIcon from '@assets/images/native-tab-icons/insights.png';
 import profileIcon from '@assets/images/native-tab-icons/profile.png';
 import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
 
@@ -14,6 +15,7 @@ const NATIVE_TAB_ICONS = {
     [SCREENS.HOME]: {type: 'image', source: homeIcon},
     [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: {type: 'image', source: inboxIcon},
     [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: {type: 'image', source: receiptMultipleIcon},
+    [SCREENS.INSIGHTS]: {type: 'image', source: insightsIcon},
     [NAVIGATORS.WORKSPACE_NAVIGATOR]: {type: 'image', source: buildingsIcon},
     [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: {type: 'image', source: profileIcon},
 } as const satisfies Record<string, NativeBottomTabIcon>;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
new file mode 100644
index 000000000000..26a496748561
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
@@ -0,0 +1,209 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useTheme from '@hooks/useTheme';
+
+import {getAvatarURL} from '@libs/UserAvatarUtils';
+
+import variables from '@styles/variables';
+
+import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
+import type {ImageSourcePropType} from 'react-native';
+
+import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import {useEffect, useState} from 'react';
+import {Image} from 'react-native';
+
+import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+
+/** The recolored copies of one glyph, one per selection state. */
+type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
+
+/** The recolored glyphs, with the signature of the colors baked into them. */
+type TintedTabIcons = {signature: string; icons: Record<string, TintedTabIconPair>};
+
+/** The account avatar cropped to a circle, with the URI it was drawn from. */
+type CircularAvatarIcon = {uri: string; icon: NativeBottomTabIcon};
+
+/**
+ * The last icons drawn, kept outside the hook so a remounted navigator starts from them instead of waiting for
+ * Skia again.
+ */
+let lastTintedIcons: TintedTabIcons | undefined;
+let lastCircularAvatar: CircularAvatarIcon | undefined;
+
+/** Every glyph the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
+const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
+
+/**
+ * Material draws the icons without a tint (react-native-screens patch 003), so each glyph is recolored off-screen
+ * in the theme color of its selection state. The canvas is the glyph's own size, so Android's fixed icon slot
+ * draws it at full size.
+ */
+async function createTintedGlyph(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
+    const asset = Image.resolveAssetSource(source);
+    if (!asset?.uri) {
+        return undefined;
+    }
+
+    const response = await fetch(asset.uri);
+    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
+    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
+    const scale = asset.scale ?? 1;
+    const canvasWidth = image?.width() ?? 0;
+    const canvasHeight = image?.height() ?? 0;
+    const surface = image ? Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight) : null;
+
+    if (!image || !surface) {
+        image?.dispose();
+        surface?.dispose();
+        return undefined;
+    }
+
+    const paint = Skia.Paint();
+    // SrcIn keeps the glyph's alpha and replaces every colored pixel with the theme color.
+    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
+    surface.getCanvas().drawImageRect(image, Skia.XYWHRect(0, 0, canvasWidth, canvasHeight), Skia.XYWHRect(0, 0, canvasWidth, canvasHeight), paint);
+    surface.flush();
+
+    const snapshot = surface.makeImageSnapshot();
+    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
+
+    image.dispose();
+    snapshot.dispose();
+    surface.dispose();
+
+    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale, scale}};
+}
+
+/**
+ * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
+ * circle off-screen and handed over as a data URI, at the size of the glyphs next to it. The selected tab is
+ * marked by the active indicator pill, so one image serves both selection states.
+ */
+async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIcon | undefined> {
+    const response = await fetch(uri);
+    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
+    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
+    const scale = variables.nativeTabIconScale;
+    const canvasSize = variables.iconBottomBar * scale;
+    const surface = Skia.Surface.MakeOffscreen(canvasSize, canvasSize);
+
+    if (!image || !surface) {
+        image?.dispose();
+        surface?.dispose();
+        return undefined;
+    }
+
+    const sourceSize = Math.min(image.width(), image.height());
+    const sourceX = (image.width() - sourceSize) / 2;
+    const sourceY = (image.height() - sourceSize) / 2;
+    const circle = Skia.Path.Make();
+    circle.addCircle(canvasSize / 2, canvasSize / 2, canvasSize / 2);
+
+    const canvas = surface.getCanvas();
+    canvas.clipPath(circle, ClipOp.Intersect, true);
+    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, canvasSize, canvasSize), Skia.Paint());
+    surface.flush();
+
+    const snapshot = surface.makeImageSnapshot();
+    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
+
+    circle.dispose();
+    image.dispose();
+    snapshot.dispose();
+    surface.dispose();
+
+    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: variables.iconBottomBar, height: variables.iconBottomBar, scale}};
+}
+
+/**
+ * The icons of the Android tab bar: each glyph recolored for both selection states, and the user's avatar on the
+ * account tab. `areTabIconsReady` stays false until the first recolored set exists, because the plain black glyphs
+ * would draw black.
+ */
+function useAndroidTabIcons() {
+    const theme = useTheme();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const inactiveColor = theme.icon;
+    const activeColor = theme.iconMenu;
+    const iconsSignature = [inactiveColor, activeColor].join('|');
+    const [tintedIcons, setTintedIcons] = useState<TintedTabIcons | undefined>(lastTintedIcons);
+
+    const avatarSource = getAvatarURL({avatarSource: currentUserPersonalDetails.avatar, accountID: currentUserPersonalDetails.accountID});
+    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
+    const [circularAvatar, setCircularAvatar] = useState<CircularAvatarIcon | undefined>(lastCircularAvatar);
+
+    useEffect(() => {
+        let isActive = true;
+        const signature = iconsSignature;
+
+        Promise.all(
+            TAB_ICONS.map(([name, source]) =>
+                Promise.all([createTintedGlyph(source, inactiveColor), createTintedGlyph(source, activeColor)]).then(([inactive, active]) => ({name, inactive, active})),
+            ),
+        )
+            .then((results) => {
+                if (!isActive) {
+                    return;
+                }
+                const icons: Record<string, TintedTabIconPair> = {};
+                for (const result of results) {
+                    if (result.inactive && result.active) {
+                        icons[result.name] = {inactive: result.inactive, active: result.active};
+                    }
+                }
+                lastTintedIcons = {signature, icons};
+                setTintedIcons(lastTintedIcons);
+            })
+            .catch(() => {
+                // A failed draw still lets the bar show, on the plain black glyphs, rather than keeping it hidden.
+                if (!isActive) {
+                    return;
+                }
+                setTintedIcons((previous) => previous ?? {signature, icons: {}});
+            });
+
+        return () => {
+            isActive = false;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [iconsSignature]);
+
+    useEffect(() => {
+        let isActive = true;
+        if (!avatarURI) {
+            return () => {
+                isActive = false;
+            };
+        }
+
+        createCircularAvatarIcon(avatarURI)
+            .then((icon) => {
+                if (!isActive || !icon) {
+                    return;
+                }
+                lastCircularAvatar = {uri: avatarURI, icon};
+                setCircularAvatar(lastCircularAvatar);
+            })
+            .catch(() => {});
+
+        return () => {
+            isActive = false;
+        };
+    }, [avatarURI]);
+
+    /** Falls back to the plain black glyph for a tab whose recolored copies could not be drawn. */
+    const getTabBarIcon = (name: keyof typeof NATIVE_TAB_ICONS) => {
+        const pair = tintedIcons?.icons[name];
+        if (!pair) {
+            return NATIVE_TAB_ICONS[name];
+        }
+        return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
+    };
+
+    // An avatar drawn for another user is never shown; until the current one is drawn, the account glyph stands in.
+    const accountAvatarIcon = circularAvatar?.uri === avatarURI ? circularAvatar?.icon : undefined;
+
+    return {getTabBarIcon, accountAvatarIcon, areTabIconsReady: !!tintedIcons};
+}
+
+export default useAndroidTabIcons;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 3b72abe07786..8a48826fff1a 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -3,6 +3,7 @@ import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
 import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
@@ -10,10 +11,13 @@ import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorSta
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
+import Navigation from '@libs/Navigation/Navigation';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
@@ -29,7 +33,7 @@ import tabScreenListeners from './tabScreenListeners';
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
  * WORKSPACE.INITIAL is intentionally excluded, since swiping back from it returns to the workspace list.
  */
-const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.SETTINGS.ROOT]);
+const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.INSIGHTS, SCREENS.SETTINGS.ROOT]);
 
 const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
     [NAVIGATION_TABS.INBOX]: INBOX_TAB_SPAN_IDS,
@@ -43,13 +47,16 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 
 /**
  * The state both native tab navigators share: whether the native bar shows, the status dot color of each tab that
- * has one, and a router override that restores the tab state after the navigator is remounted. It also keeps the
+ * has one, whether Insights or Account gets the last tab item, and a router override that restores the tab state after the navigator is remounted. It also keeps the
  * parent stack's swipe-back gesture, the preserved tab state and the tab-navigation spans in sync with the focused tab,
  * and returns the screen listeners that start those spans on a native bar tap.
  */
 function useNativeTabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
+    const {isBetaEnabled} = usePermissions();
+    // With the Insights beta, Insights takes the Account tab's place in the bar and Account moves to the top bar.
+    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const theme = useTheme();
     const {chatTabBrickRoad} = useSidebarOrderedReportsState();
     const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
@@ -64,7 +71,9 @@ function useNativeTabNavigator() {
     const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
     const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible;
+    // A tab with no item in the bar is drawn over the other tabs as a full screen, so the bar hides while it is focused.
+    const isActiveTabWithoutBarItem = isInsightsTabVisible ? activeTabRoute?.name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR : activeTabRoute?.name === SCREENS.INSIGHTS;
+    const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible && !isActiveTabWithoutBarItem;
 
     let inboxDotColor: string | undefined;
     if (chatTabBrickRoad) {
@@ -88,6 +97,16 @@ function useNativeTabNavigator() {
         setPreservedNavigatorState(route.key, tabState);
     }, [tabState, route.key]);
 
+    // Without the beta, Insights has no bar item and its page is not found, so a restored or deep-linked Insights tab
+    // would be a full screen with no way out. Home takes its place.
+    const isInsightsTabFocusedWithoutBeta = !isInsightsTabVisible && activeTabRoute?.name === SCREENS.INSIGHTS;
+    useEffect(() => {
+        if (!isInsightsTabFocusedWithoutBeta) {
+            return;
+        }
+        Navigation.navigate(ROUTES.HOME);
+    }, [isInsightsTabFocusedWithoutBeta]);
+
     // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
     // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
     useEffect(() => {
@@ -107,7 +126,7 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners};
+    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
index bf40bfd4cc23..6fa999c662e8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
@@ -1,12 +1,20 @@
 /**
  * Ordered list of screen names registered inside TabNavigator.
  * This must match the Tab.Screen order in TabNavigator.ios.tsx and TabNavigator.android.tsx, where the order is also the order the native
- * tab bar draws its items in, so Workspaces comes before Account.
+ * tab bar draws its items in. Insights and Account never show together: the bar draws Home, Inbox, Spend, Insights, Workspaces with
+ * the Insights beta and Home, Inbox, Spend, Workspaces, Account without it.
  * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
  */
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
-const TAB_SCREENS = [SCREENS.HOME, NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, NAVIGATORS.WORKSPACE_NAVIGATOR, NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR] as const;
+const TAB_SCREENS = [
+    SCREENS.HOME,
+    NAVIGATORS.REPORTS_SPLIT_NAVIGATOR,
+    NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR,
+    SCREENS.INSIGHTS,
+    NAVIGATORS.WORKSPACE_NAVIGATOR,
+    NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
+] as const;
 
 export default TAB_SCREENS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
index 315a6f82a8ed..dff68eb75705 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
@@ -6,9 +6,11 @@ import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStack
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
 import HomePage from '@pages/home/HomePage';
+import InsightsPage from '@pages/Insights/InsightsPage';
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
@@ -19,8 +21,8 @@ import React from 'react';
 
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
-import NATIVE_TAB_ICONS from './NativeTabNavigator/NATIVE_TAB_ICONS';
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import useAndroidTabIcons from './NativeTabNavigator/useAndroidTabIcons';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
@@ -59,7 +61,8 @@ function TabNavigator() {
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
+    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useAndroidTabIcons();
 
     // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
     // selected tab has the menu icon color and a bold label in the regular text color, the others the plain icon
@@ -74,7 +77,7 @@ function TabNavigator() {
         tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
         tabBarLabelVisibilityMode: 'labeled',
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.highlightBG},
+        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.highlightBG},
     };
 
     return (
@@ -89,28 +92,35 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={{tabBarLabel: translate('common.home'), tabBarIcon: NATIVE_TAB_ICONS[SCREENS.HOME]}}
+                options={{tabBarLabel: translate('common.home'), tabBarIcon: getTabBarIcon(SCREENS.HOME)}}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
                 options={{
                     tabBarLabel: translate('common.inbox'),
-                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.REPORTS_SPLIT_NAVIGATOR],
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR),
                     ...getStatusBadgeOptions(inboxDotColor),
                 }}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={{tabBarLabel: translate('common.spend'), tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]}}
+                options={{tabBarLabel: translate('common.spend'), tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}}
+            />
+            <Tab.Screen
+                name={SCREENS.INSIGHTS}
+                component={InsightsPage}
+                // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
+                initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
+                options={{tabBarLabel: translate('common.insights'), tabBarIcon: getTabBarIcon(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
                 options={{
                     tabBarLabel: translate('common.workspacesTabTitle'),
-                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.WORKSPACE_NAVIGATOR],
+                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR),
                     ...getStatusBadgeOptions(workspacesDotColor),
                 }}
             />
@@ -119,7 +129,8 @@ function TabNavigator() {
                 component={SettingsSplitNavigator}
                 options={{
                     tabBarLabel: translate('initialSettingsPage.account'),
-                    tabBarIcon: NATIVE_TAB_ICONS[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR],
+                    tabBarIcon: accountAvatarIcon ?? getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
+                    tabBarItemHidden: isInsightsTabVisible,
                     ...getStatusBadgeOptions(accountDotColor),
                 }}
             />
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index 12827d2f55bf..61be5183804f 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -7,10 +7,12 @@ import type {TabNavigatorParamList} from '@libs/Navigation/types';
 import {getAvatarURL} from '@libs/UserAvatarUtils';
 
 import HomePage from '@pages/home/HomePage';
+import InsightsPage from '@pages/Insights/InsightsPage';
 
 import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
@@ -243,7 +245,7 @@ function TabNavigator() {
     const {translate} = useLocalize();
     const theme = useTheme();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
     const dotColors: Record<string, string | undefined> = {
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
@@ -253,6 +255,7 @@ function TabNavigator() {
         [SCREENS.HOME]: translate('common.home'),
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
         [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
+        [SCREENS.INSIGHTS]: translate('common.insights'),
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
         [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
     };
@@ -403,6 +406,13 @@ function TabNavigator() {
                 component={SearchFullscreenNavigator}
                 options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}}
             />
+            <Tab.Screen
+                name={SCREENS.INSIGHTS}
+                component={InsightsPage}
+                // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
+                initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
+                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
+            />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
@@ -416,6 +426,7 @@ function TabNavigator() {
                 component={SettingsSplitNavigator}
                 options={{
                     tabBarLabel: '',
+                    tabBarItemHidden: isInsightsTabVisible,
                     tabBarIcon: avatarPair
                         ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive)
                         : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 0940a3450b95..4eb636cbf27c 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -11,6 +11,7 @@ import Text from '@components/Text';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 
+import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePrevious from '@hooks/usePrevious';
@@ -27,13 +28,14 @@ import {openInitialSettingsPage} from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ComponentRef} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import type {ScrollView as RNScrollView, ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
 
-import {findFocusedRoute, useNavigationState, useRoute} from '@react-navigation/native';
+import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {canSwitchAccountsSelector} from '@selectors/Account';
 import React, {useContext, useEffect, useLayoutEffect, useRef} from 'react';
 import {View} from 'react-native';
@@ -53,6 +55,16 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
+    const navigation = useNavigation();
+    const isDrawnOverTabs = useIsSettingsDrawnOverTabs();
+    // The tab navigator keeps the full tab history, so going back returns to the tab the user opened Account from.
+    const goBackFromAccount = () => {
+        if (navigation.canGoBack()) {
+            navigation.goBack();
+            return;
+        }
+        Navigation.navigate(ROUTES.HOME);
+    };
     const isScreenFocused = useIsSidebarRouteActive(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, shouldUseNarrowLayout);
     const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails);
     const {accountMenuItemsData, generalMenuItemsData} = useInitialSettingsPageMenuData(currentUserPersonalDetails);
@@ -161,6 +173,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 breadcrumbLabel={translate('initialSettingsPage.account')}
                 shouldDisplaySearch={shouldUseNarrowLayout}
                 shouldDisplayHelpButton={shouldUseNarrowLayout}
+                onBackButtonPress={isDrawnOverTabs ? goBackFromAccount : undefined}
             >
                 {!shouldUseNarrowLayout && !isPersonalDetailsEmpty && (
                     /* The top bar row ends 12px from the screen edge, so add 8px to sit the button 20px in. */

From c81bbef6c6e38909f94d9f194c31c4ece2291b06 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 16:13:00 +0200
Subject: [PATCH 208/781] clearing up pr

---
 ...02+active-indicator-color-precedence.patch |  31 ++
 ...s+7.16.2+002+android-tab-item-colors.patch | 113 ------
 patches/react-navigation/details.md           |   6 +-
 .../Navigation/NavigationTabBar/index.tsx     |   6 +-
 src/components/Search/index.tsx               |  28 +-
 .../NativeTabNavigator/tabIconRasterizer.ts   |  93 +++++
 .../NativeTabNavigator/useAndroidTabIcons.ts  | 177 ++--------
 .../NativeTabNavigator/useIOSTabIcons.ts      | 227 ++++++++++++
 .../useRasterizedTabIcons.ts                  |  46 +++
 .../Navigators/TabNavigator.android.tsx       |  11 +-
 .../Navigators/TabNavigator.ios.tsx           | 328 +-----------------
 src/pages/Search/SearchPageNarrow/index.tsx   |   7 -
 12 files changed, 463 insertions(+), 610 deletions(-)
 create mode 100644 patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
 delete mode 100644 patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts

diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
new file mode 100644
index 000000000000..0526d0fd3623
--- /dev/null
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
@@ -0,0 +1,31 @@
+diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+index 1183c51..303635c 100644
+--- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
++++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
+@@ -160,7 +160,7 @@ export function NativeBottomTabView({
+     ios: PlatformColor('label'),
+     default: colors.text
+   });
+-  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined;
++  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? (typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined);
+   const onTransitionStart = ({
+     closing,
+     route
+diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
+index 287dea3..0f06b2b 100644
+--- a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
++++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
+@@ -262,10 +262,10 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
+     });
+ 
+   const activeIndicatorColor =
+-    (currentOptions?.tabBarActiveIndicatorColor ??
+-    typeof activeTintColor === 'string')
++    currentOptions?.tabBarActiveIndicatorColor ??
++    (typeof activeTintColor === 'string'
+       ? Color(activeTintColor)?.alpha(0.1).string()
+-      : undefined;
++      : undefined);
+ 
+   const onTransitionStart = ({
+     closing,
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
deleted file mode 100644
index f7e43f14b342..000000000000
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-index 1183c51..303635c 100644
---- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-+++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-@@ -160,7 +160,7 @@ export function NativeBottomTabView({
-     ios: PlatformColor('label'),
-     default: colors.text
-   });
--  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined;
-+  const activeIndicatorColor = currentOptions?.tabBarActiveIndicatorColor ?? (typeof activeTintColor === 'string' ? Color(activeTintColor)?.alpha(0.1).string() : undefined);
-   const onTransitionStart = ({
-     closing,
-     route
-@@ -253,11 +253,11 @@ export function NativeBottomTabView({
-           tabBarItemBadgeBackgroundColor: badgeBackgroundColor
-         };
-         const normalTabItemAppearance = {
--          tabBarItemTitleFontColor: inactiveTintColor ?? fontColor,
-+          tabBarItemTitleFontColor: currentOptions.tabBarInactiveLabelColor ?? inactiveTintColor ?? fontColor,
-           tabBarItemIconColor: inactiveTintColor
-         };
-         const selectedTabItemAppearance = {
--          tabBarItemTitleFontColor: activeTintColor,
-+          tabBarItemTitleFontColor: currentOptions.tabBarActiveLabelColor ?? activeTintColor,
-           tabBarItemIconColor: activeTintColor
-         };
-         const icon = typeof tabBarIcon === 'function' ? getPlatformIcon(tabBarIcon({
-diff --git a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-index 5a502c2..a071119 100644
---- a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-+++ b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-@@ -156,6 +156,18 @@ export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
-      * @platform android
-      */
-     tabBarInactiveTintColor?: ColorValue;
-+    /**
-+     * Color for the label in the active tab, overriding `tabBarActiveTintColor` for the label only.
-+     *
-+     * @platform android
-+     */
-+    tabBarActiveLabelColor?: ColorValue;
-+    /**
-+     * Color for the label in the inactive tabs, overriding `tabBarInactiveTintColor` for the label only.
-+     *
-+     * @platform android
-+     */
-+    tabBarInactiveLabelColor?: ColorValue;
-     /**
-      * Background color of the active indicator.
-      *
-diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-index 287dea3..0f06b2b 100644
---- a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-+++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-@@ -262,10 +262,10 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
-     });
- 
-   const activeIndicatorColor =
--    (currentOptions?.tabBarActiveIndicatorColor ??
--    typeof activeTintColor === 'string')
-+    currentOptions?.tabBarActiveIndicatorColor ??
-+    (typeof activeTintColor === 'string'
-       ? Color(activeTintColor)?.alpha(0.1).string()
--      : undefined;
-+      : undefined);
- 
-   const onTransitionStart = ({
-     closing,
-@@ -387,13 +387,17 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
- 
-           const normalTabItemAppearance: TabsScreenItemStateAppearanceAndroid =
-             {
--              tabBarItemTitleFontColor: inactiveTintColor ?? fontColor,
-+              tabBarItemTitleFontColor:
-+                currentOptions.tabBarInactiveLabelColor ??
-+                inactiveTintColor ??
-+                fontColor,
-               tabBarItemIconColor: inactiveTintColor,
-             };
- 
-           const selectedTabItemAppearance: TabsScreenItemStateAppearanceAndroid =
-             {
--              tabBarItemTitleFontColor: activeTintColor,
-+              tabBarItemTitleFontColor:
-+                currentOptions.tabBarActiveLabelColor ?? activeTintColor,
-               tabBarItemIconColor: activeTintColor,
-             };
- 
-diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
-index a2471f5..d9df793 100644
---- a/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
-+++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/types.tsx
-@@ -200,6 +200,20 @@ export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
-    */
-   tabBarInactiveTintColor?: ColorValue;
- 
-+  /**
-+   * Color for the label in the active tab, overriding `tabBarActiveTintColor` for the label only.
-+   *
-+   * @platform android
-+   */
-+  tabBarActiveLabelColor?: ColorValue;
-+
-+  /**
-+   * Color for the label in the inactive tabs, overriding `tabBarInactiveTintColor` for the label only.
-+   *
-+   * @platform android
-+   */
-+  tabBarInactiveLabelColor?: ColorValue;
-+
-   /**
-    * Background color of the active indicator.
-    *
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index ba47f69be53b..5ba1a6ebee87 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -68,11 +68,9 @@
 - E/App issue: [#94571](https://github.com/Expensify/App/issues/94571)
 - PR Introducing Patch: [#95980](https://github.com/Expensify/App/pull/95980)
 
-### [@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch](@react-navigation+bottom-tabs+7.16.2+002+android-tab-item-colors.patch)
+### [@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch)
 
-- Reason: Lets the native Android tab bar take the colors from the design, where the selected tab's icon and active indicator are green and its label keeps the regular text color.
-    - `tabBarActiveIndicatorColor` was never applied: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence.
-    - `tabBarActiveTintColor` and `tabBarInactiveTintColor` each color an icon and its label together. The patch adds Android-only `tabBarActiveLabelColor` and `tabBarInactiveLabelColor`, which override the tint for the label only. The native `TabsScreenItemStateAppearanceAndroid` already takes separate title and icon colors, so nothing native changes.
+- Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 1a4755b490bc..f934146a96da 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -14,7 +14,6 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import TAB_SCREENS from '@libs/Navigation/AppNavigator/Navigators/TAB_SCREENS';
 import Navigation from '@libs/Navigation/Navigation';
 
 import NavigationTabBarAvatar from '@pages/inbox/sidebar/NavigationTabBarAvatar';
@@ -24,7 +23,6 @@ import SupportalSwitcherButton from '@pages/inbox/sidebar/SupportalSwitcherButto
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
 
 import type {ValueOf} from 'type-fest';
 
@@ -48,9 +46,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     const {translate} = useLocalize();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const {isBetaEnabled} = usePermissions();
-    // The native tab navigators register five items and leave Insights out, so the wide layout's own bar must not
-    // offer a tab the navigator cannot route to.
-    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE) && (TAB_SCREENS as readonly string[]).includes(SCREENS.INSIGHTS);
+    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['ExpensifyAppIcon', 'Home']);
 
     const {shouldUseNarrowLayout} = useResponsiveLayout();
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 3a963469f934..af5560e39649 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -50,6 +50,7 @@ import {
     isTransactionGroupListItemType,
     isTransactionListItemType,
     isTransactionReportGroupListItemType,
+    isTransactionSearchType,
     shouldShowEmptyState,
     shouldShowYear as shouldShowYearUtil,
 } from '@libs/SearchUIUtils';
@@ -416,7 +417,7 @@ function Search({
     const hasUnresolvedErrors = hasErrors && responseStatusCode === null;
     const isWaitingForInitialData = !shouldUseLiveData && !isOffline && (!isDataLoaded || isSearchLoadingWithNoResults || hasUnresolvedErrors || isCardFeedsLoading);
     const shouldShowLoadingState = isDeferringHeavyWork || isWaitingForInitialData;
-    const shouldShowRowSkeleton = !hasErrors && (shouldShowLoadingState || (!skeletonWasDisplayed && showPendingExpensePlaceholder));
+    const shouldShowRowSkeleton = (!skeletonWasDisplayed || shouldShowLoadingState) && showPendingExpensePlaceholder && !hasErrors;
 
     const isLoadingMorePage = shouldUseLiveData ? isLivePageInFlight : !!searchResults?.search?.isLoading;
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && isLoadingMorePage && (searchResults?.search?.offset ?? 0) > 0;
@@ -1000,11 +1001,6 @@ function Search({
     // Deferred layout only needs the base work (no scroll handling, no content-ready signal).
     const onDeferredLayout = onLayoutBase;
 
-    const handleSkeletonLayout = useCallback(() => {
-        onDeferredLayout();
-        onSkeletonLayout();
-    }, [onDeferredLayout, onSkeletonLayout]);
-
     const onLayout = useCallback(() => {
         onLayoutBase();
         handleSelectionListScroll(stableSortedData, searchListRef.current);
@@ -1164,15 +1160,25 @@ function Search({
         [clearSelectedTransactions, queryJSON, onSortPressedCallback, navigation],
     );
 
-    // Stands in for the list while the heavy grouping and sorting work is deferred or the first response
-    // has not arrived. The page level skeleton (useSearchLoadingState) stops at the first defined `data`,
-    // so on a warm snapshot this is the only thing between the header and the rows. Its onLayout also
-    // flushes the deferred API write and sets hasHadFirstLayout.
+    // When heavy work is deferred (e.g. during the RHP dismiss animation after
+    // submitting an expense), skip the expensive render below. The ancestor
+    // SearchPage (via SearchPageNarrow / SearchPageWide) renders a SearchStaticList
+    // overlay that covers this component, so the user sees real-looking content.
+    // The minimal View fires onLayout to flush the deferred API write and set
+    // hasHadFirstLayout.
+    if (isDeferringHeavyWork && searchResults?.data && isTransactionSearchType(type)) {
+        // Zero-sized View - onLayout still fires on RN, which is all we need here.
+        return <View onLayout={onDeferredLayout} />;
+    }
+
+    // This is a performance optimization for the submit-expense->search path only.
+    // The SearchPage skeleton (useSearchLoadingState) doesn't cover this case because
+    // Search must mount for its onLayout to flush the deferred CreateMoneyRequest API write, which would block the JS thread causing a slowdown on post expense creation navigation
     if (shouldShowRowSkeleton) {
         return (
             <SearchRowSkeleton
                 shouldAnimate
-                onLayout={handleSkeletonLayout}
+                onLayout={onSkeletonLayout}
                 containerStyle={shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3}
             />
         );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
new file mode 100644
index 000000000000..2930b251442f
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -0,0 +1,93 @@
+import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
+import type {SkCanvas, SkImage, SkSurface} from '@shopify/react-native-skia';
+import type {ImageSourcePropType} from 'react-native';
+
+import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import {Image} from 'react-native';
+
+import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+
+/** The recolored copies of one glyph, one per selection state. */
+type TabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
+
+/** Every glyph the bar draws, paired with the tab it belongs to so the recolored copies can be looked up again. */
+const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
+
+/** Downloads and decodes an image, or resolves to null when it cannot be decoded. */
+async function decodeImage(uri: string): Promise<SkImage | null> {
+    const response = await fetch(uri);
+    return Skia.Image.MakeImageFromEncoded(Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer())));
+}
+
+/** Decodes a bundled glyph together with the pixel density it was resolved at. */
+async function decodeGlyph(source: ImageSourcePropType): Promise<{image: SkImage; scale: number} | undefined> {
+    const asset = Image.resolveAssetSource(source);
+    if (!asset?.uri) {
+        return undefined;
+    }
+    const image = await decodeImage(asset.uri);
+    return image ? {image, scale: asset.scale ?? 1} : undefined;
+}
+
+/** A paint that keeps the glyph's alpha and replaces every colored pixel with the given color. */
+function createTintPaint(color: string) {
+    const paint = Skia.Paint();
+    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
+    return paint;
+}
+
+/** Draws the centred square of the image, cropped to a circle of the given size. */
+function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top: number, size: number) {
+    const sourceSize = Math.min(image.width(), image.height());
+    const circle = Skia.Path.Make();
+    circle.addCircle(left + size / 2, top + size / 2, size / 2);
+
+    canvas.save();
+    canvas.clipPath(circle, ClipOp.Intersect, true);
+    canvas.drawImageRect(
+        image,
+        Skia.XYWHRect((image.width() - sourceSize) / 2, (image.height() - sourceSize) / 2, sourceSize, sourceSize),
+        Skia.XYWHRect(left, top, size, size),
+        Skia.Paint(),
+    );
+    canvas.restore();
+    circle.dispose();
+}
+
+/** Encodes what was drawn on the surface as a PNG data URI, which a tab icon can take, and disposes the surface. */
+function encodeSurface(surface: SkSurface): string {
+    surface.flush();
+    const snapshot = surface.makeImageSnapshot();
+    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
+    snapshot.dispose();
+    surface.dispose();
+    return `data:image/png;base64,${base64}`;
+}
+
+/** Draws both selection states of every glyph, leaving out a tab whose copies could not be drawn. */
+async function drawTabIconPairs(
+    drawIcon: (name: string, source: ImageSourcePropType, isSelected: boolean) => Promise<NativeBottomTabIcon | undefined>,
+): Promise<Record<string, TabIconPair>> {
+    const results = await Promise.all(
+        TAB_ICONS.map(([name, source]) => Promise.all([drawIcon(name, source, false), drawIcon(name, source, true)]).then(([inactive, active]) => ({name, inactive, active}))),
+    );
+    const icons: Record<string, TabIconPair> = {};
+    for (const result of results) {
+        if (result.inactive && result.active) {
+            icons[result.name] = {inactive: result.inactive, active: result.active};
+        }
+    }
+    return icons;
+}
+
+/** The tab's recolored icon for its selection state, or the plain glyph for a tab whose copies could not be drawn. */
+function getTabBarIcon(icons: Record<string, TabIconPair> | undefined, name: keyof typeof NATIVE_TAB_ICONS) {
+    const pair = icons?.[name];
+    if (!pair) {
+        return NATIVE_TAB_ICONS[name];
+    }
+    return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
+}
+
+export {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon};
+export type {TabIconPair};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
index 26a496748561..8470d3776f9f 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
@@ -8,30 +8,17 @@ import variables from '@styles/variables';
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {ImageSourcePropType} from 'react-native';
 
-import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
-import {useEffect, useState} from 'react';
-import {Image} from 'react-native';
+import {Skia} from '@shopify/react-native-skia';
 
-import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+import type {TabIconPair} from './tabIconRasterizer';
+import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
 
-/** The recolored copies of one glyph, one per selection state. */
-type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
+import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
+import useRasterizedTabIcons from './useRasterizedTabIcons';
 
-/** The recolored glyphs, with the signature of the colors baked into them. */
-type TintedTabIcons = {signature: string; icons: Record<string, TintedTabIconPair>};
-
-/** The account avatar cropped to a circle, with the URI it was drawn from. */
-type CircularAvatarIcon = {uri: string; icon: NativeBottomTabIcon};
-
-/**
- * The last icons drawn, kept outside the hook so a remounted navigator starts from them instead of waiting for
- * Skia again.
- */
-let lastTintedIcons: TintedTabIcons | undefined;
-let lastCircularAvatar: CircularAvatarIcon | undefined;
-
-/** Every glyph the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
-const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
+const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
+const lastCircularAvatar: LastDrawnTabIcons<{uri: string; icon: NativeBottomTabIcon}> = {};
 
 /**
  * Material draws the icons without a tint (react-native-screens patch 003), so each glyph is recolored off-screen
@@ -39,39 +26,25 @@ const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name,
  * draws it at full size.
  */
 async function createTintedGlyph(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
-    const asset = Image.resolveAssetSource(source);
-    if (!asset?.uri) {
+    const glyph = await decodeGlyph(source);
+    if (!glyph) {
         return undefined;
     }
 
-    const response = await fetch(asset.uri);
-    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
-    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
-    const scale = asset.scale ?? 1;
-    const canvasWidth = image?.width() ?? 0;
-    const canvasHeight = image?.height() ?? 0;
-    const surface = image ? Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight) : null;
-
-    if (!image || !surface) {
-        image?.dispose();
-        surface?.dispose();
+    const {image, scale} = glyph;
+    const canvasWidth = image.width();
+    const canvasHeight = image.height();
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+    if (!surface) {
+        image.dispose();
         return undefined;
     }
 
-    const paint = Skia.Paint();
-    // SrcIn keeps the glyph's alpha and replaces every colored pixel with the theme color.
-    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
-    surface.getCanvas().drawImageRect(image, Skia.XYWHRect(0, 0, canvasWidth, canvasHeight), Skia.XYWHRect(0, 0, canvasWidth, canvasHeight), paint);
-    surface.flush();
-
-    const snapshot = surface.makeImageSnapshot();
-    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
-
+    const rect = Skia.XYWHRect(0, 0, canvasWidth, canvasHeight);
+    surface.getCanvas().drawImageRect(image, rect, rect, createTintPaint(color));
     image.dispose();
-    snapshot.dispose();
-    surface.dispose();
 
-    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale, scale}};
+    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}};
 }
 
 /**
@@ -80,12 +53,10 @@ async function createTintedGlyph(source: ImageSourcePropType, color: string): Pr
  * marked by the active indicator pill, so one image serves both selection states.
  */
 async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIcon | undefined> {
-    const response = await fetch(uri);
-    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
-    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
+    const image = await decodeImage(uri);
     const scale = variables.nativeTabIconScale;
     const canvasSize = variables.iconBottomBar * scale;
-    const surface = Skia.Surface.MakeOffscreen(canvasSize, canvasSize);
+    const surface = image ? Skia.Surface.MakeOffscreen(canvasSize, canvasSize) : null;
 
     if (!image || !surface) {
         image?.dispose();
@@ -93,26 +64,10 @@ async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIco
         return undefined;
     }
 
-    const sourceSize = Math.min(image.width(), image.height());
-    const sourceX = (image.width() - sourceSize) / 2;
-    const sourceY = (image.height() - sourceSize) / 2;
-    const circle = Skia.Path.Make();
-    circle.addCircle(canvasSize / 2, canvasSize / 2, canvasSize / 2);
-
-    const canvas = surface.getCanvas();
-    canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(0, 0, canvasSize, canvasSize), Skia.Paint());
-    surface.flush();
-
-    const snapshot = surface.makeImageSnapshot();
-    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
-
-    circle.dispose();
+    drawCircularImage(surface.getCanvas(), image, 0, 0, canvasSize);
     image.dispose();
-    snapshot.dispose();
-    surface.dispose();
 
-    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: variables.iconBottomBar, height: variables.iconBottomBar, scale}};
+    return {type: 'image', source: {uri: encodeSurface(surface), width: variables.iconBottomBar, height: variables.iconBottomBar, scale}};
 }
 
 /**
@@ -125,85 +80,27 @@ function useAndroidTabIcons() {
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const inactiveColor = theme.icon;
     const activeColor = theme.iconMenu;
-    const iconsSignature = [inactiveColor, activeColor].join('|');
-    const [tintedIcons, setTintedIcons] = useState<TintedTabIcons | undefined>(lastTintedIcons);
+
+    // A failed draw still lets the bar show, on the plain black glyphs, rather than keeping it hidden.
+    const tintedIcons = useRasterizedTabIcons(
+        lastTintedIcons,
+        [inactiveColor, activeColor].join('|'),
+        () => drawTabIconPairs((name, source, isSelected) => createTintedGlyph(source, isSelected ? activeColor : inactiveColor)),
+        {},
+    );
 
     const avatarSource = getAvatarURL({avatarSource: currentUserPersonalDetails.avatar, accountID: currentUserPersonalDetails.accountID});
     const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const [circularAvatar, setCircularAvatar] = useState<CircularAvatarIcon | undefined>(lastCircularAvatar);
-
-    useEffect(() => {
-        let isActive = true;
-        const signature = iconsSignature;
-
-        Promise.all(
-            TAB_ICONS.map(([name, source]) =>
-                Promise.all([createTintedGlyph(source, inactiveColor), createTintedGlyph(source, activeColor)]).then(([inactive, active]) => ({name, inactive, active})),
-            ),
-        )
-            .then((results) => {
-                if (!isActive) {
-                    return;
-                }
-                const icons: Record<string, TintedTabIconPair> = {};
-                for (const result of results) {
-                    if (result.inactive && result.active) {
-                        icons[result.name] = {inactive: result.inactive, active: result.active};
-                    }
-                }
-                lastTintedIcons = {signature, icons};
-                setTintedIcons(lastTintedIcons);
-            })
-            .catch(() => {
-                // A failed draw still lets the bar show, on the plain black glyphs, rather than keeping it hidden.
-                if (!isActive) {
-                    return;
-                }
-                setTintedIcons((previous) => previous ?? {signature, icons: {}});
-            });
-
-        return () => {
-            isActive = false;
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [iconsSignature]);
-
-    useEffect(() => {
-        let isActive = true;
-        if (!avatarURI) {
-            return () => {
-                isActive = false;
-            };
-        }
-
-        createCircularAvatarIcon(avatarURI)
-            .then((icon) => {
-                if (!isActive || !icon) {
-                    return;
-                }
-                lastCircularAvatar = {uri: avatarURI, icon};
-                setCircularAvatar(lastCircularAvatar);
-            })
-            .catch(() => {});
-
-        return () => {
-            isActive = false;
-        };
-    }, [avatarURI]);
-
-    /** Falls back to the plain black glyph for a tab whose recolored copies could not be drawn. */
-    const getTabBarIcon = (name: keyof typeof NATIVE_TAB_ICONS) => {
-        const pair = tintedIcons?.icons[name];
-        if (!pair) {
-            return NATIVE_TAB_ICONS[name];
-        }
-        return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
-    };
+    const circularAvatar = useRasterizedTabIcons(lastCircularAvatar, avatarURI, (uri) => createCircularAvatarIcon(uri).then((icon) => icon && {uri, icon}));
 
     // An avatar drawn for another user is never shown; until the current one is drawn, the account glyph stands in.
     const accountAvatarIcon = circularAvatar?.uri === avatarURI ? circularAvatar?.icon : undefined;
 
-    return {getTabBarIcon, accountAvatarIcon, areTabIconsReady: !!tintedIcons};
+    return {
+        getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),
+        accountAvatarIcon,
+        areTabIconsReady: !!tintedIcons,
+    };
 }
 
 export default useAndroidTabIcons;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
new file mode 100644
index 000000000000..550e515c683a
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
@@ -0,0 +1,227 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+
+import {getAvatarURL} from '@libs/UserAvatarUtils';
+
+import FontUtils from '@styles/utils/FontUtils';
+import variables from '@styles/variables';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
+import type {SkCanvas} from '@shopify/react-native-skia';
+import type {ImageSourcePropType} from 'react-native';
+
+import {FontWeight, Skia} from '@shopify/react-native-skia';
+
+import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+import type {TabIconPair} from './tabIconRasterizer';
+import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
+
+import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
+import useRasterizedTabIcons from './useRasterizedTabIcons';
+
+/** The account avatar drawn with its label, and the size it came out at. */
+type AvatarTabIcon = {uri: string; width: number; height: number};
+
+/** The account tab's avatar in both selection states, with the URI it was drawn from. */
+type CircularAvatarIcons = {uri: string; active: AvatarTabIcon; inactive: AvatarTabIcon};
+
+const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
+const lastCircularAvatar: LastDrawnTabIcons<CircularAvatarIcons> = {};
+
+/** Paints the status dot in the glyph's top right corner, where a native badge would have sat. */
+function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, scale: number, color: string) {
+    const radius = variables.nativeTabIconDotRadius * scale;
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
+}
+
+/** The label's face: Expensify Neue, bold when selected. */
+function getLabelFont(isSelected: boolean, scale: number) {
+    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
+        weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
+    });
+    return Skia.Font(typeface, variables.fontSizeSmall * scale);
+}
+
+/**
+ * Draws the label under the glyph and reports how much room it took. iOS 26 discards the title color an item
+ * appearance carries while honoring its font, and neither `unselectedItemTintColor` nor re-asserting it after
+ * layout gets through, so the text is painted into the image the item is handed instead.
+ */
+function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: boolean, scale: number, canvasWidth: number, top: number) {
+    const font = getLabelFont(isSelected, scale);
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    paint.setAntiAlias(true);
+    const width = font.measureText(label).width;
+    const metrics = font.getMetrics();
+    canvas.drawText(label, (canvasWidth - width) / 2, top - metrics.ascent, paint, font);
+}
+
+/** Width and height the label occupies, so a canvas can be sized before anything is drawn into it. */
+function measureLabel(label: string, isSelected: boolean, scale: number) {
+    const font = getLabelFont(isSelected, scale);
+    const metrics = font.getMetrics();
+    return {width: font.measureText(label).width, height: metrics.descent - metrics.ascent};
+}
+
+/**
+ * iOS 26 draws the bar's glass material itself and honors very little of what a tab item is told about its colors.
+ * The inactive icon color from `UITabBarItemAppearance` never arrives, and every badge is painted in the color of
+ * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
+ * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
+ * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
+ * differ in type. The canvas is only as big as what it holds, and the dot overlaps the glyph's top right corner
+ * the way the indicator on the JS bar does.
+ */
+async function createTabIcon(
+    source: ImageSourcePropType,
+    color: string,
+    dotColor: string | undefined,
+    label: string,
+    labelColor: string,
+    isSelected: boolean,
+): Promise<NativeBottomTabIcon | undefined> {
+    const glyph = await decodeGlyph(source);
+    if (!glyph) {
+        return undefined;
+    }
+
+    const {image, scale} = glyph;
+    // The glyph assets are 24 pt and are drawn at the native bar's glyph size.
+    const glyphWidth = variables.iconNativeTabBarIOS * scale;
+    const glyphHeight = variables.iconNativeTabBarIOS * scale;
+    // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
+    // every label lands at the same height.
+    const glyphTop = ((variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
+    const gap = variables.nativeTabIconLabelGap * scale;
+    const labelSize = measureLabel(label, isSelected, scale);
+    const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
+    const canvasHeight = Math.ceil(glyphTop + glyphHeight + gap + labelSize.height);
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+
+    if (!surface) {
+        image.dispose();
+        return undefined;
+    }
+
+    const canvas = surface.getCanvas();
+    const glyphLeft = (canvasWidth - glyphWidth) / 2;
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphWidth, glyphHeight), createTintPaint(color));
+
+    if (dotColor) {
+        drawStatusDot(canvas, glyphLeft + glyphWidth, glyphTop, scale, dotColor);
+    }
+
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphHeight + gap);
+    image.dispose();
+
+    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
+}
+
+/**
+ * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
+ * circle off-screen and handed over as a data URI. Its canvas is as tall as every other tab icon's, with the avatar
+ * a little larger than the glyphs next to it, since a circle reads smaller than a glyph of the same box.
+ */
+async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<AvatarTabIcon | undefined> {
+    const image = await decodeImage(uri);
+    const scale = variables.nativeTabIconScale;
+    const avatarSize = variables.avatarNativeTabBarIOS * scale;
+    // The avatar overhangs a glyph by the same amount above and below, so its gap to the label shrinks by
+    // that much and the label lands where every other tab's does.
+    const gap = (variables.nativeTabIconLabelGap - (variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
+    const labelSize = measureLabel(label, isSelected, scale);
+    const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
+    const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+
+    if (!image || !surface) {
+        image?.dispose();
+        surface?.dispose();
+        return undefined;
+    }
+
+    const avatarLeft = (canvasWidth - avatarSize) / 2;
+    const canvas = surface.getCanvas();
+    drawCircularImage(canvas, image, avatarLeft, 0, avatarSize);
+
+    if (dotColor) {
+        drawStatusDot(canvas, avatarLeft + avatarSize, 0, scale, dotColor);
+    }
+
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
+    image.dispose();
+
+    return {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale};
+}
+
+function toAvatarIcon(icon: AvatarTabIcon): NativeBottomTabIcon {
+    return {type: 'image', source: {uri: icon.uri, width: icon.width, height: icon.height, scale: variables.nativeTabIconScale}, tinted: false};
+}
+
+/**
+ * The icons of the iOS tab bar: each glyph recolored for both selection states with its label and status dot baked
+ * in, and the user's avatar on the account tab. `areTabIconsReady` stays false until the first recolored set exists,
+ * because the template icons the bar would fall back to render black on iOS 26, which ignores the inactive tint.
+ */
+function useIOSTabIcons(dotColors: Record<string, string | undefined>) {
+    const {translate} = useLocalize();
+    const theme = useTheme();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const tabLabels: Record<string, string> = {
+        [SCREENS.HOME]: translate('common.home'),
+        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
+        [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
+        [SCREENS.INSIGHTS]: translate('common.insights'),
+        [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
+        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
+    };
+    const accountLabel = tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
+    const accountDotColor = dotColors[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
+
+    // The signature covers everything baked into the bitmaps, so a status that comes or goes, a theme swap or a
+    // language change redraws them. The label takes the supporting tone when idle and the plain text tone when
+    // selected, taken from the theme so light and dark each get their own pair.
+    const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, ...Object.values(dotColors), ...Object.values(tabLabels)].join('|');
+    // A failed draw still lets the bar show, on the template icons, rather than keeping it hidden.
+    const tintedIcons = useRasterizedTabIcons(
+        lastTintedIcons,
+        iconsSignature,
+        () =>
+            drawTabIconPairs((name, source, isSelected) =>
+                createTabIcon(source, isSelected ? theme.iconMenu : theme.icon, dotColors[name], tabLabels[name], isSelected ? theme.text : theme.textSupporting, isSelected),
+            ),
+        {},
+    );
+
+    const avatarSource = getAvatarURL({avatarSource: currentUserPersonalDetails.avatar, accountID: currentUserPersonalDetails.accountID});
+    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
+    const avatarSignature = avatarURI && [avatarURI, accountDotColor, accountLabel, theme.textSupporting, theme.text].join('|');
+    const circularAvatar = useRasterizedTabIcons(lastCircularAvatar, avatarSignature, () => {
+        if (!avatarURI) {
+            return Promise.resolve(undefined);
+        }
+        return Promise.all([
+            createCircularAvatarIcon(avatarURI, accountDotColor, accountLabel, theme.textSupporting, false),
+            createCircularAvatarIcon(avatarURI, accountDotColor, accountLabel, theme.text, true),
+        ]).then(([inactive, active]) => (inactive && active ? {uri: avatarURI, inactive, active} : undefined));
+    });
+
+    // An avatar drawn for another user is never shown, while a stale dot or label is, until the redraw lands.
+    const avatarPair = circularAvatar?.uri === avatarURI ? circularAvatar : undefined;
+    const accountAvatarIcon = avatarPair ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive) : undefined;
+
+    return {
+        getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),
+        accountAvatarIcon,
+        areTabIconsReady: !!tintedIcons,
+    };
+}
+
+export default useIOSTabIcons;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
new file mode 100644
index 000000000000..0af2e3565f84
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
@@ -0,0 +1,46 @@
+import {useEffect, useState} from 'react';
+
+/**
+ * The last icons drawn, held by the caller outside any component so a remounted navigator starts from them instead
+ * of waiting for Skia again. While a new set is being drawn, the bar keeps showing these.
+ */
+type LastDrawnTabIcons<T> = {current?: T};
+
+/**
+ * Draws tab icons off-screen again whenever the signature of everything baked into them changes, and never while
+ * it is undefined. A failed draw keeps the previous icons, or resolves to `fallbackOnError` when there are none.
+ */
+function useRasterizedTabIcons<T>(lastDrawn: LastDrawnTabIcons<T>, signature: string | undefined, draw: (signature: string) => Promise<T | undefined>, fallbackOnError?: T): T | undefined {
+    const [icons, setIcons] = useState<T | undefined>(lastDrawn.current);
+
+    useEffect(() => {
+        let isActive = true;
+        if (signature !== undefined) {
+            draw(signature)
+                .then((result) => {
+                    if (!isActive || result === undefined) {
+                        return;
+                    }
+                    // eslint-disable-next-line no-param-reassign
+                    lastDrawn.current = result;
+                    setIcons(result);
+                })
+                .catch(() => {
+                    if (!isActive || fallbackOnError === undefined) {
+                        return;
+                    }
+                    setIcons((previous) => previous ?? fallbackOnError);
+                });
+        }
+
+        return () => {
+            isActive = false;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [signature]);
+
+    return icons;
+}
+
+export default useRasterizedTabIcons;
+export type {LastDrawnTabIcons};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
index dff68eb75705..dbb7db0b8846 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
@@ -65,14 +65,13 @@ function TabNavigator() {
     const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useAndroidTabIcons();
 
     // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
-    // selected tab has the menu icon color and a bold label in the regular text color, the others the plain icon
-    // color and a supporting text label. The bar takes the raised surface tone with no top border.
+    // selected tab has a bold label in the regular text color, the others a supporting text label. The tint only
+    // reaches the labels, since the icons arrive already recolored (react-native-screens patch 003). The bar takes
+    // the raised surface tone with no top border.
     const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
-        tabBarActiveTintColor: theme.iconMenu,
-        tabBarInactiveTintColor: theme.icon,
-        tabBarActiveLabelColor: theme.text,
-        tabBarInactiveLabelColor: theme.textSupporting,
+        tabBarActiveTintColor: theme.text,
+        tabBarInactiveTintColor: theme.textSupporting,
         tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
         tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
         tabBarLabelVisibilityMode: 'labeled',
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
index 61be5183804f..19f5d8dae923 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
@@ -1,34 +1,24 @@
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 
 import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import {getAvatarURL} from '@libs/UserAvatarUtils';
 
 import HomePage from '@pages/home/HomePage';
 import InsightsPage from '@pages/Insights/InsightsPage';
 
-import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
-import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-import type {SkCanvas} from '@shopify/react-native-skia';
-import type {ImageSourcePropType} from 'react-native';
-
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
-import {BlendMode, ClipOp, FontWeight, ImageFormat, Skia} from '@shopify/react-native-skia';
-import React, {useEffect, useState} from 'react';
-import {Image} from 'react-native';
+import React from 'react';
 
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
-import NATIVE_TAB_ICONS from './NativeTabNavigator/NATIVE_TAB_ICONS';
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import useIOSTabIcons from './NativeTabNavigator/useIOSTabIcons';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
 import SearchFullscreenNavigator from './SearchFullscreenNavigator';
@@ -41,197 +31,6 @@ import WorkspaceNavigator from './WorkspaceNavigator';
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
-/** The recolored tab icons, with the signature of everything baked into them. */
-type TintedTabIcons = {signature: string; icons: Record<string, TintedTabIconPair>};
-
-/** The account tab's avatar in both selection states, with the signature of everything baked into them. */
-type CircularAvatarIcons = {signature: string; uri: string; active: AvatarTabIcon; inactive: AvatarTabIcon};
-
-/**
- * The last icons drawn, kept outside the component so a remounted navigator starts from them instead of waiting
- * for Skia again. While a new theme or language is being drawn, the bar keeps showing these.
- */
-let lastTintedIcons: TintedTabIcons | undefined;
-let lastCircularAvatar: CircularAvatarIcons | undefined;
-
-/** The recolored copies of one tab icon, one per selection state. */
-type TintedTabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
-
-/** The account avatar drawn with its label, and the size it came out at. */
-type AvatarTabIcon = {uri: string; width: number; height: number};
-
-/** Paints the status dot in the glyph's top right corner, where a native badge would have sat. */
-function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, scale: number, color: string) {
-    const radius = variables.nativeTabIconDotRadius * scale;
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
-    canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
-}
-
-/** The label's face: Expensify Neue, bold when selected. */
-function getLabelFont(isSelected: boolean, scale: number) {
-    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
-        weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
-    });
-    return Skia.Font(typeface, variables.fontSizeSmall * scale);
-}
-
-/**
- * Draws the label under the glyph and reports how much room it took. iOS 26 discards the title color an item
- * appearance carries while honoring its font, and neither `unselectedItemTintColor` nor re-asserting it after
- * layout gets through, so the text is painted into the image the item is handed instead.
- */
-function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: boolean, scale: number, canvasWidth: number, top: number) {
-    const font = getLabelFont(isSelected, scale);
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
-    paint.setAntiAlias(true);
-    const width = font.measureText(label).width;
-    const metrics = font.getMetrics();
-    canvas.drawText(label, (canvasWidth - width) / 2, top - metrics.ascent, paint, font);
-}
-
-/** Width and height the label occupies, so a canvas can be sized before anything is drawn into it. */
-function measureLabel(label: string, isSelected: boolean, scale: number) {
-    const font = getLabelFont(isSelected, scale);
-    const metrics = font.getMetrics();
-    return {width: font.measureText(label).width, height: metrics.descent - metrics.ascent};
-}
-
-/**
- * iOS 26 draws the bar's glass material itself and honors very little of what a tab item is told about its colors.
- * The inactive icon color from `UITabBarItemAppearance` never arrives, and every badge is painted in the color of
- * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
- * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
- * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
- * differ in type. The canvas is only as big as what it holds, and the dot overlaps the glyph's top right corner
- * the way the indicator on the JS bar does.
- */
-async function createTabIcon(
-    source: ImageSourcePropType,
-    color: string,
-    dotColor: string | undefined,
-    label: string,
-    labelColor: string,
-    isSelected: boolean,
-): Promise<NativeBottomTabIcon | undefined> {
-    const asset = Image.resolveAssetSource(source);
-    if (!asset?.uri) {
-        return undefined;
-    }
-
-    const response = await fetch(asset.uri);
-    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
-    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
-    const scale = asset.scale ?? 1;
-
-    if (!image) {
-        return undefined;
-    }
-
-    // The glyph assets are 24 pt and are drawn at the native bar's glyph size.
-    const glyphWidth = variables.iconNativeTabBarIOS * scale;
-    const glyphHeight = variables.iconNativeTabBarIOS * scale;
-    // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
-    // every label lands at the same height.
-    const glyphTop = ((variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
-    const gap = variables.nativeTabIconLabelGap * scale;
-    const labelSize = measureLabel(label, isSelected, scale);
-    const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
-    const canvasHeight = Math.ceil(glyphTop + glyphHeight + gap + labelSize.height);
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
-
-    if (!surface) {
-        image.dispose();
-        return undefined;
-    }
-
-    const paint = Skia.Paint();
-    // SrcIn keeps the glyph's alpha and replaces every colored pixel with the theme color.
-    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
-
-    const canvas = surface.getCanvas();
-    const glyphLeft = (canvasWidth - glyphWidth) / 2;
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphWidth, glyphHeight), paint);
-
-    if (dotColor) {
-        drawStatusDot(canvas, glyphLeft + glyphWidth, glyphTop, scale, dotColor);
-    }
-
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphHeight + gap);
-
-    surface.flush();
-
-    const snapshot = surface.makeImageSnapshot();
-    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
-
-    image.dispose();
-    snapshot.dispose();
-    surface.dispose();
-
-    return {type: 'image', source: {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
-}
-
-/**
- * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI. Its canvas is as tall as every other tab icon's, with the avatar
- * a little larger than the glyphs next to it, since a circle reads smaller than a glyph of the same box.
- */
-async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<AvatarTabIcon | undefined> {
-    const response = await fetch(uri);
-    const encodedImage = Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer()));
-    const image = Skia.Image.MakeImageFromEncoded(encodedImage);
-    const scale = variables.nativeTabIconScale;
-    const avatarSize = variables.avatarNativeTabBarIOS * scale;
-    // The avatar overhangs a glyph by the same amount above and below, so its gap to the label shrinks by
-    // that much and the label lands where every other tab's does.
-    const gap = (variables.nativeTabIconLabelGap - (variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
-    const labelSize = measureLabel(label, isSelected, scale);
-    const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
-    const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
-
-    if (!image || !surface) {
-        image?.dispose();
-        surface?.dispose();
-        return undefined;
-    }
-
-    const sourceSize = Math.min(image.width(), image.height());
-    const sourceX = (image.width() - sourceSize) / 2;
-    const sourceY = (image.height() - sourceSize) / 2;
-    const avatarLeft = (canvasWidth - avatarSize) / 2;
-    const circle = Skia.Path.Make();
-    circle.addCircle(avatarLeft + avatarSize / 2, avatarSize / 2, avatarSize / 2);
-
-    const canvas = surface.getCanvas();
-    canvas.save();
-    canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(image, Skia.XYWHRect(sourceX, sourceY, sourceSize, sourceSize), Skia.XYWHRect(avatarLeft, 0, avatarSize, avatarSize), Skia.Paint());
-    canvas.restore();
-
-    if (dotColor) {
-        drawStatusDot(canvas, avatarLeft + avatarSize, 0, scale, dotColor);
-    }
-
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
-
-    surface.flush();
-
-    const snapshot = surface.makeImageSnapshot();
-    const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
-
-    circle.dispose();
-    image.dispose();
-    snapshot.dispose();
-    surface.dispose();
-
-    return {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale};
-}
-
-/** Every glyph the bar draws, paired with the tab it belongs to so the tinted copies can be looked up again. */
-const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
-
 const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
 
 const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingButtonsBottom'>) => (
@@ -242,131 +41,14 @@ const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingBut
 );
 
 function TabNavigator() {
-    const {translate} = useLocalize();
     const theme = useTheme();
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
-    const dotColors: Record<string, string | undefined> = {
+    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useIOSTabIcons({
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
         [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: accountDotColor,
-    };
-    const tabLabels: Record<string, string> = {
-        [SCREENS.HOME]: translate('common.home'),
-        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
-        [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
-        [SCREENS.INSIGHTS]: translate('common.insights'),
-        [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
-        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
-    };
-    // The signature covers everything baked into the bitmaps, so a status that comes or goes, a theme swap or a
-    // language change redraws them.
-    const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, inboxDotColor, workspacesDotColor, accountDotColor, ...Object.values(tabLabels)].join('|');
-
-    const [tintedIcons, setTintedIcons] = useState<TintedTabIcons | undefined>(lastTintedIcons);
-    // The template icons the bar would fall back to render black on iOS 26, which ignores the inactive tint, so
-    // the bar is held back until the first recolored set exists.
-    const areTabIconsReady = !!tintedIcons;
-
-    useEffect(() => {
-        let isActive = true;
-        const inactiveColor = theme.icon;
-        const activeColor = theme.iconMenu;
-        // The supporting tone when idle, the plain text tone when selected, taken from the theme so light and dark
-        // each get their own pair.
-        const inactiveLabelColor = theme.textSupporting;
-        const activeLabelColor = theme.text;
-        const signature = iconsSignature;
-
-        Promise.all(
-            TAB_ICONS.map(([name, source]) =>
-                Promise.all([
-                    createTabIcon(source, inactiveColor, dotColors[name], tabLabels[name], inactiveLabelColor, false),
-                    createTabIcon(source, activeColor, dotColors[name], tabLabels[name], activeLabelColor, true),
-                ]).then(([inactive, active]) => ({
-                    name,
-                    inactive,
-                    active,
-                })),
-            ),
-        )
-            .then((results) => {
-                if (!isActive) {
-                    return;
-                }
-                const icons: Record<string, TintedTabIconPair> = {};
-                for (const result of results) {
-                    if (result.inactive && result.active) {
-                        icons[result.name] = {inactive: result.inactive, active: result.active};
-                    }
-                }
-                lastTintedIcons = {signature, icons};
-                setTintedIcons(lastTintedIcons);
-            })
-            .catch(() => {
-                // A failed draw still lets the bar show, on the template icons, rather than keeping it hidden.
-                if (!isActive) {
-                    return;
-                }
-                setTintedIcons((previous) => previous ?? {signature, icons: {}});
-            });
-
-        return () => {
-            isActive = false;
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [iconsSignature]);
-
-    /** Falls back to the template icon for a tab whose tinted copies could not be drawn, so it is never left without one. */
-    const getTabBarIcon = (name: keyof typeof NATIVE_TAB_ICONS) => {
-        const pair = tintedIcons?.icons[name];
-        if (!pair) {
-            return NATIVE_TAB_ICONS[name];
-        }
-        return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
-    };
-
-    const avatarSource = getAvatarURL({
-        avatarSource: currentUserPersonalDetails.avatar,
-        accountID: currentUserPersonalDetails.accountID,
-    });
-    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const avatarSignature = [avatarURI, accountDotColor, tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR], theme.textSupporting, theme.text].join('|');
-    const [circularAvatar, setCircularAvatar] = useState<CircularAvatarIcons | undefined>(lastCircularAvatar);
-    // An avatar drawn for another user is never shown, while a stale dot or label is, until the redraw lands.
-    const avatarPair = circularAvatar?.uri === avatarURI ? circularAvatar : undefined;
-    const toAvatarIcon = (icon: AvatarTabIcon): NativeBottomTabIcon => ({
-        type: 'image',
-        source: {uri: icon.uri, width: icon.width, height: icon.height, scale: variables.nativeTabIconScale},
-        tinted: false,
     });
 
-    useEffect(() => {
-        let isActive = true;
-        if (!avatarURI) {
-            return () => {
-                isActive = false;
-            };
-        }
-
-        const signature = avatarSignature;
-        const label = tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
-        Promise.all([createCircularAvatarIcon(avatarURI, accountDotColor, label, theme.textSupporting, false), createCircularAvatarIcon(avatarURI, accountDotColor, label, theme.text, true)])
-            .then(([inactive, active]) => {
-                if (!isActive || !inactive || !active) {
-                    return;
-                }
-                lastCircularAvatar = {signature, uri: avatarURI, active, inactive};
-                setCircularAvatar(lastCircularAvatar);
-            })
-            .catch(() => {});
-
-        return () => {
-            isActive = false;
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [avatarSignature]);
-
     const screenOptions = {
         headerShown: false,
         tabBarActiveTintColor: theme.iconMenu,
@@ -427,9 +109,7 @@ function TabNavigator() {
                 options={{
                     tabBarLabel: '',
                     tabBarItemHidden: isInsightsTabVisible,
-                    tabBarIcon: avatarPair
-                        ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive)
-                        : getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
+                    tabBarIcon: accountAvatarIcon ?? getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
                 }}
             />
         </Tab.Navigator>
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index edf7b49e5cd3..1e321b3c20e4 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -13,7 +13,6 @@ import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPa
 import SearchSelectionFooter from '@components/Search/SearchSelectionFooter';
 import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
 import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
-import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
@@ -344,12 +343,6 @@ function SearchPageNarrow({
                                             hasFilterBars={hasFilterBars}
                                         />
                                     )}
-                                    {!isInteractive && !searchOverlayContent && (
-                                        <SearchRowSkeleton
-                                            shouldAnimate
-                                            containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
-                                        />
-                                    )}
                                     {shouldRenderLayoutProbe && <View onLayout={onSearchLayout} />}
                                     {!!searchOverlayContent && (
                                         <View

From 8e215cb70d698feaef14cd8d60ca28d1428d2b1d Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 16:40:30 +0200
Subject: [PATCH 209/781] clearing up pr

---
 .../NativeTabNavigator/NATIVE_TAB_ICONS.ts    |   1 -
 .../NativeTabNavigator/NativeTabLayout.tsx    |  24 +--
 .../NativeTabNavigator/tabIconRasterizer.ts   |   9 --
 .../NativeTabNavigator/useAndroidTabIcons.ts  |  17 +--
 .../NativeTabNavigator/useIOSTabIcons.ts      |  78 +++-------
 .../useNativeTabBarOptions/index.ios.ts       |  42 ++++++
 .../useNativeTabBarOptions/index.ts           |  51 +++++++
 .../useNativeTabBarOptions/types.ts           |   7 +
 .../useNativeTabNavigator.ts                  |  36 ++---
 .../useRasterizedTabIcons.ts                  |  10 +-
 .../Navigators/TAB_SCREENS.native.ts          |  20 ---
 .../AppNavigator/Navigators/TAB_SCREENS.ts    |   5 +-
 .../Navigators/TabNavigator.android.tsx       | 140 ------------------
 .../Navigators/TabNavigator.ios.tsx           | 119 ---------------
 .../Navigators/TabNavigator.native.tsx        |  83 +++++++++++
 .../AppNavigator/Navigators/TabNavigator.tsx  |   8 +-
 .../Navigators/TabNavigatorBar.tsx            |   3 +-
 .../PlatformStackNavigation/ScreenLayout.tsx  |  23 +--
 src/styles/variables.ts                       |   2 +-
 .../buildTabNavigatorNestedStateTests.ts      |  27 ++--
 20 files changed, 266 insertions(+), 439 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
index c462369d097e..6e9db9a6eacf 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
@@ -10,7 +10,6 @@ import SCREENS from '@src/SCREENS';
 
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 
-/** The glyph each native tab draws, keyed by the tab's route name. The bar tints them for both selection states. */
 const NATIVE_TAB_ICONS = {
     [SCREENS.HOME]: {type: 'image', source: homeIcon},
     [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: {type: 'image', source: inboxIcon},
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index e6f5048de235..60de5f48e070 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -1,7 +1,6 @@
 import FloatingCameraButton from '@components/FloatingCameraButton';
 import FloatingGPSButton from '@components/FloatingGPSButton';
 import DebugTabView from '@components/Navigation/DebugTabView';
-import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
@@ -10,6 +9,8 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import TabNavigatorBar from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
+
 import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
 import CONST from '@src/CONST';
@@ -22,17 +23,11 @@ import React from 'react';
 import {View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
-type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0] & {
-    /** Distance from the bottom edge of the screen to the strip the floating buttons hang from, given the bottom safe area inset. */
-    getFloatingButtonsBottom: (bottomInset: number) => number;
-};
+import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
+
+type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
 
-/**
- * Wraps the tab screens so the floating buttons, the debug view and the wide-layout side bar can be drawn over
- * them. The native bar is part of the navigator itself, so it is switched off through `tabBarStyle` in the
- * navigator's screen options instead of being unmounted.
- */
-function NativeTabLayout({children, state, descriptors, getFloatingButtonsBottom}: NativeTabLayoutProps) {
+function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const styles = useThemeStyles();
@@ -45,12 +40,7 @@ function NativeTabLayout({children, state, descriptors, getFloatingButtonsBottom
     if (!shouldUseNarrowLayout) {
         return (
             <View style={[styles.flex1, styles.flexRow]}>
-                <View
-                    style={styles.tabNavigatorBarContainer}
-                    pointerEvents="box-none"
-                >
-                    <NavigationTabBar selectedTab={selectedTab} />
-                </View>
+                <TabNavigatorBar state={state} />
                 <View style={styles.flex1}>{children}</View>
             </View>
         );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index 2930b251442f..ce6df5edf964 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -7,19 +7,15 @@ import {Image} from 'react-native';
 
 import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
 
-/** The recolored copies of one glyph, one per selection state. */
 type TabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
-/** Every glyph the bar draws, paired with the tab it belongs to so the recolored copies can be looked up again. */
 const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
 
-/** Downloads and decodes an image, or resolves to null when it cannot be decoded. */
 async function decodeImage(uri: string): Promise<SkImage | null> {
     const response = await fetch(uri);
     return Skia.Image.MakeImageFromEncoded(Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer())));
 }
 
-/** Decodes a bundled glyph together with the pixel density it was resolved at. */
 async function decodeGlyph(source: ImageSourcePropType): Promise<{image: SkImage; scale: number} | undefined> {
     const asset = Image.resolveAssetSource(source);
     if (!asset?.uri) {
@@ -29,14 +25,12 @@ async function decodeGlyph(source: ImageSourcePropType): Promise<{image: SkImage
     return image ? {image, scale: asset.scale ?? 1} : undefined;
 }
 
-/** A paint that keeps the glyph's alpha and replaces every colored pixel with the given color. */
 function createTintPaint(color: string) {
     const paint = Skia.Paint();
     paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
     return paint;
 }
 
-/** Draws the centred square of the image, cropped to a circle of the given size. */
 function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top: number, size: number) {
     const sourceSize = Math.min(image.width(), image.height());
     const circle = Skia.Path.Make();
@@ -54,7 +48,6 @@ function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top:
     circle.dispose();
 }
 
-/** Encodes what was drawn on the surface as a PNG data URI, which a tab icon can take, and disposes the surface. */
 function encodeSurface(surface: SkSurface): string {
     surface.flush();
     const snapshot = surface.makeImageSnapshot();
@@ -64,7 +57,6 @@ function encodeSurface(surface: SkSurface): string {
     return `data:image/png;base64,${base64}`;
 }
 
-/** Draws both selection states of every glyph, leaving out a tab whose copies could not be drawn. */
 async function drawTabIconPairs(
     drawIcon: (name: string, source: ImageSourcePropType, isSelected: boolean) => Promise<NativeBottomTabIcon | undefined>,
 ): Promise<Record<string, TabIconPair>> {
@@ -80,7 +72,6 @@ async function drawTabIconPairs(
     return icons;
 }
 
-/** The tab's recolored icon for its selection state, or the plain glyph for a tab whose copies could not be drawn. */
 function getTabBarIcon(icons: Record<string, TabIconPair> | undefined, name: keyof typeof NATIVE_TAB_ICONS) {
     const pair = icons?.[name];
     if (!pair) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
index 8470d3776f9f..a55c798ba91b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
@@ -21,9 +21,8 @@ const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
 const lastCircularAvatar: LastDrawnTabIcons<{uri: string; icon: NativeBottomTabIcon}> = {};
 
 /**
- * Material draws the icons without a tint (react-native-screens patch 003), so each glyph is recolored off-screen
- * in the theme color of its selection state. The canvas is the glyph's own size, so Android's fixed icon slot
- * draws it at full size.
+ * Material draws the icons without a tint (react-native-screens patch 003), so each glyph is recolored here. The
+ * canvas is the glyph's own size, so Android's fixed icon slot draws it at full size.
  */
 async function createTintedGlyph(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
     const glyph = await decodeGlyph(source);
@@ -47,11 +46,7 @@ async function createTintedGlyph(source: ImageSourcePropType, color: string): Pr
     return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}};
 }
 
-/**
- * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI, at the size of the glyphs next to it. The selected tab is
- * marked by the active indicator pill, so one image serves both selection states.
- */
+/** The active indicator pill marks the selected tab, so one image serves both selection states. */
 async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIcon | undefined> {
     const image = await decodeImage(uri);
     const scale = variables.nativeTabIconScale;
@@ -70,11 +65,7 @@ async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIco
     return {type: 'image', source: {uri: encodeSurface(surface), width: variables.iconBottomBar, height: variables.iconBottomBar, scale}};
 }
 
-/**
- * The icons of the Android tab bar: each glyph recolored for both selection states, and the user's avatar on the
- * account tab. `areTabIconsReady` stays false until the first recolored set exists, because the plain black glyphs
- * would draw black.
- */
+/** `areTabIconsReady` stays false until the first recolored set exists, because the plain glyphs draw black. */
 function useAndroidTabIcons() {
     const theme = useTheme();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
index 550e515c683a..ec4cd48a7df8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
@@ -1,5 +1,4 @@
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 
 import {getAvatarURL} from '@libs/UserAvatarUtils';
@@ -8,7 +7,6 @@ import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 
 import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
 
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas} from '@shopify/react-native-skia';
@@ -23,16 +21,12 @@ import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
 import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
 import useRasterizedTabIcons from './useRasterizedTabIcons';
 
-/** The account avatar drawn with its label, and the size it came out at. */
-type AvatarTabIcon = {uri: string; width: number; height: number};
-
 /** The account tab's avatar in both selection states, with the URI it was drawn from. */
-type CircularAvatarIcons = {uri: string; active: AvatarTabIcon; inactive: AvatarTabIcon};
+type CircularAvatarIcons = TabIconPair & {uri: string};
 
 const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
 const lastCircularAvatar: LastDrawnTabIcons<CircularAvatarIcons> = {};
 
-/** Paints the status dot in the glyph's top right corner, where a native badge would have sat. */
 function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, scale: number, color: string) {
     const radius = variables.nativeTabIconDotRadius * scale;
     const paint = Skia.Paint();
@@ -40,7 +34,6 @@ function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, s
     canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
 }
 
-/** The label's face: Expensify Neue, bold when selected. */
 function getLabelFont(isSelected: boolean, scale: number) {
     const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
         weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
@@ -49,9 +42,8 @@ function getLabelFont(isSelected: boolean, scale: number) {
 }
 
 /**
- * Draws the label under the glyph and reports how much room it took. iOS 26 discards the title color an item
- * appearance carries while honoring its font, and neither `unselectedItemTintColor` nor re-asserting it after
- * layout gets through, so the text is painted into the image the item is handed instead.
+ * iOS 26 discards the title color an item appearance carries while honoring its font, and neither
+ * `unselectedItemTintColor` nor re-asserting it after layout gets through, so the label is painted into the icon.
  */
 function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: boolean, scale: number, canvasWidth: number, top: number) {
     const font = getLabelFont(isSelected, scale);
@@ -63,7 +55,6 @@ function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: b
     canvas.drawText(label, (canvasWidth - width) / 2, top - metrics.ascent, paint, font);
 }
 
-/** Width and height the label occupies, so a canvas can be sized before anything is drawn into it. */
 function measureLabel(label: string, isSelected: boolean, scale: number) {
     const font = getLabelFont(isSelected, scale);
     const metrics = font.getMetrics();
@@ -71,13 +62,10 @@ function measureLabel(label: string, isSelected: boolean, scale: number) {
 }
 
 /**
- * iOS 26 draws the bar's glass material itself and honors very little of what a tab item is told about its colors.
- * The inactive icon color from `UITabBarItemAppearance` never arrives, and every badge is painted in the color of
- * whichever tab is selected — measured to hold for `badgeBackgroundColor` and for `UITabBarItem.badgeColor` alike.
- * The image handed to an item is honored, though, so the glyph is recolored off-screen and the status dot is drawn
- * into it. Both selection states go through this, because RNScreens rejects a tab whose icon and selectedIcon
- * differ in type. The canvas is only as big as what it holds, and the dot overlaps the glyph's top right corner
- * the way the indicator on the JS bar does.
+ * iOS 26 never applies the inactive icon color from `UITabBarItemAppearance`, and paints every badge in the color of
+ * the selected tab (both `badgeBackgroundColor` and `UITabBarItem.badgeColor`), so the glyph is recolored and the
+ * status dot drawn into the image. Both selection states go through this, because RNScreens rejects a tab whose
+ * icon and selectedIcon differ in type.
  */
 async function createTabIcon(
     source: ImageSourcePropType,
@@ -93,16 +81,14 @@ async function createTabIcon(
     }
 
     const {image, scale} = glyph;
-    // The glyph assets are 24 pt and are drawn at the native bar's glyph size.
-    const glyphWidth = variables.iconNativeTabBarIOS * scale;
-    const glyphHeight = variables.iconNativeTabBarIOS * scale;
+    const glyphSize = variables.iconNativeTabBarIOS * scale;
     // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
     // every label lands at the same height.
     const glyphTop = ((variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
     const gap = variables.nativeTabIconLabelGap * scale;
     const labelSize = measureLabel(label, isSelected, scale);
-    const canvasWidth = Math.ceil(Math.max(glyphWidth, labelSize.width));
-    const canvasHeight = Math.ceil(glyphTop + glyphHeight + gap + labelSize.height);
+    const canvasWidth = Math.ceil(Math.max(glyphSize, labelSize.width));
+    const canvasHeight = Math.ceil(glyphTop + glyphSize + gap + labelSize.height);
     const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
 
     if (!surface) {
@@ -111,25 +97,21 @@ async function createTabIcon(
     }
 
     const canvas = surface.getCanvas();
-    const glyphLeft = (canvasWidth - glyphWidth) / 2;
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphWidth, glyphHeight), createTintPaint(color));
+    const glyphLeft = (canvasWidth - glyphSize) / 2;
+    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphSize, glyphSize), createTintPaint(color));
 
     if (dotColor) {
-        drawStatusDot(canvas, glyphLeft + glyphWidth, glyphTop, scale, dotColor);
+        drawStatusDot(canvas, glyphLeft + glyphSize, glyphTop, scale, dotColor);
     }
 
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphHeight + gap);
+    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphSize + gap);
     image.dispose();
 
     return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
 }
 
-/**
- * The account tab shows the user's avatar, and a tab icon has to be a square image, so the avatar is cropped to a
- * circle off-screen and handed over as a data URI. Its canvas is as tall as every other tab icon's, with the avatar
- * a little larger than the glyphs next to it, since a circle reads smaller than a glyph of the same box.
- */
-async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<AvatarTabIcon | undefined> {
+/** A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs. */
+async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<NativeBottomTabIcon | undefined> {
     const image = await decodeImage(uri);
     const scale = variables.nativeTabIconScale;
     const avatarSize = variables.avatarNativeTabBarIOS * scale;
@@ -158,36 +140,20 @@ async function createCircularAvatarIcon(uri: string, dotColor: string | undefine
     drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
     image.dispose();
 
-    return {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale};
-}
-
-function toAvatarIcon(icon: AvatarTabIcon): NativeBottomTabIcon {
-    return {type: 'image', source: {uri: icon.uri, width: icon.width, height: icon.height, scale: variables.nativeTabIconScale}, tinted: false};
+    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
 }
 
 /**
- * The icons of the iOS tab bar: each glyph recolored for both selection states with its label and status dot baked
- * in, and the user's avatar on the account tab. `areTabIconsReady` stays false until the first recolored set exists,
- * because the template icons the bar would fall back to render black on iOS 26, which ignores the inactive tint.
+ * `areTabIconsReady` stays false until the first recolored set exists, because the template icons the bar would
+ * fall back to render black on iOS 26, which ignores the inactive tint.
  */
-function useIOSTabIcons(dotColors: Record<string, string | undefined>) {
-    const {translate} = useLocalize();
+function useIOSTabIcons(dotColors: Record<string, string | undefined>, tabLabels: Record<string, string>) {
     const theme = useTheme();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const tabLabels: Record<string, string> = {
-        [SCREENS.HOME]: translate('common.home'),
-        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
-        [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
-        [SCREENS.INSIGHTS]: translate('common.insights'),
-        [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
-        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
-    };
     const accountLabel = tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
     const accountDotColor = dotColors[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
 
-    // The signature covers everything baked into the bitmaps, so a status that comes or goes, a theme swap or a
-    // language change redraws them. The label takes the supporting tone when idle and the plain text tone when
-    // selected, taken from the theme so light and dark each get their own pair.
+    // Covers everything baked into the bitmaps, so a status, theme or language change redraws them.
     const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, ...Object.values(dotColors), ...Object.values(tabLabels)].join('|');
     // A failed draw still lets the bar show, on the template icons, rather than keeping it hidden.
     const tintedIcons = useRasterizedTabIcons(
@@ -215,7 +181,7 @@ function useIOSTabIcons(dotColors: Record<string, string | undefined>) {
 
     // An avatar drawn for another user is never shown, while a stale dot or label is, until the redraw lands.
     const avatarPair = circularAvatar?.uri === avatarURI ? circularAvatar : undefined;
-    const accountAvatarIcon = avatarPair ? ({focused}: {focused: boolean}) => toAvatarIcon(focused ? avatarPair.active : avatarPair.inactive) : undefined;
+    const accountAvatarIcon = avatarPair ? ({focused}: {focused: boolean}) => (focused ? avatarPair.active : avatarPair.inactive) : undefined;
 
     return {
         getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
new file mode 100644
index 000000000000..7a90d8ecda07
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -0,0 +1,42 @@
+import useTheme from '@hooks/useTheme';
+
+import type NATIVE_TAB_ICONS from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS';
+import useIOSTabIcons from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons';
+
+import variables from '@styles/variables';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+
+import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
+
+import type NativeTabBarOptionsParams from './types';
+
+const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
+
+function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
+    const theme = useTheme();
+    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useIOSTabIcons(dotColors, tabLabels);
+
+    const screenOptions: NativeBottomTabNavigationOptions = {
+        headerShown: false,
+        // The labels are drawn into the icons.
+        tabBarLabel: '',
+        tabBarActiveTintColor: theme.iconMenu,
+        tabBarInactiveTintColor: theme.icon,
+        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
+        // The background only lands on iOS 18 and below; iOS 26 keeps its own glass material.
+        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.appBG},
+        tabBarControllerMode: 'tabBar',
+        // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
+        tabBarMinimizeBehavior: 'none',
+    };
+
+    const getTabOptions = (name: keyof typeof NATIVE_TAB_ICONS): NativeBottomTabNavigationOptions => ({
+        tabBarIcon: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR && accountAvatarIcon ? accountAvatarIcon : getTabBarIcon(name),
+    });
+
+    return {screenOptions, getTabOptions};
+}
+
+export default useNativeTabBarOptions;
+export {getFloatingButtonsBottom};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
new file mode 100644
index 000000000000..0ae89e4311b5
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -0,0 +1,51 @@
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type NATIVE_TAB_ICONS from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS';
+import useAndroidTabIcons from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons';
+
+import variables from '@styles/variables';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+
+import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
+
+import type NativeTabBarOptionsParams from './types';
+
+/** An empty badge value makes Material draw its small dot badge instead of a number. */
+const STATUS_DOT_BADGE = '';
+
+/** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
+const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
+
+function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useAndroidTabIcons();
+
+    // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
+    const screenOptions: NativeBottomTabNavigationOptions = {
+        headerShown: false,
+        tabBarActiveTintColor: theme.text,
+        tabBarInactiveTintColor: theme.textSupporting,
+        tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
+        tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
+        tabBarLabelVisibilityMode: 'labeled',
+        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
+        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.highlightBG},
+    };
+
+    const getTabOptions = (name: keyof typeof NATIVE_TAB_ICONS): NativeBottomTabNavigationOptions => {
+        const dotColor = dotColors[name];
+        return {
+            tabBarLabel: tabLabels[name],
+            tabBarIcon: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR && accountAvatarIcon ? accountAvatarIcon : getTabBarIcon(name),
+            ...(dotColor ? {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}} : {tabBarBadge: undefined}),
+        };
+    };
+
+    return {screenOptions, getTabOptions};
+}
+
+export default useNativeTabBarOptions;
+export {getFloatingButtonsBottom};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
new file mode 100644
index 000000000000..2728ae0e274a
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
@@ -0,0 +1,7 @@
+type NativeTabBarOptionsParams = {
+    shouldShowNativeTabBar: boolean;
+    dotColors: Record<string, string | undefined>;
+    tabLabels: Record<string, string>;
+};
+
+export default NativeTabBarOptionsParams;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 8a48826fff1a..d19fb99f5aaf 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -3,6 +3,7 @@ import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
 import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
@@ -10,10 +11,11 @@ import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
+import {NAVIGATION_TAB_TO_SPANS} from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
+import cancelTabNavigationSpans from '@libs/telemetry/cancelTabNavigationSpans';
 
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -21,13 +23,10 @@ import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
-import type {ValueOf} from 'type-fest';
 
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {useEffect} from 'react';
 
-import tabScreenListeners from './tabScreenListeners';
-
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.
@@ -35,26 +34,16 @@ import tabScreenListeners from './tabScreenListeners';
  */
 const TAB_ROOT_SCREENS_WITHOUT_GESTURE = new Set<string>([SCREENS.HOME, SCREENS.INBOX, SCREENS.SEARCH.ROOT, SCREENS.INSIGHTS, SCREENS.SETTINGS.ROOT]);
 
-const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
-    [NAVIGATION_TABS.INBOX]: INBOX_TAB_SPAN_IDS,
-    [NAVIGATION_TABS.SEARCH]: REPORTS_TAB_SPAN_IDS,
-};
-
 /** stale === false distinguishes a fully realized NavigationState from a PartialState. */
 function isRealizedNavigationState(state: NavigationState | PartialState<NavigationState> | undefined): state is NavigationState {
     return state?.stale === false;
 }
 
-/**
- * The state both native tab navigators share: whether the native bar shows, the status dot color of each tab that
- * has one, whether Insights or Account gets the last tab item, and a router override that restores the tab state after the navigator is remounted. It also keeps the
- * parent stack's swipe-back gesture, the preserved tab state and the tab-navigation spans in sync with the focused tab,
- * and returns the screen listeners that start those spans on a native bar tap.
- */
 function useNativeTabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {isBetaEnabled} = usePermissions();
+    const {translate} = useLocalize();
     // With the Insights beta, Insights takes the Account tab's place in the bar and Account moves to the top bar.
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const theme = useTheme();
@@ -79,8 +68,19 @@ function useNativeTabNavigator() {
     if (chatTabBrickRoad) {
         inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
     }
-    const workspacesDotColor = workspacesIndicatorStatus ? workspacesIndicatorColor : undefined;
-    const accountDotColor = accountIndicatorStatus ? accountIndicatorColor : undefined;
+    const dotColors: Record<string, string | undefined> = {
+        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
+        [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesIndicatorStatus ? workspacesIndicatorColor : undefined,
+        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: accountIndicatorStatus ? accountIndicatorColor : undefined,
+    };
+    const tabLabels: Record<string, string> = {
+        [SCREENS.HOME]: translate('common.home'),
+        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: translate('common.inbox'),
+        [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: translate('common.spend'),
+        [SCREENS.INSIGHTS]: translate('common.insights'),
+        [NAVIGATORS.WORKSPACE_NAVIGATOR]: translate('common.workspacesTabTitle'),
+        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: translate('initialSettingsPage.account'),
+    };
 
     useEffect(() => {
         if (!shouldUseNarrowLayout || !parentNavigation) {
@@ -126,7 +126,7 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners};
+    return {shouldShowNativeTabBar, dotColors, tabLabels, isInsightsTabVisible, tabRouterOverride};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
index 0af2e3565f84..596a606bc4ec 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
@@ -1,15 +1,9 @@
 import {useEffect, useState} from 'react';
 
-/**
- * The last icons drawn, held by the caller outside any component so a remounted navigator starts from them instead
- * of waiting for Skia again. While a new set is being drawn, the bar keeps showing these.
- */
+/** Held outside any component, so a remounted navigator starts from the last icons instead of waiting for Skia. */
 type LastDrawnTabIcons<T> = {current?: T};
 
-/**
- * Draws tab icons off-screen again whenever the signature of everything baked into them changes, and never while
- * it is undefined. A failed draw keeps the previous icons, or resolves to `fallbackOnError` when there are none.
- */
+/** A failed draw keeps the previous icons, or resolves to `fallbackOnError` when there are none. */
 function useRasterizedTabIcons<T>(lastDrawn: LastDrawnTabIcons<T>, signature: string | undefined, draw: (signature: string) => Promise<T | undefined>, fallbackOnError?: T): T | undefined {
     const [icons, setIcons] = useState<T | undefined>(lastDrawn.current);
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
deleted file mode 100644
index 6fa999c662e8..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.native.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Ordered list of screen names registered inside TabNavigator.
- * This must match the Tab.Screen order in TabNavigator.ios.tsx and TabNavigator.android.tsx, where the order is also the order the native
- * tab bar draws its items in. Insights and Account never show together: the bar draws Home, Inbox, Spend, Insights, Workspaces with
- * the Insights beta and Home, Inbox, Spend, Workspaces, Account without it.
- * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
- */
-import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
-
-const TAB_SCREENS = [
-    SCREENS.HOME,
-    NAVIGATORS.REPORTS_SPLIT_NAVIGATOR,
-    NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR,
-    SCREENS.INSIGHTS,
-    NAVIGATORS.WORKSPACE_NAVIGATOR,
-    NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
-] as const;
-
-export default TAB_SCREENS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ts b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ts
index 84825c7babaa..cbb02a5c88d8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/TAB_SCREENS.ts
@@ -1,6 +1,7 @@
 /**
  * Ordered list of screen names registered inside TabNavigator.
- * This must match the Tab.Screen order in TabNavigator.tsx.
+ * This must match the Tab.Screen order in TabNavigator.tsx and TabNavigator.native.tsx, where it is also the order
+ * the native tab bar draws its items in.
  * Used by getAdaptedStateFromPath to build complete tab navigator state for deep-links.
  */
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -11,8 +12,8 @@ const TAB_SCREENS = [
     NAVIGATORS.REPORTS_SPLIT_NAVIGATOR,
     NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR,
     SCREENS.INSIGHTS,
-    NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
     NAVIGATORS.WORKSPACE_NAVIGATOR,
+    NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
 ] as const;
 
 export default TAB_SCREENS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
deleted file mode 100644
index dbb7db0b8846..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.android.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
-import type {TabNavigatorParamList} from '@libs/Navigation/types';
-
-import HomePage from '@pages/home/HomePage';
-import InsightsPage from '@pages/Insights/InsightsPage';
-
-import variables from '@styles/variables';
-
-import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
-
-import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
-
-import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
-import React from 'react';
-
-import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
-
-import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
-import useAndroidTabIcons from './NativeTabNavigator/useAndroidTabIcons';
-import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
-import ReportsSplitNavigator from './ReportsSplitNavigator';
-import SearchFullscreenNavigator from './SearchFullscreenNavigator';
-import SettingsSplitNavigator from './SettingsSplitNavigator';
-import WorkspaceNavigator from './WorkspaceNavigator';
-
-/**
- * Tab Navigator backed by Material's BottomNavigationView, with the Material 3 active indicator pill, ripples, and
- * Material badges for the status dots. Wide layouts keep the JS side bar, since the native bar cannot be moved to
- * the side of the screen.
- */
-const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
-
-/** An empty badge value makes Material draw its small dot badge instead of a number. */
-const STATUS_DOT_BADGE = '';
-
-/** Shows a status as a Material dot badge in its own color, or no badge at all. */
-function getStatusBadgeOptions(dotColor: string | undefined): Pick<NativeBottomTabNavigationOptions, 'tabBarBadge' | 'tabBarBadgeStyle'> {
-    if (!dotColor) {
-        return {tabBarBadge: undefined};
-    }
-    return {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}};
-}
-
-/** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
-const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
-
-const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingButtonsBottom'>) => (
-    <NativeTabLayout
-        {...props}
-        getFloatingButtonsBottom={getFloatingButtonsBottom}
-    />
-);
-
-function TabNavigator() {
-    const {translate} = useLocalize();
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
-    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useAndroidTabIcons();
-
-    // Colors and the label face come from the Expensify theme and match the side bar on wide layouts: the
-    // selected tab has a bold label in the regular text color, the others a supporting text label. The tint only
-    // reaches the labels, since the icons arrive already recolored (react-native-screens patch 003). The bar takes
-    // the raised surface tone with no top border.
-    const screenOptions: NativeBottomTabNavigationOptions = {
-        headerShown: false,
-        tabBarActiveTintColor: theme.text,
-        tabBarInactiveTintColor: theme.textSupporting,
-        tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
-        tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
-        tabBarLabelVisibilityMode: 'labeled',
-        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.highlightBG},
-    };
-
-    return (
-        <Tab.Navigator
-            backBehavior="fullHistory"
-            layout={renderNativeTabLayout}
-            screenLayout={nativeBottomTabScreenLayoutWrapper}
-            screenOptions={screenOptions}
-            UNSTABLE_router={tabRouterOverride}
-            screenListeners={tabScreenListeners}
-        >
-            <Tab.Screen
-                name={SCREENS.HOME}
-                component={HomePage}
-                options={{tabBarLabel: translate('common.home'), tabBarIcon: getTabBarIcon(SCREENS.HOME)}}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
-                component={ReportsSplitNavigator}
-                options={{
-                    tabBarLabel: translate('common.inbox'),
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR),
-                    ...getStatusBadgeOptions(inboxDotColor),
-                }}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
-                component={SearchFullscreenNavigator}
-                options={{tabBarLabel: translate('common.spend'), tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}}
-            />
-            <Tab.Screen
-                name={SCREENS.INSIGHTS}
-                component={InsightsPage}
-                // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
-                initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
-                options={{tabBarLabel: translate('common.insights'), tabBarIcon: getTabBarIcon(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
-                component={WorkspaceNavigator}
-                options={{
-                    tabBarLabel: translate('common.workspacesTabTitle'),
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR),
-                    ...getStatusBadgeOptions(workspacesDotColor),
-                }}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
-                component={SettingsSplitNavigator}
-                options={{
-                    tabBarLabel: translate('initialSettingsPage.account'),
-                    tabBarIcon: accountAvatarIcon ?? getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
-                    tabBarItemHidden: isInsightsTabVisible,
-                    ...getStatusBadgeOptions(accountDotColor),
-                }}
-            />
-        </Tab.Navigator>
-    );
-}
-
-export default TabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
deleted file mode 100644
index 19f5d8dae923..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.ios.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import useTheme from '@hooks/useTheme';
-
-import {nativeBottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
-import type {TabNavigatorParamList} from '@libs/Navigation/types';
-
-import HomePage from '@pages/home/HomePage';
-import InsightsPage from '@pages/Insights/InsightsPage';
-
-import variables from '@styles/variables';
-
-import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
-
-import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
-import React from 'react';
-
-import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
-
-import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
-import useIOSTabIcons from './NativeTabNavigator/useIOSTabIcons';
-import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
-import ReportsSplitNavigator from './ReportsSplitNavigator';
-import SearchFullscreenNavigator from './SearchFullscreenNavigator';
-import SettingsSplitNavigator from './SettingsSplitNavigator';
-import WorkspaceNavigator from './WorkspaceNavigator';
-
-/**
- * Tab Navigator backed by UITabBar, which brings the liquid glass material with it on iOS 26. Wide layouts keep
- * the JS side bar, since UITabBar cannot be moved to the side of the screen.
- */
-const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
-
-const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
-
-const renderNativeTabLayout = (props: Omit<NativeTabLayoutProps, 'getFloatingButtonsBottom'>) => (
-    <NativeTabLayout
-        {...props}
-        getFloatingButtonsBottom={getFloatingButtonsBottom}
-    />
-);
-
-function TabNavigator() {
-    const theme = useTheme();
-    const {shouldShowNativeTabBar, inboxDotColor, workspacesDotColor, accountDotColor, isInsightsTabVisible, tabRouterOverride, tabScreenListeners} = useNativeTabNavigator();
-    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useIOSTabIcons({
-        [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
-        [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesDotColor,
-        [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: accountDotColor,
-    });
-
-    const screenOptions = {
-        headerShown: false,
-        tabBarActiveTintColor: theme.iconMenu,
-        tabBarInactiveTintColor: theme.icon,
-        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        // The background only lands on iOS 18 and below; iOS 26 keeps its own glass material.
-        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? ('flex' as const) : ('none' as const), backgroundColor: theme.appBG},
-        tabBarControllerMode: 'tabBar' as const,
-        // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
-        tabBarMinimizeBehavior: 'none' as const,
-    };
-
-    return (
-        <Tab.Navigator
-            backBehavior="fullHistory"
-            layout={renderNativeTabLayout}
-            screenLayout={nativeBottomTabScreenLayoutWrapper}
-            screenOptions={screenOptions}
-            UNSTABLE_router={tabRouterOverride}
-            screenListeners={tabScreenListeners}
-        >
-            <Tab.Screen
-                name={SCREENS.HOME}
-                component={HomePage}
-                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.HOME)}}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
-                component={ReportsSplitNavigator}
-                options={{
-                    tabBarLabel: '',
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR),
-                }}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
-                component={SearchFullscreenNavigator}
-                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}}
-            />
-            <Tab.Screen
-                name={SCREENS.INSIGHTS}
-                component={InsightsPage}
-                // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
-                initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
-                options={{tabBarLabel: '', tabBarIcon: getTabBarIcon(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
-                component={WorkspaceNavigator}
-                options={{
-                    tabBarLabel: '',
-                    tabBarIcon: getTabBarIcon(NAVIGATORS.WORKSPACE_NAVIGATOR),
-                }}
-            />
-            <Tab.Screen
-                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
-                component={SettingsSplitNavigator}
-                options={{
-                    tabBarLabel: '',
-                    tabBarItemHidden: isInsightsTabVisible,
-                    tabBarIcon: accountAvatarIcon ?? getTabBarIcon(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR),
-                }}
-            />
-        </Tab.Navigator>
-    );
-}
-
-export default TabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
new file mode 100644
index 000000000000..3be4da307cad
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -0,0 +1,83 @@
+import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
+import type {TabNavigatorParamList} from '@libs/Navigation/types';
+
+import HomePage from '@pages/home/HomePage';
+import InsightsPage from '@pages/Insights/InsightsPage';
+
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
+import React from 'react';
+
+import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
+
+import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import tabScreenListeners from './NativeTabNavigator/tabScreenListeners';
+import useNativeTabBarOptions from './NativeTabNavigator/useNativeTabBarOptions';
+import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
+import ReportsSplitNavigator from './ReportsSplitNavigator';
+import SearchFullscreenNavigator from './SearchFullscreenNavigator';
+import SettingsSplitNavigator from './SettingsSplitNavigator';
+import WorkspaceNavigator from './WorkspaceNavigator';
+
+/**
+ * Tab Navigator backed by the platform's own tab bar: UITabBar with the liquid glass material on iOS 26, and
+ * Material's BottomNavigationView on Android. Wide layouts keep the JS side bar, since neither native bar can be
+ * moved to the side of the screen.
+ */
+const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
+
+const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
+
+function TabNavigator() {
+    const {shouldShowNativeTabBar, dotColors, tabLabels, isInsightsTabVisible, tabRouterOverride} = useNativeTabNavigator();
+    const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels});
+
+    return (
+        <Tab.Navigator
+            backBehavior="fullHistory"
+            layout={renderNativeTabLayout}
+            screenLayout={bottomTabScreenLayoutWrapper}
+            screenOptions={screenOptions}
+            UNSTABLE_router={tabRouterOverride}
+            screenListeners={tabScreenListeners}
+        >
+            <Tab.Screen
+                name={SCREENS.HOME}
+                component={HomePage}
+                options={getTabOptions(SCREENS.HOME)}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
+                component={ReportsSplitNavigator}
+                options={getTabOptions(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
+                component={SearchFullscreenNavigator}
+                options={getTabOptions(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}
+            />
+            <Tab.Screen
+                name={SCREENS.INSIGHTS}
+                component={InsightsPage}
+                // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
+                initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
+                options={{...getTabOptions(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.WORKSPACE_NAVIGATOR}
+                component={WorkspaceNavigator}
+                options={getTabOptions(NAVIGATORS.WORKSPACE_NAVIGATOR)}
+            />
+            <Tab.Screen
+                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
+                component={SettingsSplitNavigator}
+                options={{...getTabOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR), tabBarItemHidden: isInsightsTabVisible}}
+            />
+        </Tab.Navigator>
+    );
+}
+
+export default TabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index d77a12be149d..6bf2ea7f9df1 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -133,14 +133,14 @@ function TabNavigator() {
                 name={SCREENS.INSIGHTS}
                 component={InsightsPageScreen}
             />
-            <Tab.Screen
-                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
-                component={SettingsSplitNavigatorScreen}
-            />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigatorScreen}
             />
+            <Tab.Screen
+                name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
+                component={SettingsSplitNavigatorScreen}
+            />
         </Tab.Navigator>
     );
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index 9b46ffd6e246..3943151a081a 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -40,7 +40,7 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     const isAtRoot = isTabRouteAtRoot(activeRoute);
     // --- Narrow-only animation logic (hooks must run unconditionally per Rules of Hooks) ---
-    // On native, screens also render the tab bar via bottomContent for swipe-back animations.
+    // Screens also render the tab bar via bottomContent for swipe-back animations.
     // Delay showing this navigator's tab bar only when navigating back from a deeper screen
     // (where the tab bar was hidden). Keep it visible during tab switches so it doesn't flash.
     // Guard with shouldUseNarrowLayout so prevShouldHide stays false in wide layout,
@@ -96,3 +96,4 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
 }
 
 export default TabNavigatorBar;
+export {NAVIGATION_TAB_TO_SPANS};
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index 2b74f7b4b002..bf0e8308a45b 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -1,8 +1,8 @@
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {TransitionHandle} from '@libs/Navigation/TransitionTracker';
 
-import type {BottomTabNavigationOptions, BottomTabNavigationProp} from '@react-navigation/bottom-tabs';
-import type {NativeBottomTabNavigationOptions, NativeBottomTabNavigationProp} from '@react-navigation/bottom-tabs/unstable';
+import type {BottomTabNavigationOptions} from '@react-navigation/bottom-tabs';
+import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
 import type {ParamListBase, ScreenLayoutArgs} from '@react-navigation/native';
 
 import React, {useLayoutEffect, useRef} from 'react';
@@ -27,20 +27,9 @@ function screenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBa
     );
 }
 
-// Same as screenLayoutWrapper above, but for bottom-tab navigators. No cast needed here - `navigation` is already
-// properly typed as BottomTabNavigationProp, and its `addListener` structurally satisfies TransitionAwareNavigation.
-function bottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBase, string, BottomTabNavigationOptions, BottomTabNavigationProp<ParamListBase>>) {
-    return (
-        <ScreenLayout
-            {...rest}
-            navigation={navigation}
-        />
-    );
-}
-
-// Same again for the native bottom tab navigator, whose options type differs while its navigation prop still
-// carries the `addListener` that ScreenLayout needs.
-function nativeBottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBase, string, NativeBottomTabNavigationOptions, NativeBottomTabNavigationProp<ParamListBase>>) {
+// Same as screenLayoutWrapper above, but for bottom-tab navigators, JS and native. No cast needed here - their
+// `navigation` props' `addListener` structurally satisfies TransitionAwareNavigation.
+function bottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutProps) {
     return (
         <ScreenLayout
             {...rest}
@@ -98,4 +87,4 @@ function ScreenLayout({children, navigation}: ScreenLayoutProps) {
 }
 
 export default screenLayoutWrapper;
-export {bottomTabScreenLayoutWrapper, nativeBottomTabScreenLayoutWrapper};
+export {bottomTabScreenLayoutWrapper};
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index b8f92b71b591..0ea27e0f0b23 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -115,7 +115,7 @@ export default {
     iconNativeTabBarIOS: 22,
     /** Account avatar size in the iOS native tab bar, larger than its glyphs by the same amount as on the JS bar. */
     avatarNativeTabBarIOS: 26,
-    /** Radius of the status dot drawn into a native tab bar icon, and the room reserved for it around the glyph. */
+    /** Radius of the status dot drawn into an iOS native tab bar icon. */
     nativeTabIconDotRadius: 4,
     // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.
     nativeTabIconLabelGap: 6,
diff --git a/tests/navigation/buildTabNavigatorNestedStateTests.ts b/tests/navigation/buildTabNavigatorNestedStateTests.ts
index aaedcaff3ada..ea0f8b8127dd 100644
--- a/tests/navigation/buildTabNavigatorNestedStateTests.ts
+++ b/tests/navigation/buildTabNavigatorNestedStateTests.ts
@@ -5,22 +5,23 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 describe('buildTabNavigatorNestedState', () => {
-    it('returns state with every tab route, in the order the navigator registers them', () => {
-        // Given the tab screens the navigator registers on the current platform
-        // When the nested state is built for one of them
+    it('returns state with all 6 tab routes', () => {
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR});
-
-        // Then it holds a route for every tab, in the same order, since the native tab bars draw their items in it
-        expect(result.routes.map((r) => r.name)).toEqual([...TAB_SCREENS]);
+        expect(result.routes).toHaveLength(TAB_SCREENS.length);
+        const routeNames = result.routes.map((r) => r.name);
+        expect(routeNames).toEqual([
+            SCREENS.HOME,
+            NAVIGATORS.REPORTS_SPLIT_NAVIGATOR,
+            NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR,
+            SCREENS.INSIGHTS,
+            NAVIGATORS.WORKSPACE_NAVIGATOR,
+            NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR,
+        ]);
     });
 
-    it('sets index to the position of the selected tab', () => {
-        // Given the settings tab, whose position differs between platforms
-        // When the nested state is built for it
+    it('sets index to the position of the selected tab (SETTINGS = 5)', () => {
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR});
-
-        // Then the index points at that tab's own route
-        expect(result.index).toBe(TAB_SCREENS.indexOf(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR));
+        expect(result.index).toBe(5);
     });
 
     it('falls back to index 0 for an unknown tab name', () => {
@@ -39,7 +40,7 @@ describe('buildTabNavigatorNestedState', () => {
     it('copies params from selectedTabRoute onto the matched route only', () => {
         const params = {screen: 'SomeScreen'};
         const result = buildTabNavigatorNestedState({name: NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, params});
-        expect(result.routes.at(TAB_SCREENS.indexOf(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR))?.params).toEqual(params);
+        expect(result.routes.at(5)?.params).toEqual(params);
         expect(result.routes.at(0)?.params).toBeUndefined();
         expect(result.routes.at(1)?.params).toBeUndefined();
     });

From 8d5dfffd8c01a281ac31483d2adbf9134b5ccc80 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 30 Sep 2026 16:57:30 +0200
Subject: [PATCH 210/781] fix: restore Search skeleton rows dropped in the PR
 cleanup

---
 src/components/Search/index.tsx             | 28 ++++++++-------------
 src/pages/Search/SearchPageNarrow/index.tsx |  7 ++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index af5560e39649..3a963469f934 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -50,7 +50,6 @@ import {
     isTransactionGroupListItemType,
     isTransactionListItemType,
     isTransactionReportGroupListItemType,
-    isTransactionSearchType,
     shouldShowEmptyState,
     shouldShowYear as shouldShowYearUtil,
 } from '@libs/SearchUIUtils';
@@ -417,7 +416,7 @@ function Search({
     const hasUnresolvedErrors = hasErrors && responseStatusCode === null;
     const isWaitingForInitialData = !shouldUseLiveData && !isOffline && (!isDataLoaded || isSearchLoadingWithNoResults || hasUnresolvedErrors || isCardFeedsLoading);
     const shouldShowLoadingState = isDeferringHeavyWork || isWaitingForInitialData;
-    const shouldShowRowSkeleton = (!skeletonWasDisplayed || shouldShowLoadingState) && showPendingExpensePlaceholder && !hasErrors;
+    const shouldShowRowSkeleton = !hasErrors && (shouldShowLoadingState || (!skeletonWasDisplayed && showPendingExpensePlaceholder));
 
     const isLoadingMorePage = shouldUseLiveData ? isLivePageInFlight : !!searchResults?.search?.isLoading;
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && isLoadingMorePage && (searchResults?.search?.offset ?? 0) > 0;
@@ -1001,6 +1000,11 @@ function Search({
     // Deferred layout only needs the base work (no scroll handling, no content-ready signal).
     const onDeferredLayout = onLayoutBase;
 
+    const handleSkeletonLayout = useCallback(() => {
+        onDeferredLayout();
+        onSkeletonLayout();
+    }, [onDeferredLayout, onSkeletonLayout]);
+
     const onLayout = useCallback(() => {
         onLayoutBase();
         handleSelectionListScroll(stableSortedData, searchListRef.current);
@@ -1160,25 +1164,15 @@ function Search({
         [clearSelectedTransactions, queryJSON, onSortPressedCallback, navigation],
     );
 
-    // When heavy work is deferred (e.g. during the RHP dismiss animation after
-    // submitting an expense), skip the expensive render below. The ancestor
-    // SearchPage (via SearchPageNarrow / SearchPageWide) renders a SearchStaticList
-    // overlay that covers this component, so the user sees real-looking content.
-    // The minimal View fires onLayout to flush the deferred API write and set
-    // hasHadFirstLayout.
-    if (isDeferringHeavyWork && searchResults?.data && isTransactionSearchType(type)) {
-        // Zero-sized View - onLayout still fires on RN, which is all we need here.
-        return <View onLayout={onDeferredLayout} />;
-    }
-
-    // This is a performance optimization for the submit-expense->search path only.
-    // The SearchPage skeleton (useSearchLoadingState) doesn't cover this case because
-    // Search must mount for its onLayout to flush the deferred CreateMoneyRequest API write, which would block the JS thread causing a slowdown on post expense creation navigation
+    // Stands in for the list while the heavy grouping and sorting work is deferred or the first response
+    // has not arrived. The page level skeleton (useSearchLoadingState) stops at the first defined `data`,
+    // so on a warm snapshot this is the only thing between the header and the rows. Its onLayout also
+    // flushes the deferred API write and sets hasHadFirstLayout.
     if (shouldShowRowSkeleton) {
         return (
             <SearchRowSkeleton
                 shouldAnimate
-                onLayout={onSkeletonLayout}
+                onLayout={handleSkeletonLayout}
                 containerStyle={shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3}
             />
         );
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 1e321b3c20e4..edf7b49e5cd3 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -13,6 +13,7 @@ import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPa
 import SearchSelectionFooter from '@components/Search/SearchSelectionFooter';
 import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
 import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
@@ -343,6 +344,12 @@ function SearchPageNarrow({
                                             hasFilterBars={hasFilterBars}
                                         />
                                     )}
+                                    {!isInteractive && !searchOverlayContent && (
+                                        <SearchRowSkeleton
+                                            shouldAnimate
+                                            containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
+                                        />
+                                    )}
                                     {shouldRenderLayoutProbe && <View onLayout={onSearchLayout} />}
                                     {!!searchOverlayContent && (
                                         <View

From f7788198d503b8e975548210225f3fd8b4456ff2 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 02:42:29 +0000
Subject: [PATCH 211/781] Let users pick a time as well as a date for the
 vacation delegate to clear

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 .../settings/Delegate-when-out-of-office.md   |  6 +-
 src/components/VacationDelegateForm.tsx       | 46 ++++++++++++--
 src/components/VacationDelegateMenuItem.tsx   |  4 +-
 src/libs/DateUtils.ts                         |  3 +-
 src/libs/VacationDelegateUtils.ts             | 59 +++++++++++++----
 src/pages/settings/Profile/ProfilePage.tsx    |  4 +-
 src/types/form/VacationDelegateForm.ts        |  4 ++
 tests/unit/libs/VacationDelegateUtilsTest.ts  | 63 +++++++++++++++----
 8 files changed, 152 insertions(+), 37 deletions(-)

diff --git a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
index 1caaf08f33f7..1df676784bec 100644
--- a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
+++ b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
@@ -9,7 +9,7 @@ internalScope: Audience is all members. Covers assigning, scheduling the end of,
 
 If you're out of the office or on vacation, you can assign a vacation delegate to handle your approvals while you're away.
 
-A vacation delegate can approve reports on your behalf. Once assigned, any reports sent to you for approval will be automatically redirected to your delegate. Pick a **Clear after** date and the delegate is removed automatically at the end of that day, so reports come back to you when you return.
+A vacation delegate can approve reports on your behalf. Once assigned, any reports sent to you for approval will be automatically redirected to your delegate. Pick a **Clear after** date and time and the delegate is removed automatically at that time, so reports come back to you when you return.
 
 All delegate actions are tracked in the report history for full visibility.
 
@@ -19,10 +19,10 @@ All delegate actions are tracked in the report history for full visibility.
 
 1. Go to **Account > Profile > Vacation delegate**.
 2. Select the member who should approve on your behalf.
-3. Optional (recommended): Under **Clear after**, pick the last day the delegate should cover.
+3. Optional (recommended): Under **Clear after**, pick the last day the delegate should cover. Then, under **Time**, pick when the delegate should clear on that day. If you don't change the time, the delegate clears at the end of the day.
 4. Click **Save**.
 
-Once set, any reports or chats that would normally come to you will be redirected to your delegate. You can view every action they take in the report's history and comments. The delegate and the date it clears are shown under **Vacation delegate** on your profile.
+Once set, any reports or chats that would normally come to you will be redirected to your delegate. You can view every action they take in the report's history and comments. The delegate and the date and time it clears are shown under **Vacation delegate** on your profile.
 
 ## How to remove a vacation delegate
 
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index aef8ec2d9237..887f9c9361d9 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -4,7 +4,15 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {formatVacationDelegateClearDate, getVacationDelegateClearAfter, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import DateUtils from '@libs/DateUtils';
+import {
+    formatVacationDelegateClearDateTime,
+    getVacationDelegateClearAfter,
+    getVacationDelegateClearDate,
+    getVacationDelegateClearDateTime,
+    getVacationDelegateLocalClearDateTime,
+    isVacationDelegateExpired,
+} from '@libs/VacationDelegateUtils';
 import {getDatePassedError} from '@libs/ValidationUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,6 +30,7 @@ import FormProvider from './Form/FormProvider';
 import InputWrapper from './Form/InputWrapper';
 import MenuItemAction from './MenuItem/presets/MenuItemAction';
 import Text from './Text';
+import TimeModalPicker from './TimeModalPicker';
 import VacationDelegateMenuItem from './VacationDelegateMenuItem';
 
 type VacationDelegateFormProps = {
@@ -62,16 +71,27 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
 
     const savedDelegate = isVacationDelegateExpired(vacationDelegate?.clearAfter) ? undefined : vacationDelegate?.delegate;
+    const savedClearDateTime = savedDelegate ? getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone?.selected) : '';
     const savedClearDate = savedDelegate ? getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected) : '';
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty draft means no member was picked yet
     const delegate = draftValues?.[INPUT_IDS.DELEGATE] || savedDelegate;
-    const formattedClearDate = formatVacationDelegateClearDate(draftValues?.[INPUT_IDS.CLEAR_AFTER_DATE] ?? savedClearDate, dateFnsLocale);
+    const clearDate = draftValues?.[INPUT_IDS.CLEAR_AFTER_DATE] ?? savedClearDate;
+    const formattedClearDateTime = formatVacationDelegateClearDateTime(
+        getVacationDelegateLocalClearDateTime(clearDate, draftValues?.[INPUT_IDS.CLEAR_AFTER_TIME] ?? savedClearDateTime),
+        dateFnsLocale,
+    );
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM> => {
         const formErrors: FormInputErrors<typeof ONYXKEYS.FORMS.VACATION_DELEGATE_FORM> = {};
-        const dateError = values[INPUT_IDS.CLEAR_AFTER_DATE] ? getDatePassedError(translate, values[INPUT_IDS.CLEAR_AFTER_DATE]) : '';
+        if (!values[INPUT_IDS.CLEAR_AFTER_DATE]) {
+            return formErrors;
+        }
+
+        const dateError = getDatePassedError(translate, values[INPUT_IDS.CLEAR_AFTER_DATE]);
         if (dateError) {
             formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = dateError;
+        } else if (isVacationDelegateExpired(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected))) {
+            formErrors[INPUT_IDS.CLEAR_AFTER_TIME] = translate('common.error.invalidTimeShouldBeFuture');
         }
         return formErrors;
     };
@@ -81,7 +101,7 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             return;
         }
 
-        onSubmit(delegate, getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], timezone?.selected));
+        onSubmit(delegate, getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected));
     };
 
     return (
@@ -119,9 +139,23 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
                     shouldHideClearButton
                     shouldSaveDraft
                 />
-                {/* The bottom margin matches the date input's own, so the remove button below sits the same distance from whichever is last */}
-                {!!formattedClearDate && <Text style={[styles.textLabelSupporting, styles.mt2, styles.mb2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDate)}</Text>}
             </View>
+            {/* The time only means something once a day is picked. Until it is changed, the delegate clears at the end of that day. */}
+            {!!clearDate && (
+                <View style={styles.mt2}>
+                    <InputWrapper
+                        InputComponent={TimeModalPicker}
+                        inputID={INPUT_IDS.CLEAR_AFTER_TIME}
+                        label={translate('statusPage.time')}
+                        defaultValue={savedClearDateTime || DateUtils.getEndOfToday()}
+                        shouldSaveDraft
+                    />
+                </View>
+            )}
+            {/* The bottom margin matches the date input's own, so the remove button below sits the same distance from whichever is last */}
+            {!!formattedClearDateTime && (
+                <Text style={[styles.mh5, styles.textLabelSupporting, styles.mt2, styles.mb2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDateTime)}</Text>
+            )}
             {!!savedDelegate && (
                 <View style={styles.mt4}>
                     <MenuItemAction
diff --git a/src/components/VacationDelegateMenuItem.tsx b/src/components/VacationDelegateMenuItem.tsx
index 7440edb40139..a4431eb6d574 100644
--- a/src/components/VacationDelegateMenuItem.tsx
+++ b/src/components/VacationDelegateMenuItem.tsx
@@ -6,7 +6,7 @@ import useVacationDelegatePersonalDetails from '@hooks/useVacationDelegatePerson
 
 import getVacationDelegateDisplayName from '@libs/getVacationDelegateDisplayName';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
-import {formatVacationDelegateClearDate, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {formatVacationDelegateClearDateTime, getVacationDelegateClearDateTime, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
 import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
@@ -110,7 +110,7 @@ function VacationDelegateMenuItemPreset({vacationDelegate, label, errors, pendin
 
     const rawDelegateLogin = vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '';
     const delegateDisplayName = getVacationDelegateDisplayName(rawDelegateLogin, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber);
-    const clearDate = formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected), dateFnsLocale);
+    const clearDate = formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone?.selected), dateFnsLocale);
     const untilText = clearDate ? translate('statusPage.vacationDelegate.until', clearDate) : '';
 
     return (
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 8903666754ba..4285a66b4d8a 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -1064,7 +1064,7 @@ const formatInTimeZoneWithFallback: typeof formatInTimeZone = (date, timeZone, f
  * @param timeZone - Target timezone to display the date in
  * @returns Date string in yyyy-MM-dd format, or empty string if invalid
  */
-function formatUTCDateTimeToDateInTimezone(utcDateTime: string, timeZone: SelectedTimezone | undefined, formatStr = CONST.DATE.FNS_FORMAT_STRING): string {
+function formatUTCDateTimeToDateInTimezone(utcDateTime: string, timeZone: SelectedTimezone | undefined, formatStr: string = CONST.DATE.FNS_FORMAT_STRING): string {
     if (!utcDateTime || !timeZone) {
         return '';
     }
@@ -1334,6 +1334,7 @@ const DateUtils = {
     formatViolationSnapshotStartedAtDate,
     normalizeDateToStartOfDay,
     normalizeDateToEndOfDay,
+    formatDBTimeWithoutMilliseconds,
     getMonthDateRange,
     getWeekDateRange,
     isDateStringInMonth,
diff --git a/src/libs/VacationDelegateUtils.ts b/src/libs/VacationDelegateUtils.ts
index cef40ef540d6..4cebb3ee6ae1 100644
--- a/src/libs/VacationDelegateUtils.ts
+++ b/src/libs/VacationDelegateUtils.ts
@@ -4,42 +4,70 @@ import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {Locale as DateFnsLocale} from 'date-fns';
 
 import {format, isValid, parse} from 'date-fns';
+import {fromZonedTime} from 'date-fns-tz';
 
 import DateUtils from './DateUtils';
 
+/** Format of the local clear date and time the user picks, e.g. 2026-10-01 17:00:00 */
+const LOCAL_DATE_TIME_FORMAT = 'yyyy-MM-dd HH:mm:ss';
+
+/** Time a clear date ends at when no time is picked, so the delegate stays active for the whole day */
+const END_OF_DAY_TIME = '23:59:59';
+
 /**
- * Converts the date picked for the vacation delegate to clear on (yyyy-MM-dd) into the UTC datetime the backend expects.
- * The delegate stays active for the whole picked day, so this is the end of that day in the given timezone.
+ * Combines the picked clear date (yyyy-MM-dd) and time into the local datetime (yyyy-MM-dd HH:mm:ss) the delegate clears at.
+ * The time can be a full datetime, as the time picker stores it; only its time part is used. Without a time, the delegate clears
+ * at the end of the picked day.
  */
-function getVacationDelegateClearAfter(clearDate: string | undefined, timezone: SelectedTimezone | undefined): string | undefined {
+function getVacationDelegateLocalClearDateTime(clearDate: string | undefined, clearTime: string | undefined): string {
     if (!clearDate) {
+        return '';
+    }
+
+    return (clearTime ? DateUtils.combineDateAndTime(clearTime, clearDate) : '') || `${clearDate} ${END_OF_DAY_TIME}`;
+}
+
+/**
+ * Converts the clear date (yyyy-MM-dd) and time picked for the vacation delegate into the UTC datetime the backend expects,
+ * reading them in the given timezone.
+ */
+function getVacationDelegateClearAfter(clearDate: string | undefined, clearTime: string | undefined, timezone: SelectedTimezone | undefined): string | undefined {
+    const localClearDateTime = getVacationDelegateLocalClearDateTime(clearDate, clearTime);
+    if (!localClearDateTime) {
         return undefined;
     }
 
-    return DateUtils.normalizeDateToEndOfDay(clearDate, timezone ?? CONST.DEFAULT_TIME_ZONE.selected);
+    return DateUtils.formatDBTimeWithoutMilliseconds(fromZonedTime(localClearDateTime, timezone ?? CONST.DEFAULT_TIME_ZONE.selected).valueOf());
 }
 
 /**
- * Converts the UTC datetime the vacation delegate clears after back into the day (yyyy-MM-dd) it clears on in the given timezone.
+ * Converts the UTC datetime the vacation delegate clears after back into the local datetime (yyyy-MM-dd HH:mm:ss) it clears at in the given timezone.
  */
-function getVacationDelegateClearDate(clearAfter: string | undefined, timezone: SelectedTimezone | undefined): string {
+function getVacationDelegateClearDateTime(clearAfter: string | undefined, timezone: SelectedTimezone | undefined): string {
     if (!clearAfter) {
         return '';
     }
 
-    return DateUtils.formatUTCDateTimeToDateInTimezone(clearAfter, timezone ?? CONST.DEFAULT_TIME_ZONE.selected);
+    return DateUtils.formatUTCDateTimeToDateInTimezone(clearAfter, timezone ?? CONST.DEFAULT_TIME_ZONE.selected, LOCAL_DATE_TIME_FORMAT);
+}
+
+/**
+ * Converts the UTC datetime the vacation delegate clears after back into the day (yyyy-MM-dd) it clears on in the given timezone.
+ */
+function getVacationDelegateClearDate(clearAfter: string | undefined, timezone: SelectedTimezone | undefined): string {
+    return getVacationDelegateClearDateTime(clearAfter, timezone).slice(0, CONST.DATE.FNS_FORMAT_STRING.length);
 }
 
 /**
- * Formats a clear date (yyyy-MM-dd) for display, e.g. "Oct 1, 2026".
+ * Formats a local clear datetime (yyyy-MM-dd HH:mm:ss) for display, e.g. "Oct 1, 2026 5:00 PM".
  */
-function formatVacationDelegateClearDate(clearDate: string, dateFnsLocale: DateFnsLocale | undefined): string {
-    const date = parse(clearDate, CONST.DATE.FNS_FORMAT_STRING, new Date());
+function formatVacationDelegateClearDateTime(clearDateTime: string, dateFnsLocale: DateFnsLocale | undefined): string {
+    const date = parse(clearDateTime, LOCAL_DATE_TIME_FORMAT, new Date());
     if (!isValid(date)) {
         return '';
     }
 
-    return format(date, CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT, {locale: dateFnsLocale});
+    return format(date, `${CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT} ${CONST.DATE.LOCAL_TIME_FORMAT}`, {locale: dateFnsLocale});
 }
 
 /**
@@ -51,4 +79,11 @@ function isVacationDelegateExpired(clearAfter: string | undefined): boolean {
     return !!clearAfter && clearAfter <= DateUtils.getDBTime();
 }
 
-export {getVacationDelegateClearAfter, getVacationDelegateClearDate, formatVacationDelegateClearDate, isVacationDelegateExpired};
+export {
+    getVacationDelegateClearAfter,
+    getVacationDelegateClearDate,
+    getVacationDelegateClearDateTime,
+    getVacationDelegateLocalClearDateTime,
+    formatVacationDelegateClearDateTime,
+    isVacationDelegateExpired,
+};
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index 18bb2b46a7aa..d6a282e71c0d 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -41,7 +41,7 @@ import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigat
 import type {SettingsSplitNavigatorParamList} from '@libs/Navigation/types';
 import {getFormattedAddress, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import {expensifyLoginsSelector, getContactMethodsOptions, getLoginListBrickRoadIndicator} from '@libs/UserUtils';
-import {formatVacationDelegateClearDate, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {formatVacationDelegateClearDateTime, getVacationDelegateClearDateTime, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
 
 import useTimeSensitiveHomeAddress from '@pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress';
 
@@ -110,7 +110,7 @@ function ProfilePage() {
         ? getVacationDelegateDisplayName(vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '', vacationDelegatePersonalDetails?.displayName, formatPhoneNumber)
         : '';
     const vacationDelegateClearDate = hasVacationDelegate
-        ? formatVacationDelegateClearDate(getVacationDelegateClearDate(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
+        ? formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
         : '';
     const vacationDelegateUntilText = vacationDelegateClearDate ? translate('statusPage.vacationDelegate.until', vacationDelegateClearDate) : '';
     const vacationDelegateBrickRoadIndicator = isEmptyObject(getVacationDelegateErrors(vacationDelegate)) ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
diff --git a/src/types/form/VacationDelegateForm.ts b/src/types/form/VacationDelegateForm.ts
index 3c6bb6b2906a..bd75e0e74307 100644
--- a/src/types/form/VacationDelegateForm.ts
+++ b/src/types/form/VacationDelegateForm.ts
@@ -8,6 +8,9 @@ const INPUT_IDS = {
 
     /** Day (yyyy-MM-dd) the vacation delegate clears on, in the timezone of the person setting it */
     CLEAR_AFTER_DATE: 'clearAfterDate',
+
+    /** Time the vacation delegate clears at on that day, in the timezone of the person setting it. Stored as yyyy-MM-dd HH:mm:ss by the time picker, but only the time is used. */
+    CLEAR_AFTER_TIME: 'clearAfterTime',
 } as const;
 
 type InputID = ValueOf<typeof INPUT_IDS>;
@@ -17,6 +20,7 @@ type VacationDelegateForm = Form<
     {
         [INPUT_IDS.DELEGATE]: string;
         [INPUT_IDS.CLEAR_AFTER_DATE]: string;
+        [INPUT_IDS.CLEAR_AFTER_TIME]: string;
     }
 >;
 
diff --git a/tests/unit/libs/VacationDelegateUtilsTest.ts b/tests/unit/libs/VacationDelegateUtilsTest.ts
index 6f0a2bb31e7c..b520047b82f3 100644
--- a/tests/unit/libs/VacationDelegateUtilsTest.ts
+++ b/tests/unit/libs/VacationDelegateUtilsTest.ts
@@ -1,4 +1,11 @@
-import {formatVacationDelegateClearDate, getVacationDelegateClearAfter, getVacationDelegateClearDate, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {
+    formatVacationDelegateClearDateTime,
+    getVacationDelegateClearAfter,
+    getVacationDelegateClearDate,
+    getVacationDelegateClearDateTime,
+    getVacationDelegateLocalClearDateTime,
+    isVacationDelegateExpired,
+} from '@libs/VacationDelegateUtils';
 
 describe('VacationDelegateUtils', () => {
     beforeEach(() => {
@@ -10,19 +17,53 @@ describe('VacationDelegateUtils', () => {
         jest.useRealTimers();
     });
 
+    describe('getVacationDelegateLocalClearDateTime', () => {
+        it('takes the day from the date and only the time from the time picker value', () => {
+            // Given a picked day and a time picker value whose own date is a different day
+            // When they are combined
+            // Then the result keeps the picked day, since the time picker's date part is meaningless
+            expect(getVacationDelegateLocalClearDateTime('2026-10-01', '2026-09-28 17:30:00')).toBe('2026-10-01 17:30:00');
+        });
+
+        it('falls back to the end of the day when no time is picked, and to nothing when no day is picked', () => {
+            // Given a day without a time, and no day at all
+            // When they are combined
+            // Then the day ends at 23:59:59 so the delegate covers all of it, and no day means the delegate never clears
+            expect(getVacationDelegateLocalClearDateTime('2026-10-01', undefined)).toBe('2026-10-01 23:59:59');
+            expect(getVacationDelegateLocalClearDateTime('', '2026-09-28 17:30:00')).toBe('');
+        });
+    });
+
     describe('getVacationDelegateClearAfter', () => {
-        it('converts the picked day to the UTC end of that day in the given timezone', () => {
-            // Given a day picked in Los Angeles, where Oct 1 ends at 06:59:59 UTC on Oct 2 during daylight saving time
+        it('converts the picked day and time to UTC in the given timezone', () => {
+            // Given 5:30 PM on Oct 1 picked in Los Angeles, which is 7 hours behind UTC during daylight saving time
+            // When it is converted for the backend
+            // Then the backend gets the same moment in UTC
+            expect(getVacationDelegateClearAfter('2026-10-01', '2026-09-28 17:30:00', 'America/Los_Angeles')).toBe('2026-10-02 00:30:00');
+        });
+
+        it('converts a day without a time to the UTC end of that day in the given timezone', () => {
+            // Given a day picked in Los Angeles with no time, where Oct 1 ends at 06:59:59 UTC on Oct 2 during daylight saving time
             // When it is converted for the backend
             // Then the delegate stays active for the whole picked day, not just until midnight UTC
-            expect(getVacationDelegateClearAfter('2026-10-01', 'America/Los_Angeles')).toBe('2026-10-02 06:59:59');
+            expect(getVacationDelegateClearAfter('2026-10-01', undefined, 'America/Los_Angeles')).toBe('2026-10-02 06:59:59');
         });
 
         it('returns undefined when no day is picked, so the delegate never clears', () => {
             // Given no picked day
             // When it is converted for the backend
             // Then nothing is sent, since the date is optional
-            expect(getVacationDelegateClearAfter('', 'America/Los_Angeles')).toBeUndefined();
+            expect(getVacationDelegateClearAfter('', '2026-09-28 17:30:00', 'America/Los_Angeles')).toBeUndefined();
+        });
+    });
+
+    describe('getVacationDelegateClearDateTime', () => {
+        it('converts the UTC clear after datetime back into the picked day and time', () => {
+            // Given the datetime the backend stored for 5:30 PM on Oct 1 picked in Los Angeles
+            // When it is read back in the same timezone
+            // Then it shows the day and time that were picked, not the UTC ones
+            expect(getVacationDelegateClearDateTime('2026-10-02 00:30:00', 'America/Los_Angeles')).toBe('2026-10-01 17:30:00');
+            expect(getVacationDelegateClearDateTime(undefined, 'America/Los_Angeles')).toBe('');
         });
     });
 
@@ -35,13 +76,13 @@ describe('VacationDelegateUtils', () => {
         });
     });
 
-    describe('formatVacationDelegateClearDate', () => {
-        it('formats the day for display and ignores an invalid one', () => {
-            // Given a valid and an invalid day
+    describe('formatVacationDelegateClearDateTime', () => {
+        it('formats the day and time for display and ignores an invalid one', () => {
+            // Given a valid and an invalid datetime
             // When they are formatted
-            // Then the valid one reads as a short date and the invalid one shows nothing instead of throwing
-            expect(formatVacationDelegateClearDate('2026-10-01', undefined)).toBe('Oct 1, 2026');
-            expect(formatVacationDelegateClearDate('not a date', undefined)).toBe('');
+            // Then the valid one reads as a short date with a time and the invalid one shows nothing instead of throwing
+            expect(formatVacationDelegateClearDateTime('2026-10-01 17:30:00', undefined)).toBe('Oct 1, 2026 5:30 PM');
+            expect(formatVacationDelegateClearDateTime('not a date', undefined)).toBe('');
         });
     });
 

From 5a618c48c4186b0c142338e64498d7798e0350ec Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Thu, 1 Oct 2026 07:38:29 +0430
Subject: [PATCH 212/781] Prevent hidden recipient separator from being
 selected

---
 .../Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx b/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
index abf59b483ca1..2c2785ff2d78 100644
--- a/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
+++ b/src/components/Search/SearchList/ListItem/UserInfoCellsWithArrow.tsx
@@ -81,6 +81,7 @@ function UserInfoCellsWithArrow({
                         <Text
                             testID="UserInfoToIndicator"
                             style={[styles.mutedNormalTextLabel]}
+                            selectable={false}
                             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {translate('common.conjunctionTo')}

From 54b14935b01c00a286b4d2865fb52c40d36d12b2 Mon Sep 17 00:00:00 2001
From: "Nyoman Jyotisa (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 05:01:58 +0000
Subject: [PATCH 213/781] Use a full stop instead of a semicolon in
 ReconnectApp comment

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>
---
 src/libs/actions/User.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 60915bf4f4ee..2e02ec8b0d95 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -912,7 +912,7 @@ function subscribeToUserEvents(
     PusherUtils.subscribeToMultiEvent(Pusher.TYPE.MULTIPLE_EVENT_TYPE.RECONNECT_APP, () => {
         // This event is broadcast on the account-wide channel, so every signed-in device receives it, not only
         // the one whose updateID is missing. A full ReconnectApp uses setCollection and clears report actions the
-        // device already holds (#97847, #100791). Pass lastUpdateID so the server can reply incrementally; it
+        // device already holds (#97847, #100791). Pass lastUpdateID so the server can reply incrementally. It
         // still returns full data when it can't serve that range, and we fall back to a full reconnect when the
         // client has no lastUpdateID yet.
         reconnectApp(lastUpdateIDAppliedToClient);

From 31f0a42a0882f0bbffa618959c7ad4606a085037 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 06:44:33 +0000
Subject: [PATCH 214/781] Prevent removing the parent report's submitter and
 manager from an expense thread

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/libs/ReportUtils.ts                    | 12 ++++
 src/pages/DynamicRoomMemberDetailsPage.tsx | 11 +++-
 src/pages/DynamicRoomMembersPage.tsx       |  5 +-
 tests/unit/ReportUtilsTest.ts              | 66 ++++++++++++++++++++++
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 5b5b31cb544e..461fb3184966 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2823,6 +2823,17 @@ function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | string, rep
     return isIOUReport(report) || isExpenseReport(report);
 }
 
+/**
+ * Checks if a thread member is the submitter or manager of the thread's parent money request or invoice report.
+ * These members keep access through the parent report, so removing them from the thread doesn't stick.
+ */
+function isThreadMemberProtectedByParentReport(parentReport: OnyxInputOrEntry<Report>, accountID: number | undefined): boolean {
+    if (!parentReport || accountID === undefined || (!isMoneyRequestReport(parentReport) && !isInvoiceReport(parentReport))) {
+        return false;
+    }
+    return accountID === parentReport.ownerAccountID || accountID === parentReport.managerID;
+}
+
 /**
  * Checks if a report aligns its action list to the top (transaction threads, money request / invoice reports).
  */
@@ -14780,6 +14791,7 @@ export {
     isSystemChat,
     isTaskReport,
     isThread,
+    isThreadMemberProtectedByParentReport,
     isTrackExpenseReport,
     isUnread,
     isUnreadWithMention,
diff --git a/src/pages/DynamicRoomMemberDetailsPage.tsx b/src/pages/DynamicRoomMemberDetailsPage.tsx
index bb0261e09fd0..46e64ee024b5 100644
--- a/src/pages/DynamicRoomMemberDetailsPage.tsx
+++ b/src/pages/DynamicRoomMemberDetailsPage.tsx
@@ -11,6 +11,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -22,11 +23,12 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
 import type {RoomMembersNavigatorParamList} from '@libs/Navigation/types';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import {isRoomMemberProtectedByPolicyRole} from '@libs/PolicyUtils';
-import {isPolicyExpenseChat} from '@libs/ReportUtils';
+import {isPolicyExpenseChat, isThreadMemberProtectedByParentReport} from '@libs/ReportUtils';
 
 import Navigation from '@navigation/Navigation';
 
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetails} from '@src/types/onyx';
@@ -48,6 +50,7 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     const StyleUtils = useStyleUtils();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const policy = usePolicy(report?.policyID);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.ROOM_MEMBER_DETAILS.path);
     const {showConfirmModal} = useConfirmModal();
 
@@ -62,7 +65,11 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     // Check the selected member's own role on the policy, not the viewer's, and fail closed when their login is missing.
     // Kept in sync with the members list through the shared helper.
     const isSelectedMemberProtectedByPolicyRole = isRoomMemberProtectedByPolicyRole(policy, details.login, accountID);
-    const shouldDisableRemoveUser = (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) || isSelectedMemberCurrentUser || isSelectedMemberOwner;
+    const shouldDisableRemoveUser =
+        (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) ||
+        isSelectedMemberCurrentUser ||
+        isSelectedMemberOwner ||
+        isThreadMemberProtectedByParentReport(parentReport, accountID);
     const askForConfirmationToRemove = () => {
         showConfirmModal({
             buttonVariant: CONST.BUTTON_VARIANT.DANGER,
diff --git a/src/pages/DynamicRoomMembersPage.tsx b/src/pages/DynamicRoomMembersPage.tsx
index c4f428bbf5e0..06cbc68294f0 100644
--- a/src/pages/DynamicRoomMembersPage.tsx
+++ b/src/pages/DynamicRoomMembersPage.tsx
@@ -44,6 +44,7 @@ import {
     isChatThread,
     isDefaultRoom,
     isPolicyExpenseChat as isPolicyExpenseChatUtils,
+    isThreadMemberProtectedByParentReport,
     isUserCreatedPolicyRoom,
 } from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
@@ -221,7 +222,8 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
                 (isPolicyExpenseChat && isProtectedByPolicyRole) ||
                 accountID === session?.accountID ||
                 pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
-                details.accountID === report.ownerAccountID;
+                details.accountID === report.ownerAccountID ||
+                isThreadMemberProtectedByParentReport(parentReport, accountID);
 
             result.push({
                 keyForList: String(accountID),
@@ -248,6 +250,7 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
         isPolicyExpenseChat,
         localeCompare,
         openRoomMemberDetails,
+        parentReport,
         participants,
         personalDetails,
         policy,
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index e17c3a2fc103..6fd25de1ee5f 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -199,6 +199,7 @@ import {
     isRootGroupChat,
     isSelfDMOrSelfDMThread,
     isSortableColumnName,
+    isThreadMemberProtectedByParentReport,
     isUnread,
     isUploadingAttachmentRemovedFromDraft,
     isWorkspaceMemberLeavingWorkspaceRoom,
@@ -1755,6 +1756,71 @@ describe('ReportUtils', () => {
         });
     });
 
+    describe('isThreadMemberProtectedByParentReport', () => {
+        const senderAccountID = 1;
+        const receiverAccountID = 2;
+        const invitedAccountID = 3;
+
+        it('should protect the sender and receiver of the parent IOU report', () => {
+            // Given an IOU report where the sender owns the report and the receiver manages it
+            const iouReport: Report = {
+                ...createRandomReport(1, undefined),
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether they can be removed from one of the report's expense threads
+            // Then both are protected, because they keep access through the IOU report and would be added back
+            expect(isThreadMemberProtectedByParentReport(iouReport, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(iouReport, receiverAccountID)).toBe(true);
+        });
+
+        it('should protect the submitter and current approver of the parent expense report', () => {
+            // Given a workspace expense report with a submitter and a current approver
+            const expenseReport: Report = {
+                ...createRandomReport(2, undefined),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether they can be removed from one of the report's expense threads
+            // Then both are protected
+            expect(isThreadMemberProtectedByParentReport(expenseReport, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, receiverAccountID)).toBe(true);
+        });
+
+        it('should not protect a member who was invited into the thread', () => {
+            // Given an IOU report that the invited member isn't part of
+            const iouReport: Report = {
+                ...createRandomReport(3, undefined),
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether the invited member can be removed from the expense thread
+            // Then they aren't protected, so removing invited members keeps working
+            expect(isThreadMemberProtectedByParentReport(iouReport, invitedAccountID)).toBe(false);
+        });
+
+        it('should not protect anyone when the parent is not a money request or invoice report', () => {
+            // Given a chat report, which is the parent of regular comment threads
+            const chatReport: Report = {
+                ...createRandomReport(4, undefined),
+                type: CONST.REPORT.TYPE.CHAT,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether its members can be removed from a thread, or when the parent report is missing
+            // Then nobody is protected, so the existing room member rules still apply
+            expect(isThreadMemberProtectedByParentReport(chatReport, senderAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(undefined, senderAccountID)).toBe(false);
+        });
+    });
+
     describe('sortOutstandingReportsBySelected', () => {
         it('should return -1 when report1 is selected and report2 is not', () => {
             const report1 = LHNTestUtils.getFakeReport();

From 1ac76e68c931915fe8bd6d7683a961e811496f89 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 1 Oct 2026 09:25:46 +0200
Subject: [PATCH 215/781] fix: tint Android tab icons in release builds, even
 pill inset on mWeb

---
 .../Navigators/NativeTabNavigator/tabIconRasterizer.ts      | 5 +++--
 src/styles/index.ts                                         | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index ce6df5edf964..d2b534a9c004 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -11,9 +11,10 @@ type TabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
 const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
 
+/** Skia reads URLs, file paths and, in Android release builds, bundled assets that resolve to a drawable name. */
 async function decodeImage(uri: string): Promise<SkImage | null> {
-    const response = await fetch(uri);
-    return Skia.Image.MakeImageFromEncoded(Skia.Data.fromBytes(new Uint8Array(await response.arrayBuffer())));
+    const data = await Skia.Data.fromURI(uri);
+    return Skia.Image.MakeImageFromEncoded(data);
 }
 
 async function decodeGlyph(source: ImageSourcePropType): Promise<{image: SkImage; scale: number} | undefined> {
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8155b1177963..c5edd6ba705b 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -752,8 +752,10 @@ const staticStyles = (theme: ThemeColors) =>
             backgroundColor: theme.appBG,
             borderWidth: variables.hairlineBorderWidth,
             borderColor: theme.border,
-            // Insets the row so the selected item's capsule keeps a margin inside the bar's rounded edge.
-            ...spacing.p1,
+            // Insets the row so the selected item's capsule keeps the same margin inside the bar's rounded edge on
+            // every side, past the overhang it reaches beyond the first and last tabs.
+            ...spacing.pv1,
+            paddingHorizontal: spacing.p1.padding + variables.floatingTabBarSelectedOverhang,
             // Clips each item's hover and press background to the capsule's rounded ends.
             overflow: 'hidden',
         },

From 4f32e800d730c96988ea105ad1553430a2e3a7c2 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 1 Oct 2026 12:08:56 +0200
Subject: [PATCH 216/781] fix: keep the avatar on the selected Android Account
 tab

---
 .../Navigators/NativeTabNavigator/useAndroidTabIcons.ts       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
index a55c798ba91b..e51b9dbc06fb 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
@@ -85,7 +85,9 @@ function useAndroidTabIcons() {
     const circularAvatar = useRasterizedTabIcons(lastCircularAvatar, avatarURI, (uri) => createCircularAvatarIcon(uri).then((icon) => icon && {uri, icon}));
 
     // An avatar drawn for another user is never shown; until the current one is drawn, the account glyph stands in.
-    const accountAvatarIcon = circularAvatar?.uri === avatarURI ? circularAvatar?.icon : undefined;
+    const avatarIcon = circularAvatar?.uri === avatarURI ? circularAvatar?.icon : undefined;
+    // A function, because React Navigation derives the selected icon only from a function.
+    const accountAvatarIcon = avatarIcon ? () => avatarIcon : undefined;
 
     return {
         getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),

From c2c6539cf3eca0d2ba92baa32ba2888825cec125 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 1 Oct 2026 12:08:58 +0200
Subject: [PATCH 217/781] fix: run iOS tab root content under the glass tab
 bar, inset list ends past it

---
 .../LHNOptionsList/LHNOptionsList.tsx         |  2 ++
 .../index.ios.tsx                             | 30 +++++++++++++++++++
 .../useTabRootScreenWrapperProps/index.tsx    | 21 +++++++++++++
 .../useTabRootScreenWrapperProps/types.ts     |  5 ++++
 .../BaseSearchList/index.native.tsx           |  2 ++
 .../Tables/WorkspaceListTable/index.tsx       |  2 ++
 src/components/WorkspaceListLayout.tsx        |  6 ++--
 src/pages/Insights/InsightsDashboard.tsx      |  9 ++++--
 src/pages/Search/SearchPageNarrow/index.tsx   |  8 ++---
 src/pages/domain/DomainInitialPage.tsx        | 12 +++++---
 src/pages/home/HomePage.tsx                   |  8 +++--
 src/pages/inbox/sidebar/BaseSidebarScreen.tsx |  6 ++--
 src/pages/settings/InitialSettingsPage.tsx    |  9 +++---
 src/pages/workspace/WorkspaceInitialPage.tsx  | 12 +++++---
 14 files changed, 104 insertions(+), 28 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index a4dae4fa96b6..9df8ac177a3a 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -162,6 +162,8 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             <LHNTooltipContextProvider data={data}>
                 <FlashList
                     ref={flashListRef}
+                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                    contentInsetAdjustmentBehavior="automatic"
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
                     CellRendererComponent={OptionRowRendererComponent}
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
new file mode 100644
index 000000000000..8a77d0dcc4f2
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -0,0 +1,30 @@
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+import type TabRootScreenWrapperProps from './types';
+
+import TabBarBottomContent from '..';
+
+/**
+ * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
+ * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar.
+ */
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+
+    if (shouldUseNarrowLayout) {
+        return {includeSafeAreaPaddingBottom: false};
+    }
+
+    return {
+        bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
+        bottomContentStyle: styles.overflowVisible,
+    };
+}
+
+export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
new file mode 100644
index 000000000000..b632062f193f
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -0,0 +1,21 @@
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+import type TabRootScreenWrapperProps from './types';
+
+import TabBarBottomContent from '..';
+
+/** The ScreenWrapper props that keep a tab root screen's content clear of the tab bar. */
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+    const styles = useThemeStyles();
+
+    return {
+        bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
+        bottomContentStyle: styles.overflowVisible,
+    };
+}
+
+export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
new file mode 100644
index 000000000000..dab83f0477d5
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -0,0 +1,5 @@
+import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
+
+type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'>;
+
+export default TabRootScreenWrapperProps;
diff --git a/src/components/Search/SearchList/BaseSearchList/index.native.tsx b/src/components/Search/SearchList/BaseSearchList/index.native.tsx
index 8164250b667d..95bc5b6a011c 100644
--- a/src/components/Search/SearchList/BaseSearchList/index.native.tsx
+++ b/src/components/Search/SearchList/BaseSearchList/index.native.tsx
@@ -33,6 +33,8 @@ function BaseSearchList({
     return (
         <AnimatedFlashListComponent
             data={data}
+            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+            contentInsetAdjustmentBehavior="automatic"
             renderItem={renderItemWithoutKeyboardFocus}
             keyExtractor={keyExtractor}
             onScroll={onScroll}
diff --git a/src/components/Tables/WorkspaceListTable/index.tsx b/src/components/Tables/WorkspaceListTable/index.tsx
index 504682a3e635..703e0a7576e5 100644
--- a/src/components/Tables/WorkspaceListTable/index.tsx
+++ b/src/components/Tables/WorkspaceListTable/index.tsx
@@ -207,6 +207,8 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
             keyExtractor={(row, index) => `${row.policyID}-${index}`}
             filters={filterConfig}
             isItemInFilter={isItemInFilter}
+            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+            contentInsetAdjustmentBehavior="automatic"
         >
             <Table.ListHeader>{tableHeaderComponent}</Table.ListHeader>
             <Table.NoResultsState />
diff --git a/src/components/WorkspaceListLayout.tsx b/src/components/WorkspaceListLayout.tsx
index ce180ea0d91d..3b4762dab1df 100644
--- a/src/components/WorkspaceListLayout.tsx
+++ b/src/components/WorkspaceListLayout.tsx
@@ -17,7 +17,7 @@ import {View} from 'react-native';
 
 import {useDebugTabViewHeight} from './Navigation/DebugTabView';
 import NAVIGATION_TABS from './Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from './Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from './Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBarWithLoadingBar from './Navigation/TopBarWithLoadingBar';
 import OfflineIndicator from './OfflineIndicator';
 import ScreenWrapper from './ScreenWrapper';
@@ -88,6 +88,7 @@ function WorkspaceListHeaderContent({activeTabKey, headerButton, shouldShowHeade
 
 function WorkspaceListLayout({children, activeTabKey, headerButton, headerComponent, scrollHeaderWithTable = false}: WorkspaceListLayoutProps) {
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
 
@@ -119,8 +120,7 @@ function WorkspaceListLayout({children, activeTabKey, headerButton, headerCompon
             shouldEnableMaxHeight
             shouldEnablePickerAvoiding={false}
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContentStyle={styles.overflowVisible}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
+            {...tabRootScreenWrapperProps}
         >
             <View style={[styles.flex1, styles.flexRow]}>
                 <View style={[styles.flex1]}>
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index ee11a1be7697..a80c5ee14940 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,7 +1,7 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBar from '@components/Navigation/TopBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -109,6 +109,8 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
         return (
             <ScrollView
                 contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}
+                // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                contentInsetAdjustmentBehavior="automatic"
                 addBottomSafeAreaPadding
             >
                 {state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES ? <InsightsNoExpensesState /> : <InsightsEmptyState />}
@@ -122,6 +124,8 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     return (
         <ScrollView
             style={styles.insightsDashboardScrollView}
+            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+            contentInsetAdjustmentBehavior="automatic"
             contentContainerStyle={[styles.flexGrow1, styles.ph5, styles.pb5]}
             addBottomSafeAreaPadding
         >
@@ -161,6 +165,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {translate} = useLocalize();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.INSIGHTS);
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
     const {login} = useCurrentUserPersonalDetails();
@@ -209,7 +214,7 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
         <ScreenWrapper
             shouldShowOfflineIndicatorInWideScreen
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
+            {...tabRootScreenWrapperProps}
             testID="InsightsPage"
         >
             <TopBar
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index edf7b49e5cd3..1e5523b5326c 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -1,7 +1,7 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import PulsingView from '@components/PulsingView';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -77,8 +77,6 @@ type SearchPageNarrowProps = {
     isOverlayActive: boolean;
 };
 
-const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SEARCH} />;
-
 function SearchPageNarrow({
     queryJSON,
     searchResults,
@@ -100,6 +98,7 @@ function SearchPageNarrow({
     const {translate} = useLocalize();
     const {windowHeight} = useWindowDimensions();
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.SEARCH);
     const StyleUtils = useStyleUtils();
     const {clearSelectedTransactions} = useSearchSelectionActions();
     const {shouldUseLiveData} = useSearchResultsContext();
@@ -265,8 +264,7 @@ function SearchPageNarrow({
                     shouldEnableMaxHeight
                     offlineIndicatorStyle={styles.mtAuto}
                     shouldShowOfflineIndicator={!!searchResults}
-                    bottomContent={tabBarContent}
-                    bottomContentStyle={styles.overflowVisible}
+                    {...tabRootScreenWrapperProps}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index 64187a0751d4..56ddb6722ac1 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -2,7 +2,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
@@ -43,6 +43,7 @@ type DomainInitialPageProps = PlatformStackScreenProps<DomainSplitNavigatorParam
 function DomainInitialPage({route}: DomainInitialPageProps) {
     const icons = useMemoizedLazyExpensifyIcons(DOMAIN_MENU_ICON_NAMES);
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
     const waitForNavigate = useWaitForNavigation();
     const {singleExecution, isExecuting} = useSingleExecution();
     const activeRoute = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -102,8 +103,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
         <ScreenWrapper
             testID="DomainInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
-            bottomContentStyle={styles.overflowVisible}
+            {...tabRootScreenWrapperProps}
         >
             <FullPageNotFoundView
                 onBackButtonPress={() => Navigation.dismissModal()}
@@ -121,7 +121,11 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView contentContainerStyle={styles.flexColumn}>
+                <ScrollView
+                    contentContainerStyle={styles.flexColumn}
+                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                    contentInsetAdjustmentBehavior="automatic"
+                >
                     <View style={[styles.pb4, styles.mh3, styles.mt3]}>
                         {/*
                             Ideally we should use MenuList component for MenuItems with singleExecution/Navigation actions.
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 55dd8d0cfda3..ac4e33e4f4f2 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,6 +1,6 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBar from '@components/Navigation/TopBar';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -42,6 +42,7 @@ const RIGHT_COLUMN_TEST_ID = 'homePageRightColumn';
 function HomePage() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.HOME);
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
     const {isOffline} = useNetwork({onReconnect: openHomePage});
@@ -141,8 +142,7 @@ function HomePage() {
                     shouldShowOfflineIndicatorInWideScreen
                     testID="HomePage"
                     enableEdgeToEdgeBottomSafeAreaPadding={false}
-                    bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.HOME} />}
-                    bottomContentStyle={styles.overflowVisible}
+                    {...tabRootScreenWrapperProps}
                 >
                     <TopBar
                         breadcrumbLabel={translate('common.home')}
@@ -151,6 +151,8 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
+                        // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                        contentInsetAdjustmentBehavior="automatic"
                         contentContainerStyle={styles.homePageContentContainer}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
diff --git a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
index dd92d4ecd347..1cacee978912 100644
--- a/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
+++ b/src/pages/inbox/sidebar/BaseSidebarScreen.tsx
@@ -1,5 +1,5 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -22,6 +22,7 @@ import SidebarLinksData from './SidebarLinksData';
 
 function BaseSidebarScreen() {
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.INBOX);
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const shouldShowSkeleton = useAppLoadSkeletonState();
@@ -40,8 +41,7 @@ function BaseSidebarScreen() {
             shouldEnableKeyboardAvoidingView={false}
             style={[styles.sidebar, isMobile() ? styles.userSelectNone : {}]}
             testID="BaseSidebarScreen"
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INBOX} />}
-            bottomContentStyle={styles.overflowVisible}
+            {...tabRootScreenWrapperProps}
         >
             {({insets}) => (
                 <>
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 4eb636cbf27c..fd6a522b520a 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -2,7 +2,7 @@ import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherButton from '@components/AccountSwitcherButton';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -50,8 +50,8 @@ type InitialSettingsPageProps = WithCurrentUserPersonalDetailsProps;
 function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPageProps) {
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
-    const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SETTINGS} />;
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.SETTINGS);
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -166,8 +166,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             includeSafeAreaPaddingBottom
             testID="InitialSettingsPage"
             shouldEnableKeyboardAvoidingView={false}
-            bottomContent={tabBarContent}
-            bottomContentStyle={styles.overflowVisible}
+            {...tabRootScreenWrapperProps}
         >
             <TopBarWithLoadingBar
                 breadcrumbLabel={translate('initialSettingsPage.account')}
@@ -184,6 +183,8 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             </TopBarWithLoadingBar>
             <ScrollView
                 ref={scrollViewRef}
+                // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                contentInsetAdjustmentBehavior="automatic"
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
                 contentContainerStyle={[styles.w100]}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 5beb127fe3d2..1f5e8b3e202e 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -2,7 +2,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
+import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -68,6 +68,7 @@ function dismissError(policyID: string | undefined, pendingAction: PendingAction
 
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
+    const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
@@ -224,8 +225,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         <ScreenWrapper
             testID="WorkspaceInitialPage"
             enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.WORKSPACES} />}
-            bottomContentStyle={styles.overflowVisible}
+            {...tabRootScreenWrapperProps}
         >
             <FullPageNotFoundView
                 onBackButtonPress={goBackFromWorkspaceSettingPages}
@@ -247,7 +247,11 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView contentContainerStyle={[styles.flexColumn, styles.pb14]}>
+                <ScrollView
+                    contentContainerStyle={[styles.flexColumn, styles.pb14]}
+                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
+                    contentInsetAdjustmentBehavior="automatic"
+                >
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
                         onClose={() => dismissError(policyID, policy?.pendingAction)}

From e0534577538f51a446a9ebaefdcd68cd08a6386f Mon Sep 17 00:00:00 2001
From: eliran goshen <elirangoshen@gmail.com>
Date: Thu, 1 Oct 2026 13:03:35 +0200
Subject: [PATCH 218/781] Match Metro's Android release assets in Re.Pack

Re.Pack puts Android fonts in res/font, where Skia's useFont never looks,
so Home charts never loaded in HybridApp release builds (#102619). It also
writes no raw/keep.xml, so shrinkResources can strip bundled assets.
Patch both to match Metro: fonts go to raw/, and keep.xml lists every
bundled resource.
---
 ...k+repack+5.3.0+003+android-fonts-raw.patch | 15 ++++++
 ...ck+repack+5.3.0+004+android-keep-xml.patch | 46 +++++++++++++++++++
 patches/@callstack/repack/details.md          | 33 +++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
 create mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch

diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
new file mode 100644
index 000000000000..07cd5dea69e9
--- /dev/null
+++ b/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js b/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
+--- a/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
++++ b/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
+@@ -83,8 +83,9 @@
+         if (testXml.test(resourceNormalizedFilename) && content?.indexOf('font-family') !== -1) {
+           destination = 'font';
+         } else if (testFonts.test(resourceNormalizedFilename)) {
+-          // font extensions
+-          destination = 'font';
++          // font extensions: `raw`, as Metro does, because JS loaders (e.g. Skia's `useFont`)
++          // resolve the asset through `drawable`/`raw` and never look in `res/font`
++          destination = 'raw';
+         } else if (testMP4.test(resourceNormalizedFilename)) {
+           // video files extensions
+           destination = 'raw';
diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch
new file mode 100644
index 000000000000..d28b9a6009f9
--- /dev/null
+++ b/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch
@@ -0,0 +1,46 @@
+diff --git a/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js b/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
+--- a/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
++++ b/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
+@@ -9,6 +9,7 @@
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+ class AssetsCopyProcessor {
+   queue = [];
++  androidResources = new Set();
+   constructor(config, filesystem = _nodeFs.default) {
+     this.config = config;
+     this.filesystem = filesystem;
+@@ -101,6 +102,14 @@
+     // Copy regular assets
+     const mediaAssets = [...chunk.auxiliaryFiles].filter(file => !/\.(map|bundle\.json)$/.test(file)).filter(file => !/^remote-assets/.test(file));
+     this.queue.push(...mediaAssets.map(asset => () => this.copyAsset(_nodePath.default.join(outputPath, asset), _nodePath.default.join(assetsDest, asset))));
++    if (platform === 'android') {
++      mediaAssets.forEach(asset => {
++        const match = asset.match(/^(drawable|raw|font)(?:-[^/]+)?\/([^/]+?)(?:\.[^./]+)?$/);
++        if (match) {
++          this.androidResources.add(`@${match[1]}/${match[2]}`);
++        }
++      });
++    }
+ 
+     // Manifest file name e.g: `index.bundle.json`, src_App_js.chunk.bundle.json`
+     const [manifest] = [...chunk.auxiliaryFiles].filter(file => /\.bundle\.json$/.test(file));
+@@ -126,6 +135,19 @@
+     }
+   }
+   execute() {
++    if (this.androidResources.size) {
++      // Like Metro, list every bundled resource in `raw/keep.xml` so `shrinkResources` keeps them:
++      // JS looks them up by name at runtime, which the resource shrinker cannot see.
++      const keepPath = _nodePath.default.join(this.config.assetsDest, 'raw/keep.xml');
++      const content = `<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="${[...this.androidResources].join(',')}" />\n`;
++      this.androidResources = new Set();
++      this.queue.push(async () => {
++        await this.filesystem.promises.mkdir(_nodePath.default.dirname(keepPath), {
++          recursive: true
++        });
++        await this.filesystem.promises.writeFile(keepPath, content);
++      });
++    }
+     const queue = this.queue;
+     this.queue = [];
+     return queue.map(work => work());
diff --git a/patches/@callstack/repack/details.md b/patches/@callstack/repack/details.md
index 66ab25dec30b..3d12c05b6d58 100644
--- a/patches/@callstack/repack/details.md
+++ b/patches/@callstack/repack/details.md
@@ -41,3 +41,36 @@
 - Upstream PR/issue: https://github.com/callstack/repack/pull/1430 - merged into `main`, not in any release yet; staged for 5.4.0 by https://github.com/callstack/repack/pull/1441. Delete this patch when a release containing it is pinned.
 - E/App issue: None. Found while answering review on the PR below.
 - PR Introducing Patch: https://github.com/Expensify/App/pull/99407
+
+### [@callstack+repack+5.3.0+003+android-fonts-raw.patch](@callstack+repack+5.3.0+003+android-fonts-raw.patch)
+
+- Reason:
+
+    ```
+    In Android release builds Re.Pack's assets loader writes `.ttf`/`.otf`/`.ttc` files to `res/font/`,
+    while Metro writes every non-image asset to `res/raw/`. Fonts loaded from JS with `require()` (Skia's
+    `useFont`/`matchFont`, used by the Home charts) resolve the asset as an Android resource and only look
+    in `drawable` and `raw`, so they never load and the chart spinner never stops. This patch sends font
+    files to `raw`, as Metro does. XML font-family resources still go to `font/`.
+    ```
+
+- Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
+- E/App issue: https://github.com/Expensify/App/issues/102619
+- PR Introducing Patch: TBD
+
+### [@callstack+repack+5.3.0+004+android-keep-xml.patch](@callstack+repack+5.3.0+004+android-keep-xml.patch)
+
+- Reason:
+
+    ```
+    Metro writes `res/raw/keep.xml` next to the Android assets, listing every bundled resource with
+    `tools:keep`. JS loads these resources by name at runtime, which Android's resource shrinker cannot
+    see, so without the file a release build with `shrinkResources` (the standalone Android app) can
+    strip images and fonts that are still in use. Re.Pack writes no such file. This patch makes the
+    assets copy step write the same `raw/keep.xml` for Android, with one `@drawable/...`, `@raw/...` or
+    `@font/...` entry per copied resource.
+    ```
+
+- Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
+- E/App issue: None. Found while comparing Re.Pack and Metro Android release asset output for https://github.com/Expensify/App/issues/102619.
+- PR Introducing Patch: TBD

From 0becb2ac76237c313caeeda02c89bf51d038e7e5 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 1 Oct 2026 15:15:31 +0200
Subject: [PATCH 219/781] fix: keep Android tab root content above the Material
 tab bar

---
 .../TabBarBottomContent/index.android.tsx     | 29 +++++++++++++++++++
 .../TabBarBottomContent/index.ios.tsx         |  6 ++++
 .../TabBarBottomContent/index.native.tsx      |  6 ----
 src/styles/index.ts                           |  4 +++
 src/styles/variables.ts                       |  7 +++--
 5 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/index.android.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/index.ios.tsx
 delete mode 100644 src/components/Navigation/TabBarBottomContent/index.native.tsx

diff --git a/src/components/Navigation/TabBarBottomContent/index.android.tsx b/src/components/Navigation/TabBarBottomContent/index.android.tsx
new file mode 100644
index 000000000000..84ef345a43ae
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/index.android.tsx
@@ -0,0 +1,29 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+
+import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import type TabBarBottomContentProps from './types';
+
+/**
+ * Material's bar is drawn over the full-height tab screen, so a tab root screen reserves the bar's row under its
+ * content. The ScreenWrapper adds the gesture inset the bar sits on below it.
+ */
+function TabBarBottomContent({selectedTab}: TabBarBottomContentProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
+    const styles = useThemeStyles();
+
+    // Account drawn over the tabs hides the bar.
+    if (!shouldUseNarrowLayout || (selectedTab === NAVIGATION_TABS.SETTINGS && isSettingsDrawnOverTabs)) {
+        return null;
+    }
+
+    return <View style={styles.androidNativeTabBarSpacer} />;
+}
+
+export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/index.ios.tsx
new file mode 100644
index 000000000000..4a2451a606dd
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/index.ios.tsx
@@ -0,0 +1,6 @@
+/** UITabBar is translucent, so a tab root screen's content runs under it rather than ending above a copy of the bar. */
+function TabBarBottomContent() {
+    return null;
+}
+
+export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/index.native.tsx b/src/components/Navigation/TabBarBottomContent/index.native.tsx
deleted file mode 100644
index b423035245d5..000000000000
--- a/src/components/Navigation/TabBarBottomContent/index.native.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/** The native tab bars keep the screen content clear of themselves, so a tab root screen needs no copy of the bar. */
-function TabBarBottomContent() {
-    return null;
-}
-
-export default TabBarBottomContent;
diff --git a/src/styles/index.ts b/src/styles/index.ts
index c5edd6ba705b..22823ad3a4a2 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -770,6 +770,10 @@ const staticStyles = (theme: ThemeColors) =>
             marginHorizontal: -variables.floatingTabBarSelectedOverhang,
         },
 
+        androidNativeTabBarSpacer: {
+            height: variables.androidNativeTabBarHeight,
+        },
+
         // The gap between the floating bar and the bottom edge of the screen.
         floatingTabBarBottomInset: {
             paddingBottom: variables.floatingTabBarBottomInset,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 0ea27e0f0b23..6d10a89da4a8 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -31,6 +31,7 @@ const avatarSizes = {
 
 const floatingTabBarHeight = 60;
 const floatingTabBarBottomInset = 8;
+const androidNativeTabBarHeight = 80;
 
 export default {
     bottomTabHeight: 72,
@@ -121,8 +122,10 @@ export default {
     nativeTabIconLabelGap: 6,
     /** Pixel density the native tab bar icons are rasterized at. */
     nativeTabIconScale: 3,
-    /** Material's 80 dp BottomNavigationView row plus the 16 dp Material keeps between a FAB and the bar, without the gesture inset under it. */
-    androidNativeTabBarFloatingButtonsBottom: 96,
+    /** Material's BottomNavigationView row, without the gesture inset under it. */
+    androidNativeTabBarHeight,
+    /** Material's bar row plus the 16 dp Material keeps between a FAB and the bar. */
+    androidNativeTabBarFloatingButtonsBottom: androidNativeTabBarHeight + 16,
     /** UITabBar with the home indicator inset under it, plus a 12 pt gap to the floating buttons. */
     iosNativeTabBarFloatingButtonsBottom: 84,
     iconHeader: 48,

From abcddbea639ed80818fc96914735cad11bd10fed Mon Sep 17 00:00:00 2001
From: eliran goshen <elirangoshen@gmail.com>
Date: Thu, 1 Oct 2026 15:28:20 +0200
Subject: [PATCH 220/781] Link Re.Pack patches 003 and 004 to their PR

---
 patches/@callstack/repack/details.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/@callstack/repack/details.md b/patches/@callstack/repack/details.md
index 3d12c05b6d58..f0eda3361715 100644
--- a/patches/@callstack/repack/details.md
+++ b/patches/@callstack/repack/details.md
@@ -56,7 +56,7 @@
 
 - Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
 - E/App issue: https://github.com/Expensify/App/issues/102619
-- PR Introducing Patch: TBD
+- PR Introducing Patch: https://github.com/Expensify/App/pull/102766
 
 ### [@callstack+repack+5.3.0+004+android-keep-xml.patch](@callstack+repack+5.3.0+004+android-keep-xml.patch)
 
@@ -73,4 +73,4 @@
 
 - Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
 - E/App issue: None. Found while comparing Re.Pack and Metro Android release asset output for https://github.com/Expensify/App/issues/102619.
-- PR Introducing Patch: TBD
+- PR Introducing Patch: https://github.com/Expensify/App/pull/102766

From e9b7295b51ff9276eb9591808c99268d89f49efc Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Thu, 1 Oct 2026 16:50:45 +0000
Subject: [PATCH 221/781] Add MERGEDEXPENSEDELETED report action

---
 src/CONST/index.ts                                            | 1 +
 src/languages/de.ts                                           | 1 +
 src/languages/el.ts                                           | 1 +
 src/languages/en.ts                                           | 1 +
 src/languages/es.ts                                           | 1 +
 src/languages/fr.ts                                           | 1 +
 src/languages/it.ts                                           | 1 +
 src/languages/ja.ts                                           | 1 +
 src/languages/nl.ts                                           | 1 +
 src/languages/pl.ts                                           | 1 +
 src/languages/pt-BR.ts                                        | 1 +
 src/languages/zh-hans.ts                                      | 1 +
 .../inbox/report/actionContents/SimpleMessageContent.tsx      | 4 ++++
 src/types/onyx/OriginalMessage.ts                             | 1 +
 14 files changed, 17 insertions(+)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index ab33238b5ed7..7aa053906b96 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1798,6 +1798,7 @@ const CONST = {
                 MARKED_REIMBURSED: 'MARKEDREIMBURSED', // OldDot Action
                 MARK_REIMBURSED_FROM_INTEGRATION: 'ACTIONMARKEDREIMBURSEDFROMINTEGRATION', // OldDot Action
                 MERGED_WITH_CASH_TRANSACTION: 'MERGEDWITHCASHTRANSACTION',
+                MERGED_EXPENSE_DELETED: 'MERGEDEXPENSEDELETED',
                 MODIFIED_EXPENSE: 'MODIFIEDEXPENSE',
                 CONCIERGE_AUTO_MATCH_VENDOR: 'CONCIERGEAUTOMATCHVENDOR',
                 CONCIERGE_AUTO_SELECT_DISTANCE_RATE: 'CONCIERGEAUTOSELECTDISTANCERATE',
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2f3d34504b5b..344a3bb6a178 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -10898,6 +10898,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
     },
     systemMessage: {
         mergedWithCashTransaction: 'hat eine Quittung mit dieser Transaktion abgeglichen',
+        mergedExpenseDeleted: 'hat Ausgaben zusammengeführt und eine in Gelöscht verschoben',
     },
     subscription: {
         authenticatePaymentCard: 'Zahlungskarte authentifizieren',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 238f89657a23..bc403911dabd 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -11116,6 +11116,7 @@ ${reportName}`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'έγινε αντιστοίχιση μιας απόδειξης με αυτή τη συναλλαγή',
+        mergedExpenseDeleted: 'συγχώνευσε έξοδα και μετέφερε ένα στα Διαγραμμένα',
     },
     subscription: {
         authenticatePaymentCard: 'Πιστοποιήστε την κάρτα πληρωμής',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index cb890829c5c9..a238520a2938 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -11107,6 +11107,7 @@ const translations = {
     },
     systemMessage: {
         mergedWithCashTransaction: 'matched a receipt to this transaction',
+        mergedExpenseDeleted: 'merged expenses and moved one to Deleted',
     },
     subscription: {
         authenticatePaymentCard: 'Authenticate payment card',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 642c1014be4a..802e1bd65b33 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -11098,6 +11098,7 @@ ${reportName}`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'encontró un recibo para esta transacción',
+        mergedExpenseDeleted: 'combinó gastos y movió uno a Eliminados',
     },
     subscription: {
         authenticatePaymentCard: 'Autenticar tarjeta de pago',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index af474c05af12..e7025d52c804 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -10921,6 +10921,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
     },
     systemMessage: {
         mergedWithCashTransaction: 'a fait correspondre un reçu à cette transaction',
+        mergedExpenseDeleted: 'a fusionné des dépenses et en a déplacé une vers Supprimées',
     },
     subscription: {
         authenticatePaymentCard: 'Authentifier la carte de paiement',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index b2f3d995a997..85edb8c2ba14 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -10850,6 +10850,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'ha associato una ricevuta a questa transazione',
+        mergedExpenseDeleted: 'ha unito delle spese e ne ha spostata una in Eliminate',
     },
     subscription: {
         authenticatePaymentCard: 'Autentica carta di pagamento',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 390da1996527..b45deba11401 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -10690,6 +10690,7 @@ ${reportName}`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'この取引にレシートを照合しました',
+        mergedExpenseDeleted: '経費を統合し、1件を削除済みに移動しました',
     },
     subscription: {
         authenticatePaymentCard: '支払カードを認証',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 55be6dafc89d..90315379067f 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -10817,6 +10817,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'heeft een bonnetje aan deze transactie gekoppeld',
+        mergedExpenseDeleted: 'heeft uitgaven samengevoegd en er één naar Verwijderd verplaatst',
     },
     subscription: {
         authenticatePaymentCard: 'Betalingskaart verifiëren',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 5252fad2cb51..2cdd98942d01 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -10827,6 +10827,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'dopasowano paragon do tej transakcji',
+        mergedExpenseDeleted: 'scalono wydatki i przeniesiono jeden do Usuniętych',
     },
     subscription: {
         authenticatePaymentCard: 'Uwierzytelnij kartę płatniczą',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index eb7a31765c67..59a4bf4864a3 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -10812,6 +10812,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
     },
     systemMessage: {
         mergedWithCashTransaction: 'correspondeu um recibo a esta transação',
+        mergedExpenseDeleted: 'mesclou despesas e moveu uma para Excluídas',
     },
     subscription: {
         authenticatePaymentCard: 'Autenticar cartão de pagamento',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index b3c2cbfc5bb0..40bbd0659566 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -10418,6 +10418,7 @@ ${reportName}`,
     },
     systemMessage: {
         mergedWithCashTransaction: '已将一张收据匹配到此交易',
+        mergedExpenseDeleted: '已合并报销并将其中一笔移至已删除',
     },
     subscription: {
         authenticatePaymentCard: '验证支付卡',
diff --git a/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx b/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
index c929fca11b36..cd7bf41c089c 100644
--- a/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
+++ b/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
@@ -38,6 +38,7 @@ const SIMPLE_MESSAGE_ACTION_TYPES = new Set<string>([
     CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY,
     CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION,
     CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION,
+    CONST.REPORT.ACTIONS.TYPE.MERGED_EXPENSE_DELETED,
     CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION,
     CONST.REPORT.ACTIONS.TYPE.RESOLVED_DUPLICATES,
     CONST.REPORT.ACTIONS.TYPE.DEMOTED_FROM_WORKSPACE,
@@ -86,6 +87,9 @@ function SimpleMessageContent({action}: SimpleMessageContentProps) {
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION)) {
         return <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
     }
+    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MERGED_EXPENSE_DELETED)) {
+        return <ReportActionItemBasicMessage message={translate('systemMessage.mergedExpenseDeleted')} />;
+    }
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) {
         return <ReportActionItemBasicMessage message={getDismissedViolationMessageText(translate, getOriginalMessage(action))} />;
     }
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index d0f827f3cd5b..0dd2d797c227 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -1670,6 +1670,7 @@ type OriginalMessageMap = {
     [CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION]: never;
     [CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED]: OriginalMessageMarkedReimbursed;
     [CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION]: never;
+    [CONST.REPORT.ACTIONS.TYPE.MERGED_EXPENSE_DELETED]: never;
     [CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE]: OriginalMessageModifiedExpense;
     [CONST.REPORT.ACTIONS.TYPE.CONCIERGE_AUTO_MATCH_VENDOR]: OriginalMessageConciergeAutoMatchVendor;
     [CONST.REPORT.ACTIONS.TYPE.CONCIERGE_AUTO_SELECT_DISTANCE_RATE]: OriginalMessageConciergeAutoSelectDistanceRate;

From 48b0f8fb1e9ab85d5410b55e27fce29fa65a7c32 Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 21:13:17 +0000
Subject: [PATCH 222/781] Fetch policy categories and tags on the Search Edit
 multiple page

The Category and Tag rows depend on policy categories/tags, which are not in
the search snapshot. After a cache clear, opening Edit multiple straight from
Search left them unloaded, so the rows were hidden.

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../SearchEditMultiplePage.tsx                | 25 +++++++++++
 tests/ui/SearchEditMultiplePageTest.tsx       | 43 +++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
index 96aeb07420a9..fa24759812aa 100644
--- a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
+++ b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
@@ -13,6 +13,7 @@ import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
@@ -20,6 +21,8 @@ import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearBulkEditDraftTransaction, updateMultipleMoneyRequests} from '@libs/actions/IOU/BulkEdit';
+import {openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
+import {openPolicyTagsPage} from '@libs/actions/Policy/Tag';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
@@ -171,6 +174,28 @@ function SearchEditMultiplePage() {
     const areTagsEnabled = areSelectedTransactionsExpenses && !!policy?.areTagsEnabled && hasEnabledTags(policyTagLists);
     const areAttendeesEnabled = areSelectedTransactionsExpenses && isAttendeeTrackingEnabledForSelection;
 
+    // Policy categories and tags are not part of the search snapshot, and this page can be opened straight from Search
+    // before any screen has loaded them (e.g. after a cache clear), so fetch them here or their rows stay hidden.
+    const fetchPolicyData = () => {
+        if (!policyID) {
+            return;
+        }
+        if (policy?.areCategoriesEnabled && !policyCategories) {
+            openPolicyCategoriesPage(policyID);
+        }
+        if (policy?.areTagsEnabled && !policyTags) {
+            openPolicyTagsPage(policyID);
+        }
+    };
+
+    useNetwork({onReconnect: fetchPolicyData});
+
+    useEffect(() => {
+        fetchPolicyData();
+        // Only refetch when the policy or its enabled features change, not when the fetched data lands.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [policyID, policy?.areCategoriesEnabled, policy?.areTagsEnabled]);
+
     useEffect(() => {
         return () => {
             clearBulkEditDraftTransaction();
diff --git a/tests/ui/SearchEditMultiplePageTest.tsx b/tests/ui/SearchEditMultiplePageTest.tsx
index e89d39835848..c4fd2b8e5cb1 100644
--- a/tests/ui/SearchEditMultiplePageTest.tsx
+++ b/tests/ui/SearchEditMultiplePageTest.tsx
@@ -12,6 +12,8 @@ import ThemeStylesProvider from '@components/ThemeStylesContextProvider';
 import SearchEditMultiplePage from '@pages/Search/SearchEditMultiple/SearchEditMultiplePage';
 
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
+import {openPolicyCategoriesPage} from '@userActions/Policy/Category';
+import {openPolicyTagsPage} from '@userActions/Policy/Tag';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
@@ -32,6 +34,16 @@ import {createExpenseReport} from '../utils/collections/reports';
 import createRandomTransaction from '../utils/collections/transaction';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
+jest.mock('@userActions/Policy/Category', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@userActions/Policy/Category'),
+    openPolicyCategoriesPage: jest.fn(),
+}));
+
+jest.mock('@userActions/Policy/Tag', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@userActions/Policy/Tag'),
+    openPolicyTagsPage: jest.fn(),
+}));
+
 const CURRENT_USER_ACCOUNT_ID = 5;
 const CURRENT_USER_EMAIL = 'bjorn@vikings.net';
 const POLICY_ID = 'policy1';
@@ -136,6 +148,7 @@ describe('SearchEditMultiplePage', () => {
     });
 
     beforeEach(async () => {
+        jest.clearAllMocks();
         await Onyx.set(ONYXKEYS.SESSION, {email: CURRENT_USER_EMAIL, accountID: CURRENT_USER_ACCOUNT_ID});
         await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CURRENT_USER_ACCOUNT_ID]: {accountID: CURRENT_USER_ACCOUNT_ID, login: CURRENT_USER_EMAIL}});
         await Onyx.set(ONYXKEYS.NVP_ACTIVE_POLICY_ID, POLICY_ID);
@@ -172,4 +185,34 @@ describe('SearchEditMultiplePage', () => {
 
         expect(screen.getByLabelText(/^Reimbursable/).props.accessibilityState).toEqual(expect.objectContaining({disabled: true}));
     });
+
+    it('fetches policy categories and tags when they are enabled but not loaded yet', async () => {
+        // Given a workspace with categories and tags enabled whose categories and tags were never loaded, as after a cache clear
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {areCategoriesEnabled: true, areTagsEnabled: true});
+        await selectTransactions([OPEN_TRANSACTION_ID]);
+
+        // When the Edit multiple page opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it fetches them itself, since the search snapshot doesn't include them and the Category/Tag rows depend on them
+        expect(openPolicyCategoriesPage).toHaveBeenCalledWith(POLICY_ID);
+        expect(openPolicyTagsPage).toHaveBeenCalledWith(POLICY_ID);
+    });
+
+    it('does not refetch policy categories and tags that are already loaded', async () => {
+        // Given a workspace with categories and tags enabled whose categories and tags are already in Onyx
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {areCategoriesEnabled: true, areTagsEnabled: true});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`, {Food: {name: 'Food', enabled: true}});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${POLICY_ID}`, {Department: {name: 'Department', required: false, orderWeight: 0, tags: {Sales: {name: 'Sales', enabled: true}}}});
+        await selectTransactions([OPEN_TRANSACTION_ID]);
+
+        // When the Edit multiple page opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then no extra request is made, so opening the page doesn't add network traffic when the data is already available
+        expect(openPolicyCategoriesPage).not.toHaveBeenCalled();
+        expect(openPolicyTagsPage).not.toHaveBeenCalled();
+    });
 });

From 904519d2d87c7c874862c9300a74fc4be8d1e5a2 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 02:49:23 +0430
Subject: [PATCH 223/781] Fix expense detail field value selection on desktop
 and mobile web

---
 src/components/MenuItem/MenuItem.tsx          |  29 ++++-
 src/components/MenuItem/MenuItemContext.tsx   |   4 +
 .../MenuItem/layout/MenuItemRoot.tsx          |  57 +++++++--
 .../content/base/BaseMenuItemPrimaryText.tsx  |  11 +-
 .../base/BaseMenuItemSupportingText.tsx       |   7 +-
 .../MenuItem/leaves/content/base/types.ts     |   3 +
 .../MenuItem/presets/MenuItemField.tsx        |  31 ++++-
 .../ReportActionItem/MoneyRequestView.tsx     |   2 +-
 .../components/MenuItem/MenuItemCopyTest.tsx  |  99 ++++++++++++++-
 .../components/MenuItem/MenuItemFieldTest.tsx | 115 +++++++++++++++++-
 10 files changed, 335 insertions(+), 23 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 797827bddd09..c43dfcfd1cf6 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -65,7 +65,7 @@ import type {GestureResponderEvent, Role, StyleProp, TextStyle, ViewStyle} from
 import type {AnimatedStyle} from 'react-native-reanimated';
 import type {ValueOf} from 'type-fest';
 
-import React, {useMemo, useRef} from 'react';
+import React, {useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 
 import useRemoveNonInteractiveClickHandler from './hooks/useRemoveNonInteractiveClickHandler';
@@ -586,6 +586,8 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<ComponentRef<typeof View>>(null);
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
+    const didTouchStartOnCopyableTextRef = useRef(false);
+    const [didTouchStartOnCopyableText, setDidTouchStartOnCopyableText] = useState(false);
     const {isPressStartOnCopyableText, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
         useCopyableTextRowPress();
     useRemoveNonInteractiveClickHandler(pressableRef, interactive);
@@ -689,7 +691,7 @@ function MenuItem({
     }, [helperText, shouldParseHelperText, shouldEscapeText]);
 
     const shouldRenderTitleAsHTML = shouldRenderAsHTML && !!title && Parser.isHTML(title);
-    const shouldOverrideHTMLTitleSelection = isTitleSelectable && getPlatform() === CONST.PLATFORM.WEB;
+    const shouldEnableTextSelection = isTitleSelectable && getPlatform() === CONST.PLATFORM.WEB;
 
     const processedTitle = useMemo(() => {
         let titleToWrap = '';
@@ -793,6 +795,16 @@ function MenuItem({
         });
         onSecondaryInteraction?.(event);
     };
+    const secondaryInteractionHandler = copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction;
+
+    const handlePressIn = () => {
+        if (shouldEnableTextSelection && didTouchStartOnCopyableTextRef.current) {
+            return;
+        }
+        if (shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen()) {
+            ControlSelection.block();
+        }
+    };
 
     const isIDPassed = !!iconReportID || !!iconAccountID || iconAccountID === CONST.DEFAULT_NUMBER_ID;
 
@@ -831,16 +843,21 @@ function MenuItem({
                             <PressableWithSecondaryInteraction
                                 onPress={shouldCheckActionAllowedOnPress ? callFunctionIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
                                 onMouseDown={(event) => {
+                                    didTouchStartOnCopyableTextRef.current = false;
+                                    setDidTouchStartOnCopyableText(false);
                                     markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
                                 onTouchStart={(event) => {
-                                    markTouchStartOnCopyableText(event, isTitleSelectable && isPressStartOnCopyableText(event));
+                                    const isCopyableTarget = markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
+                                    didTouchStartOnCopyableTextRef.current = isCopyableTarget;
+                                    setDidTouchStartOnCopyableText(isCopyableTarget);
                                 }}
                                 shouldAllowTextSelection={isTitleSelectable}
                                 preventDefaultContextMenu={(event) => deviceHasHoverSupport || !isTitleSelectable || !isPressStartOnCopyableText(event)}
-                                onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
+                                onPressIn={handlePressIn}
                                 onPressOut={ControlSelection.unblock}
-                                onSecondaryInteraction={copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction}
+                                // Keep the native selection menu available through press-out; reset on the next pointer start.
+                                onSecondaryInteraction={shouldEnableTextSelection && didTouchStartOnCopyableText ? undefined : secondaryInteractionHandler}
                                 wrapperStyle={outerWrapperStyle}
                                 activeOpacity={!interactive ? 1 : variables.pressDimValue}
                                 opacityAnimationDuration={variables.instantAnimationDuration}
@@ -1037,7 +1054,7 @@ function MenuItem({
                                                                         {shouldRenderTitleAsHTML || shouldParseTitle ? (
                                                                             <RenderHTML
                                                                                 html={processedTitle}
-                                                                                isSelectable={shouldOverrideHTMLTitleSelection ? true : undefined}
+                                                                                isSelectable={shouldEnableTextSelection ? true : undefined}
                                                                             />
                                                                         ) : (
                                                                             <Text style={styles.webViewStyles.baseFontStyle}>{convertToLTR(Parser.htmlToText(processedTitle))}</Text>
diff --git a/src/components/MenuItem/MenuItemContext.tsx b/src/components/MenuItem/MenuItemContext.tsx
index 8fbdb4f7b5f4..b0c0895ad5af 100644
--- a/src/components/MenuItem/MenuItemContext.tsx
+++ b/src/components/MenuItem/MenuItemContext.tsx
@@ -7,6 +7,9 @@ type MenuItemConfig = {
 
     /** Whether the row responds to interactions */
     isInteractive: boolean;
+
+    /** Whether the row opts into browser selection of explicitly marked values */
+    shouldAllowTextSelection: boolean;
 };
 
 /** Interaction state of the menu item row */
@@ -21,6 +24,7 @@ type MenuItemInteraction = {
 const DEFAULT_CONFIG: MenuItemConfig = {
     isDisabled: false,
     isInteractive: false,
+    shouldAllowTextSelection: false,
 };
 
 const DEFAULT_INTERACTION: MenuItemInteraction = {
diff --git a/src/components/MenuItem/layout/MenuItemRoot.tsx b/src/components/MenuItem/layout/MenuItemRoot.tsx
index d9e72e4d4bf7..d5b2240561ea 100644
--- a/src/components/MenuItem/layout/MenuItemRoot.tsx
+++ b/src/components/MenuItem/layout/MenuItemRoot.tsx
@@ -6,6 +6,7 @@ import {MenuItemConfigContext, MenuItemInteractionContext} from '@components/Men
 import MenuItemSecondaryInteractionContext, {useMenuItemSecondaryInteractionRegistry} from '@components/MenuItem/MenuItemSecondaryInteractionContext';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -13,6 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import ControlSelection from '@libs/ControlSelection';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import getButtonState from '@libs/getButtonState';
+import getPlatform from '@libs/getPlatform';
 
 import variables from '@styles/variables';
 
@@ -23,7 +25,7 @@ import type WithTestID from '@src/types/utils/TestID';
 import type {ComponentRef, PropsWithChildren} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 
-import React, {useRef} from 'react';
+import React, {useRef, useState} from 'react';
 import {View} from 'react-native';
 
 type MenuItemRootProps = PropsWithChildren &
@@ -46,15 +48,23 @@ type MenuItemRootProps = PropsWithChildren &
          * before the hover/press background so the row keeps its interaction feedback.
          */
         style?: StyleProp<ViewStyle>;
+
+        /** Whether explicitly marked child text can start native browser text selection */
+        shouldAllowTextSelection?: boolean;
     };
 
-function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style}: MenuItemRootProps) {
+function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style, shouldAllowTextSelection = false}: MenuItemRootProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
+    const didTouchStartOnCopyableTextRef = useRef(false);
+    const [didTouchStartOnCopyableText, setDidTouchStartOnCopyableText] = useState(false);
     const isCompactPopover = useIsCompactPopover();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isInteractive = !!onPress;
+    const shouldEnableTextSelection = shouldAllowTextSelection && getPlatform() === CONST.PLATFORM.WEB;
+    const {isPressStartOnCopyableText, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
+        useCopyableTextRowPress();
 
     const {accessibilityLabel: derivedAccessibilityLabel, accessibilityHint, accessibilityActions} = useMenuItemAccessibility();
     const {handler: registeredSecondaryInteraction, register: registerSecondaryInteraction} = useMenuItemSecondaryInteractionRegistry();
@@ -66,6 +76,10 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
             return;
         }
 
+        if (shouldSuppressCopyableTextRowPress(shouldEnableTextSelection)) {
+            return;
+        }
+
         // Prevent clicked menu items from retaining an unwanted focus outline on web, especially in Safari
         if (event?.type === 'click' && typeof HTMLElement !== 'undefined' && event.currentTarget instanceof HTMLElement) {
             event.currentTarget.blur();
@@ -79,19 +93,48 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
 
     // Left undefined when no sub-component wants it, so the web keeps its native context menu on a plain row
     const onSecondaryInteractionAction = registeredSecondaryInteraction
-        ? (event: GestureResponderEvent | MouseEvent) => registeredSecondaryInteraction(event, pressableRef.current)
+        ? (event: GestureResponderEvent | MouseEvent) => {
+              if (shouldEnableTextSelection && (shouldSuppressCopyableTextRowLongPress() || isPressStartOnCopyableText(event))) {
+                  return;
+              }
+              registeredSecondaryInteraction(event, pressableRef.current);
+          }
         : undefined;
 
+    const handlePressIn = () => {
+        // RN Web responder events omit client coordinates, so reuse the original touch hit-test.
+        if (shouldEnableTextSelection && didTouchStartOnCopyableTextRef.current) {
+            return;
+        }
+
+        if (onSecondaryInteractionAction && shouldUseNarrowLayout && canUseTouchScreen()) {
+            ControlSelection.block();
+        }
+    };
+
     return (
-        <MenuItemConfigContext.Provider value={{isDisabled, isInteractive}}>
+        <MenuItemConfigContext.Provider value={{isDisabled, isInteractive, shouldAllowTextSelection: shouldEnableTextSelection}}>
             <Hoverable>
                 {(isHovered) => (
                     <PressableWithSecondaryInteraction
                         onPress={onPressAction}
-                        // A long press on a touch device starts a text selection under the context menu the row is about to open, so block it while the press lasts
-                        onPressIn={() => !!onSecondaryInteractionAction && shouldUseNarrowLayout && canUseTouchScreen() && ControlSelection.block()}
+                        onMouseDown={(event) => {
+                            didTouchStartOnCopyableTextRef.current = false;
+                            setDidTouchStartOnCopyableText(false);
+                            markMouseDownOnCopyableText(event?.target, shouldEnableTextSelection);
+                        }}
+                        onTouchStart={(event) => {
+                            const isCopyableTarget = markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
+                            didTouchStartOnCopyableTextRef.current = isCopyableTarget;
+                            setDidTouchStartOnCopyableText(isCopyableTarget);
+                        }}
+                        shouldAllowTextSelection={shouldEnableTextSelection}
+                        preventDefaultContextMenu={(event) => !shouldEnableTextSelection || !isPressStartOnCopyableText(event)}
+                        onPressIn={handlePressIn}
                         onPressOut={ControlSelection.unblock}
-                        onSecondaryInteraction={onSecondaryInteractionAction}
+                        // RN Web prevents the native context menu whenever an onLongPress handler is attached.
+                        // Reset on the next pointer start, since press-out can precede the browser's selection menu.
+                        onSecondaryInteraction={shouldEnableTextSelection && didTouchStartOnCopyableText ? undefined : onSecondaryInteractionAction}
                         activeOpacity={!isInteractive ? 1 : variables.pressDimValue}
                         opacityAnimationDuration={variables.instantAnimationDuration}
                         style={({pressed}) =>
diff --git a/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx b/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
index fd203fcad6a0..f5369cf9d8c9 100644
--- a/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
+++ b/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
@@ -5,6 +5,8 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import convertToLTR from '@libs/convertToLTR';
+import getPlatform from '@libs/getPlatform';
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import CONST from '@src/CONST';
 
@@ -13,9 +15,10 @@ import React from 'react';
 import type {BaseMenuItemTextProps, MenuItemPrimaryTextProps} from './types';
 
 /** Base of the full-contrast leaves */
-function BaseMenuItemPrimaryText({children, accessibilityLabel, numberOfLines = 1, slot, style}: MenuItemPrimaryTextProps & BaseMenuItemTextProps) {
+function BaseMenuItemPrimaryText({children, accessibilityLabel, numberOfLines = 1, isSelectable = false, slot, style}: MenuItemPrimaryTextProps & BaseMenuItemTextProps) {
     const styles = useThemeStyles();
     const {isDisabled, isInteractive} = useMenuItemConfig();
+    const shouldAllowTextSelection = isSelectable && getPlatform() === CONST.PLATFORM.WEB && !(isInteractive && isDisabled);
 
     useMenuItemAccessibilityLabel(slot, accessibilityLabel ?? String(children));
 
@@ -26,12 +29,16 @@ function BaseMenuItemPrimaryText({children, accessibilityLabel, numberOfLines =
                 styles.popoverMenuText,
                 numberOfLines === 1 ? styles.pre : styles.preWrap,
                 isInteractive && isDisabled && styles.userSelectNone,
+                shouldAllowTextSelection && styles.userSelectText,
                 styles.ltr,
                 styles.mw100,
                 style,
             ]}
             numberOfLines={numberOfLines}
-            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: isInteractive && isDisabled}}
+            dataSet={{
+                [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: isInteractive && isDisabled,
+                ...(shouldAllowTextSelection ? COPYABLE_TEXT_DATA_SET : {}),
+            }}
         >
             {typeof children === 'string' ? convertToLTR(children) : children}
         </Text>
diff --git a/src/components/MenuItem/leaves/content/base/BaseMenuItemSupportingText.tsx b/src/components/MenuItem/leaves/content/base/BaseMenuItemSupportingText.tsx
index 7c7c5744a256..108e38060543 100644
--- a/src/components/MenuItem/leaves/content/base/BaseMenuItemSupportingText.tsx
+++ b/src/components/MenuItem/leaves/content/base/BaseMenuItemSupportingText.tsx
@@ -1,8 +1,11 @@
 import {useMenuItemAccessibilityLabel} from '@components/MenuItem/MenuItemAccessibilityContext';
+import {useMenuItemConfig} from '@components/MenuItem/MenuItemContext';
 import Text from '@components/Text';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import CONST from '@src/CONST';
+
 import React from 'react';
 
 import type {BaseMenuItemTextProps, MenuItemSupportingTextProps} from './types';
@@ -10,13 +13,15 @@ import type {BaseMenuItemTextProps, MenuItemSupportingTextProps} from './types';
 /** Base of the muted leaves */
 function BaseMenuItemSupportingText({children, numberOfLines = 2, slot, style}: MenuItemSupportingTextProps & BaseMenuItemTextProps) {
     const styles = useThemeStyles();
+    const {shouldAllowTextSelection} = useMenuItemConfig();
 
     useMenuItemAccessibilityLabel(slot, String(children));
 
     return (
         <Text
-            style={[styles.textLabelSupporting, styles.breakWord, style]}
+            style={[styles.textLabelSupporting, styles.breakWord, style, shouldAllowTextSelection && styles.userSelectNone]}
             numberOfLines={numberOfLines}
+            dataSet={shouldAllowTextSelection ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
         >
             {children}
         </Text>
diff --git a/src/components/MenuItem/leaves/content/base/types.ts b/src/components/MenuItem/leaves/content/base/types.ts
index bb1604686404..305432c6c63d 100644
--- a/src/components/MenuItem/leaves/content/base/types.ts
+++ b/src/components/MenuItem/leaves/content/base/types.ts
@@ -21,6 +21,9 @@ type MenuItemPrimaryTextProps = (
 ) & {
     /** Defaults to 1. Anything else lets the text wrap, and `0` lets it grow unbounded */
     numberOfLines?: number;
+
+    /** Whether this text can start native browser text selection inside an interactive row */
+    isSelectable?: boolean;
 };
 
 /** Props of the muted leaves */
diff --git a/src/components/MenuItem/presets/MenuItemField.tsx b/src/components/MenuItem/presets/MenuItemField.tsx
index 889eeb5c9d75..2b32fe7fd4ea 100644
--- a/src/components/MenuItem/presets/MenuItemField.tsx
+++ b/src/components/MenuItem/presets/MenuItemField.tsx
@@ -25,6 +25,9 @@ type MenuItemFieldRowProps = PropsWithChildren<{
 
     /** How many lines the value may take. Defaults to 1, and `0` lets it grow unbounded */
     numberOfLinesValue?: number;
+
+    /** Whether the field value can start native browser text selection */
+    isValueSelectable?: boolean;
 }>;
 
 type MenuItemFieldProps = Omit<MenuItemRootProps, 'accessibilityLabel'> & Omit<MenuItemFieldRowProps, 'children'>;
@@ -61,10 +64,19 @@ function MenuItemFieldContent({name, children}: MenuItemFieldContentProps) {
  * `MenuItemField` preset when the row needs siblings inside the same `Root` (an error or a hint
  * line under the row).
  */
-function MenuItemFieldRow({name, value, numberOfLinesValue, children}: MenuItemFieldRowProps) {
+function MenuItemFieldRow({name, value, numberOfLinesValue, isValueSelectable = false, children}: MenuItemFieldRowProps) {
     return (
         <MenuItemRow>
-            <MenuItemFieldContent name={name}>{!!value && <MenuItemFieldValue numberOfLines={numberOfLinesValue}>{value}</MenuItemFieldValue>}</MenuItemFieldContent>
+            <MenuItemFieldContent name={name}>
+                {!!value && (
+                    <MenuItemFieldValue
+                        numberOfLines={numberOfLinesValue}
+                        isSelectable={isValueSelectable}
+                    >
+                        {value}
+                    </MenuItemFieldValue>
+                )}
+            </MenuItemFieldContent>
             {hasRenderableChildren(children) && <MenuItemTrailing>{children}</MenuItemTrailing>}
         </MenuItemRow>
     );
@@ -74,18 +86,31 @@ function MenuItemFieldRow({name, value, numberOfLinesValue, children}: MenuItemF
  * Field preset: a field name plus its value. With no `value` the name takes over the row.
  * `children` land in the trailing cell, next to the chevron.
  */
-function MenuItemFieldPreset({name, value, numberOfLinesValue, children, onPress, isDisabled = false, sentryLabel, testID}: MenuItemFieldProps) {
+function MenuItemFieldPreset({
+    name,
+    value,
+    numberOfLinesValue,
+    isValueSelectable = false,
+    children,
+    onPress,
+    isDisabled = false,
+    sentryLabel,
+    testID,
+    shouldAllowTextSelection = isValueSelectable,
+}: MenuItemFieldProps) {
     return (
         <MenuItemRoot
             onPress={onPress ? callFunctionIfActionIsAllowed(onPress) : undefined}
             isDisabled={isDisabled}
             sentryLabel={sentryLabel}
             testID={testID}
+            shouldAllowTextSelection={shouldAllowTextSelection}
         >
             <MenuItemFieldRow
                 name={name}
                 value={value}
                 numberOfLinesValue={numberOfLinesValue}
+                isValueSelectable={isValueSelectable}
             >
                 {children}
                 {!!onPress && <MenuItemChevron />}
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index debc40bfd400..63f5ef4f9a2b 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1243,7 +1243,7 @@ function MoneyRequestView({
     const parentReportDerivedName = parentReport?.reportID ? derivedReportNames?.[parentReport.reportID] : undefined;
     const reportNameToDisplay = isFromMergeTransaction ? (updatedTransaction?.reportName ?? translate('common.none')) : getReportName(parentReport, parentReportDerivedName);
     const shouldShowReport = !!parentReportID || (isFromMergeTransaction && !!reportNameToDisplay);
-    const reportCopyValue = !canEditReport && reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
+    const reportCopyValue = reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
     const shouldShowCategoryAnalyzing = isCategoryBeingAnalyzed(updatedTransaction ?? transaction, transactionReport, policy);
     // In this case we want to use this value. The shouldUseNarrowLayout will always be true as this case is handled when we display ReportScreen in RHP.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
diff --git a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
index f3ac1d350868..0158a5c36555 100644
--- a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
@@ -3,11 +3,15 @@ import {fireEvent, render, screen} from '@testing-library/react-native';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+
+import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 
 import Clipboard from '@libs/Clipboard';
 import ControlSelection from '@libs/ControlSelection';
 import type * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import {canUseTouchScreen, hasHoverSupport} from '@libs/DeviceCapabilities';
+import getPlatform from '@libs/getPlatform';
 
 import {showContextMenu} from '@pages/inbox/report/ContextMenu/ReportActionContextMenu';
 
@@ -26,6 +30,7 @@ let mockShouldUseNarrowLayout = false;
 jest.mock('@hooks/useLazyAsset', () => ({
     useMemoizedLazyExpensifyIcons: jest.fn(() => ({
         Copy: () => null,
+        NewWindow: () => null,
     })),
 }));
 
@@ -60,6 +65,16 @@ jest.mock('@hooks/useResponsiveLayout', () => ({
     default: () => ({shouldUseNarrowLayout: mockShouldUseNarrowLayout}),
 }));
 
+jest.mock('@libs/getPlatform', () => jest.fn());
+
+jest.mock('@hooks/useCopyableTextRowPress', () => {
+    const actual = jest.requireActual<typeof import('@hooks/useCopyableTextRowPress')>('@hooks/useCopyableTextRowPress');
+    return {...actual, __esModule: true, default: jest.fn(actual.default)};
+});
+
+const actualUseCopyableTextRowPress = jest.requireActual<typeof import('@hooks/useCopyableTextRowPress')>('@hooks/useCopyableTextRowPress').default;
+const mockedUseCopyableTextRowPress = jest.mocked(useCopyableTextRowPress);
+const mockedGetPlatform = jest.mocked(getPlatform);
 const mockedHasHoverSupport = jest.mocked(hasHoverSupport);
 const mockedCanUseTouchScreen = jest.mocked(canUseTouchScreen);
 const mockedShowContextMenu = jest.mocked(showContextMenu);
@@ -70,13 +85,14 @@ const NAME = 'Confirmation';
 const VALUE = 'CONF-12345';
 const ROW_TEST_ID = 'copyable-row';
 
-function Row() {
+function Row({isValueSelectable = false}: {isValueSelectable?: boolean}) {
     return (
         <LocaleContextProvider>
             <MenuItemField
                 name={NAME}
                 value={VALUE}
                 testID={ROW_TEST_ID}
+                isValueSelectable={isValueSelectable}
             >
                 <MenuItem.Copy value={VALUE} />
             </MenuItemField>
@@ -84,7 +100,34 @@ function Row() {
     );
 }
 
-/** A long press reaches the row's handler through `PressableWithSecondaryInteraction`, which calls `preventDefault` first */
+function LegacyRow({isTitleSelectable = false}: {isTitleSelectable?: boolean}) {
+    return (
+        <LocaleContextProvider>
+            <MenuItem
+                title={VALUE}
+                description="Report"
+                copyValue={VALUE}
+                pressableTestID={ROW_TEST_ID}
+                interactive={false}
+                shouldShowRightIcon={false}
+                shouldRenderAsHTML
+                shouldBlockSelection
+                copyable
+                isTitleSelectable={isTitleSelectable}
+            />
+        </LocaleContextProvider>
+    );
+}
+
+function mockCopyableTextHitTest(isPressStartOnCopyableText: (event: unknown) => boolean) {
+    mockedUseCopyableTextRowPress.mockImplementation(() => ({
+        ...actualUseCopyableTextRowPress(),
+        isPressStartOnCopyableText,
+        markTouchStartOnCopyableText: (_event, shouldCheck = true) => shouldCheck,
+    }));
+}
+
+/** A long press reaches the row's handler through `PressableWithSecondaryInteraction`. */
 function longPressRow() {
     fireEvent(screen.getByTestId(ROW_TEST_ID), 'longPress', {preventDefault: () => {}});
 }
@@ -100,6 +143,8 @@ describe('MenuItem.Copy', () => {
         mockShouldUseNarrowLayout = false;
         mockedHasHoverSupport.mockReturnValue(true);
         mockedCanUseTouchScreen.mockReturnValue(false);
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.IOS);
+        mockedUseCopyableTextRowPress.mockImplementation(actualUseCopyableTextRowPress);
     });
 
     describe('on a device with hover support', () => {
@@ -140,6 +185,56 @@ describe('MenuItem.Copy', () => {
             mockShouldUseNarrowLayout = true;
         });
 
+        it.each(['compound', 'legacy'])('preserves native selection and restores the %s row copy action on the next gesture', (implementation) => {
+            // Given a mobile-web field with a registered copy action and selectable value
+            mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+            const isPressStartOnCopyableText = jest.fn().mockReturnValueOnce(true).mockReturnValue(false);
+            mockCopyableTextHitTest(isPressStartOnCopyableText);
+            render(implementation === 'legacy' ? <LegacyRow isTitleSelectable /> : <Row isValueSelectable />);
+            expect(screen.UNSAFE_getByType(PressableWithFeedback).props.onLongPress).toEqual(expect.any(Function));
+
+            // When a touch starts on the value, the browser must be able to open its native selection menu
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'touchStart', {nativeEvent: {}});
+            // RN Web normalizes responder coordinates to pageX/pageY rather than clientX/clientY.
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'pressIn', {nativeEvent: {pageX: 10, pageY: 10, touches: [{pageX: 10, pageY: 10}]}});
+
+            // Then no long-press handler or global selection blocker interferes with native selection
+            expect(screen.UNSAFE_getByType(PressableWithFeedback).props.onLongPress).toBeUndefined();
+            expect(mockedBlockSelection).not.toHaveBeenCalled();
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'pressOut', {nativeEvent: {}});
+            expect(screen.UNSAFE_getByType(PressableWithFeedback).props.onLongPress).toBeUndefined();
+            expect(mockedShowContextMenu).not.toHaveBeenCalled();
+
+            // When the next gesture starts outside the copyable value
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'touchStart', {nativeEvent: {}});
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'pressIn', {nativeEvent: {}});
+            longPressRow();
+
+            // Then the ordinary row selection blocker and copy context menu work again
+            expect(mockedBlockSelection).toHaveBeenCalledTimes(1);
+            expect(mockedShowContextMenu).toHaveBeenCalledTimes(1);
+            expect(mockedShowContextMenu).toHaveBeenCalledWith(expect.objectContaining({selection: VALUE}));
+        });
+
+        it.each([
+            {platform: CONST.PLATFORM.WEB, isTitleSelectable: false},
+            {platform: CONST.PLATFORM.IOS, isTitleSelectable: true},
+            {platform: CONST.PLATFORM.ANDROID, isTitleSelectable: true},
+        ])('preserves legacy row interactions on $platform with isTitleSelectable=$isTitleSelectable', ({platform, isTitleSelectable}) => {
+            // Given a native row or a web row that has not opted into text selection
+            mockedGetPlatform.mockReturnValue(platform);
+            mockCopyableTextHitTest(() => true);
+            render(<LegacyRow isTitleSelectable={isTitleSelectable} />);
+
+            // When the row is touched
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'touchStart', {nativeEvent: {}});
+            fireEvent(screen.getByTestId(ROW_TEST_ID), 'pressIn', {nativeEvent: {}});
+
+            // Then browser-only selection handling does not detach its long-press action or skip its blocker
+            expect(screen.UNSAFE_getByType(PressableWithFeedback).props.onLongPress).toEqual(expect.any(Function));
+            expect(mockedBlockSelection).toHaveBeenCalledTimes(1);
+        });
+
         it('renders no copy button, as there is no hover to reveal it', () => {
             mockIsHovered = true;
 
diff --git a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
index 86c36815ec57..0640f2c50c9b 100644
--- a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
@@ -5,6 +5,8 @@ import MenuItemTrailing from '@components/MenuItem/layout/MenuItemTrailing';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
 
+import getPlatform from '@libs/getPlatform';
+
 import CONST from '@src/CONST';
 
 import React from 'react';
@@ -15,6 +17,9 @@ jest.mock('@hooks/useLazyAsset', () => ({
     })),
 }));
 
+jest.mock('@libs/getPlatform', () => jest.fn());
+
+const mockedGetPlatform = jest.mocked(getPlatform);
 const CHEVRON_TEST_ID = 'menu-item-chevron';
 const pressEvent = {nativeEvent: {}};
 const NAME = 'Legal first name';
@@ -25,6 +30,10 @@ function Wrapper({children}: {children: React.ReactNode}) {
 }
 
 describe('MenuItemField', () => {
+    beforeEach(() => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+    });
+
     describe('filled shape', () => {
         it('renders the name and the value', () => {
             render(
@@ -52,6 +61,88 @@ describe('MenuItemField', () => {
 
             expect(await screen.findByLabelText(`${NAME}, ${VALUE}`)).toBeOnTheScreen();
         });
+
+        it('marks only the value as copyable when value selection is enabled', () => {
+            // Given a field value that is allowed to start native text selection
+            // When the field is rendered
+            render(
+                <Wrapper>
+                    <MenuItemField
+                        name={NAME}
+                        value={VALUE}
+                        isValueSelectable
+                    />
+                </Wrapper>,
+            );
+
+            // Then only the value receives the shared copyable-text marker
+            expect(screen.getByText(VALUE)).toHaveStyle({userSelect: 'text'});
+            expect(screen.getByText(VALUE)).toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
+            expect(screen.getByText(NAME).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(NAME)).toHaveStyle({userSelect: 'none'});
+            expect(screen.getByText(NAME)).toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
+        });
+
+        it.each([CONST.PLATFORM.IOS, CONST.PLATFORM.ANDROID])('keeps browser value selection disabled on %s', async (platform) => {
+            // Given a native platform where browser selection handling does not apply
+            mockedGetPlatform.mockReturnValue(platform);
+            const onPress = jest.fn();
+
+            // When a pressable field opts into browser value selection
+            render(
+                <Wrapper>
+                    <MenuItemField
+                        name={NAME}
+                        value={VALUE}
+                        onPress={onPress}
+                        isValueSelectable
+                    />
+                </Wrapper>,
+            );
+
+            // Then native text stays unmarked and ordinary row presses still work
+            expect(screen.getByText(VALUE)).not.toHaveStyle({userSelect: 'text'});
+            expect(screen.getByText(VALUE).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(NAME).props.dataSet?.[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]).not.toBe(true);
+            fireEvent.press(await screen.findByLabelText(`${NAME}, ${VALUE}`), pressEvent);
+            expect(onPress).toHaveBeenCalledTimes(1);
+        });
+
+        it('keeps disabled interactive values excluded from selection and copied content', () => {
+            // Given a disabled interactive field on web
+            // When browser value selection is requested
+            render(
+                <Wrapper>
+                    <MenuItemField
+                        name={NAME}
+                        value={VALUE}
+                        onPress={() => {}}
+                        isDisabled
+                        isValueSelectable
+                    />
+                </Wrapper>,
+            );
+
+            // Then selectable styling and metadata cannot override the disabled restriction
+            expect(screen.getByText(VALUE)).toHaveStyle({userSelect: 'none'});
+            expect(screen.getByText(VALUE)).toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
+            expect(screen.getByText(VALUE).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+        });
     });
 
     describe('value line count', () => {
@@ -99,6 +190,24 @@ describe('MenuItemField', () => {
     });
 
     describe('empty shape', () => {
+        it('keeps the placeholder label nonselectable when web value selection is enabled', () => {
+            // Given a field without a value to select
+            // When its row opts into browser value selection
+            render(
+                <Wrapper>
+                    <MenuItemField
+                        name={NAME}
+                        isValueSelectable
+                    />
+                </Wrapper>,
+            );
+
+            // Then the placeholder remains a label rather than a copyable value
+            expect(screen.getByText(NAME)).toHaveStyle({userSelect: 'none'});
+            expect(screen.getByText(NAME).props.dataSet?.[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]).toBe(true);
+            expect(screen.getByText(NAME).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+        });
+
         it.each([
             ['no value prop', undefined],
             ['an empty value', ''],
@@ -229,7 +338,8 @@ describe('MenuItemField', () => {
             expect(await screen.findByRole(CONST.ROLE.BUTTON, {name: `${NAME}, ${VALUE}`})).toBeOnTheScreen();
         });
 
-        it('calls onPress when pressed', async () => {
+        it.each([false, true])('calls onPress for a normal press with isValueSelectable=%s', async (isValueSelectable) => {
+            // Given a pressable field with or without native value selection enabled
             const onPress = jest.fn();
             render(
                 <Wrapper>
@@ -237,12 +347,15 @@ describe('MenuItemField', () => {
                         name={NAME}
                         value={VALUE}
                         onPress={onPress}
+                        isValueSelectable={isValueSelectable}
                     />
                 </Wrapper>,
             );
 
+            // When the row is pressed without selecting text
             fireEvent.press(await screen.findByLabelText(`${NAME}, ${VALUE}`), pressEvent);
 
+            // Then the usual row action still runs once
             expect(onPress).toHaveBeenCalledTimes(1);
         });
 

From e80da578fe350a41f512553c2a415ee320f8a65d Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 22:32:00 +0000
Subject: [PATCH 224/781] Protect workspace admins and approvers in expense
 threads and select only the derived boolean

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/libs/ReportUtils.ts                    |  13 ++-
 src/pages/DynamicRoomMemberDetailsPage.tsx |   7 +-
 src/pages/DynamicRoomMembersPage.tsx       |   2 +-
 tests/unit/ReportUtilsTest.ts              | 114 ++++++++++++++++++---
 4 files changed, 116 insertions(+), 20 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 461fb3184966..cd924001e293 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -164,6 +164,7 @@ import {
     isPolicyAdmin as isPolicyAdminPolicyUtils,
     isPolicyAuditor,
     isPolicyOwner,
+    isRoomMemberProtectedByPolicyRole,
     isSubmitAndClose,
     isSubmitterApproveBlockedOnSubmitWorkspace,
     resolveCurrentTaxCode,
@@ -2824,14 +2825,18 @@ function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | string, rep
 }
 
 /**
- * Checks if a thread member is the submitter or manager of the thread's parent money request or invoice report.
- * These members keep access through the parent report, so removing them from the thread doesn't stick.
+ * Checks if a thread member keeps access through the thread's parent money request or invoice report, so removing them from the thread doesn't stick.
+ * That covers the parent report's submitter and current manager. On a workspace expense report it also covers workspace admins and approvers,
+ * because `managerID` only points at the current approver, and approvers who already approved earlier in the chain keep access too.
  */
-function isThreadMemberProtectedByParentReport(parentReport: OnyxInputOrEntry<Report>, accountID: number | undefined): boolean {
+function isThreadMemberProtectedByParentReport(parentReport: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>, login: string | undefined, accountID: number | undefined): boolean {
     if (!parentReport || accountID === undefined || (!isMoneyRequestReport(parentReport) && !isInvoiceReport(parentReport))) {
         return false;
     }
-    return accountID === parentReport.ownerAccountID || accountID === parentReport.managerID;
+    if (accountID === parentReport.ownerAccountID || accountID === parentReport.managerID) {
+        return true;
+    }
+    return isExpenseReport(parentReport) && isRoomMemberProtectedByPolicyRole(policy, login, accountID);
 }
 
 /**
diff --git a/src/pages/DynamicRoomMemberDetailsPage.tsx b/src/pages/DynamicRoomMemberDetailsPage.tsx
index 46e64ee024b5..35707d9655f7 100644
--- a/src/pages/DynamicRoomMemberDetailsPage.tsx
+++ b/src/pages/DynamicRoomMemberDetailsPage.tsx
@@ -50,7 +50,6 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     const StyleUtils = useStyleUtils();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const policy = usePolicy(report?.policyID);
-    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.ROOM_MEMBER_DETAILS.path);
     const {showConfirmModal} = useConfirmModal();
 
@@ -65,11 +64,15 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     // Check the selected member's own role on the policy, not the viewer's, and fail closed when their login is missing.
     // Kept in sync with the members list through the shared helper.
     const isSelectedMemberProtectedByPolicyRole = isRoomMemberProtectedByPolicyRole(policy, details.login, accountID);
+    // Select only the derived boolean so this page doesn't re-render on every unrelated change to the parent report.
+    const [isSelectedMemberProtectedByParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`, {
+        selector: (parentReport) => isThreadMemberProtectedByParentReport(parentReport, policy, details.login, accountID),
+    });
     const shouldDisableRemoveUser =
         (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) ||
         isSelectedMemberCurrentUser ||
         isSelectedMemberOwner ||
-        isThreadMemberProtectedByParentReport(parentReport, accountID);
+        !!isSelectedMemberProtectedByParentReport;
     const askForConfirmationToRemove = () => {
         showConfirmModal({
             buttonVariant: CONST.BUTTON_VARIANT.DANGER,
diff --git a/src/pages/DynamicRoomMembersPage.tsx b/src/pages/DynamicRoomMembersPage.tsx
index 06cbc68294f0..0710c73b1344 100644
--- a/src/pages/DynamicRoomMembersPage.tsx
+++ b/src/pages/DynamicRoomMembersPage.tsx
@@ -223,7 +223,7 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
                 accountID === session?.accountID ||
                 pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
                 details.accountID === report.ownerAccountID ||
-                isThreadMemberProtectedByParentReport(parentReport, accountID);
+                isThreadMemberProtectedByParentReport(parentReport, policy, details.login, accountID);
 
             result.push({
                 keyForList: String(accountID),
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 6fd25de1ee5f..2d5730fe2d15 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -1760,6 +1760,28 @@ describe('ReportUtils', () => {
         const senderAccountID = 1;
         const receiverAccountID = 2;
         const invitedAccountID = 3;
+        const adminAccountID = 4;
+        const previousApproverAccountID = 5;
+        const senderLogin = 'sender@test.com';
+        const adminLogin = 'admin@test.com';
+        const previousApproverLogin = 'previousapprover@test.com';
+        const currentApproverLogin = 'currentapprover@test.com';
+        const invitedLogin = 'invited@test.com';
+
+        // A workspace where the sender submits to the previous approver, who forwards to the current approver
+        const approvalChainPolicy: Policy = {
+            ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+            ownerAccountID: adminAccountID,
+            owner: adminLogin,
+            approver: undefined,
+            employeeList: {
+                [senderLogin]: {email: senderLogin, role: CONST.POLICY.ROLE.USER, submitsTo: previousApproverLogin},
+                [adminLogin]: {email: adminLogin, role: CONST.POLICY.ROLE.ADMIN},
+                [previousApproverLogin]: {email: previousApproverLogin, role: CONST.POLICY.ROLE.USER, forwardsTo: currentApproverLogin},
+                [currentApproverLogin]: {email: currentApproverLogin, role: CONST.POLICY.ROLE.USER},
+                [invitedLogin]: {email: invitedLogin, role: CONST.POLICY.ROLE.USER},
+            },
+        };
 
         it('should protect the sender and receiver of the parent IOU report', () => {
             // Given an IOU report where the sender owns the report and the receiver manages it
@@ -1772,8 +1794,8 @@ describe('ReportUtils', () => {
 
             // When checking whether they can be removed from one of the report's expense threads
             // Then both are protected, because they keep access through the IOU report and would be added back
-            expect(isThreadMemberProtectedByParentReport(iouReport, senderAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(iouReport, receiverAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, senderLogin, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, currentApproverLogin, receiverAccountID)).toBe(true);
         });
 
         it('should protect the submitter and current approver of the parent expense report', () => {
@@ -1787,37 +1809,103 @@ describe('ReportUtils', () => {
 
             // When checking whether they can be removed from one of the report's expense threads
             // Then both are protected
-            expect(isThreadMemberProtectedByParentReport(expenseReport, senderAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(expenseReport, receiverAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, senderLogin, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, currentApproverLogin, receiverAccountID)).toBe(true);
+        });
+
+        it('should protect workspace admins and earlier approvers of the parent expense report', () => {
+            // Given a workspace expense report that the previous approver already approved, so managerID now points at the current approver
+            const expenseReport: Report = {
+                ...createRandomReport(3, undefined),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether the admin or the previous approver can be removed from one of the report's expense threads
+            // Then both are protected, because they keep access to the expense report and would be added back
+            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, adminLogin, adminAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, previousApproverLogin, previousApproverAccountID)).toBe(true);
+        });
+
+        it('should protect the sender and receiver of the parent invoice report', () => {
+            // Given an invoice report where the sender owns the report and the receiver manages it
+            const invoiceReport: Report = {
+                ...createRandomReport(4, undefined),
+                type: CONST.REPORT.TYPE.INVOICE,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether they can be removed from one of the invoice's threads
+            // Then both are protected, because they keep access through the invoice report
+            expect(isThreadMemberProtectedByParentReport(invoiceReport, undefined, senderLogin, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(invoiceReport, undefined, currentApproverLogin, receiverAccountID)).toBe(true);
         });
 
         it('should not protect a member who was invited into the thread', () => {
-            // Given an IOU report that the invited member isn't part of
+            // Given an IOU report and an expense report that the invited member isn't part of
             const iouReport: Report = {
-                ...createRandomReport(3, undefined),
+                ...createRandomReport(5, undefined),
                 type: CONST.REPORT.TYPE.IOU,
                 ownerAccountID: senderAccountID,
                 managerID: receiverAccountID,
             };
+            const expenseReport: Report = {...iouReport, type: CONST.REPORT.TYPE.EXPENSE};
 
-            // When checking whether the invited member can be removed from the expense thread
+            // When checking whether the invited member can be removed from an expense thread
             // Then they aren't protected, so removing invited members keeps working
-            expect(isThreadMemberProtectedByParentReport(iouReport, invitedAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, invitedLogin, invitedAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, invitedLogin, invitedAccountID)).toBe(false);
         });
 
-        it('should not protect anyone when the parent is not a money request or invoice report', () => {
+        it('should not protect a workspace admin when the parent is an IOU report', () => {
+            // Given an IOU report, which has no workspace admins or approvers with access to it
+            const iouReport: Report = {
+                ...createRandomReport(6, undefined),
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking whether someone who is an admin on the thread's policy can be removed from the expense thread
+            // Then they aren't protected, because the policy role check only applies to workspace expense reports
+            expect(isThreadMemberProtectedByParentReport(iouReport, approvalChainPolicy, adminLogin, adminAccountID)).toBe(false);
+        });
+
+        it('should not protect anyone when the parent is a chat report', () => {
             // Given a chat report, which is the parent of regular comment threads
             const chatReport: Report = {
-                ...createRandomReport(4, undefined),
+                ...createRandomReport(7, undefined),
                 type: CONST.REPORT.TYPE.CHAT,
                 ownerAccountID: senderAccountID,
                 managerID: receiverAccountID,
             };
 
-            // When checking whether its members can be removed from a thread, or when the parent report is missing
+            // When checking whether its members can be removed from a thread
             // Then nobody is protected, so the existing room member rules still apply
-            expect(isThreadMemberProtectedByParentReport(chatReport, senderAccountID)).toBe(false);
-            expect(isThreadMemberProtectedByParentReport(undefined, senderAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(chatReport, approvalChainPolicy, senderLogin, senderAccountID)).toBe(false);
+        });
+
+        it('should not protect anyone when the parent report is missing', () => {
+            // Given a thread whose parent report isn't loaded
+            // When checking whether a member can be removed from the thread
+            // Then nobody is protected, so the existing room member rules still apply
+            expect(isThreadMemberProtectedByParentReport(undefined, approvalChainPolicy, senderLogin, senderAccountID)).toBe(false);
+        });
+
+        it('should not protect anyone when the accountID is missing', () => {
+            // Given an IOU report with a sender and a receiver
+            const iouReport: Report = {
+                ...createRandomReport(8, undefined),
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: senderAccountID,
+                managerID: receiverAccountID,
+            };
+
+            // When checking a member whose accountID is unknown
+            // Then they aren't protected, so an unknown member can't match a missing ownerAccountID or managerID
+            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, senderLogin, undefined)).toBe(false);
         });
     });
 

From 299da3f55fdeca6ad5e46c11f56c8b26e67372b8 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 03:10:42 +0430
Subject: [PATCH 225/781] Fix lint errors in MenuItem text selection tests

---
 .../ReportActionItem/MoneyRequestView.tsx     |  1 +
 .../components/MenuItem/MenuItemCopyTest.tsx  |  5 ++-
 .../components/MenuItem/MenuItemFieldTest.tsx | 42 ++++++++++++++++---
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 63f5ef4f9a2b..753a899f66bc 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1245,6 +1245,7 @@ function MoneyRequestView({
     const shouldShowReport = !!parentReportID || (isFromMergeTransaction && !!reportNameToDisplay);
     const reportCopyValue = reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
     const shouldShowCategoryAnalyzing = isCategoryBeingAnalyzed(updatedTransaction ?? transaction, transactionReport, policy);
+
     // In this case we want to use this value. The shouldUseNarrowLayout will always be true as this case is handled when we display ReportScreen in RHP.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
diff --git a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
index 0158a5c36555..e8f626d88c88 100644
--- a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
@@ -5,6 +5,7 @@ import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 
+import type * as CopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
 
 import Clipboard from '@libs/Clipboard';
@@ -68,11 +69,11 @@ jest.mock('@hooks/useResponsiveLayout', () => ({
 jest.mock('@libs/getPlatform', () => jest.fn());
 
 jest.mock('@hooks/useCopyableTextRowPress', () => {
-    const actual = jest.requireActual<typeof import('@hooks/useCopyableTextRowPress')>('@hooks/useCopyableTextRowPress');
+    const actual = jest.requireActual<typeof CopyableTextRowPress>('@hooks/useCopyableTextRowPress');
     return {...actual, __esModule: true, default: jest.fn(actual.default)};
 });
 
-const actualUseCopyableTextRowPress = jest.requireActual<typeof import('@hooks/useCopyableTextRowPress')>('@hooks/useCopyableTextRowPress').default;
+const actualUseCopyableTextRowPress = jest.requireActual<typeof CopyableTextRowPress>('@hooks/useCopyableTextRowPress').default;
 const mockedUseCopyableTextRowPress = jest.mocked(useCopyableTextRowPress);
 const mockedGetPlatform = jest.mocked(getPlatform);
 const mockedHasHoverSupport = jest.mocked(hasHoverSupport);
diff --git a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
index 0640f2c50c9b..bffd402809f4 100644
--- a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
@@ -83,7 +83,12 @@ describe('MenuItemField', () => {
                     [CONST.COPYABLE_TEXT_ELEMENT]: true,
                 }),
             );
-            expect(screen.getByText(NAME).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(NAME)).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
             expect(screen.getByText(NAME)).toHaveStyle({userSelect: 'none'});
             expect(screen.getByText(NAME)).toHaveProp(
                 'dataSet',
@@ -112,8 +117,18 @@ describe('MenuItemField', () => {
 
             // Then native text stays unmarked and ordinary row presses still work
             expect(screen.getByText(VALUE)).not.toHaveStyle({userSelect: 'text'});
-            expect(screen.getByText(VALUE).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
-            expect(screen.getByText(NAME).props.dataSet?.[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(VALUE)).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
+            expect(screen.getByText(NAME)).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
             fireEvent.press(await screen.findByLabelText(`${NAME}, ${VALUE}`), pressEvent);
             expect(onPress).toHaveBeenCalledTimes(1);
         });
@@ -141,7 +156,12 @@ describe('MenuItemField', () => {
                     [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
                 }),
             );
-            expect(screen.getByText(VALUE).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(VALUE)).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
         });
     });
 
@@ -204,8 +224,18 @@ describe('MenuItemField', () => {
 
             // Then the placeholder remains a label rather than a copyable value
             expect(screen.getByText(NAME)).toHaveStyle({userSelect: 'none'});
-            expect(screen.getByText(NAME).props.dataSet?.[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]).toBe(true);
-            expect(screen.getByText(NAME).props.dataSet?.[CONST.COPYABLE_TEXT_ELEMENT]).not.toBe(true);
+            expect(screen.getByText(NAME)).toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
+            expect(screen.getByText(NAME)).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
         });
 
         it.each([

From 731c5468b674707ce1a538de14d66769513fc841 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 1 Oct 2026 22:45:55 +0000
Subject: [PATCH 226/781] Fix: Apply oxfmt formatting to
 DynamicRoomMemberDetailsPage

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/pages/DynamicRoomMemberDetailsPage.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/DynamicRoomMemberDetailsPage.tsx b/src/pages/DynamicRoomMemberDetailsPage.tsx
index 35707d9655f7..3f04be1a2324 100644
--- a/src/pages/DynamicRoomMemberDetailsPage.tsx
+++ b/src/pages/DynamicRoomMemberDetailsPage.tsx
@@ -69,10 +69,7 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
         selector: (parentReport) => isThreadMemberProtectedByParentReport(parentReport, policy, details.login, accountID),
     });
     const shouldDisableRemoveUser =
-        (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) ||
-        isSelectedMemberCurrentUser ||
-        isSelectedMemberOwner ||
-        !!isSelectedMemberProtectedByParentReport;
+        (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) || isSelectedMemberCurrentUser || isSelectedMemberOwner || !!isSelectedMemberProtectedByParentReport;
     const askForConfirmationToRemove = () => {
         showConfirmModal({
             buttonVariant: CONST.BUTTON_VARIANT.DANGER,

From 593f42fe682dfcb9e22920d9d3554ba99d8f1e9c Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 2 Oct 2026 01:14:33 +0000
Subject: [PATCH 227/781] Use the composed Header and a memoized useOnyx
 selector on the vacation delegate form pages

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 .../Members/DomainMemberVacationDelegateFormPage.tsx     | 9 +++++----
 .../Profile/CustomStatus/VacationDelegateFormPage.tsx    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
index 785e932cf637..b6d802032c51 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import VacationDelegateForm from '@components/VacationDelegateForm';
 
@@ -22,7 +22,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 import {vacationDelegateSelector} from '@selectors/Domain';
-import React from 'react';
+import React, {useMemo} from 'react';
 
 type DomainMemberVacationDelegateFormPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
 
@@ -32,8 +32,9 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
 
     const {login: currentUserLogin} = useCurrentUserPersonalDetails();
 
+    const memberVacationDelegateSelector = useMemo(() => vacationDelegateSelector(accountID), [accountID]);
     const [vacationDelegate] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
-        selector: vacationDelegateSelector(accountID),
+        selector: memberVacationDelegateSelector,
     });
 
     const [personalDetails] = usePersonalDetail(accountID);
@@ -75,7 +76,7 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
                 testID="DomainMemberVacationDelegateFormPage"
                 shouldEnableMaxHeight
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('common.vacationDelegate')}
                     onBackButtonPress={goBack}
                 />
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
index 9d0d6545f77d..23167ce66e10 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import VacationDelegateForm from '@components/VacationDelegateForm';
 
@@ -108,7 +108,7 @@ function VacationDelegateFormPage() {
             testID="VacationDelegateFormPage"
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={translate('common.vacationDelegate')}
                 onBackButtonPress={goBack}
             />

From 179dc79fc7eab8a58588e05b1f99b2c1211fe26c Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 12:27:18 +0430
Subject: [PATCH 228/781] Make workspace member approver names selectable and
 exclude avatar text

---
 .../WorkspaceMembersTableRow.tsx              | 20 +++++++-----
 tests/ui/WorkspaceMembersTableTest.tsx        | 31 +++++++++++++++++++
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index 95206d069818..2dfbdb15c580 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -122,17 +122,23 @@ export default function WorkspaceMembersTableRow({
                         >
                             {!!item.approverDisplayName && !!item.approverAccountID && (
                                 <>
-                                    <AccountAvatar
-                                        accountID={item.approverAccountID}
-                                        accountEmail={item.approverLogin}
-                                        fallbackDisplayName={item.approverDisplayName}
-                                        size={CONST.AVATAR_SIZE.XXX_SMALL}
-                                        containerStyle={StyleUtils.getWidthAndHeightStyle(variables.avatarSizeXxxSmall)}
-                                    />
+                                    <View
+                                        style={styles.userSelectNone}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                    >
+                                        <AccountAvatar
+                                            accountID={item.approverAccountID}
+                                            accountEmail={item.approverLogin}
+                                            fallbackDisplayName={item.approverDisplayName}
+                                            size={CONST.AVATAR_SIZE.XXX_SMALL}
+                                            containerStyle={StyleUtils.getWidthAndHeightStyle(variables.avatarSizeXxxSmall)}
+                                        />
+                                    </View>
                                     <TextWithTooltip
                                         shouldShowTooltip
                                         numberOfLines={1}
                                         text={item.approverDisplayName}
+                                        isCopyable
                                     />
                                 </>
                             )}
diff --git a/tests/ui/WorkspaceMembersTableTest.tsx b/tests/ui/WorkspaceMembersTableTest.tsx
index 46772fa09c66..101c52a7fb8c 100644
--- a/tests/ui/WorkspaceMembersTableTest.tsx
+++ b/tests/ui/WorkspaceMembersTableTest.tsx
@@ -1,5 +1,6 @@
 import {act, fireEvent, render, screen} from '@testing-library/react-native';
 
+import AccountAvatar from '@components/Avatar/connected/AccountAvatar';
 import ComposeProviders from '@components/ComposeProviders';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import {ModalProvider} from '@components/Modal/Global/ModalContext';
@@ -85,6 +86,36 @@ describe('WorkspaceMembersTable', () => {
         });
     });
 
+    it('marks approver names as copyable and excludes member and approver avatars from selection', async () => {
+        // Given a member with an approver displayed in the wide table layout.
+        const member = buildMember({
+            keyForList: 'walter',
+            login: 'walter@example.com',
+            email: 'walter@example.com',
+            name: 'Walter',
+            accountID: 1,
+            approverAccountID: 10,
+            approverDisplayName: 'Ann Manager',
+        });
+        const tableRef = React.createRef<TableHandle<WorkspaceMemberRowData, WorkspaceMembersTableColumnKey, string>>();
+
+        // When the member row is rendered with the approver column visible.
+        renderTable([member], tableRef);
+        await waitForBatchedUpdatesWithAct();
+
+        // Then only the approver name is marked as selectable, while avatar text is excluded from copied content.
+        expect(screen.getByText('Ann Manager')).toHaveProp('selectable', true);
+        expect(screen.getByText('Ann Manager')).toHaveProp('dataSet', expect.objectContaining({[CONST.COPYABLE_TEXT_ELEMENT]: true}));
+        const avatars = screen.UNSAFE_getAllByType(AccountAvatar);
+        expect(avatars).toHaveLength(2);
+        for (const avatar of avatars) {
+            expect(avatar.parent?.props).toMatchObject({
+                style: {userSelect: 'none'},
+                dataSet: {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true},
+            });
+        }
+    });
+
     describe('approver sorting', () => {
         it('sorts members by their approver, with unapproved members last in both directions, and ties broken by member name', async () => {
             const members: WorkspaceMemberRowData[] = [

From f4b79ceca3d31724c4034aa5a0e8e769aec44187 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 2 Oct 2026 10:42:59 +0200
Subject: [PATCH 229/781] feat: Android tab bar on appBG with a soft top shadow
 instead of a tonal edge

---
 .../NativeTabBarShadow/index.ios.tsx          |  6 +++++
 .../NativeTabBarShadow/index.tsx              | 24 +++++++++++++++++++
 .../NativeTabNavigator/NativeTabLayout.tsx    |  2 ++
 .../useNativeTabBarOptions/index.ts           |  2 +-
 src/styles/index.ts                           | 11 +++++++++
 src/styles/theme/themes/dark.ts               |  1 +
 src/styles/theme/themes/light.ts              |  1 +
 src/styles/theme/types.ts                     |  1 +
 8 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.ios.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.ios.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.ios.tsx
new file mode 100644
index 000000000000..d3f248535c5b
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.ios.tsx
@@ -0,0 +1,6 @@
+/** UITabBar draws its own glass edge over the content. */
+function NativeTabBarShadow() {
+    return null;
+}
+
+export default NativeTabBarShadow;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx
new file mode 100644
index 000000000000..6a99823d730b
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx
@@ -0,0 +1,24 @@
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+
+/** Material's bar shares the screen's background, so a shadow along its top edge marks where the content ends. */
+function NativeTabBarShadow() {
+    const styles = useThemeStyles();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+
+    return (
+        <Animated.View
+            entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
+            exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
+            style={styles.androidNativeTabBarShadow(bottomInset)}
+            pointerEvents="none"
+        />
+    );
+}
+
+export default NativeTabBarShadow;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index 60de5f48e070..f2d380f1cabe 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -23,6 +23,7 @@ import React from 'react';
 import {View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
+import NativeTabBarShadow from './NativeTabBarShadow';
 import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
 
 type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
@@ -49,6 +50,7 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     return (
         <View style={styles.flex1}>
             {children}
+            {shouldShowNativeTabBar && <NativeTabBarShadow />}
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
                 // The buttons belong to the bar, so they fade with it rather than appearing in place. They leave
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
index 0ae89e4311b5..983ccf6a933c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -32,7 +32,7 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}:
         tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
         tabBarLabelVisibilityMode: 'labeled',
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.highlightBG},
+        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.appBG},
     };
 
     const getTabOptions = (name: keyof typeof NATIVE_TAB_ICONS): NativeBottomTabNavigationOptions => {
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 22823ad3a4a2..8959a151f370 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -6922,6 +6922,17 @@ const dynamicStyles = (theme: ThemeColors) =>
                 zIndex: 10,
             }) satisfies ViewStyle,
 
+        // Covers Material's bar and the gesture inset under it, and casts the shadow up over the screen content.
+        androidNativeTabBarShadow: (bottomInset: number) =>
+            ({
+                position: 'absolute',
+                right: 0,
+                bottom: 0,
+                left: 0,
+                height: variables.androidNativeTabBarHeight + bottomInset,
+                boxShadow: theme.androidTabBarShadow,
+            }) satisfies ViewStyle,
+
         getSplitListItemAmountStyle: (inputMarginLeft: number, amountWidth: number | string) => ({
             marginLeft: inputMarginLeft,
             width: amountWidth,
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 92281a8a91b3..0b7713364b01 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -61,6 +61,7 @@ const darkTheme = {
     floatingTabBarSelectedBG: 'rgba(26,61,50,0.50)',
     // selectedOptionBG (green700) at 40%
     androidTabBarActiveIndicatorBG: 'rgba(8,82,57,0.40)',
+    androidTabBarShadow: '0px -4px 12px 0px rgba(2,18,4,0.24)',
     heading: colors.productDark900,
     textLight: colors.productDark900,
     textDark: colors.productDark100,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 1960210b9bb5..534aaa23ae05 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -61,6 +61,7 @@ const lightTheme = {
     floatingTabBarSelectedBG: 'rgba(230,225,218,0.50)',
     // selectedOptionBG (green100) at 40%
     androidTabBarActiveIndicatorBG: 'rgba(177,242,214,0.40)',
+    androidTabBarShadow: '0px -4px 12px 0px rgba(2,18,4,0.06)',
     heading: colors.productLight900,
     textLight: colors.white,
     textDark: colors.productLight900,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 66a4ad6b832d..0c3aab949e1a 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -67,6 +67,7 @@ type ThemeColors = {
     sidebarHover: Color;
     floatingTabBarSelectedBG: Color;
     androidTabBarActiveIndicatorBG: Color;
+    androidTabBarShadow: Color;
     heading: Color;
     textLight: Color;
     textDark: Color;

From 3ba46958c56eafc54c4975ac645d6f72a8ebd727 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 14:21:26 +0430
Subject: [PATCH 230/781] Fix web Approver selection test and cover copied text
 excluding avatars

---
 tests/ui/WorkspaceMembersTableTest.tsx |  8 ++++--
 tests/unit/SelectionScraperTest.ts     | 38 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/tests/ui/WorkspaceMembersTableTest.tsx b/tests/ui/WorkspaceMembersTableTest.tsx
index 101c52a7fb8c..905670c92483 100644
--- a/tests/ui/WorkspaceMembersTableTest.tsx
+++ b/tests/ui/WorkspaceMembersTableTest.tsx
@@ -9,6 +9,7 @@ import ScreenWrapperStatusContext from '@components/ScreenWrapper/ScreenWrapperS
 import type {TableHandle} from '@components/Table';
 import type {WorkspaceMemberRowData, WorkspaceMembersTableColumnKey} from '@components/Tables/WorkspaceMembersTable';
 import WorkspaceMembersTable from '@components/Tables/WorkspaceMembersTable';
+import type * as TextWithTooltipModule from '@components/TextWithTooltip';
 
 import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
 
@@ -30,6 +31,9 @@ jest.mock('@hooks/useResponsiveLayout', () => ({
     default: jest.fn(() => ({shouldUseNarrowLayout: false, isSmallScreenWidth: false, isMediumScreenWidth: false})),
 }));
 
+// Jest resolves native modules by default; copyable text selection is a web-only feature.
+jest.mock('@components/TextWithTooltip', () => jest.requireActual<typeof TextWithTooltipModule>('@components/TextWithTooltip/index.tsx'));
+
 const SCREEN_WRAPPER_STATUS = {didScreenTransitionEnd: true, isSafeAreaTopPaddingApplied: true, isSafeAreaBottomPaddingApplied: true};
 
 function buildMember(overrides: Partial<WorkspaceMemberRowData> & Pick<WorkspaceMemberRowData, 'keyForList' | 'login' | 'name' | 'email' | 'accountID'>): WorkspaceMemberRowData {
@@ -86,7 +90,7 @@ describe('WorkspaceMembersTable', () => {
         });
     });
 
-    it('marks approver names as copyable and excludes member and approver avatars from selection', async () => {
+    it('marks approver names as copyable on web and excludes member and approver avatars from selection', async () => {
         // Given a member with an approver displayed in the wide table layout.
         const member = buildMember({
             keyForList: 'walter',
@@ -103,7 +107,7 @@ describe('WorkspaceMembersTable', () => {
         renderTable([member], tableRef);
         await waitForBatchedUpdatesWithAct();
 
-        // Then only the approver name is marked as selectable, while avatar text is excluded from copied content.
+        // Then the approver name is selectable, while avatar text is excluded from copied content.
         expect(screen.getByText('Ann Manager')).toHaveProp('selectable', true);
         expect(screen.getByText('Ann Manager')).toHaveProp('dataSet', expect.objectContaining({[CONST.COPYABLE_TEXT_ELEMENT]: true}));
         const avatars = screen.UNSAFE_getAllByType(AccountAvatar);
diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
index e8976d2cc758..c2f48bb90651 100644
--- a/tests/unit/SelectionScraperTest.ts
+++ b/tests/unit/SelectionScraperTest.ts
@@ -1,3 +1,4 @@
+import type * as ClipboardTextWebModule from '@libs/Clipboard/getClipboardText/index';
 import type * as SelectionScraperWebModule from '@libs/SelectionScraper/index';
 import installTransformedChildren from '@libs/SelectionScraper/installTransformedChildren';
 
@@ -8,6 +9,7 @@ import {Element, Text} from 'domhandler';
 // cspell:ignore mtext
 // Selection scraping only exists in the web implementation. The native variant always returns an empty string.
 const {default: SelectionScraper} = jest.requireActual<typeof SelectionScraperWebModule>('@libs/SelectionScraper/index.ts');
+const {default: getClipboardText} = jest.requireActual<typeof ClipboardTextWebModule>('@libs/Clipboard/getClipboardText/index.ts');
 
 const copyableRowAttribute = `data-${CONST.COPYABLE_ROW_ELEMENT}`;
 const copyableTextAttribute = `data-${CONST.COPYABLE_TEXT_ELEMENT}`;
@@ -94,6 +96,42 @@ describe('SelectionScraper', () => {
         expect(SelectionScraper.getCurrentSelection()).toBe('123');
     });
 
+    it.each([
+        {startOffset: 0, endOffset: 11, expectedText: 'Ann Manager'},
+        {startOffset: 0, endOffset: 3, expectedText: 'Ann'},
+    ])('preserves exactly "$expectedText" in the approver clipboard text', ({startOffset, endOffset, expectedText}) => {
+        // Given an approver cell whose avatar must not become part of the copied name.
+        createFixture(
+            `<div ${copyableRowAttribute}="true">` + `<span ${hiddenElementAttribute}="true">A</span>` + `<span id="approver" ${copyableTextAttribute}="true">Ann Manager</span>` + '</div>',
+        );
+
+        // When the user selects either the whole name or just its first word.
+        selectText(getTextNode('approver'), startOffset, getTextNode('approver'), endOffset);
+        const selectionHTML = SelectionScraper.getCurrentSelection();
+
+        // Then the clipboard payload preserves the exact selection, not the full field or avatar initial.
+        expect(selectionHTML).toBe(expectedText);
+        expect(getClipboardText(selectionHTML)).toBe(expectedText);
+    });
+
+    it('excludes approver avatar text when the selection range crosses the avatar', () => {
+        // Given an excluded avatar next to a copyable approver name in an interactive row.
+        createFixture(
+            `<div ${copyableRowAttribute}="true">` +
+                `<span id="approver-avatar" ${hiddenElementAttribute}="true">A</span>` +
+                `<span id="approver" ${copyableTextAttribute}="true">Ann Manager</span>` +
+                '</div>',
+        );
+
+        // When selection handles extend across the avatar as well as the name.
+        selectText(getTextNode('approver-avatar'), 0, getTextNode('approver'), 'Ann Manager'.length);
+        const selectionHTML = SelectionScraper.getCurrentSelection();
+
+        // Then the copied plain text and HTML exclude the avatar initial.
+        expect(selectionHTML).toBe('<span>Ann Manager</span>');
+        expect(getClipboardText(selectionHTML)).toBe('Ann Manager');
+    });
+
     it('preserves partial first and last cell boundaries in multi-row selections', () => {
         createFixture(`
             <div>

From 14c8df6b94e7c1e98945d37ca8c007662c4a7c33 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 14:44:15 +0430
Subject: [PATCH 231/781] Fix lint errors in Approver selection test fixtures

---
 tests/unit/SelectionScraperTest.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
index c2f48bb90651..0b8fd30a92fb 100644
--- a/tests/unit/SelectionScraperTest.ts
+++ b/tests/unit/SelectionScraperTest.ts
@@ -101,9 +101,7 @@ describe('SelectionScraper', () => {
         {startOffset: 0, endOffset: 3, expectedText: 'Ann'},
     ])('preserves exactly "$expectedText" in the approver clipboard text', ({startOffset, endOffset, expectedText}) => {
         // Given an approver cell whose avatar must not become part of the copied name.
-        createFixture(
-            `<div ${copyableRowAttribute}="true">` + `<span ${hiddenElementAttribute}="true">A</span>` + `<span id="approver" ${copyableTextAttribute}="true">Ann Manager</span>` + '</div>',
-        );
+        createFixture(`<div ${copyableRowAttribute}="true"><span ${hiddenElementAttribute}="true">A</span><span id="approver" ${copyableTextAttribute}="true">Ann Manager</span></div>`);
 
         // When the user selects either the whole name or just its first word.
         selectText(getTextNode('approver'), startOffset, getTextNode('approver'), endOffset);
@@ -117,10 +115,7 @@ describe('SelectionScraper', () => {
     it('excludes approver avatar text when the selection range crosses the avatar', () => {
         // Given an excluded avatar next to a copyable approver name in an interactive row.
         createFixture(
-            `<div ${copyableRowAttribute}="true">` +
-                `<span id="approver-avatar" ${hiddenElementAttribute}="true">A</span>` +
-                `<span id="approver" ${copyableTextAttribute}="true">Ann Manager</span>` +
-                '</div>',
+            `<div ${copyableRowAttribute}="true"><span id="approver-avatar" ${hiddenElementAttribute}="true">A</span><span id="approver" ${copyableTextAttribute}="true">Ann Manager</span></div>`,
         );
 
         // When selection handles extend across the avatar as well as the name.

From 75f34ea18ec110ef5e8c19bc896c0e64c025fb7d Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 2 Oct 2026 12:39:17 +0200
Subject: [PATCH 232/781] feat: float the mWeb tab bar over tab root content,
 inset list ends past it

---
 .../LHNOptionsList/LHNOptionsList.tsx         |  4 ++-
 .../index.native.tsx                          |  8 ++++++
 .../useTabBarContentInsetStyle/index.tsx      | 25 +++++++++++++++++++
 .../index.android.tsx                         | 21 ++++++++++++++++
 .../useTabRootScreenWrapperProps/index.tsx    |  9 +++++--
 .../SearchList/BaseSearchList/index.tsx       |  4 ++-
 src/pages/Insights/InsightsDashboard.tsx      |  7 ++++--
 src/pages/domain/DomainInitialPage.tsx        |  4 ++-
 src/pages/home/HomePage.tsx                   |  4 ++-
 src/pages/settings/InitialSettingsPage.tsx    |  4 ++-
 src/pages/workspace/WorkspaceInitialPage.tsx  |  4 ++-
 src/styles/index.ts                           |  9 +++++++
 12 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 9df8ac177a3a..391b907c3a54 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -1,3 +1,4 @@
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 
 import useNetwork from '@hooks/useNetwork';
@@ -45,6 +46,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const [personalDetails] = useAllPersonalDetails();
 
     const styles = useThemeStyles();
+    const contentContainerStyle = useTabBarContentInsetStyle(contentContainerStyles);
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
@@ -167,7 +169,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
                     CellRendererComponent={OptionRowRendererComponent}
-                    contentContainerStyle={StyleSheet.flatten(contentContainerStyles)}
+                    contentContainerStyle={StyleSheet.flatten(contentContainerStyle)}
                     data={data}
                     testID="lhn-options-list"
                     keyExtractor={keyExtractor}
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
new file mode 100644
index 000000000000..2a8564a9d097
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
@@ -0,0 +1,8 @@
+import type {StyleProp, ViewStyle} from 'react-native';
+
+/** UIKit insets the lists past the iOS tab bar, and Android reserves the bar's row below the content. */
+function useTabBarContentInsetStyle(style?: StyleProp<ViewStyle>): StyleProp<ViewStyle> {
+    return style;
+}
+
+export default useTabBarContentInsetStyle;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx
new file mode 100644
index 000000000000..5920674a1f49
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx
@@ -0,0 +1,25 @@
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+
+import variables from '@styles/variables';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+/**
+ * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
+ * room for the bar, letting its last row scroll out from under it. A list that already adds the bottom safe area
+ * passes `hasBottomSafeAreaPadding`, so the safe area is not added twice.
+ */
+function useTabBarContentInsetStyle(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): StyleProp<ViewStyle> {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const insetStyle = useBottomSafeSafeAreaPaddingStyle({
+        style,
+        addBottomSafeAreaPadding: !hasBottomSafeAreaPadding,
+        addOfflineIndicatorBottomSafeAreaPadding: false,
+        additionalPaddingBottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
+    });
+
+    return shouldUseNarrowLayout ? insetStyle : style;
+}
+
+export default useTabBarContentInsetStyle;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
new file mode 100644
index 000000000000..b632062f193f
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
@@ -0,0 +1,21 @@
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+import type TabRootScreenWrapperProps from './types';
+
+import TabBarBottomContent from '..';
+
+/** The ScreenWrapper props that keep a tab root screen's content clear of the tab bar. */
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+    const styles = useThemeStyles();
+
+    return {
+        bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
+        bottomContentStyle: styles.overflowVisible,
+    };
+}
+
+export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index b632062f193f..5621ca35e2fd 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -1,5 +1,6 @@
 import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
@@ -8,13 +9,17 @@ import type TabRootScreenWrapperProps from './types';
 
 import TabBarBottomContent from '..';
 
-/** The ScreenWrapper props that keep a tab root screen's content clear of the tab bar. */
+/**
+ * On narrow layouts the floating tab bar is laid over the bottom of a tab root screen, so the content runs under it
+ * down to the bottom edge of the screen. Each tab root's list ends with room for the bar.
+ */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
 
     return {
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
-        bottomContentStyle: styles.overflowVisible,
+        bottomContentStyle: shouldUseNarrowLayout ? styles.floatingTabBarOverlay : styles.overflowVisible,
     };
 }
 
diff --git a/src/components/Search/SearchList/BaseSearchList/index.tsx b/src/components/Search/SearchList/BaseSearchList/index.tsx
index 1fbb0c477c13..08a6cd4847e6 100644
--- a/src/components/Search/SearchList/BaseSearchList/index.tsx
+++ b/src/components/Search/SearchList/BaseSearchList/index.tsx
@@ -1,3 +1,4 @@
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
@@ -74,6 +75,7 @@ function BaseSearchList({
     disabledIndexes,
     overrideItemLayout,
 }: BaseSearchListProps) {
+    const tabBarInsetContentContainerStyle = useTabBarContentInsetStyle(contentContainerStyle);
     const hasKeyBeenPressed = useRef(false);
     const isFocused = useIsFocused();
     const {focusedCellId, isEditingCell} = useEditingCellState();
@@ -193,7 +195,7 @@ function BaseSearchList({
             CellRendererComponent={CellRendererComponent}
             removeClippedSubviews
             drawDistance={250}
-            contentContainerStyle={contentContainerStyle}
+            contentContainerStyle={tabBarInsetContentContainerStyle}
             maintainVisibleContentPosition={{disabled: true}}
             stickyHeaderIndices={stickyHeaderIndices}
             stickyHeaderConfig={stickyHeaderConfig}
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index a80c5ee14940..0c96b3583719 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,6 +1,7 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBar from '@components/Navigation/TopBar';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -64,6 +65,8 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
+    const emptyStateContentContainerStyle = useTabBarContentInsetStyle([styles.flexGrow1, styles.flexShrink0], true);
+    const contentContainerStyle = useTabBarContentInsetStyle([styles.flexGrow1, styles.ph5, styles.pb5], true);
 
     const didRequestFail = state === INSIGHTS_DASHBOARD_STATE.ERROR || state === INSIGHTS_DASHBOARD_STATE.STALE;
 
@@ -108,7 +111,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     if (state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES || state === INSIGHTS_DASHBOARD_STATE.EMPTY) {
         return (
             <ScrollView
-                contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}
+                contentContainerStyle={emptyStateContentContainerStyle}
                 // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
                 contentInsetAdjustmentBehavior="automatic"
                 addBottomSafeAreaPadding
@@ -126,7 +129,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
             style={styles.insightsDashboardScrollView}
             // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
             contentInsetAdjustmentBehavior="automatic"
-            contentContainerStyle={[styles.flexGrow1, styles.ph5, styles.pb5]}
+            contentContainerStyle={contentContainerStyle}
             addBottomSafeAreaPadding
         >
             <View style={styles.insightsDashboardLayout}>
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index 56ddb6722ac1..fb526a6e7c24 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -2,6 +2,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -44,6 +45,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
     const icons = useMemoizedLazyExpensifyIcons(DOMAIN_MENU_ICON_NAMES);
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
+    const contentContainerStyle = useTabBarContentInsetStyle(styles.flexColumn);
     const waitForNavigate = useWaitForNavigation();
     const {singleExecution, isExecuting} = useSingleExecution();
     const activeRoute = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -122,7 +124,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
                 />
 
                 <ScrollView
-                    contentContainerStyle={styles.flexColumn}
+                    contentContainerStyle={contentContainerStyle}
                     // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
                     contentInsetAdjustmentBehavior="automatic"
                 >
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index ac4e33e4f4f2..e32d114bbff8 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,5 +1,6 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBar from '@components/Navigation/TopBar';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
@@ -43,6 +44,7 @@ function HomePage() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.HOME);
+    const contentContainerStyle = useTabBarContentInsetStyle(styles.homePageContentContainer, true);
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
     const {isOffline} = useNetwork({onReconnect: openHomePage});
@@ -153,7 +155,7 @@ function HomePage() {
                         style={styles.homePageScrollView}
                         // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
                         contentInsetAdjustmentBehavior="automatic"
-                        contentContainerStyle={styles.homePageContentContainer}
+                        contentContainerStyle={contentContainerStyle}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index fd6a522b520a..19be41b5a75b 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -2,6 +2,7 @@ import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherButton from '@components/AccountSwitcherButton';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -52,6 +53,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.SETTINGS);
+    const contentContainerStyle = useTabBarContentInsetStyle(styles.w100);
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -187,7 +189,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 contentInsetAdjustmentBehavior="automatic"
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
-                contentContainerStyle={[styles.w100]}
+                contentContainerStyle={contentContainerStyle}
                 showsVerticalScrollIndicator={false}
             >
                 {headerContent}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 1f5e8b3e202e..0456e3fcc2cc 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -2,6 +2,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -69,6 +70,7 @@ function dismissError(policyID: string | undefined, pendingAction: PendingAction
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
+    const contentContainerStyle = useTabBarContentInsetStyle([styles.flexColumn, styles.pb14]);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
@@ -248,7 +250,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                 />
 
                 <ScrollView
-                    contentContainerStyle={[styles.flexColumn, styles.pb14]}
+                    contentContainerStyle={contentContainerStyle}
                     // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
                     contentInsetAdjustmentBehavior="automatic"
                 >
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8959a151f370..4f02a3b8a223 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -774,6 +774,15 @@ const staticStyles = (theme: ThemeColors) =>
             height: variables.androidNativeTabBarHeight,
         },
 
+        // Lays a tab root screen's copy of the floating bar over the bottom of its content.
+        floatingTabBarOverlay: {
+            position: 'absolute',
+            right: 0,
+            bottom: 0,
+            left: 0,
+            overflow: 'visible',
+        },
+
         // The gap between the floating bar and the bottom edge of the screen.
         floatingTabBarBottomInset: {
             paddingBottom: variables.floatingTabBarBottomInset,

From 1bf907c9b929f930ff1a2f42e1f82ad8bdcb4eb9 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 16:13:33 +0430
Subject: [PATCH 233/781] Make task search row values selectable and copyable

---
 .../ListItem/AvatarWithTextCell.tsx           |  46 +++++---
 .../SearchList/ListItem/TaskListItem.tsx      |   1 +
 .../SearchList/ListItem/TaskListItemRow.tsx   |  21 +++-
 .../ui/components/AvatarWithTextCellTest.tsx  |  70 ++++++++++++
 .../components/TaskListItemSelectionTest.tsx  | 107 ++++++++++++++++++
 5 files changed, 224 insertions(+), 21 deletions(-)
 create mode 100644 tests/ui/components/AvatarWithTextCellTest.tsx
 create mode 100644 tests/ui/components/TaskListItemSelectionTest.tsx

diff --git a/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx b/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
index 027256179a0f..074e3f42ad7b 100644
--- a/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
+++ b/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
@@ -3,6 +3,8 @@ import Text from '@components/Text';
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
+
 import CONST from '@src/CONST';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 
@@ -16,33 +18,47 @@ type AvatarWithTextCellProps = {
     icon?: Icon;
     isLargeScreenWidth?: boolean;
     textStyle?: StyleProp<TextStyle>;
+
+    /** Whether the text can be selected inside a copyable row */
+    isCopyable?: boolean;
 };
 
-function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle}: AvatarWithTextCellProps) {
+function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle, isCopyable = false}: AvatarWithTextCellProps) {
     const styles = useThemeStyles();
 
     if (!reportName || !icon) {
         return null;
     }
 
+    const avatar = (
+        <AvatarFromIcon
+            icon={icon}
+            size={CONST.AVATAR_SIZE.XXX_SMALL}
+            containerStyles={styles.pr2}
+        />
+    );
+
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter]}>
-            {!!icon && (
-                <AvatarFromIcon
-                    icon={icon}
-                    size={CONST.AVATAR_SIZE.XXX_SMALL}
-                    containerStyles={styles.pr2}
-                />
-            )}
-
-            {!!reportName && (
-                <Text
-                    numberOfLines={1}
-                    style={[textStyle ?? (isLargeScreenWidth ? styles.themeTextColor : styles.textMicroBold), styles.flexShrink1]}
+            {isCopyable ? (
+                <View
+                    style={styles.userSelectNone}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 >
-                    {reportName}
-                </Text>
+                    {avatar}
+                </View>
+            ) : (
+                avatar
             )}
+
+            <Text
+                numberOfLines={1}
+                style={[textStyle ?? (isLargeScreenWidth ? styles.themeTextColor : styles.textMicroBold), styles.flexShrink1]}
+                selectable={isCopyable ? true : undefined}
+                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+            >
+                {reportName}
+            </Text>
         </View>
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/TaskListItem.tsx b/src/components/Search/SearchList/ListItem/TaskListItem.tsx
index bda6e047162f..14289ab1fea2 100644
--- a/src/components/Search/SearchList/ListItem/TaskListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TaskListItem.tsx
@@ -76,6 +76,7 @@ function TaskListItem<TItem extends ListItem>({
     return (
         <ListItemComposed
             item={item}
+            shouldAllowTextSelection
             pressableStyle={listItemPressableStyle}
             containerStyle={!isLargeScreenWidth && styles.mb2}
             isFocused={isFocused}
diff --git a/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx b/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
index 34f096773046..db956e74ddba 100644
--- a/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
+++ b/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
@@ -63,6 +63,7 @@ function TitleCell({taskItem, showTooltip, isLargeScreenWidth}: TaskCellProps) {
             shouldShowTooltip={showTooltip}
             numberOfLines={2}
             style={[isLargeScreenWidth ? styles.lineHeightLarge : styles.lh20, styles.preWrap, styles.justifyContentCenter]}
+            isCopyable
         />
     );
 }
@@ -76,6 +77,7 @@ function DescriptionCell({taskItem, showTooltip, isLargeScreenWidth}: TaskCellPr
             text={taskItem.description}
             numberOfLines={2}
             style={[styles.lineHeightLarge, styles.preWrap, styles.justifyContentCenter, isLargeScreenWidth ? undefined : [styles.textMicro, styles.textSupporting]]}
+            isCopyable
         />
     );
 }
@@ -165,6 +167,7 @@ function TaskListItemRow({item, containerStyle, showTooltip}: TaskListItemRowPro
                                 reportName={item?.parentReportName}
                                 icon={item?.parentReportIcon}
                                 isLargeScreenWidth={isLargeScreenWidth}
+                                isCopyable
                             />
                         </View>
                     </View>
@@ -194,12 +197,17 @@ function TaskListItemRow({item, containerStyle, showTooltip}: TaskListItemRowPro
 
                     <View style={[styles.gap2, styles.alignItemsEnd]}>
                         {!!item.assignee.accountID && (
-                            <UserAvatar
-                                imageStyles={styles.alignSelfCenter}
-                                size={CONST.AVATAR_SIZE.XXX_SMALL}
-                                source={item.assignee.avatar}
-                                accountID={item.assignee.accountID}
-                            />
+                            <View
+                                style={styles.userSelectNone}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                            >
+                                <UserAvatar
+                                    imageStyles={styles.alignSelfCenter}
+                                    size={CONST.AVATAR_SIZE.XXX_SMALL}
+                                    source={item.assignee.avatar}
+                                    accountID={item.assignee.accountID}
+                                />
+                            </View>
                         )}
 
                         <DateCell
@@ -250,6 +258,7 @@ function TaskListItemRow({item, containerStyle, showTooltip}: TaskListItemRowPro
                         reportName={item?.parentReportName}
                         icon={item?.parentReportIcon}
                         isLargeScreenWidth={isLargeScreenWidth}
+                        isCopyable
                     />
                 </View>
                 <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ASSIGNEE)]}>
diff --git a/tests/ui/components/AvatarWithTextCellTest.tsx b/tests/ui/components/AvatarWithTextCellTest.tsx
new file mode 100644
index 000000000000..d3bf429ce467
--- /dev/null
+++ b/tests/ui/components/AvatarWithTextCellTest.tsx
@@ -0,0 +1,70 @@
+import {render, screen} from '@testing-library/react-native';
+
+import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
+import AvatarWithTextCell from '@components/Search/SearchList/ListItem/AvatarWithTextCell';
+
+import CONST from '@src/CONST';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import React from 'react';
+
+jest.mock('@components/Avatar/AvatarFromIcon', () => jest.fn(() => null));
+jest.mock('@hooks/useThemeStyles', () =>
+    jest.fn(() => ({
+        flexRow: {},
+        alignItemsCenter: {},
+        pr2: {},
+        userSelectNone: {userSelect: 'none'},
+        themeTextColor: {},
+        textMicroBold: {},
+        flexShrink1: {},
+    })),
+);
+
+const ICON: Icon = {
+    source: 'avatar.png',
+    type: CONST.ICON_TYPE_AVATAR,
+    name: 'Test user',
+    id: 1,
+};
+
+describe('AvatarWithTextCell', () => {
+    it('marks the text as copyable and excludes the avatar from copied content', () => {
+        // Given a shared chat value rendered in a copyable search row.
+        render(
+            <AvatarWithTextCell
+                reportName="Shared chat"
+                icon={ICON}
+                isLargeScreenWidth
+                isCopyable
+            />,
+        );
+
+        // When the copyable cell is rendered, then only its text participates in row copying.
+        expect(screen.getByText('Shared chat')).toHaveProp('selectable', true);
+        expect(screen.getByText('Shared chat')).toHaveProp('dataSet', expect.objectContaining({[CONST.COPYABLE_TEXT_ELEMENT]: true}));
+
+        const avatar = screen.UNSAFE_getByType(AvatarFromIcon);
+        expect(avatar.parent?.props).toMatchObject({
+            style: {userSelect: 'none'},
+            dataSet: {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true},
+        });
+    });
+
+    it('preserves the original non-copyable rendering for other callers', () => {
+        // Given a shared chat value whose caller did not opt into text selection.
+        render(
+            <AvatarWithTextCell
+                reportName="Shared chat"
+                icon={ICON}
+                isLargeScreenWidth
+            />,
+        );
+
+        // When the default cell is rendered, then neither the text nor avatar receives copy-specific behavior.
+        expect(screen.getByText('Shared chat')).not.toHaveProp('selectable', true);
+
+        const avatar = screen.UNSAFE_getByType(AvatarFromIcon);
+        expect(avatar.parent?.props).not.toMatchObject({dataSet: {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}});
+    });
+});
diff --git a/tests/ui/components/TaskListItemSelectionTest.tsx b/tests/ui/components/TaskListItemSelectionTest.tsx
new file mode 100644
index 000000000000..b2a36f165fbf
--- /dev/null
+++ b/tests/ui/components/TaskListItemSelectionTest.tsx
@@ -0,0 +1,107 @@
+import {render} from '@testing-library/react-native';
+
+import UserAvatar from '@components/Avatar/UserAvatar';
+import AvatarWithTextCell from '@components/Search/SearchList/ListItem/AvatarWithTextCell';
+import TaskListItem from '@components/Search/SearchList/ListItem/TaskListItem';
+import type {TaskListItemType} from '@components/Search/SearchList/ListItem/types';
+import ListItemComposed from '@components/SelectionList/ListItemComposed';
+import TextWithTooltip from '@components/TextWithTooltip';
+
+import CONST from '@src/CONST';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+
+let mockIsLargeScreenWidth = true;
+
+jest.mock('@components/Avatar/UserAvatar', () => jest.fn(() => null));
+jest.mock('@components/Badge', () => jest.fn(() => null));
+jest.mock('@components/Icon', () => jest.fn(() => null));
+jest.mock('@components/Search/SearchList/ListItem/AvatarWithTextCell', () => jest.fn(() => null));
+jest.mock('@components/Search/SearchList/ListItem/DateCell', () => jest.fn(() => null));
+jest.mock('@components/Search/SearchList/ListItem/UserInfoCell', () => jest.fn(() => null));
+jest.mock('@components/SelectionList/ListItemComposed', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/TextWithTooltip', () => jest.fn(() => null));
+
+jest.mock('@components/OnyxListItemProvider', () => ({useSession: () => ({accountID: 1})}));
+jest.mock('@components/Search/SearchSelectionProvider', () => ({useRowSelection: () => ({isSelected: false})}));
+jest.mock('@hooks/useHasOutstandingChildTask', () => jest.fn(() => false));
+jest.mock('@hooks/useLazyAsset', () => ({useMemoizedLazyExpensifyIcons: () => ({ArrowRightLong: 'arrow'})}));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined]));
+jest.mock('@hooks/useParentReport', () => jest.fn(() => undefined));
+jest.mock('@hooks/useParentReportAction', () => jest.fn(() => undefined));
+jest.mock('@hooks/useReportIsArchived', () => jest.fn(() => false));
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({isLargeScreenWidth: mockIsLargeScreenWidth})));
+jest.mock('@hooks/useStyleUtils', () => jest.fn(() => new Proxy({}, {get: () => () => ({})})));
+jest.mock('@hooks/useTheme', () => jest.fn(() => ({icon: '', reportStatusBadge: {paid: {backgroundColor: '', textColor: ''}}})));
+jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
+jest.mock('@libs/actions/Task', () => ({canActionTask: () => false, completeTask: jest.fn()}));
+jest.mock('@libs/Fullstory', () => ({__esModule: true, default: {getChatFSClass: () => ''}}));
+
+const TASK_ITEM = {
+    keyForList: 'task-1',
+    type: CONST.SEARCH.DATA_TYPES.TASK,
+    accountID: 1,
+    created: '2026-10-02 12:00:00',
+    description: 'Review the expense',
+    managerID: 2,
+    parentReportID: 'parent-1',
+    reportID: 'task-1',
+    reportName: 'Review expense',
+    stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+    statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+    assignee: {accountID: 2, avatar: 'assignee.png'},
+    createdBy: {accountID: 1, avatar: 'creator.png'},
+    formattedAssignee: 'Assignee',
+    formattedCreatedBy: 'Creator',
+    parentReportName: 'Shared chat',
+    parentReportIcon: {source: 'chat.png', type: CONST.ICON_TYPE_AVATAR, name: 'Shared chat', id: 3},
+    report: {reportID: 'task-1'},
+    shouldShowYear: false,
+} as TaskListItemType;
+
+const mockedListItemComposed = jest.mocked(ListItemComposed);
+const mockedTextWithTooltip = jest.mocked(TextWithTooltip);
+const mockedAvatarWithTextCell = jest.mocked(AvatarWithTextCell);
+
+function renderTaskItem() {
+    return render(
+        <TaskListItem
+            item={TASK_ITEM}
+            showTooltip={false}
+            onSelectRow={jest.fn()}
+        />,
+    );
+}
+
+describe('TaskListItem text selection', () => {
+    beforeEach(() => {
+        mockIsLargeScreenWidth = true;
+        jest.clearAllMocks();
+    });
+
+    it('enables copyable-row handling and marks the task title, description, and shared chat as copyable', () => {
+        // Given a task displayed in the wide search table.
+        renderTaskItem();
+
+        // When the row is rendered, then its press handling allows native selection for each copyable value.
+        expect(mockedListItemComposed).toHaveBeenCalledWith(expect.objectContaining({shouldAllowTextSelection: true}), undefined);
+        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review expense', isCopyable: true}), undefined);
+        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review the expense', isCopyable: true}), undefined);
+        expect(mockedAvatarWithTextCell).toHaveBeenCalledWith(expect.objectContaining({reportName: 'Shared chat', isCopyable: true}), undefined);
+    });
+
+    it('excludes the compact assignee avatar from copied content', () => {
+        // Given a task displayed in the narrow search layout.
+        mockIsLargeScreenWidth = false;
+
+        // When the row is rendered, then its avatar is hidden from copied text.
+        const {UNSAFE_getByType} = renderTaskItem();
+        const avatar = UNSAFE_getByType(UserAvatar);
+        expect(avatar.parent?.props).toMatchObject({
+            dataSet: {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true},
+        });
+    });
+});

From 5a7f85ffbea3d2c6fd8f1cc15efa970b794dd530 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 16:49:14 +0430
Subject: [PATCH 234/781] Fix TaskListItem selection test lint error

---
 tests/ui/components/TaskListItemSelectionTest.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ui/components/TaskListItemSelectionTest.tsx b/tests/ui/components/TaskListItemSelectionTest.tsx
index b2a36f165fbf..19a591c0e86a 100644
--- a/tests/ui/components/TaskListItemSelectionTest.tsx
+++ b/tests/ui/components/TaskListItemSelectionTest.tsx
@@ -98,8 +98,8 @@ describe('TaskListItem text selection', () => {
         mockIsLargeScreenWidth = false;
 
         // When the row is rendered, then its avatar is hidden from copied text.
-        const {UNSAFE_getByType} = renderTaskItem();
-        const avatar = UNSAFE_getByType(UserAvatar);
+        const renderResult = renderTaskItem();
+        const avatar = renderResult.UNSAFE_getByType(UserAvatar);
         expect(avatar.parent?.props).toMatchObject({
             dataSet: {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true},
         });

From 850404331ef4061c32bb1427dbcd3db8cf2602db Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Fri, 2 Oct 2026 17:39:02 +0430
Subject: [PATCH 235/781] fix: keep grouped expense header on one line when
 copied

---
 .../MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
index e29c10f8ca00..ea9f382675ba 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
@@ -114,10 +114,9 @@ function MoneyRequestReportGroupHeader({
                         style={[styles.textBold, textStyle, styles.flexShrink1, shouldShowCheckbox && shouldUseNarrowLayout && styles.ml2]}
                         numberOfLines={1}
                     >
-                        {displayName}
+                        <Text style={[styles.textBold, textStyle]}>{displayName}</Text>
+                        {` ${CONST.DOT_SEPARATOR} ${formattedAmount}`}
                     </Text>
-                    <Text style={[styles.textBold, textStyle, styles.mh1]}>{CONST.DOT_SEPARATOR}</Text>
-                    <Text style={[styles.textBold, textStyle]}>{formattedAmount}</Text>
                 </View>
             </View>
         </OfflineWithFeedback>

From 8cc11e5c47d99dc662f66eed2cd5b8fb3c8d483d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Musia=C5=82?= <jan.musial@swmansion.com>
Date: Fri, 2 Oct 2026 15:49:50 +0200
Subject: [PATCH 236/781] Fix -  Copilot-User is logged out after remove
 copilot then kill app and open again

---
 src/libs/Reauthentication.ts                  |  12 +-
 src/libs/actions/Delegate.ts                  | 173 ++++++++++++++----
 src/pages/settings/Copilot/CopilotPage.tsx    |  25 ++-
 .../Security/SecuritySettingsPage.tsx         |   8 +-
 tests/actions/DelegateTest.ts                 |  72 ++++++++
 tests/actions/SessionTest.ts                  |  37 ++++
 6 files changed, 282 insertions(+), 45 deletions(-)

diff --git a/src/libs/Reauthentication.ts b/src/libs/Reauthentication.ts
index 8d7afc5b2f4c..a691aa0f13b0 100644
--- a/src/libs/Reauthentication.ts
+++ b/src/libs/Reauthentication.ts
@@ -38,6 +38,7 @@ type Parameters = {
 let isAuthenticatingWithShortLivedToken = false;
 let isSupportAuthTokenUsed = false;
 let isSupportSession = false;
+let isDelegateTokenSession = false;
 
 type ReauthenticationResult = {
     wasSuccessful: boolean;
@@ -59,6 +60,7 @@ Onyx.connectWithoutView({
     callback: (value) => {
         isSupportAuthTokenUsed = !!value?.isSupportAuthTokenUsed;
         isSupportSession = value?.authTokenType === CONST.AUTH_TOKEN_TYPES.SUPPORT;
+        isDelegateTokenSession = value?.authTokenType === CONST.AUTH_TOKEN_TYPES.DELEGATE;
 
         Sentry.setUser({
             id: value?.accountID,
@@ -212,9 +214,13 @@ function reauthenticate(command = ''): Promise<ReauthenticationResult> {
 
     return hasReadRequiredDataFromStorage().then(() => {
         // While connected as a delegate, ONYXKEYS.CREDENTIALS is wiped by clearOnyxForDelegateTransition; the original user's creds live in stashedCredentials.
-        const isDelegate = isConnectedAsDelegate({
-            delegatedAccess: account?.delegatedAccess,
-        });
+        // ACCOUNT can lose the `delegate` field once the copilot's access is revoked, while SESSION still holds the revoked
+        // restricted token, so the token type also marks a delegate session. See Expensify/App#93458.
+        const isDelegate =
+            isDelegateTokenSession ||
+            isConnectedAsDelegate({
+                delegatedAccess: account?.delegatedAccess,
+            });
         const credentials = isDelegate ? stashedCredentials : getCredentials();
         const {partnerName, partnerPassword} = getPartnerCredentials(credentials?.autoGeneratedLogin);
 
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index e51bbde3128b..8f5bb04d934d 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -22,6 +22,7 @@ import type Credentials from '@src/types/onyx/Credentials';
 import type Session from '@src/types/onyx/Session';
 
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 
 import HybridAppModule from '@expensify/react-native-hybrid-app';
 import Onyx from 'react-native-onyx';
@@ -123,6 +124,25 @@ type WithActivePolicyID = {
 
 type DisconnectParams = WithStashedCredentials & WithStashedSession;
 
+const DISCONNECT_RESULT = {
+    /** The server ended the copilot session and the original session was restored with fresh tokens */
+    RESTORED: 'restored',
+
+    /** The server response was incomplete, so the original session was restored from the stash */
+    RESTORED_FROM_STASH: 'restoredFromStash',
+
+    /**
+     * The server ended the copilot session, but restoring the original session threw partway. SESSION is written first,
+     * so it most likely holds the original account already; if not, the next request reauthenticates with the stash.
+     */
+    RESTORE_INTERRUPTED: 'restoreInterrupted',
+
+    /** The request failed, so the copilot session is still active */
+    FAILED: 'failed',
+} as const;
+
+type DisconnectResult = ValueOf<typeof DISCONNECT_RESULT>;
+
 // Clear delegator-level errors
 type ClearDelegatorErrorsParams = WithDelegatedAccess;
 
@@ -261,7 +281,7 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
         });
 }
 
-function disconnect({stashedCredentials, stashedSession}: DisconnectParams) {
+function disconnect({stashedCredentials, stashedSession}: DisconnectParams): Promise<DisconnectResult> {
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -301,11 +321,11 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams) {
     ];
 
     // We need to access the authToken directly from the response to update the session
-    // The promise resolves to true only once the original session is fully restored, so callers can gate
-    // follow-up work that must run under the original user's identity (e.g. deleting the agent).
+    // The promise resolves to a DISCONNECT_RESULT once the flow settles, so callers can gate follow-up work that
+    // must run under the original user's identity (e.g. deleting the agent) on how the session was restored.
     // eslint-disable-next-line rulesdir/no-api-side-effects-method
-    return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.DISCONNECT_AS_DELEGATE, {}, {optimisticData, successData, failureData})
-        .then((response) => {
+    return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.DISCONNECT_AS_DELEGATE, {}, {optimisticData, successData, failureData}).then(
+        (response) => {
             const restoreToStashed = () =>
                 restoreDelegateSession({
                     authToken: stashedSession?.authToken,
@@ -317,37 +337,46 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams) {
                     creationDate: stashedSession?.creationDate,
                 });
 
-            if (!response?.authToken || !response?.encryptedAuthToken) {
-                Log.alert('[Delegate] No auth token returned while disconnecting as a delegate');
-                return restoreToStashed().then(() => false);
-            }
-
-            if (!response?.requesterID || !response?.requesterEmail) {
-                Log.alert('[Delegate] No requester data returned while disconnecting as a delegate');
-                return restoreToStashed().then(() => false);
-            }
+            const restoreOriginalSession = (): Promise<DisconnectResult> => {
+                if (!response?.authToken || !response?.encryptedAuthToken) {
+                    Log.alert('[Delegate] No auth token returned while disconnecting as a delegate');
+                    return restoreToStashed().then(() => DISCONNECT_RESULT.RESTORED_FROM_STASH);
+                }
 
-            clearPreservedSearchNavigatorStates();
+                if (!response?.requesterID || !response?.requesterEmail) {
+                    Log.alert('[Delegate] No requester data returned while disconnecting as a delegate');
+                    return restoreToStashed().then(() => DISCONNECT_RESULT.RESTORED_FROM_STASH);
+                }
 
-            const requesterEmail = response.requesterEmail;
-            const authToken = response.authToken;
-            return SequentialQueue.waitForIdle()
-                .then(() =>
-                    restoreDelegateSession({
-                        authToken,
-                        encryptedAuthToken: response.encryptedAuthToken,
-                        accountID: response.requesterID,
-                        email: requesterEmail,
-                        stashedCredentials,
-                        stashedSession,
-                    }),
-                )
-                .then(() => true);
-        })
-        .catch((error) => {
+                clearPreservedSearchNavigatorStates();
+
+                const requesterEmail = response.requesterEmail;
+                const authToken = response.authToken;
+                return SequentialQueue.waitForIdle()
+                    .then(() =>
+                        restoreDelegateSession({
+                            authToken,
+                            encryptedAuthToken: response.encryptedAuthToken,
+                            accountID: response.requesterID,
+                            email: requesterEmail,
+                            stashedCredentials,
+                            stashedSession,
+                        }),
+                    )
+                    .then(() => DISCONNECT_RESULT.RESTORED);
+            };
+
+            return restoreOriginalSession().catch((error) => {
+                Log.alert('[Delegate] Error restoring the original session after disconnecting as a delegate', {error});
+                return DISCONNECT_RESULT.RESTORE_INTERRUPTED;
+            });
+        },
+        // Only a failed request leaves the copilot session untouched; errors thrown while restoring are handled above
+        (error) => {
             Log.alert('[Delegate] Error disconnecting as a delegate', {error});
-            return false;
-        });
+            return DISCONNECT_RESULT.FAILED;
+        },
+    );
 }
 
 function clearDelegatorErrors({delegatedAccess}: ClearDelegatorErrorsParams) {
@@ -687,6 +716,82 @@ function removeDelegator({email, delegatedAccess}: RemoveDelegateParams) {
     });
 }
 
+type RemoveSelfAsDelegateParams = WithStashedCredentials &
+    WithStashedSession & {
+        /** Email of the delegator the copilot is currently acting as */
+        delegatorEmail: string;
+
+        /** Email of the acting copilot, whose row shows the error when the copilot session cannot be ended */
+        delegateEmail: string;
+    };
+
+/**
+ * Removes the acting copilot from the delegator's copilots. The original session is restored before the access is
+ * revoked: revoking first invalidates the restricted token the app is running on, and killing the app before the
+ * restore completes persists that revoked token in both NewDot and OldDot. See Expensify/App#93458.
+ */
+function removeSelfAsDelegate({delegatorEmail, delegateEmail, stashedCredentials, stashedSession}: RemoveSelfAsDelegateParams) {
+    return disconnect({stashedCredentials, stashedSession}).then((disconnectResult) => {
+        // Restoring from the stash still returns the copilot to their own account, so only a failed request blocks the removal
+        if (disconnectResult === DISCONNECT_RESULT.FAILED) {
+            Log.alert('[Delegate] Unable to restore the original session, skipping copilot removal');
+
+            // The copilot is still acting as the delegator, so the error goes on their own row in the delegator's copilots list
+            Onyx.merge(ONYXKEYS.ACCOUNT, {
+                delegatedAccess: {
+                    errorFields: {
+                        removeDelegate: {
+                            [delegateEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
+                        },
+                    },
+                },
+            });
+            return;
+        }
+
+        const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    delegatedAccess: {
+                        errorFields: {
+                            removeDelegator: {
+                                [delegatorEmail]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ];
+
+        const failureData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    delegatedAccess: {
+                        errorFields: {
+                            removeDelegator: {
+                                [delegatorEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
+                            },
+                        },
+                    },
+                },
+            },
+        ];
+
+        const parameters: APIRemoveDelegatorParams = {delegatorEmail};
+
+        // The delegators list of the restored account is not known here, so it is refreshed from the server once the removal is written
+        API.write(WRITE_COMMANDS.REMOVE_DELEGATOR, parameters, {
+            optimisticData,
+            failureData,
+        });
+        openSecuritySettingsPage();
+    });
+}
+
 function clearDelegateErrorsByField({email, fieldName, delegatedAccess}: ClearDelegateErrorsByFieldParams) {
     if (!delegatedAccess) {
         return;
@@ -887,6 +992,7 @@ function openSecuritySettingsPage() {
 
 export {
     KEYS_TO_PRESERVE_DELEGATE_ACCESS,
+    DISCONNECT_RESULT,
     connect,
     disconnect,
     clearDelegatorErrors,
@@ -897,6 +1003,7 @@ export {
     updateDelegateRole,
     removeDelegate,
     removeDelegator,
+    removeSelfAsDelegate,
     openSecuritySettingsPage,
     clearOnyxForDelegateTransition,
 };
diff --git a/src/pages/settings/Copilot/CopilotPage.tsx b/src/pages/settings/Copilot/CopilotPage.tsx
index 2907b2fbcbf5..2f0d99ce6fab 100644
--- a/src/pages/settings/Copilot/CopilotPage.tsx
+++ b/src/pages/settings/Copilot/CopilotPage.tsx
@@ -29,7 +29,7 @@ import useSearchResults from '@hooks/useSearchResults';
 import useSwitchToDelegator from '@hooks/useSwitchToDelegator';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {clearDelegateErrorsByField, openSecuritySettingsPage, removeDelegate, removeDelegator} from '@libs/actions/Delegate';
+import {clearDelegateErrorsByField, openSecuritySettingsPage, removeDelegate, removeDelegator, removeSelfAsDelegate} from '@libs/actions/Delegate';
 import {getLatestError} from '@libs/ErrorUtils';
 import getClickedTargetLocation from '@libs/getClickedTargetLocation';
 import Navigation from '@libs/Navigation/Navigation';
@@ -92,6 +92,8 @@ function CopilotPage() {
     const isAgentAccount = useIsAgentAccount();
     const actingDelegateEmail = account?.delegatedAccess?.delegate?.toLowerCase();
     const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [stashedCredentials = CONST.EMPTY_OBJECT] = useOnyx(ONYXKEYS.STASHED_CREDENTIALS);
+    const [stashedSession] = useOnyx(ONYXKEYS.STASHED_SESSION);
     const isUserValidated = account?.validated;
     const delegateButtonRef = useRef<HTMLDivElement | null>(null);
     const switchToDelegator = useSwitchToDelegator();
@@ -259,8 +261,9 @@ function CopilotPage() {
     const delegateMenuItems: MenuItemProps[] = useMemo(() => {
         return filteredDelegates.map(({email, role, pendingAction, pendingFields}) => {
             const personalDetail = personalDetailsByLogin[email.toLowerCase()];
-            const addDelegateErrors = errorFields?.addDelegate?.[email];
-            const error = getLatestError(addDelegateErrors);
+            const addDelegateError = getLatestError(errorFields?.addDelegate?.[email]);
+            const removeDelegateError = getLatestError(errorFields?.removeDelegate?.[email]);
+            const error = getLatestError({...addDelegateError, ...removeDelegateError});
             const isOwnerRow = isAgentAccount === true && !!actingDelegateEmail && email.toLowerCase() === actingDelegateEmail;
             const isPendingDelete = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
@@ -293,7 +296,10 @@ function CopilotPage() {
                 shouldShowRightIcon: !isOwnerRow && !isPendingDelete,
                 pendingAction,
                 shouldForceOpacity: !!pendingAction,
-                onPendingActionDismiss: () => clearDelegateErrorsByField({email, fieldName: 'addDelegate', delegatedAccess: account?.delegatedAccess}),
+                onPendingActionDismiss: () => {
+                    clearDelegateErrorsByField({email, fieldName: 'addDelegate', delegatedAccess: account?.delegatedAccess});
+                    clearDelegateErrorsByField({email, fieldName: 'removeDelegate', delegatedAccess: account?.delegatedAccess});
+                },
                 error,
                 disabled: isPendingDelete,
                 onPress: isOwnerRow ? undefined : onPress,
@@ -395,7 +401,16 @@ function CopilotPage() {
                                 showDelegateNoAccessModal();
                                 return;
                             }
-                            removeDelegate({email: selectedDelegate?.email ?? '', delegatedAccess: account?.delegatedAccess});
+                            if (selectedDelegate?.email === account?.delegatedAccess?.delegate && isActingAsDelegate) {
+                                removeSelfAsDelegate({
+                                    delegatorEmail: session?.email ?? '',
+                                    delegateEmail: selectedDelegate?.email ?? '',
+                                    stashedCredentials,
+                                    stashedSession,
+                                });
+                            } else {
+                                removeDelegate({email: selectedDelegate?.email ?? '', delegatedAccess: account?.delegatedAccess});
+                            }
                             setSelectedDelegate(undefined);
                         }
                     });
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index 4c4747a44ee4..5251fbcbdcc4 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -24,7 +24,7 @@ import useTwoFactorAuthRoute from '@hooks/useTwoFactorAuthRoute';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 
 import {deleteAgent} from '@libs/actions/Agent';
-import {disconnect, openSecuritySettingsPage} from '@libs/actions/Delegate';
+import {DISCONNECT_RESULT, disconnect, openSecuritySettingsPage} from '@libs/actions/Delegate';
 import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasDeviceManagementError} from '@libs/UserUtils';
@@ -226,11 +226,11 @@ function SecuritySettingsPage() {
                     // The DeleteAgent command must be issued by the agent's owner, but while copiloting the session is
                     // authenticated as the agent itself. So capture the agent's identity, end the copilot session
                     // (which restores the owner's session and auth token), and only then delete the agent as the
-                    // owner. If the disconnect fails the owner's session was never restored, so skip the delete.
+                    // owner. Unless the server ended the session and restored the owner with fresh tokens, skip the delete.
                     const agentAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
                     const agentLogin = currentUserPersonalDetails.login;
-                    const didDisconnect = await disconnect({stashedCredentials, stashedSession});
-                    if (!didDisconnect) {
+                    const disconnectResult = await disconnect({stashedCredentials, stashedSession});
+                    if (disconnectResult !== DISCONNECT_RESULT.RESTORED) {
                         return;
                     }
                     deleteAgent(agentAccountID, agentLogin, allPolicies, false);
diff --git a/tests/actions/DelegateTest.ts b/tests/actions/DelegateTest.ts
index 9311bc06435b..0ef1e829cf0c 100644
--- a/tests/actions/DelegateTest.ts
+++ b/tests/actions/DelegateTest.ts
@@ -6,8 +6,11 @@ import {
     connect,
     isConnectedAsDelegate,
     removeDelegate,
+    removeSelfAsDelegate,
     updateDelegateRole,
 } from '@libs/actions/Delegate';
+import * as API from '@libs/API';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import DateUtils from '@libs/DateUtils';
 import {pause, resetQueue} from '@libs/Network/SequentialQueue';
 
@@ -308,6 +311,75 @@ describe('actions/Delegate', () => {
         });
     });
 
+    // Each case stubs every API method the disconnect and removal flow calls, which this rule counts as chained API calls
+    /* eslint-disable rulesdir/no-multiple-api-calls */
+    describe('removeSelfAsDelegate', () => {
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
+        it.each([
+            [
+                'removes the copilot access once the server restores the original session',
+                {authToken: 'copilotRefreshedToken', encryptedAuthToken: 'encrypted', requesterID: 2, requesterEmail: 'copilot@test.com'},
+                false,
+                true,
+                {email: 'copilot@test.com', authToken: 'copilotRefreshedToken'},
+            ],
+            [
+                'removes the copilot access when restoring the original session is interrupted after SESSION was written',
+                {authToken: 'copilotRefreshedToken', encryptedAuthToken: 'encrypted', requesterID: 2, requesterEmail: 'copilot@test.com'},
+                true,
+                true,
+                {email: 'copilot@test.com', authToken: 'copilotRefreshedToken'},
+            ],
+            [
+                'removes the copilot access once the original session is restored from the stash',
+                {authToken: undefined, encryptedAuthToken: undefined, requesterID: undefined, requesterEmail: undefined},
+                false,
+                true,
+                {email: 'copilot@test.com', authToken: 'copilotAuthToken'},
+            ],
+            [
+                'keeps the copilot access and shows an error when the original session could not be restored',
+                new Error('Network error'),
+                false,
+                false,
+                {email: 'delegator@test.com', authToken: 'restrictedToken'},
+            ],
+        ])('%s', async (_description, disconnectResponse, shouldOpenAppFail, shouldRemoveDelegator, expectedSession) => {
+            // Given a copilot acting as the delegator, with their own session and login stashed
+            const stashedSession = {authToken: 'copilotAuthToken', email: 'copilot@test.com', accountID: 2};
+            const stashedCredentials = {autoGeneratedLogin: 'copilotLogin', autoGeneratedPassword: 'copilotPassword'};
+            await Onyx.set(ONYXKEYS.SESSION, {authToken: 'restrictedToken', email: 'delegator@test.com', accountID: 1, authTokenType: CONST.AUTH_TOKEN_TYPES.DELEGATE});
+            jest.spyOn(API, 'makeRequestWithSideEffects').mockImplementation(() =>
+                disconnectResponse instanceof Error ? Promise.reject(disconnectResponse) : Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS, ...disconnectResponse}),
+            );
+            jest.spyOn(API, 'writeWithNoDuplicatesOpenAppConflictAction').mockImplementation(() => (shouldOpenAppFail ? Promise.reject(new Error('OpenApp failed')) : Promise.resolve()));
+            const writeSpy = jest.spyOn(API, 'write').mockResolvedValue(undefined);
+            const readSpy = jest.spyOn(API, 'read').mockImplementation(() => {});
+
+            // When the copilot removes themselves from the delegator's copilots
+            await removeSelfAsDelegate({delegatorEmail: 'delegator@test.com', delegateEmail: 'copilot@test.com', stashedCredentials, stashedSession});
+            await waitForBatchedUpdates();
+
+            // Then the access is revoked as the copilot only once they are back on their own account, so the app never runs on a revoked token
+            const removeDelegatorCalls = writeSpy.mock.calls.filter(([command]) => command === WRITE_COMMANDS.REMOVE_DELEGATOR);
+            expect(removeDelegatorCalls).toHaveLength(shouldRemoveDelegator ? 1 : 0);
+            await expect(getOnyxValue(ONYXKEYS.SESSION)).resolves.toEqual(expect.objectContaining(expectedSession));
+            if (shouldRemoveDelegator) {
+                expect(removeDelegatorCalls.at(0)?.at(1)).toEqual({delegatorEmail: 'delegator@test.com'});
+                expect(readSpy).toHaveBeenCalledWith(READ_COMMANDS.OPEN_SECURITY_SETTINGS_PAGE, null);
+                return;
+            }
+
+            // And a failed restore leaves the copilot on the delegator's account with an error on their own row
+            const account = await getOnyxValue(ONYXKEYS.ACCOUNT);
+            expect(account?.delegatedAccess?.errorFields?.removeDelegate?.['copilot@test.com']).toBeDefined();
+        });
+    });
+    /* eslint-enable rulesdir/no-multiple-api-calls */
+
     describe('clearOnyxForDelegateTransition', () => {
         it('keeps IS_LOADING_APP=true after the clear so DelegateAccessHandler does not see HAS_LOADED_APP=true && IS_LOADING_APP=undefined and fire a duplicate openApp', async () => {
             // Simulate the pre-switch state: app is fully loaded with the previous account.
diff --git a/tests/actions/SessionTest.ts b/tests/actions/SessionTest.ts
index 5224aad1eb08..0cc88a7b3577 100644
--- a/tests/actions/SessionTest.ts
+++ b/tests/actions/SessionTest.ts
@@ -3,6 +3,7 @@
 import {beforeEach, jest, test} from '@jest/globals';
 
 import {openApp, reconnectApp} from '@libs/actions/App';
+import * as DelegateActions from '@libs/actions/Delegate';
 import OnyxUpdateManager from '@libs/actions/OnyxUpdateManager';
 import {getAll as getAllPersistedRequests} from '@libs/actions/PersistedRequests';
 import {initReconnect} from '@libs/actions/Reconnect';
@@ -143,6 +144,42 @@ describe('Session', () => {
         redirectToSignInSpy.mockRestore();
     });
 
+    test('reauthenticate restores the original account with the stashed credentials when the delegate field is gone but SESSION still holds a delegate token', async () => {
+        // Given a copilot whose access was revoked: SESSION still holds the delegator's restricted token, ACCOUNT no longer
+        // has the `delegate` field, CREDENTIALS were wiped on connect and the copilot's own login lives only in the stash
+        const stashedCredentials = {login: 'copilot@expensify.com', autoGeneratedLogin: 'copilotAutoLogin', autoGeneratedPassword: 'copilotAutoPassword'};
+        await Onyx.multiSet({
+            [ONYXKEYS.SESSION]: {email: 'delegator@expensify.com', accountID: 1, authToken: 'revokedRestrictedToken', authTokenType: CONST.AUTH_TOKEN_TYPES.DELEGATE},
+            [ONYXKEYS.STASHED_CREDENTIALS]: stashedCredentials,
+            [ONYXKEYS.STASHED_SESSION]: {email: 'copilot@expensify.com', accountID: 2, authToken: 'copilotAuthToken'},
+            [ONYXKEYS.ACCOUNT]: {delegatedAccess: {delegates: []}},
+        });
+        await waitForBatchedUpdates();
+
+        const redirectToSignInSpy = jest.spyOn(SignInRedirect, 'default').mockImplementation(() => Promise.resolve());
+        const restoreDelegateSessionSpy = jest.spyOn(DelegateActions, 'restoreDelegateSession').mockResolvedValue(undefined);
+        jest.mocked(HttpUtils.xhr)
+            .mockClear()
+            .mockImplementationOnce(() => Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS, accountID: 2, authToken: 'copilotRefreshedToken', email: 'copilot@expensify.com'}));
+
+        // When the revoked token triggers reauthentication
+        const result = await reauthenticate('TestCommand');
+        await waitForBatchedUpdates();
+
+        // Then it authenticates with the copilot's stashed login and restores their account instead of signing out
+        expect(redirectToSignInSpy).not.toHaveBeenCalled();
+        expect(jest.mocked(HttpUtils.xhr).mock.calls.at(0)?.at(0)).toBe('Authenticate');
+        expect(jest.mocked(HttpUtils.xhr).mock.calls.at(0)?.at(1)).toEqual(expect.objectContaining({partnerUserID: stashedCredentials.autoGeneratedLogin}));
+        expect(restoreDelegateSessionSpy).toHaveBeenCalledWith(
+            expect.objectContaining({authToken: 'copilotRefreshedToken', accountID: 2, email: 'copilot@expensify.com', stashedCredentials}),
+        );
+        expect(result).toEqual({wasSuccessful: false, didRestoreOriginalSession: true});
+
+        redirectToSignInSpy.mockRestore();
+        restoreDelegateSessionSpy.mockRestore();
+        NetworkStore.setIsAuthenticating(false);
+    });
+
     test('reauthenticate aborts when RAM_ONLY_IS_AUTHENTICATING_WITH_SHORT_LIVED_TOKEN is true', async () => {
         // Given a SignIn with short lived token is currently in flight
         await Onyx.set(ONYXKEYS.RAM_ONLY_IS_AUTHENTICATING_WITH_SHORT_LIVED_TOKEN, true);

From 5ab9968cde6271c0a0428e9764ebceb4fbaec50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Musia=C5=82?= <jan.musial@swmansion.com>
Date: Fri, 2 Oct 2026 17:24:43 +0200
Subject: [PATCH 237/781] fix stalled switch on Android

---
 src/libs/actions/Delegate.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 8f5bb04d934d..0ec8f4b40134 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -969,8 +969,13 @@ function restoreDelegateSession({authToken, encryptedAuthToken, accountID, email
                 return openApp();
             })
             // Reinitialize Pusher for the restored account so realtime updates resume on the correct session.
-            .then(() => requestPusherReinitialize({accountID, email}))
             .then(() => {
+                // Not awaited: Pusher.init only resolves once the socket reports connected, which can stall right after the
+                // disconnect above (on Android), and the account switch below must not wait on it. See Expensify/App#93458.
+                requestPusherReinitialize({accountID, email}).catch((error: unknown) => {
+                    Log.hmmm('[Delegate] Failed to reinitialize Pusher after restoring the original session', {error: ErrorUtils.getErrorMessage(error)});
+                });
+
                 // Sync the account switch to the classic mobile app experience of HybridApp; otherwise the
                 // two experiences disagree about which account is active after a reauth-driven restoration.
                 if (!CONFIG.IS_HYBRID_APP || !email || !authToken) {

From d9de250a6e4ede594070e80c32c2f8a0d4e2c4e3 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 10:58:36 +0430
Subject: [PATCH 238/781] fix: apply mutually exclusive text selection datasets

---
 .../content/base/BaseMenuItemPrimaryText.tsx     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx b/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
index f5369cf9d8c9..d6968be987f1 100644
--- a/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
+++ b/src/components/MenuItem/leaves/content/base/BaseMenuItemPrimaryText.tsx
@@ -18,7 +18,14 @@ import type {BaseMenuItemTextProps, MenuItemPrimaryTextProps} from './types';
 function BaseMenuItemPrimaryText({children, accessibilityLabel, numberOfLines = 1, isSelectable = false, slot, style}: MenuItemPrimaryTextProps & BaseMenuItemTextProps) {
     const styles = useThemeStyles();
     const {isDisabled, isInteractive} = useMenuItemConfig();
-    const shouldAllowTextSelection = isSelectable && getPlatform() === CONST.PLATFORM.WEB && !(isInteractive && isDisabled);
+    const shouldHideTextFromSelection = isInteractive && isDisabled;
+    const shouldAllowTextSelection = isSelectable && getPlatform() === CONST.PLATFORM.WEB && !shouldHideTextFromSelection;
+    let selectionDataSet: React.ComponentProps<typeof Text>['dataSet'];
+    if (shouldHideTextFromSelection) {
+        selectionDataSet = {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true};
+    } else if (shouldAllowTextSelection) {
+        selectionDataSet = COPYABLE_TEXT_DATA_SET;
+    }
 
     useMenuItemAccessibilityLabel(slot, accessibilityLabel ?? String(children));
 
@@ -28,17 +35,14 @@ function BaseMenuItemPrimaryText({children, accessibilityLabel, numberOfLines =
                 styles.flexShrink1,
                 styles.popoverMenuText,
                 numberOfLines === 1 ? styles.pre : styles.preWrap,
-                isInteractive && isDisabled && styles.userSelectNone,
+                shouldHideTextFromSelection && styles.userSelectNone,
                 shouldAllowTextSelection && styles.userSelectText,
                 styles.ltr,
                 styles.mw100,
                 style,
             ]}
             numberOfLines={numberOfLines}
-            dataSet={{
-                [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: isInteractive && isDisabled,
-                ...(shouldAllowTextSelection ? COPYABLE_TEXT_DATA_SET : {}),
-            }}
+            dataSet={selectionDataSet}
         >
             {typeof children === 'string' ? convertToLTR(children) : children}
         </Text>

From 8ac9d5da87613dc46c89b53e3090f603403416ec Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 11:09:14 +0430
Subject: [PATCH 239/781] revert: restore separate grouped expense header
 values

---
 .../MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
index ea9f382675ba..e29c10f8ca00 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx
@@ -114,9 +114,10 @@ function MoneyRequestReportGroupHeader({
                         style={[styles.textBold, textStyle, styles.flexShrink1, shouldShowCheckbox && shouldUseNarrowLayout && styles.ml2]}
                         numberOfLines={1}
                     >
-                        <Text style={[styles.textBold, textStyle]}>{displayName}</Text>
-                        {` ${CONST.DOT_SEPARATOR} ${formattedAmount}`}
+                        {displayName}
                     </Text>
+                    <Text style={[styles.textBold, textStyle, styles.mh1]}>{CONST.DOT_SEPARATOR}</Text>
+                    <Text style={[styles.textBold, textStyle]}>{formattedAmount}</Text>
                 </View>
             </View>
         </OfflineWithFeedback>

From 3db0df9be3044d60c9599022f4c9bdb8e6a1d540 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 14:45:10 +0430
Subject: [PATCH 240/781] fix: make report field values selectable and preserve
 copy spacing

---
 src/CONST/index.ts                            |  1 +
 .../MoneyRequestViewReportFields.tsx          | 19 +++-
 .../ReportActionItem/MoneyReportView.tsx      | 97 +++++++++++--------
 src/libs/SelectionScraper/index.native.ts     |  3 +-
 src/libs/SelectionScraper/index.ts            | 23 +++--
 tests/ui/MoneyReportViewTest.tsx              | 15 ++-
 tests/unit/SelectionScraperTest.ts            | 21 ++++
 7 files changed, 121 insertions(+), 58 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 38b1cc524489..257e49201875 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6573,6 +6573,7 @@ const CONST = {
     INNER_BOX_SHADOW_ELEMENT: 'inner-box-shadow-element',
     COPYABLE_TEXT_ELEMENT: 'copyable-text',
     COPYABLE_ROW_ELEMENT: 'copyable-row',
+    COPYABLE_ROW_CONTINUATION_ELEMENT: 'copyable-row-continuation',
     MODERATION: {
         MODERATOR_DECISION_PENDING: 'pending',
         MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',
diff --git a/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx b/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
index 2bb4bd1aacee..089be5cf6c0a 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
@@ -9,6 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {clearReportFieldKeyErrors} from '@libs/actions/Report';
 import {resolveReportFieldValue} from '@libs/Formula';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import getPlatform from '@libs/getPlatform';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {
@@ -21,6 +22,7 @@ import {
     shouldDisplayReportFields as shouldDisplayReportFieldsUtils,
     shouldHideSingleReportField,
 } from '@libs/ReportUtils';
+import {COPYABLE_ROW_CONTINUATION_DATA_SET} from '@libs/SelectionScraper';
 
 import type {ThemeStyles} from '@styles/index';
 
@@ -65,6 +67,7 @@ function ReportFieldView(reportField: EnrichedPolicyReportField, report: OnyxEnt
         >
             <MenuItemWithTopDescription
                 description={Str.UCFirst(reportField.name)}
+                descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                 title={reportField.fieldValue}
                 onPress={() => {
                     if (!report?.policyID) {
@@ -81,6 +84,10 @@ function ReportFieldView(reportField: EnrichedPolicyReportField, report: OnyxEnt
                 titleWithTooltips={[]}
                 brickRoadIndicator={reportField.violation ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                 errorText={reportField.violationTranslation}
+                errorTextStyle={styles.userSelectNone}
+                copyValue={reportField.fieldValue || undefined}
+                copyable={reportField.isFieldDisabled && !!reportField.fieldValue}
+                isTitleSelectable={!!reportField.fieldValue}
             />
         </OfflineWithFeedback>
     );
@@ -91,6 +98,7 @@ function MoneyRequestViewReportFields({report, policy, pendingAction}: MoneyRequ
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(report?.reportID)}`);
     const {getCurrencyDecimals} = useCurrencyListActions();
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const shouldUseCopyableRowContinuation = getPlatform(true) === CONST.PLATFORM.WEB;
 
     const sortedPolicyReportFields = useMemo<EnrichedPolicyReportField[]>((): EnrichedPolicyReportField[] => {
         const {fieldValues, fieldsByName} = getReportFieldMaps(report, policy?.fieldList ?? {}, reportNameValuePairs);
@@ -130,9 +138,14 @@ function MoneyRequestViewReportFields({report, policy, pendingAction}: MoneyRequ
 
     return (
         <View style={styles.mb3}>
-            {sortedPolicyReportFields.map((reportField) => {
-                return ReportFieldView(reportField, report, styles, pendingAction);
-            })}
+            <View
+                style={styles.dContents}
+                dataSet={shouldUseCopyableRowContinuation ? COPYABLE_ROW_CONTINUATION_DATA_SET : undefined}
+            >
+                {sortedPolicyReportFields.map((reportField) => {
+                    return ReportFieldView(reportField, report, styles, pendingAction);
+                })}
+            </View>
         </View>
     );
 }
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 07d679851ffa..dd8ad6c90efe 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -19,6 +19,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {resolveReportFieldValue} from '@libs/Formula';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import getPlatform from '@libs/getPlatform';
 import {isSingleTransactionReport} from '@libs/MoneyRequestReportUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -38,12 +39,14 @@ import {
     shouldDisplayReportFields as shouldDisplayReportFieldsUtils,
     shouldHideSingleReportField,
 } from '@libs/ReportUtils';
+import {COPYABLE_ROW_CONTINUATION_DATA_SET} from '@libs/SelectionScraper';
 import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import AnimatedEmptyStateBackground from '@pages/inbox/report/AnimatedEmptyStateBackground';
 
 import {fontScale} from '@styles/typography';
 
+import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import {clearReportFieldKeyErrors} from '@src/libs/actions/Report';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -102,6 +105,7 @@ function MoneyReportView({
     const {convertToDisplayString, getCurrencyDecimals} = useCurrencyListActions();
     const {isOffline} = useNetwork();
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const shouldUseCopyableRowContinuation = getPlatform(true) === CONST.PLATFORM.WEB;
     const isSettled = isSettledReportUtils(report?.reportID);
     const isTotalUpdated = hasUpdatedTotal(report, policy) && !isTotalPending;
 
@@ -174,51 +178,62 @@ function MoneyReportView({
                 {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
                 {!isClosedExpenseReportWithNoExpenses && (
                     <>
-                        {shouldDisplayReportFields &&
-                            (!isCombinedReport || !isOnlyTitleFieldEnabled) &&
-                            sortedPolicyReportFields.map((reportField) => {
-                                if (shouldHideSingleReportField(reportField)) {
-                                    return null;
-                                }
+                        {shouldDisplayReportFields && (!isCombinedReport || !isOnlyTitleFieldEnabled) && (
+                            <View
+                                style={styles.dContents}
+                                dataSet={shouldUseCopyableRowContinuation ? COPYABLE_ROW_CONTINUATION_DATA_SET : undefined}
+                            >
+                                {sortedPolicyReportFields.map((reportField) => {
+                                    if (shouldHideSingleReportField(reportField)) {
+                                        return null;
+                                    }
 
-                                const fieldValue = resolveReportFieldValue(reportField, report, policy, fieldValues, fieldsByName, getCurrencyDecimals);
-                                const isFieldDisabled = isReportFieldDisabledForUser(report, reportField, policy, currentUserAccountID, rules);
-                                const fieldKey = getReportFieldKey(reportField.fieldID);
+                                    const fieldValue = resolveReportFieldValue(reportField, report, policy, fieldValues, fieldsByName, getCurrencyDecimals);
+                                    const isFieldDisabled = isReportFieldDisabledForUser(report, reportField, policy, currentUserAccountID, rules);
+                                    const fieldKey = getReportFieldKey(reportField.fieldID);
+                                    const reportFieldCopyValue = fieldValue || undefined;
 
-                                const violation = isFieldDisabled ? undefined : getFieldViolation(reportField);
-                                const violationTranslation = getFieldViolationTranslation(reportField, violation);
+                                    const violation = isFieldDisabled ? undefined : getFieldViolation(reportField);
+                                    const violationTranslation = getFieldViolationTranslation(reportField, violation);
 
-                                return (
-                                    <OfflineWithFeedback
-                                        // Need to return undefined when we have pendingAction to avoid the duplicate pending action
-                                        pendingAction={pendingAction ? undefined : report?.pendingFields?.[fieldKey as keyof typeof report.pendingFields]}
-                                        errors={report?.errorFields?.[fieldKey]}
-                                        errorRowStyles={styles.ph5}
-                                        key={`menuItem-${fieldKey}`}
-                                        onClose={() => clearReportFieldKeyErrors(report?.reportID, fieldKey)}
-                                    >
-                                        <MenuItemWithTopDescription
-                                            description={Str.UCFirst(reportField.name)}
-                                            title={fieldValue}
-                                            onPress={() => {
-                                                if (!report?.policyID) {
-                                                    return;
-                                                }
+                                    return (
+                                        <OfflineWithFeedback
+                                            // Need to return undefined when we have pendingAction to avoid the duplicate pending action
+                                            pendingAction={pendingAction ? undefined : report?.pendingFields?.[fieldKey as keyof typeof report.pendingFields]}
+                                            errors={report?.errorFields?.[fieldKey]}
+                                            errorRowStyles={styles.ph5}
+                                            key={`menuItem-${fieldKey}`}
+                                            onClose={() => clearReportFieldKeyErrors(report?.reportID, fieldKey)}
+                                        >
+                                            <MenuItemWithTopDescription
+                                                description={Str.UCFirst(reportField.name)}
+                                                descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
+                                                title={fieldValue}
+                                                onPress={() => {
+                                                    if (!report?.policyID) {
+                                                        return;
+                                                    }
 
-                                                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EDIT_REPORT_FIELD.getRoute(report.policyID, reportField.fieldID)));
-                                            }}
-                                            shouldShowRightIcon={!isFieldDisabled}
-                                            wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
-                                            shouldGreyOutWhenDisabled={false}
-                                            numberOfLinesTitle={0}
-                                            interactive={!isFieldDisabled}
-                                            titleWithTooltips={[]}
-                                            brickRoadIndicator={violation ? 'error' : undefined}
-                                            errorText={violationTranslation}
-                                        />
-                                    </OfflineWithFeedback>
-                                );
-                            })}
+                                                    Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EDIT_REPORT_FIELD.getRoute(report.policyID, reportField.fieldID)));
+                                                }}
+                                                shouldShowRightIcon={!isFieldDisabled}
+                                                wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
+                                                shouldGreyOutWhenDisabled={false}
+                                                numberOfLinesTitle={0}
+                                                interactive={!isFieldDisabled}
+                                                titleWithTooltips={[]}
+                                                brickRoadIndicator={violation ? 'error' : undefined}
+                                                errorText={violationTranslation}
+                                                errorTextStyle={styles.userSelectNone}
+                                                copyValue={reportFieldCopyValue}
+                                                copyable={isFieldDisabled && !!reportFieldCopyValue}
+                                                isTitleSelectable={!!reportFieldCopyValue}
+                                            />
+                                        </OfflineWithFeedback>
+                                    );
+                                })}
+                            </View>
+                        )}
                         {shouldShowTotalRow && (
                             <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
                                 <View style={[styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/libs/SelectionScraper/index.native.ts b/src/libs/SelectionScraper/index.native.ts
index 3a5d9e94e3f2..db484ce39fea 100644
--- a/src/libs/SelectionScraper/index.native.ts
+++ b/src/libs/SelectionScraper/index.native.ts
@@ -4,11 +4,12 @@ import type GetCurrentSelection from './types';
 
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
+const COPYABLE_ROW_CONTINUATION_DATA_SET = {...COPYABLE_ROW_DATA_SET, [CONST.COPYABLE_ROW_CONTINUATION_ELEMENT]: true} as const;
 
 // This is a no-op function for native devices because they wouldn't be able to support Selection API like a website.
 const getCurrentSelection: GetCurrentSelection = () => '';
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
+export {COPYABLE_ROW_CONTINUATION_DATA_SET, COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
 
 export default {
     getCurrentSelection,
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 1f45bc3938d0..01d7ec6c5c29 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -19,6 +19,8 @@ const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 const COPYABLE_TEXT_DATA_SET = {[CONST.COPYABLE_TEXT_ELEMENT]: true} as const;
 const COPYABLE_ROW_SELECTOR = `[data-${CONST.COPYABLE_ROW_ELEMENT}=true]`;
 const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
+const copyableRowContinuationAttribute = `data-${CONST.COPYABLE_ROW_CONTINUATION_ELEMENT}`;
+const COPYABLE_ROW_CONTINUATION_DATA_SET = {...COPYABLE_ROW_DATA_SET, [CONST.COPYABLE_ROW_CONTINUATION_ELEMENT]: true} as const;
 
 function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
     const elementRange = document.createRange();
@@ -46,12 +48,14 @@ function getCopyableElementText(element: globalThis.Element, selection: Selectio
         .replaceAll(/[\t\n\r ]+/g, ' ');
 }
 
-function replaceElementContentWithLines(element: globalThis.Element, lines: string[]) {
-    for (const [index, line] of lines.entries()) {
+function replaceElementContentWithLines(element: globalThis.Element, lines: Array<{row: globalThis.Element; text: string}>) {
+    for (const [index, {text}] of lines.entries()) {
         if (index > 0) {
-            element.appendChild(document.createElement('br'));
+            const previousRow = lines.at(index - 1)?.row;
+            const separator = previousRow?.getAttribute(copyableRowContinuationAttribute) === 'true' ? document.createTextNode(' ') : document.createElement('br');
+            element.appendChild(separator);
         }
-        element.appendChild(document.createTextNode(line));
+        element.appendChild(document.createTextNode(text));
     }
 }
 
@@ -167,14 +171,15 @@ function getHTMLOfSelectedCopyableRows(selection: Selection): string {
     }
 
     const lines = selectedRows
-        .map((row) =>
-            [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
+        .map((row) => ({
+            row,
+            text: [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
                 .filter((copyableElement) => selectedCopyableElementsByRow.get(row)?.has(copyableElement))
                 .map((copyableElement) => getCopyableElementText(copyableElement, selection))
                 .filter((text) => !!text)
                 .join(' '),
-        )
-        .filter((line) => !!line);
+        }))
+        .filter(({text}) => !!text);
 
     if (lines.length === 0) {
         return '';
@@ -342,7 +347,7 @@ const getCurrentSelection: GetCurrentSelection = () => {
     return newHtml || '';
 };
 
-export {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
+export {COPYABLE_ROW_CONTINUATION_DATA_SET, COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET};
 
 export default {
     getCurrentSelection,
diff --git a/tests/ui/MoneyReportViewTest.tsx b/tests/ui/MoneyReportViewTest.tsx
index 5d525c985783..e08c76f51811 100644
--- a/tests/ui/MoneyReportViewTest.tsx
+++ b/tests/ui/MoneyReportViewTest.tsx
@@ -4,6 +4,8 @@ import ComposeProviders from '@components/ComposeProviders';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
 
+import {COPYABLE_ROW_CONTINUATION_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
+
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
 
 import CONST from '@src/CONST';
@@ -303,7 +305,7 @@ describe('MoneyReportView report fields visibility', () => {
         orderWeight: 2,
         deletable: true,
         defaultValue: '',
-        value: '1',
+        value: 'Copyable field value',
         values: [],
         keys: [],
         externalIDs: [],
@@ -341,7 +343,8 @@ describe('MoneyReportView report fields visibility', () => {
         });
     });
 
-    it('keeps a custom report field visible for a non-admin submitter after the report is approved (single-expense combined view)', async () => {
+    it('keeps a custom report field visible and copyable for a non-admin submitter after the report is approved', async () => {
+        // Given an approved report with a custom field that is read-only for the submitter
         const fieldList = {
             [CONST.REPORT_FIELD_TITLE_FIELD_ID]: buildTitleField(),
             [customFieldKey]: buildCustomTextField(),
@@ -354,12 +357,16 @@ describe('MoneyReportView report fields visibility', () => {
         });
         await seedReportFieldsPolicy(policy, approvedReport);
 
+        // When the report is rendered in the single-expense combined view
         renderMoneyReportView(approvedReport, policy, true);
         await waitForBatchedUpdatesWithAct();
 
-        // The custom field (rendered read-only after approval) must still show for the submitter.
+        // Then only the custom field value is marked as copyable
         await waitFor(() => {
-            expect(screen.getByText('Test')).toBeOnTheScreen();
+            const [copyableReportFields] = screen.UNSAFE_getAllByProps({dataSet: COPYABLE_ROW_CONTINUATION_DATA_SET});
+            expect(copyableReportFields).toHaveStyle({display: 'contents'});
+            expect(screen.getByText('Copyable field value')).toHaveProp('dataSet', expect.objectContaining(COPYABLE_TEXT_DATA_SET));
+            expect(screen.getByText('Test')).toHaveProp('dataSet', {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true});
         });
     });
 
diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
index 0b8fd30a92fb..d77e1a728cda 100644
--- a/tests/unit/SelectionScraperTest.ts
+++ b/tests/unit/SelectionScraperTest.ts
@@ -84,6 +84,27 @@ describe('SelectionScraper', () => {
         expect(SelectionScraper.getCurrentSelection()).toBe('Aug 26 Paid<br>Aug 27 Draft');
     });
 
+    it('joins a continuation row to the next row with a space', () => {
+        // Given report fields followed by expense details in separate copyable rows
+        createFixture(`
+            <div>
+                <div ${copyableRowAttribute}="true" data-${CONST.COPYABLE_ROW_CONTINUATION_ELEMENT}="true">
+                    <span id="report-field" ${copyableTextAttribute}="true">Test is good</span>
+                </div>
+                <div ${copyableRowAttribute}="true">
+                    <span id="date" ${copyableTextAttribute}="true">2026-10-03</span>
+                    <span id="amount" ${copyableTextAttribute}="true">10.00</span>
+                </div>
+            </div>
+        `);
+
+        // When the selection crosses from the report field into the expense details
+        selectText(getTextNode('report-field'), 0, getTextNode('amount'), '10.00'.length);
+
+        // Then all selected values are separated by spaces without introducing a line break
+        expect(SelectionScraper.getCurrentSelection()).toBe('Test is good 2026-10-03 10.00');
+    });
+
     it('keeps browser selection behavior for a single selected copyable cell', () => {
         createFixture(`
             <div ${copyableRowAttribute}="true">

From 339109e42689fe1e7976f748431e697aa9878b4d Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 16:04:06 +0430
Subject: [PATCH 241/781] Fix MoneyReportView platform-dependent test

---
 tests/ui/MoneyReportViewTest.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/ui/MoneyReportViewTest.tsx b/tests/ui/MoneyReportViewTest.tsx
index e08c76f51811..333197d6774e 100644
--- a/tests/ui/MoneyReportViewTest.tsx
+++ b/tests/ui/MoneyReportViewTest.tsx
@@ -4,6 +4,7 @@ import ComposeProviders from '@components/ComposeProviders';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
 
+import getPlatform from '@libs/getPlatform';
 import {COPYABLE_ROW_CONTINUATION_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
@@ -36,6 +37,8 @@ jest.mock('@hooks/useScreenWrapperTransitionStatus', () => ({
     }),
 }));
 
+jest.mock('@libs/getPlatform', () => jest.fn());
+
 jest.mock('@react-navigation/native', () => ({
     ...((): typeof NativeNavigation => jest.requireActual('@react-navigation/native'))(),
     useNavigation: jest.fn(() => ({navigate: jest.fn(), addListener: jest.fn(() => jest.fn())})),
@@ -50,6 +53,8 @@ jest.mock('@pages/inbox/report/AnimatedEmptyStateBackground', () => {
 
 TestHelper.setupGlobalFetchMock();
 
+const mockedGetPlatform = jest.mocked(getPlatform);
+
 const policyID = 'policy_mrv_breakdown';
 const reportID = 'report_mrv_breakdown';
 
@@ -337,6 +342,10 @@ describe('MoneyReportView report fields visibility', () => {
         initOnyxDerivedValues();
     });
 
+    beforeEach(() => {
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.MOBILE_WEB);
+    });
+
     afterEach(async () => {
         await act(async () => {
             await Onyx.clear();
@@ -345,6 +354,7 @@ describe('MoneyReportView report fields visibility', () => {
 
     it('keeps a custom report field visible and copyable for a non-admin submitter after the report is approved', async () => {
         // Given an approved report with a custom field that is read-only for the submitter
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
         const fieldList = {
             [CONST.REPORT_FIELD_TITLE_FIELD_ID]: buildTitleField(),
             [customFieldKey]: buildCustomTextField(),
@@ -364,7 +374,7 @@ describe('MoneyReportView report fields visibility', () => {
         // Then only the custom field value is marked as copyable
         await waitFor(() => {
             const [copyableReportFields] = screen.UNSAFE_getAllByProps({dataSet: COPYABLE_ROW_CONTINUATION_DATA_SET});
-            expect(copyableReportFields).toHaveStyle({display: 'contents'});
+            expect(copyableReportFields.props.style).toEqual(expect.objectContaining({display: 'contents'}));
             expect(screen.getByText('Copyable field value')).toHaveProp('dataSet', expect.objectContaining(COPYABLE_TEXT_DATA_SET));
             expect(screen.getByText('Test')).toHaveProp('dataSet', {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true});
         });

From a863e15f2c193071aa3c6dbb4612fc1221d0c682 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 16:55:44 +0430
Subject: [PATCH 242/781] Preserve word wrapping for non-selectable expense
 labels

---
 .../ReportActionItem/MoneyRequestView.tsx     | 10 +-
 tests/ui/MoneyRequestViewTest.tsx             | 92 ++++++++++++++++---
 2 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 99c31b32030b..2fc0ac285a9b 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1215,7 +1215,7 @@ function MoneyRequestView({
                 <HighlightableMenuItemWithTopDescription
                     highlighted={hasDependentTags && shouldShow && !getTagForDisplay(transaction, index) && currentTagLength > previousTagLength}
                     description={name ?? translate('common.tag')}
-                    descriptionTextStyle={styles.userSelectNone}
+                    descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                     title={tagForDisplay}
                     numberOfLinesTitle={2}
                     interactive={canEdit}
@@ -1309,7 +1309,7 @@ function MoneyRequestView({
                         shouldShowTitleIcon={shouldShowPaid}
                         titleIcon={icons.Checkmark}
                         description={amountDescription}
-                        descriptionTextStyle={styles.userSelectNone}
+                        descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                         hintText={amountHintText}
                         hintTextStyle={styles.userSelectNone}
                         titleStyle={styles.textHeadlineH2}
@@ -1359,7 +1359,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('comment')}>
                         <MenuItemWithTopDescription
                             description={translate('common.description')}
-                            descriptionTextStyle={styles.userSelectNone}
+                            descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                             shouldRenderAsHTML
                             title={updatedTransactionDescription ?? transactionDescription}
                             interactive={canEdit}
@@ -1389,7 +1389,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('merchant')}>
                         <MenuItemWithTopDescription
                             description={translate('common.merchant')}
-                            descriptionTextStyle={styles.userSelectNone}
+                            descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                             title={updatedMerchantTitle}
                             interactive={canEditMerchant}
                             shouldShowRightIcon={canEditMerchant}
@@ -1779,7 +1779,7 @@ function MoneyRequestView({
                             shouldShowRightIcon={canEditReport}
                             title={reportNameToDisplay}
                             description={translate('common.report')}
-                            descriptionTextStyle={styles.userSelectNone}
+                            descriptionTextStyle={[styles.breakWord, styles.userSelectNone]}
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                             onPress={() => {
diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index 29f8f9989ef5..a953f8ef26b4 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -5,6 +5,8 @@ import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
 import ScreenWrapperStatusContext from '@components/ScreenWrapper/ScreenWrapperStatusContext';
 
+import useThemeStyles from '@hooks/useThemeStyles';
+
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
 
 import CONST from '@src/CONST';
@@ -12,6 +14,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy} from '@src/types/onyx';
 
 import type * as NativeNavigation from '@react-navigation/native';
+import type {StyleProp, TextStyle} from 'react-native';
 import type {PartialDeep} from 'type-fest';
 
 import escapeRegExp from 'lodash/escapeRegExp';
@@ -23,6 +26,30 @@ import * as LHNTestUtils from '../utils/LHNTestUtils';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
+type MockMenuItemWithTopDescriptionProps = {
+    description?: string;
+    title?: string;
+    interactive?: boolean;
+    descriptionTextStyle?: StyleProp<TextStyle>;
+};
+
+const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive}: MockMenuItemWithTopDescriptionProps) => {
+    const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
+
+    return (
+        <>
+            <RN.View testID={`menu-item-${description}`}>
+                <RN.Text>{interactive ? 'editable' : 'readonly'}</RN.Text>
+            </RN.View>
+            {title !== undefined && (
+                <RN.View testID={`menu-item-title-${description}`}>
+                    <RN.Text>{title}</RN.Text>
+                </RN.View>
+            )}
+        </>
+    );
+});
+
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
         translate: jest.fn((key: string) => key),
@@ -58,19 +85,7 @@ jest.mock('@pages/inbox/report/AnimatedEmptyStateBackground', () => {
 // Title lives in a sibling element so existing toHaveTextContent('editable'|'readonly') assertions on
 // the menu-item testID stay strict-equal — they don't pick up the title text.
 jest.mock('@components/MenuItemWithTopDescription', () => {
-    const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
-    return ({description, title, interactive}: {description?: string; title?: string; interactive?: boolean}) => (
-        <>
-            <RN.View testID={`menu-item-${description}`}>
-                <RN.Text>{interactive ? 'editable' : 'readonly'}</RN.Text>
-            </RN.View>
-            {title !== undefined && (
-                <RN.View testID={`menu-item-title-${description}`}>
-                    <RN.Text>{title}</RN.Text>
-                </RN.View>
-            )}
-        </>
-    );
+    return (props: MockMenuItemWithTopDescriptionProps) => mockMenuItemWithTopDescription(props);
 });
 
 // Mock the legacy MenuItem (used for some fields like billable), but keep the real compound parts the migrated rows render with
@@ -107,11 +122,23 @@ const parentReportActionID = 'parent_action_mrv';
 const transactionID = 'txn_mrv_test';
 
 const SCREEN_WRAPPER_STATUS = {didScreenTransitionEnd: true, shouldUseNarrowLayoutOnWideRHP: false, isSafeAreaTopPaddingApplied: true, isSafeAreaBottomPaddingApplied: true};
+let renderedThemeStyles: ReturnType<typeof useThemeStyles> | undefined;
+
+function ThemeStylesObserver() {
+    const styles = useThemeStyles();
+
+    React.useEffect(() => {
+        renderedThemeStyles = styles;
+    }, [styles]);
+
+    return null;
+}
 
 const renderMoneyRequestView = (threadReport: ReturnType<typeof LHNTestUtils.getFakeReport>, policy?: PartialDeep<Policy>) =>
     render(
         <ComposeProviders components={[OnyxListItemProvider]}>
             <ScreenWrapperStatusContext.Provider value={SCREEN_WRAPPER_STATUS}>
+                <ThemeStylesObserver />
                 <MoneyRequestView
                     transactionThreadReport={threadReport}
                     parentReportID={expenseReportID}
@@ -143,6 +170,7 @@ describe('MoneyRequestView edit fields', () => {
         await act(async () => {
             await Onyx.clear();
         });
+        mockMenuItemWithTopDescription.mockClear();
     });
 
     const setupTestData = async (isSettledReport = false) => {
@@ -253,6 +281,44 @@ describe('MoneyRequestView edit fields', () => {
         });
     });
 
+    it('preserves word wrapping when expense detail labels are made non-selectable', async () => {
+        // Given an expense with all labels affected by the non-selectable text styling
+        const threadReport = {
+            ...LHNTestUtils.getFakeReport(),
+            parentReportID: expenseReportID,
+            parentReportActionID,
+        };
+        const longTagName = 'LongTagNameWithoutSpaces';
+
+        await setupTestData();
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+                [longTagName]: {name: longTagName, orderWeight: 0, required: false, tags: {Berlin: {name: 'Berlin', enabled: true}}},
+            });
+        });
+
+        // When the expense details are rendered
+        renderMoneyRequestView(threadReport, {areTagsEnabled: true});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then each affected description keeps both breakWord and userSelectNone
+        await waitFor(() => {
+            const renderedRows = mockMenuItemWithTopDescription.mock.calls.map(([props]) => props);
+            const affectedRows = [
+                renderedRows.find(({description}) => description === longTagName),
+                renderedRows.find(({description}) => description?.startsWith('iou.amount')),
+                renderedRows.find(({description}) => description === 'common.description'),
+                renderedRows.find(({description}) => description === 'common.merchant'),
+                renderedRows.find(({description}) => description === 'common.report'),
+            ];
+
+            expect(affectedRows).not.toContain(undefined);
+            for (const row of affectedRows) {
+                expect(row?.descriptionTextStyle).toEqual([renderedThemeStyles?.breakWord, renderedThemeStyles?.userSelectNone]);
+            }
+        });
+    });
+
     it('hides the Category and Tag rows when the categories and tags belong to a different policy', async () => {
         const threadReport = {
             ...LHNTestUtils.getFakeReport(),

From 57da0f61582835ef093689d60187601620e8ed9b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 17:20:30 +0430
Subject: [PATCH 243/781] Fix copying all attendees from editable expenses

---
 .../ReportActionItem/MoneyRequestView.tsx     |  9 ++--
 tests/ui/MoneyRequestViewTest.tsx             | 51 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 2fc0ac285a9b..0cbe4bdd1f15 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1187,6 +1187,7 @@ function MoneyRequestView({
     // actualAttendees is already sorted by enrichAndSortAttendees above; pass without localeCompare to preserve that order while stripping the SMS domain.
     const getAttendeesTitle = Array.isArray(actualAttendees) ? getAttendeesListDisplayString(actualAttendees) : '';
     const attendeesCopyValue = getAttendeesTitle || undefined;
+    const areAttendeesCopyable = !!attendeesCopyValue;
 
     const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
         const tagForDisplay = getTagForDisplay(updatedTransaction ?? transaction, index);
@@ -1686,8 +1687,8 @@ function MoneyRequestView({
                                             accountID: a?.accountID,
                                             email: a?.email,
                                         }))}
-                                        maxVisible={canEdit ? undefined : actualAttendees.length}
-                                        isCopyable={!!attendeesCopyValue}
+                                        maxVisible={areAttendeesCopyable ? actualAttendees.length : undefined}
+                                        isCopyable={areAttendeesCopyable}
                                     />
                                 ) : undefined
                             }
@@ -1706,8 +1707,8 @@ function MoneyRequestView({
                             interactive={canEdit}
                             shouldShowRightIcon={canEdit}
                             copyValue={attendeesCopyValue}
-                            copyable={!canEdit && !!attendeesCopyValue}
-                            isTitleSelectable={!!attendeesCopyValue}
+                            copyable={!canEdit && areAttendeesCopyable}
+                            isTitleSelectable={areAttendeesCopyable}
                         />
                     </OfflineWithFeedback>
                 )}
diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index a953f8ef26b4..b15ff2b89171 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -31,9 +31,16 @@ type MockMenuItemWithTopDescriptionProps = {
     title?: string;
     interactive?: boolean;
     descriptionTextStyle?: StyleProp<TextStyle>;
+    titleComponent?: React.ReactNode;
 };
 
-const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive}: MockMenuItemWithTopDescriptionProps) => {
+type MockUserPillsProps = {
+    users: unknown[];
+    maxVisible?: number;
+    isCopyable?: boolean;
+};
+
+const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive, titleComponent}: MockMenuItemWithTopDescriptionProps) => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
 
     return (
@@ -46,15 +53,18 @@ const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive
                     <RN.Text>{title}</RN.Text>
                 </RN.View>
             )}
+            {titleComponent}
         </>
     );
 });
+const mockUserPills = jest.fn((_props: MockUserPillsProps) => null);
 
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
         translate: jest.fn((key: string) => key),
         numberFormat: jest.fn((num: number) => num.toString()),
         toLocaleDigit: jest.fn((digit: string) => digit),
+        localeCompare: jest.fn((first: string, second: string) => first.localeCompare(second)),
     })),
 );
 
@@ -88,6 +98,10 @@ jest.mock('@components/MenuItemWithTopDescription', () => {
     return (props: MockMenuItemWithTopDescriptionProps) => mockMenuItemWithTopDescription(props);
 });
 
+jest.mock('@components/UserPills', () => {
+    return (props: MockUserPillsProps) => mockUserPills(props);
+});
+
 // Mock the legacy MenuItem (used for some fields like billable), but keep the real compound parts the migrated rows render with
 jest.mock('@components/MenuItem', () => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
@@ -171,6 +185,7 @@ describe('MoneyRequestView edit fields', () => {
             await Onyx.clear();
         });
         mockMenuItemWithTopDescription.mockClear();
+        mockUserPills.mockClear();
     });
 
     const setupTestData = async (isSettledReport = false) => {
@@ -319,6 +334,40 @@ describe('MoneyRequestView edit fields', () => {
         });
     });
 
+    it('renders every copyable attendee on an editable expense', async () => {
+        // Given an editable expense with more attendees than UserPills displays by default
+        const threadReport = {
+            ...LHNTestUtils.getFakeReport(),
+            parentReportID: expenseReportID,
+            parentReportActionID,
+        };
+        const attendees = Array.from({length: 8}, (_, index) => ({
+            email: `attendee${index}@example.com`,
+            displayName: `Attendee ${index}`,
+            avatarUrl: '',
+        }));
+
+        await setupTestData();
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+                type: CONST.POLICY.TYPE.CORPORATE,
+                isAttendeeTrackingEnabled: true,
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {attendees}});
+        });
+
+        // When attendee tracking is enabled and the expense details are rendered
+        renderMoneyRequestView(threadReport, {type: CONST.POLICY.TYPE.CORPORATE, isAttendeeTrackingEnabled: true});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then every copyable attendee is rendered instead of collapsing the final attendees into a non-copyable summary
+        await waitFor(() => {
+            const userPillsProps = mockUserPills.mock.calls.at(-1)?.[0];
+            expect(userPillsProps).toEqual(expect.objectContaining({isCopyable: true, maxVisible: attendees.length}));
+            expect(userPillsProps?.users).toHaveLength(attendees.length);
+        });
+    });
+
     it('hides the Category and Tag rows when the categories and tags belong to a different policy', async () => {
         const threadReport = {
             ...LHNTestUtils.getFakeReport(),

From ad3a8c44b450e44df3df6ab9359835e29158d76b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 18:01:48 +0430
Subject: [PATCH 244/781] Fix help text selection in copyable menu items

---
 .../leaves/helpText/BaseMenuItemHelpText.tsx  |  4 +-
 .../leaves/helpText/MenuItemHelpText.tsx      |  7 ++
 .../MenuItem/leaves/helpText/types.ts         |  8 ++-
 .../components/MenuItem/MenuItemFieldTest.tsx | 70 +++++++++++++++++++
 4 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx b/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx
index e7ad90213e78..77dad679bbde 100644
--- a/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx
+++ b/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx
@@ -5,13 +5,15 @@ import React from 'react';
 import type {BaseMenuItemHelpTextProps} from './types';
 
 /** Base of the help line leaves */
-function BaseMenuItemHelpText({message, children, isError = false, style}: BaseMenuItemHelpTextProps) {
+function BaseMenuItemHelpText({message, children, isError = false, style, messageStyle, dataSet}: BaseMenuItemHelpTextProps) {
     return (
         <FormHelpMessage
             isError={isError}
             shouldShowRedDotIndicator={false}
             message={message}
             style={style}
+            messageStyle={messageStyle}
+            dataSet={dataSet}
         >
             {children}
         </FormHelpMessage>
diff --git a/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx b/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx
index f8adf00ad2b3..9f50033e2377 100644
--- a/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx
+++ b/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx
@@ -1,5 +1,9 @@
+import {useMenuItemConfig} from '@components/MenuItem/MenuItemContext';
+
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import CONST from '@src/CONST';
+
 import React from 'react';
 
 import type {MenuItemHelpTextProps} from './types';
@@ -9,12 +13,15 @@ import BaseMenuItemHelpText from './BaseMenuItemHelpText';
 /** The help line of a `MenuItem.Root`, rendered under `MenuItem.Row` and inside the row's press target */
 function MenuItemHelpText({message, isError = false}: MenuItemHelpTextProps) {
     const styles = useThemeStyles();
+    const {shouldAllowTextSelection} = useMenuItemConfig();
 
     return (
         <BaseMenuItemHelpText
             isError={isError}
             message={message}
             style={styles.menuItemError}
+            messageStyle={shouldAllowTextSelection ? styles.userSelectNone : undefined}
+            dataSet={shouldAllowTextSelection ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
         />
     );
 }
diff --git a/src/components/MenuItem/leaves/helpText/types.ts b/src/components/MenuItem/leaves/helpText/types.ts
index 29ef14a9be37..4798b5379f52 100644
--- a/src/components/MenuItem/leaves/helpText/types.ts
+++ b/src/components/MenuItem/leaves/helpText/types.ts
@@ -1,5 +1,5 @@
 import type {ReactNode} from 'react';
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, TextStyle, ViewProps, ViewStyle} from 'react-native';
 
 /** Props shared by the help line leaves */
 type MenuItemHelpTextSharedProps = {
@@ -29,6 +29,12 @@ type BaseMenuItemHelpTextProps = MenuItemHelpTextSharedProps & {
 
     /** Spacing of the line, which depends on where the leaf sits */
     style?: StyleProp<ViewStyle>;
+
+    /** Style applied to the help message text */
+    messageStyle?: StyleProp<TextStyle>;
+
+    /** Data attributes applied to the help text container */
+    dataSet?: ViewProps['dataSet'];
 };
 
 export type {BaseMenuItemHelpTextProps, MenuItemHelpTextHTMLProps, MenuItemHelpTextProps};
diff --git a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
index bffd402809f4..c0c9549cb169 100644
--- a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
@@ -1,6 +1,7 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import MenuItem from '@components/MenuItem';
 import MenuItemTrailing from '@components/MenuItem/layout/MenuItemTrailing';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
@@ -9,6 +10,8 @@ import getPlatform from '@libs/getPlatform';
 
 import CONST from '@src/CONST';
 
+import type {StyleProp, TextStyle, ViewProps} from 'react-native';
+
 import React from 'react';
 
 jest.mock('@hooks/useLazyAsset', () => ({
@@ -25,6 +28,27 @@ const pressEvent = {nativeEvent: {}};
 const NAME = 'Legal first name';
 const VALUE = 'John';
 
+type MockFormHelpMessageProps = {
+    message?: React.ReactNode;
+    messageStyle?: StyleProp<TextStyle>;
+    dataSet?: ViewProps['dataSet'];
+};
+
+const mockFormHelpMessage = jest.fn(({message, messageStyle}: MockFormHelpMessageProps) => {
+    const RN = jest.requireActual<
+        Record<
+            string,
+            React.ComponentType<{
+                children?: React.ReactNode;
+                style?: StyleProp<TextStyle>;
+            }>
+        >
+    >('react-native');
+    return <RN.Text style={messageStyle}>{message}</RN.Text>;
+});
+
+jest.mock('@components/FormHelpMessage', () => (props: MockFormHelpMessageProps) => mockFormHelpMessage(props));
+
 function Wrapper({children}: {children: React.ReactNode}) {
     return <LocaleContextProvider>{children}</LocaleContextProvider>;
 }
@@ -32,6 +56,7 @@ function Wrapper({children}: {children: React.ReactNode}) {
 describe('MenuItemField', () => {
     beforeEach(() => {
         mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockFormHelpMessage.mockClear();
     });
 
     describe('filled shape', () => {
@@ -258,6 +283,51 @@ describe('MenuItemField', () => {
         });
     });
 
+    describe('help text selection', () => {
+        it('excludes help text from selection and copied content when web value selection is enabled', () => {
+            // Given a help message inside a row with a selectable value
+            const helpMessage = 'Commuter deduction applied';
+
+            // When the row is rendered on web
+            render(
+                <Wrapper>
+                    <MenuItem.Root shouldAllowTextSelection>
+                        <MenuItem.HelpText message={helpMessage} />
+                    </MenuItem.Root>
+                </Wrapper>,
+            );
+
+            // Then the help message cannot be highlighted and is excluded by SelectionScraper
+            expect(screen.getByText(helpMessage)).toHaveStyle({userSelect: 'none'});
+            expect(mockFormHelpMessage.mock.calls.at(-1)?.[0].dataSet).toEqual(
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
+        });
+
+        it('does not change help text selection for an ordinary row', () => {
+            // Given a help message inside a row that does not enable value selection
+            const helpMessage = 'Validation failed';
+
+            // When the row is rendered
+            render(
+                <Wrapper>
+                    <MenuItem.Root>
+                        <MenuItem.HelpText
+                            isError
+                            message={helpMessage}
+                        />
+                    </MenuItem.Root>
+                </Wrapper>,
+            );
+
+            // Then no selection-specific style or scraper marker is added
+            expect(screen.getByText(helpMessage)).not.toHaveStyle({userSelect: 'none'});
+            expect(mockFormHelpMessage.mock.calls.at(-1)?.[0].dataSet).toBeUndefined();
+        });
+    });
+
     describe('trailing cell', () => {
         it('renders no chevron when the row is not pressable', () => {
             render(

From afa61720f5b92d568d0312f0ba79642c5492a78f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 18:33:42 +0430
Subject: [PATCH 245/781] Fix reimbursable label selection in expense details

---
 .../ReportActionItem/MoneyRequestView.tsx     |  6 ++--
 tests/ui/MoneyRequestViewTest.tsx             | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 0cbe4bdd1f15..ed0928c5c696 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -98,7 +98,7 @@ import {
     isTrackExpenseReportNew,
     shouldEnableNegative,
 } from '@libs/ReportUtils';
-import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
 import {getDependentTagVisibility, hasEnabledTags} from '@libs/TagsOptionsListUtils';
 import {
     getAttendeesListDisplayString,
@@ -1721,8 +1721,8 @@ function MoneyRequestView({
                             <Text
                                 accessible={false}
                                 aria-hidden
-                                style={styles.userSelectText}
-                                dataSet={COPYABLE_TEXT_DATA_SET}
+                                style={styles.userSelectNone}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {Str.UCFirst(translate('iou.reimbursable'))}
                             </Text>
diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index b15ff2b89171..b9369aeebd7b 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -334,6 +334,40 @@ describe('MoneyRequestView edit fields', () => {
         });
     });
 
+    it('excludes the reimbursable toggle label from selection and copied content', async () => {
+        // Given an expense that displays the reimbursable toggle
+        const threadReport = {
+            ...LHNTestUtils.getFakeReport(),
+            parentReportID: expenseReportID,
+            parentReportActionID,
+        };
+
+        await setupTestData();
+
+        // When the expense details are rendered
+        renderMoneyRequestView(threadReport);
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the visual label is hidden from selection while the switch remains accessible
+        await waitFor(() => {
+            const reimbursableLabel = screen.getByText(/reimbursable$/i, {includeHiddenElements: true});
+            expect(reimbursableLabel).toHaveStyle({userSelect: 'none'});
+            expect(reimbursableLabel).toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
+                }),
+            );
+            expect(reimbursableLabel).not.toHaveProp(
+                'dataSet',
+                expect.objectContaining({
+                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
+                }),
+            );
+            expect(screen.getByLabelText(/reimbursable$/i)).toBeOnTheScreen();
+        });
+    });
+
     it('renders every copyable attendee on an editable expense', async () => {
         // Given an editable expense with more attendees than UserPills displays by default
         const threadReport = {

From 45490a80f7001163d4d6e9c0e4ac502e9a7b88a1 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 3 Oct 2026 18:47:45 +0430
Subject: [PATCH 246/781] Fix unused UserPills mock parameter

---
 tests/ui/MoneyRequestViewTest.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index b9369aeebd7b..994404f5ac9c 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -57,7 +57,7 @@ const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive
         </>
     );
 });
-const mockUserPills = jest.fn((_props: MockUserPillsProps) => null);
+const mockUserPills = jest.fn<null, [MockUserPillsProps]>(() => null);
 
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({

From 32584668233a1fcd3a7feb1c419b168bc458b70a Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Sun, 4 Oct 2026 19:17:36 +0700
Subject: [PATCH 247/781] Remove getReportTransactions callers' reliance on the
 deprecated default in mergeTransactionRequest (Part 5)

mergeTransactionRequest now takes transactionsOfDeletableReportCollection,
resolved by DynamicConfirmationPage via useReportTransactionsCollection for
whichever of target/source isn't the merge destination, instead of falling
back to the deprecated Onyx.connect-backed global.
---
 config/eslint/eslint.seatbelt.tsv                     |  1 -
 src/libs/actions/MergeTransaction.ts                  |  7 +++++--
 .../TransactionMerge/DynamicConfirmationPage.tsx      |  7 +++++++
 tests/actions/MergeTransactionTest.ts                 | 11 +++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 37c27d6d5c2c..372f38ff3fc0 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -563,7 +563,6 @@
 "../../src/libs/actions/Link.ts"	"no-restricted-syntax"	2
 "../../src/libs/actions/MapboxToken.ts"	"no-restricted-syntax"	2
 "../../src/libs/actions/MergeAccounts.ts"	"no-restricted-syntax"	1
-"../../src/libs/actions/MergeTransaction.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	1
 "../../src/libs/actions/MergeTransaction.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/actions/MergeTransaction.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/MergeTransaction.ts"	"no-restricted-syntax"	1
diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index ffea761fdb02..5f4e4ed53c7f 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -23,7 +23,6 @@ import {getIOUActionForReportID, getReportAction, getTrackExpenseActionableWhisp
 import {
     buildOptimisticIOUReportAction,
     getReportOrDraftReport,
-    getReportTransactions,
     getTransactionDetails,
     isCurrentUserSubmitter,
     isMoneyRequestReportEligibleForMerge,
@@ -412,6 +411,9 @@ type MergeTransactionRequestParams = {
     targetTransaction: Transaction;
     allTransactionViolations: OnyxCollection<TransactionViolations>;
     sourceTransaction: Transaction;
+    // Expenses currently on whichever of targetTransaction/sourceTransaction's report is about to be left behind,
+    // used to tell if deleting it would empty that report. The caller resolves which one that is.
+    transactionsOfDeletableReportCollection: Record<string, Transaction>;
     targetTransactionThreadReport: OnyxEntry<Report>;
     targetTransactionThreadParentReport: OnyxEntry<Report>;
     iouReportOwnerLogin: string | undefined;
@@ -448,6 +450,7 @@ function mergeTransactionRequest({
     mergeTransaction,
     targetTransaction,
     sourceTransaction,
+    transactionsOfDeletableReportCollection,
     targetTransactionThreadReport,
     targetTransactionThreadParentReport,
     iouReportOwnerLogin,
@@ -550,7 +553,7 @@ function mergeTransactionRequest({
         };
 
         const transactionToDelete = mergeTransaction.reportID === targetTransaction.reportID ? sourceTransaction : targetTransaction;
-        const transactionsOfDeletableReport = getReportTransactions(transactionToDelete.reportID);
+        const transactionsOfDeletableReport = Object.values(transactionsOfDeletableReportCollection ?? {});
         const deletableReport = getReportOrDraftReport(transactionToDelete.reportID);
         const reportPreviewActionIDOfDeletableReport = deletableReport?.parentReportActionID;
         const optimisticReportDeletionData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> =
diff --git a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
index 148a5e11372a..d36d13234ccb 100644
--- a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
+++ b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
@@ -92,6 +92,8 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReport?.reportID)}`);
 
     const [sourceReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(sourceTransaction?.reportID)}`);
+    // Expenses already in the source report, used to tell if only one will be left after merging.
+    const sourceReportTransactionsCollection = useReportTransactionsCollection(sourceTransaction?.reportID);
     const sourceIOUAction = sourceTransaction ? getIOUActionForTransactionID(Object.values(sourceReportActions ?? {}), sourceTransaction.transactionID) : undefined;
     const selfDMSourceIOUAction =
         selfDMReport?.reportID && sourceTransaction ? getIOUActionForTransactionID(Object.values(selfDMReportActions ?? {}), sourceTransaction.transactionID) : undefined;
@@ -114,6 +116,10 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
         // lingers in the stack and briefly flashes the "not found" page when the user taps back. Must be read pre-merge.
         const willDeleteTargetTransactionReport = Object.keys(targetReportTransactionsCollection ?? {}).length === 1;
 
+        // mergeTransactionRequest only ever needs the report that's about to lose its expense (whichever of
+        // target/source isn't the merge destination), so resolve that here instead of passing both collections.
+        const transactionsOfDeletableReportCollection = mergeTransaction.reportID === targetTransaction.reportID ? sourceReportTransactionsCollection : targetReportTransactionsCollection;
+
         setIsMergingExpenses(true);
 
         mergeTransactionRequest({
@@ -124,6 +130,7 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
             mergeTransaction,
             targetTransaction,
             sourceTransaction,
+            transactionsOfDeletableReportCollection,
             targetTransactionThreadReport,
             targetTransactionThreadParentReport,
             iouReportOwnerLogin,
diff --git a/tests/actions/MergeTransactionTest.ts b/tests/actions/MergeTransactionTest.ts
index 42c41ae9c58c..da2a717a1293 100644
--- a/tests/actions/MergeTransactionTest.ts
+++ b/tests/actions/MergeTransactionTest.ts
@@ -198,6 +198,7 @@ function runCrossReportMergeToSourceReportRequest(fixtures: CrossReportMergeToSo
         mergeTransactionID,
         mergeTransaction,
         targetTransaction,
+        transactionsOfDeletableReportCollection: {[targetTransaction.transactionID]: targetTransaction},
         sourceTransaction,
         policy: undefined,
         policyTags: undefined,
@@ -322,6 +323,7 @@ describe('mergeTransactionRequest', () => {
             mergeTransactionID,
             mergeTransaction,
             targetTransaction,
+            transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
             sourceTransaction,
             sourceIOUActionThreadReport: undefined,
             targetTransactionThreadReport: {reportID: 'target-report-456'},
@@ -447,6 +449,7 @@ describe('mergeTransactionRequest', () => {
             mergeTransactionID,
             mergeTransaction,
             targetTransaction,
+            transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
             sourceTransaction,
             sourceIOUActionThreadReport: undefined,
             targetTransactionThreadReport: {reportID: targetReportID},
@@ -555,6 +558,7 @@ describe('mergeTransactionRequest', () => {
             mergeTransactionID,
             mergeTransaction,
             targetTransaction,
+            transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
             sourceTransaction,
             sourceIOUActionThreadReport: undefined,
             targetTransactionThreadReport: {reportID: targetExpenseReport.reportID},
@@ -713,6 +717,7 @@ describe('mergeTransactionRequest', () => {
             mergeTransactionID,
             mergeTransaction,
             targetTransaction,
+            transactionsOfDeletableReportCollection: {[targetTransaction.transactionID]: targetTransaction},
             sourceTransaction,
             sourceIOUActionThreadReport: undefined,
             targetTransactionThreadReport: {reportID: 'target-report-456'},
@@ -826,6 +831,7 @@ describe('mergeTransactionRequest', () => {
             mergeTransactionID,
             mergeTransaction,
             targetTransaction,
+            transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
             sourceTransaction,
             sourceIOUActionThreadReport: undefined,
             targetTransactionThreadReport: {reportID: 'target123'},
@@ -1062,6 +1068,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransactionID,
                 mergeTransaction,
                 targetTransaction,
+                transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction, [otherTransaction.transactionID]: otherTransaction},
                 sourceTransaction,
                 sourceIOUActionThreadReport: undefined,
                 targetTransactionThreadReport: {reportID: 'target-report-456'},
@@ -1272,6 +1279,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransactionID,
                 mergeTransaction,
                 targetTransaction,
+                transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction, [otherTransaction.transactionID]: otherTransaction},
                 sourceTransaction,
                 sourceIOUActionThreadReport: undefined,
                 targetTransactionThreadReport: {reportID: 'target-report-456'},
@@ -1431,6 +1439,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransactionID,
                 mergeTransaction,
                 targetTransaction,
+                transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
                 sourceTransaction,
                 sourceIOUActionThreadReport: undefined,
                 targetTransactionThreadReport: {reportID: 'target-report-456'},
@@ -1566,6 +1575,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransactionID,
                 mergeTransaction,
                 targetTransaction,
+                transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
                 sourceTransaction,
                 sourceIOUActionThreadReport,
                 targetTransactionThreadReport: {reportID: targetReportID},
@@ -1711,6 +1721,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransactionID,
                 mergeTransaction,
                 targetTransaction,
+                transactionsOfDeletableReportCollection: {[sourceTransaction.transactionID]: sourceTransaction},
                 sourceTransaction,
                 sourceIOUActionThreadReport,
                 targetTransactionThreadReport: {reportID: targetReportID},

From 1d0e75fc7e4a0586e0a5c99d37baaa26cfe98bfe Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Sun, 4 Oct 2026 19:19:55 +0700
Subject: [PATCH 248/781] chore: remove comment

---
 src/libs/actions/MergeTransaction.ts                   | 2 --
 src/pages/TransactionMerge/DynamicConfirmationPage.tsx | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index 5f4e4ed53c7f..a2b0dc0883f0 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -411,8 +411,6 @@ type MergeTransactionRequestParams = {
     targetTransaction: Transaction;
     allTransactionViolations: OnyxCollection<TransactionViolations>;
     sourceTransaction: Transaction;
-    // Expenses currently on whichever of targetTransaction/sourceTransaction's report is about to be left behind,
-    // used to tell if deleting it would empty that report. The caller resolves which one that is.
     transactionsOfDeletableReportCollection: Record<string, Transaction>;
     targetTransactionThreadReport: OnyxEntry<Report>;
     targetTransactionThreadParentReport: OnyxEntry<Report>;
diff --git a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
index d36d13234ccb..1408e3a9ea92 100644
--- a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
+++ b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
@@ -92,7 +92,6 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReport?.reportID)}`);
 
     const [sourceReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(sourceTransaction?.reportID)}`);
-    // Expenses already in the source report, used to tell if only one will be left after merging.
     const sourceReportTransactionsCollection = useReportTransactionsCollection(sourceTransaction?.reportID);
     const sourceIOUAction = sourceTransaction ? getIOUActionForTransactionID(Object.values(sourceReportActions ?? {}), sourceTransaction.transactionID) : undefined;
     const selfDMSourceIOUAction =

From d06af1e72310194ed1ad90bd8dd14deb6ffcd545 Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Mon, 5 Oct 2026 09:10:29 +0700
Subject: [PATCH 249/781] chore: remove comment

---
 src/pages/TransactionMerge/DynamicConfirmationPage.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
index 1408e3a9ea92..f9646ff28ba6 100644
--- a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
+++ b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
@@ -115,8 +115,6 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
         // lingers in the stack and briefly flashes the "not found" page when the user taps back. Must be read pre-merge.
         const willDeleteTargetTransactionReport = Object.keys(targetReportTransactionsCollection ?? {}).length === 1;
 
-        // mergeTransactionRequest only ever needs the report that's about to lose its expense (whichever of
-        // target/source isn't the merge destination), so resolve that here instead of passing both collections.
         const transactionsOfDeletableReportCollection = mergeTransaction.reportID === targetTransaction.reportID ? sourceReportTransactionsCollection : targetReportTransactionsCollection;
 
         setIsMergingExpenses(true);

From db655b4f0a6b83ecb9acc4b4a0b1524ff61ef4e4 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 11:52:44 +0200
Subject: [PATCH 250/781] fix: draw iOS tab glyphs as Skia vector paths so
 resized icons stay smooth

---
 .../NativeTabNavigator/NATIVE_TAB_GLYPHS.ts   | 83 +++++++++++++++++++
 .../NativeTabNavigator/tabIconRasterizer.ts   | 22 ++---
 .../NativeTabNavigator/useAndroidTabIcons.ts  |  4 +-
 .../NativeTabNavigator/useIOSTabIcons.ts      | 56 +++++++++----
 4 files changed, 137 insertions(+), 28 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts
new file mode 100644
index 000000000000..9b5ba3d83ab3
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts
@@ -0,0 +1,83 @@
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+
+type NativeTabGlyphPath = {
+    d: string;
+    isEvenOdd?: boolean;
+};
+
+type NativeTabGlyph = {
+    /** Side of the square viewBox the paths are drawn in. */
+    viewBoxSize: number;
+    paths: NativeTabGlyphPath[];
+};
+
+/**
+ * Vector copies of the tab bar SVGs in `assets/images`, so Skia draws each glyph at the bar's size instead of resampling
+ * a bitmap. They have to be kept in sync with those files.
+ */
+const NATIVE_TAB_GLYPHS = {
+    // home.svg
+    [SCREENS.HOME]: {
+        viewBoxSize: 20,
+        paths: [
+            {
+                d: 'M9.386 1.477a1 1 0 0 1 1.229 0l7.613 5.922c.487.379.772.962.772 1.579V18a1 1 0 0 1-1 1h-5v-6a1 1 0 0 0-1-1H8a1 1 0 0 0-1 1v6H2a1 1 0 0 1-1-1V8.978c0-.617.285-1.2.772-1.579z',
+            },
+        ],
+    },
+    // inbox.svg
+    [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: {
+        viewBoxSize: 20,
+        paths: [
+            {
+                d: 'M4.5 1.5a3 3 0 0 0-3 3v11a3 3 0 0 0 3 3h11a3 3 0 0 0 3-3v-11a3 3 0 0 0-3-3zm-1 3a1 1 0 0 1 1-1h11a1 1 0 0 1 1 1V12H13c-.276 0-.495.226-.549.497a2.5 2.5 0 0 1-4.902 0C7.494 12.226 7.276 12 7 12H3.5z',
+                isEvenOdd: true,
+            },
+        ],
+    },
+    // receipt-multiple.svg
+    [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: {
+        viewBoxSize: 20,
+        paths: [
+            {
+                d: 'M9.72 1.24c.12-.18.36-.21.52-.07l1.15 1c.16.14.41.1.52-.07l.54-.83a.35.35 0 0 1 .64.14l2.18 15.49c.04.32-.33.52-.58.31l-.75-.65a.35.35 0 0 0-.52.07l-.84 1.28c-.12.18-.36.21-.52.07l-1.16-1a.35.35 0 0 0-.52.07l-.84 1.28c-.12.18-.36.21-.52.07l-1.15-1a.35.35 0 0 0-.52.07l-.83 1.28c-.12.18-.36.21-.52.07l-1.16-1a.35.35 0 0 0-.52.07l-.54.83a.35.35 0 0 1-.64-.14L.97 3.11c-.04-.32.33-.52.58-.31l.75.65c.16.14.41.1.52-.07l.83-1.28c.12-.18.36-.21.52-.07l1.15 1c.16.14.41.1.52-.07l.83-1.28c.12-.18.36-.21.52-.07l1.15 1c.16.14.41.1.52-.07l.83-1.28Zm1.37 10.99-5.2.73a.87.87 0 0 0-.74.99c.07.48.51.81.99.75l5.2-.73c.48-.07.81-.51.75-.99a.886.886 0 0 0-.99-.75ZM8.87 9.01 5.4 9.5c-.48.07-.81.51-.75.99.07.48.51.81.99.75l3.47-.49c.48-.07.81-.51.75-.99a.87.87 0 0 0-.99-.74Zm1.24-3.71-5.2.73c-.48.07-.81.51-.75.99.07.48.51.81.99.75l5.2-.73a.87.87 0 0 0 .74-.99.886.886 0 0 0-.99-.75Z',
+                isEvenOdd: true,
+            },
+            {
+                d: 'M15.15 3.09c.1.16.32.19.46.07l1.03-.89c.14-.12.36-.09.46.06l.74 1.14c.1.16.32.19.46.07l.67-.58c.22-.19.55 0 .51.28l-1.94 13.79c-.04.28-.41.37-.57.13l-.49-.74s-.02-.03-.04-.04L14.42 2.03l.7 1.07Z',
+            },
+        ],
+    },
+    // pie-chart.svg
+    [SCREENS.INSIGHTS]: {
+        viewBoxSize: 24,
+        paths: [
+            {d: 'M15.598.074C14.94-.008 14.4.537 14.4 1.2v8.4h8.4c.663 0 1.208-.54 1.126-1.198A9.605 9.605 0 0 0 15.598.074'},
+            {d: 'M22.734 13.198C22.138 18.6 17.56 22.8 12 22.8 6.035 22.8 1.2 17.965 1.2 12c0-5.56 4.2-10.138 9.602-10.734C11.46 1.193 12 1.737 12 2.4V12h9.6c.663 0 1.207.54 1.134 1.198'},
+        ],
+    },
+    // buildings.svg
+    [NAVIGATORS.WORKSPACE_NAVIGATOR]: {
+        viewBoxSize: 20,
+        paths: [
+            {
+                d: 'M1 3a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v2h6a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H8v-3a1 1 0 0 0-1-1H5a1 1 0 0 0-1 1v3H3a2 2 0 0 1-2-2zm2 1a1 1 0 1 1 2 0 1 1 0 0 1-2 0m0 4a1 1 0 1 1 2 0 1 1 0 0 1-2 0m1 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2m3-7a1 1 0 1 1 2 0 1 1 0 0 1-2 0m1 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2m-1 5a1 1 0 1 1 2 0 1 1 0 0 1-2 0m5-5a1 1 0 1 0 0 2 1 1 0 0 0 0-2m3 1a1 1 0 1 1 2 0 1 1 0 0 1-2 0m1 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2m-1 5a1 1 0 1 1 2 0 1 1 0 0 1-2 0m-3-5a1 1 0 1 0 0 2 1 1 0 0 0 0-2m-1 5a1 1 0 1 1 2 0 1 1 0 0 1-2 0',
+                isEvenOdd: true,
+            },
+        ],
+    },
+    // profile.svg, with its circle written as a path
+    [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: {
+        viewBoxSize: 20,
+        paths: [
+            {d: 'M13 7a3 3 0 1 1-6 0 3 3 0 0 1 6 0z'},
+            {d: 'M10 1c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9m5.9 12.7C14.6 12.1 12.4 11 10 11s-4.6 1.1-5.9 2.7C3.4 12.6 3 11.4 3 10c0-3.9 3.1-7 7-7s7 3.1 7 7c0 1.4-.4 2.6-1.1 3.7'},
+        ],
+    },
+} as const satisfies Record<keyof typeof NATIVE_TAB_ICONS, NativeTabGlyph>;
+
+export default NATIVE_TAB_GLYPHS;
+export type {NativeTabGlyph};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index d2b534a9c004..94d7cf7d8787 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -1,15 +1,19 @@
+import ObjectUtils from '@src/types/utils/ObjectUtils';
+
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas, SkImage, SkSurface} from '@shopify/react-native-skia';
 import type {ImageSourcePropType} from 'react-native';
 
-import {BlendMode, ClipOp, ImageFormat, Skia} from '@shopify/react-native-skia';
+import {BlendMode, ClipOp, FilterMode, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
 import {Image} from 'react-native';
 
 import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
 
 type TabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
 
-const TAB_ICONS = Object.entries(NATIVE_TAB_ICONS).map(([name, icon]) => [name, icon.source] as const);
+type NativeTabName = keyof typeof NATIVE_TAB_ICONS;
+
+const TAB_NAMES = ObjectUtils.typedKeys(NATIVE_TAB_ICONS);
 
 /** Skia reads URLs, file paths and, in Android release builds, bundled assets that resolve to a drawable name. */
 async function decodeImage(uri: string): Promise<SkImage | null> {
@@ -39,10 +43,12 @@ function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top:
 
     canvas.save();
     canvas.clipPath(circle, ClipOp.Intersect, true);
-    canvas.drawImageRect(
+    canvas.drawImageRectOptions(
         image,
         Skia.XYWHRect((image.width() - sourceSize) / 2, (image.height() - sourceSize) / 2, sourceSize, sourceSize),
         Skia.XYWHRect(left, top, size, size),
+        FilterMode.Linear,
+        MipmapMode.Linear,
         Skia.Paint(),
     );
     canvas.restore();
@@ -58,12 +64,8 @@ function encodeSurface(surface: SkSurface): string {
     return `data:image/png;base64,${base64}`;
 }
 
-async function drawTabIconPairs(
-    drawIcon: (name: string, source: ImageSourcePropType, isSelected: boolean) => Promise<NativeBottomTabIcon | undefined>,
-): Promise<Record<string, TabIconPair>> {
-    const results = await Promise.all(
-        TAB_ICONS.map(([name, source]) => Promise.all([drawIcon(name, source, false), drawIcon(name, source, true)]).then(([inactive, active]) => ({name, inactive, active}))),
-    );
+async function drawTabIconPairs(drawIcon: (name: NativeTabName, isSelected: boolean) => Promise<NativeBottomTabIcon | undefined>): Promise<Record<string, TabIconPair>> {
+    const results = await Promise.all(TAB_NAMES.map((name) => Promise.all([drawIcon(name, false), drawIcon(name, true)]).then(([inactive, active]) => ({name, inactive, active}))));
     const icons: Record<string, TabIconPair> = {};
     for (const result of results) {
         if (result.inactive && result.active) {
@@ -73,7 +75,7 @@ async function drawTabIconPairs(
     return icons;
 }
 
-function getTabBarIcon(icons: Record<string, TabIconPair> | undefined, name: keyof typeof NATIVE_TAB_ICONS) {
+function getTabBarIcon(icons: Record<string, TabIconPair> | undefined, name: NativeTabName) {
     const pair = icons?.[name];
     if (!pair) {
         return NATIVE_TAB_ICONS[name];
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
index e51b9dbc06fb..c43e1d36aad3 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
@@ -10,10 +10,10 @@ import type {ImageSourcePropType} from 'react-native';
 
 import {Skia} from '@shopify/react-native-skia';
 
-import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
 import type {TabIconPair} from './tabIconRasterizer';
 import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
 
+import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
 import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
 import useRasterizedTabIcons from './useRasterizedTabIcons';
 
@@ -76,7 +76,7 @@ function useAndroidTabIcons() {
     const tintedIcons = useRasterizedTabIcons(
         lastTintedIcons,
         [inactiveColor, activeColor].join('|'),
-        () => drawTabIconPairs((name, source, isSelected) => createTintedGlyph(source, isSelected ? activeColor : inactiveColor)),
+        () => drawTabIconPairs((name, isSelected) => createTintedGlyph(NATIVE_TAB_ICONS[name].source, isSelected ? activeColor : inactiveColor)),
         {},
     );
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
index ec4cd48a7df8..bbb10095ac77 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
@@ -10,15 +10,16 @@ import NAVIGATORS from '@src/NAVIGATORS';
 
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas} from '@shopify/react-native-skia';
-import type {ImageSourcePropType} from 'react-native';
 
-import {FontWeight, Skia} from '@shopify/react-native-skia';
+import {FillType, FontWeight, Skia} from '@shopify/react-native-skia';
 
+import type {NativeTabGlyph} from './NATIVE_TAB_GLYPHS';
 import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
 import type {TabIconPair} from './tabIconRasterizer';
 import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
 
-import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
+import NATIVE_TAB_GLYPHS from './NATIVE_TAB_GLYPHS';
+import {decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
 import useRasterizedTabIcons from './useRasterizedTabIcons';
 
 /** The account tab's avatar in both selection states, with the URI it was drawn from. */
@@ -34,6 +35,29 @@ function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, s
     canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
 }
 
+function drawGlyph(canvas: SkCanvas, glyph: NativeTabGlyph, left: number, top: number, size: number, color: string) {
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    paint.setAntiAlias(true);
+    const viewBoxScale = size / glyph.viewBoxSize;
+
+    canvas.save();
+    canvas.translate(left, top);
+    canvas.scale(viewBoxScale, viewBoxScale);
+    for (const {d, isEvenOdd} of glyph.paths) {
+        const path = Skia.Path.MakeFromSVGString(d);
+        if (!path) {
+            continue;
+        }
+        if (isEvenOdd) {
+            path.setFillType(FillType.EvenOdd);
+        }
+        canvas.drawPath(path, paint);
+        path.dispose();
+    }
+    canvas.restore();
+}
+
 function getLabelFont(isSelected: boolean, scale: number) {
     const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
         weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
@@ -63,24 +87,19 @@ function measureLabel(label: string, isSelected: boolean, scale: number) {
 
 /**
  * iOS 26 never applies the inactive icon color from `UITabBarItemAppearance`, and paints every badge in the color of
- * the selected tab (both `badgeBackgroundColor` and `UITabBarItem.badgeColor`), so the glyph is recolored and the
+ * the selected tab (both `badgeBackgroundColor` and `UITabBarItem.badgeColor`), so the glyph is drawn in its color and the
  * status dot drawn into the image. Both selection states go through this, because RNScreens rejects a tab whose
  * icon and selectedIcon differ in type.
  */
 async function createTabIcon(
-    source: ImageSourcePropType,
+    glyph: NativeTabGlyph,
     color: string,
     dotColor: string | undefined,
     label: string,
     labelColor: string,
     isSelected: boolean,
 ): Promise<NativeBottomTabIcon | undefined> {
-    const glyph = await decodeGlyph(source);
-    if (!glyph) {
-        return undefined;
-    }
-
-    const {image, scale} = glyph;
+    const scale = variables.nativeTabIconScale;
     const glyphSize = variables.iconNativeTabBarIOS * scale;
     // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
     // every label lands at the same height.
@@ -92,20 +111,18 @@ async function createTabIcon(
     const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
 
     if (!surface) {
-        image.dispose();
         return undefined;
     }
 
     const canvas = surface.getCanvas();
     const glyphLeft = (canvasWidth - glyphSize) / 2;
-    canvas.drawImageRect(image, Skia.XYWHRect(0, 0, image.width(), image.height()), Skia.XYWHRect(glyphLeft, glyphTop, glyphSize, glyphSize), createTintPaint(color));
+    drawGlyph(canvas, glyph, glyphLeft, glyphTop, glyphSize, color);
 
     if (dotColor) {
         drawStatusDot(canvas, glyphLeft + glyphSize, glyphTop, scale, dotColor);
     }
 
     drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphSize + gap);
-    image.dispose();
 
     return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
 }
@@ -160,8 +177,15 @@ function useIOSTabIcons(dotColors: Record<string, string | undefined>, tabLabels
         lastTintedIcons,
         iconsSignature,
         () =>
-            drawTabIconPairs((name, source, isSelected) =>
-                createTabIcon(source, isSelected ? theme.iconMenu : theme.icon, dotColors[name], tabLabels[name], isSelected ? theme.text : theme.textSupporting, isSelected),
+            drawTabIconPairs((name, isSelected) =>
+                createTabIcon(
+                    NATIVE_TAB_GLYPHS[name],
+                    isSelected ? theme.iconMenu : theme.icon,
+                    dotColors[name],
+                    tabLabels[name],
+                    isSelected ? theme.text : theme.textSupporting,
+                    isSelected,
+                ),
             ),
         {},
     );

From 124600e45f946acb1a622267869f7f889078a7f6 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 11:52:46 +0200
Subject: [PATCH 251/781] fix: bold the selected Android tab label and tighten
 label letter spacing

---
 patches/react-native-screens/details.md       |  9 ++++-
 ...s+4.28.0+002+bold-selected-tab-label.patch | 35 ++++++++++---------
 ...004+android-tab-label-letter-spacing.patch | 30 ++++++++++++++++
 3 files changed, 57 insertions(+), 17 deletions(-)
 create mode 100644 patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index dd61413a37ac..cdb1ee57cb0a 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -9,7 +9,7 @@
 
 ### [react-native-screens+4.28.0+002+bold-selected-tab-label.patch](react-native-screens+4.28.0+002+bold-selected-tab-label.patch)
 
-- Reason: The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected, so the patch gives the large label the bold weight of the same font family.
+- Reason: The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. The patch turns on Material's own `setItemTextAppearanceActiveBoldEnabled`, which keeps the large label bold whenever Material re-applies its text appearance, and calls it before `updateFontStyles`, because enabling it re-applies Material's text appearance and would otherwise replace the app's typeface. `updateFontStyles` then sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
@@ -20,3 +20,10 @@
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
+
+### [react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch](react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch)
+
+- Reason: `TabsAppearanceApplicator.updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app. React Navigation has no option that reaches the native label's letter spacing, so the patch sets a fixed -0.5dp tracking on both labels, converted to the `em` unit `TextView.letterSpacing` expects for each label's size.
+- Upstream PR/issue: not reported yet.
+- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
+- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch b/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch
index a5287c5822ec..b01db811eef2 100644
--- a/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch
+++ b/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch
@@ -1,28 +1,31 @@
 diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 --- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 +++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-@@ -145,6 +145,15 @@
-                     context.assets,
-                 )
+@@ -3,6 +3,7 @@
+ import android.annotation.SuppressLint
+ import android.content.Context
+ import android.content.res.ColorStateList
++import android.graphics.Typeface
+ import android.graphics.drawable.StateListDrawable
+ import android.util.TypedValue
+ import android.view.MenuItem
+@@ -95,6 +96,10 @@
  
-+            // The selected tab's label is drawn bold, the way the app marks a selected tab everywhere else.
-+            val activeFontFamily =
-+                ReactFontManager.getInstance().getTypeface(
-+                    tabBarAppearance?.tabBarItemTitleFontFamily ?: "",
-+                    maxOf(fontWeight, 700),
-+                    isFontStyleItalic,
-+                    context.assets,
-+                )
+         bottomNavigationView.labelVisibilityMode = visibilityMode
+ 
++        // The selected tab's label is drawn bold, the way the app marks a selected tab everywhere else. Material re-applies
++        // its text appearance when enabling this, so it has to run before `updateFontStyles` sets the app's typeface.
++        bottomNavigationView.setItemTextAppearanceActiveBoldEnabled(true)
 +
-             /*
-                 Short explanation about computations we're doing below.
-                 R.dimen, has defined value in SP, getDimension converts it to pixels, and by default
-@@ -167,7 +176,7 @@
+         // Ripple color
+         val rippleColor =
+             tabBarAppearance?.tabBarItemRippleColor
+@@ -167,7 +172,7 @@
  
              // Active
              largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
 -            largeLabel.typeface = fontFamily
-+            largeLabel.typeface = activeFontFamily
++            largeLabel.setTypeface(fontFamily, Typeface.BOLD)
          }
      }
  
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch b/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch
new file mode 100644
index 000000000000..4986b3563f36
--- /dev/null
+++ b/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch
@@ -0,0 +1,30 @@
+diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+--- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
++++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+@@ -152,13 +152,18 @@
+                 tabBarAppearance?.tabBarItemTitleLargeLabelFontSize?.takeIf { it > 0 }?.let { PixelUtil.toPixelFromSP(it) }
+                     ?: context.resources.getDimension(R.dimen.design_bottom_navigation_text_size)
+ 
++            // Material's label text appearance tracks letters 0.5sp apart, wider than the app's labels.
++            val labelTracking = PixelUtil.toPixelFromDIP(LABEL_TRACKING_DP)
++
+             // Inactive
+             smallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallFontSize)
+             smallLabel.typeface = fontFamily
++            smallLabel.letterSpacing = labelTracking / smallFontSize
+ 
+             // Active
+             largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
+             largeLabel.setTypeface(fontFamily, Typeface.BOLD)
++            largeLabel.letterSpacing = labelTracking / largeFontSize
+         }
+     }
+ 
+@@ -228,5 +233,7 @@
+ 
+     companion object {
+         const val TAG = "TabsAppearanceApplicator"
++
++        private const val LABEL_TRACKING_DP = -0.5f
+     }
+ }

From 92918cfd3a9dde8e84b16d0194f00fee37883ca0 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:02:33 +0200
Subject: [PATCH 252/781] perf: freeze background native tabs, which have no
 freezeOnBlur

---
 ...tom-tabs+7.16.2+003+hidden-tab-items.patch | 32 ++++++++---------
 patches/react-navigation/details.md           |  2 +-
 .../FreezeWrapper/index.native.tsx            |  3 +-
 .../nativeTabScreenLayout.tsx                 | 36 +++++++++++++++++++
 .../Navigators/TabNavigator.native.tsx        |  4 +--
 5 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx

diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
index 7f4710b1bc8a..744455116a73 100644
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
@@ -2,13 +2,12 @@ diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/Nati
 index 303635c..6ccaad5 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-@@ -4,11 +4,12 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
+@@ -4,11 +4,11 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
  import { CommonActions, NavigationMetaContext, StackActions, useTheme } from '@react-navigation/native';
  import Color from 'color';
  import * as React from 'react';
 -import { Platform, PlatformColor } from 'react-native';
 +import { Platform, PlatformColor, StyleSheet, View } from 'react-native';
-+import { Freeze } from 'react-freeze';
  import { Tabs } from 'react-native-screens';
  import { Deferred } from "./Deferred.js";
  import { NativeScreen } from "./NativeScreen/NativeScreen.js";
@@ -17,7 +16,7 @@ index 303635c..6ccaad5 100644
  const meta = {
    type: 'native-tabs'
  };
-@@ -32,9 +33,23 @@ export function NativeBottomTabView({
+@@ -32,9 +32,23 @@ export function NativeBottomTabView({
      fonts
    } = useTheme();
    const focusedRouteKey = state.routes[state.index].key;
@@ -30,7 +29,7 @@ index 303635c..6ccaad5 100644
 +    lastVisibleRouteKeyRef.current = focusedRouteKey;
 +  }
 +  const nativeSelectedRouteKey = isFocusedRouteHidden ? lastVisibleRouteKeyRef.current ?? state.routes.find(route => !isRouteHidden(route))?.key ?? focusedRouteKey : focusedRouteKey;
-+  // Hidden routes stay mounted once visited, frozen while another tab is focused, the same as the native tabs.
++  // Hidden routes stay mounted once visited, the same as the native tabs.
 +  const visitedHiddenRouteKeysRef = React.useRef(new Set());
 +  if (isFocusedRouteHidden) {
 +    visitedHiddenRouteKeysRef.current.add(focusedRouteKey);
@@ -42,7 +41,7 @@ index 303635c..6ccaad5 100644
        provenance: 0
      }
    });
-@@ -189,17 +204,17 @@ export function NativeBottomTabView({
+@@ -189,17 +203,17 @@ export function NativeBottomTabView({
    const tabBarMinimizeBehavior = currentOptions.tabBarMinimizeBehavior === 'auto' ? 'automatic' : currentOptions.tabBarMinimizeBehavior === 'none' ? 'never' : currentOptions.tabBarMinimizeBehavior;
    const shouldHideTabBar = currentOptions.tabBarStyle?.display === 'none';
    const bottomAccessory = currentOptions.bottomAccessory;
@@ -64,7 +63,7 @@ index 303635c..6ccaad5 100644
        colorScheme: dark ? 'dark' : 'light',
        ios: {
          bottomAccessory: bottomAccessory ? environment => bottomAccessory({
-@@ -210,6 +225,9 @@ export function NativeBottomTabView({
+@@ -210,6 +224,9 @@ export function NativeBottomTabView({
          tabBarTintColor: activeTintColor
        },
        children: state.routes.map((route, index) => {
@@ -74,7 +73,7 @@ index 303635c..6ccaad5 100644
          const {
            options,
            render,
-@@ -363,9 +381,43 @@ export function NativeBottomTabView({
+@@ -363,9 +380,40 @@ export function NativeBottomTabView({
            })
          }, route.key);
        })
@@ -94,17 +93,14 @@ index 303635c..6ccaad5 100644
 +          backgroundColor: colors.background
 +        }, !isFocused && styles.hiddenRoute],
 +        pointerEvents: isFocused ? 'auto' : 'none',
-+        children: /*#__PURE__*/_jsx(Freeze, {
-+          freeze: !isFocused,
-+          children: /*#__PURE__*/_jsx(ScreenWithHeader, {
-+            isFocused: isFocused,
-+            route: route,
-+            navigation: navigation,
-+            options: options,
-+            children: /*#__PURE__*/_jsx(NavigationMetaContext.Provider, {
-+              value: meta,
-+              children: render()
-+            })
++        children: /*#__PURE__*/_jsx(ScreenWithHeader, {
++          isFocused: isFocused,
++          route: route,
++          navigation: navigation,
++          options: options,
++          children: /*#__PURE__*/_jsx(NavigationMetaContext.Provider, {
++            value: meta,
++            children: render()
 +          })
 +        })
 +      }, route.key);
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 5ba1a6ebee87..bff313fe3264 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -78,7 +78,7 @@
 
 ### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
 
-- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited and is frozen while another tab is focused. Nothing native changes.
+- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Like every other tab, it is frozen by the App's tab screen layout while another tab is focused. Nothing native changes.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx b/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
index 50672780db45..3f833f9216d1 100644
--- a/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
+++ b/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
@@ -1,7 +1,6 @@
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 
-// On native, tab-level freezing is handled by the TabNavigator's `freezeOnBlur: true` option,
-// which uses react-native-screens to natively freeze inactive tabs.
+// On native, tab-level freezing is handled by the TabNavigator's screen layout (nativeTabScreenLayout).
 // On web, react-native-screens only sets `display: none` without actually freezing the React tree,
 // so the web FreezeWrapper uses `react-freeze` to suspend rendering of background tabs.
 function FreezeWrapper({children}: ChildrenProps) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx
new file mode 100644
index 000000000000..af7c533db7e4
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx
@@ -0,0 +1,36 @@
+import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
+
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+import {useIsFocused} from '@react-navigation/native';
+import React, {useLayoutEffect, useState} from 'react';
+import {Freeze} from 'react-freeze';
+
+/**
+ * Native tabs have no `freezeOnBlur`, so a tab in the background would keep re-rendering on every Onyx update.
+ * A blurred tab freezes one frame after it loses focus, so a tab mounted in the background still renders once.
+ */
+function NativeTabScreenFreeze({children}: ChildrenProps) {
+    const isFocused = useIsFocused();
+    const [isFrozen, setIsFrozen] = useState(false);
+
+    // Decouple the Suspense render task so it won't be interrupted by React's concurrent mode and stuck in an infinite loop
+    useLayoutEffect(() => {
+        if (isFocused) {
+            // isFocused is the only dependency and does not change as a result of this setState.
+            // eslint-disable-next-line react-hooks/set-state-in-effect
+            setIsFrozen(false);
+            return;
+        }
+        const frameID = requestAnimationFrame(() => setIsFrozen(true));
+        return () => cancelAnimationFrame(frameID);
+    }, [isFocused]);
+
+    return <Freeze freeze={isFrozen && !isFocused}>{children}</Freeze>;
+}
+
+function nativeTabScreenLayout({children, ...rest}: Parameters<typeof bottomTabScreenLayoutWrapper>[0]) {
+    return bottomTabScreenLayoutWrapper({...rest, children: <NativeTabScreenFreeze>{children}</NativeTabScreenFreeze>});
+}
+
+export default nativeTabScreenLayout;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 3be4da307cad..a3c449ce89ad 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -1,4 +1,3 @@
-import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
 import HomePage from '@pages/home/HomePage';
@@ -14,6 +13,7 @@ import React from 'react';
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
+import nativeTabScreenLayout from './NativeTabNavigator/nativeTabScreenLayout';
 import tabScreenListeners from './NativeTabNavigator/tabScreenListeners';
 import useNativeTabBarOptions from './NativeTabNavigator/useNativeTabBarOptions';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
@@ -39,7 +39,7 @@ function TabNavigator() {
         <Tab.Navigator
             backBehavior="fullHistory"
             layout={renderNativeTabLayout}
-            screenLayout={bottomTabScreenLayoutWrapper}
+            screenLayout={nativeTabScreenLayout}
             screenOptions={screenOptions}
             UNSTABLE_router={tabRouterOverride}
             screenListeners={tabScreenListeners}

From a30432a8ee2d458afb8fe3cce8f91e03ec77c732 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:03:23 +0200
Subject: [PATCH 253/781] perf: give tab bars the Inbox status alone, so LHN
 updates do not re-render the native tab navigator

---
 .../Navigation/NavigationTabBar/InboxTabButton.tsx  |  4 ++--
 src/hooks/useSidebarOrderedReports.tsx              | 13 +++++++++++--
 .../NativeTabNavigator/useNativeTabNavigator.ts     |  4 ++--
 tests/unit/InboxTabButtonTest.tsx                   |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index 1476cc214c74..5d5fdcd82215 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -4,7 +4,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useRootNavigationState from '@hooks/useRootNavigationState';
-import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
+import {useChatTabBrickRoad} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -206,7 +206,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
-    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
+    const chatTabBrickRoad = useChatTabBrickRoad();
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Inbox']);
 
     let statusIndicatorColor: string | undefined;
diff --git a/src/hooks/useSidebarOrderedReports.tsx b/src/hooks/useSidebarOrderedReports.tsx
index fca377ea8ed0..633328984cb4 100644
--- a/src/hooks/useSidebarOrderedReports.tsx
+++ b/src/hooks/useSidebarOrderedReports.tsx
@@ -71,6 +71,9 @@ const SidebarOrderedReportsStateContext = createContext<SidebarOrderedReportsSta
     hasStaleUnreadReport: false,
 });
 
+/** The Inbox tab's status alone, so tab bars re-render only when it changes, not on every LHN update. */
+const SidebarChatTabBrickRoadContext = createContext<BrickRoad>(undefined);
+
 const SidebarOrderedReportsActionsContext = createContext<SidebarOrderedReportsActionsContextValue>({
     clearLHNCache: () => {},
     setActiveTab: () => {},
@@ -466,7 +469,9 @@ function SidebarOrderedReportsContextProvider({
 
     return (
         <SidebarOrderedReportsStateContext.Provider value={stateValue}>
-            <SidebarOrderedReportsActionsContext.Provider value={actionsValue}>{children}</SidebarOrderedReportsActionsContext.Provider>
+            <SidebarChatTabBrickRoadContext.Provider value={stateValue.chatTabBrickRoad}>
+                <SidebarOrderedReportsActionsContext.Provider value={actionsValue}>{children}</SidebarOrderedReportsActionsContext.Provider>
+            </SidebarChatTabBrickRoadContext.Provider>
         </SidebarOrderedReportsStateContext.Provider>
     );
 }
@@ -475,6 +480,10 @@ function useSidebarOrderedReportsState() {
     return useContext(SidebarOrderedReportsStateContext);
 }
 
+function useChatTabBrickRoad() {
+    return useContext(SidebarChatTabBrickRoadContext);
+}
+
 function useSidebarOrderedReportsActions() {
     return useContext(SidebarOrderedReportsActionsContext);
 }
@@ -487,5 +496,5 @@ function useSidebarOrderedReports() {
     return useMemo(() => ({...state, ...actions}), [state, actions]);
 }
 
-export {SidebarOrderedReportsContextProvider, useSidebarOrderedReports, useSidebarOrderedReportsState, useSidebarOrderedReportsActions};
+export {SidebarOrderedReportsContextProvider, useChatTabBrickRoad, useSidebarOrderedReports, useSidebarOrderedReportsState, useSidebarOrderedReportsActions};
 export type {ReportsToDisplayInLHN};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index d19fb99f5aaf..633fcd0e599e 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -6,7 +6,7 @@ import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import {useSidebarOrderedReportsState} from '@hooks/useSidebarOrderedReports';
+import {useChatTabBrickRoad} from '@hooks/useSidebarOrderedReports';
 import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
@@ -47,7 +47,7 @@ function useNativeTabNavigator() {
     // With the Insights beta, Insights takes the Account tab's place in the bar and Account moves to the top bar.
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const theme = useTheme();
-    const {chatTabBrickRoad} = useSidebarOrderedReportsState();
+    const chatTabBrickRoad = useChatTabBrickRoad();
     const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
     const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
     const navigation = useNavigation();
diff --git a/tests/unit/InboxTabButtonTest.tsx b/tests/unit/InboxTabButtonTest.tsx
index 9391613c69c6..8ec1a0319d58 100644
--- a/tests/unit/InboxTabButtonTest.tsx
+++ b/tests/unit/InboxTabButtonTest.tsx
@@ -53,7 +53,7 @@ jest.mock('@components/Navigation/NavigationTabBar/TabBarItem', () => () => null
 jest.mock('@components/Navigation/NavigationTabBar/getLastRoute', () => () => mockLastRoute);
 jest.mock('@hooks/useLazyAsset', () => ({useMemoizedLazyExpensifyIcons: () => ({Inbox: 'inbox-icon'})}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
-jest.mock('@hooks/useSidebarOrderedReports', () => ({useSidebarOrderedReportsState: () => ({chatTabBrickRoad: undefined})}));
+jest.mock('@hooks/useSidebarOrderedReports', () => ({useChatTabBrickRoad: () => undefined}));
 jest.mock('@hooks/useTheme', () => () => ({danger: 'danger', iconSuccessFill: 'success'}));
 jest.mock('@hooks/useThemeStyles', () => () => ({
     flex1: {},

From 46fe6f771dd424df98571655f19bb283ab9cb569 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:06:17 +0200
Subject: [PATCH 254/781] perf: draw native tab icons synchronously from vector
 glyphs on both platforms, cached per icon

---
 assets/images/native-tab-icons/buildings.png  | Bin 446 -> 0 bytes
 .../images/native-tab-icons/buildings@2x.png  | Bin 842 -> 0 bytes
 .../images/native-tab-icons/buildings@3x.png  | Bin 1287 -> 0 bytes
 assets/images/native-tab-icons/home.png       | Bin 292 -> 0 bytes
 assets/images/native-tab-icons/home@2x.png    | Bin 460 -> 0 bytes
 assets/images/native-tab-icons/home@3x.png    | Bin 610 -> 0 bytes
 assets/images/native-tab-icons/inbox.png      | Bin 278 -> 0 bytes
 assets/images/native-tab-icons/inbox@2x.png   | Bin 464 -> 0 bytes
 assets/images/native-tab-icons/inbox@3x.png   | Bin 660 -> 0 bytes
 assets/images/native-tab-icons/insights.png   | Bin 371 -> 0 bytes
 .../images/native-tab-icons/insights@2x.png   | Bin 649 -> 0 bytes
 .../images/native-tab-icons/insights@3x.png   | Bin 975 -> 0 bytes
 assets/images/native-tab-icons/profile.png    | Bin 493 -> 0 bytes
 assets/images/native-tab-icons/profile@2x.png | Bin 990 -> 0 bytes
 assets/images/native-tab-icons/profile@3x.png | Bin 1465 -> 0 bytes
 .../native-tab-icons/receipt-multiple.png     | Bin 625 -> 0 bytes
 .../native-tab-icons/receipt-multiple@2x.png  | Bin 1216 -> 0 bytes
 .../native-tab-icons/receipt-multiple@3x.png  | Bin 1842 -> 0 bytes
 .../NativeTabNavigator/NATIVE_TAB_GLYPHS.ts   |  13 +-
 .../NativeTabNavigator/NATIVE_TAB_ICONS.ts    |  22 --
 .../NativeTabNavigator/tabIconRasterizer.ts   | 195 ++++++++++++----
 .../NativeTabNavigator/useAndroidTabIcons.ts  |  99 --------
 .../NativeTabNavigator/useIOSTabIcons.ts      | 217 ------------------
 .../useNativeTabBarOptions/index.ios.ts       |  40 +++-
 .../useNativeTabBarOptions/index.ts           |  28 ++-
 .../useRasterizedTabIcons.ts                  |  40 ----
 .../NativeTabNavigator/useTabAvatarImage.ts   |  53 +++++
 src/styles/variables.ts                       |   2 -
 28 files changed, 268 insertions(+), 441 deletions(-)
 delete mode 100644 assets/images/native-tab-icons/buildings.png
 delete mode 100644 assets/images/native-tab-icons/buildings@2x.png
 delete mode 100644 assets/images/native-tab-icons/buildings@3x.png
 delete mode 100644 assets/images/native-tab-icons/home.png
 delete mode 100644 assets/images/native-tab-icons/home@2x.png
 delete mode 100644 assets/images/native-tab-icons/home@3x.png
 delete mode 100644 assets/images/native-tab-icons/inbox.png
 delete mode 100644 assets/images/native-tab-icons/inbox@2x.png
 delete mode 100644 assets/images/native-tab-icons/inbox@3x.png
 delete mode 100644 assets/images/native-tab-icons/insights.png
 delete mode 100644 assets/images/native-tab-icons/insights@2x.png
 delete mode 100644 assets/images/native-tab-icons/insights@3x.png
 delete mode 100644 assets/images/native-tab-icons/profile.png
 delete mode 100644 assets/images/native-tab-icons/profile@2x.png
 delete mode 100644 assets/images/native-tab-icons/profile@3x.png
 delete mode 100644 assets/images/native-tab-icons/receipt-multiple.png
 delete mode 100644 assets/images/native-tab-icons/receipt-multiple@2x.png
 delete mode 100644 assets/images/native-tab-icons/receipt-multiple@3x.png
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts

diff --git a/assets/images/native-tab-icons/buildings.png b/assets/images/native-tab-icons/buildings.png
deleted file mode 100644
index 31476c8ea396b7398c1d2614e842ed28b8385925..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0a7jc#RCt`-mcK3pQ5431g-Wq>)H+dm0d%M+JOU4}EB-AK;Q>4Y
zi6x5N^$6QYjCvEbja5rl=gLXGk&|nzoyj6`l2hDo=APf3`<<CP@JlfQ>;Wwx>67Qc
zR1v@~5C+T#EhtyCH2Dpv18rBZ2V4MMr%mStB%0XJc+wTym$vM**`k29im$n14WI;^
z3<EHX>;c!n_)h_X@-z!z^s2Tcz3~w!M~k?V)^S>0e!XgZn+33Lu^4j`%hDE{HZQH>
zH1o-#rg4%5=&D=1p@|A!Iqg!~z0;00_qiWnn3?<u;0ajN<9b8qv@NMtljaw81T48X
zJ{i>HN*|Lq^P1dKt2N!kjv(I9L|WXY2d+*3smTF&0cPB_Q9XW$3@t_aDlp+b^<M&P
zujAN=0QN#z96HUu!WK7Kfb_umbV0Em0lMmz)X<=nH+5(Q)%=K^oPaPuZutUs#u~(^
oXBmK%Z+-@RT8-@@=XRlZ2mhi`77TpLkN^Mx07*qoM6N<$g7g@}Z2$lO

diff --git a/assets/images/native-tab-icons/buildings@2x.png b/assets/images/native-tab-icons/buildings@2x.png
deleted file mode 100644
index a902f49f984af66f7d147293850465f13221289a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVh{7FPXRCt{2nmcb3K@i7(AP5x@N1~wSm572q62cH8dY~e-P?|?1
zD3GW~oF<8oP{I|6@GAHO7$WltkZ`C-l<)-*I0a6GOnhjiv9wyvp3j^gXW@~ivH!l^
z-`?!Z?44m?>9ajR4k!S@Kl)SPA#kSKlOF*}K-ea)153cZZmoQ&jgz;1wi^Js4o%+p
zZ{SF$0SX-iFn+ny0D&@S4R{1(fjm(0Ol||X22232JenK50GM_(S3Qu&9Nl|Gce57&
zSx0k7(X1)gno0{m-qD;@G}}PN(Y;IyKt;mlpiF+<6W=ENjtPia{oS+xgembKz+2#S
zzXF6-xL)dKfDrf&9PVd;&{tD@05wUK+f6Q7k%Cr_(9}g!i4iJmGPd^p<G27DR*}j?
zG<#2g{h~VuR29uH$z+Ij(Q~a8U|4j=flWmd#04<zfo)@o=BG9JhRrLwIY(oDquq&9
zj&3pufay@(^Mb1}E9BaJMQ1*9?VF-=i{iy30H!gs?XD-TP1rQ-0I;g)%D|ANGi{2t
zUv4{NzDWWQN@F%9?SXHDRwZoi0be3E=c;HHJo_Y+D*i&o{NT~F1dv7#1^^5I=o-K~
z$v(@THn~xx=46AGBL@B~n)xQ1__>T(ObTE!k8O7pP2H-nNUAJ*CU2)vlX|tRcFP&_
z^?zN+CS$Y`6{VF}h|x-zyRoI{MjhStBmkSzP&HQnqbDX8Er_fqzN=Qn9+Ky$q2eX$
zE}Zb(rIt2vP0qqQO)|rlr*qU6MO*pM@*NrTPtr}CRu2XM3;^glfO%1I)bn0pG{(Dy
zT`5w-P4r)Zae0__#dB(F8Nl@Tdx^G8lY{?qO#Qf{%eMpI8SyNt4>AW7*VYxCS$W&C
z?Ep}JpxCE~YnaB&wv(R6CMIlbn@tNqD2-W8+5@e^h7$96S^0toGHCS`Q@a4#<<r{W
z6MY15-Zz1jJ^(02O<=?WkrsfWa$ZpF0x)C!b---8IQAgH-xGoepNR^afzd<z3n*(w
UU@e}4-v9sr07*qoM6N<$f`rO@n*aa+

diff --git a/assets/images/native-tab-icons/buildings@3x.png b/assets/images/native-tab-icons/buildings@3x.png
deleted file mode 100644
index 85e0ef74fac7de2a18efcf90b4e1d32e2fcb4ef6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qcxk*GpRCt{2oK0*MRTRg6Xq!M3EyazpLQ(uS#ucbZr5K}?or?HT
zF~%26D6ZTgA2BXWtVTD+7<H!!E-bqBsViv&R%*0h35bD(iJ~p2sq~tgoR>@{cka0}
z@6B{Nz5nE_+W*`$zs}r`bMF+QqM{a9D}YVFD9|b)o&_EP23cfU4ZH=M2TTPq2OI#_
zu?Tb{aH1kG>G%_PfSNx!3kAnW%mTMjQ@y>waE!z^z%pvsA<xzTj*+;NnrTxFpqNCw
zM9nlBnD_-?N=BYMH#`sg4Ez!J`*swqm0AH{UI6;!_b&s+18;T$xH{3+2yjO6yvrg3
zv?Ig!f#N#~^gDbTfd85T=zQYIN$U;;&@-MkCz}Fj%Hz920W{?Ce%us5bJFLybdLgP
z%+ux%O#x(pHyoZzfUgzbX<)$NeX41lw2=<^c3`DEIU1bgE4l?(B@5EMz`sodWEv2E
z1IK}P@~-)o3Luk+i@<BZr4bO`crOA%jmIJ&yzyfMgc`R*KzQSkZUKD@Y?tN3m`nmg
z8vYB|0}RW%K9M8oPsKAV^QW0W-!H&U$<^k3IKcCKH-IJ_3)TUd1Zr^BJKB3CAmRNE
z-%SCKegdvc`E2e76<@0;p!rliC#i>(MqkeG*@RDdd?!5>guP0ew%+8@HF7UK2Q=;R
z4JyfQ_IN+>`0UTJv{`A>E@`rKq6|RiJi83ncQL>C%HwN$e2*(_UYFrprj&dO12VEj
zT;y@LeV0quN*UKzq+6Te{jA_?t#t=o0XhS0bd)T#Rk@K4xi1ChXn^lX3X(0|z8c`O
zIX#ie^={y7nShMckSC=Q=qq+*4ZC*#{Y&M^Nyi289LO=P=*0Ju>!d79P1%4<!y^JB
z0wMw;0wMyUp3#$G{t)ny454`%KPf|XJLfQOCyZZ+*SB_a#dnhHA!VDpXA{K@DbJIE
z6UF_hiQ-zB1Zuv+sfl7=U=_gTv@MnE#()D8T>*M9!?!1(p4024hE}%No#7iP3()VL
z#p*hx(MLUPwmm-kT4iag(x!!9>0))dX626i>sIcVmtvDkTa;w&E9g?ctk1H1r#uC-
zeM*~l)$Y=ovI=HKN(||PQ1&l%O!3V~nKZ4CRk`hu)4Dm}u<4ZJz=X~H^RkEeBl7ux
zErjm^ehu(+AnlXF`__PZPBIRPXIQQgdJ^}v<TxZbhm=?1M3D%H2#5%X2#9({1VjWx
zZ2<iyhXS&;q&pgrnXR^mpS3FAEgOM(uhW(l{7N~C_<ogu{sC@Pz_>u=-L~0Q@H%Zd
zqMX)vRe(OEn0DnXb``x&x^C6c<;qt|Jp=S&K|tE6{AAb-zbp+YUi(^Q=~xwjS_J{!
zm7@(?Ce6}wiZ|>0bH7rgTU3B90{1$u(HC%9%y!5wjdgQhbpvFihCGs}X08b+S#)At
z`kW5bodKH#tzLYRX(|MiJfAdOz&9t;g3w)*r+f8LZ>wTJRfX@{HkQkQ%cTlvMi_YY
z<`M?<ddLk72EOa9h5<UB@zI}C>*f1)vqS({I5*_IkyY{u=4^uj&B#<B_{ni;IdGrj
xA1t}HaYA%eN&l!RPmIcFrFO_sQBjns{{ePx-cHm@%}f9Q002ovPDHLkV1lITT|58)

diff --git a/assets/images/native-tab-icons/home.png b/assets/images/native-tab-icons/home.png
deleted file mode 100644
index ccb34aeed4888197e36a0f98dcf3407e18567285..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpx`x6
z7srr_Id3Q1avd^|aFBnYu!Ae^z|os0jbA7&>OOaLt!-2I2Zp>jr(G6hFCIO5wP0OS
zGJ7veP{+b!LBRoEnzuiBZp*=9m-EYEJx?KT1e4Q7rdR8p=q9W_8C>RY`{?93#!ocG
z6Czw<7@r-us^q_uk$b_c@Ouo`ERP&YU^a<AX?<W{LyQKW!}pmrY%2LDT9pFVwa>H?
z;BM}e<M8HasZ!8W6!`D=fa6C)x&VW^IOF|K`Ap)B=Y=Lz|7W-_*x|+D^6TKns0pEy
n8&ws)Z+ho({Y26EyLT8Rye+Hwug$p*^dW<%tDnm{r-UW|EAMgL

diff --git a/assets/images/native-tab-icons/home@2x.png b/assets/images/native-tab-icons/home@2x.png
deleted file mode 100644
index 395f787214bf54f5535b5b5522f08edec91e1725..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVgen~_@RCt{2nXyX4P#8v!sGH#A;HHa<SRcU62XOQe1P3RT4t)W;
ztB@yf>;vfJoJ=mA+#I?X!9^>0<w63nrcH8loBYN9gAY2i$vGu_y-?6-#O4%uPHJB-
zOxA!qz)W-itRp--z*7!<+99xu&>R78GvL#{1IGx;3UCE{mw?YU09M<E-vAyef@k{(
zY_<h|0KC+IPdfq*n}$CDK0Uyjq+dW6SZZq`eRVL;sV$mFUmeb4YVAbE4Zs`UQ@iXq
zk-i$#nOZxM_bq{&x>M_GB7JpKWoplWu>fc@(Q(2yGhG3orl6P8;J1Z-^Jb#<2Xre>
z;6ebLDcSQpfg1r}rerPap9BKHOvzeS6)-A*3jE5y7l?rf2n!l{IGP8(1+FU|d+mE~
zr3kz_p4shZVhIBFk#J2ULBKxOt_f8j6BTesr~;X&fI~tR$V3Gk5~@HZ{RI-}=Ur^y
z@n4sw1wMezv<r3;yP!gQH3WJU?`7HcYTQqQ@B9FGrsk12kb+MD0000<MNUMnLSTZ!
Cn7sc0

diff --git a/assets/images/native-tab-icons/home@3x.png b/assets/images/native-tab-icons/home@3x.png
deleted file mode 100644
index dbd209645b85c3586887d2bc425009d27b5f2b9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9EB4?vjF!m7EPfq_ZH
z)5S5QV$R!HhS|Y^5^eK61hhn~O1hdAnqFR5db3&T`lC6H8xl5oEzG{%^N;nv)A4_7
z>=$pkW*ieM>AtjZs+?s3^TG+$d1rQhuls)Qd!x9MQ_=p<6Hb2@Vshe8w2^&~EA&4?
zWlMwd1E~Vfb(5d}$?i=Pwulxewts#=jCUz_jsHaB^ZW_Z+YDL$rA*jdaa#5Q!>t3y
zMUUJ$ul_*M^r_*8N?yy)HO%t@jDH;nWwHGHhbb<YIqCrW1GPnSD*rJFKVUSCeW(|t
z70J3wGQ46<$SN+L@R)}illF0KxelT?ag`{o{SaXo%KGcTQbx^Zs~ohCi^l!b+7Nkx
zYki973$Z<iv_o0jRM&o(5&9r@ZupMP5v*3n!gj3Gx?sNRQ1a8~R-q3Bc9<4)>?xi-
zr&Lvqjjf#ZxytG};s@q7HpU+Om@bzh_~q(>4eOTFaGtD8OYjIUnzxLzDmlR+yy)9y
zmc8Z%3$!io9Sl0g##W+w+<Jn73J0fC(*%V#u0R6FUR2nWb~0b@pL*-P`eXaQi~NW+
zcQk%r`SHfdz#z@0zRvTRb6I$c1WZ;;UJ%FE^e5dbfJ;ckp^3>OfPs@s!I4o#qk)BW
z!U6^i!AKF4NeX+Km+qOQ@MnI+^iLc!%pxwZZkYJ=&}BBRT@2qg#odXnnR%!GF~`kw
pju*<7+;lq`*?eC{k!9mgc9lnLtEYcrzXVJ)44$rjF6*2UngHD605$*s

diff --git a/assets/images/native-tab-icons/inbox.png b/assets/images/native-tab-icons/inbox.png
deleted file mode 100644
index ccab0c1eb69f7dd22a6db32c06e6979017c6b5de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpx_Bl
z7srr_Id7*r@--QVxX4>uHpMOK){A(3c285+G3ggf{fpTX*}J7CIqh2(s-b$U#Zyi3
z<@-I;1lZ~phy*mqWu$(u<FR8hO<;;;-pOAgC75%sreN+q+n=l_nBoH2VvhR8<t=2{
zE6Ee8Ry6C3UzCo?`GuGE&5^v2#rB7D0mHdN(F%nvs%5_C#A+Gz*2^}Woo?IAP@bUq
zEc}47+5raDg3Wr>XR_~~*PAw#MW;b4sp6^DTpOi?=fB#5Z@VOG7vEn#TV3<7=NFa<
XLeF}pdf5pA{lwtu>gTe~DWM4fKHOx@

diff --git a/assets/images/native-tab-icons/inbox@2x.png b/assets/images/native-tab-icons/inbox@2x.png
deleted file mode 100644
index 609dbffa777dcd7b1d9427db3b9bed5bf1d698d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVgf=NU{RCt{2nLA2DK@^5R5JG~DiF+{Cv9*X1>;y{@a?8;TBr8bi
zdllj`bODN%J{IA#b7WxBg!`I1_c4U?!{1!y%=y1zZZii&qRQ0)MnD9pnjG1lrgvej
z16RN|pd0cRa0&EW!*2rb4F=Z>egpb0Cm&LHZT$*#^8j225LPGnJS%+1-n+%Z2Vhd;
zPdou0V{&`~?KFT<LiiT-tCaw;lU5YP6ijJO)0jNtv;q}VV7@ga<(fwTN|q7;1i(v5
z01yB#DFHwLyrcvG0q~L%0G0q?25hBx0IU`WXKDr+d(X-M$m1tq#UZ>|`&_VBB>={|
z4gh-|eN<HdHx2-|Ap-mX`#HiN*tNj{82<o=Df=G*zn(o*l>l?!0ms0$^$Boa(%z~L
zfGVw)8XyWFpw95v^>H^e57Pk5)AdIHA$5W?pVy5p0tl)Td`b@W>`Y1r<`-a%oa)<|
zR7l}Ba8%dMq~b<Sb>8_imy?fE+m3bW9&``${IDVse)<P9c$}t<a;&@n0000<MNUMn
GLSTYG<hbDg

diff --git a/assets/images/native-tab-icons/inbox@3x.png b/assets/images/native-tab-icons/inbox@3x.png
deleted file mode 100644
index fa76c2e9e48e364b058ce7d1f87e36b926d705b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 660
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9EB4?vjF!m7EPfq}`*
z)5S5QV$R#yd$XoEinPsN6PvWUcFVS2wRKheO&%Y_u3X7FaxQkgLs|CPqgI?ZvR}%s
zSS`?D)^#i?C1sVvzR5G^&OKvZDPJ)=Rq|Zrx8IV}EEQS=7HP5_VB5gj)9CqBvOVg$
z^IPs@)(Wl~<{1CaqBr>VraV<MSiRt2%ugns;*&es|EyfF^3F%w+;iIL9Dmj=nCbdd
zV8>Lg=QYXOuNMB~(OJ$>73TPH=_i%2a|$*eW8LeRb|2W%6#ldD<JPx~`+MTjHbyt_
zCLjEMK<n?p>%R`Zco}u3Df-yd&0ha^q{MjgCy7;G+;~CnZ|eHR>jTd?P3~)5_GNme
zd;GrVI!$U{rsvdpPH1G2^dOVCAjAE(eX@|@O~$+l-_JbpbCUh7%Chr_Oo~<PEB}3e
zBOGd%>z!cSZp^W3^MYHe1iolBFSxGDZN<YrGiWEzpWMg^%=Z|d3q9fKVGcOUQFOpN
zK{Lqj`orbVSS%m#7CdCx8pCo=Y{habN4_6?Htg$Ub}pKBD1Gq<+43;foyxzL^eZl1
z^2KX{^-~W4As0i($6Q=xt&iiyBHaXI7Vnf-&e+@36#H<E;LhT?p#dc)C9lnx`?r3Z
zw#J?ixrqn73|>o}Uw&nx&-t&$23KDH-#54WtlRNJfBEaD`|unt*^vEW+o$B^k&%3t
z57yT0{+a&japgQq^}9?lta5GpmDQ%Ei#!Xw9u)V~i9>P4^!mh7MVVd4Bz^&t8H1;*
KpUXO@geCyTs3YJ2

diff --git a/assets/images/native-tab-icons/insights.png b/assets/images/native-tab-icons/insights.png
deleted file mode 100644
index 9787cdd1bbd8e30249f39e1b95ab6162a3bbf8a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0B}qg<RCt`dmBC6vK@>pGB5UnNKOzb816pX%Ch!OR4K)g)PY6rM
z*3lwYL9TRR5@G#C;5XPpaOA>_46pZ|Gt+xsxSN?f=fKR|83>OCFbBp!8z_f@s=x&>
z06NzA1E8$@1#W<SSMVwD9f2&Z`F>>1<OC?DfeXMRuu1@I6G%>hgE+VhzNIWwjsnT+
zI6-gABIO}i03{oK<^We70?C#wnB^cCnc`zdxbhVInBvO-K~qbTQu^fF6u$%ryy87?
z!NfzL9CE3jmrXopEKqveH*uANplu5(IS7uT=kS#w{4?&LPcnk9fO^txy30UtpLSjM
zfZ;#jubPn>QqT?9mRq0i(wxc60saBhe8AB-)Q{nl?s$1tq%oya|6IkL#~Sy*R`8!b
Re}Di0002ovPDHLkV1h7Vo!|ff

diff --git a/assets/images/native-tab-icons/insights@2x.png b/assets/images/native-tab-icons/insights@2x.png
deleted file mode 100644
index 22c775d075e71ab6947e9c65b6d76dbc56987924..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVhJ4r-ARCt{2m`!U_K@^6ciYb2l03m8s(5)ifiILiNqn0WNF2sd_
zf;%hz3A<<))$~Kf-%#9%J8_}df*ZvKjE3UYNZrRH7tSKw-g`4QcjjgW`og;j$;|tZ
znK?5DhNB7KJ@65D3fu$62t<d04j?gifw#aNV02jFP6IQ*Ja7vbN%+o%gzyq`OUH4p
z1G*eu0PTbzO9{UjHvkazYv7oR;1ysFX!Z%vDF`6IFW{oh@YjIt907^~2(SxG77czB
zcsao2HUI?p3!EP`d==OlaAI2kqWdiOo;a)PP&@z-U?WfXlfX{F32g(2=@A<hoKF@e
za{=((q}aW(Fp(<&0d8l7ziw#~mjG|Fic~WIfUfS*J$hg<yh{K9?#2g?E??gQ0$7d@
ze${e#*8m^lgFg=p;9Y$1oqzy-1GV0PPdNym1aL$lia2@{9f}V;TM~dXJq{gUA#{L7
z=m5_g0oe2(U@@iJ!4nSxilJ|oxrtr)VG_WM2f@V9(RF{1Top1GK9RPOe|iv344#vz
zTK6EJ^zlj-K+S`I(#Myw07i1Q4a@eIv>MQ>x(7ie#rH8##nXS`D{v4)O?wbndi)QV
zBB$0vIeF3)y?8!*5PnNvaRay2hgsa(nxT-+4GE$RoWYW+B`>E<;5e2Q?TNJ#PMcM2
z?K{(ygZ887IUgP0rKqA+aof`Mpq{5l*;I5dxvWd8l_T^IZ6aJTx!aVfF?}sP(l$*)
jy`Z1n$a;+IivaZ>(AHorVxlk-00000NkvXXu0mjfu`Uvc

diff --git a/assets/images/native-tab-icons/insights@3x.png b/assets/images/native-tab-icons/insights@3x.png
deleted file mode 100644
index 3d5f365b1ec41bdc0c1923241fe482ae5d80a197..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 975
zcmV;=12FuFP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qbfk{L`RCt{2oJ&YmK^Vt>nPyg6%jiW>ZCdqMM2fu=C23K#wykBU
z>+H2_<D!%nMGq<{qJ2=*CfY<nQ5L<ZD0)aqPkNY6Onky6y!W1aJu~wiJ%9MG6#35&
z&zzZWzB7<KEdtI0H-YoO9-tAZ3LQ*?W&wSG8OHs<4WJE}!5G!yEO7q!AK)TTO~N$|
zSPaaL`1{u*0?PDdU<nCOIj{=Y4_pP_W(;BwI0lsE`5U*20AxJ?904j(rc$6DI1PM_
zFc1sR1)w3n0BTU6$v`XcvcLg6aSX`%H_$>Ll>zO*ha$t<N6j^$A=?SR1dpl%9>x&d
z7a$|^-Z<A_CISa#A~XpDWZmTw&O)Fk=D@xIS?_QGrv~VC5H<uLJ8{>>31>6#%Td@6
zfQFU;v8<Eofu9b8h5}^WJyJNU9m5F?$i8Tn77J&tqd7+tAnR+zz?lTx_Yh74AnO%{
z0_ye@Obeh3g}_-STY#|y$QIwGN8MXJ@(4!@AnRRG0JVCCqY02L&gE3)2zKS80Z@Ow
zgMhXGa5Mq3Zpap7Jn%FHL`SwD4T0boWq{6Q3u0@?CI$5GoNd?w*ryZ_)+e$p3`4;&
ziU55C<_s5NpJG5~1d>bJ_0OSP$JbXB15zO$B@L5QKvjX^7?f*S3MjWiE)Y!;0BubH
z<<_<oP;NCT0AxISP&VcVBJ?M*ML}Q_&_|<mXoL=F0{=J7)c%?`fo*#xbCy|so?sY-
zo|^A5d!rzv3FOyAQ0UF73256goL74l1T}%2wFaH3S_MH(AV+Euo&bDN5Y~A1XBm4W
zol+3kc=mA$Q0Tg}3E;Jb04kB5Ju^o9teB?qoeF~cax+D!0(hq&yleML2VGHWS1<tA
zZW-z4Om`Iw!j*fX)PVA7<tW|24oF*bEb3A)pt#*h%%4-<Rxqfzd`HF<s}{(CzDc;>
z1M_gC<-j)ugDloRe0(b2C=HG#VYc6xY;+AL6Vi7DgN|zZ>DDGZt2!ZbQm-skf@pq#
zwzxvyR`x5UpemPj(x9?MV5jt3s!=U)PXU|<as`G;l}U$w=Di#~*Eh|we^jpu*(E>s
z0Om2UU9Q7OoJxQ-z)2~J#|5QNYRGlIua|JCQaM)XkOR6`1pu*+>?L5g%yp4ZACj&q
xa{1AEX}xKZCNA6Qwn2WT?#`c7sZtS_{sKvC8Y-o+g315@002ovPDHLkV1injpa1{>

diff --git a/assets/images/native-tab-icons/profile.png b/assets/images/native-tab-icons/profile.png
deleted file mode 100644
index 23b477c9c67eb099a9cb65d15684e264ae58586f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^0pGibPRCt`tmCr6iQ4q#|U6iEQ_!m3_#T$r<$3V9l9)LcAwGe+6
zO%dJziK-=SQeJ?Kgf6<nrb*=_-(_-pdwbg^;!7rJzM1pQ>CD_Y@DDHxWPuZ)C_53C
z>_vDPC<Bc)Rsxnf5$*#Hd?H`Ed0ti&XJht(cogw#bLbgZ0|w-uk|8b)yqNf_c1i5b
z&w+&adEn9bD!`n4F6P4c_QGmz#be?}fwzF#SAlWG#C%CoK?%yHEZ)r>HbNSl;TH*0
zt_K1}(L3a7Zm|=R!1*lF#y4XfS&^Tnp&nL460G=Q2hDVCS;v`3H-3Kf15W|s6-}KV
zck;WB@dw2q(qIHQ0$yc@z;KJ$Q)v|}c`GtU@5oE*Ca6R%ksp)5rji$AIZf9@)Dn43
z{!pVF#(-m>9@6BxO6Ou7hBPQmO-`Ca>-uu55f+_i@A|SchMV^PwUP<0bs*l5)pXYV
zz7J~7LKmWq78bZF(8}#qe3uZ!wQ{=^zl`!G#I<s}xp|xpkkVFcC+r%!*om+oZYyq^
jr_y^m-JCa#;-BLiwSE2NzHp3G00000NkvXXu0mjfWRKbM

diff --git a/assets/images/native-tab-icons/profile@2x.png b/assets/images/native-tab-icons/profile@2x.png
deleted file mode 100644
index 92b5c76f49c84adba7216afb8a5205e209a3dc1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVikV!;ARCt{2noCHPK@`V-nPsWbW6@(_S1Ah07SW;yMX6DdSZ!Jr
z;l?uC7)B6ft1NdtjHu9pq-a;sDrnOaqAV9tiT1E}?b0%O-WWK7e9X)@^ZDI-CH%ty
z`IvL&KQrewbA@62Unl}9fI6TNI4;sC-zsFxkU<tu2DAXLfuy5!1I<9G*ho9Z05!l1
z57H)i4paj<=_0S(;AITNgYpL0m`dW~fD0)go(xDUkRLbs89+zK#D9Q?z+s>YSOqK+
zSuNj=0FPv>&DPU6gMA+G!7|xLU>`8u!)5}g2R>Qsz6Xlq*m)EAufQG&=paVQ&TkS~
zDBpq@3+x5HSr$<^7@s$}O&c&%qca-V4Sd$<sNLQrV}h6^uBDsnNz|Ay1?&~sxgaJ2
zHywiX1~5URp9@?y=$!K<zurPVTQgo2qw5}-=9-~^Wm^_e?n++y^ecng=yqPAGD5oC
zY_O$HqTNvNoQhqIAz*br-;W0o7I4pEZ#K}U(b*bCKFiP^sBB|`^8LRN7NB&-TkO_r
zbh^TNr<I00Z*m=lxe>_s%N&c{Ttl5$Zd*W$MnM%R8;S<8fJBJx{TiLqHid4@F^3fr
zmDhVBkpBXV3bCEgxTi`m&O51k8yB39*tEHz-Sy-uGy_#*<^tu*KRw9*kWAx(qpmff
zPBTz-kgnM7v4GHYH~`x;`a99!kY=E2iG5HhHN!-_7ue!ybB)H%LEXS6&A`R@V;ayP
z%~`LA`uhMdHG;h*8eYd-7qFDfW0~s$bS|`x%wvOwmpWmmAodA1q%|l3c8H%gi8M%$
zRT9!Z=uqt%#JV)9-fqG$Netcwemi8KU%)M(R&>K~#x;%V3fVJ@;VH7a-y;;Ue(4i`
zo@|+?!>0uawh~I_2gZz$W9=OT@u2jGyDHlQu|P9cb<0LHYZTPmW<S*3^m2^ElL5H|
z<PDhbgl5c1+X6}r$6O%(+Ll7{Ns;?<$0#sdYOL*amR#L}N*95<X&|2zxg&E1zjwMk
z2K)3h>6R)SFZFS}I>#-YhBqbW1}f81jwf1&0O_R2St1}`UWqeJ{&66+dZEDcr=z&#
zox{aH6vgsNoNn@O<;f-%6v``cI^8Bg%*dBl;&cRT9w|gwih{cfSWB9aBd-NrF%hrw
zDN=Dl^(8ChxzFdPS5@gxNn@6gAG%FQNX4wx{HsB&xJc~5ISew0e@nXoP-2-0MF0Q*
M07*qoM6N<$f?!p}j{pDw

diff --git a/assets/images/native-tab-icons/profile@3x.png b/assets/images/native-tab-icons/profile@3x.png
deleted file mode 100644
index a620f6bb3dd49f80468cf839c1baa3d85badae48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1465
zcmV;q1xEUbP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qdYe_^wRCt{2oM~uXMHI(>X(LH%6Vtj-6&G9(f>^MmDu@zO>1xH2
zYO#%0#kzwlwQj_MD=PR!{HASF)8Yc+0*bY*O8u_UC}}EwXicrLYFq7seKK$^gh$@Y
znYnY{yYKn_@c(k(y=TsxJIh(-KB%LPI%*hgz%1ZuU<t57xJ0hal6(FaXa+igHNX~N
z4^U9j-1|B3w8${BY66YG0$?NXw}(MoG_v}E`O-$!p%r)(_$8uIO3}2jO4`glCIh{|
zzA_l5n7;#00h7ont^sydz%a!e1{RVdw90x=$Qk>9DU~+P#lTR6&g_#n|BY}s(lq@6
zm{BR?ECdb)C_Mta1*}x~If<Wihm2Am*C62mU>;@0&A?F)CI11|0<(b$DcYSV4&*xE
zkVpGRfF8<doMRqu??qsG26~(dyyP*8jn2y{!?Zf8ROkcXEQQP_nF0?1uLvIm=E`p_
zoGv3uJCf#QxgZ}@DDel-t&n#b@H+69MV9&PH5n}~To3%I9Mu<*!B#$`Xx!{T=P2ae
z=DEO|PTiuAdoD1b+})zO0R4(azfeZr&j;*837=KSp9*}XkY%Q26f9C2N8{q(o5DB=
z?^1?58Y7utHx(uWKPje_X5_Scx(2p|_5wwF(-hNfN7~d$uVO*gtT_hnM=(yp_mpj(
zr&ze32sO?L3U^<#TN#|`;X7$)WSyaGd#OX#D9{pOpw$k+?|8_%FQRc0-tE!8YxF+i
zYn(<$vg?4y8#Gv-fq~xiX#Z@7Td~_WGr7Q_+zUR!fX^~8(5Id{yzG!?Ja;uVS_B;u
zFW3i~E!US{dg?G;g62~4HfRMkI}+?`@yFX47-&;~9_t;;h9>soDu-fS0g64Bfq|Y0
z&|{86<`o(tYaGe02?2^-o`Hcb3(P0|YLRLDJ}0(V1oQ_el_=)&$bC4RBJsA#B6qV!
zz=%b_O2V-`qJfO_7m7O_+r1TS4#hfBC}!UHClQSEG0>1gk4qi$tp&&q$HQ%;gGogU
zrZCR;5p<a5Xk%vRDnCjboG5cW#P2yJk`A^Q(-Z|tqTBM|PU7J>-~r$_g<;G+_eVaY
z@Ux}8#kL1mIPyNRVKN3c0q@Gx+b<lHV7MovLkZtn`e~{*K?eGc+QDF`foxN3gxbNL
z&?z>@k?L%q`q3bL30kDH-sZ<!tlOm|y;z2~;dOGYUG9mAscE)(m!sI3Qn{0XWfD~n
zINs#gkvkw|nj3+WQtIFe##_^b8jl4i)FehRrJ;WV{GVbP8Qa8Is`Nw=9#0c$xPsLW
zJrpsO%O`=o5sXrbd!-GZD(OdQgH>C)W4}Tf6S?2x7>ThtA_YZPgx?~4NR{sBbSQJH
zBRRgcjD{)ZcHn%Aez(U+m^C{p0NYDEx76`=%0+V`<c1PDejOv_syVFCG0wslvoM&J
z$K;&$SX`nw^r^;thp??<?tL`}1}Q~z7%RcHm}Q?v+42e&E|MLjkaL>a`?ZdHcFE@A
zg;frrnp8zz=+gCJ0?;bQ`wKPB;KK{Zw-1FHr#Yk%j7d^rDby&3VtjixHwPWbim8v_
zCFsjRXJYdWB4SF)a!ua&W15Az6lRD!UZ`@KaOgrZLKkp22b~P%5lJg&ik_UsT|S96
zlVmFkmMPPvdEw!58fWZuvwet?7gpqhx&-ZxDrKcPn8lYpAuhnW92jFfKj(OIgsz<U
zN;_hD$g$BZ`IpfOr8HItmV(NT7CGMUO1j11F3IOq{2TcYOq3mDL*OUmww<X@0%`9|
zU|!J#Tq(7u&7Pxcw>;A;rJ1UjMlsMThXrQK(VOHCmb&HI%xd{pmpbaGgAn`&3>*Te
TRsNQ>00000NkvXXu0mjf$po^`

diff --git a/assets/images/native-tab-icons/receipt-multiple.png b/assets/images/native-tab-icons/receipt-multiple.png
deleted file mode 100644
index 88c0d4ae12e8f4437282f20c5728546efbdc8113..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>^1BS}O-RCt`t)mw;8Q4|O8pKF9-FhvoCT#8aslhnwA<dQtdiw6?L
z14@%5k|-%nqe-NBle~H$w-PTTB}y_1xulF+G&07gqjhRKon!c(X4UTOz1DyK*FI~l
zy*B+oMkn(X*c9`L*j^9eF3gMhYJ9~SG~yj<Xu}oU58U|pj>4QW(xaG(CHRTY*os#{
z*o)UOPsbMwKnt3~;Ttrd3Da^1m+=W7OGs*cj4V`J3c82*hUK|~_Bx1bF&1NKg>8Bo
z_cFi_JdHnW58RH(OODxyDHVH%<_=aBjJq)-1r+33f<26Z5t5XnGu<$|U>uX!hD5TK
zVH-}z>2mD(z&$E(TuL1bi%Q9jj|0$&o<4GLFE}m~^e2kH{o*eq-EqS15?fY%nH(?Z
zcNQI7PmEm=j%G}XS{G$kc7VpX)v0b}(ZQ+2*in+$5!hehpeb^c>Sh%QS`uSchOIb*
z8_A8X8XKYz@^x?I^$%J550|P7w<Dq76a7I9PIS*oBJjJxrDPAV59_fY`b#RU3HEI0
zp2YfUnS+th=+d~B$v7;E1LW8{VY?XXlchTg9Wx8VW*ovf+{K5A(7liSZAm96m7D+3
z<Z6Y{5Phl^??<V0)It0*z6;|$$>wvb9PBM2=)v1$eJt8YEiUIE9KihGID+9-4%S7f
zWw-KqknF+O2;Z&foLNa`q*JSis$_EVs85K~W@MRUtvjo<{w2Qv*M=gkvHHWL00000
LNkvXXu0mjf(eWO6

diff --git a/assets/images/native-tab-icons/receipt-multiple@2x.png b/assets/images/native-tab-icons/receipt-multiple@2x.png
deleted file mode 100644
index e33a87c5e95d7955a3676ced3e691b42cb4c47fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm003B(
z003B(0oiRg(*OVja!Eu%RCt{2ntf>1WfaFhd#Tk5v!oVoRM-oOq=;`#p;bafw6G{*
zj#_pjNx~Nb%Rj2w%2^RqZ1iSkDO#+k45g^lBBEwmEh?1)rNq=yu~zxA-FV<!I6nS<
z&&%EQE^1#m?EaqToacPc?>;Z*Id?FC|29Sg6H@vv11k6zzz`Xn&|VGf2Mz%lt8XTd
z1!fe3;0eH0Kv_cHwL)YIaK6>IO8Rp0Fi--V100aHr<K0xJ1%%soV^89s`f#^Pm17f
z;1cO;u*m0REwEWVuTkSo2F|v8j|W}^&IloTF>tfhHWoOn9CiX#()UaP!9Rg#fqf|f
z*s@jm8Uehnp05YGMQ^Fat1M|oyduia1LZPxzDjVq4Ok5H29k8iA@PMQ=pLX2ct}2L
zT{DdhYJe|+m39CNmGZ~(^=6A8!xV>Y4!xg&+49#sudoBi6p64cS1Jx4M%XQ|1E}k#
z0A?x<&qdhXY6no$PXRokILwQ%n`8%2qE>w&#Oz32!27^nhu$j1;f9Fu&msZeM3OWI
z(k7q-Xq9zTC*P*V>A<%sV|=IdMn(8d#G9Ts+6FYqp_4lgLNO<0+`oZR(WwmFo;RjB
zdE8+%mA*l5)3%(e^mYUU@LHOa87T(6DY;MxP6MWU*4GrJ|4~2ykEA)9;xIB<XBvh8
z6M<>K1HdxiQ^}7)=JcIvti=KPx2F*~&tbF&m@mdHa+G&^c9>9kOmUbWpnqvv0Hw01
zvPG6R6o;Dv^oKfT!%^vOv7}4+ALG&O_T3%c$&*BnBx4`QF7ZQzZMPzIsz>*0Jb2PG
zfXVgW1KNSPKs_)#;eKn<@%0fwR4dzG0;gLd?sgcP6#HbtF+C!HI%W5XL(kk0ow(Xz
zTuU4lMFfyhc1r`d+(ca9FgC&YV5ZJRz`el1hyYsE823B$t_UHZ@4;F&%RPCJ%=>y-
z2ko*hestLSq(gB?D+*+#s^LY<4pJ!DWK|=4iJuei_Co-_EB}L2bWBPfgth_@`VIJ8
zF5jlga2s%+CqJrE9DYsce>*gQxq&2iNz(SREW8G(g}Mq+mpjIrtn@zfTtA(t_k7ij
zvXJvZxnt}mrMKKu0B~Z2!$~uJ!;OxyTa;e2rv&4~NePv)oZJ;jxJsr*ldP@3909CU
zcDHznU|wu@Bva;=rBNfPKt>Lv4%rrSRp?OJpvJ6qlp%xQs*>%M{w}%fXA30zl>alW
zK2ySvLQIvckTOJZ&{gi$u>r(X$qFeG6^AcW`%|$2#8k-&DUFK5tEzogYyhEEvcAfC
zsrToeA5<KgRQolt0i05xA2E&qOHxvZjk2>;sDtYT#i2yyWfzhMLaJoBlw!G%P0RC#
zNgY&gi=!>Frer=c;T*~P*Gyd{GyD3w1cJTlguD*;L-l<xhoUa>u9ZHM;2n1?5ofz)
zUoMe1ssnh*vKa^Ll#~3J8a{BM%;%^>DPP<pBu$p7afjTzcFJ3|QEg?G{e}w1zY2_z
eYvlm`*Z2pnxr;KmA9)%80000<MNUMnLSTZ}zBVBM

diff --git a/assets/images/native-tab-icons/receipt-multiple@3x.png b/assets/images/native-tab-icons/receipt-multiple@3x.png
deleted file mode 100644
index c07be16e489816bb3c3708d29be37abbdc77738d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1842
zcmV-22hI42P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm004yG
z004yG0XRB?cK`qe<Vi$9RCt{2Txo1oMHK#u&<E}jA&LqL2wG6o5MvZ8!37O!jdiO#
zL|j@8YU8emilUKL0}2|{hPX$GQnd-75*I2)jiRZVswfgu5K#mRDlONX<h*1$&dfV=
z@4UyYzArgH+B<W4&bfDH&Nc;#D58k}5qbg0Y;PgbiUR<w2Jj1jagK4r0ek~s34k8>
z51<mjB>+ksW9Zpi03xQp09<SsM+RwD#*IQZ$H|H^F9PUo8F!g7E=$`0Ow|lKMH@rL
zPaS#!SOnl_Hh>Mg09d6d^ge*T+PDD#elr*-OAP?}02m425AE4a8n063=fY0NGj3J{
z+zQ}w%eY4@3bz6ns*HQZVVo?r1L!dPexBj)KH-r4R_60~5(5l%EQMhJwipDRp)G|m
z06HBCuLE!;fQJOeanVwPjLQL>XZY&pYI9GEW1KU1GA)fm3>)OT4q=~X!|n>;tAvV6
ziB3HoPxJEc$3O4JC!Ric6>kG7=p|nTpxS1j8x#h=12{=}RxJ>C4GR|)h&p+HQZbF6
ztpIQhfELGm+6J=7@Jr4<%Nn=~Dm4aw1Gt0tnN0;$+=oVJI$Yps;L`!@1K>U7_Z__9
z{|kquK;g)fDl{FA3c&L_+Y;NE{g0>{QLU!Ko&k808)HRV3Y3mKXpTXLUla0t)MX%b
zEk@md78`W<C?U`5T?T4Mfzpu&tu*MMo<?zqHf}3!Pl3{r=SifeNbX6<v&?0na|@(c
z8!u=2VsB&bcQnUR6s6Di;B}Cu!=-_Jt1cKF$N<{_{K(<JJPs_+VpoDrO9`Y#I#ruD
zCV|}KVLP#V3_~<?tW(Q=$w)^$=Yvr~87K{+Vy^@SqP$d2tP?W(iNA<^VLzc9vkh}M
z#x#&9(qA6aiwzCwUeaWk`)N!A-6#?486mR_@`ocloL0(F>v$=qfzFf&H%++r^bKH$
z9XMfs0_TWk^2YAUCq;&!nsPoWX2dkmp%S4l6f&FYQO-FKz$pN(2JkR|HvoLi3Hm4i
zsaZ-}o?G(LMJZWnMBE8rI)Fi(m^zp<b=Pq`LqXrSoSKdDOnQENYz!WB=!np-018Ec
zsYcUb-xxgJfd@9EKxrSUH>6M7J$XFoW1x>yptKJ)8g%%=lLu8j#CRbEO8XEM3Uo+H
zN-CY>W1#7IQiQzp54ie3?!=t{UJH=P{F7Y<6%TsyAm2-ji3x;V!&TG<PM>5Wb&B(B
zsPgoEOtino^9s-TbP|hktOw%`ep^QxYE3>^l+ZxrY^pfkWA0jCVfXf6PTd<JaDPGr
zkteQVkjLC*zQUFmngwhrPgiS;4}3ROohVGvtHGvHxrr$E<c$>q#<bUjK)Izs!G~To
z@clAy*wh6J1dKPuY$>6)JCM7{>Hus`Xq<@s9vzLsx#!0*&;vr|&v8I%i_}l#rhqzr
z%Po8?M}cXxVY$}}=h6Y=jmaLu{Q%%Gj?`Zd9I5*d#b7FGg!A@@W1w-{LBXU%QM`)r
zf;m))jfH_JP}r9!52Rv<V9tke4b&sh=2=LhOrpLI=345{A^}<opwxPPi?rF_%`L!3
z1L)7;33<q$3wgb4(4jTQoV$`3Xkj2DtYvR?J~w4m@yQ|G9Q!kmTz}^?!`!AEb4)$i
zV${dz8+;1DEdb62a5(oZhQMs0U#1`RvvSO#uQfKRJ&aSA=j#E|SdA*Ha5SLnL|<oY
zj28;kl4s+T2t%KUYx625IL1=5Y9b643PqoBzEH|l66u#r6<PfPjBV^ENrmglg}Er7
zN2Qi#Dd&XUy?n=Gz2`ni*-+iUwm_KpCq}Dqb0nwCCrF*l@!kSnK9cl`geae`W2I#*
zy@bSQ@`%T(I8im28_}zI^In+8AXO)-$mm#X89OP2fo2szsgOi9Jsoo_V`(`j#*`E&
z?Mu`zt)kX4F4y%b5hkQSVPB&D0u>d8G3}w!#luseurE=Eii$GB7&;h&pfo_fxX?sJ
zNfjAG-HlGqVE8@-O8XF1ZguEaM9IYnh9xOb+C+^Ujq7O{>a)xhSK6+V#=_hJD&1*#
z+qT}s9a%mq8^5Xb0O%;u{2|x<d~ehi&_HxGlyH&5v7}~)<1`t2DR)gwUl7=V-N0UZ
ztVF#H6#=~4N!mXKkW@I!EwPyE%2HX59)STI?gYgMM_*sAu8fU}Kp9T0n#Q$R-s&)3
zPHIS#q)8$#=ws;N$wtj%b41)VhP~iE&mLv+jNfKs>!qF4V72CCsnygWTrAX;ZgwQn
zCMu~EQv}}au#}bA$_-Jbx4cX-&KCB<T{woDtWvjR;-HehqH7&vdh=C=4#UzaLV>B7
gp@<@iC;|%p0f1sTB9!jRX8-^I07*qoM6N<$f{Ru}xBvhE

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts
index 9b5ba3d83ab3..495f8dfcdf42 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS.ts
@@ -1,8 +1,6 @@
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
-import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
-
 type NativeTabGlyphPath = {
     d: string;
     isEvenOdd?: boolean;
@@ -15,8 +13,8 @@ type NativeTabGlyph = {
 };
 
 /**
- * Vector copies of the tab bar SVGs in `assets/images`, so Skia draws each glyph at the bar's size instead of resampling
- * a bitmap. They have to be kept in sync with those files.
+ * Vector copies of the tab bar SVGs in `assets/images`, so Skia draws each glyph at the bar's size and the device's
+ * density on both platforms. They have to be kept in sync with those files.
  */
 const NATIVE_TAB_GLYPHS = {
     // home.svg
@@ -77,7 +75,10 @@ const NATIVE_TAB_GLYPHS = {
             {d: 'M10 1c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9m5.9 12.7C14.6 12.1 12.4 11 10 11s-4.6 1.1-5.9 2.7C3.4 12.6 3 11.4 3 10c0-3.9 3.1-7 7-7s7 3.1 7 7c0 1.4-.4 2.6-1.1 3.7'},
         ],
     },
-} as const satisfies Record<keyof typeof NATIVE_TAB_ICONS, NativeTabGlyph>;
+} as const satisfies Record<string, NativeTabGlyph>;
+
+/** A tab of the native tab bar, by its route name. */
+type NativeTabName = keyof typeof NATIVE_TAB_GLYPHS;
 
 export default NATIVE_TAB_GLYPHS;
-export type {NativeTabGlyph};
+export type {NativeTabGlyph, NativeTabName};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
deleted file mode 100644
index 6e9db9a6eacf..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import buildingsIcon from '@assets/images/native-tab-icons/buildings.png';
-import homeIcon from '@assets/images/native-tab-icons/home.png';
-import inboxIcon from '@assets/images/native-tab-icons/inbox.png';
-import insightsIcon from '@assets/images/native-tab-icons/insights.png';
-import profileIcon from '@assets/images/native-tab-icons/profile.png';
-import receiptMultipleIcon from '@assets/images/native-tab-icons/receipt-multiple.png';
-
-import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
-
-import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-
-const NATIVE_TAB_ICONS = {
-    [SCREENS.HOME]: {type: 'image', source: homeIcon},
-    [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: {type: 'image', source: inboxIcon},
-    [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: {type: 'image', source: receiptMultipleIcon},
-    [SCREENS.INSIGHTS]: {type: 'image', source: insightsIcon},
-    [NAVIGATORS.WORKSPACE_NAVIGATOR]: {type: 'image', source: buildingsIcon},
-    [NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR]: {type: 'image', source: profileIcon},
-} as const satisfies Record<string, NativeBottomTabIcon>;
-
-export default NATIVE_TAB_ICONS;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index 94d7cf7d8787..453a76a3dd6c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -1,45 +1,106 @@
-import ObjectUtils from '@src/types/utils/ObjectUtils';
+import FontUtils from '@styles/utils/FontUtils';
 
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-import type {SkCanvas, SkImage, SkSurface} from '@shopify/react-native-skia';
-import type {ImageSourcePropType} from 'react-native';
+import type {SkCanvas, SkFont, SkImage, SkPath} from '@shopify/react-native-skia';
 
-import {BlendMode, ClipOp, FilterMode, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
-import {Image} from 'react-native';
+import {ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
+import {PixelRatio} from 'react-native';
 
-import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
+import type {NativeTabGlyph, NativeTabName} from './NATIVE_TAB_GLYPHS';
 
-type TabIconPair = {active: NativeBottomTabIcon; inactive: NativeBottomTabIcon};
+import NATIVE_TAB_GLYPHS from './NATIVE_TAB_GLYPHS';
 
-type NativeTabName = keyof typeof NATIVE_TAB_ICONS;
+type TabIconLayout = {
+    /** Side of a glyph's box. */
+    glyphSize: number;
+    /** Side of the account avatar's box. */
+    avatarSize: number;
+    /** Radius of the status dot drawn at the content's top right corner. */
+    dotRadius: number;
+    /** Gap between the glyph box and the label drawn under it. */
+    labelGap: number;
+    /** Font size of the label drawn under the glyph. */
+    labelFontSize: number;
+};
 
-const TAB_NAMES = ObjectUtils.typedKeys(NATIVE_TAB_ICONS);
+type TabIconLabel = {
+    text: string;
+    color: string;
+    isBold: boolean;
+};
 
-/** Skia reads URLs, file paths and, in Android release builds, bundled assets that resolve to a drawable name. */
-async function decodeImage(uri: string): Promise<SkImage | null> {
-    const data = await Skia.Data.fromURI(uri);
-    return Skia.Image.MakeImageFromEncoded(data);
+type TabIconParams = {
+    /** The glyph drawn unless an avatar is given. */
+    name: NativeTabName;
+    color: string;
+    avatar?: {uri: string; image: SkImage};
+    dotColor?: string;
+    label?: TabIconLabel;
+};
+
+/** Upper bound on cached icons, enough for every tab in both selection states across a few status and theme changes. */
+const MAX_CACHED_ICONS = 64;
+
+const iconCache = new Map<string, NativeBottomTabIcon | undefined>();
+const glyphPathCache = new Map<NativeTabName, SkPath[]>();
+const labelFontCache = new Map<string, SkFont>();
+
+function getGlyphPaths(name: NativeTabName): SkPath[] {
+    const cachedPaths = glyphPathCache.get(name);
+    if (cachedPaths) {
+        return cachedPaths;
+    }
+    const paths: SkPath[] = [];
+    const glyph: NativeTabGlyph = NATIVE_TAB_GLYPHS[name];
+    for (const {d, isEvenOdd} of glyph.paths) {
+        const path = Skia.Path.MakeFromSVGString(d);
+        if (!path) {
+            continue;
+        }
+        if (isEvenOdd) {
+            path.setFillType(FillType.EvenOdd);
+        }
+        paths.push(path);
+    }
+    glyphPathCache.set(name, paths);
+    return paths;
 }
 
-async function decodeGlyph(source: ImageSourcePropType): Promise<{image: SkImage; scale: number} | undefined> {
-    const asset = Image.resolveAssetSource(source);
-    if (!asset?.uri) {
-        return undefined;
+function getLabelFont(isBold: boolean, size: number): SkFont {
+    const key = `${isBold}|${size}`;
+    const cachedFont = labelFontCache.get(key);
+    if (cachedFont) {
+        return cachedFont;
     }
-    const image = await decodeImage(asset.uri);
-    return image ? {image, scale: asset.scale ?? 1} : undefined;
+    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
+        weight: isBold ? FontWeight.Bold : FontWeight.Normal,
+    });
+    const font = Skia.Font(typeface, size);
+    labelFontCache.set(key, font);
+    return font;
 }
 
-function createTintPaint(color: string) {
+function drawGlyph(canvas: SkCanvas, name: NativeTabName, left: number, top: number, size: number, color: string) {
     const paint = Skia.Paint();
-    paint.setColorFilter(Skia.ColorFilter.MakeBlend(Skia.Color(color), BlendMode.SrcIn));
-    return paint;
+    paint.setColor(Skia.Color(color));
+    paint.setAntiAlias(true);
+    const viewBoxScale = size / NATIVE_TAB_GLYPHS[name].viewBoxSize;
+
+    canvas.save();
+    canvas.translate(left, top);
+    canvas.scale(viewBoxScale, viewBoxScale);
+    for (const path of getGlyphPaths(name)) {
+        canvas.drawPath(path, paint);
+    }
+    canvas.restore();
+    paint.dispose();
 }
 
 function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top: number, size: number) {
     const sourceSize = Math.min(image.width(), image.height());
     const circle = Skia.Path.Make();
     circle.addCircle(left + size / 2, top + size / 2, size / 2);
+    const paint = Skia.Paint();
 
     canvas.save();
     canvas.clipPath(circle, ClipOp.Intersect, true);
@@ -49,39 +110,89 @@ function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top:
         Skia.XYWHRect(left, top, size, size),
         FilterMode.Linear,
         MipmapMode.Linear,
-        Skia.Paint(),
+        paint,
     );
     canvas.restore();
+    paint.dispose();
     circle.dispose();
 }
 
-function encodeSurface(surface: SkSurface): string {
+function drawStatusDot(canvas: SkCanvas, right: number, top: number, radius: number, color: string) {
+    const paint = Skia.Paint();
+    paint.setColor(Skia.Color(color));
+    paint.setAntiAlias(true);
+    canvas.drawCircle(right - radius, top + radius, radius, paint);
+    paint.dispose();
+}
+
+function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, label}: TabIconParams): NativeBottomTabIcon | undefined {
+    const scale = PixelRatio.get();
+    const contentSize = (avatar ? layout.avatarSize : layout.glyphSize) * scale;
+    // With a label, every tab shares one row as tall as the avatar, so glyphs and the avatar share a centre and
+    // every label lands at the same height.
+    const rowSize = label ? Math.max(layout.glyphSize, layout.avatarSize) * scale : contentSize;
+    const labelTop = (rowSize + layout.glyphSize * scale) / 2 + layout.labelGap * scale;
+    const font = label ? getLabelFont(label.isBold, layout.labelFontSize * scale) : undefined;
+    const labelWidth = label && font ? font.measureText(label.text).width : 0;
+    const labelMetrics = font?.getMetrics();
+    const labelHeight = labelMetrics ? labelMetrics.descent - labelMetrics.ascent : 0;
+    const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
+    const canvasHeight = Math.ceil(label ? labelTop + labelHeight : rowSize);
+
+    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+    if (!surface) {
+        return undefined;
+    }
+
+    const canvas = surface.getCanvas();
+    const contentLeft = (canvasWidth - contentSize) / 2;
+    const contentTop = (rowSize - contentSize) / 2;
+    if (avatar) {
+        drawCircularImage(canvas, avatar.image, contentLeft, contentTop, contentSize);
+    } else {
+        drawGlyph(canvas, name, contentLeft, contentTop, contentSize, color);
+    }
+    if (dotColor) {
+        drawStatusDot(canvas, contentLeft + contentSize, contentTop, layout.dotRadius * scale, dotColor);
+    }
+    if (label && font && labelMetrics) {
+        const paint = Skia.Paint();
+        paint.setColor(Skia.Color(label.color));
+        paint.setAntiAlias(true);
+        canvas.drawText(label.text, (canvasWidth - labelWidth) / 2, labelTop - labelMetrics.ascent, paint, font);
+        paint.dispose();
+    }
+
     surface.flush();
     const snapshot = surface.makeImageSnapshot();
     const base64 = snapshot.encodeToBase64(ImageFormat.PNG, 100);
     snapshot.dispose();
     surface.dispose();
-    return `data:image/png;base64,${base64}`;
-}
 
-async function drawTabIconPairs(drawIcon: (name: NativeTabName, isSelected: boolean) => Promise<NativeBottomTabIcon | undefined>): Promise<Record<string, TabIconPair>> {
-    const results = await Promise.all(TAB_NAMES.map((name) => Promise.all([drawIcon(name, false), drawIcon(name, true)]).then(([inactive, active]) => ({name, inactive, active}))));
-    const icons: Record<string, TabIconPair> = {};
-    for (const result of results) {
-        if (result.inactive && result.active) {
-            icons[result.name] = {inactive: result.inactive, active: result.active};
-        }
-    }
-    return icons;
+    return {
+        type: 'image',
+        source: {uri: `data:image/png;base64,${base64}`, width: canvasWidth / scale, height: canvasHeight / scale, scale},
+        tinted: false,
+    };
 }
 
-function getTabBarIcon(icons: Record<string, TabIconPair> | undefined, name: NativeTabName) {
-    const pair = icons?.[name];
-    if (!pair) {
-        return NATIVE_TAB_ICONS[name];
+/**
+ * Draws a tab icon synchronously, so the bar never waits for it, and reuses it for as long as everything drawn into it
+ * stays the same. A status, theme or language change redraws only the icons it reaches.
+ */
+function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomTabIcon | undefined {
+    const {name, color, avatar, dotColor, label} = params;
+    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, layout.glyphSize, layout.avatarSize].join('|');
+    if (iconCache.has(key)) {
+        return iconCache.get(key);
+    }
+    if (iconCache.size >= MAX_CACHED_ICONS) {
+        iconCache.clear();
     }
-    return ({focused}: {focused: boolean}) => (focused ? pair.active : pair.inactive);
+    const icon = drawTabIcon(layout, params);
+    iconCache.set(key, icon);
+    return icon;
 }
 
-export {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon};
-export type {TabIconPair};
+export default getTabIcon;
+export type {TabIconLayout, TabIconParams};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
deleted file mode 100644
index c43e1d36aad3..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useTheme from '@hooks/useTheme';
-
-import {getAvatarURL} from '@libs/UserAvatarUtils';
-
-import variables from '@styles/variables';
-
-import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-import type {ImageSourcePropType} from 'react-native';
-
-import {Skia} from '@shopify/react-native-skia';
-
-import type {TabIconPair} from './tabIconRasterizer';
-import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
-
-import NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
-import {createTintPaint, decodeGlyph, decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
-import useRasterizedTabIcons from './useRasterizedTabIcons';
-
-const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
-const lastCircularAvatar: LastDrawnTabIcons<{uri: string; icon: NativeBottomTabIcon}> = {};
-
-/**
- * Material draws the icons without a tint (react-native-screens patch 003), so each glyph is recolored here. The
- * canvas is the glyph's own size, so Android's fixed icon slot draws it at full size.
- */
-async function createTintedGlyph(source: ImageSourcePropType, color: string): Promise<NativeBottomTabIcon | undefined> {
-    const glyph = await decodeGlyph(source);
-    if (!glyph) {
-        return undefined;
-    }
-
-    const {image, scale} = glyph;
-    const canvasWidth = image.width();
-    const canvasHeight = image.height();
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
-    if (!surface) {
-        image.dispose();
-        return undefined;
-    }
-
-    const rect = Skia.XYWHRect(0, 0, canvasWidth, canvasHeight);
-    surface.getCanvas().drawImageRect(image, rect, rect, createTintPaint(color));
-    image.dispose();
-
-    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}};
-}
-
-/** The active indicator pill marks the selected tab, so one image serves both selection states. */
-async function createCircularAvatarIcon(uri: string): Promise<NativeBottomTabIcon | undefined> {
-    const image = await decodeImage(uri);
-    const scale = variables.nativeTabIconScale;
-    const canvasSize = variables.iconBottomBar * scale;
-    const surface = image ? Skia.Surface.MakeOffscreen(canvasSize, canvasSize) : null;
-
-    if (!image || !surface) {
-        image?.dispose();
-        surface?.dispose();
-        return undefined;
-    }
-
-    drawCircularImage(surface.getCanvas(), image, 0, 0, canvasSize);
-    image.dispose();
-
-    return {type: 'image', source: {uri: encodeSurface(surface), width: variables.iconBottomBar, height: variables.iconBottomBar, scale}};
-}
-
-/** `areTabIconsReady` stays false until the first recolored set exists, because the plain glyphs draw black. */
-function useAndroidTabIcons() {
-    const theme = useTheme();
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const inactiveColor = theme.icon;
-    const activeColor = theme.iconMenu;
-
-    // A failed draw still lets the bar show, on the plain black glyphs, rather than keeping it hidden.
-    const tintedIcons = useRasterizedTabIcons(
-        lastTintedIcons,
-        [inactiveColor, activeColor].join('|'),
-        () => drawTabIconPairs((name, isSelected) => createTintedGlyph(NATIVE_TAB_ICONS[name].source, isSelected ? activeColor : inactiveColor)),
-        {},
-    );
-
-    const avatarSource = getAvatarURL({avatarSource: currentUserPersonalDetails.avatar, accountID: currentUserPersonalDetails.accountID});
-    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const circularAvatar = useRasterizedTabIcons(lastCircularAvatar, avatarURI, (uri) => createCircularAvatarIcon(uri).then((icon) => icon && {uri, icon}));
-
-    // An avatar drawn for another user is never shown; until the current one is drawn, the account glyph stands in.
-    const avatarIcon = circularAvatar?.uri === avatarURI ? circularAvatar?.icon : undefined;
-    // A function, because React Navigation derives the selected icon only from a function.
-    const accountAvatarIcon = avatarIcon ? () => avatarIcon : undefined;
-
-    return {
-        getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),
-        accountAvatarIcon,
-        areTabIconsReady: !!tintedIcons,
-    };
-}
-
-export default useAndroidTabIcons;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
deleted file mode 100644
index bbb10095ac77..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useTheme from '@hooks/useTheme';
-
-import {getAvatarURL} from '@libs/UserAvatarUtils';
-
-import FontUtils from '@styles/utils/FontUtils';
-import variables from '@styles/variables';
-
-import NAVIGATORS from '@src/NAVIGATORS';
-
-import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-import type {SkCanvas} from '@shopify/react-native-skia';
-
-import {FillType, FontWeight, Skia} from '@shopify/react-native-skia';
-
-import type {NativeTabGlyph} from './NATIVE_TAB_GLYPHS';
-import type NATIVE_TAB_ICONS from './NATIVE_TAB_ICONS';
-import type {TabIconPair} from './tabIconRasterizer';
-import type {LastDrawnTabIcons} from './useRasterizedTabIcons';
-
-import NATIVE_TAB_GLYPHS from './NATIVE_TAB_GLYPHS';
-import {decodeImage, drawCircularImage, drawTabIconPairs, encodeSurface, getTabBarIcon} from './tabIconRasterizer';
-import useRasterizedTabIcons from './useRasterizedTabIcons';
-
-/** The account tab's avatar in both selection states, with the URI it was drawn from. */
-type CircularAvatarIcons = TabIconPair & {uri: string};
-
-const lastTintedIcons: LastDrawnTabIcons<Record<string, TabIconPair>> = {};
-const lastCircularAvatar: LastDrawnTabIcons<CircularAvatarIcons> = {};
-
-function drawStatusDot(canvas: SkCanvas, glyphRight: number, glyphTop: number, scale: number, color: string) {
-    const radius = variables.nativeTabIconDotRadius * scale;
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
-    canvas.drawCircle(glyphRight - radius, glyphTop + radius, radius, paint);
-}
-
-function drawGlyph(canvas: SkCanvas, glyph: NativeTabGlyph, left: number, top: number, size: number, color: string) {
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
-    paint.setAntiAlias(true);
-    const viewBoxScale = size / glyph.viewBoxSize;
-
-    canvas.save();
-    canvas.translate(left, top);
-    canvas.scale(viewBoxScale, viewBoxScale);
-    for (const {d, isEvenOdd} of glyph.paths) {
-        const path = Skia.Path.MakeFromSVGString(d);
-        if (!path) {
-            continue;
-        }
-        if (isEvenOdd) {
-            path.setFillType(FillType.EvenOdd);
-        }
-        canvas.drawPath(path, paint);
-        path.dispose();
-    }
-    canvas.restore();
-}
-
-function getLabelFont(isSelected: boolean, scale: number) {
-    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
-        weight: isSelected ? FontWeight.Bold : FontWeight.Normal,
-    });
-    return Skia.Font(typeface, variables.fontSizeSmall * scale);
-}
-
-/**
- * iOS 26 discards the title color an item appearance carries while honoring its font, and neither
- * `unselectedItemTintColor` nor re-asserting it after layout gets through, so the label is painted into the icon.
- */
-function drawLabel(canvas: SkCanvas, label: string, color: string, isSelected: boolean, scale: number, canvasWidth: number, top: number) {
-    const font = getLabelFont(isSelected, scale);
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
-    paint.setAntiAlias(true);
-    const width = font.measureText(label).width;
-    const metrics = font.getMetrics();
-    canvas.drawText(label, (canvasWidth - width) / 2, top - metrics.ascent, paint, font);
-}
-
-function measureLabel(label: string, isSelected: boolean, scale: number) {
-    const font = getLabelFont(isSelected, scale);
-    const metrics = font.getMetrics();
-    return {width: font.measureText(label).width, height: metrics.descent - metrics.ascent};
-}
-
-/**
- * iOS 26 never applies the inactive icon color from `UITabBarItemAppearance`, and paints every badge in the color of
- * the selected tab (both `badgeBackgroundColor` and `UITabBarItem.badgeColor`), so the glyph is drawn in its color and the
- * status dot drawn into the image. Both selection states go through this, because RNScreens rejects a tab whose
- * icon and selectedIcon differ in type.
- */
-async function createTabIcon(
-    glyph: NativeTabGlyph,
-    color: string,
-    dotColor: string | undefined,
-    label: string,
-    labelColor: string,
-    isSelected: boolean,
-): Promise<NativeBottomTabIcon | undefined> {
-    const scale = variables.nativeTabIconScale;
-    const glyphSize = variables.iconNativeTabBarIOS * scale;
-    // The account avatar is taller than a glyph, so every glyph sits this far down to share its centre, and
-    // every label lands at the same height.
-    const glyphTop = ((variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
-    const gap = variables.nativeTabIconLabelGap * scale;
-    const labelSize = measureLabel(label, isSelected, scale);
-    const canvasWidth = Math.ceil(Math.max(glyphSize, labelSize.width));
-    const canvasHeight = Math.ceil(glyphTop + glyphSize + gap + labelSize.height);
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
-
-    if (!surface) {
-        return undefined;
-    }
-
-    const canvas = surface.getCanvas();
-    const glyphLeft = (canvasWidth - glyphSize) / 2;
-    drawGlyph(canvas, glyph, glyphLeft, glyphTop, glyphSize, color);
-
-    if (dotColor) {
-        drawStatusDot(canvas, glyphLeft + glyphSize, glyphTop, scale, dotColor);
-    }
-
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, glyphTop + glyphSize + gap);
-
-    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
-}
-
-/** A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs. */
-async function createCircularAvatarIcon(uri: string, dotColor: string | undefined, label: string, labelColor: string, isSelected: boolean): Promise<NativeBottomTabIcon | undefined> {
-    const image = await decodeImage(uri);
-    const scale = variables.nativeTabIconScale;
-    const avatarSize = variables.avatarNativeTabBarIOS * scale;
-    // The avatar overhangs a glyph by the same amount above and below, so its gap to the label shrinks by
-    // that much and the label lands where every other tab's does.
-    const gap = (variables.nativeTabIconLabelGap - (variables.avatarNativeTabBarIOS - variables.iconNativeTabBarIOS) / 2) * scale;
-    const labelSize = measureLabel(label, isSelected, scale);
-    const canvasWidth = Math.ceil(Math.max(avatarSize, labelSize.width));
-    const canvasHeight = Math.ceil(avatarSize + gap + labelSize.height);
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
-
-    if (!image || !surface) {
-        image?.dispose();
-        surface?.dispose();
-        return undefined;
-    }
-
-    const avatarLeft = (canvasWidth - avatarSize) / 2;
-    const canvas = surface.getCanvas();
-    drawCircularImage(canvas, image, avatarLeft, 0, avatarSize);
-
-    if (dotColor) {
-        drawStatusDot(canvas, avatarLeft + avatarSize, 0, scale, dotColor);
-    }
-
-    drawLabel(canvas, label, labelColor, isSelected, scale, canvasWidth, avatarSize + gap);
-    image.dispose();
-
-    return {type: 'image', source: {uri: encodeSurface(surface), width: canvasWidth / scale, height: canvasHeight / scale, scale}, tinted: false};
-}
-
-/**
- * `areTabIconsReady` stays false until the first recolored set exists, because the template icons the bar would
- * fall back to render black on iOS 26, which ignores the inactive tint.
- */
-function useIOSTabIcons(dotColors: Record<string, string | undefined>, tabLabels: Record<string, string>) {
-    const theme = useTheme();
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const accountLabel = tabLabels[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
-    const accountDotColor = dotColors[NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR];
-
-    // Covers everything baked into the bitmaps, so a status, theme or language change redraws them.
-    const iconsSignature = [theme.icon, theme.iconMenu, theme.text, theme.textSupporting, ...Object.values(dotColors), ...Object.values(tabLabels)].join('|');
-    // A failed draw still lets the bar show, on the template icons, rather than keeping it hidden.
-    const tintedIcons = useRasterizedTabIcons(
-        lastTintedIcons,
-        iconsSignature,
-        () =>
-            drawTabIconPairs((name, isSelected) =>
-                createTabIcon(
-                    NATIVE_TAB_GLYPHS[name],
-                    isSelected ? theme.iconMenu : theme.icon,
-                    dotColors[name],
-                    tabLabels[name],
-                    isSelected ? theme.text : theme.textSupporting,
-                    isSelected,
-                ),
-            ),
-        {},
-    );
-
-    const avatarSource = getAvatarURL({avatarSource: currentUserPersonalDetails.avatar, accountID: currentUserPersonalDetails.accountID});
-    const avatarURI = typeof avatarSource === 'string' ? avatarSource : undefined;
-    const avatarSignature = avatarURI && [avatarURI, accountDotColor, accountLabel, theme.textSupporting, theme.text].join('|');
-    const circularAvatar = useRasterizedTabIcons(lastCircularAvatar, avatarSignature, () => {
-        if (!avatarURI) {
-            return Promise.resolve(undefined);
-        }
-        return Promise.all([
-            createCircularAvatarIcon(avatarURI, accountDotColor, accountLabel, theme.textSupporting, false),
-            createCircularAvatarIcon(avatarURI, accountDotColor, accountLabel, theme.text, true),
-        ]).then(([inactive, active]) => (inactive && active ? {uri: avatarURI, inactive, active} : undefined));
-    });
-
-    // An avatar drawn for another user is never shown, while a stale dot or label is, until the redraw lands.
-    const avatarPair = circularAvatar?.uri === avatarURI ? circularAvatar : undefined;
-    const accountAvatarIcon = avatarPair ? ({focused}: {focused: boolean}) => (focused ? avatarPair.active : avatarPair.inactive) : undefined;
-
-    return {
-        getTabBarIcon: (name: keyof typeof NATIVE_TAB_ICONS) => getTabBarIcon(tintedIcons, name),
-        accountAvatarIcon,
-        areTabIconsReady: !!tintedIcons,
-    };
-}
-
-export default useIOSTabIcons;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 7a90d8ecda07..907897c35e41 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -1,7 +1,9 @@
 import useTheme from '@hooks/useTheme';
 
-import type NATIVE_TAB_ICONS from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS';
-import useIOSTabIcons from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIOSTabIcons';
+import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
+import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
 
 import variables from '@styles/variables';
 
@@ -13,9 +15,23 @@ import type NativeTabBarOptionsParams from './types';
 
 const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
 
+const TAB_ICON_LAYOUT: TabIconLayout = {
+    glyphSize: variables.iconNativeTabBarIOS,
+    // A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs.
+    avatarSize: variables.avatarNativeTabBarIOS,
+    dotRadius: variables.nativeTabIconDotRadius,
+    labelGap: variables.nativeTabIconLabelGap,
+    labelFontSize: variables.fontSizeSmall,
+};
+
+/**
+ * iOS 26 never applies the inactive icon color or the title color from `UITabBarItemAppearance`, and paints every badge
+ * in the color of the selected tab, so each icon is drawn with its own colors, its status dot and its label. Both
+ * selection states are images, because RNScreens rejects a tab whose icon and selectedIcon differ in type.
+ */
 function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
     const theme = useTheme();
-    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useIOSTabIcons(dotColors, tabLabels);
+    const avatar = useTabAvatarImage();
 
     const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
@@ -25,15 +41,25 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}:
         tabBarInactiveTintColor: theme.icon,
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
         // The background only lands on iOS 18 and below; iOS 26 keeps its own glass material.
-        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.appBG},
+        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG},
         tabBarControllerMode: 'tabBar',
         // The bar stays put while the content scrolls, instead of collapsing the way iOS 26 does by default.
         tabBarMinimizeBehavior: 'none',
     };
 
-    const getTabOptions = (name: keyof typeof NATIVE_TAB_ICONS): NativeBottomTabNavigationOptions => ({
-        tabBarIcon: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR && accountAvatarIcon ? accountAvatarIcon : getTabBarIcon(name),
-    });
+    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
+        const getIcon = (isSelected: boolean) =>
+            getTabIcon(TAB_ICON_LAYOUT, {
+                name,
+                color: isSelected ? theme.iconMenu : theme.icon,
+                avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
+                dotColor: dotColors[name],
+                label: {text: tabLabels[name], color: isSelected ? theme.text : theme.textSupporting, isBold: isSelected},
+            });
+        const inactiveIcon = getIcon(false);
+        const activeIcon = getIcon(true);
+        return {tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined};
+    };
 
     return {screenOptions, getTabOptions};
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
index 983ccf6a933c..4e0c5803e67b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -1,8 +1,10 @@
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import type NATIVE_TAB_ICONS from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_ICONS';
-import useAndroidTabIcons from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useAndroidTabIcons';
+import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
+import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
 
 import variables from '@styles/variables';
 
@@ -18,10 +20,19 @@ const STATUS_DOT_BADGE = '';
 /** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
 const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
 
+/** Material draws each icon in its fixed icon slot, with the label and the status badge of its own. */
+const TAB_ICON_LAYOUT: TabIconLayout = {
+    glyphSize: variables.iconBottomBar,
+    avatarSize: variables.iconBottomBar,
+    dotRadius: 0,
+    labelGap: 0,
+    labelFontSize: 0,
+};
+
 function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {getTabBarIcon, accountAvatarIcon, areTabIconsReady} = useAndroidTabIcons();
+    const avatar = useTabAvatarImage();
 
     // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
     const screenOptions: NativeBottomTabNavigationOptions = {
@@ -32,14 +43,19 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}:
         tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
         tabBarLabelVisibilityMode: 'labeled',
         // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar && areTabIconsReady ? 'flex' : 'none', backgroundColor: theme.appBG},
+        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG},
     };
 
-    const getTabOptions = (name: keyof typeof NATIVE_TAB_ICONS): NativeBottomTabNavigationOptions => {
+    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
+        // The active indicator pill marks the selected tab, so the avatar is the same image in both selection states.
+        const tabAvatar = name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined;
+        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar});
+        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar});
         const dotColor = dotColors[name];
         return {
             tabBarLabel: tabLabels[name],
-            tabBarIcon: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR && accountAvatarIcon ? accountAvatarIcon : getTabBarIcon(name),
+            // A function, because React Navigation derives the selected icon only from a function.
+            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
             ...(dotColor ? {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}} : {tabBarBadge: undefined}),
         };
     };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
deleted file mode 100644
index 596a606bc4ec..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useRasterizedTabIcons.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {useEffect, useState} from 'react';
-
-/** Held outside any component, so a remounted navigator starts from the last icons instead of waiting for Skia. */
-type LastDrawnTabIcons<T> = {current?: T};
-
-/** A failed draw keeps the previous icons, or resolves to `fallbackOnError` when there are none. */
-function useRasterizedTabIcons<T>(lastDrawn: LastDrawnTabIcons<T>, signature: string | undefined, draw: (signature: string) => Promise<T | undefined>, fallbackOnError?: T): T | undefined {
-    const [icons, setIcons] = useState<T | undefined>(lastDrawn.current);
-
-    useEffect(() => {
-        let isActive = true;
-        if (signature !== undefined) {
-            draw(signature)
-                .then((result) => {
-                    if (!isActive || result === undefined) {
-                        return;
-                    }
-                    // eslint-disable-next-line no-param-reassign
-                    lastDrawn.current = result;
-                    setIcons(result);
-                })
-                .catch(() => {
-                    if (!isActive || fallbackOnError === undefined) {
-                        return;
-                    }
-                    setIcons((previous) => previous ?? fallbackOnError);
-                });
-        }
-
-        return () => {
-            isActive = false;
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [signature]);
-
-    return icons;
-}
-
-export default useRasterizedTabIcons;
-export type {LastDrawnTabIcons};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
new file mode 100644
index 000000000000..075384c5fed9
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
@@ -0,0 +1,53 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+
+import {getAvatarURL} from '@libs/UserAvatarUtils';
+
+import type {SkImage} from '@shopify/react-native-skia';
+
+import {Skia} from '@shopify/react-native-skia';
+import {useEffect, useState} from 'react';
+
+type TabAvatarImage = {uri: string; image: SkImage};
+
+/** Held outside any component, so a status or theme redraw and a remounted navigator reuse the decoded avatar. */
+let lastDecodedAvatar: TabAvatarImage | undefined;
+
+/**
+ * The current user's avatar, decoded once per URI for the account tab icon. Until it is decoded, and for avatars that
+ * are not a remote image, the account glyph stands in.
+ */
+function useTabAvatarImage(): TabAvatarImage | undefined {
+    const {avatar, accountID} = useCurrentUserPersonalDetails();
+    const avatarSource = getAvatarURL({avatarSource: avatar, accountID});
+    const uri = typeof avatarSource === 'string' ? avatarSource : undefined;
+    const [decodedAvatar, setDecodedAvatar] = useState(lastDecodedAvatar);
+
+    useEffect(() => {
+        if (!uri || decodedAvatar?.uri === uri) {
+            return;
+        }
+        let isActive = true;
+        Skia.Data.fromURI(uri)
+            .then((data) => {
+                const image = Skia.Image.MakeImageFromEncoded(data);
+                if (!image) {
+                    return;
+                }
+                lastDecodedAvatar = {uri, image};
+                if (isActive) {
+                    setDecodedAvatar(lastDecodedAvatar);
+                }
+            })
+            // A failed decode keeps the account glyph.
+            .catch(() => undefined);
+        return () => {
+            isActive = false;
+        };
+        // Only a new URI needs decoding; the decoded avatar is compared to skip one that is already decoded.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [uri]);
+
+    return decodedAvatar?.uri === uri ? decodedAvatar : undefined;
+}
+
+export default useTabAvatarImage;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 6d10a89da4a8..ee8d0aac2d66 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -120,8 +120,6 @@ export default {
     nativeTabIconDotRadius: 4,
     // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.
     nativeTabIconLabelGap: 6,
-    /** Pixel density the native tab bar icons are rasterized at. */
-    nativeTabIconScale: 3,
     /** Material's BottomNavigationView row, without the gesture inset under it. */
     androidNativeTabBarHeight,
     /** Material's bar row plus the 16 dp Material keeps between a FAB and the bar. */

From d8ab0f4f74e81ddd86ac653d8770ccf5da80a750 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:08:35 +0200
Subject: [PATCH 255/781] refactor: one tab root scroll props hook, platform
 tab bar insets without empty bottom content

---
 .../LHNOptionsList/LHNOptionsList.tsx         |  9 +++---
 .../TabBarBottomContent/index.android.tsx     | 29 -------------------
 .../TabBarBottomContent/index.ios.tsx         |  6 ----
 .../index.native.tsx                          |  8 -----
 .../index.android.tsx                         | 22 +++++++++-----
 .../index.ios.tsx                             | 20 ++-----------
 .../useTabRootScrollProps/index.native.tsx    | 14 +++++++++
 .../index.tsx                                 | 11 ++++---
 .../BaseSearchList/index.native.tsx           |  6 ++--
 .../SearchList/BaseSearchList/index.tsx       |  6 ++--
 .../Tables/WorkspaceListTable/index.tsx       |  5 ++--
 src/pages/Insights/InsightsDashboard.tsx      | 14 ++++-----
 src/pages/domain/DomainInitialPage.tsx        | 10 ++-----
 src/pages/home/HomePage.tsx                   |  8 ++---
 src/pages/settings/InitialSettingsPage.tsx    |  8 ++---
 src/pages/workspace/WorkspaceInitialPage.tsx  | 10 ++-----
 16 files changed, 68 insertions(+), 118 deletions(-)
 delete mode 100644 src/components/Navigation/TabBarBottomContent/index.android.tsx
 delete mode 100644 src/components/Navigation/TabBarBottomContent/index.ios.tsx
 delete mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
 rename src/components/Navigation/TabBarBottomContent/{useTabBarContentInsetStyle => useTabRootScrollProps}/index.tsx (65%)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 391b907c3a54..fb948e8a49dd 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -1,4 +1,4 @@
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 
 import useNetwork from '@hooks/useNetwork';
@@ -46,7 +46,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const [personalDetails] = useAllPersonalDetails();
 
     const styles = useThemeStyles();
-    const contentContainerStyle = useTabBarContentInsetStyle(contentContainerStyles);
+    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles);
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
@@ -164,12 +164,11 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             <LHNTooltipContextProvider data={data}>
                 <FlashList
                     ref={flashListRef}
-                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                    contentInsetAdjustmentBehavior="automatic"
+                    contentInsetAdjustmentBehavior={tabRootScrollProps.contentInsetAdjustmentBehavior}
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
                     CellRendererComponent={OptionRowRendererComponent}
-                    contentContainerStyle={StyleSheet.flatten(contentContainerStyle)}
+                    contentContainerStyle={StyleSheet.flatten(tabRootScrollProps.contentContainerStyle)}
                     data={data}
                     testID="lhn-options-list"
                     keyExtractor={keyExtractor}
diff --git a/src/components/Navigation/TabBarBottomContent/index.android.tsx b/src/components/Navigation/TabBarBottomContent/index.android.tsx
deleted file mode 100644
index 84ef345a43ae..000000000000
--- a/src/components/Navigation/TabBarBottomContent/index.android.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-
-import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import React from 'react';
-import {View} from 'react-native';
-
-import type TabBarBottomContentProps from './types';
-
-/**
- * Material's bar is drawn over the full-height tab screen, so a tab root screen reserves the bar's row under its
- * content. The ScreenWrapper adds the gesture inset the bar sits on below it.
- */
-function TabBarBottomContent({selectedTab}: TabBarBottomContentProps) {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
-    const styles = useThemeStyles();
-
-    // Account drawn over the tabs hides the bar.
-    if (!shouldUseNarrowLayout || (selectedTab === NAVIGATION_TABS.SETTINGS && isSettingsDrawnOverTabs)) {
-        return null;
-    }
-
-    return <View style={styles.androidNativeTabBarSpacer} />;
-}
-
-export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/index.ios.tsx
deleted file mode 100644
index 4a2451a606dd..000000000000
--- a/src/components/Navigation/TabBarBottomContent/index.ios.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/** UITabBar is translucent, so a tab root screen's content runs under it rather than ending above a copy of the bar. */
-function TabBarBottomContent() {
-    return null;
-}
-
-export default TabBarBottomContent;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
deleted file mode 100644
index 2a8564a9d097..000000000000
--- a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.native.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {StyleProp, ViewStyle} from 'react-native';
-
-/** UIKit insets the lists past the iOS tab bar, and Android reserves the bar's row below the content. */
-function useTabBarContentInsetStyle(style?: StyleProp<ViewStyle>): StyleProp<ViewStyle> {
-    return style;
-}
-
-export default useTabBarContentInsetStyle;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
index b632062f193f..0ecf905ca0d3 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
@@ -1,21 +1,29 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 
+import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
+import {View} from 'react-native';
 
 import type TabRootScreenWrapperProps from './types';
 
-import TabBarBottomContent from '..';
-
-/** The ScreenWrapper props that keep a tab root screen's content clear of the tab bar. */
+/**
+ * Material's bar is drawn over the full-height tab screen, so a narrow tab root screen reserves the bar's row under its
+ * content, and the ScreenWrapper adds the gesture inset the bar sits on below it. Account drawn over the tabs hides the bar.
+ */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
     const styles = useThemeStyles();
 
-    return {
-        bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
-        bottomContentStyle: styles.overflowVisible,
-    };
+    if (!shouldUseNarrowLayout || (selectedTab === NAVIGATION_TABS.SETTINGS && isSettingsDrawnOverTabs)) {
+        return {};
+    }
+
+    return {bottomContent: <View style={styles.androidNativeTabBarSpacer} />};
 }
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 8a77d0dcc4f2..c7d86f32d2c4 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,30 +1,14 @@
-import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
-
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import React from 'react';
 
 import type TabRootScreenWrapperProps from './types';
 
-import TabBarBottomContent from '..';
-
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
  * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar.
  */
-function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+function useTabRootScreenWrapperProps(): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const styles = useThemeStyles();
-
-    if (shouldUseNarrowLayout) {
-        return {includeSafeAreaPaddingBottom: false};
-    }
-
-    return {
-        bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
-        bottomContentStyle: styles.overflowVisible,
-    };
+    return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false} : {};
 }
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
new file mode 100644
index 000000000000..3ab149092092
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
@@ -0,0 +1,14 @@
+import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
+
+type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
+
+/**
+ * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
+ * the bar's row below the content, so the content container keeps its style.
+ */
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps {
+    return {contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'};
+}
+
+export default useTabRootScrollProps;
+export type {TabRootScrollProps};
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
similarity index 65%
rename from src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx
rename to src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index 5920674a1f49..75b760461ef3 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -3,14 +3,16 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import variables from '@styles/variables';
 
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
+
+type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
 
 /**
  * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
  * room for the bar, letting its last row scroll out from under it. A list that already adds the bottom safe area
  * passes `hasBottomSafeAreaPadding`, so the safe area is not added twice.
  */
-function useTabBarContentInsetStyle(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): StyleProp<ViewStyle> {
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): TabRootScrollProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const insetStyle = useBottomSafeSafeAreaPaddingStyle({
         style,
@@ -19,7 +21,8 @@ function useTabBarContentInsetStyle(style?: StyleProp<ViewStyle>, hasBottomSafeA
         additionalPaddingBottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
     });
 
-    return shouldUseNarrowLayout ? insetStyle : style;
+    return {contentContainerStyle: shouldUseNarrowLayout ? insetStyle : style};
 }
 
-export default useTabBarContentInsetStyle;
+export default useTabRootScrollProps;
+export type {TabRootScrollProps};
diff --git a/src/components/Search/SearchList/BaseSearchList/index.native.tsx b/src/components/Search/SearchList/BaseSearchList/index.native.tsx
index 95bc5b6a011c..97fe20695996 100644
--- a/src/components/Search/SearchList/BaseSearchList/index.native.tsx
+++ b/src/components/Search/SearchList/BaseSearchList/index.native.tsx
@@ -1,3 +1,4 @@
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
 
 import {FlashList} from '@shopify/flash-list';
@@ -23,6 +24,7 @@ function BaseSearchList({
     stickyHeaderIndices,
     getItemType,
 }: BaseSearchListProps) {
+    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyle);
     const renderItemWithoutKeyboardFocus = useCallback(
         ({item, index}: {item: SearchListItem; index: number}) => {
             return renderItem(item, index, false, undefined);
@@ -33,8 +35,6 @@ function BaseSearchList({
     return (
         <AnimatedFlashListComponent
             data={data}
-            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-            contentInsetAdjustmentBehavior="automatic"
             renderItem={renderItemWithoutKeyboardFocus}
             keyExtractor={keyExtractor}
             onScroll={onScroll}
@@ -47,7 +47,7 @@ function BaseSearchList({
             onLayout={onLayout}
             removeClippedSubviews
             drawDistance={250}
-            contentContainerStyle={contentContainerStyle}
+            {...tabRootScrollProps}
             maintainVisibleContentPosition={{disabled: true}}
             stickyHeaderIndices={stickyHeaderIndices}
             getItemType={getItemType}
diff --git a/src/components/Search/SearchList/BaseSearchList/index.tsx b/src/components/Search/SearchList/BaseSearchList/index.tsx
index 08a6cd4847e6..46ad0873cbb9 100644
--- a/src/components/Search/SearchList/BaseSearchList/index.tsx
+++ b/src/components/Search/SearchList/BaseSearchList/index.tsx
@@ -1,4 +1,4 @@
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
@@ -75,7 +75,7 @@ function BaseSearchList({
     disabledIndexes,
     overrideItemLayout,
 }: BaseSearchListProps) {
-    const tabBarInsetContentContainerStyle = useTabBarContentInsetStyle(contentContainerStyle);
+    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyle);
     const hasKeyBeenPressed = useRef(false);
     const isFocused = useIsFocused();
     const {focusedCellId, isEditingCell} = useEditingCellState();
@@ -195,7 +195,7 @@ function BaseSearchList({
             CellRendererComponent={CellRendererComponent}
             removeClippedSubviews
             drawDistance={250}
-            contentContainerStyle={tabBarInsetContentContainerStyle}
+            {...tabRootScrollProps}
             maintainVisibleContentPosition={{disabled: true}}
             stickyHeaderIndices={stickyHeaderIndices}
             stickyHeaderConfig={stickyHeaderConfig}
diff --git a/src/components/Tables/WorkspaceListTable/index.tsx b/src/components/Tables/WorkspaceListTable/index.tsx
index 703e0a7576e5..35a9997276f3 100644
--- a/src/components/Tables/WorkspaceListTable/index.tsx
+++ b/src/components/Tables/WorkspaceListTable/index.tsx
@@ -1,3 +1,4 @@
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import type {CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
 
@@ -66,6 +67,7 @@ type WorkspaceListTableProps = {
 };
 
 export default function WorkspaceListTable({ref, workspaces, headerComponent, onDeleteWorkspace, pendingDeletePolicyID}: WorkspaceListTableProps) {
+    const {contentInsetAdjustmentBehavior} = useTabRootScrollProps();
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {isBetaEnabled} = usePermissions();
@@ -207,8 +209,7 @@ export default function WorkspaceListTable({ref, workspaces, headerComponent, on
             keyExtractor={(row, index) => `${row.policyID}-${index}`}
             filters={filterConfig}
             isItemInFilter={isItemInFilter}
-            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-            contentInsetAdjustmentBehavior="automatic"
+            contentInsetAdjustmentBehavior={contentInsetAdjustmentBehavior}
         >
             <Table.ListHeader>{tableHeaderComponent}</Table.ListHeader>
             <Table.NoResultsState />
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index 0c96b3583719..aff5aac08db7 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,8 +1,8 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import TopBar from '@components/Navigation/TopBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -65,8 +65,8 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
-    const emptyStateContentContainerStyle = useTabBarContentInsetStyle([styles.flexGrow1, styles.flexShrink0], true);
-    const contentContainerStyle = useTabBarContentInsetStyle([styles.flexGrow1, styles.ph5, styles.pb5], true);
+    const emptyStateScrollProps = useTabRootScrollProps([styles.flexGrow1, styles.flexShrink0], true);
+    const scrollProps = useTabRootScrollProps([styles.flexGrow1, styles.ph5, styles.pb5], true);
 
     const didRequestFail = state === INSIGHTS_DASHBOARD_STATE.ERROR || state === INSIGHTS_DASHBOARD_STATE.STALE;
 
@@ -111,9 +111,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     if (state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES || state === INSIGHTS_DASHBOARD_STATE.EMPTY) {
         return (
             <ScrollView
-                contentContainerStyle={emptyStateContentContainerStyle}
-                // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                contentInsetAdjustmentBehavior="automatic"
+                {...emptyStateScrollProps}
                 addBottomSafeAreaPadding
             >
                 {state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES ? <InsightsNoExpensesState /> : <InsightsEmptyState />}
@@ -127,9 +125,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     return (
         <ScrollView
             style={styles.insightsDashboardScrollView}
-            // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-            contentInsetAdjustmentBehavior="automatic"
-            contentContainerStyle={contentContainerStyle}
+            {...scrollProps}
             addBottomSafeAreaPadding
         >
             <View style={styles.insightsDashboardLayout}>
diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx
index fb526a6e7c24..a5686293daeb 100644
--- a/src/pages/domain/DomainInitialPage.tsx
+++ b/src/pages/domain/DomainInitialPage.tsx
@@ -2,8 +2,8 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 
@@ -45,7 +45,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
     const icons = useMemoizedLazyExpensifyIcons(DOMAIN_MENU_ICON_NAMES);
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
-    const contentContainerStyle = useTabBarContentInsetStyle(styles.flexColumn);
+    const tabRootScrollProps = useTabRootScrollProps(styles.flexColumn);
     const waitForNavigate = useWaitForNavigation();
     const {singleExecution, isExecuting} = useSingleExecution();
     const activeRoute = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -123,11 +123,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView
-                    contentContainerStyle={contentContainerStyle}
-                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                    contentInsetAdjustmentBehavior="automatic"
-                >
+                <ScrollView {...tabRootScrollProps}>
                     <View style={[styles.pb4, styles.mh3, styles.mt3]}>
                         {/*
                             Ideally we should use MenuList component for MenuItems with singleExecution/Navigation actions.
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index e32d114bbff8..9027fee12d26 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,7 +1,7 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import TopBar from '@components/Navigation/TopBar';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -44,7 +44,7 @@ function HomePage() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.HOME);
-    const contentContainerStyle = useTabBarContentInsetStyle(styles.homePageContentContainer, true);
+    const tabRootScrollProps = useTabRootScrollProps(styles.homePageContentContainer, true);
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
     const {isOffline} = useNetwork({onReconnect: openHomePage});
@@ -153,9 +153,7 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
-                        // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                        contentInsetAdjustmentBehavior="automatic"
-                        contentContainerStyle={contentContainerStyle}
+                        {...tabRootScrollProps}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 19be41b5a75b..a55c35407e76 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -2,8 +2,8 @@ import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherButton from '@components/AccountSwitcherButton';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -53,7 +53,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const [canSwitchAccounts = false] = useOnyx(ONYXKEYS.ACCOUNT, {selector: canSwitchAccountsSelector});
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.SETTINGS);
-    const contentContainerStyle = useTabBarContentInsetStyle(styles.w100);
+    const tabRootScrollProps = useTabRootScrollProps(styles.w100);
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
@@ -185,11 +185,9 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             </TopBarWithLoadingBar>
             <ScrollView
                 ref={scrollViewRef}
-                // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                contentInsetAdjustmentBehavior="automatic"
                 onScroll={onScroll}
                 scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
-                contentContainerStyle={contentContainerStyle}
+                {...tabRootScrollProps}
                 showsVerticalScrollIndicator={false}
             >
                 {headerContent}
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 0456e3fcc2cc..ebb5f1581075 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -2,8 +2,8 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import HighlightableMenuItem from '@components/HighlightableMenuItem';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import useTabBarContentInsetStyle from '@components/Navigation/TabBarBottomContent/useTabBarContentInsetStyle';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -70,7 +70,7 @@ function dismissError(policyID: string | undefined, pendingAction: PendingAction
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.WORKSPACES);
-    const contentContainerStyle = useTabBarContentInsetStyle([styles.flexColumn, styles.pb14]);
+    const tabRootScrollProps = useTabRootScrollProps([styles.flexColumn, styles.pb14]);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
@@ -249,11 +249,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                     shouldDisplayAccountButton
                 />
 
-                <ScrollView
-                    contentContainerStyle={contentContainerStyle}
-                    // Lets UIKit inset the end of the list past the translucent iOS tab bar that the content runs under.
-                    contentInsetAdjustmentBehavior="automatic"
-                >
+                <ScrollView {...tabRootScrollProps}>
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
                         onClose={() => dismissError(policyID, policy?.pendingAction)}

From 5f852c01a838a2ddcf670e1c3b0396132b3bed9f Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:09:09 +0200
Subject: [PATCH 256/781] refactor: one rule for the tab the native bar has no
 item for

---
 src/hooks/useIsSettingsDrawnOverTabs/index.native.ts |  7 +++++--
 .../NativeTabNavigator/getTabWithoutBarItem.ts       | 12 ++++++++++++
 .../NativeTabNavigator/useNativeTabNavigator.ts      |  7 ++++---
 .../AppNavigator/Navigators/TabNavigator.native.tsx  |  6 +++---
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem.ts

diff --git a/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts b/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
index 8220fdd02a41..ba0c059aafa2 100644
--- a/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
+++ b/src/hooks/useIsSettingsDrawnOverTabs/index.native.ts
@@ -1,16 +1,19 @@
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
+import getTabWithoutBarItem from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem';
+
 import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
 
 /**
- * With the Insights beta the native tab bar has no Account item, so the Account tab is drawn over the other tabs
+ * When the native tab bar has no Account item, the Account tab is drawn over the other tabs
  * as a full screen with the bar hidden, and it needs its own way back.
  */
 function useIsSettingsDrawnOverTabs() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBetaEnabled} = usePermissions();
-    return shouldUseNarrowLayout && isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+    return shouldUseNarrowLayout && getTabWithoutBarItem(isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE)) === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
 }
 
 export default useIsSettingsDrawnOverTabs;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem.ts
new file mode 100644
index 000000000000..502b8506ea4e
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem.ts
@@ -0,0 +1,12 @@
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+/**
+ * The native bar shows at most five of the six tabs. With the Insights beta, Insights takes the Account tab's place
+ * and Account moves to the top bar; without it, Insights has no item.
+ */
+function getTabWithoutBarItem(isInsightsBetaEnabled: boolean) {
+    return isInsightsBetaEnabled ? NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR : SCREENS.INSIGHTS;
+}
+
+export default getTabWithoutBarItem;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 633fcd0e599e..ab1f97e132d9 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -11,6 +11,7 @@ import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
+import getTabWithoutBarItem from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem';
 import {NAVIGATION_TAB_TO_SPANS} from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import Navigation from '@libs/Navigation/Navigation';
@@ -44,8 +45,8 @@ function useNativeTabNavigator() {
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {isBetaEnabled} = usePermissions();
     const {translate} = useLocalize();
-    // With the Insights beta, Insights takes the Account tab's place in the bar and Account moves to the top bar.
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+    const tabWithoutBarItem = getTabWithoutBarItem(isInsightsTabVisible);
     const theme = useTheme();
     const chatTabBrickRoad = useChatTabBrickRoad();
     const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
@@ -61,7 +62,7 @@ function useNativeTabNavigator() {
     const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     // A tab with no item in the bar is drawn over the other tabs as a full screen, so the bar hides while it is focused.
-    const isActiveTabWithoutBarItem = isInsightsTabVisible ? activeTabRoute?.name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR : activeTabRoute?.name === SCREENS.INSIGHTS;
+    const isActiveTabWithoutBarItem = activeTabRoute?.name === tabWithoutBarItem;
     const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible && !isActiveTabWithoutBarItem;
 
     let inboxDotColor: string | undefined;
@@ -126,7 +127,7 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, dotColors, tabLabels, isInsightsTabVisible, tabRouterOverride};
+    return {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index a3c449ce89ad..cbf3a2fb1130 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -32,7 +32,7 @@ const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
-    const {shouldShowNativeTabBar, dotColors, tabLabels, isInsightsTabVisible, tabRouterOverride} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride} = useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels});
 
     return (
@@ -64,7 +64,7 @@ function TabNavigator() {
                 component={InsightsPage}
                 // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
                 initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
-                options={{...getTabOptions(SCREENS.INSIGHTS), tabBarItemHidden: !isInsightsTabVisible}}
+                options={{...getTabOptions(SCREENS.INSIGHTS), tabBarItemHidden: tabWithoutBarItem === SCREENS.INSIGHTS}}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
@@ -74,7 +74,7 @@ function TabNavigator() {
             <Tab.Screen
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
-                options={{...getTabOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR), tabBarItemHidden: isInsightsTabVisible}}
+                options={{...getTabOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR), tabBarItemHidden: tabWithoutBarItem === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}}
             />
         </Tab.Navigator>
     );

From c46d04881697c86818ea8f057bf112638c08cbfb Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:09:53 +0200
Subject: [PATCH 257/781] chore: merge the two Android tab label patches for
 react-native-screens into one

---
 patches/react-native-screens/details.md       | 13 +++-----
 ....0+002+android-tab-label-typography.patch} | 26 ++++++++++++++--
 ...+4.28.0+003+no-android-tab-icon-tint.patch |  4 +--
 ...004+android-tab-label-letter-spacing.patch | 30 -------------------
 4 files changed, 29 insertions(+), 44 deletions(-)
 rename patches/react-native-screens/{react-native-screens+4.28.0+002+bold-selected-tab-label.patch => react-native-screens+4.28.0+002+android-tab-label-typography.patch} (57%)
 delete mode 100644 patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index cdb1ee57cb0a..10e08d0a2a47 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -7,9 +7,11 @@
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
 
-### [react-native-screens+4.28.0+002+bold-selected-tab-label.patch](react-native-screens+4.28.0+002+bold-selected-tab-label.patch)
+### [react-native-screens+4.28.0+002+android-tab-label-typography.patch](react-native-screens+4.28.0+002+android-tab-label-typography.patch)
 
-- Reason: The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. The patch turns on Material's own `setItemTextAppearanceActiveBoldEnabled`, which keeps the large label bold whenever Material re-applies its text appearance, and calls it before `updateFontStyles`, because enabling it re-applies Material's text appearance and would otherwise replace the app's typeface. `updateFontStyles` then sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family.
+- Reason: Two changes to the Android tab labels, both in `TabsAppearanceApplicator`, which React Navigation has no option for.
+  - Bold selected label. The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. The patch turns on Material's own `setItemTextAppearanceActiveBoldEnabled`, which keeps the large label bold whenever Material re-applies its text appearance, and calls it before `updateFontStyles`, because enabling it re-applies Material's text appearance and would otherwise replace the app's typeface. `updateFontStyles` then sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family.
+  - Letter spacing. `updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app, so the patch sets a fixed -0.5dp tracking on both labels, converted to the `em` unit `TextView.letterSpacing` expects for each label's size.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
@@ -20,10 +22,3 @@
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
-
-### [react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch](react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch)
-
-- Reason: `TabsAppearanceApplicator.updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app. React Navigation has no option that reaches the native label's letter spacing, so the patch sets a fixed -0.5dp tracking on both labels, converted to the `em` unit `TextView.letterSpacing` expects for each label's size.
-- Upstream PR/issue: not reported yet.
-- E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
-- PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch b/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
similarity index 57%
rename from patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch
rename to patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
index b01db811eef2..f0be85344b86 100644
--- a/patches/react-native-screens/react-native-screens+4.28.0+002+bold-selected-tab-label.patch
+++ b/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
@@ -1,7 +1,8 @@
 diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
+index 10cd91b..9238416 100644
 --- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 +++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ package com.swmansion.rnscreens.gamma.tabs.appearance
  import android.annotation.SuppressLint
  import android.content.Context
  import android.content.res.ColorStateList
@@ -9,7 +10,7 @@ diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansi
  import android.graphics.drawable.StateListDrawable
  import android.util.TypedValue
  import android.view.MenuItem
-@@ -95,6 +96,10 @@
+@@ -95,6 +96,10 @@ internal class TabsAppearanceApplicator(
  
          bottomNavigationView.labelVisibilityMode = visibilityMode
  
@@ -20,12 +21,31 @@ diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansi
          // Ripple color
          val rippleColor =
              tabBarAppearance?.tabBarItemRippleColor
-@@ -167,7 +172,7 @@
+@@ -161,13 +166,18 @@ internal class TabsAppearanceApplicator(
+                 tabBarAppearance?.tabBarItemTitleLargeLabelFontSize?.takeIf { it > 0 }?.let { PixelUtil.toPixelFromSP(it) }
+                     ?: context.resources.getDimension(R.dimen.design_bottom_navigation_text_size)
+ 
++            // Material's label text appearance tracks letters 0.5sp apart, wider than the app's labels.
++            val labelTracking = PixelUtil.toPixelFromDIP(LABEL_TRACKING_DP)
++
+             // Inactive
+             smallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallFontSize)
+             smallLabel.typeface = fontFamily
++            smallLabel.letterSpacing = labelTracking / smallFontSize
  
              // Active
              largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
 -            largeLabel.typeface = fontFamily
 +            largeLabel.setTypeface(fontFamily, Typeface.BOLD)
++            largeLabel.letterSpacing = labelTracking / largeFontSize
          }
      }
  
+@@ -237,5 +247,7 @@ internal class TabsAppearanceApplicator(
+ 
+     companion object {
+         const val TAG = "TabsAppearanceApplicator"
++
++        private const val LABEL_TRACKING_DP = -0.5f
+     }
+ }
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch b/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
index 0e2a6405da10..95dc7a725632 100644
--- a/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
+++ b/patches/react-native-screens/react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-index 70a24c4..874eb63 100644
+index 9238416..d7d2024 100644
 --- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 +++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-@@ -63,24 +63,10 @@ internal class TabsAppearanceApplicator(
+@@ -64,24 +64,10 @@ internal class TabsAppearanceApplicator(
          bottomNavigationView.itemTextColor = ColorStateList(states, fontColors)
  
          // Icon color
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch b/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch
deleted file mode 100644
index 4986b3563f36..000000000000
--- a/patches/react-native-screens/react-native-screens+4.28.0+004+android-tab-label-letter-spacing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
---- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-+++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-@@ -152,13 +152,18 @@
-                 tabBarAppearance?.tabBarItemTitleLargeLabelFontSize?.takeIf { it > 0 }?.let { PixelUtil.toPixelFromSP(it) }
-                     ?: context.resources.getDimension(R.dimen.design_bottom_navigation_text_size)
- 
-+            // Material's label text appearance tracks letters 0.5sp apart, wider than the app's labels.
-+            val labelTracking = PixelUtil.toPixelFromDIP(LABEL_TRACKING_DP)
-+
-             // Inactive
-             smallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallFontSize)
-             smallLabel.typeface = fontFamily
-+            smallLabel.letterSpacing = labelTracking / smallFontSize
- 
-             // Active
-             largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
-             largeLabel.setTypeface(fontFamily, Typeface.BOLD)
-+            largeLabel.letterSpacing = labelTracking / largeFontSize
-         }
-     }
- 
-@@ -228,5 +233,7 @@
- 
-     companion object {
-         const val TAG = "TabsAppearanceApplicator"
-+
-+        private const val LABEL_TRACKING_DP = -0.5f
-     }
- }

From 901bff341b4c8475e8ca7201fa058b4788887b77 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:11:14 +0200
Subject: [PATCH 258/781] refactor: fade the Android tab bar shadow and the
 floating buttons in one container

---
 .../NativeTabBarShadow/index.tsx              |  8 ++-----
 .../NativeTabNavigator/NativeTabLayout.tsx    | 23 +++++++++++--------
 src/styles/index.ts                           |  1 -
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx
index 6a99823d730b..2ad21697e685 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarShadow/index.tsx
@@ -1,10 +1,8 @@
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import CONST from '@src/CONST';
-
 import React from 'react';
-import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+import {View} from 'react-native';
 
 /** Material's bar shares the screen's background, so a shadow along its top edge marks where the content ends. */
 function NativeTabBarShadow() {
@@ -12,9 +10,7 @@ function NativeTabBarShadow() {
     const {bottom: bottomInset} = useSafeAreaInsets();
 
     return (
-        <Animated.View
-            entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
-            exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
+        <View
             style={styles.androidNativeTabBarShadow(bottomInset)}
             pointerEvents="none"
         />
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index f2d380f1cabe..b605ffa7fa47 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -20,7 +20,7 @@ import SCREENS from '@src/SCREENS';
 import type {NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
 
 import React from 'react';
-import {View} from 'react-native';
+import {StyleSheet, View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
 import NativeTabBarShadow from './NativeTabBarShadow';
@@ -50,22 +50,27 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     return (
         <View style={styles.flex1}>
             {children}
-            {shouldShowNativeTabBar && <NativeTabBarShadow />}
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
-                // The buttons belong to the bar, so they fade with it rather than appearing in place. They leave
-                // faster than they come in, so they stop covering a bar that is still sliding out.
+                // The shadow and the buttons belong to the bar, so they fade with it rather than appearing in place.
+                // They leave faster than they come in, so they stop covering a bar that is still sliding out.
                 <Animated.View
                     entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
                     exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
-                    style={styles.nativeTabBarFloatingButtons(getFloatingButtonsBottom(bottomInset))}
+                    style={[StyleSheet.absoluteFill, styles.zIndex10]}
                     pointerEvents="box-none"
                 >
-                    <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
-                        <NavigationTabBarFloatingActionButton />
+                    <NativeTabBarShadow />
+                    <View
+                        style={styles.nativeTabBarFloatingButtons(getFloatingButtonsBottom(bottomInset))}
+                        pointerEvents="box-none"
+                    >
+                        <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
+                            <NavigationTabBarFloatingActionButton />
+                        </View>
+                        <FloatingGPSButton />
+                        <FloatingCameraButton />
                     </View>
-                    <FloatingGPSButton />
-                    <FloatingCameraButton />
                 </Animated.View>
             )}
         </View>
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 4f02a3b8a223..16d6b8c98c43 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -6928,7 +6928,6 @@ const dynamicStyles = (theme: ThemeColors) =>
                 bottom,
                 left: 0,
                 height: 0,
-                zIndex: 10,
             }) satisfies ViewStyle,
 
         // Covers Material's bar and the gesture inset under it, and casts the shadow up over the screen content.

From 29c26522155010d9b25aa2a5d384222edeb96fda Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:13:20 +0200
Subject: [PATCH 259/781] revert: move the Search skeleton rows change to its
 own branch, fix/search-skeleton-rows

---
 src/components/Search/index.tsx             | 28 +++++++++++++--------
 src/pages/Search/SearchPageNarrow/index.tsx |  7 ------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index ecdbf0664574..d51b2e0c2487 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -51,6 +51,7 @@ import {
     isTransactionGroupListItemType,
     isTransactionListItemType,
     isTransactionReportGroupListItemType,
+    isTransactionSearchType,
     shouldShowEmptyState,
     shouldShowYear as shouldShowYearUtil,
 } from '@libs/SearchUIUtils';
@@ -418,7 +419,7 @@ function Search({
     const hasUnresolvedErrors = hasErrors && responseStatusCode === null;
     const isWaitingForInitialData = !shouldUseLiveData && !isOffline && (!isDataLoaded || isSearchLoadingWithNoResults || hasUnresolvedErrors || isCardFeedsLoading);
     const shouldShowLoadingState = isDeferringHeavyWork || isWaitingForInitialData;
-    const shouldShowRowSkeleton = !hasErrors && (shouldShowLoadingState || (!skeletonWasDisplayed && showPendingExpensePlaceholder));
+    const shouldShowRowSkeleton = (!skeletonWasDisplayed || shouldShowLoadingState) && showPendingExpensePlaceholder && !hasErrors;
 
     const isLoadingMorePage = shouldUseLiveData ? isLivePageInFlight : !!searchResults?.search?.isLoading;
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && isLoadingMorePage && (searchResults?.search?.offset ?? 0) > 0;
@@ -1011,11 +1012,6 @@ function Search({
     // Deferred layout only needs the base work (no scroll handling, no content-ready signal).
     const onDeferredLayout = onLayoutBase;
 
-    const handleSkeletonLayout = useCallback(() => {
-        onDeferredLayout();
-        onSkeletonLayout();
-    }, [onDeferredLayout, onSkeletonLayout]);
-
     const onLayout = useCallback(() => {
         onLayoutBase();
         handleSelectionListScroll(stableSortedData, searchListRef.current);
@@ -1175,15 +1171,25 @@ function Search({
         [clearSelectedTransactions, queryJSON, onSortPressedCallback, navigation],
     );
 
-    // Stands in for the list while the heavy grouping and sorting work is deferred or the first response
-    // has not arrived. The page level skeleton (useSearchLoadingState) stops at the first defined `data`,
-    // so on a warm snapshot this is the only thing between the header and the rows. Its onLayout also
-    // flushes the deferred API write and sets hasHadFirstLayout.
+    // When heavy work is deferred (e.g. during the RHP dismiss animation after
+    // submitting an expense), skip the expensive render below. The ancestor
+    // SearchPage (via SearchPageNarrow / SearchPageWide) renders a SearchStaticList
+    // overlay that covers this component, so the user sees real-looking content.
+    // The minimal View fires onLayout to flush the deferred API write and set
+    // hasHadFirstLayout.
+    if (isDeferringHeavyWork && searchResults?.data && isTransactionSearchType(type)) {
+        // Zero-sized View - onLayout still fires on RN, which is all we need here.
+        return <View onLayout={onDeferredLayout} />;
+    }
+
+    // This is a performance optimization for the submit-expense->search path only.
+    // The SearchPage skeleton (useSearchLoadingState) doesn't cover this case because
+    // Search must mount for its onLayout to flush the deferred CreateMoneyRequest API write, which would block the JS thread causing a slowdown on post expense creation navigation
     if (shouldShowRowSkeleton) {
         return (
             <SearchRowSkeleton
                 shouldAnimate
-                onLayout={handleSkeletonLayout}
+                onLayout={onSkeletonLayout}
                 containerStyle={shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3}
             />
         );
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 1e5523b5326c..e310ae2aa9e2 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -13,7 +13,6 @@ import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPa
 import SearchSelectionFooter from '@components/Search/SearchSelectionFooter';
 import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
 import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
-import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
@@ -342,12 +341,6 @@ function SearchPageNarrow({
                                             hasFilterBars={hasFilterBars}
                                         />
                                     )}
-                                    {!isInteractive && !searchOverlayContent && (
-                                        <SearchRowSkeleton
-                                            shouldAnimate
-                                            containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
-                                        />
-                                    )}
                                     {shouldRenderLayoutProbe && <View onLayout={onSearchLayout} />}
                                     {!!searchOverlayContent && (
                                         <View

From 4d63259b931b675e1e62e256ed84bbbdcc9e7dd2 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:17:14 +0200
Subject: [PATCH 260/781] chore: relative import for the tab without a bar item
 rule

---
 .../Navigators/NativeTabNavigator/useNativeTabNavigator.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index ab1f97e132d9..98f371ae25e8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -11,7 +11,6 @@ import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
-import getTabWithoutBarItem from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem';
 import {NAVIGATION_TAB_TO_SPANS} from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import Navigation from '@libs/Navigation/Navigation';
@@ -28,6 +27,8 @@ import type {NavigationAction, NavigationState, PartialState, Router, TabNavigat
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {useEffect} from 'react';
 
+import getTabWithoutBarItem from './getTabWithoutBarItem';
+
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
  * Swiping from these screens would pop the entire TAB_NAVIGATOR, which feels wrong.

From 4a3e8d13b405364343b10d59156b0feef02150dd Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:37:04 +0200
Subject: [PATCH 261/781] perf: no icon draws for the tab without a bar item,
 gesture effect reads a boolean

---
 .../NativeTabNavigator/useNativeTabNavigator.ts |  7 +++----
 .../Navigators/TabNavigator.native.tsx          | 17 +++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 98f371ae25e8..41e2ff283aa2 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -54,7 +54,7 @@ function useNativeTabNavigator() {
     const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
     const navigation = useNavigation();
     const parentNavigation = navigation.getParent();
-    const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
+    const isFocusedRouteTabRoot = useNavigationState((state) => TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(findFocusedRoute(state)?.name ?? ''));
     const route = useRoute();
     // The Tab.Navigator's own state lives at `parentState.routes[i].state`. We can't read it via
     // `useNavigationState((s) => s)` here because the navigator's body runs before <Tab.Navigator>
@@ -88,9 +88,8 @@ function useNativeTabNavigator() {
         if (!shouldUseNarrowLayout || !parentNavigation) {
             return;
         }
-        const isRootScreen = TAB_ROOT_SCREENS_WITHOUT_GESTURE.has(focusedRouteName ?? '');
-        parentNavigation.setOptions({gestureEnabled: !isRootScreen});
-    }, [focusedRouteName, shouldUseNarrowLayout, parentNavigation]);
+        parentNavigation.setOptions({gestureEnabled: !isFocusedRouteTabRoot});
+    }, [isFocusedRouteTabRoot, shouldUseNarrowLayout, parentNavigation]);
 
     useEffect(() => {
         if (!isRealizedNavigationState(tabState)) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index cbf3a2fb1130..364f6ecca22b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -10,6 +10,7 @@ import SCREENS from '@src/SCREENS';
 import {createNativeBottomTabNavigator} from '@react-navigation/bottom-tabs/unstable';
 import React from 'react';
 
+import type {NativeTabName} from './NativeTabNavigator/NATIVE_TAB_GLYPHS';
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
@@ -29,11 +30,15 @@ import WorkspaceNavigator from './WorkspaceNavigator';
  */
 const Tab = createNativeBottomTabNavigator<TabNavigatorParamList>();
 
+const HIDDEN_TAB_OPTIONS = {tabBarItemHidden: true};
+
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
     const {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride} = useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels});
+    // A tab with no bar item draws no icon.
+    const getOptions = (name: NativeTabName) => (name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : getTabOptions(name));
 
     return (
         <Tab.Navigator
@@ -47,34 +52,34 @@ function TabNavigator() {
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={getTabOptions(SCREENS.HOME)}
+                options={getOptions(SCREENS.HOME)}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
-                options={getTabOptions(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)}
+                options={getOptions(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={getTabOptions(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}
+                options={getOptions(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}
             />
             <Tab.Screen
                 name={SCREENS.INSIGHTS}
                 component={InsightsPage}
                 // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
                 initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
-                options={{...getTabOptions(SCREENS.INSIGHTS), tabBarItemHidden: tabWithoutBarItem === SCREENS.INSIGHTS}}
+                options={getOptions(SCREENS.INSIGHTS)}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
-                options={getTabOptions(NAVIGATORS.WORKSPACE_NAVIGATOR)}
+                options={getOptions(NAVIGATORS.WORKSPACE_NAVIGATOR)}
             />
             <Tab.Screen
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
-                options={{...getTabOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR), tabBarItemHidden: tabWithoutBarItem === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}}
+                options={getOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR)}
             />
         </Tab.Navigator>
     );

From 35304d70d2b96c702bbfa2981d0294305eace449 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:37:06 +0200
Subject: [PATCH 262/781] refactor: one tab root scroll props call in the
 Insights dashboard

---
 src/pages/Insights/InsightsDashboard.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index aff5aac08db7..403a810142ba 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -65,8 +65,8 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
-    const emptyStateScrollProps = useTabRootScrollProps([styles.flexGrow1, styles.flexShrink0], true);
-    const scrollProps = useTabRootScrollProps([styles.flexGrow1, styles.ph5, styles.pb5], true);
+    const isEmptyState = state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES || state === INSIGHTS_DASHBOARD_STATE.EMPTY;
+    const scrollProps = useTabRootScrollProps(isEmptyState ? [styles.flexGrow1, styles.flexShrink0] : [styles.flexGrow1, styles.ph5, styles.pb5], true);
 
     const didRequestFail = state === INSIGHTS_DASHBOARD_STATE.ERROR || state === INSIGHTS_DASHBOARD_STATE.STALE;
 
@@ -108,10 +108,10 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
         );
     }
 
-    if (state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES || state === INSIGHTS_DASHBOARD_STATE.EMPTY) {
+    if (isEmptyState) {
         return (
             <ScrollView
-                {...emptyStateScrollProps}
+                {...scrollProps}
                 addBottomSafeAreaPadding
             >
                 {state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES ? <InsightsNoExpensesState /> : <InsightsEmptyState />}

From 743cc0e6a74f468f3d9fac71a6728164e473108e Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:37:08 +0200
Subject: [PATCH 263/781] chore: drop the unused src hunk from the bottom-tabs
 indicator color patch

---
 ...002+active-indicator-color-precedence.patch | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
index 0526d0fd3623..ee75c7d7fdea 100644
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
@@ -11,21 +11,3 @@ index 1183c51..303635c 100644
    const onTransitionStart = ({
      closing,
      route
-diff --git a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-index 287dea3..0f06b2b 100644
---- a/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-+++ b/node_modules/@react-navigation/bottom-tabs/src/unstable/NativeBottomTabView.native.tsx
-@@ -262,10 +262,10 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
-     });
- 
-   const activeIndicatorColor =
--    (currentOptions?.tabBarActiveIndicatorColor ??
--    typeof activeTintColor === 'string')
-+    currentOptions?.tabBarActiveIndicatorColor ??
-+    (typeof activeTintColor === 'string'
-       ? Color(activeTintColor)?.alpha(0.1).string()
--      : undefined;
-+      : undefined);
- 
-   const onTransitionStart = ({
-     closing,

From 4ba41ea69548e232e98d30319bfa07ba87307983 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:50:15 +0200
Subject: [PATCH 264/781] docs: note when the tab bar hide and indicator color
 patches can go

---
 patches/react-native-screens/details.md | 2 +-
 patches/react-navigation/details.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 10e08d0a2a47..1119bd04d244 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -3,7 +3,7 @@
 ### [react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch](react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch)
 
 - Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES`, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart.
-- Upstream PR/issue: not reported yet.
+- Upstream PR/issue: fixed upstream by [software-mansion/react-native-screens#4632](https://github.com/software-mansion/react-native-screens/pull/4632), which animates by default behind a new `ios.tabBarHiddenAnimationEnabled` prop, and [#4673](https://github.com/software-mansion/react-native-screens/pull/4673), which skips the animation on the first render. Both are merged after the 4.28.0 release and labeled for the v4 backport. **This patch can be removed on the bump to the first release that contains them (4.29.0).**
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
 
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index bff313fe3264..f53e554c6f9c 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -71,7 +71,7 @@
 ### [@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch)
 
 - Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design.
-- Upstream PR/issue: not reported yet.
+- Upstream PR/issue: not reported. The rewritten native tab view on the v8 branch no longer has the bug, but it is still present on the `7.x` branch as of 7.20.0. **This patch can be removed on the upgrade to v8.**
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A

From 4d060b22fb974522c27deb55e3d99d7a2e23a644 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 13:56:06 +0200
Subject: [PATCH 265/781] fix: name the iOS native tabs for VoiceOver, note in
 patch docs which patches go on upgrade

---
 patches/react-native-screens/details.md       |  4 +--
 ...tom-tabs+7.16.2+003+hidden-tab-items.patch | 28 ++++++++++++++++---
 patches/react-navigation/details.md           |  6 ++--
 .../useNativeTabBarOptions/index.ios.ts       |  6 +++-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 1119bd04d244..fa3513685927 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -2,8 +2,8 @@
 
 ### [react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch](react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch)
 
-- Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES`, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart.
-- Upstream PR/issue: fixed upstream by [software-mansion/react-native-screens#4632](https://github.com/software-mansion/react-native-screens/pull/4632), which animates by default behind a new `ios.tabBarHiddenAnimationEnabled` prop, and [#4673](https://github.com/software-mansion/react-native-screens/pull/4673), which skips the animation on the first render. Both are merged after the 4.28.0 release and labeled for the v4 backport. **This patch can be removed on the bump to the first release that contains them (4.29.0).**
+- Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES`, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart. **This patch can be removed on the bump to react-native-screens 4.29.0**, the first release with the upstream fix linked below.
+- Upstream PR/issue: fixed upstream by [software-mansion/react-native-screens#4632](https://github.com/software-mansion/react-native-screens/pull/4632), which animates by default behind a new `ios.tabBarHiddenAnimationEnabled` prop, and [#4673](https://github.com/software-mansion/react-native-screens/pull/4673), which skips the animation on the first render. Both are merged after the 4.28.0 release and labeled for the v4 backport.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
 
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
index 744455116a73..ae32aafb76b4 100644
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-index 303635c..6ccaad5 100644
+index 09ec68f..bd6204e 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 @@ -4,11 +4,11 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
@@ -73,7 +73,23 @@ index 303635c..6ccaad5 100644
          const {
            options,
            render,
-@@ -363,9 +380,40 @@ export function NativeBottomTabView({
+@@ -221,6 +238,7 @@ export function NativeBottomTabView({
+           title,
+           lazy = false,
+           tabBarLabel,
++          tabBarAccessibilityLabel,
+           tabBarSelectionEnabled,
+           tabBarBadgeStyle,
+           tabBarIcon,
+@@ -287,6 +305,7 @@ export function NativeBottomTabView({
+           preventNativeSelection: tabBarSelectionEnabled === false,
+           badgeValue: tabBarBadge?.toString(),
+           title: tabTitle,
++          tabBarItemAccessibilityLabel: tabBarAccessibilityLabel,
+           specialEffects: {
+             repeatedTabSelection: {
+               popToRoot: true,
+@@ -363,9 +382,40 @@ export function NativeBottomTabView({
            })
          }, route.key);
        })
@@ -116,10 +132,10 @@ index 303635c..6ccaad5 100644
    isFocused,
    route,
 diff --git a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-index a071119..390f594 100644
+index 5a502c2..a2f2e85 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-@@ -78,6 +78,11 @@ type IconIOSSfSymbol = {
+@@ -78,6 +78,15 @@ type IconIOSSfSymbol = {
  };
  export type NativeBottomTabIcon = IconIOSSfSymbol | IconImage;
  export type NativeBottomTabNavigationOptions = NativeHeaderOptions & {
@@ -128,6 +144,10 @@ index a071119..390f594 100644
 +     * native tabs and the tab bar is hidden.
 +     */
 +    tabBarItemHidden?: boolean;
++    /**
++     * Accessibility label for the tab bar item, read by the screen reader. Useful when the tab has no visible label.
++     */
++    tabBarAccessibilityLabel?: string;
      /**
       * Title text for the screen.
       */
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index f53e554c6f9c..f97be9f631f8 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -70,15 +70,15 @@
 
 ### [@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch)
 
-- Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design.
-- Upstream PR/issue: not reported. The rewritten native tab view on the v8 branch no longer has the bug, but it is still present on the `7.x` branch as of 7.20.0. **This patch can be removed on the upgrade to v8.**
+- Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design. **This patch can be removed on the upgrade to React Navigation v8**, whose rewritten native tab view no longer has the bug.
+- Upstream PR/issue: not reported. Fixed on the v8 branch, still present on the `7.x` branch as of 7.20.0.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A
 
 ### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
 
-- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Like every other tab, it is frozen by the App's tab screen layout while another tab is focused. Nothing native changes.
+- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Like every other tab, it is frozen by the App's tab screen layout while another tab is focused. Nothing native changes. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 907897c35e41..d3c29b934b92 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -58,7 +58,11 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}:
             });
         const inactiveIcon = getIcon(false);
         const activeIcon = getIcon(true);
-        return {tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined};
+        return {
+            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
+            // The label is drawn into the icon, so VoiceOver reads it from here.
+            tabBarAccessibilityLabel: tabLabels[name],
+        };
     };
 
     return {screenOptions, getTabOptions};

From 43a71c083803d0a8c800125a7cb7c2ab694fad53 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 14:16:29 +0200
Subject: [PATCH 266/781] revert: stop freezing background native tabs, the
 native bar shows a tab before JS unfreezes it

---
 patches/react-navigation/details.md           |  2 +-
 .../FreezeWrapper/index.native.tsx            |  3 +-
 .../nativeTabScreenLayout.tsx                 | 36 -------------------
 .../Navigators/TabNavigator.native.tsx        |  4 +--
 4 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx

diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index f97be9f631f8..8555434a0409 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -78,7 +78,7 @@
 
 ### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
 
-- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Like every other tab, it is frozen by the App's tab screen layout while another tab is focused. Nothing native changes. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
+- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Nothing native changes. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
 - Upstream PR/issue: not reported yet.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx b/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
index 3f833f9216d1..a794924c3020 100644
--- a/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
+++ b/src/libs/Navigation/AppNavigator/FreezeWrapper/index.native.tsx
@@ -1,6 +1,7 @@
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 
-// On native, tab-level freezing is handled by the TabNavigator's screen layout (nativeTabScreenLayout).
+// On native, background tabs are not frozen: the native tab bar shows a tab before JS can unfreeze it, so a frozen
+// tab would flash an empty screen on every switch.
 // On web, react-native-screens only sets `display: none` without actually freezing the React tree,
 // so the web FreezeWrapper uses `react-freeze` to suspend rendering of background tabs.
 function FreezeWrapper({children}: ChildrenProps) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx
deleted file mode 100644
index af7c533db7e4..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/nativeTabScreenLayout.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
-
-import type ChildrenProps from '@src/types/utils/ChildrenProps';
-
-import {useIsFocused} from '@react-navigation/native';
-import React, {useLayoutEffect, useState} from 'react';
-import {Freeze} from 'react-freeze';
-
-/**
- * Native tabs have no `freezeOnBlur`, so a tab in the background would keep re-rendering on every Onyx update.
- * A blurred tab freezes one frame after it loses focus, so a tab mounted in the background still renders once.
- */
-function NativeTabScreenFreeze({children}: ChildrenProps) {
-    const isFocused = useIsFocused();
-    const [isFrozen, setIsFrozen] = useState(false);
-
-    // Decouple the Suspense render task so it won't be interrupted by React's concurrent mode and stuck in an infinite loop
-    useLayoutEffect(() => {
-        if (isFocused) {
-            // isFocused is the only dependency and does not change as a result of this setState.
-            // eslint-disable-next-line react-hooks/set-state-in-effect
-            setIsFrozen(false);
-            return;
-        }
-        const frameID = requestAnimationFrame(() => setIsFrozen(true));
-        return () => cancelAnimationFrame(frameID);
-    }, [isFocused]);
-
-    return <Freeze freeze={isFrozen && !isFocused}>{children}</Freeze>;
-}
-
-function nativeTabScreenLayout({children, ...rest}: Parameters<typeof bottomTabScreenLayoutWrapper>[0]) {
-    return bottomTabScreenLayoutWrapper({...rest, children: <NativeTabScreenFreeze>{children}</NativeTabScreenFreeze>});
-}
-
-export default nativeTabScreenLayout;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 364f6ecca22b..229031fa720c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -1,3 +1,4 @@
+import {bottomTabScreenLayoutWrapper} from '@libs/Navigation/PlatformStackNavigation/ScreenLayout';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
 import HomePage from '@pages/home/HomePage';
@@ -14,7 +15,6 @@ import type {NativeTabName} from './NativeTabNavigator/NATIVE_TAB_GLYPHS';
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
-import nativeTabScreenLayout from './NativeTabNavigator/nativeTabScreenLayout';
 import tabScreenListeners from './NativeTabNavigator/tabScreenListeners';
 import useNativeTabBarOptions from './NativeTabNavigator/useNativeTabBarOptions';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
@@ -44,7 +44,7 @@ function TabNavigator() {
         <Tab.Navigator
             backBehavior="fullHistory"
             layout={renderNativeTabLayout}
-            screenLayout={nativeTabScreenLayout}
+            screenLayout={bottomTabScreenLayoutWrapper}
             screenOptions={screenOptions}
             UNSTABLE_router={tabRouterOverride}
             screenListeners={tabScreenListeners}

From aa861e2b54e57d571a37d7b9951d126e281c1004 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 14:26:23 +0200
Subject: [PATCH 267/781] fix: show Search skeleton rows on the first visit to
 a background mounted Spend tab

---
 src/pages/Search/SearchPageNarrow/index.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index e310ae2aa9e2..1e5523b5326c 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -13,6 +13,7 @@ import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPa
 import SearchSelectionFooter from '@components/Search/SearchSelectionFooter';
 import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
 import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
@@ -341,6 +342,12 @@ function SearchPageNarrow({
                                             hasFilterBars={hasFilterBars}
                                         />
                                     )}
+                                    {!isInteractive && !searchOverlayContent && (
+                                        <SearchRowSkeleton
+                                            shouldAnimate
+                                            containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
+                                        />
+                                    )}
                                     {shouldRenderLayoutProbe && <View onLayout={onSearchLayout} />}
                                     {!!searchOverlayContent && (
                                         <View

From f8735874c98a72e1e58c454bd88de6a974d7c7d4 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 15:47:10 +0200
Subject: [PATCH 268/781] fix: derive the natively selected tab from the
 history, so a beta change that hides it no longer crashes the Android tab bar

---
 ...tom-tabs+7.16.2+003+hidden-tab-items.patch | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
index ae32aafb76b4..0363ebe03089 100644
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-index 09ec68f..bd6204e 100644
+index 09ec68f..6645270 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 @@ -4,11 +4,11 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
@@ -16,7 +16,7 @@ index 09ec68f..bd6204e 100644
  const meta = {
    type: 'native-tabs'
  };
-@@ -32,9 +32,23 @@ export function NativeBottomTabView({
+@@ -32,9 +32,21 @@ export function NativeBottomTabView({
      fonts
    } = useTheme();
    const focusedRouteKey = state.routes[state.index].key;
@@ -24,11 +24,9 @@ index 09ec68f..bd6204e 100644
 +  // and the tab bar is hidden, and the host keeps the last focused visible tab selected underneath.
 +  const isRouteHidden = route => descriptors[route.key]?.options.tabBarItemHidden === true;
 +  const isFocusedRouteHidden = isRouteHidden(state.routes[state.index]);
-+  const lastVisibleRouteKeyRef = React.useRef(undefined);
-+  if (!isFocusedRouteHidden) {
-+    lastVisibleRouteKeyRef.current = focusedRouteKey;
-+  }
-+  const nativeSelectedRouteKey = isFocusedRouteHidden ? lastVisibleRouteKeyRef.current ?? state.routes.find(route => !isRouteHidden(route))?.key ?? focusedRouteKey : focusedRouteKey;
++  // Derived from the history rather than remembered, so a route that became hidden since it was focused is skipped.
++  const isRouteKeyVisible = key => state.routes.some(route => route.key === key && !isRouteHidden(route));
++  const nativeSelectedRouteKey = isFocusedRouteHidden ? state.history.findLast(entry => isRouteKeyVisible(entry.key))?.key ?? state.routes.find(route => !isRouteHidden(route))?.key ?? focusedRouteKey : focusedRouteKey;
 +  // Hidden routes stay mounted once visited, the same as the native tabs.
 +  const visitedHiddenRouteKeysRef = React.useRef(new Set());
 +  if (isFocusedRouteHidden) {
@@ -41,7 +39,7 @@ index 09ec68f..bd6204e 100644
        provenance: 0
      }
    });
-@@ -189,17 +203,17 @@ export function NativeBottomTabView({
+@@ -189,17 +201,17 @@ export function NativeBottomTabView({
    const tabBarMinimizeBehavior = currentOptions.tabBarMinimizeBehavior === 'auto' ? 'automatic' : currentOptions.tabBarMinimizeBehavior === 'none' ? 'never' : currentOptions.tabBarMinimizeBehavior;
    const shouldHideTabBar = currentOptions.tabBarStyle?.display === 'none';
    const bottomAccessory = currentOptions.bottomAccessory;
@@ -63,7 +61,7 @@ index 09ec68f..bd6204e 100644
        colorScheme: dark ? 'dark' : 'light',
        ios: {
          bottomAccessory: bottomAccessory ? environment => bottomAccessory({
-@@ -210,6 +224,9 @@ export function NativeBottomTabView({
+@@ -210,6 +222,9 @@ export function NativeBottomTabView({
          tabBarTintColor: activeTintColor
        },
        children: state.routes.map((route, index) => {
@@ -73,7 +71,7 @@ index 09ec68f..bd6204e 100644
          const {
            options,
            render,
-@@ -221,6 +238,7 @@ export function NativeBottomTabView({
+@@ -221,6 +236,7 @@ export function NativeBottomTabView({
            title,
            lazy = false,
            tabBarLabel,
@@ -81,7 +79,7 @@ index 09ec68f..bd6204e 100644
            tabBarSelectionEnabled,
            tabBarBadgeStyle,
            tabBarIcon,
-@@ -287,6 +305,7 @@ export function NativeBottomTabView({
+@@ -287,6 +303,7 @@ export function NativeBottomTabView({
            preventNativeSelection: tabBarSelectionEnabled === false,
            badgeValue: tabBarBadge?.toString(),
            title: tabTitle,
@@ -89,7 +87,7 @@ index 09ec68f..bd6204e 100644
            specialEffects: {
              repeatedTabSelection: {
                popToRoot: true,
-@@ -363,9 +382,40 @@ export function NativeBottomTabView({
+@@ -363,9 +380,40 @@ export function NativeBottomTabView({
            })
          }, route.key);
        })

From 2a9acc3c13351a5c490f96db6e9ebd1c1944d697 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 15:47:12 +0200
Subject: [PATCH 269/781] fix: replace instead of push when leaving Insights
 without the beta or deep linked Account, so back does not loop

---
 .../NativeTabNavigator/useNativeTabNavigator.ts       |  9 +++++----
 src/pages/settings/InitialSettingsPage.tsx            | 11 ++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 41e2ff283aa2..1bb5d86d0304 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -44,7 +44,7 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 function useNativeTabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
-    const {isBetaEnabled} = usePermissions();
+    const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
     const {translate} = useLocalize();
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const tabWithoutBarItem = getTabWithoutBarItem(isInsightsTabVisible);
@@ -99,13 +99,14 @@ function useNativeTabNavigator() {
     }, [tabState, route.key]);
 
     // Without the beta, Insights has no bar item and its page is not found, so a restored or deep-linked Insights tab
-    // would be a full screen with no way out. Home takes its place.
-    const isInsightsTabFocusedWithoutBeta = !isInsightsTabVisible && activeTabRoute?.name === SCREENS.INSIGHTS;
+    // would be a full screen with no way out. Home replaces it, so going back does not return to it. Betas that are
+    // still loading are not a missing beta.
+    const isInsightsTabFocusedWithoutBeta = isBetaEnabledOrUnknown(CONST.BETAS.INSIGHTS_PAGE) === false && activeTabRoute?.name === SCREENS.INSIGHTS;
     useEffect(() => {
         if (!isInsightsTabFocusedWithoutBeta) {
             return;
         }
-        Navigation.navigate(ROUTES.HOME);
+        Navigation.navigate(ROUTES.HOME, {forceReplace: true});
     }, [isInsightsTabFocusedWithoutBeta]);
 
     // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index a55c35407e76..089c655f2050 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -12,6 +12,7 @@ import Text from '@components/Text';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 
+import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -60,13 +61,21 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const navigation = useNavigation();
     const isDrawnOverTabs = useIsSettingsDrawnOverTabs();
     // The tab navigator keeps the full tab history, so going back returns to the tab the user opened Account from.
+    // With nothing behind it, as after a deep link, Home replaces Account so that going back does not reopen it.
     const goBackFromAccount = () => {
         if (navigation.canGoBack()) {
             navigation.goBack();
             return;
         }
-        Navigation.navigate(ROUTES.HOME);
+        Navigation.navigate(ROUTES.HOME, {forceReplace: true});
     };
+    useAndroidBackButtonHandler(() => {
+        if (!isDrawnOverTabs) {
+            return false;
+        }
+        goBackFromAccount();
+        return true;
+    });
     const isScreenFocused = useIsSidebarRouteActive(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, shouldUseNarrowLayout);
     const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails);
     const {accountMenuItemsData, generalMenuItemsData} = useInitialSettingsPageMenuData(currentUserPersonalDetails);

From 3855aca0e56d80b99e29054882ee9b420abd54cb Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 15:47:26 +0200
Subject: [PATCH 270/781] fix: native tab taps run the JS tab button rules,
 Inbox opens at its list and anonymous users get sign-in

---
 .../NavigationTabBar/InboxTabButton.tsx       |  5 +-
 .../NavigationTabBar/navigateToInboxTab.ts    | 12 +++++
 .../NativeTabNavigator/tabScreenListeners.ts  | 34 ++++++++----
 .../useNativeTabNavigator.ts                  |  9 ++--
 .../Navigators/TabNavigator.native.tsx        |  7 +--
 .../Navigators/TabNavigatorBar.tsx            |  9 +---
 .../telemetry/cancelTabNavigationSpans.ts     | 10 +++-
 src/selectors/Session.ts                      |  4 +-
 tests/unit/nativeTabScreenListenersTest.ts    | 53 ++++++++++---------
 9 files changed, 91 insertions(+), 52 deletions(-)
 create mode 100644 src/components/Navigation/NavigationTabBar/navigateToInboxTab.ts

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index 5d5fdcd82215..39257ebeba21 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -31,6 +31,7 @@ import React, {useEffect, useRef} from 'react';
 import getLastRoute from './getLastRoute';
 import getReusableReportsTabStateKey from './getReusableReportsTabStateKey';
 import getStringParam from './getStringParam';
+import navigateToInboxTab from './navigateToInboxTab';
 import NAVIGATION_TABS from './NAVIGATION_TABS';
 import TabBarItem from './TabBarItem';
 
@@ -232,9 +233,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
         if (selectedTab === NAVIGATION_TABS.INBOX) {
             return;
         }
-
-        startNavigateToInboxTabSpan({isWideLayout: false});
-        Navigation.navigate(ROUTES.INBOX);
+        navigateToInboxTab();
     };
 
     return (
diff --git a/src/components/Navigation/NavigationTabBar/navigateToInboxTab.ts b/src/components/Navigation/NavigationTabBar/navigateToInboxTab.ts
new file mode 100644
index 000000000000..254b83ef7a10
--- /dev/null
+++ b/src/components/Navigation/NavigationTabBar/navigateToInboxTab.ts
@@ -0,0 +1,12 @@
+import Navigation from '@libs/Navigation/Navigation';
+import {startNavigateToInboxTabSpan} from '@libs/telemetry/startTabNavigationSpans';
+
+import ROUTES from '@src/ROUTES';
+
+/** Opens the Inbox tab at its chat list from the narrow tab bar, whatever report was left open in it. */
+function navigateToInboxTab() {
+    startNavigateToInboxTabSpan({isWideLayout: false});
+    Navigation.navigate(ROUTES.INBOX);
+}
+
+export default navigateToInboxTab;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
index 85c0f54871b4..a5d450535e04 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
@@ -1,27 +1,42 @@
+import navigateToInboxTab from '@components/Navigation/NavigationTabBar/navigateToInboxTab';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
-import {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
 
 import type {ValueOf} from 'type-fest';
 
+type NavigationTab = ValueOf<typeof NAVIGATION_TABS>;
+
+/** Tabs the JS tab buttons keep from anonymous users, who get the sign-in modal instead. */
+const ANONYMOUS_GATED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.SEARCH, NAVIGATION_TABS.INSIGHTS, NAVIGATION_TABS.SETTINGS]);
+
 /**
- * Starts the tab-navigation spans of the tabs that have them. The native bar never renders InboxTabButton or
- * SearchTabButton, which start these spans on the JS tab bar, so its taps start them here instead.
+ * What a tap on the native bar does on top of the tab switch, mirroring the JS tab buttons the native bar replaces.
+ * Inbox opens at its chat list, so it is switched by JS navigation rather than by the native selection.
  */
-const NAVIGATION_TAB_TO_SPAN_START: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, () => void>> = {
-    [NAVIGATION_TABS.INBOX]: () => startNavigateToInboxTabSpan({isWideLayout: false}),
-    [NAVIGATION_TABS.SEARCH]: startNavigateToReportsTabSpans,
+const NAVIGATION_TAB_PRESS_HANDLERS: Partial<Record<NavigationTab, () => void>> = {
+    [NAVIGATION_TABS.INBOX]: navigateToInboxTab,
+    [NAVIGATION_TABS.SEARCH]: () => interceptAnonymousUser(startNavigateToReportsTabSpans),
+    [NAVIGATION_TABS.INSIGHTS]: () => interceptAnonymousUser(() => {}),
+    [NAVIGATION_TABS.SETTINGS]: () => interceptAnonymousUser(() => {}),
 };
 
+/** Whether the native bar switches to the tab itself, or leaves the switch to the tab's press handler. */
+function isNativeTabSelectionEnabled(routeName: string, isAnonymousUser: boolean) {
+    const tab = ROUTE_TO_NAVIGATION_TAB[routeName];
+    return tab !== NAVIGATION_TABS.INBOX && !(isAnonymousUser && ANONYMOUS_GATED_TABS.has(tab));
+}
+
 type TabScreenListenerProps = {
     route: {name: string};
     navigation: {isFocused: () => boolean};
 };
 
 /**
- * Native tabs emit `tabPress` when a user tap reaches JS, before the navigator switches to that tab. A tap on the
- * already focused tab also emits it, and starts no span, the same as a JS tab button pressed on its own tab.
+ * Native tabs emit `tabPress` when a user tap reaches JS, both for a tab the bar switched to and for one whose
+ * selection is disabled. A tap on the already focused tab does nothing, the same as a JS tab button pressed on its own tab.
  */
 function tabScreenListeners({route, navigation}: TabScreenListenerProps) {
     return {
@@ -29,9 +44,10 @@ function tabScreenListeners({route, navigation}: TabScreenListenerProps) {
             if (navigation.isFocused()) {
                 return;
             }
-            NAVIGATION_TAB_TO_SPAN_START[ROUTE_TO_NAVIGATION_TAB[route.name]]?.();
+            NAVIGATION_TAB_PRESS_HANDLERS[ROUTE_TO_NAVIGATION_TAB[route.name]]?.();
         },
     };
 }
 
 export default tabScreenListeners;
+export {isNativeTabSelectionEnabled};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 1bb5d86d0304..d3c419584453 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -4,6 +4,7 @@ import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROU
 
 import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {useChatTabBrickRoad} from '@hooks/useSidebarOrderedReports';
@@ -11,20 +12,21 @@ import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
-import {NAVIGATION_TAB_TO_SPANS} from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import cancelTabNavigationSpans from '@libs/telemetry/cancelTabNavigationSpans';
+import cancelTabNavigationSpans, {NAVIGATION_TAB_TO_SPANS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
 
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
+import {isAnonymousSessionSelector} from '@selectors/Session';
 import {useEffect} from 'react';
 
 import getTabWithoutBarItem from './getTabWithoutBarItem';
@@ -46,6 +48,7 @@ function useNativeTabNavigator() {
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
     const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
     const {translate} = useLocalize();
+    const [isAnonymousUser = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector});
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const tabWithoutBarItem = getTabWithoutBarItem(isInsightsTabVisible);
     const theme = useTheme();
@@ -128,7 +131,7 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride};
+    return {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 229031fa720c..9a537675168b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -15,7 +15,7 @@ import type {NativeTabName} from './NativeTabNavigator/NATIVE_TAB_GLYPHS';
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
-import tabScreenListeners from './NativeTabNavigator/tabScreenListeners';
+import tabScreenListeners, {isNativeTabSelectionEnabled} from './NativeTabNavigator/tabScreenListeners';
 import useNativeTabBarOptions from './NativeTabNavigator/useNativeTabBarOptions';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
@@ -35,10 +35,11 @@ const HIDDEN_TAB_OPTIONS = {tabBarItemHidden: true};
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
-    const {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser} = useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels});
     // A tab with no bar item draws no icon.
-    const getOptions = (name: NativeTabName) => (name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : getTabOptions(name));
+    const getOptions = (name: NativeTabName) =>
+        name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, isAnonymousUser)};
 
     return (
         <Tab.Navigator
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
index 3943151a081a..327776eaa50b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigatorBar.tsx
@@ -10,21 +10,15 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
-import cancelTabNavigationSpans, {INBOX_TAB_SPAN_IDS, REPORTS_TAB_SPAN_IDS} from '@libs/telemetry/cancelTabNavigationSpans';
+import cancelTabNavigationSpans, {NAVIGATION_TAB_TO_SPANS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import SCREENS from '@src/SCREENS';
 
 import type {BottomTabBarProps} from '@react-navigation/bottom-tabs';
-import type {ValueOf} from 'type-fest';
 
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
-const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
-    [NAVIGATION_TABS.INBOX]: INBOX_TAB_SPAN_IDS,
-    [NAVIGATION_TABS.SEARCH]: REPORTS_TAB_SPAN_IDS,
-};
-
 /**
  * Custom tab bar rendered by the BottomTabNavigator. Only receives `state` (not the
  * full BottomTabBarProps) to avoid `descriptors` thrashing memoization.
@@ -96,4 +90,3 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
 }
 
 export default TabNavigatorBar;
-export {NAVIGATION_TAB_TO_SPANS};
diff --git a/src/libs/telemetry/cancelTabNavigationSpans.ts b/src/libs/telemetry/cancelTabNavigationSpans.ts
index 364a0cf2ab0e..42c3c7a3261b 100644
--- a/src/libs/telemetry/cancelTabNavigationSpans.ts
+++ b/src/libs/telemetry/cancelTabNavigationSpans.ts
@@ -1,5 +1,9 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+
 import CONST from '@src/CONST';
 
+import type {ValueOf} from 'type-fest';
+
 import {cancelSpan} from './activeSpans';
 
 // Spans grouped by the tab they belong to. The Reports tab owns three (legacy plus the FirstPaint/ContentLoad
@@ -11,6 +15,10 @@ const REPORTS_TAB_SPAN_IDS: readonly string[] = [
 ];
 const INBOX_TAB_SPAN_IDS: readonly string[] = [CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB];
 const TAB_NAVIGATION_SPAN_IDS: readonly string[] = [...REPORTS_TAB_SPAN_IDS, ...INBOX_TAB_SPAN_IDS];
+const NAVIGATION_TAB_TO_SPANS: Partial<Record<ValueOf<typeof NAVIGATION_TABS>, readonly string[]>> = {
+    [NAVIGATION_TABS.INBOX]: INBOX_TAB_SPAN_IDS,
+    [NAVIGATION_TABS.SEARCH]: REPORTS_TAB_SPAN_IDS,
+};
 
 /**
  * Cancels running tab-navigation spans so an abandoned tap does not leave one ticking until the user returns.
@@ -26,4 +34,4 @@ function cancelTabNavigationSpans(preserve: readonly string[] = []) {
 }
 
 export default cancelTabNavigationSpans;
-export {REPORTS_TAB_SPAN_IDS, INBOX_TAB_SPAN_IDS, TAB_NAVIGATION_SPAN_IDS};
+export {REPORTS_TAB_SPAN_IDS, INBOX_TAB_SPAN_IDS, TAB_NAVIGATION_SPAN_IDS, NAVIGATION_TAB_TO_SPANS};
diff --git a/src/selectors/Session.ts b/src/selectors/Session.ts
index c1798bac7d6d..37e3232ed5f6 100644
--- a/src/selectors/Session.ts
+++ b/src/selectors/Session.ts
@@ -7,6 +7,8 @@ const isSupportalSessionSelector = (session: OnyxEntry<Session>) => session?.aut
 
 const isDelegateSessionSelector = (session: OnyxEntry<Session>) => session?.authTokenType === CONST.AUTH_TOKEN_TYPES.DELEGATE;
 
+const isAnonymousSessionSelector = (session: OnyxEntry<Session>) => session?.authTokenType === CONST.AUTH_TOKEN_TYPES.ANONYMOUS;
+
 const emailSelector = (session: OnyxEntry<Session>) => session?.email;
 
 const accountIDSelector = (session: OnyxEntry<Session>) => session?.accountID;
@@ -15,4 +17,4 @@ const sessionEmailAndAccountIDSelector = (session: OnyxEntry<Session>) => ({emai
 
 const authTokenSelector = (session: OnyxEntry<Session>) => session?.authToken;
 
-export {emailSelector, accountIDSelector, sessionEmailAndAccountIDSelector, authTokenSelector, isSupportalSessionSelector, isDelegateSessionSelector};
+export {emailSelector, accountIDSelector, sessionEmailAndAccountIDSelector, authTokenSelector, isSupportalSessionSelector, isDelegateSessionSelector, isAnonymousSessionSelector};
diff --git a/tests/unit/nativeTabScreenListenersTest.ts b/tests/unit/nativeTabScreenListenersTest.ts
index f16f5c891c7b..964dd46201f7 100644
--- a/tests/unit/nativeTabScreenListenersTest.ts
+++ b/tests/unit/nativeTabScreenListenersTest.ts
@@ -1,9 +1,14 @@
-import tabScreenListeners from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners';
-import {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+import navigateToInboxTab from '@components/Navigation/NavigationTabBar/navigateToInboxTab';
+
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import tabScreenListeners, {isNativeTabSelectionEnabled} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners';
+import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
 
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
+jest.mock('@components/Navigation/NavigationTabBar/navigateToInboxTab', () => jest.fn());
+jest.mock('@libs/interceptAnonymousUser', () => jest.fn((callback: () => void) => callback()));
 jest.mock('@libs/telemetry/startTabNavigationSpans', () => ({
     startNavigateToInboxTabSpan: jest.fn(),
     startNavigateToReportsTabSpans: jest.fn(),
@@ -18,46 +23,46 @@ describe('tabScreenListeners', () => {
         jest.clearAllMocks();
     });
 
-    it('starts the inbox tab span when the Inbox tab is pressed from another tab', () => {
-        // Given the native bar, which never renders InboxTabButton, so the span has to start from the tab press
+    it('opens the Inbox chat list when Inbox is pressed from another tab', () => {
+        // Given the native bar, whose Inbox selection is left to JS so that it opens at the chat list like InboxTabButton
         // When the user presses Inbox while another tab is focused
         pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, false);
 
-        // Then the same span the JS tab button starts is started, tagged as a narrow layout tap
-        expect(startNavigateToInboxTabSpan).toHaveBeenCalledWith({isWideLayout: false});
-        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+        // Then the shared Inbox navigation runs
+        expect(navigateToInboxTab).toHaveBeenCalledTimes(1);
     });
 
-    it('starts the reports tab spans when the Spend tab is pressed from another tab', () => {
+    it('checks for an anonymous user before starting the Spend spans', () => {
         // Given the native bar, which never renders SearchTabButton
         // When the user presses Spend while another tab is focused
         pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, false);
 
-        // Then the legacy span and its FirstPaint/ContentLoad split are started, as on the JS tab button
+        // Then the spans start behind the same anonymous user check the JS tab button uses
+        expect(interceptAnonymousUser).toHaveBeenCalledWith(startNavigateToReportsTabSpans);
         expect(startNavigateToReportsTabSpans).toHaveBeenCalledTimes(1);
-        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
     });
 
-    it('starts no span when the already focused tab is pressed again', () => {
+    it('does nothing when the already focused tab is pressed again', () => {
         // Given native tabs also emit tabPress for a tap on the focused tab
         // When the user presses Inbox and Spend while each is already focused
         pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, true);
         pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, true);
 
-        // Then nothing starts, because no navigation follows that would end the spans
-        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
-        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+        // Then nothing runs, the same as a JS tab button pressed on its own tab
+        expect(navigateToInboxTab).not.toHaveBeenCalled();
+        expect(interceptAnonymousUser).not.toHaveBeenCalled();
     });
 
-    it('starts no span for tabs without a navigation span', () => {
-        // Given Home, Workspaces and Account have no tab navigation span
-        // When the user presses each of them from another tab
-        pressTab(SCREENS.HOME, false);
-        pressTab(NAVIGATORS.WORKSPACE_NAVIGATOR, false);
-        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, false);
-
-        // Then no tab navigation span starts
-        expect(startNavigateToInboxTabSpan).not.toHaveBeenCalled();
-        expect(startNavigateToReportsTabSpans).not.toHaveBeenCalled();
+    it('leaves the switch to JS only for Inbox and, for anonymous users, the tabs they are kept from', () => {
+        // Given the tabs whose press has to run JS before any switch
+        // When the native selection is decided for a signed-in and for an anonymous user
+        // Then Inbox is always switched by JS, and Spend, Insights and Account only for an anonymous user
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, false)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, false)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, true)).toBe(false);
+        expect(isNativeTabSelectionEnabled(SCREENS.INSIGHTS, true)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, true)).toBe(false);
+        expect(isNativeTabSelectionEnabled(SCREENS.HOME, true)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, true)).toBe(true);
     });
 });

From 433cc0023f66bc87f1fcdaee7115dde4c68a4229 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 15:47:28 +0200
Subject: [PATCH 271/781] fix: still background Spend skeleton, no tab bar
 animation before it is on screen, iOS floating buttons above the safe area

---
 ...8.0+001+animate-hiding-the-native-tab-bar.patch |  7 ++++---
 .../useNativeTabBarOptions/index.ios.ts            |  3 ++-
 src/pages/Search/SearchPageNarrow/index.tsx        |  5 ++++-
 src/styles/variables.ts                            | 14 +++++++-------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/patches/react-native-screens/react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch b/patches/react-native-screens/react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch
index d0d1588f1646..632508daac5b 100644
--- a/patches/react-native-screens/react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch
+++ b/patches/react-native-screens/react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch
@@ -1,13 +1,14 @@
 diff --git a/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm b/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
 --- a/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
 +++ b/node_modules/react-native-screens/ios/tabs/host/RNSTabsHostComponentView.mm
-@@ -244,7 +244,8 @@
+@@ -244,7 +244,9 @@
      _tabBarHidden = newComponentProps.tabBarHidden;
  #if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
      if (@available(iOS 18.0, *)) {
 -      [_controller setTabBarHidden:_tabBarHidden animated:NO];
-+      // Animated so the bar slides out with the screen that hid it instead of blinking away.
-+      [_controller setTabBarHidden:_tabBarHidden animated:YES];
++      // Animated so the bar slides out with the screen that hid it instead of blinking away, except before the bar
++      // is on screen, where the first render would animate it out.
++      [_controller setTabBarHidden:_tabBarHidden animated:[[_controller tabBar] window] != nil];
      } else
  #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
      {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index d3c29b934b92..135056a4332b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -13,7 +13,8 @@ import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-ta
 
 import type NativeTabBarOptionsParams from './types';
 
-const getFloatingButtonsBottom = () => variables.iosNativeTabBarFloatingButtonsBottom;
+/** UITabBar sits above the home indicator inset, so the floating buttons clear both. */
+const getFloatingButtonsBottom = (bottomInset: number) => variables.iosNativeTabBarFloatingButtonsBottom + bottomInset;
 
 const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconNativeTabBarIOS,
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 1e5523b5326c..c565d5c75d6b 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -187,6 +187,8 @@ function SearchPageNarrow({
     });
     const [isInteractive, setIsInteractive] = useState(!useStaticRendering);
     const [isHeaderInteractive, setIsHeaderInteractive] = useState(!useStaticRendering);
+    // A page mounted in the background, as native tabs mount Spend, keeps its skeleton still until it is first shown.
+    const [hasBeenFocused, setHasBeenFocused] = useState(!useStaticRendering);
     const isHeaderInteractiveRef = useRef(isHeaderInteractive);
     const [, startTransition] = useTransition();
     useEffect(() => {
@@ -209,6 +211,7 @@ function SearchPageNarrow({
     // useFocusEffect avoids the extra re-renders that useIsFocused causes on every focus change.
     useFocusEffect(
         useCallback(() => {
+            setHasBeenFocused(true);
             if (isInteractive) {
                 return;
             }
@@ -344,7 +347,7 @@ function SearchPageNarrow({
                                     )}
                                     {!isInteractive && !searchOverlayContent && (
                                         <SearchRowSkeleton
-                                            shouldAnimate
+                                            shouldAnimate={hasBeenFocused}
                                             containerStyle={styles.searchListContentContainerStyles(hasFilterBars)}
                                         />
                                     )}
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index ee8d0aac2d66..5e9e38376af8 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -108,24 +108,24 @@ export default {
     iconSizeMegaLarge: 105,
     iconSizeMenuItem: 32,
     iconBottomBar: 24,
-    /** Glyph size in the floating tab bar, smaller than the side bar's so each item keeps padding above and below it. */
+    /** Glyph size in the floating tab bar. */
     iconFloatingTabBar: 20,
-    /** Account avatar size in the floating tab bar. A circle reads smaller than a glyph of the same box, so it is larger. */
+    /** Account avatar size in the floating tab bar. */
     avatarFloatingTabBar: avatarSizes.avatarSizeXSmall,
-    /** Glyph size in the iOS native tab bar. UITabBar gives each item more room than the JS bar, so its glyphs are larger. */
+    /** Glyph size in the iOS native tab bar. */
     iconNativeTabBarIOS: 22,
-    /** Account avatar size in the iOS native tab bar, larger than its glyphs by the same amount as on the JS bar. */
+    /** Account avatar size in the iOS native tab bar. */
     avatarNativeTabBarIOS: 26,
     /** Radius of the status dot drawn into an iOS native tab bar icon. */
     nativeTabIconDotRadius: 4,
-    // Gap between the glyph and the label baked under it, matching the spacing the JS bar uses.
+    /** Gap between the glyph and the label drawn under it in an iOS native tab bar icon. */
     nativeTabIconLabelGap: 6,
     /** Material's BottomNavigationView row, without the gesture inset under it. */
     androidNativeTabBarHeight,
     /** Material's bar row plus the 16 dp Material keeps between a FAB and the bar. */
     androidNativeTabBarFloatingButtonsBottom: androidNativeTabBarHeight + 16,
-    /** UITabBar with the home indicator inset under it, plus a 12 pt gap to the floating buttons. */
-    iosNativeTabBarFloatingButtonsBottom: 84,
+    /** UITabBar's row above the home indicator inset, plus the gap to the floating buttons. */
+    iosNativeTabBarFloatingButtonsBottom: 50,
     iconHeader: 48,
     iconSection: 68,
     iouAmountTextSize: 40,

From 0eb4f2895401fc64b139797b31e126e562d520e3 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 5 Oct 2026 15:47:30 +0200
Subject: [PATCH 272/781] chore: shared tab root scroll props type,
 constraint-only comments, patch docs explain why nothing is reported upstream

---
 patches/react-native-screens/details.md                  | 4 ++--
 patches/react-navigation/details.md                      | 9 +++++----
 .../useTabRootScrollProps/index.native.tsx               | 5 ++---
 .../TabBarBottomContent/useTabRootScrollProps/index.tsx  | 5 ++---
 .../TabBarBottomContent/useTabRootScrollProps/types.ts   | 5 +++++
 src/styles/index.ts                                      | 6 ++----
 6 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index fa3513685927..80b8f9a1bb67 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -12,13 +12,13 @@
 - Reason: Two changes to the Android tab labels, both in `TabsAppearanceApplicator`, which React Navigation has no option for.
   - Bold selected label. The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. The patch turns on Material's own `setItemTextAppearanceActiveBoldEnabled`, which keeps the large label bold whenever Material re-applies its text appearance, and calls it before `updateFontStyles`, because enabling it re-applies Material's text appearance and would otherwise replace the app's typeface. `updateFontStyles` then sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family.
   - Letter spacing. `updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app, so the patch sets a fixed -0.5dp tracking on both labels, converted to the `em` unit `TextView.letterSpacing` expects for each label's size.
-- Upstream PR/issue: not reported yet.
+- Upstream PR/issue: not reported, because both changes are the App's typography (a bold selected label and its letter spacing) rather than a library defect, and RNScreens has no option for either.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
 
 ### [react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch](react-native-screens+4.28.0+003+no-android-tab-icon-tint.patch)
 
 - Reason: The Android account tab shows the user's avatar. `TabsAppearanceApplicator` assigns `bottomNavigationView.itemIconTintList` unconditionally, and a `ColorStateList` tint is `SRC_IN`, so it flattens the avatar to a solid silhouette in the tint color. React Navigation's `tinted: false` only reaches iOS, since `getPlatformIcon` in `@react-navigation/bottom-tabs` always hands Android a plain `imageSource`. The patch drops the icon tint list so Android draws every icon bitmap as supplied. The App recolors the glyphs off-screen in Skia for both selection states, so they keep the design's colors. Label colors are untouched and keep coming from `tabBarItemTitleFontColor`.
-- Upstream PR/issue: not reported yet.
+- Upstream PR/issue: not reported, because dropping the tint for every icon fits only a bar whose icons all arrive pre-colored, as the App's do. The disabled and focused icon colors go with it, which the App does not use.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 8555434a0409..b186911582fb 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -30,7 +30,7 @@
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/pull/12751 (`route.history` + `pushParams`, added upstream for this use case); originating issue https://github.com/react-navigation/react-navigation/issues/12460. On the v8 upgrade, evaluate adopting `pushParams` to shrink this patch.
 - E/App issue: [#21356](https://github.com/Expensify/App/issues/21356)
 - PR Introducing Patch: [#24165](https://github.com/Expensify/App/pull/24165)
-- PR Updating Patch: [#32087](https://github.com/Expensify/App/pull/32087) [#42465](https://github.com/Expensify/App/pull/42465) [#64155](https://github.com/Expensify/App/pull/64155)
+- PR Updating Patch: [#32087](https://github.com/Expensify/App/pull/32087) [#42465](https://github.com/Expensify/App/pull/42465) [#64155](https://github.com/Expensify/App/pull/64155) [#101339](https://github.com/Expensify/App/pull/101339)
 
 ### [@react-navigation+stack+7.8.5+001+edge-drag-gesture.patch](@react-navigation+stack+7.8.5+001+edge-drag-gesture.patch)
 
@@ -67,19 +67,20 @@
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/issues/11145
 - E/App issue: [#94571](https://github.com/Expensify/App/issues/94571)
 - PR Introducing Patch: [#95980](https://github.com/Expensify/App/pull/95980)
+- PR Updating Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 
 ### [@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch)
 
 - Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design. **This patch can be removed on the upgrade to React Navigation v8**, whose rewritten native tab view no longer has the bug.
-- Upstream PR/issue: not reported. Fixed on the v8 branch, still present on the `7.x` branch as of 7.20.0.
+- Upstream PR/issue: not reported, because the v8 branch already fixes it and the fix only matters until the App moves to v8. Still present on the `7.x` branch as of 7.20.0.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A
 
 ### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
 
-- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Nothing native changes. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
-- Upstream PR/issue: not reported yet.
+- Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Nothing native changes. The host's selection is derived from the tab history, skipping routes that are hidden by then, so a beta change that hides the selected route cannot leave the host pointing at a removed tab. A route that moves between hidden and visible is remounted, and a hidden route ignores preloading and emits no transition events. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
+- Upstream PR/issue: not reported, because hiding an item from a native tab bar has no native counterpart and this works around it in JS for the App's tab set; the accessibility label part is already in v8.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
index 3ab149092092..65aaa5912a7a 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
@@ -1,6 +1,6 @@
-import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 
-type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
+import type TabRootScrollProps from './types';
 
 /**
  * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
@@ -11,4 +11,3 @@ function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps
 }
 
 export default useTabRootScrollProps;
-export type {TabRootScrollProps};
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index 75b760461ef3..c75a5c774fc8 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -3,9 +3,9 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import variables from '@styles/variables';
 
-import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 
-type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
+import type TabRootScrollProps from './types';
 
 /**
  * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
@@ -25,4 +25,3 @@ function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPa
 }
 
 export default useTabRootScrollProps;
-export type {TabRootScrollProps};
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
new file mode 100644
index 000000000000..61dc387fad90
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
@@ -0,0 +1,5 @@
+import type {ScrollViewProps} from 'react-native';
+
+type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
+
+export default TabRootScrollProps;
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 16d6b8c98c43..68c4704bcec3 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -742,8 +742,7 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
-        // The narrow tab bar on mobile web is a flat capsule floating above the screen content. iOS and Android hand
-        // the bottom bar over to their native tab bars, so nothing here reaches them.
+        // Only the mobile web bar uses this; iOS and Android draw native tab bars.
         navigationTabBarContainer: {
             flexDirection: 'row',
             height: variables.floatingTabBarHeight,
@@ -763,8 +762,7 @@ const staticStyles = (theme: ThemeColors) =>
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
-            // Spans the whole tab and a little past it, the way the native iOS bar draws its selection. The padding
-            // matches the negative margin, so the label keeps the tab's width to wrap in, selected or not.
+            // The padding matches the negative margin, so the label keeps the tab's width to wrap in, selected or not.
             alignSelf: 'stretch',
             paddingHorizontal: variables.floatingTabBarSelectedOverhang,
             marginHorizontal: -variables.floatingTabBarSelectedOverhang,

From 93a39949821e9a9b758e1ca318ba3897f9d88d1e Mon Sep 17 00:00:00 2001
From: "Maruf Sharifi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 5 Oct 2026 15:10:10 +0000
Subject: [PATCH 273/781] Recheck LHN reports whose visibility-related
 reportAttributes changed

A new DM filtered out before its derived attributes were ready was never rechecked, because the
attributes-only fallback only rechecks reports that are already displayed.

Co-authored-by: Maruf Sharifi <marufsharifi@users.noreply.github.com>
---
 src/hooks/useSidebarOrderedReports.tsx      | 23 ++++++
 tests/unit/useSidebarOrderedReportsTest.tsx | 89 +++++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/src/hooks/useSidebarOrderedReports.tsx b/src/hooks/useSidebarOrderedReports.tsx
index fca377ea8ed0..c37633b47edf 100644
--- a/src/hooks/useSidebarOrderedReports.tsx
+++ b/src/hooks/useSidebarOrderedReports.tsx
@@ -7,6 +7,7 @@ import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ValueOf} from 'type-fest';
 
@@ -116,6 +117,7 @@ function SidebarOrderedReportsContextProvider({
     const prevGuideAccountIDs = usePrevious(guideAccountIDs);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const reportAttributes = useReportAttributes();
+    const prevReportAttributes = usePrevious(reportAttributes);
     const [currentReportsToDisplay, setCurrentReportsToDisplay] = useState<ReportsToDisplayInLHN>({});
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isOffline} = useNetwork();
@@ -223,6 +225,26 @@ function SidebarOrderedReportsContextProvider({
         // reports, recheck only the already-displayed reports with the new reportAttributes.
         let effectiveUpdatedReports = updatedReports.length === 0 && hasCachedReports ? Object.keys(currentReportsToDisplay) : updatedReports;
 
+        // A report can be filtered out before its derived attributes are ready (e.g. a new DM that arrives before its
+        // expense preview). It is then not displayed, so the fallback above never rechecks it. Also recheck reports whose
+        // visibility-related attributes changed. Compare fields, not references: derived writes recreate every entry,
+        // so a reference diff would bring back a full scan. Skip the first hydration for the same reason.
+        if (hasCachedReports && reportAttributes !== prevReportAttributes && !isEmptyObject(prevReportAttributes)) {
+            const reportsToUpdate = new Set(effectiveUpdatedReports);
+            for (const [reportID, attributes] of Object.entries(reportAttributes ?? {})) {
+                const prevAttributes = prevReportAttributes[reportID];
+                if (
+                    !prevAttributes ||
+                    attributes.requiresAttention !== prevAttributes.requiresAttention ||
+                    attributes.isEmpty !== prevAttributes.isEmpty ||
+                    attributes.brickRoadStatus !== prevAttributes.brickRoadStatus
+                ) {
+                    reportsToUpdate.add(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+                }
+            }
+            effectiveUpdatedReports = Array.from(reportsToUpdate);
+        }
+
         // When guide personal details hydrate after the reports collection, guideAccountIDs changes but
         // getUpdatedReports() returns no report keys. Re-evaluate all reports so domain rooms previously
         // filtered out can appear in the LHN.
@@ -282,6 +304,7 @@ function SidebarOrderedReportsContextProvider({
         transactionViolations,
         reportNameValuePairs,
         reportAttributes,
+        prevReportAttributes,
         reportsDrafts,
         isOffline,
         clearCacheDummyCounter,
diff --git a/tests/unit/useSidebarOrderedReportsTest.tsx b/tests/unit/useSidebarOrderedReportsTest.tsx
index 9b5071bd224e..09ecf03f2cf0 100644
--- a/tests/unit/useSidebarOrderedReportsTest.tsx
+++ b/tests/unit/useSidebarOrderedReportsTest.tsx
@@ -10,6 +10,7 @@ import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report} from '@src/types/onyx';
+import type {ReportAttributes} from '@src/types/onyx/DerivedValues';
 
 import type {OnyxMultiSetInput} from 'react-native-onyx';
 
@@ -427,4 +428,92 @@ describe('useSidebarOrderedReports', () => {
 
         expect(fullRecomputeCall).toBeUndefined();
     });
+
+    describe('reportAttributes changes', () => {
+        const createReportAttributes = (attributes: Partial<ReportAttributes> = {}): ReportAttributes => ({
+            reportName: 'Chat',
+            isEmpty: false,
+            brickRoadStatus: undefined,
+            requiresAttention: false,
+            reportErrors: {},
+            ...attributes,
+        });
+
+        const displayedReportID = '1';
+        const newDMReportID = '2';
+
+        // Renders the LHN with one displayed report and a new DM that is filtered out because its attributes are not ready yet.
+        const renderWithExcludedReport = async () => {
+            const displayedReports = createMockReports({
+                report1: {reportName: 'Chat A'},
+            });
+            // The LHN cache is keyed by the report's Onyx key
+            mockSidebarUtils.getReportsToDisplayInLHN.mockReturnValue({[`${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`]: displayedReports[displayedReportID]});
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockImplementation(({displayedReports: reports}) => reports);
+
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`, displayedReports[displayedReportID]);
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {reports: {[displayedReportID]: createReportAttributes()}, locale: 'en'});
+            });
+
+            renderHook(() => useSidebarOrderedReports(), {
+                wrapper: TestWrapper,
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`, {reportID: newDMReportID, type: CONST.REPORT.TYPE.CHAT} as Report);
+            });
+            await waitForBatchedUpdatesWithAct();
+        };
+
+        const getUpdatedReportsKeys = () => mockSidebarUtils.updateReportsToDisplayInLHN.mock.calls.flatMap((call) => call[0]?.updatedReportsKeys ?? []);
+
+        it('should recheck a report that is not displayed when its attributes make it require attention', async () => {
+            // Given the LHN cache is built and a new DM was filtered out before its attributes were calculated
+            await renderWithExcludedReport();
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockClear();
+
+            // When the derived attributes later mark the DM as requiring attention, with no change to the report itself
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {[displayedReportID]: createReportAttributes(), [newDMReportID]: createReportAttributes({requiresAttention: true})},
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the DM is rechecked, so it can be added to the LHN without a full rebuild, and the displayed report is still
+            // rechecked with the new attributes by the existing fallback
+            expect(getUpdatedReportsKeys()).toEqual(expect.arrayContaining([`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`, `${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`]));
+        });
+
+        it('should not recheck a report when its attributes are recreated with the same visibility fields', async () => {
+            // Given the DM already has attributes that keep it out of the LHN
+            await renderWithExcludedReport();
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {[displayedReportID]: createReportAttributes(), [newDMReportID]: createReportAttributes({isEmpty: true})},
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockClear();
+
+            // When the derived value is written again with new objects but the same visibility fields
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {
+                        [displayedReportID]: createReportAttributes({reportName: 'Renamed'}),
+                        [newDMReportID]: createReportAttributes({isEmpty: true, reportName: 'Renamed'}),
+                    },
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the hidden DM is not rechecked, which keeps reportAttributes writes from triggering a full scan
+            expect(getUpdatedReportsKeys()).not.toContain(`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`);
+        });
+    });
 });

From c20bc5aa450c886b45f4ffc2e86f7e3e1c6e5c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Musia=C5=82?= <jan.musial@swmansion.com>
Date: Mon, 5 Oct 2026 17:41:51 +0200
Subject: [PATCH 274/781] fix cosnistency comments

---
 src/libs/actions/Delegate.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 0ec8f4b40134..b60159aff704 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -133,7 +133,7 @@ const DISCONNECT_RESULT = {
 
     /**
      * The server ended the copilot session, but restoring the original session threw partway. SESSION is written first,
-     * so it most likely holds the original account already; if not, the next request reauthenticates with the stash.
+     * so it most likely holds the original account already. If not, the next request reauthenticates with the stash.
      */
     RESTORE_INTERRUPTED: 'restoreInterrupted',
 
@@ -371,7 +371,7 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams): Pro
                 return DISCONNECT_RESULT.RESTORE_INTERRUPTED;
             });
         },
-        // Only a failed request leaves the copilot session untouched; errors thrown while restoring are handled above
+        // Only a failed request leaves the copilot session untouched. Errors thrown while restoring are handled above.
         (error) => {
             Log.alert('[Delegate] Error disconnecting as a delegate', {error});
             return DISCONNECT_RESULT.FAILED;

From 2eeafea4691d14f0d9ee76bb8f108913d7e5c163 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 5 Oct 2026 21:45:59 +0200
Subject: [PATCH 275/781] Fix copying Reimbursable and Billable labels

---
 .../ReportActionItem/MoneyRequestView.tsx     | 10 +--
 tests/ui/MoneyRequestViewTest.tsx             | 76 +++----------------
 2 files changed, 13 insertions(+), 73 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index ed0928c5c696..48ced1138788 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -98,7 +98,7 @@ import {
     isTrackExpenseReportNew,
     shouldEnableNegative,
 } from '@libs/ReportUtils';
-import {COPYABLE_ROW_DATA_SET} from '@libs/SelectionScraper';
+import {COPYABLE_ROW_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import {getDependentTagVisibility, hasEnabledTags} from '@libs/TagsOptionsListUtils';
 import {
     getAttendeesListDisplayString,
@@ -1687,7 +1687,7 @@ function MoneyRequestView({
                                             accountID: a?.accountID,
                                             email: a?.email,
                                         }))}
-                                        maxVisible={areAttendeesCopyable ? actualAttendees.length : undefined}
+                                        maxVisible={canEdit ? undefined : actualAttendees.length}
                                         isCopyable={areAttendeesCopyable}
                                     />
                                 ) : undefined
@@ -1721,8 +1721,7 @@ function MoneyRequestView({
                             <Text
                                 accessible={false}
                                 aria-hidden
-                                style={styles.userSelectNone}
-                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                dataSet={COPYABLE_TEXT_DATA_SET}
                             >
                                 {Str.UCFirst(translate('iou.reimbursable'))}
                             </Text>
@@ -1744,8 +1743,7 @@ function MoneyRequestView({
                             <Text
                                 accessible={false}
                                 aria-hidden
-                                style={styles.userSelectNone}
-                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                dataSet={COPYABLE_TEXT_DATA_SET}
                             >
                                 {translate('common.billable')}
                             </Text>
diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index 994404f5ac9c..adb205fdb233 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -31,16 +31,9 @@ type MockMenuItemWithTopDescriptionProps = {
     title?: string;
     interactive?: boolean;
     descriptionTextStyle?: StyleProp<TextStyle>;
-    titleComponent?: React.ReactNode;
 };
 
-type MockUserPillsProps = {
-    users: unknown[];
-    maxVisible?: number;
-    isCopyable?: boolean;
-};
-
-const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive, titleComponent}: MockMenuItemWithTopDescriptionProps) => {
+const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive}: MockMenuItemWithTopDescriptionProps) => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
 
     return (
@@ -53,18 +46,15 @@ const mockMenuItemWithTopDescription = jest.fn(({description, title, interactive
                     <RN.Text>{title}</RN.Text>
                 </RN.View>
             )}
-            {titleComponent}
         </>
     );
 });
-const mockUserPills = jest.fn<null, [MockUserPillsProps]>(() => null);
 
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
         translate: jest.fn((key: string) => key),
         numberFormat: jest.fn((num: number) => num.toString()),
         toLocaleDigit: jest.fn((digit: string) => digit),
-        localeCompare: jest.fn((first: string, second: string) => first.localeCompare(second)),
     })),
 );
 
@@ -98,10 +88,6 @@ jest.mock('@components/MenuItemWithTopDescription', () => {
     return (props: MockMenuItemWithTopDescriptionProps) => mockMenuItemWithTopDescription(props);
 });
 
-jest.mock('@components/UserPills', () => {
-    return (props: MockUserPillsProps) => mockUserPills(props);
-});
-
 // Mock the legacy MenuItem (used for some fields like billable), but keep the real compound parts the migrated rows render with
 jest.mock('@components/MenuItem', () => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
@@ -185,7 +171,6 @@ describe('MoneyRequestView edit fields', () => {
             await Onyx.clear();
         });
         mockMenuItemWithTopDescription.mockClear();
-        mockUserPills.mockClear();
     });
 
     const setupTestData = async (isSettledReport = false) => {
@@ -334,8 +319,8 @@ describe('MoneyRequestView edit fields', () => {
         });
     });
 
-    it('excludes the reimbursable toggle label from selection and copied content', async () => {
-        // Given an expense that displays the reimbursable toggle
+    it('marks selectable toggle labels for multi-field copying', async () => {
+        // Given an expense that displays the Reimbursable and Billable toggles
         const threadReport = {
             ...LHNTestUtils.getFakeReport(),
             parentReportID: expenseReportID,
@@ -348,57 +333,14 @@ describe('MoneyRequestView edit fields', () => {
         renderMoneyRequestView(threadReport);
         await waitForBatchedUpdatesWithAct();
 
-        // Then the visual label is hidden from selection while the switch remains accessible
+        // Then both selectable labels carry the marker used by the multi-field selection scraper
         await waitFor(() => {
-            const reimbursableLabel = screen.getByText(/reimbursable$/i, {includeHiddenElements: true});
-            expect(reimbursableLabel).toHaveStyle({userSelect: 'none'});
-            expect(reimbursableLabel).toHaveProp(
-                'dataSet',
-                expect.objectContaining({
-                    [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true,
-                }),
-            );
-            expect(reimbursableLabel).not.toHaveProp(
-                'dataSet',
-                expect.objectContaining({
-                    [CONST.COPYABLE_TEXT_ELEMENT]: true,
-                }),
-            );
-            expect(screen.getByLabelText(/reimbursable$/i)).toBeOnTheScreen();
-        });
-    });
-
-    it('renders every copyable attendee on an editable expense', async () => {
-        // Given an editable expense with more attendees than UserPills displays by default
-        const threadReport = {
-            ...LHNTestUtils.getFakeReport(),
-            parentReportID: expenseReportID,
-            parentReportActionID,
-        };
-        const attendees = Array.from({length: 8}, (_, index) => ({
-            email: `attendee${index}@example.com`,
-            displayName: `Attendee ${index}`,
-            avatarUrl: '',
-        }));
-
-        await setupTestData();
-        await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-                type: CONST.POLICY.TYPE.CORPORATE,
-                isAttendeeTrackingEnabled: true,
-            });
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {attendees}});
-        });
-
-        // When attendee tracking is enabled and the expense details are rendered
-        renderMoneyRequestView(threadReport, {type: CONST.POLICY.TYPE.CORPORATE, isAttendeeTrackingEnabled: true});
-        await waitForBatchedUpdatesWithAct();
+            const toggleLabels = [screen.getByText(/reimbursable$/i, {includeHiddenElements: true}), screen.getByText('common.billable', {includeHiddenElements: true})];
 
-        // Then every copyable attendee is rendered instead of collapsing the final attendees into a non-copyable summary
-        await waitFor(() => {
-            const userPillsProps = mockUserPills.mock.calls.at(-1)?.[0];
-            expect(userPillsProps).toEqual(expect.objectContaining({isCopyable: true, maxVisible: attendees.length}));
-            expect(userPillsProps?.users).toHaveLength(attendees.length);
+            for (const toggleLabel of toggleLabels) {
+                expect(toggleLabel).toHaveProp('dataSet', expect.objectContaining({[CONST.COPYABLE_TEXT_ELEMENT]: true}));
+                expect(toggleLabel).not.toHaveProp('dataSet', expect.objectContaining({[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}));
+            }
         });
     });
 

From 6f2bd277254a5d96d9b26c9b1c2e5959f02f7d42 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 5 Oct 2026 22:00:08 +0000
Subject: [PATCH 276/781] Scope expense thread member protection to IOU reports

Only the sender and receiver of the parent IOU report are protected from removal.
Drop the workspace expense report and invoice report cases per review.

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/libs/ReportUtils.ts                    |  15 +--
 src/pages/DynamicRoomMemberDetailsPage.tsx |   2 +-
 src/pages/DynamicRoomMembersPage.tsx       |   2 +-
 tests/unit/ReportUtilsTest.ts              | 142 ++++-----------------
 4 files changed, 29 insertions(+), 132 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index cd924001e293..4b1cfa838e2b 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -164,7 +164,6 @@ import {
     isPolicyAdmin as isPolicyAdminPolicyUtils,
     isPolicyAuditor,
     isPolicyOwner,
-    isRoomMemberProtectedByPolicyRole,
     isSubmitAndClose,
     isSubmitterApproveBlockedOnSubmitWorkspace,
     resolveCurrentTaxCode,
@@ -2825,18 +2824,14 @@ function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | string, rep
 }
 
 /**
- * Checks if a thread member keeps access through the thread's parent money request or invoice report, so removing them from the thread doesn't stick.
- * That covers the parent report's submitter and current manager. On a workspace expense report it also covers workspace admins and approvers,
- * because `managerID` only points at the current approver, and approvers who already approved earlier in the chain keep access too.
+ * Checks if a thread member is the sender or receiver of the thread's parent IOU report.
+ * They keep access through the IOU report, so removing them from the thread doesn't stick.
  */
-function isThreadMemberProtectedByParentReport(parentReport: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>, login: string | undefined, accountID: number | undefined): boolean {
-    if (!parentReport || accountID === undefined || (!isMoneyRequestReport(parentReport) && !isInvoiceReport(parentReport))) {
+function isThreadMemberProtectedByParentReport(parentReport: OnyxInputOrEntry<Report>, accountID: number | undefined): boolean {
+    if (!parentReport || accountID === undefined || !isIOUReport(parentReport)) {
         return false;
     }
-    if (accountID === parentReport.ownerAccountID || accountID === parentReport.managerID) {
-        return true;
-    }
-    return isExpenseReport(parentReport) && isRoomMemberProtectedByPolicyRole(policy, login, accountID);
+    return accountID === parentReport.ownerAccountID || accountID === parentReport.managerID;
 }
 
 /**
diff --git a/src/pages/DynamicRoomMemberDetailsPage.tsx b/src/pages/DynamicRoomMemberDetailsPage.tsx
index 3f04be1a2324..caf5fe7634a8 100644
--- a/src/pages/DynamicRoomMemberDetailsPage.tsx
+++ b/src/pages/DynamicRoomMemberDetailsPage.tsx
@@ -66,7 +66,7 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     const isSelectedMemberProtectedByPolicyRole = isRoomMemberProtectedByPolicyRole(policy, details.login, accountID);
     // Select only the derived boolean so this page doesn't re-render on every unrelated change to the parent report.
     const [isSelectedMemberProtectedByParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`, {
-        selector: (parentReport) => isThreadMemberProtectedByParentReport(parentReport, policy, details.login, accountID),
+        selector: (parentReport) => isThreadMemberProtectedByParentReport(parentReport, accountID),
     });
     const shouldDisableRemoveUser =
         (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) || isSelectedMemberCurrentUser || isSelectedMemberOwner || !!isSelectedMemberProtectedByParentReport;
diff --git a/src/pages/DynamicRoomMembersPage.tsx b/src/pages/DynamicRoomMembersPage.tsx
index 0710c73b1344..06cbc68294f0 100644
--- a/src/pages/DynamicRoomMembersPage.tsx
+++ b/src/pages/DynamicRoomMembersPage.tsx
@@ -223,7 +223,7 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
                 accountID === session?.accountID ||
                 pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
                 details.accountID === report.ownerAccountID ||
-                isThreadMemberProtectedByParentReport(parentReport, policy, details.login, accountID);
+                isThreadMemberProtectedByParentReport(parentReport, accountID);
 
             result.push({
                 keyForList: String(accountID),
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 2d5730fe2d15..b9eb1bf4936e 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -1760,152 +1760,54 @@ describe('ReportUtils', () => {
         const senderAccountID = 1;
         const receiverAccountID = 2;
         const invitedAccountID = 3;
-        const adminAccountID = 4;
-        const previousApproverAccountID = 5;
-        const senderLogin = 'sender@test.com';
-        const adminLogin = 'admin@test.com';
-        const previousApproverLogin = 'previousapprover@test.com';
-        const currentApproverLogin = 'currentapprover@test.com';
-        const invitedLogin = 'invited@test.com';
-
-        // A workspace where the sender submits to the previous approver, who forwards to the current approver
-        const approvalChainPolicy: Policy = {
-            ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
-            ownerAccountID: adminAccountID,
-            owner: adminLogin,
-            approver: undefined,
-            employeeList: {
-                [senderLogin]: {email: senderLogin, role: CONST.POLICY.ROLE.USER, submitsTo: previousApproverLogin},
-                [adminLogin]: {email: adminLogin, role: CONST.POLICY.ROLE.ADMIN},
-                [previousApproverLogin]: {email: previousApproverLogin, role: CONST.POLICY.ROLE.USER, forwardsTo: currentApproverLogin},
-                [currentApproverLogin]: {email: currentApproverLogin, role: CONST.POLICY.ROLE.USER},
-                [invitedLogin]: {email: invitedLogin, role: CONST.POLICY.ROLE.USER},
-            },
+        const iouReport: Report = {
+            ...createRandomReport(1, undefined),
+            type: CONST.REPORT.TYPE.IOU,
+            ownerAccountID: senderAccountID,
+            managerID: receiverAccountID,
         };
 
         it('should protect the sender and receiver of the parent IOU report', () => {
             // Given an IOU report where the sender owns the report and the receiver manages it
-            const iouReport: Report = {
-                ...createRandomReport(1, undefined),
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
             // When checking whether they can be removed from one of the report's expense threads
             // Then both are protected, because they keep access through the IOU report and would be added back
-            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, senderLogin, senderAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, currentApproverLogin, receiverAccountID)).toBe(true);
-        });
-
-        it('should protect the submitter and current approver of the parent expense report', () => {
-            // Given a workspace expense report with a submitter and a current approver
-            const expenseReport: Report = {
-                ...createRandomReport(2, undefined),
-                type: CONST.REPORT.TYPE.EXPENSE,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
-            // When checking whether they can be removed from one of the report's expense threads
-            // Then both are protected
-            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, senderLogin, senderAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, currentApproverLogin, receiverAccountID)).toBe(true);
-        });
-
-        it('should protect workspace admins and earlier approvers of the parent expense report', () => {
-            // Given a workspace expense report that the previous approver already approved, so managerID now points at the current approver
-            const expenseReport: Report = {
-                ...createRandomReport(3, undefined),
-                type: CONST.REPORT.TYPE.EXPENSE,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
-            // When checking whether the admin or the previous approver can be removed from one of the report's expense threads
-            // Then both are protected, because they keep access to the expense report and would be added back
-            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, adminLogin, adminAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, previousApproverLogin, previousApproverAccountID)).toBe(true);
-        });
-
-        it('should protect the sender and receiver of the parent invoice report', () => {
-            // Given an invoice report where the sender owns the report and the receiver manages it
-            const invoiceReport: Report = {
-                ...createRandomReport(4, undefined),
-                type: CONST.REPORT.TYPE.INVOICE,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
-            // When checking whether they can be removed from one of the invoice's threads
-            // Then both are protected, because they keep access through the invoice report
-            expect(isThreadMemberProtectedByParentReport(invoiceReport, undefined, senderLogin, senderAccountID)).toBe(true);
-            expect(isThreadMemberProtectedByParentReport(invoiceReport, undefined, currentApproverLogin, receiverAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(iouReport, senderAccountID)).toBe(true);
+            expect(isThreadMemberProtectedByParentReport(iouReport, receiverAccountID)).toBe(true);
         });
 
         it('should not protect a member who was invited into the thread', () => {
-            // Given an IOU report and an expense report that the invited member isn't part of
-            const iouReport: Report = {
-                ...createRandomReport(5, undefined),
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-            const expenseReport: Report = {...iouReport, type: CONST.REPORT.TYPE.EXPENSE};
-
+            // Given an IOU report that the invited member isn't part of
             // When checking whether the invited member can be removed from an expense thread
             // Then they aren't protected, so removing invited members keeps working
-            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, invitedLogin, invitedAccountID)).toBe(false);
-            expect(isThreadMemberProtectedByParentReport(expenseReport, approvalChainPolicy, invitedLogin, invitedAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(iouReport, invitedAccountID)).toBe(false);
         });
 
-        it('should not protect a workspace admin when the parent is an IOU report', () => {
-            // Given an IOU report, which has no workspace admins or approvers with access to it
-            const iouReport: Report = {
-                ...createRandomReport(6, undefined),
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
-            // When checking whether someone who is an admin on the thread's policy can be removed from the expense thread
-            // Then they aren't protected, because the policy role check only applies to workspace expense reports
-            expect(isThreadMemberProtectedByParentReport(iouReport, approvalChainPolicy, adminLogin, adminAccountID)).toBe(false);
-        });
-
-        it('should not protect anyone when the parent is a chat report', () => {
-            // Given a chat report, which is the parent of regular comment threads
-            const chatReport: Report = {
-                ...createRandomReport(7, undefined),
-                type: CONST.REPORT.TYPE.CHAT,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
+        it('should not protect anyone when the parent is not an IOU report', () => {
+            // Given an expense, invoice, and chat report with the same submitter and manager
+            const expenseReport: Report = {...iouReport, type: CONST.REPORT.TYPE.EXPENSE};
+            const invoiceReport: Report = {...iouReport, type: CONST.REPORT.TYPE.INVOICE};
+            const chatReport: Report = {...iouReport, type: CONST.REPORT.TYPE.CHAT};
 
-            // When checking whether its members can be removed from a thread
-            // Then nobody is protected, so the existing room member rules still apply
-            expect(isThreadMemberProtectedByParentReport(chatReport, approvalChainPolicy, senderLogin, senderAccountID)).toBe(false);
+            // When checking whether the submitter or manager can be removed from one of their threads
+            // Then nobody is protected, because only IOU report threads are in scope, so the existing room member rules still apply
+            expect(isThreadMemberProtectedByParentReport(expenseReport, senderAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(expenseReport, receiverAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(invoiceReport, senderAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(chatReport, senderAccountID)).toBe(false);
         });
 
         it('should not protect anyone when the parent report is missing', () => {
             // Given a thread whose parent report isn't loaded
             // When checking whether a member can be removed from the thread
             // Then nobody is protected, so the existing room member rules still apply
-            expect(isThreadMemberProtectedByParentReport(undefined, approvalChainPolicy, senderLogin, senderAccountID)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(undefined, senderAccountID)).toBe(false);
         });
 
         it('should not protect anyone when the accountID is missing', () => {
             // Given an IOU report with a sender and a receiver
-            const iouReport: Report = {
-                ...createRandomReport(8, undefined),
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: senderAccountID,
-                managerID: receiverAccountID,
-            };
-
             // When checking a member whose accountID is unknown
             // Then they aren't protected, so an unknown member can't match a missing ownerAccountID or managerID
-            expect(isThreadMemberProtectedByParentReport(iouReport, undefined, senderLogin, undefined)).toBe(false);
+            expect(isThreadMemberProtectedByParentReport(iouReport, undefined)).toBe(false);
         });
     });
 

From b38256d55c0576e2286d9710b9ebdbaf5bb2193b Mon Sep 17 00:00:00 2001
From: "Nyoman Jyotisa (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 6 Oct 2026 05:31:20 +0000
Subject: [PATCH 277/781] Run a full ReconnectApp when a response has a
 lastUpdateID but no previousUpdateID

When a device comes back after the server has dropped its lastUpdateID, a write
can return lastUpdateID without previousUpdateID. Applying it moves the client
past updates it never received, so the incremental ReconnectApp from the Pusher
event can't recover them. Trigger a full ReconnectApp after applying.

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>
---
 src/libs/Middleware/SaveResponseInOnyx.ts | 27 ++++++++++
 tests/unit/MiddlewareTest.ts              | 66 ++++++++++++++++++++++-
 2 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/src/libs/Middleware/SaveResponseInOnyx.ts b/src/libs/Middleware/SaveResponseInOnyx.ts
index 1a423540de20..4f204258f62d 100644
--- a/src/libs/Middleware/SaveResponseInOnyx.ts
+++ b/src/libs/Middleware/SaveResponseInOnyx.ts
@@ -1,5 +1,7 @@
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import Log from '@libs/Log';
 
+import {reconnectApp} from '@userActions/App';
 import * as OnyxUpdates from '@userActions/OnyxUpdates';
 
 import CONST from '@src/CONST';
@@ -44,6 +46,31 @@ const SaveResponseInOnyx: Middleware = <TKey extends OnyxKey>(requestResponse: P
 
         const shouldApplyWithoutAdvancingLastUpdateID = requestsToApplyWithoutAdvancingLastUpdateID.has(request.command);
 
+        // The server only keeps recent update IDs. When a client comes back after a long time, the server no longer knows its
+        // lastUpdateIDAppliedToClient and answers a request with a lastUpdateID but no previousUpdateID. Applying that response moves
+        // the client's lastUpdateID forward past updates it never received, so an incremental ReconnectApp can't recover them.
+        // Run a full ReconnectApp after applying so the client gets everything in the gap.
+        const clientLastUpdateID = OnyxUpdates.getPersistedLastUpdateID();
+        const responseLastUpdateID = Number(response?.lastUpdateID ?? CONST.DEFAULT_NUMBER_ID);
+        const shouldFullReconnectAfterApply =
+            !shouldApplyWithoutAdvancingLastUpdateID &&
+            !requestsToIgnoreLastUpdateID.has(request.command) &&
+            !!clientLastUpdateID &&
+            responseLastUpdateID > clientLastUpdateID &&
+            !Number(response?.previousUpdateID ?? CONST.DEFAULT_NUMBER_ID);
+
+        if (shouldFullReconnectAfterApply) {
+            Log.info('[SaveResponseInOnyx] Response has a lastUpdateID but no previousUpdateID, running a full ReconnectApp after applying it', false, {
+                command: request.command,
+                clientLastUpdateID,
+                responseLastUpdateID,
+            });
+            return OnyxUpdates.apply(responseToApply).then((appliedResponse) => {
+                reconnectApp();
+                return appliedResponse;
+            });
+        }
+
         if (
             shouldApplyWithoutAdvancingLastUpdateID ||
             requestsToIgnoreLastUpdateID.has(request.command) ||
diff --git a/tests/unit/MiddlewareTest.ts b/tests/unit/MiddlewareTest.ts
index d6a6d79da16d..52cb3a33f084 100644
--- a/tests/unit/MiddlewareTest.ts
+++ b/tests/unit/MiddlewareTest.ts
@@ -1,7 +1,8 @@
-import {READ_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import SaveResponseInOnyx from '@libs/Middleware/SaveResponseInOnyx';
 
 import CONST from '@src/CONST';
+import * as App from '@src/libs/actions/App';
 import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
 import type MoveIOUReportToExistingPolicyParams from '@src/libs/API/parameters/MoveIOUReportToExistingPolicyParams';
 import HttpUtils from '@src/libs/HttpUtils';
@@ -120,6 +121,69 @@ describe('Middleware', () => {
             expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_FROM_SERVER)).toBeUndefined();
             expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(clientLastUpdateID);
         });
+
+        describe('when the server no longer knows the client lastUpdateID', () => {
+            beforeEach(() => {
+                jest.spyOn(App, 'reconnectApp').mockImplementation(() => {});
+            });
+
+            afterEach(() => {
+                jest.restoreAllMocks();
+            });
+
+            test('applies the response and runs a full ReconnectApp to cover the gap', async () => {
+                // Given a device that was backgrounded for a long time, so the server no longer has its lastUpdateIDAppliedToClient
+                await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 100);
+                await waitForBatchedUpdates();
+
+                Request.addMiddleware(SaveResponseInOnyx);
+
+                // When a write returns a lastUpdateID but no previousUpdateID
+                jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({jsonCode: 200, lastUpdateID: 5001});
+                const result = await Request.processWithMiddleware({
+                    command: 'AddComment',
+                    data: {apiRequestType: CONST.API_REQUEST_TYPE.WRITE},
+                    successData: [{onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_APP, value: false}],
+                });
+                await waitForBatchedUpdates();
+
+                // Then the response is applied without pausing the queue
+                expect(result?.shouldPauseQueue).toBeUndefined();
+                expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_FROM_SERVER)).toBeUndefined();
+
+                // And a full ReconnectApp runs, because an incremental one would start after the skipped updates
+                expect(App.reconnectApp).toHaveBeenCalledTimes(1);
+                expect(App.reconnectApp).toHaveBeenCalledWith();
+            });
+
+            test.each([
+                ['the response has a previousUpdateID', 100, 'AddComment', {lastUpdateID: 101, previousUpdateID: 100}],
+                ['the client has no lastUpdateID yet', undefined, 'AddComment', {lastUpdateID: 5001}],
+                ['the response is not newer than the client', 100, 'AddComment', {lastUpdateID: 100}],
+                ['the request is a ReconnectApp', 100, SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP, {lastUpdateID: 5001}],
+                ['the request is an OpenApp', 100, WRITE_COMMANDS.OPEN_APP, {lastUpdateID: 5001}],
+            ])('does not run a full ReconnectApp when %s', async (_case, clientLastUpdateID, command, updateIDs) => {
+                // Given a client whose lastUpdateID is either still known to the server or has nothing to lose
+                if (clientLastUpdateID) {
+                    await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, clientLastUpdateID);
+                }
+                await waitForBatchedUpdates();
+
+                Request.addMiddleware(SaveResponseInOnyx);
+                jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({jsonCode: 200, ...updateIDs});
+
+                // When the response comes back
+                await Request.processWithMiddleware({
+                    command,
+                    data: {apiRequestType: CONST.API_REQUEST_TYPE.WRITE},
+                    successData: [{onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_APP, value: false}],
+                });
+                await waitForBatchedUpdates();
+
+                // Then no extra full ReconnectApp runs, since no updates were skipped or the request already returns full data
+                expect(App.reconnectApp).not.toHaveBeenCalled();
+            });
+        });
     });
 
     describe('HandleUnusedOptimisticID', () => {

From aab897c38b5570c8c862cd98a7024dc07b093e47 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:04:01 +0530
Subject: [PATCH 278/781] add the ShareReport write command

---
 src/libs/API/parameters/ShareReportParams.ts | 7 +++++++
 src/libs/API/parameters/index.ts             | 1 +
 src/libs/API/types.ts                        | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 src/libs/API/parameters/ShareReportParams.ts

diff --git a/src/libs/API/parameters/ShareReportParams.ts b/src/libs/API/parameters/ShareReportParams.ts
new file mode 100644
index 000000000000..33338659745c
--- /dev/null
+++ b/src/libs/API/parameters/ShareReportParams.ts
@@ -0,0 +1,7 @@
+type ShareReportParams = {
+    reportID: string;
+    shareToEmail: string;
+    permissions: string;
+};
+
+export default ShareReportParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 1fe1c4a0225b..cc5144812c57 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -565,6 +565,7 @@ export type {default as ImportPerDiemRatesParams} from './ImportPerDiemRatesPara
 export type {default as ExportPerDiemCSVParams} from './ExportPerDiemCSVParams';
 export type {default as ExportReportPDFParams} from './ExportReportPDFParams';
 export type {default as ExportReportsToPDFParams} from './ExportReportsToPDFParams';
+export type {default as ShareReportParams} from './ShareReportParams';
 export type {default as ExportReceiptsToZipParams} from './ExportReceiptsToZipParams';
 export type {default as UpdateWorkspaceCustomUnitParams} from './UpdateWorkspaceCustomUnitParams';
 export type {default as DismissProductTrainingParams} from './DismissProductTraining';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 883a395ae6bd..4feafea03cc9 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -186,6 +186,7 @@ const WRITE_COMMANDS = {
     MOVE_IOU_REPORT_TO_EXISTING_POLICY: 'MoveIOUReportToExistingPolicy',
     EXPORT_REPORT_TO_PDF: 'ExportReportToPDF',
     EXPORT_REPORTS_TO_PDF: 'ExportReportsToPDF',
+    SHARE_REPORT: 'ShareReport',
     EXPORT_RECEIPTS_TO_ZIP: 'ExportReceiptsToZip',
     RENAME_WORKSPACE_CATEGORY: 'RenameWorkspaceCategory',
     CREATE_POLICY_TAG: 'CreatePolicyTag',
@@ -923,6 +924,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.EXPORT_PER_DIEM_CSV]: Parameters.ExportPerDiemCSVParams;
     [WRITE_COMMANDS.EXPORT_REPORT_TO_PDF]: Parameters.ExportReportPDFParams;
     [WRITE_COMMANDS.EXPORT_REPORTS_TO_PDF]: Parameters.ExportReportsToPDFParams;
+    [WRITE_COMMANDS.SHARE_REPORT]: Parameters.ShareReportParams;
     [WRITE_COMMANDS.EXPORT_RECEIPTS_TO_ZIP]: Parameters.ExportReceiptsToZipParams;
     [WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams;
     [WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY]: Parameters.SetWorkspaceRequiresCategoryParams;

From ba6f4c73b4965a4351c0b3f10e36b7b233ef048a Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:04:12 +0530
Subject: [PATCH 279/781] add the share secondary action and its sentry labels

---
 src/CONST/index.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 2ed17edb8741..6986e191eac5 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1635,6 +1635,7 @@ const CONST = {
             HOLD: 'hold',
             DOWNLOAD_PDF: 'downloadPDF',
             DOWNLOAD_RECEIPTS: 'downloadReceipts',
+            SHARE: 'share',
             PRINT: 'print',
             CHANGE_WORKSPACE: 'changeWorkspace',
             CHANGE_APPROVER: 'changeApprover',
@@ -9557,6 +9558,11 @@ const CONST = {
             EXPORT_FILE: 'MoreMenu-ExportFile',
             DOWNLOAD_PDF: 'MoreMenu-DownloadPDF',
             DOWNLOAD_RECEIPTS: 'MoreMenu-DownloadReceipts',
+            SHARE: 'MoreMenu-Share',
+            SHARE_REPORT: 'MoreMenu-ShareReport',
+            SHARE_CODE: 'MoreMenu-ShareCode',
+            REFER_FRIEND: 'MoreMenu-ReferFriend',
+            COPY_URL: 'MoreMenu-CopyURL',
             PRINT: 'MoreMenu-Print',
             CLOSE_PDF_MODAL: 'MoreMenu-ClosePDFModal',
             SUBMIT: 'MoreMenu-Submit',

From 351aace03f1f405e8bb6efb920fcc65e24db9e1d Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:04:50 +0530
Subject: [PATCH 280/781] add the shareReport action

---
 src/libs/actions/Report/index.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index fcf980837f6c..da1e0015967d 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -39,6 +39,7 @@ import type {
     SearchForReportsParams,
     SearchForRoomsToMentionParams,
     SearchForUsersParams,
+    ShareReportParams,
     TogglePinnedChatParams,
     TransactionThreadInfo,
     UpdateChatNameParams,
@@ -92,6 +93,7 @@ import Parser from '@libs/Parser';
 import {getParsedMessageWithShortMentions} from '@libs/ParsingUtils';
 import {getAllPersonalDetails} from '@libs/PersonalDetailsStore';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 import {isMapOrGPSRequired} from '@libs/PolicyDistanceRatesUtils';
 import {
     getDefaultApprover,
@@ -6906,6 +6908,17 @@ async function exportReportToPDF({reportID}: ExportReportPDFParams) {
     return API.write(WRITE_COMMANDS.EXPORT_REPORT_TO_PDF, params, {optimisticData, failureData});
 }
 
+/** Emails the report to the given login and gives them access to it. */
+function shareReport(reportID: string, shareToLogin: string) {
+    const params = {
+        reportID,
+        shareToEmail: addSMSDomainIfPhoneNumber(shareToLogin),
+        permissions: [CONST.REPORT.PERMISSIONS.READ, CONST.REPORT.PERMISSIONS.WRITE].join(', '),
+    } satisfies ShareReportParams;
+
+    API.write(WRITE_COMMANDS.SHARE_REPORT, params);
+}
+
 function downloadReportPDF(fileName: string, reportName: string, translate: LocalizedTranslate, currentUserLogin: string, encryptedAuthToken: string) {
     const baseURL = getOldDotURLFromEnvironment(environment);
     const downloadFileName = `${reportName}.pdf`;
@@ -9028,6 +9041,7 @@ export {
     expandURLPreview,
     exportReportToCSV,
     exportReportToPDF,
+    shareReport,
     exportToIntegration,
     joinReportViaSecureLink,
     flagComment,

From 0f200773a9738ee23a4241991e8704a9d68ab3c9 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:05:28 +0530
Subject: [PATCH 281/781] add canShareReport

---
 src/libs/ReportUtils.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 613ebf56c5a6..fcb0c5091e49 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -13520,6 +13520,16 @@ function canBeExported(report: OnyxEntry<Report>) {
     return isExpenseReport(report) && isCorrectState;
 }
 
+/**
+ * Whether the current user can email the report to someone. The submitter, the approver and workspace admins can once the report is submitted.
+ */
+function canShareReport(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, currentUserAccountID: number): boolean {
+    if (!isExpenseReport(report) || isOpenReport(report)) {
+        return false;
+    }
+    return isCurrentUserSubmitter(report, currentUserAccountID) || report?.managerID === currentUserAccountID || isPolicyAdmin(policy);
+}
+
 function getIntegrationNameFromExportMessage(reportActions: OnyxEntry<ReportActions> | ReportAction[]) {
     if (!reportActions) {
         return '';
@@ -14911,6 +14921,7 @@ export {
     findPolicyExpenseChatByPolicyID,
     getIntegrationIcon,
     canBeExported,
+    canShareReport,
     isExported,
     hasExpensifyGuidesEmails,
     hasExportError,

From 3cb981cc7040e4ce06af4a4ea580f2c565f14a5a Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:06:23 +0530
Subject: [PATCH 282/781] register the share report route

---
 src/ROUTES.ts                                                 | 4 ++++
 src/SCREENS.ts                                                | 1 +
 .../Navigation/AppNavigator/ModalStackNavigators/index.tsx    | 1 +
 src/libs/Navigation/linkingConfig/config.ts                   | 1 +
 src/libs/Navigation/types.ts                                  | 3 +++
 src/pages/inbox/report/withReportOrNotFound.tsx               | 1 +
 6 files changed, 11 insertions(+)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f10be93c951c..dd429da4af3a 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -1570,6 +1570,10 @@ const DYNAMIC_ROUTES = {
         entryScreens: [SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, SCREENS.SEARCH.ROOT],
         getRoute: (connectionName: ConnectionName) => `details/export/${connectionName as string}` as const,
     },
+    REPORT_DETAILS_SHARE_REPORT: {
+        path: 'share-report',
+        entryScreens: [SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, SCREENS.SEARCH.ROOT],
+    },
     REPORT_CHANGE_WORKSPACE: {
         path: 'change-workspace',
         entryScreens: [SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, SCREENS.SEARCH.ROOT],
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 1e6e1d4f9b0c..cf953ee607f2 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -501,6 +501,7 @@ const SCREENS = {
         DYNAMIC_ROOT: 'Dynamic_Report_Details_Root',
         DYNAMIC_SHARE_CODE: 'Dynamic_Report_Details_Share_Code',
         DYNAMIC_EXPORT: 'Dynamic_Report_Details_Export',
+        DYNAMIC_SHARE_REPORT: 'Dynamic_Report_Details_Share_Report',
     },
 
     REPORT_CHANGE_WORKSPACE: {
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 43af4494621e..d9f696bf6963 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -277,6 +277,7 @@ const ReportDetailsModalStackNavigator = createModalStackNavigator<ReportDetails
     [SCREENS.REPORT_DETAILS.DYNAMIC_ROOT]: () => require<ReactComponentModule>('../../../../pages/DynamicReportDetailsPage').default,
     [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_CODE]: () => require<ReactComponentModule>('../../../../pages/inbox/report/DynamicReportDetailsShareCodePage').default,
     [SCREENS.REPORT_DETAILS.DYNAMIC_EXPORT]: () => require<ReactComponentModule>('../../../../pages/inbox/report/DynamicReportDetailsExportPage').default,
+    [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_REPORT]: () => require<ReactComponentModule>('../../../../pages/inbox/report/DynamicReportDetailsShareReportPage').default,
 });
 
 const ReportCardActivateStackNavigator = createModalStackNavigator<ReportCardActivateNavigatorParamList>({
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index ba1c8e228bf7..f6f713d17467 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1670,6 +1670,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.REPORT_DETAILS.DYNAMIC_ROOT]: DYNAMIC_ROUTES.REPORT_DETAILS.path,
                         [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_CODE]: DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.path,
                         [SCREENS.REPORT_DETAILS.DYNAMIC_EXPORT]: DYNAMIC_ROUTES.REPORT_DETAILS_EXPORT.path,
+                        [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_REPORT]: DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_REPORT.path,
                     },
                 },
                 [SCREENS.RIGHT_MODAL.REPORT_CARD_ACTIVATE]: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index dc664dd32594..7191f06449bb 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -2260,6 +2260,9 @@ type ReportDetailsNavigatorParamList = {
         policyID: string;
         connectionName: ConnectionName;
     };
+    [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_REPORT]: {
+        reportID: string;
+    };
 };
 
 type ReportCardActivateNavigatorParamList = {
diff --git a/src/pages/inbox/report/withReportOrNotFound.tsx b/src/pages/inbox/report/withReportOrNotFound.tsx
index 706644db9efd..d9b6c7897aab 100644
--- a/src/pages/inbox/report/withReportOrNotFound.tsx
+++ b/src/pages/inbox/report/withReportOrNotFound.tsx
@@ -56,6 +56,7 @@ type ScreenProps =
     | PlatformStackScreenProps<ParticipantsNavigatorParamList, typeof SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROLE>
     | PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_ROOT>
     | PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_CODE>
+    | PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_REPORT>
     | PlatformStackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT>
     | PlatformStackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.DYNAMIC_NOTIFICATION_PREFERENCES>
     | PlatformStackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_NAME>

From dd7f4ac124ffe07dcc8819e60c0711b58f1bb353 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:06:24 +0530
Subject: [PATCH 283/781] add the share report copy

---
 src/languages/en.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 61ab6e68a69f..8cd68f04e092 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -326,6 +326,7 @@ const translations = {
         assignee: 'Assignee',
         with: 'with',
         shareCode: 'Share code',
+        shareReport: 'Share report',
         share: 'Share',
         per: 'per',
         // @context Unit label for “mile.” Should be treated as a measurement unit and may require capitalization depending on locale conventions.

From a365ef00110de9ab713f1907fdeaa2076ce03f3a Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:06:24 +0530
Subject: [PATCH 284/781] add the share report page

---
 .../DynamicReportDetailsShareReportPage.tsx   | 166 ++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx

diff --git a/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
new file mode 100644
index 000000000000..e6fe01f0d666
--- /dev/null
+++ b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
@@ -0,0 +1,166 @@
+/**
+ * Picks who to email an expense report to. Opens from Share report in the report's More menu.
+ */
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SingleSelectWithAvatarListItem from '@components/SelectionList/ListItem/SingleSelectWithAvatarListItem';
+import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
+import type {Section} from '@components/SelectionList/SelectionListWithSections/types';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import usePersonalDetailSearchSelector from '@hooks/usePersonalDetailSearchSelector';
+import usePressLoading from '@hooks/usePressLoading';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {searchUserInServer, shareReport} from '@libs/actions/Report';
+import {canUseTouchScreen} from '@libs/DeviceCapabilities';
+import getPlatform from '@libs/getPlatform';
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
+import {getHeaderMessage} from '@libs/PersonalDetailOptionsListUtils';
+import type {OptionData} from '@libs/PersonalDetailOptionsListUtils';
+import {getReportName} from '@libs/ReportNameUtils';
+import {canShareReport} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+import React, {useEffect, useState} from 'react';
+
+import type {WithReportOrNotFoundProps} from './withReportOrNotFound';
+
+import withReportOrNotFound from './withReportOrNotFound';
+
+type DynamicReportDetailsShareReportPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_REPORT>;
+
+function DynamicReportDetailsShareReportPage({report, policy}: DynamicReportDetailsShareReportPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_REPORT.path);
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+
+    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
+    const [isSearchingForUsers] = useOnyx(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_USERS);
+
+    const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false);
+    const {isLoading, startWithLoading} = usePressLoading();
+
+    const {searchTerm, debouncedSearchTerm, setSearchTerm, selectedOptions, availableOptions, toggleSelection, areOptionsInitialized} = usePersonalDetailSearchSelector({
+        selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE,
+        includeUserToInvite: true,
+        includeRecentReports: false,
+        shouldUpdateSelectedOptionsOnSingleSelect: true,
+        excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
+        shouldInitialize: didScreenTransitionEnd,
+    });
+
+    useEffect(() => {
+        searchUserInServer(debouncedSearchTerm);
+    }, [debouncedSearchTerm]);
+
+    const selectedLogin = selectedOptions.at(0)?.login;
+
+    const shareWithSelectedUser = () => {
+        if (!selectedLogin) {
+            return;
+        }
+        startWithLoading(() => {
+            shareReport(report.reportID, selectedLogin);
+            Navigation.goBack(backPath);
+        });
+    };
+
+    const sections: Array<Section<OptionData>> = [];
+    if (areOptionsInitialized) {
+        if (availableOptions.selectedOptions.length > 0) {
+            sections.push({
+                title: undefined,
+                data: availableOptions.selectedOptions,
+                sectionIndex: 0,
+            });
+        }
+
+        if (availableOptions.personalDetails.length > 0) {
+            sections.push({
+                title: translate('common.contacts'),
+                data: availableOptions.personalDetails,
+                sectionIndex: 1,
+            });
+        }
+
+        if (availableOptions.userToInvite) {
+            sections.push({
+                title: undefined,
+                data: [availableOptions.userToInvite],
+                sectionIndex: 2,
+            });
+        }
+    }
+
+    const textInputOptions = {
+        label: translate('selectionList.nameEmailOrPhoneNumber'),
+        value: searchTerm,
+        onChangeText: setSearchTerm,
+        headerMessage: sections.length > 0 ? '' : getHeaderMessage(translate, debouncedSearchTerm.trim().toLowerCase(), countryCode),
+    };
+
+    const footerContent = (
+        <FormAlertWithSubmitButton
+            isDisabled={!selectedLogin}
+            isAlertVisible={false}
+            buttonText={translate('common.shareReport')}
+            shouldShowLoadingImmediatelyOnPress={false}
+            isLoading={isLoading}
+            onSubmit={shareWithSelectedUser}
+            containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
+            enabledWhenOffline
+        />
+    );
+
+    return (
+        <ScreenWrapper
+            shouldEnableMaxHeight
+            shouldUseCachedViewportHeight
+            testID="DynamicReportDetailsShareReportPage"
+            enableEdgeToEdgeBottomSafeAreaPadding
+            onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
+        >
+            <FullPageNotFoundView shouldShow={!canShareReport(report, policy, currentUserAccountID)}>
+                <HeaderWithBackButton
+                    title={translate('common.shareReport')}
+                    subtitle={getReportName(report)}
+                    onBackButtonPress={() => Navigation.goBack(backPath)}
+                />
+                <SelectionListWithSections
+                    sections={sections}
+                    ListItem={SingleSelectWithAvatarListItem}
+                    shouldSingleExecuteRowSelect
+                    onSelectRow={toggleSelection}
+                    textInputOptions={textInputOptions}
+                    confirmButtonOptions={{
+                        onConfirm: shareWithSelectedUser,
+                        isFooterConfirmEnabled: !!selectedLogin,
+                        isFooterConfirmEnterKeyEnabled: getPlatform() !== CONST.PLATFORM.ANDROID,
+                    }}
+                    shouldShowLoadingPlaceholder={!areOptionsInitialized || !didScreenTransitionEnd}
+                    shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()}
+                    footerContent={footerContent}
+                    isLoadingNewOptions={!!isSearchingForUsers}
+                    addBottomSafeAreaPadding
+                    shouldShowTextInput
+                    disableMaintainingScrollPosition
+                />
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+export default withReportOrNotFound()(DynamicReportDetailsShareReportPage);

From be9620c4a451a326980284b7986282563ef71f51 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:07:09 +0530
Subject: [PATCH 285/781] translate the share report copy

---
 src/languages/de.ts      | 1 +
 src/languages/el.ts      | 1 +
 src/languages/es.ts      | 1 +
 src/languages/fr.ts      | 1 +
 src/languages/it.ts      | 1 +
 src/languages/ja.ts      | 1 +
 src/languages/nl.ts      | 1 +
 src/languages/pl.ts      | 1 +
 src/languages/pt-BR.ts   | 1 +
 src/languages/zh-hans.ts | 1 +
 10 files changed, 10 insertions(+)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index fd8e9d18cfa6..d054b21a28d4 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -527,6 +527,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Das Diagramm konnte nicht geladen werden. Bitte aktualisieren Sie die Seite und versuchen Sie es erneut.',
         apiKey: 'API-Schlüssel',
         exportsTo: 'Exportiert nach',
+        shareReport: 'Bericht teilen',
     },
     socials: {
         podcast: 'Folgen Sie uns auf Podcast',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index d7d7a7548e35..f975a70d99f6 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -527,6 +527,7 @@ const translations: TranslationDeepObject<typeof en> = {
             other: 'Λήψη αποδείξεων',
         }),
         commuter: 'επιβάτης καθημερινών μετακινήσεων',
+        shareReport: 'Κοινοποιήστε την αναφορά',
     },
     socials: {
         podcast: 'Ακολουθήστε μας στο Podcast',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index c5a2d9be8706..38f593db9a59 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -514,6 +514,7 @@ const translations: TranslationDeepObject<typeof en> = {
         commuter: 'viajero diario',
         noResultsFoundSubtitle: 'Sin resultados. Intenta ajustar tus filtros o la búsqueda.',
         exportsTo: 'Exporta a',
+        shareReport: 'Compartir informe',
     },
     socials: {
         podcast: 'Síguenos en Podcast',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index ef0e1e78c77e..93d38110fa2e 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -526,6 +526,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Le graphique n’a pas pu être chargé. Veuillez actualiser la page et réessayer.',
         apiKey: 'Clé API',
         exportsTo: 'Exports vers',
+        shareReport: 'Partager la note de frais',
     },
     socials: {
         podcast: 'Suivez-nous sur Podcast',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 200743b63e56..37de3e8c0edc 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -526,6 +526,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Impossibile caricare il grafico. Aggiorna la pagina e riprova.',
         apiKey: 'Chiave API',
         exportsTo: 'Esporta in',
+        shareReport: 'Condividi resoconto',
     },
     socials: {
         podcast: 'Seguici su Podcast',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5686951a9547..85553c2d77d8 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -525,6 +525,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'グラフを読み込めませんでした。ページを再読み込みして、もう一度お試しください。',
         apiKey: 'API キー',
         exportsTo: 'エクスポート先',
+        shareReport: 'レポートを共有',
     },
     socials: {
         podcast: 'ポッドキャストでフォロー',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b6b1bdd42149..8b3947af2757 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -526,6 +526,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'De grafiek kon niet worden geladen. Vernieuw de pagina en probeer het opnieuw.',
         apiKey: 'API-sleutel',
         exportsTo: 'Exporteert naar',
+        shareReport: 'Rapport delen',
     },
     socials: {
         podcast: 'Volg ons op Podcast',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index d0218ffe04fe..57405bb08b4c 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -529,6 +529,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Nie udało się załadować wykresu. Odśwież stronę i spróbuj ponownie.',
         apiKey: 'Klucz API',
         exportsTo: 'Eksporty do',
+        shareReport: 'Udostępnij raport',
     },
     socials: {
         podcast: 'Śledź nas na Podcast',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index c3a3dd80685c..63f148ecc6e3 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -525,6 +525,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Não foi possível carregar o gráfico. Atualize a página e tente novamente.',
         apiKey: 'Chave de API',
         exportsTo: 'Exportações para',
+        shareReport: 'Compartilhar relatório',
     },
     socials: {
         podcast: 'Siga-nos no Podcast',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 71de802346df..8a41b802c870 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -521,6 +521,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: '无法加载图表。请刷新页面后重试。',
         apiKey: 'API 密钥',
         exportsTo: '导出到',
+        shareReport: '分享报表',
     },
     socials: {
         podcast: '在播客上关注我们',

From 7324bb5d6c27fd467dd33fa093880b2c624b45f6 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:07:09 +0530
Subject: [PATCH 286/781] use report in the italian share report copy

---
 src/languages/it.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/it.ts b/src/languages/it.ts
index 37de3e8c0edc..f39edbdbe6a5 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -526,7 +526,7 @@ const translations: TranslationDeepObject<typeof en> = {
         chartFailedToLoad: 'Impossibile caricare il grafico. Aggiorna la pagina e riprova.',
         apiKey: 'Chiave API',
         exportsTo: 'Esporta in',
-        shareReport: 'Condividi resoconto',
+        shareReport: 'Condividi report',
     },
     socials: {
         podcast: 'Seguici su Podcast',

From 957821c0159fd3ef9dc5850e29894822178eb7ba Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:07:59 +0530
Subject: [PATCH 287/781] add useShareActions

---
 src/hooks/useShareActions.ts | 91 ++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 src/hooks/useShareActions.ts

diff --git a/src/hooks/useShareActions.ts b/src/hooks/useShareActions.ts
new file mode 100644
index 000000000000..8531c2867355
--- /dev/null
+++ b/src/hooks/useShareActions.ts
@@ -0,0 +1,91 @@
+/**
+ * Builds the Share option of the report More menu and the options under it.
+ */
+import type {SecondaryActionEntry} from '@components/MoneyReportHeaderActions/types';
+import type {PopoverMenuItem} from '@components/PopoverMenu';
+
+import Clipboard from '@libs/Clipboard';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import {canShareReport} from '@libs/ReportUtils';
+import addTrailingForwardSlash from '@libs/UrlUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useEnvironment from './useEnvironment';
+import {useMemoizedLazyExpensifyIcons} from './useLazyAsset';
+import useLocalize from './useLocalize';
+import useOnyx from './useOnyx';
+
+type UseShareActionsParams = {
+    reportID: string | undefined;
+    policy?: OnyxEntry<OnyxTypes.Policy>;
+};
+
+type UseShareActionsReturn = Pick<Record<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, SecondaryActionEntry>, typeof CONST.REPORT.SECONDARY_ACTIONS.SHARE>;
+
+function useShareActions({reportID, policy}: UseShareActionsParams): UseShareActionsReturn {
+    const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Mail', 'QrCode', 'Cash', 'Copy', 'ArrowRight'] as const);
+
+    const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`);
+
+    const shareSubMenuItems: PopoverMenuItem[] = [
+        {
+            text: translate('common.shareCode'),
+            icon: expensifyIcons.QrCode,
+            sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.SHARE_CODE,
+            onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.path)),
+        },
+        {
+            text: translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND}.buttonText`),
+            icon: expensifyIcons.Cash,
+            sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.REFER_FRIEND,
+            onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REFERRAL_DETAILS.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND))),
+        },
+        {
+            text: translate('qrCodes.copy'),
+            icon: expensifyIcons.Copy,
+            sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.COPY_URL,
+            onSelected: () => {
+                if (!moneyRequestReport?.reportID) {
+                    return;
+                }
+                Clipboard.setString(`${addTrailingForwardSlash(environmentURL)}${ROUTES.REPORT_WITH_ID.getRoute(moneyRequestReport.reportID)}`);
+            },
+        },
+    ];
+
+    if (canShareReport(moneyRequestReport, policy, currentUserAccountID)) {
+        shareSubMenuItems.unshift({
+            text: translate('common.shareReport'),
+            icon: expensifyIcons.Mail,
+            sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.SHARE_REPORT,
+            onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_REPORT.path)),
+        });
+    }
+
+    return {
+        [CONST.REPORT.SECONDARY_ACTIONS.SHARE]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.SHARE,
+            text: translate('common.share'),
+            backButtonText: translate('common.share'),
+            icon: expensifyIcons.Mail,
+            rightIcon: expensifyIcons.ArrowRight,
+            sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.SHARE,
+            subMenuItems: shareSubMenuItems,
+        },
+    };
+}
+
+export default useShareActions;

From e3c852e4bfee8e22995734dc3e2c238f718a92ba Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:08:00 +0530
Subject: [PATCH 288/781] place share between download and print in the more
 menu

---
 src/libs/PopoverMenuSections.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/PopoverMenuSections.ts b/src/libs/PopoverMenuSections.ts
index 1baddf312db4..41d4ec38e1f4 100644
--- a/src/libs/PopoverMenuSections.ts
+++ b/src/libs/PopoverMenuSections.ts
@@ -23,7 +23,7 @@ const REPORT_MORE_MENU_SECTIONS = [
     ],
     [REPORT_SECONDARY_ACTIONS.SPLIT, REPORT_SECONDARY_ACTIONS.MERGE, REPORT_SECONDARY_ACTIONS.DUPLICATE_EXPENSE, REPORT_SECONDARY_ACTIONS.MOVE_EXPENSE],
     [REPORT_SECONDARY_ACTIONS.DUPLICATE_REPORT, REPORT_SECONDARY_ACTIONS.CHANGE_WORKSPACE, REPORT_SECONDARY_ACTIONS.CHANGE_APPROVER],
-    [REPORT_SECONDARY_ACTIONS.EXPORT, REPORT_SECONDARY_ACTIONS.DOWNLOAD_PDF, REPORT_SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS, REPORT_SECONDARY_ACTIONS.PRINT],
+    [REPORT_SECONDARY_ACTIONS.EXPORT, REPORT_SECONDARY_ACTIONS.DOWNLOAD_PDF, REPORT_SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS, REPORT_SECONDARY_ACTIONS.SHARE, REPORT_SECONDARY_ACTIONS.PRINT],
     [REPORT_SECONDARY_ACTIONS.VIEW_DETAILS, REPORT_SECONDARY_ACTIONS.DELETE],
 ];
 

From fe3cecc0000e148b976c88009e646fc620559868 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:08:00 +0530
Subject: [PATCH 289/781] list share in the report secondary actions

---
 src/libs/ReportSecondaryActionUtils.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 0eca7e463779..4fc94032ac94 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -1170,6 +1170,8 @@ function getSecondaryReportActions({
         options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS);
     }
 
+    options.push(CONST.REPORT.SECONDARY_ACTIONS.SHARE);
+
     if (!isOpenReportUtils(report)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.PRINT);
     }

From 5c618bab5a65dc7a40651d8ff1df8f3a927888e2 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:08:08 +0530
Subject: [PATCH 290/781] show share in the report more menu

---
 .../MoneyReportHeaderSecondaryActions.tsx                     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
index 9ee62eade7e4..66e847282b28 100644
--- a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
+++ b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
@@ -35,6 +35,7 @@ import usePolicy from '@hooks/usePolicy';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
+import useShareActions from '@hooks/useShareActions';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
@@ -387,6 +388,8 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
         onPDFModalOpen: openPDFDownload,
     });
 
+    const shareActions = useShareActions({reportID, policy});
+
     // Compute list of applicable secondary action keys
     const secondaryActions = moneyRequestReport
         ? getSecondaryReportActions({
@@ -424,6 +427,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
             },
         },
         ...exportActionEntries,
+        ...shareActions,
         ...lifecycleActionEntries,
         ...expenseActions,
         ...holdRejectActions,

From 5ec1c24bf86d0f07897b2ebe0b4513e82ae37d23 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:08:43 +0530
Subject: [PATCH 291/781] use the refer a friend header copy

---
 src/hooks/useShareActions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useShareActions.ts b/src/hooks/useShareActions.ts
index 8531c2867355..d6ba794730ca 100644
--- a/src/hooks/useShareActions.ts
+++ b/src/hooks/useShareActions.ts
@@ -48,7 +48,7 @@ function useShareActions({reportID, policy}: UseShareActionsParams): UseShareAct
             onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.path)),
         },
         {
-            text: translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND}.buttonText`),
+            text: translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND}.header`),
             icon: expensifyIcons.Cash,
             sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.REFER_FRIEND,
             onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REFERRAL_DETAILS.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND))),

From b3c9a376b8025c88077e4ba4b203a39948c29a7f Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:10:28 +0530
Subject: [PATCH 292/781] expect share in the default secondary actions

---
 tests/unit/ReportSecondaryActionUtilsTest.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index db7591600ff9..7fdcf41fa047 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -146,6 +146,7 @@ describe('getSecondaryAction', () => {
         const result = [
             CONST.REPORT.SECONDARY_ACTIONS.EXPORT,
             CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_PDF,
+            CONST.REPORT.SECONDARY_ACTIONS.SHARE,
             CONST.REPORT.SECONDARY_ACTIONS.PRINT,
             CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS,
         ];

From 794ce691a38e2db6166620e5b5b47462a37bf743 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:10:28 +0530
Subject: [PATCH 293/781] test the share options

---
 tests/unit/hooks/useShareActionsTest.ts | 132 ++++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 tests/unit/hooks/useShareActionsTest.ts

diff --git a/tests/unit/hooks/useShareActionsTest.ts b/tests/unit/hooks/useShareActionsTest.ts
new file mode 100644
index 000000000000..2e6fe9647776
--- /dev/null
+++ b/tests/unit/hooks/useShareActionsTest.ts
@@ -0,0 +1,132 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useShareActions from '@hooks/useShareActions';
+
+import Clipboard from '@libs/Clipboard';
+import Navigation from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type {Policy, Report} from '@src/types/onyx';
+
+import createMock from '../../utils/createMock';
+
+const REPORT_ID = 'report1';
+const CURRENT_USER_ACCOUNT_ID = 1;
+const OTHER_ACCOUNT_ID = 2;
+const ENVIRONMENT_URL = 'https://new.expensify.com';
+
+const submittedReport: Report = {
+    reportID: REPORT_ID,
+    type: CONST.REPORT.TYPE.EXPENSE,
+    ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+    managerID: OTHER_ACCOUNT_ID,
+    stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+    statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+};
+
+let mockReport: Report | undefined = submittedReport;
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+}));
+
+jest.mock('@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute', () => ({
+    __esModule: true,
+    default: (path: string) => path,
+}));
+
+jest.mock('@libs/Clipboard', () => ({
+    setString: jest.fn(),
+}));
+
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: (key: string) => key}),
+}));
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: () => ({}),
+}));
+
+jest.mock('@hooks/useEnvironment', () => ({
+    __esModule: true,
+    default: () => ({environmentURL: ENVIRONMENT_URL}),
+}));
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
+    __esModule: true,
+    default: () => ({accountID: CURRENT_USER_ACCOUNT_ID}),
+}));
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: () => [mockReport],
+}));
+
+function getShareOptions(policy?: Policy) {
+    const {result} = renderHook(() => useShareActions({reportID: REPORT_ID, policy}));
+    return result.current[CONST.REPORT.SECONDARY_ACTIONS.SHARE].subMenuItems ?? [];
+}
+
+describe('useShareActions', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockReport = submittedReport;
+    });
+
+    it('lists share report first for the submitter of a submitted report', () => {
+        // Given a submitted expense report owned by the current user
+        // When the share options are built
+        const options = getShareOptions();
+
+        // Then share report comes before the options every report has
+        expect(options.map((option) => option.text)).toEqual(['common.shareReport', 'common.shareCode', 'referralProgram.referralFriend.header', 'qrCodes.copy']);
+    });
+
+    it('hides share report on an open report', () => {
+        // Given the same report before it is submitted
+        mockReport = {...submittedReport, stateNum: CONST.REPORT.STATE_NUM.OPEN, statusNum: CONST.REPORT.STATUS_NUM.OPEN};
+
+        // When the share options are built
+        const options = getShareOptions();
+
+        // Then a report that was never submitted cannot be emailed
+        expect(options.map((option) => option.text)).not.toContain('common.shareReport');
+    });
+
+    it('hides share report from a member who is not the submitter, the approver or an admin', () => {
+        // Given a submitted report that someone else owns and approves
+        mockReport = {...submittedReport, ownerAccountID: OTHER_ACCOUNT_ID};
+
+        // When the share options are built for a regular workspace member
+        const memberOptions = getShareOptions(createMock<Policy>({id: 'policy1', role: CONST.POLICY.ROLE.USER}));
+
+        // Then they cannot share it, while a workspace admin can
+        expect(memberOptions.map((option) => option.text)).not.toContain('common.shareReport');
+        const adminOptions = getShareOptions(createMock<Policy>({id: 'policy1', role: CONST.POLICY.ROLE.ADMIN}));
+        expect(adminOptions.at(0)?.text).toBe('common.shareReport');
+    });
+
+    it('opens the share report page', () => {
+        // Given the share options of a report the current user can share
+        const options = getShareOptions();
+
+        // When share report is selected
+        options.at(0)?.onSelected?.();
+
+        // Then the picker for the recipient opens
+        expect(Navigation.navigate).toHaveBeenCalledWith(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_REPORT.path);
+    });
+
+    it('copies the report URL', () => {
+        // Given the share options of a report
+        const options = getShareOptions();
+
+        // When copy URL is selected
+        options.at(-1)?.onSelected?.();
+
+        // Then the link to the report is on the clipboard
+        expect(Clipboard.setString).toHaveBeenCalledWith(`${ENVIRONMENT_URL}/${ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID)}`);
+    });
+});

From c7210aff0940f7067126855a4019bf2ac0162a07 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:10:29 +0530
Subject: [PATCH 294/781] test the shareReport request

---
 tests/actions/ReportTest.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 6f726138fbee..8ca734ebd84f 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -6077,6 +6077,19 @@ describe('actions/Report', () => {
         });
     });
 
+    describe('shareReport', () => {
+        it('sends the recipient and the permissions the API expects', () => {
+            // Given a recipient entered as a phone number
+            const phoneNumber = '+15005550006';
+
+            // When the report is shared with them
+            Report.shareReport('1', phoneNumber);
+
+            // Then the request names them by their SMS login and gives read and write access
+            expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.SHARE_REPORT, {reportID: '1', shareToEmail: `${phoneNumber}${CONST.SMS.DOMAIN}`, permissions: 'read, write'});
+        });
+    });
+
     describe('openReport with introSelected', () => {
         it('should call OpenReport API with introSelected parameter', async () => {
             global.fetch = TestHelper.createGlobalFetchMock();

From 91e199d9d3c4e773c4b587061d6d9dc3d131bf02 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 6 Oct 2026 12:12:19 +0530
Subject: [PATCH 295/781] use the composed header on the share report page

---
 .../inbox/report/DynamicReportDetailsShareReportPage.tsx      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
index e6fe01f0d666..c849a153d4a2 100644
--- a/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
+++ b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
@@ -3,7 +3,7 @@
  */
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SingleSelectWithAvatarListItem from '@components/SelectionList/ListItem/SingleSelectWithAvatarListItem';
 import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
@@ -134,7 +134,7 @@ function DynamicReportDetailsShareReportPage({report, policy}: DynamicReportDeta
             onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
         >
             <FullPageNotFoundView shouldShow={!canShareReport(report, policy, currentUserAccountID)}>
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('common.shareReport')}
                     subtitle={getReportName(report)}
                     onBackButtonPress={() => Navigation.goBack(backPath)}

From ac4fd1059efce8f40f5b70d4fe1bef295798f4bb Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 10:27:28 +0200
Subject: [PATCH 296/781] fix: Android selected tab no longer sits higher than
 the others, tab labels drop Material's letter spacing

---
 patches/react-native-screens/details.md       |  4 +--
 ...8.0+002+android-tab-label-typography.patch | 33 ++++---------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 80b8f9a1bb67..8d9ce30ef917 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -10,8 +10,8 @@
 ### [react-native-screens+4.28.0+002+android-tab-label-typography.patch](react-native-screens+4.28.0+002+android-tab-label-typography.patch)
 
 - Reason: Two changes to the Android tab labels, both in `TabsAppearanceApplicator`, which React Navigation has no option for.
-  - Bold selected label. The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. The patch turns on Material's own `setItemTextAppearanceActiveBoldEnabled`, which keeps the large label bold whenever Material re-applies its text appearance, and calls it before `updateFontStyles`, because enabling it re-applies Material's text appearance and would otherwise replace the app's typeface. `updateFontStyles` then sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family.
-  - Letter spacing. `updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app, so the patch sets a fixed -0.5dp tracking on both labels, converted to the `em` unit `TextView.letterSpacing` expects for each label's size.
+  - Bold selected label. The Android tab bar takes one font weight for every label, while the design marks the selected tab with a bold label, the same way the JS side bar does. Material's `BottomNavigationView` draws each item with two labels, a small one shown while unselected and a large one shown while selected. `updateFontStyles` sets the large label's typeface with `Typeface.BOLD`, the way Material applies its own bold, so Android picks the bold face of the same font family. Material's `setItemTextAppearanceActiveBoldEnabled` is not used for this: it re-applies Material's 12sp text size to the large label alone and recomputes the selected item's offset from the difference between the two labels' sizes, so every selected tab would sit higher than the others.
+  - Letter spacing. `updateFontStyles` replaces the typeface and size of Material's tab labels but keeps the rest of Material 3's `LabelMedium` text appearance, which tracks letters 0.5sp apart. With Expensify Neue the labels read too spread out next to the rest of the app, so the patch sets the letter spacing of both labels to 0.
 - Upstream PR/issue: not reported, because both changes are the App's typography (a bold selected label and its letter spacing) rather than a library defect, and RNScreens has no option for either.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch b/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
index f0be85344b86..a532d6a859e5 100644
--- a/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
+++ b/patches/react-native-screens/react-native-screens+4.28.0+002+android-tab-label-typography.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
-index 10cd91b..9238416 100644
+index 10cd91b..6f059bd 100644
 --- a/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 +++ b/node_modules/react-native-screens/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
 @@ -3,6 +3,7 @@ package com.swmansion.rnscreens.gamma.tabs.appearance
@@ -10,42 +10,23 @@ index 10cd91b..9238416 100644
  import android.graphics.drawable.StateListDrawable
  import android.util.TypedValue
  import android.view.MenuItem
-@@ -95,6 +96,10 @@ internal class TabsAppearanceApplicator(
- 
-         bottomNavigationView.labelVisibilityMode = visibilityMode
- 
-+        // The selected tab's label is drawn bold, the way the app marks a selected tab everywhere else. Material re-applies
-+        // its text appearance when enabling this, so it has to run before `updateFontStyles` sets the app's typeface.
-+        bottomNavigationView.setItemTextAppearanceActiveBoldEnabled(true)
-+
-         // Ripple color
-         val rippleColor =
-             tabBarAppearance?.tabBarItemRippleColor
-@@ -161,13 +166,18 @@ internal class TabsAppearanceApplicator(
+@@ -161,13 +162,18 @@ internal class TabsAppearanceApplicator(
                  tabBarAppearance?.tabBarItemTitleLargeLabelFontSize?.takeIf { it > 0 }?.let { PixelUtil.toPixelFromSP(it) }
                      ?: context.resources.getDimension(R.dimen.design_bottom_navigation_text_size)
  
-+            // Material's label text appearance tracks letters 0.5sp apart, wider than the app's labels.
-+            val labelTracking = PixelUtil.toPixelFromDIP(LABEL_TRACKING_DP)
-+
++            // Both labels drop the 0.5sp letter tracking of Material's text appearance, which reads wider than the app's labels.
              // Inactive
              smallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallFontSize)
              smallLabel.typeface = fontFamily
-+            smallLabel.letterSpacing = labelTracking / smallFontSize
++            smallLabel.letterSpacing = 0f
  
              // Active
++            // Bold is set here rather than with `setItemTextAppearanceActiveBoldEnabled`, which re-applies Material's text size
++            // to this label alone, so Material lifts the selected item by the size difference between the two labels.
              largeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, largeFontSize)
 -            largeLabel.typeface = fontFamily
 +            largeLabel.setTypeface(fontFamily, Typeface.BOLD)
-+            largeLabel.letterSpacing = labelTracking / largeFontSize
++            largeLabel.letterSpacing = 0f
          }
      }
  
-@@ -237,5 +247,7 @@ internal class TabsAppearanceApplicator(
- 
-     companion object {
-         const val TAG = "TabsAppearanceApplicator"
-+
-+        private const val LABEL_TRACKING_DP = -0.5f
-     }
- }

From 9aefaeac6e88b001621454fd9b642163cd42ad39 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 10:27:30 +0200
Subject: [PATCH 297/781] fix: navigating to the split sidebar already on top
 is a handled no-op, so the first Inbox visit logs no navigation error

---
 .../createSplitNavigator/SplitRouter.ts       |  3 +-
 tests/unit/SplitRouterTest.ts                 | 79 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/SplitRouterTest.ts

diff --git a/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts b/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
index 3af6e3f40087..75f82f60e761 100644
--- a/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
@@ -168,11 +168,12 @@ function SplitRouter(options: SplitNavigatorRouterOptions) {
                 return result ? getRehydratedState(result, configOptions) : result;
             }
             if (isPushingSidebarOnCentralPane(state, action, options)) {
-                if (getIsNarrowLayout()) {
+                if (getIsNarrowLayout() && state.index > 0) {
                     const newAction = StackActions.popToTop();
                     return stackRouter.getStateForAction(state, newAction, configOptions);
                 }
                 // On wide screen do nothing as we want to keep the central pane screen and the sidebar is visible.
+                // On narrow screen the sidebar is already on top, and the stack router reports popToTop with nothing to pop as unhandled.
                 return state;
             }
 
diff --git a/tests/unit/SplitRouterTest.ts b/tests/unit/SplitRouterTest.ts
new file mode 100644
index 000000000000..04429342cbff
--- /dev/null
+++ b/tests/unit/SplitRouterTest.ts
@@ -0,0 +1,79 @@
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import SplitRouter from '@libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter';
+
+import SCREENS from '@src/SCREENS';
+
+import type {ParamListBase, RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
+
+import {CommonActions} from '@react-navigation/native';
+
+jest.mock('@libs/getIsNarrowLayout', () => jest.fn());
+
+const mockedGetIsNarrowLayout = jest.mocked(getIsNarrowLayout);
+
+const ROUTE_NAMES = [SCREENS.INBOX, SCREENS.REPORT];
+
+const CONFIG_OPTIONS: RouterConfigOptions = {
+    routeNames: ROUTE_NAMES,
+    routeParamList: {},
+    routeGetIdList: {},
+};
+
+const router = SplitRouter({
+    sidebarScreen: SCREENS.INBOX,
+    defaultCentralScreen: SCREENS.REPORT,
+    parentRoute: {key: 'ReportsSplitNavigator-key', name: 'ReportsSplitNavigator'},
+});
+
+function buildState(routeNames: string[]): StackNavigationState<ParamListBase> {
+    return {
+        stale: false,
+        type: 'stack',
+        key: 'stack-key',
+        index: routeNames.length - 1,
+        routeNames: ROUTE_NAMES,
+        preloadedRoutes: [],
+        routes: routeNames.map((name) => ({key: `${name}-key`, name})),
+    };
+}
+
+describe('SplitRouter', () => {
+    beforeEach(() => {
+        mockedGetIsNarrowLayout.mockReturnValue(true);
+    });
+
+    it('handles navigating to the sidebar on a narrow layout when the sidebar is already the only screen', () => {
+        // Given a narrow layout split navigator that shows only its sidebar, as the Inbox tab does at its chat list
+        const state = buildState([SCREENS.INBOX]);
+
+        // When the sidebar is navigated to again, which happens when the tab's navigation params are applied to an already mounted navigator
+        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
+
+        // Then the action is handled without changes, because an unhandled (null) result makes React Navigation log an error and ignore the navigation
+        expect(result).toBe(state);
+    });
+
+    it('pops back to the sidebar on a narrow layout when a central screen is on top of it', () => {
+        // Given a narrow layout split navigator with a report opened over the sidebar
+        const state = buildState([SCREENS.INBOX, SCREENS.REPORT]);
+
+        // When the sidebar is navigated to
+        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
+
+        // Then the report is popped so the sidebar is the only screen left
+        expect(result?.index).toBe(0);
+        expect(result?.routes.map((route) => route.name)).toEqual([SCREENS.INBOX]);
+    });
+
+    it('keeps the central screen on a wide layout when the sidebar is navigated to', () => {
+        // Given a wide layout split navigator, where the sidebar is drawn next to the report opened over it
+        mockedGetIsNarrowLayout.mockReturnValue(false);
+        const state = buildState([SCREENS.INBOX, SCREENS.REPORT]);
+
+        // When the sidebar is navigated to
+        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
+
+        // Then nothing changes, because the sidebar is already visible and popping would close the report next to it
+        expect(result).toBe(state);
+    });
+});

From cd5a62b5316925f723a27e6dd1612e025960bb8b Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 11:37:01 +0200
Subject: [PATCH 298/781] fix: Android tab dots drawn into the icon keep their
 own color, native tab dots get a cutout from the icon

---
 .../NativeTabNavigator/tabIconRasterizer.ts   | 21 +++++++++++++------
 .../useNativeTabBarOptions/index.ios.ts       |  2 ++
 .../useNativeTabBarOptions/index.ts           | 16 +++++++-------
 src/styles/variables.ts                       |  4 +++-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index 453a76a3dd6c..0a233bee9249 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -3,7 +3,7 @@ import FontUtils from '@styles/utils/FontUtils';
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas, SkFont, SkImage, SkPath} from '@shopify/react-native-skia';
 
-import {ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
+import {BlendMode, ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
 import {PixelRatio} from 'react-native';
 
 import type {NativeTabGlyph, NativeTabName} from './NATIVE_TAB_GLYPHS';
@@ -17,6 +17,8 @@ type TabIconLayout = {
     avatarSize: number;
     /** Radius of the status dot drawn at the content's top right corner. */
     dotRadius: number;
+    /** Width of the transparent ring cut out of the content around the status dot. */
+    dotCutout: number;
     /** Gap between the glyph box and the label drawn under it. */
     labelGap: number;
     /** Font size of the label drawn under the glyph. */
@@ -117,11 +119,18 @@ function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top:
     circle.dispose();
 }
 
-function drawStatusDot(canvas: SkCanvas, right: number, top: number, radius: number, color: string) {
+function drawStatusDot(canvas: SkCanvas, right: number, top: number, radius: number, cutout: number, color: string) {
+    const centerX = right - radius;
+    const centerY = top + radius;
     const paint = Skia.Paint();
-    paint.setColor(Skia.Color(color));
     paint.setAntiAlias(true);
-    canvas.drawCircle(right - radius, top + radius, radius, paint);
+    if (cutout > 0) {
+        paint.setBlendMode(BlendMode.Clear);
+        canvas.drawCircle(centerX, centerY, radius + cutout, paint);
+        paint.setBlendMode(BlendMode.SrcOver);
+    }
+    paint.setColor(Skia.Color(color));
+    canvas.drawCircle(centerX, centerY, radius, paint);
     paint.dispose();
 }
 
@@ -153,7 +162,7 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
         drawGlyph(canvas, name, contentLeft, contentTop, contentSize, color);
     }
     if (dotColor) {
-        drawStatusDot(canvas, contentLeft + contentSize, contentTop, layout.dotRadius * scale, dotColor);
+        drawStatusDot(canvas, contentLeft + contentSize, contentTop, layout.dotRadius * scale, layout.dotCutout * scale, dotColor);
     }
     if (label && font && labelMetrics) {
         const paint = Skia.Paint();
@@ -182,7 +191,7 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
  */
 function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomTabIcon | undefined {
     const {name, color, avatar, dotColor, label} = params;
-    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, layout.glyphSize, layout.avatarSize].join('|');
+    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, layout.glyphSize, layout.avatarSize, layout.dotRadius, layout.dotCutout].join('|');
     if (iconCache.has(key)) {
         return iconCache.get(key);
     }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 135056a4332b..8ab8500bf4d5 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -21,6 +21,8 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
     // A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs.
     avatarSize: variables.avatarNativeTabBarIOS,
     dotRadius: variables.nativeTabIconDotRadius,
+    // A cutout rather than a border in the bar's color, because the iOS 26 bar is glass and has no single color.
+    dotCutout: variables.nativeTabIconDotCutout,
     labelGap: variables.nativeTabIconLabelGap,
     labelFontSize: variables.fontSizeSmall,
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
index 4e0c5803e67b..abfeb0175b61 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -14,17 +14,18 @@ import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-ta
 
 import type NativeTabBarOptionsParams from './types';
 
-/** An empty badge value makes Material draw its small dot badge instead of a number. */
-const STATUS_DOT_BADGE = '';
-
 /** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
 const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
 
-/** Material draws each icon in its fixed icon slot, with the label and the status badge of its own. */
+/**
+ * Material draws each icon in its fixed icon slot, with a label of its own. The status dot is drawn into the icon rather
+ * than as a Material badge, because RNScreens paints every badge in the badge color of the selected tab.
+ */
 const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconBottomBar,
     avatarSize: variables.iconBottomBar,
-    dotRadius: 0,
+    dotRadius: variables.nativeTabIconDotRadius,
+    dotCutout: variables.nativeTabIconDotCutout,
     labelGap: 0,
     labelFontSize: 0,
 };
@@ -49,14 +50,13 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}:
     const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
         // The active indicator pill marks the selected tab, so the avatar is the same image in both selection states.
         const tabAvatar = name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined;
-        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar});
-        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar});
         const dotColor = dotColors[name];
+        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar, dotColor});
+        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar, dotColor});
         return {
             tabBarLabel: tabLabels[name],
             // A function, because React Navigation derives the selected icon only from a function.
             tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
-            ...(dotColor ? {tabBarBadge: STATUS_DOT_BADGE, tabBarBadgeStyle: {backgroundColor: dotColor}} : {tabBarBadge: undefined}),
         };
     };
 
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 5e9e38376af8..283e58a12929 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -116,8 +116,10 @@ export default {
     iconNativeTabBarIOS: 22,
     /** Account avatar size in the iOS native tab bar. */
     avatarNativeTabBarIOS: 26,
-    /** Radius of the status dot drawn into an iOS native tab bar icon. */
+    /** Radius of the status dot drawn into a native tab bar icon. */
     nativeTabIconDotRadius: 4,
+    /** Width of the ring cut out of a native tab bar icon around its status dot, as the JS tab bar's dot border does. */
+    nativeTabIconDotCutout: 2,
     /** Gap between the glyph and the label drawn under it in an iOS native tab bar icon. */
     nativeTabIconLabelGap: 6,
     /** Material's BottomNavigationView row, without the gesture inset under it. */

From 1ce326e97d2d527a11eda566b1e1298b69a1ee34 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 6 Oct 2026 12:12:06 +0000
Subject: [PATCH 299/781] Keep the expense report pinned to the bottom after
 the user sends a comment

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 .../useMoneyRequestReportScroll.ts            | 24 ++++++-----
 .../unit/useMoneyRequestReportScrollTest.tsx  | 40 +++++++++++++++++++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
index a8e996a9d037..52ba3c3ebc01 100644
--- a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
@@ -154,6 +154,17 @@ function useMoneyRequestReportScroll({
     const stickToBottomRef = useRef(false);
     const stickToBottomTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
+    // A single jump from far above can land short of the bottom while rows render, so keep re-pinning on every content size change for a while
+    const startStickToBottom = () => {
+        stickToBottomRef.current = true;
+        if (stickToBottomTimeoutRef.current) {
+            clearTimeout(stickToBottomTimeoutRef.current);
+        }
+        stickToBottomTimeoutRef.current = setTimeout(() => {
+            stickToBottomRef.current = false;
+        }, STICK_TO_BOTTOM_DURATION_MS);
+    };
+
     // Set when the user taps "Latest messages", cleared once the scroll reaches the bottom or the user scrolls away
     const pendingMarkAsReadRef = useRef(false);
 
@@ -239,6 +250,7 @@ function useMoneyRequestReportScroll({
                     }
                     ownActionScrollTimeoutRef.current = setTimeout(() => {
                         ownActionScrollTimeoutRef.current = null;
+                        startStickToBottom();
                         scrollToBottom();
                     }, DELAY_FOR_SCROLLING_TO_END);
                 } else {
@@ -279,20 +291,14 @@ function useMoneyRequestReportScroll({
         }
         pendingScrollTimeoutRef.current = setTimeout(() => {
             pendingScrollTimeoutRef.current = null;
+            startStickToBottom();
             scrollToBottom();
         }, DELAY_FOR_SCROLLING_TO_END);
-    }, [visibleReportActions, scrollToBottom]);
+    }, [visibleReportActions, scrollToBottom, startStickToBottom]);
 
     const scrollToLatestMessages = () => {
         setIsFloatingMessageCounterVisible(false);
-
-        stickToBottomRef.current = true;
-        if (stickToBottomTimeoutRef.current) {
-            clearTimeout(stickToBottomTimeoutRef.current);
-        }
-        stickToBottomTimeoutRef.current = setTimeout(() => {
-            stickToBottomRef.current = false;
-        }, STICK_TO_BOTTOM_DURATION_MS);
+        startStickToBottom();
 
         if (!hasNewestReportAction) {
             openReport({
diff --git a/tests/unit/useMoneyRequestReportScrollTest.tsx b/tests/unit/useMoneyRequestReportScrollTest.tsx
index 8c2e0270e4e3..a5ed7453e5d6 100644
--- a/tests/unit/useMoneyRequestReportScrollTest.tsx
+++ b/tests/unit/useMoneyRequestReportScrollTest.tsx
@@ -543,6 +543,46 @@ describe('useMoneyRequestReportScroll', () => {
             // Then the deferred jump fires for the action the first pass could not find
             expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
         });
+
+        it('should keep re-pinning the list to the bottom while content settles after the user sends a comment', async () => {
+            // Given a list scrolled to the top and a comment the user just sent
+            const {result} = await renderScroll();
+            applyLayoutAndScroll(result, BOTTOM_OFFSET_AT_TOP);
+            notifyNewAction(true, makeAction('1'));
+            act(() => {
+                jest.advanceTimersByTime(100);
+            });
+            mockScrollToIndex.mockClear();
+
+            // When rows between the top and the newest message render and grow the list
+            act(() => {
+                result.current.onListContentSizeChange(0, LIST_CONTENT_HEIGHT + 500);
+            });
+
+            // Then the list is pinned back to the last item, because a single jump from far above can land short of it
+            expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
+        });
+
+        it('should keep re-pinning the list after a deferred jump for a comment that landed late', async () => {
+            // Given a comment the user sent that only shows up in the rendered list after the event
+            const {result, rerender} = await renderScroll({visibleReportActions: [makeAction('1')]});
+            applyLayoutAndScroll(result, BOTTOM_OFFSET_AT_TOP);
+            notifyNewAction(true, makeAction('2'));
+            rerender(buildParams({visibleReportActions: [makeAction('1'), makeAction('2')], reportActionsLength: 2, lastAction: makeAction('2')}));
+            await waitForBatchedUpdatesWithAct();
+            act(() => {
+                jest.advanceTimersByTime(100);
+            });
+            mockScrollToIndex.mockClear();
+
+            // When the content height changes while the list settles
+            act(() => {
+                result.current.onListContentSizeChange(0, LIST_CONTENT_HEIGHT + 500);
+            });
+
+            // Then the deferred jump is also kept at the bottom
+            expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
+        });
     });
 
     describe('AgentZero thinking indicator', () => {

From 71ffd6e40913e84eccf9c06fe376fa93158ddeba Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 15:59:39 +0200
Subject: [PATCH 300/781] chore: no double safe area under the mWeb Inbox list,
 one owner for tab span cancel, unused exports dropped

---
 src/components/LHNOptionsList/LHNOptionsList.tsx         | 2 +-
 .../Navigators/NativeTabNavigator/tabIconRasterizer.ts   | 2 +-
 .../NativeTabNavigator/useNativeTabNavigator.ts          | 9 ++++++---
 src/libs/telemetry/cancelTabNavigationSpans.ts           | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index fb948e8a49dd..e970dc0ce6e5 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -46,7 +46,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const [personalDetails] = useAllPersonalDetails();
 
     const styles = useThemeStyles();
-    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles);
+    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles, true);
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index 0a233bee9249..e864e7f13531 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -204,4 +204,4 @@ function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomT
 }
 
 export default getTabIcon;
-export type {TabIconLayout, TabIconParams};
+export type {TabIconLayout};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index d3c419584453..0d56423ac62a 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -112,11 +112,14 @@ function useNativeTabNavigator() {
         Navigation.navigate(ROUTES.HOME, {forceReplace: true});
     }, [isInsightsTabFocusedWithoutBeta]);
 
-    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab.
-    // The span for the new tab is started by the tab button before navigation, so we keep it via `except`.
+    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab. The new tab's span is started at
+    // the tap, before navigation, so it is kept. On wide layouts the JS side bar does this.
     useEffect(() => {
+        if (!shouldUseNarrowLayout) {
+            return;
+        }
         cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
-    }, [selectedTab]);
+    }, [selectedTab, shouldUseNarrowLayout]);
 
     // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
     // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
diff --git a/src/libs/telemetry/cancelTabNavigationSpans.ts b/src/libs/telemetry/cancelTabNavigationSpans.ts
index 42c3c7a3261b..604131421a1c 100644
--- a/src/libs/telemetry/cancelTabNavigationSpans.ts
+++ b/src/libs/telemetry/cancelTabNavigationSpans.ts
@@ -34,4 +34,4 @@ function cancelTabNavigationSpans(preserve: readonly string[] = []) {
 }
 
 export default cancelTabNavigationSpans;
-export {REPORTS_TAB_SPAN_IDS, INBOX_TAB_SPAN_IDS, TAB_NAVIGATION_SPAN_IDS, NAVIGATION_TAB_TO_SPANS};
+export {TAB_NAVIGATION_SPAN_IDS, NAVIGATION_TAB_TO_SPANS};

From 9b011418221b9b51c4972e04f569cba8a3312924 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 16:38:46 +0200
Subject: [PATCH 301/781] fix: native Workspaces and first Spend taps follow
 the JS tab buttons, background tabs send no boot requests, CPU tab icons

---
 patches/react-native-screens/details.md       |  2 +-
 .../NavigationTabBar/getSearchTabRoute.ts     | 24 ++++--
 .../index.android.tsx                         |  7 +-
 .../index.ios.tsx                             |  6 +-
 .../useTabRootScreenWrapperProps/index.tsx    |  8 +-
 .../useTabRootScreenWrapperProps/types.ts     |  4 +
 .../useTabRootScrollProps/index.native.tsx    |  8 +-
 .../useTabRootScrollProps/index.tsx           | 11 +--
 .../useTabRootScrollProps/types.ts            |  6 +-
 src/hooks/useHasTabBeenShown.ts               | 37 +++++++++
 .../NativeTabNavigator/NativeTabLayout.tsx    | 22 ++++-
 .../SpendTabPressListener.tsx                 | 53 ++++++++++++
 .../WorkspacesTabPressListener.tsx            | 25 ++++++
 .../NativeTabNavigator/tabIconRasterizer.ts   |  2 +-
 .../NativeTabNavigator/tabScreenListeners.ts  | 25 ++++--
 .../useNativeTabBarOptions/index.ios.ts       |  4 +-
 .../useNativeTabBarOptions/index.ts           |  4 +-
 .../useNativeTabBarOptions/types.ts           |  2 +
 .../useNativeTabNavigator.ts                  | 11 ++-
 .../NativeTabNavigator/useTabAvatarImage.ts   | 14 ++--
 .../Navigators/TabNavigator.native.tsx        |  6 +-
 src/pages/Search/SearchPage.tsx               |  7 +-
 src/pages/settings/InitialSettingsPage.tsx    |  7 +-
 src/styles/theme/types.ts                     |  4 +-
 tests/ui/InitialSettingsPageTest.tsx          |  2 +
 tests/unit/nativeTabScreenListenersTest.ts    | 55 ++++++------
 tests/unit/useHasTabBeenShownTest.ts          | 83 +++++++++++++++++++
 27 files changed, 352 insertions(+), 87 deletions(-)
 create mode 100644 src/hooks/useHasTabBeenShown.ts
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx
 create mode 100644 tests/unit/useHasTabBeenShownTest.ts

diff --git a/patches/react-native-screens/details.md b/patches/react-native-screens/details.md
index 8d9ce30ef917..bd772bb16417 100644
--- a/patches/react-native-screens/details.md
+++ b/patches/react-native-screens/details.md
@@ -2,7 +2,7 @@
 
 ### [react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch](react-native-screens+4.28.0+001+animate-hiding-the-native-tab-bar.patch)
 
-- Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch passes `YES`, which lets UIKit run its own show/hide animation. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart. **This patch can be removed on the bump to react-native-screens 4.29.0**, the first release with the upstream fix linked below.
+- Reason: The App hides the native tab bar on screens that are not a tab root, which React Navigation forwards to RNScreens as `tabBarHidden` (it derives the flag from `tabBarStyle.display === 'none'`). RNScreens calls UIKit's `setTabBarHidden:animated:` with `animated:NO`, so the bar blinks in and out instead of travelling with the screen that hid it. The patch animates the change once the bar is in a window, which lets UIKit run its own show/hide animation without animating the bar out on the first render. The pre-iOS 18 branch is left alone: it assigns `tabBar.hidden` directly and has no animated counterpart. **This patch can be removed on the bump to react-native-screens 4.29.0**, the first release with the upstream fix linked below.
 - Upstream PR/issue: fixed upstream by [software-mansion/react-native-screens#4632](https://github.com/software-mansion/react-native-screens/pull/4632), which animates by default behind a new `ios.tabBarHiddenAnimationEnabled` prop, and [#4673](https://github.com/software-mansion/react-native-screens/pull/4673), which skips the animation on the first render. Both are merged after the 4.28.0 release and labeled for the v4 backport.
 - E/App issue: [#101169](https://github.com/Expensify/App/issues/101169)
 - PR introducing patch: [#101339](https://github.com/Expensify/App/pull/101339)
diff --git a/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts b/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
index e76c98b3398b..408f925a2d47 100644
--- a/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
+++ b/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
@@ -14,6 +14,19 @@ import type {OnyxEntry} from 'react-native-onyx';
 
 import getLastRoute from './getLastRoute';
 
+/** The latest Spend search kept in Onyx, for a Spend tab that has not shown a search yet. */
+function getStoredSearchTabRoute(lastSearchParams: OnyxEntry<LastSearchParams>, lastExpensesSearchQuery: string | undefined) {
+    const lastQueryJSON = lastSearchParams?.queryJSON;
+    const lastQueryFromOnyx = lastQueryJSON ? buildSearchQueryString(lastQueryJSON) : undefined;
+    if (lastQueryFromOnyx) {
+        // The persisted search key belongs to the persisted query, so it only travels with it.
+        return ROUTES.SEARCH_ROOT.getRoute({query: lastQueryFromOnyx, searchKey: lastSearchParams?.searchKey});
+    }
+
+    const defaultSearchQuery = buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE});
+    return ROUTES.SEARCH_ROOT.getRoute({query: getValidLastQuery(lastExpensesSearchQuery, defaultSearchQuery), searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES});
+}
+
 function getSearchTabRoute(rootState: NavigationState, lastSearchParams: OnyxEntry<LastSearchParams>, lastExpensesSearchQuery: string | undefined) {
     const lastSearchRoute = getLastRoute(rootState, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SCREENS.SEARCH.ROOT);
 
@@ -28,15 +41,8 @@ function getSearchTabRoute(rootState: NavigationState, lastSearchParams: OnyxEnt
         }
     }
 
-    const lastQueryJSON = lastSearchParams?.queryJSON;
-    const lastQueryFromOnyx = lastQueryJSON ? buildSearchQueryString(lastQueryJSON) : undefined;
-    if (lastQueryFromOnyx) {
-        // The persisted search key belongs to the persisted query, so it only travels with it.
-        return ROUTES.SEARCH_ROOT.getRoute({query: lastQueryFromOnyx, searchKey: lastSearchParams?.searchKey});
-    }
-
-    const defaultSearchQuery = buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE});
-    return ROUTES.SEARCH_ROOT.getRoute({query: getValidLastQuery(lastExpensesSearchQuery, defaultSearchQuery), searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES});
+    return getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery);
 }
 
 export default getSearchTabRoute;
+export {getStoredSearchTabRoute};
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
index 0ecf905ca0d3..888cb620fc4d 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
@@ -1,5 +1,4 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 
 import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -8,13 +7,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import React from 'react';
 import {View} from 'react-native';
 
-import type TabRootScreenWrapperProps from './types';
+import type {UseTabRootScreenWrapperProps} from './types';
 
 /**
  * Material's bar is drawn over the full-height tab screen, so a narrow tab root screen reserves the bar's row under its
  * content, and the ScreenWrapper adds the gesture inset the bar sits on below it. Account drawn over the tabs hides the bar.
  */
-function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab) => {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
     const styles = useThemeStyles();
@@ -24,6 +23,6 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
     }
 
     return {bottomContent: <View style={styles.androidNativeTabBarSpacer} />};
-}
+};
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index c7d86f32d2c4..300d65a857ce 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,14 +1,14 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import type TabRootScreenWrapperProps from './types';
+import type {UseTabRootScreenWrapperProps} from './types';
 
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
  * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar.
  */
-function useTabRootScreenWrapperProps(): TabRootScreenWrapperProps {
+const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = () => {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false} : {};
-}
+};
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 5621ca35e2fd..ecf13966f9f0 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -1,11 +1,9 @@
-import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
-
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
 
-import type TabRootScreenWrapperProps from './types';
+import type {UseTabRootScreenWrapperProps} from './types';
 
 import TabBarBottomContent from '..';
 
@@ -13,7 +11,7 @@ import TabBarBottomContent from '..';
  * On narrow layouts the floating tab bar is laid over the bottom of a tab root screen, so the content runs under it
  * down to the bottom edge of the screen. Each tab root's list ends with room for the bar.
  */
-function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
+const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab) => {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
 
@@ -21,6 +19,6 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
         bottomContentStyle: shouldUseNarrowLayout ? styles.floatingTabBarOverlay : styles.overflowVisible,
     };
-}
+};
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index dab83f0477d5..0a371761226f 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -1,5 +1,9 @@
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
 
 type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'>;
 
+type UseTabRootScreenWrapperProps = (selectedTab: TabBarBottomContentProps['selectedTab']) => TabRootScreenWrapperProps;
+
 export default TabRootScreenWrapperProps;
+export type {UseTabRootScreenWrapperProps};
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
index 65aaa5912a7a..4217cc7534fe 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
@@ -1,13 +1,9 @@
-import type {StyleProp, ViewStyle} from 'react-native';
-
-import type TabRootScrollProps from './types';
+import type {UseTabRootScrollProps} from './types';
 
 /**
  * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
  * the bar's row below the content, so the content container keeps its style.
  */
-function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps {
-    return {contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'};
-}
+const useTabRootScrollProps: UseTabRootScrollProps = (style) => ({contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'});
 
 export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index c75a5c774fc8..109b00972f09 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -3,16 +3,13 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import variables from '@styles/variables';
 
-import type {StyleProp, ViewStyle} from 'react-native';
-
-import type TabRootScrollProps from './types';
+import type {UseTabRootScrollProps} from './types';
 
 /**
  * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
- * room for the bar, letting its last row scroll out from under it. A list that already adds the bottom safe area
- * passes `hasBottomSafeAreaPadding`, so the safe area is not added twice.
+ * room for the bar, letting its last row scroll out from under it.
  */
-function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): TabRootScrollProps {
+const useTabRootScrollProps: UseTabRootScrollProps = (style, hasBottomSafeAreaPadding = false) => {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const insetStyle = useBottomSafeSafeAreaPaddingStyle({
         style,
@@ -22,6 +19,6 @@ function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPa
     });
 
     return {contentContainerStyle: shouldUseNarrowLayout ? insetStyle : style};
-}
+};
 
 export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
index 61dc387fad90..460d2c42ce86 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
@@ -1,5 +1,9 @@
-import type {ScrollViewProps} from 'react-native';
+import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
 
 type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
 
+/** A list that already adds the bottom safe area passes `hasBottomSafeAreaPadding`, so the safe area is not added twice. */
+type UseTabRootScrollProps = (style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding?: boolean) => TabRootScrollProps;
+
 export default TabRootScrollProps;
+export type {UseTabRootScrollProps};
diff --git a/src/hooks/useHasTabBeenShown.ts b/src/hooks/useHasTabBeenShown.ts
new file mode 100644
index 000000000000..f4ee1cf3de54
--- /dev/null
+++ b/src/hooks/useHasTabBeenShown.ts
@@ -0,0 +1,37 @@
+import {getTabNavigatorState} from '@libs/Navigation/helpers/tabNavigatorUtils';
+
+import type NAVIGATORS from '@src/NAVIGATORS';
+
+import type {NavigationState} from '@react-navigation/native';
+import type {ValueOf} from 'type-fest';
+
+import {useState} from 'react';
+
+import useRootNavigationState from './useRootNavigationState';
+
+type TabNavigatorName = ValueOf<typeof NAVIGATORS>;
+
+/** Whether the tab is shown or under a screen drawn over it, rather than a background tab of the tab navigator. */
+function isTabShown(rootState: NavigationState | undefined, tabName: TabNavigatorName) {
+    if (rootState?.routes.some((route) => route.name === tabName)) {
+        return true;
+    }
+    const tabState = getTabNavigatorState(rootState);
+    return !tabState || tabState.routes.at(tabState.index ?? 0)?.name === tabName;
+}
+
+/**
+ * Whether the tab has been shown since the screen mounted. Native tab bars mount every tab at startup, so a tab root
+ * screen uses it to hold back the requests and writes it makes on mount until the user first opens the tab, as it does
+ * when it mounts with the tab.
+ */
+function useHasTabBeenShown(tabName: TabNavigatorName) {
+    const isShown = useRootNavigationState((rootState) => isTabShown(rootState, tabName));
+    const [hasBeenShown, setHasBeenShown] = useState(isShown);
+    if (isShown && !hasBeenShown) {
+        setHasBeenShown(true);
+    }
+    return hasBeenShown;
+}
+
+export default useHasTabBeenShown;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index b605ffa7fa47..f60d00a097b1 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -14,6 +14,7 @@ import TabNavigatorBar from '@libs/Navigation/AppNavigator/Navigators/TabNavigat
 import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
 import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
@@ -24,10 +25,15 @@ import {StyleSheet, View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
 import NativeTabBarShadow from './NativeTabBarShadow';
+import SpendTabPressListener from './SpendTabPressListener';
 import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
+import WorkspacesTabPressListener from './WorkspacesTabPressListener';
 
 type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
 
+/** A tab's own navigation, which receives the tab's `tabPress` events. */
+type NativeTabNavigation = NativeTabLayoutProps['descriptors'][string]['navigation'];
+
 function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
@@ -37,6 +43,13 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     // The buttons follow whatever the navigator decided for the bar itself.
     const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
+    const getTabDescriptor = (routeName: string) => {
+        const route = state.routes.find((tabRoute) => tabRoute.name === routeName);
+        return route ? descriptors[route.key] : undefined;
+    };
+    const spendNavigation = getTabDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)?.navigation;
+    const spendOptions = getTabDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)?.options;
+    const workspacesNavigation = getTabDescriptor(NAVIGATORS.WORKSPACE_NAVIGATOR)?.navigation;
 
     if (!shouldUseNarrowLayout) {
         return (
@@ -50,6 +63,13 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     return (
         <View style={styles.flex1}>
             {children}
+            {!!spendNavigation && (
+                <SpendTabPressListener
+                    navigation={spendNavigation}
+                    isSwitchedByJS={spendOptions?.tabBarSelectionEnabled === false}
+                />
+            )}
+            {!!workspacesNavigation && <WorkspacesTabPressListener navigation={workspacesNavigation} />}
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
                 // The shadow and the buttons belong to the bar, so they fade with it rather than appearing in place.
@@ -78,4 +98,4 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
 }
 
 export default NativeTabLayout;
-export type {NativeTabLayoutProps};
+export type {NativeTabLayoutProps, NativeTabNavigation};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
new file mode 100644
index 000000000000..9b540106dfc1
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
@@ -0,0 +1,53 @@
+import {getStoredSearchTabRoute} from '@components/Navigation/NavigationTabBar/getSearchTabRoute';
+
+import useOnyx from '@hooks/useOnyx';
+
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import {lastExpensesSearchQuerySelector} from '@src/selectors/SearchFilters';
+
+import {useEffect} from 'react';
+
+import type {NativeTabNavigation} from './NativeTabLayout';
+
+type SpendTabPressListenerProps = {
+    /** The Spend tab's own navigation. */
+    navigation: NativeTabNavigation;
+
+    /** Whether the native bar leaves the switch to Spend to this listener, until Spend is first selected. */
+    isSwitchedByJS: boolean;
+};
+
+/**
+ * Runs the Spend tab button's navigation for a tap on the native Spend tab. The first visit opens the latest search kept
+ * in Onyx, as the JS tab button does, because the tab mounted at startup shows the default one; later visits are switched
+ * natively and only start the spans. It is its own component, so the search data it reads re-renders only this listener.
+ */
+function SpendTabPressListener({navigation, isSwitchedByJS}: SpendTabPressListenerProps) {
+    const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY);
+    const [lastExpensesSearchQuery] = useOnyx(ONYXKEYS.SEARCH_FILTERS, {selector: lastExpensesSearchQuerySelector});
+
+    useEffect(
+        () =>
+            navigation.addListener('tabPress', () => {
+                if (navigation.isFocused()) {
+                    return;
+                }
+                interceptAnonymousUser(() => {
+                    startNavigateToReportsTabSpans();
+                    if (!isSwitchedByJS) {
+                        return;
+                    }
+                    Navigation.navigate(getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery));
+                });
+            }),
+        [navigation, isSwitchedByJS, lastSearchParams, lastExpensesSearchQuery],
+    );
+
+    return null;
+}
+
+export default SpendTabPressListener;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx
new file mode 100644
index 000000000000..b78762fadfb4
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx
@@ -0,0 +1,25 @@
+import useRestoreWorkspacesTabOnNavigate from '@hooks/useRestoreWorkspacesTabOnNavigate';
+
+import {useEffect} from 'react';
+
+import type {NativeTabNavigation} from './NativeTabLayout';
+
+type WorkspacesTabPressListenerProps = {
+    /** The Workspaces tab's own navigation. */
+    navigation: NativeTabNavigation;
+};
+
+/**
+ * Runs the Workspaces tab button's navigation for a tap on the native Workspaces tab, focused or not: it restores the
+ * last workspace or domain, falls back to the list for one that is gone, and keeps anonymous users out. It is its own
+ * component, so the policy and domain collections it reads re-render only this listener.
+ */
+function WorkspacesTabPressListener({navigation}: WorkspacesTabPressListenerProps) {
+    const navigateToWorkspaces = useRestoreWorkspacesTabOnNavigate();
+
+    useEffect(() => navigation.addListener('tabPress', navigateToWorkspaces), [navigation, navigateToWorkspaces]);
+
+    return null;
+}
+
+export default WorkspacesTabPressListener;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index e864e7f13531..fa55746b019c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -148,7 +148,7 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
     const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
     const canvasHeight = Math.ceil(label ? labelTop + labelHeight : rowSize);
 
-    const surface = Skia.Surface.MakeOffscreen(canvasWidth, canvasHeight);
+    const surface = Skia.Surface.Make(canvasWidth, canvasHeight);
     if (!surface) {
         return undefined;
     }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
index a5d450535e04..3cc992d09a9d 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
@@ -3,7 +3,8 @@ import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+
+import NAVIGATORS from '@src/NAVIGATORS';
 
 import type {ValueOf} from 'type-fest';
 
@@ -12,21 +13,35 @@ type NavigationTab = ValueOf<typeof NAVIGATION_TABS>;
 /** Tabs the JS tab buttons keep from anonymous users, who get the sign-in modal instead. */
 const ANONYMOUS_GATED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.SEARCH, NAVIGATION_TABS.INSIGHTS, NAVIGATION_TABS.SETTINGS]);
 
+/**
+ * Tabs switched by their own JS navigation rather than by the native selection, as their JS tab buttons do: Inbox opens
+ * at its chat list, and Workspaces restores the last workspace or falls back to the list.
+ */
+const JS_SWITCHED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.INBOX, NAVIGATION_TABS.WORKSPACES]);
+
 /**
  * What a tap on the native bar does on top of the tab switch, mirroring the JS tab buttons the native bar replaces.
- * Inbox opens at its chat list, so it is switched by JS navigation rather than by the native selection.
+ * Spend and Workspaces are handled by SpendTabPressListener and WorkspacesTabPressListener, which need Onyx data.
  */
 const NAVIGATION_TAB_PRESS_HANDLERS: Partial<Record<NavigationTab, () => void>> = {
     [NAVIGATION_TABS.INBOX]: navigateToInboxTab,
-    [NAVIGATION_TABS.SEARCH]: () => interceptAnonymousUser(startNavigateToReportsTabSpans),
     [NAVIGATION_TABS.INSIGHTS]: () => interceptAnonymousUser(() => {}),
     [NAVIGATION_TABS.SETTINGS]: () => interceptAnonymousUser(() => {}),
 };
 
+type NativeTabSelectionParams = {
+    isAnonymousUser: boolean;
+    /** Spend's first visit opens the latest search kept in Onyx, which the tab mounted at startup does not show yet. */
+    hasSpendBeenSelected: boolean;
+};
+
 /** Whether the native bar switches to the tab itself, or leaves the switch to the tab's press handler. */
-function isNativeTabSelectionEnabled(routeName: string, isAnonymousUser: boolean) {
+function isNativeTabSelectionEnabled(routeName: string, {isAnonymousUser, hasSpendBeenSelected}: NativeTabSelectionParams) {
+    if (routeName === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR && !hasSpendBeenSelected) {
+        return false;
+    }
     const tab = ROUTE_TO_NAVIGATION_TAB[routeName];
-    return tab !== NAVIGATION_TABS.INBOX && !(isAnonymousUser && ANONYMOUS_GATED_TABS.has(tab));
+    return !JS_SWITCHED_TABS.has(tab) && !(isAnonymousUser && ANONYMOUS_GATED_TABS.has(tab));
 }
 
 type TabScreenListenerProps = {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 8ab8500bf4d5..686535daa74e 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -32,9 +32,9 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
  * in the color of the selected tab, so each icon is drawn with its own colors, its status dot and its label. Both
  * selection states are images, because RNScreens rejects a tab whose icon and selectedIcon differ in type.
  */
-function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
+function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
     const theme = useTheme();
-    const avatar = useTabAvatarImage();
+    const avatar = useTabAvatarImage(isAccountAvatarShown);
 
     const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
index abfeb0175b61..41a9ac389e2e 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -30,10 +30,10 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
     labelFontSize: 0,
 };
 
-function useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels}: NativeTabBarOptionsParams) {
+function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const avatar = useTabAvatarImage();
+    const avatar = useTabAvatarImage(isAccountAvatarShown);
 
     // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
     const screenOptions: NativeBottomTabNavigationOptions = {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
index 2728ae0e274a..4091ff2f6522 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/types.ts
@@ -1,5 +1,7 @@
 type NativeTabBarOptionsParams = {
     shouldShowNativeTabBar: boolean;
+    /** Whether the account tab has an item in a narrow layout's bar, so its avatar is drawn. */
+    isAccountAvatarShown: boolean;
     dotColors: Record<string, string | undefined>;
     tabLabels: Record<string, string>;
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index 0d56423ac62a..f99a5108c89a 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -27,7 +27,7 @@ import type {NavigationAction, NavigationState, PartialState, Router, TabNavigat
 
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {isAnonymousSessionSelector} from '@selectors/Session';
-import {useEffect} from 'react';
+import {useEffect, useState} from 'react';
 
 import getTabWithoutBarItem from './getTabWithoutBarItem';
 
@@ -68,6 +68,11 @@ function useNativeTabNavigator() {
     // A tab with no item in the bar is drawn over the other tabs as a full screen, so the bar hides while it is focused.
     const isActiveTabWithoutBarItem = activeTabRoute?.name === tabWithoutBarItem;
     const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible && !isActiveTabWithoutBarItem;
+    const isSpendSelected = activeTabRoute?.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR;
+    const [hasSpendBeenSelected, setHasSpendBeenSelected] = useState(isSpendSelected);
+    if (isSpendSelected && !hasSpendBeenSelected) {
+        setHasSpendBeenSelected(true);
+    }
 
     let inboxDotColor: string | undefined;
     if (chatTabBrickRoad) {
@@ -134,7 +139,9 @@ function useNativeTabNavigator() {
         },
     });
 
-    return {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser};
+    const isAccountAvatarShown = shouldUseNarrowLayout && tabWithoutBarItem !== NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
+
+    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, hasSpendBeenSelected};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
index 075384c5fed9..0e97954f4866 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
@@ -13,23 +13,25 @@ type TabAvatarImage = {uri: string; image: SkImage};
 let lastDecodedAvatar: TabAvatarImage | undefined;
 
 /**
- * The current user's avatar, decoded once per URI for the account tab icon. Until it is decoded, and for avatars that
- * are not a remote image, the account glyph stands in.
+ * The current user's avatar, decoded once per URI for the account tab icon while that icon is shown. Until it is
+ * decoded, and for avatars that are not a remote image, the account glyph stands in.
  */
-function useTabAvatarImage(): TabAvatarImage | undefined {
+function useTabAvatarImage(isShown: boolean): TabAvatarImage | undefined {
     const {avatar, accountID} = useCurrentUserPersonalDetails();
     const avatarSource = getAvatarURL({avatarSource: avatar, accountID});
     const uri = typeof avatarSource === 'string' ? avatarSource : undefined;
     const [decodedAvatar, setDecodedAvatar] = useState(lastDecodedAvatar);
+    const decodedUri = decodedAvatar?.uri;
 
     useEffect(() => {
-        if (!uri || decodedAvatar?.uri === uri) {
+        if (!isShown || !uri || decodedUri === uri) {
             return;
         }
         let isActive = true;
         Skia.Data.fromURI(uri)
             .then((data) => {
                 const image = Skia.Image.MakeImageFromEncoded(data);
+                data.dispose();
                 if (!image) {
                     return;
                 }
@@ -43,9 +45,7 @@ function useTabAvatarImage(): TabAvatarImage | undefined {
         return () => {
             isActive = false;
         };
-        // Only a new URI needs decoding; the decoded avatar is compared to skip one that is already decoded.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [uri]);
+    }, [isShown, uri, decodedUri]);
 
     return decodedAvatar?.uri === uri ? decodedAvatar : undefined;
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 9a537675168b..e46af455278f 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -35,11 +35,11 @@ const HIDDEN_TAB_OPTIONS = {tabBarItemHidden: true};
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
-    const {shouldShowNativeTabBar, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser} = useNativeTabNavigator();
-    const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, dotColors, tabLabels});
+    const {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, hasSpendBeenSelected} = useNativeTabNavigator();
+    const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels});
     // A tab with no bar item draws no icon.
     const getOptions = (name: NativeTabName) =>
-        name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, isAnonymousUser)};
+        name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, {isAnonymousUser, hasSpendBeenSelected})};
 
     return (
         <Tab.Navigator
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index e888e550a96d..184cbaa2f574 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -6,6 +6,7 @@ import {usePlaybackActionsContext} from '@components/VideoPlayerContexts/Playbac
 import useDocumentTitle from '@hooks/useDocumentTitle';
 import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
 import useHasFilterBars from '@hooks/useHasFilterBars';
+import useHasTabBeenShown from '@hooks/useHasTabBeenShown';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import {PaymentContextProvider} from '@hooks/usePaymentContext';
@@ -25,6 +26,7 @@ import {isQueryARefinement} from '@libs/SearchQueryRefinement';
 import {isSearchDataLoaded} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
 import type SCREENS from '@src/SCREENS';
 import type {SearchResults} from '@src/types/onyx';
 
@@ -51,7 +53,10 @@ function SearchPage({route}: SearchPageProps) {
 
     const [lastNonEmptySearchResults, setLastNonEmptySearchResults] = useState<SearchResults | undefined>(undefined);
 
-    useSearchPageSetup(currentSearchQueryJSON);
+    // Until Spend is first shown, it neither requests a search nor saves its default query over the latest search that the
+    // Spend tab reopens.
+    const hasSpendBeenShown = useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+    useSearchPageSetup(hasSpendBeenShown ? currentSearchQueryJSON : undefined);
     useSeedMyExpensesSearch();
     useReleaseOptionListCaches();
 
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 089c655f2050..f4989443a0b0 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -13,6 +13,7 @@ import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentU
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
+import useHasTabBeenShown from '@hooks/useHasTabBeenShown';
 import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -90,9 +91,13 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
         Navigation.clearPreloadedRoutes();
     }, [hasAccountBeenSwitched]);
 
+    const hasAccountBeenShown = useHasTabBeenShown(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR);
     useEffect(() => {
+        if (!hasAccountBeenShown) {
+            return;
+        }
         openInitialSettingsPage();
-    }, []);
+    }, [hasAccountBeenShown]);
 
     const getMenuItemsSection = (menuItemsData: MenuSection, sectionStyle: StyleProp<ViewStyle>) => {
         return (
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 0c3aab949e1a..6b9da58c6a12 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -2,6 +2,7 @@ import type {NavBarButtonStyle} from '@libs/NavBarManager/types';
 
 import type CONST from '@src/CONST';
 
+import type {ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 import type {ColorScheme, StatusBarStyle} from '..';
@@ -67,7 +68,8 @@ type ThemeColors = {
     sidebarHover: Color;
     floatingTabBarSelectedBG: Color;
     androidTabBarActiveIndicatorBG: Color;
-    androidTabBarShadow: Color;
+    /** A CSS box-shadow, not a color. */
+    androidTabBarShadow: NonNullable<ViewStyle['boxShadow']>;
     heading: Color;
     textLight: Color;
     textDark: Color;
diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index a5cef1a0dfff..a0a0d8959c4e 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -67,6 +67,8 @@ jest.mock('@userActions/App', () => ({
 
 jest.mock('@libs/Navigation/helpers/useIsSidebarRouteActive', () => jest.fn(() => false));
 
+jest.mock('@hooks/useHasTabBeenShown', () => jest.fn(() => true));
+
 jest.mock('@hooks/useSubscriptionPlan', () => jest.fn(() => null));
 
 jest.mock('@components/AccountSwitcher', () => {
diff --git a/tests/unit/nativeTabScreenListenersTest.ts b/tests/unit/nativeTabScreenListenersTest.ts
index 964dd46201f7..5a38a08f2a35 100644
--- a/tests/unit/nativeTabScreenListenersTest.ts
+++ b/tests/unit/nativeTabScreenListenersTest.ts
@@ -2,17 +2,12 @@ import navigateToInboxTab from '@components/Navigation/NavigationTabBar/navigate
 
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import tabScreenListeners, {isNativeTabSelectionEnabled} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners';
-import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
 
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 jest.mock('@components/Navigation/NavigationTabBar/navigateToInboxTab', () => jest.fn());
 jest.mock('@libs/interceptAnonymousUser', () => jest.fn((callback: () => void) => callback()));
-jest.mock('@libs/telemetry/startTabNavigationSpans', () => ({
-    startNavigateToInboxTabSpan: jest.fn(),
-    startNavigateToReportsTabSpans: jest.fn(),
-}));
 
 function pressTab(routeName: string, isFocused: boolean) {
     tabScreenListeners({route: {name: routeName}, navigation: {isFocused: () => isFocused}}).tabPress();
@@ -32,37 +27,47 @@ describe('tabScreenListeners', () => {
         expect(navigateToInboxTab).toHaveBeenCalledTimes(1);
     });
 
-    it('checks for an anonymous user before starting the Spend spans', () => {
-        // Given the native bar, which never renders SearchTabButton
-        // When the user presses Spend while another tab is focused
-        pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, false);
+    it('checks for an anonymous user when Account is pressed from another tab', () => {
+        // Given the native bar, which never renders the JS Account button that keeps anonymous users out
+        // When the user presses Account while another tab is focused
+        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, false);
 
-        // Then the spans start behind the same anonymous user check the JS tab button uses
-        expect(interceptAnonymousUser).toHaveBeenCalledWith(startNavigateToReportsTabSpans);
-        expect(startNavigateToReportsTabSpans).toHaveBeenCalledTimes(1);
+        // Then the same anonymous user check runs
+        expect(interceptAnonymousUser).toHaveBeenCalledTimes(1);
     });
 
     it('does nothing when the already focused tab is pressed again', () => {
         // Given native tabs also emit tabPress for a tap on the focused tab
-        // When the user presses Inbox and Spend while each is already focused
+        // When the user presses Inbox and Account while each is already focused
         pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, true);
-        pressTab(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, true);
+        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, true);
 
         // Then nothing runs, the same as a JS tab button pressed on its own tab
         expect(navigateToInboxTab).not.toHaveBeenCalled();
         expect(interceptAnonymousUser).not.toHaveBeenCalled();
     });
 
-    it('leaves the switch to JS only for Inbox and, for anonymous users, the tabs they are kept from', () => {
-        // Given the tabs whose press has to run JS before any switch
-        // When the native selection is decided for a signed-in and for an anonymous user
-        // Then Inbox is always switched by JS, and Spend, Insights and Account only for an anonymous user
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, false)).toBe(false);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, false)).toBe(true);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, true)).toBe(false);
-        expect(isNativeTabSelectionEnabled(SCREENS.INSIGHTS, true)).toBe(false);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, true)).toBe(false);
-        expect(isNativeTabSelectionEnabled(SCREENS.HOME, true)).toBe(true);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, true)).toBe(true);
+    it('leaves the switch to JS for Inbox and Workspaces and, for anonymous users, the tabs they are kept from', () => {
+        // Given a signed-in and an anonymous user who have both already been to Spend
+        const signedIn = {isAnonymousUser: false, hasSpendBeenSelected: true};
+        const anonymous = {isAnonymousUser: true, hasSpendBeenSelected: true};
+
+        // When the native selection is decided for each tab
+        // Then Inbox and Workspaces are always switched by JS, and Spend, Insights and Account only for an anonymous user
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, signedIn)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, signedIn)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, signedIn)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, anonymous)).toBe(false);
+        expect(isNativeTabSelectionEnabled(SCREENS.INSIGHTS, anonymous)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, anonymous)).toBe(false);
+        expect(isNativeTabSelectionEnabled(SCREENS.HOME, anonymous)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, anonymous)).toBe(false);
+    });
+
+    it('leaves the first switch to Spend to JS', () => {
+        // Given a signed-in user who has not been to Spend yet, whose tab was mounted at startup with the default search
+        // When the native selection is decided for Spend
+        // Then JS switches to it, so the first visit opens the latest search kept in Onyx as the JS tab button does
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, {isAnonymousUser: false, hasSpendBeenSelected: false})).toBe(false);
     });
 });
diff --git a/tests/unit/useHasTabBeenShownTest.ts b/tests/unit/useHasTabBeenShownTest.ts
new file mode 100644
index 000000000000..8317bb3d88e4
--- /dev/null
+++ b/tests/unit/useHasTabBeenShownTest.ts
@@ -0,0 +1,83 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useHasTabBeenShown from '@hooks/useHasTabBeenShown';
+import useRootNavigationState from '@hooks/useRootNavigationState';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type {NavigationState} from '@react-navigation/native';
+
+jest.mock('@hooks/useRootNavigationState', () => jest.fn());
+
+const mockedUseRootNavigationState = jest.mocked(useRootNavigationState);
+
+let rootState: NavigationState | undefined;
+
+function buildRootState(selectedTab: string): NavigationState {
+    const tabRoutes = [SCREENS.HOME, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR].map((name) => ({key: `${name}-key`, name}));
+    return {
+        stale: false,
+        type: 'stack',
+        key: 'root-key',
+        index: 0,
+        routeNames: [NAVIGATORS.TAB_NAVIGATOR],
+        routes: [
+            {
+                key: 'tab-navigator-key',
+                name: NAVIGATORS.TAB_NAVIGATOR,
+                state: {
+                    stale: false,
+                    type: 'tab',
+                    key: 'tab-key',
+                    index: tabRoutes.findIndex((route) => route.name === selectedTab),
+                    routeNames: tabRoutes.map((route) => route.name),
+                    routes: tabRoutes,
+                },
+            },
+        ],
+    } as NavigationState;
+}
+
+describe('useHasTabBeenShown', () => {
+    beforeEach(() => {
+        mockedUseRootNavigationState.mockImplementation((selector) => selector(rootState));
+    });
+
+    it('stays false while the tab is mounted in the background', () => {
+        // Given native tabs that mounted Spend at startup while Home is selected
+        rootState = buildRootState(SCREENS.HOME);
+
+        // When Spend's page reads whether it has been shown
+        const {result} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR));
+
+        // Then it has not, so the page holds back what it requests on mount
+        expect(result.current).toBe(false);
+    });
+
+    it('stays true once the tab has been selected, after the user leaves it', () => {
+        // Given Spend mounted in the background
+        rootState = buildRootState(SCREENS.HOME);
+        const {result, rerender} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR));
+
+        // When the user selects Spend and then goes back to Home
+        rootState = buildRootState(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+        rerender({});
+        rootState = buildRootState(SCREENS.HOME);
+        rerender({});
+
+        // Then Spend counts as shown, so its page keeps reacting to its query like a page mounted with the tab
+        expect(result.current).toBe(true);
+    });
+
+    it('is true before navigation is ready', () => {
+        // Given no navigation state yet, as when the page mounts with the tab on web
+        rootState = undefined;
+
+        // When the page reads whether its tab has been shown
+        const {result} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR));
+
+        // Then it counts as shown, so nothing is held back when the tab is not a background one
+        expect(result.current).toBe(true);
+    });
+});

From 61a832a1b6def0c71ba4b04b34a11062378fd5d0 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 17:04:11 +0200
Subject: [PATCH 302/781] fix: mock native tab icons under the Skia jest mock,
 platform hook types as type defaults, inline Android bar height

---
 jest/setup.ts                                              | 4 ++++
 .../useTabRootScreenWrapperProps/index.android.tsx         | 2 +-
 .../useTabRootScreenWrapperProps/index.ios.tsx             | 2 +-
 .../useTabRootScreenWrapperProps/index.tsx                 | 2 +-
 .../useTabRootScreenWrapperProps/types.ts                  | 3 +--
 .../useTabRootScrollProps/index.native.tsx                 | 2 +-
 .../TabBarBottomContent/useTabRootScrollProps/index.tsx    | 2 +-
 .../TabBarBottomContent/useTabRootScrollProps/types.ts     | 3 +--
 src/styles/variables.ts                                    | 7 +++----
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/jest/setup.ts b/jest/setup.ts
index 9afaa8f219a1..951ef6577055 100644
--- a/jest/setup.ts
+++ b/jest/setup.ts
@@ -355,6 +355,10 @@ jest.mock('@shopify/react-native-skia', () => ({
     listFontFamilies: jest.fn(() => []),
 }));
 
+// The native tab bar icons are drawn with Skia's imperative API, which the mock above leaves out, so the tabs get no icons.
+jest.mock('@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer', () => jest.fn(() => undefined));
+jest.mock('@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage', () => jest.fn(() => undefined));
+
 jest.mock('@sbaiahmed1/react-native-biometrics', () => ({
     isSensorAvailable: jest.fn(() => Promise.resolve({available: false})),
     createKeys: jest.fn(() => Promise.resolve({publicKey: ''})),
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
index 888cb620fc4d..eec0c28909ad 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
@@ -7,7 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import React from 'react';
 import {View} from 'react-native';
 
-import type {UseTabRootScreenWrapperProps} from './types';
+import type UseTabRootScreenWrapperProps from './types';
 
 /**
  * Material's bar is drawn over the full-height tab screen, so a narrow tab root screen reserves the bar's row under its
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 300d65a857ce..daf68dba45ab 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,6 +1,6 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import type {UseTabRootScreenWrapperProps} from './types';
+import type UseTabRootScreenWrapperProps from './types';
 
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index ecf13966f9f0..03efdffbd947 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -3,7 +3,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
 
-import type {UseTabRootScreenWrapperProps} from './types';
+import type UseTabRootScreenWrapperProps from './types';
 
 import TabBarBottomContent from '..';
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index 0a371761226f..f9c3518d6824 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -5,5 +5,4 @@ type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomConten
 
 type UseTabRootScreenWrapperProps = (selectedTab: TabBarBottomContentProps['selectedTab']) => TabRootScreenWrapperProps;
 
-export default TabRootScreenWrapperProps;
-export type {UseTabRootScreenWrapperProps};
+export default UseTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
index 4217cc7534fe..563fea8b3b56 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
@@ -1,4 +1,4 @@
-import type {UseTabRootScrollProps} from './types';
+import type UseTabRootScrollProps from './types';
 
 /**
  * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index 109b00972f09..c7db6bceef17 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -3,7 +3,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import variables from '@styles/variables';
 
-import type {UseTabRootScrollProps} from './types';
+import type UseTabRootScrollProps from './types';
 
 /**
  * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
index 460d2c42ce86..790b2f40efe7 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
@@ -5,5 +5,4 @@ type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'conte
 /** A list that already adds the bottom safe area passes `hasBottomSafeAreaPadding`, so the safe area is not added twice. */
 type UseTabRootScrollProps = (style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding?: boolean) => TabRootScrollProps;
 
-export default TabRootScrollProps;
-export type {UseTabRootScrollProps};
+export default UseTabRootScrollProps;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 0183243a8db6..a86fce69cfcd 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -31,7 +31,6 @@ const avatarSizes = {
 
 const floatingTabBarHeight = 60;
 const floatingTabBarBottomInset = 8;
-const androidNativeTabBarHeight = 80;
 
 export default {
     bottomTabHeight: 72,
@@ -123,9 +122,9 @@ export default {
     /** Gap between the glyph and the label drawn under it in an iOS native tab bar icon. */
     nativeTabIconLabelGap: 6,
     /** Material's BottomNavigationView row, without the gesture inset under it. */
-    androidNativeTabBarHeight,
-    /** Material's bar row plus the 16 dp Material keeps between a FAB and the bar. */
-    androidNativeTabBarFloatingButtonsBottom: androidNativeTabBarHeight + 16,
+    androidNativeTabBarHeight: 80,
+    /** Material's bar row (androidNativeTabBarHeight) plus the 16 dp Material keeps between a FAB and the bar. */
+    androidNativeTabBarFloatingButtonsBottom: 96,
     /** UITabBar's row above the home indicator inset, plus the gap to the floating buttons. */
     iosNativeTabBarFloatingButtonsBottom: 50,
     iconHeader: 48,

From 412eefe971662f8f2d36087c1235a032175c48e5 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 17:21:24 +0200
Subject: [PATCH 303/781] refactor: one listener for the native Spend and
 Workspaces taps, platform hook typing reverted, tests cut to one per fix

---
 .../index.android.tsx                         |  7 +-
 .../index.ios.tsx                             |  6 +-
 .../useTabRootScreenWrapperProps/index.tsx    |  8 +-
 .../useTabRootScreenWrapperProps/types.ts     |  5 +-
 .../useTabRootScrollProps/index.native.tsx    |  8 +-
 .../useTabRootScrollProps/index.tsx           | 11 ++-
 .../useTabRootScrollProps/types.ts            |  7 +-
 .../NativeTabNavigator/NativeTabLayout.tsx    | 27 ++-----
 .../SpendTabPressListener.tsx                 | 53 --------------
 .../NativeTabNavigator/TabPressListeners.tsx  | 58 +++++++++++++++
 .../WorkspacesTabPressListener.tsx            | 25 -------
 .../NativeTabNavigator/tabScreenListeners.ts  |  2 +-
 tests/unit/SplitRouterTest.ts                 | 73 ++++---------------
 tests/unit/nativeTabScreenListenersTest.ts    | 60 ++++-----------
 tests/unit/useHasTabBeenShownTest.ts          | 70 +++---------------
 15 files changed, 132 insertions(+), 288 deletions(-)
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
 delete mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
index eec0c28909ad..0ecf905ca0d3 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.android.tsx
@@ -1,4 +1,5 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 
 import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -7,13 +8,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import React from 'react';
 import {View} from 'react-native';
 
-import type UseTabRootScreenWrapperProps from './types';
+import type TabRootScreenWrapperProps from './types';
 
 /**
  * Material's bar is drawn over the full-height tab screen, so a narrow tab root screen reserves the bar's row under its
  * content, and the ScreenWrapper adds the gesture inset the bar sits on below it. Account drawn over the tabs hides the bar.
  */
-const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab) => {
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
     const styles = useThemeStyles();
@@ -23,6 +24,6 @@ const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab)
     }
 
     return {bottomContent: <View style={styles.androidNativeTabBarSpacer} />};
-};
+}
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index daf68dba45ab..c7d86f32d2c4 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,14 +1,14 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import type UseTabRootScreenWrapperProps from './types';
+import type TabRootScreenWrapperProps from './types';
 
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
  * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar.
  */
-const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = () => {
+function useTabRootScreenWrapperProps(): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false} : {};
-};
+}
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 03efdffbd947..5621ca35e2fd 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -1,9 +1,11 @@
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
 
-import type UseTabRootScreenWrapperProps from './types';
+import type TabRootScreenWrapperProps from './types';
 
 import TabBarBottomContent from '..';
 
@@ -11,7 +13,7 @@ import TabBarBottomContent from '..';
  * On narrow layouts the floating tab bar is laid over the bottom of a tab root screen, so the content runs under it
  * down to the bottom edge of the screen. Each tab root's list ends with room for the bar.
  */
-const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab) => {
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
 
@@ -19,6 +21,6 @@ const useTabRootScreenWrapperProps: UseTabRootScreenWrapperProps = (selectedTab)
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
         bottomContentStyle: shouldUseNarrowLayout ? styles.floatingTabBarOverlay : styles.overflowVisible,
     };
-};
+}
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index f9c3518d6824..dab83f0477d5 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -1,8 +1,5 @@
-import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
 import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
 
 type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'>;
 
-type UseTabRootScreenWrapperProps = (selectedTab: TabBarBottomContentProps['selectedTab']) => TabRootScreenWrapperProps;
-
-export default UseTabRootScreenWrapperProps;
+export default TabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
index 563fea8b3b56..65aaa5912a7a 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
@@ -1,9 +1,13 @@
-import type UseTabRootScrollProps from './types';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import type TabRootScrollProps from './types';
 
 /**
  * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
  * the bar's row below the content, so the content container keeps its style.
  */
-const useTabRootScrollProps: UseTabRootScrollProps = (style) => ({contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'});
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps {
+    return {contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'};
+}
 
 export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index c7db6bceef17..c75a5c774fc8 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -3,13 +3,16 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import variables from '@styles/variables';
 
-import type UseTabRootScrollProps from './types';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import type TabRootScrollProps from './types';
 
 /**
  * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
- * room for the bar, letting its last row scroll out from under it.
+ * room for the bar, letting its last row scroll out from under it. A list that already adds the bottom safe area
+ * passes `hasBottomSafeAreaPadding`, so the safe area is not added twice.
  */
-const useTabRootScrollProps: UseTabRootScrollProps = (style, hasBottomSafeAreaPadding = false) => {
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): TabRootScrollProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const insetStyle = useBottomSafeSafeAreaPaddingStyle({
         style,
@@ -19,6 +22,6 @@ const useTabRootScrollProps: UseTabRootScrollProps = (style, hasBottomSafeAreaPa
     });
 
     return {contentContainerStyle: shouldUseNarrowLayout ? insetStyle : style};
-};
+}
 
 export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
index 790b2f40efe7..61dc387fad90 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
@@ -1,8 +1,5 @@
-import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
+import type {ScrollViewProps} from 'react-native';
 
 type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
 
-/** A list that already adds the bottom safe area passes `hasBottomSafeAreaPadding`, so the safe area is not added twice. */
-type UseTabRootScrollProps = (style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding?: boolean) => TabRootScrollProps;
-
-export default UseTabRootScrollProps;
+export default TabRootScrollProps;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index f60d00a097b1..8dc42d5dfe64 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -14,7 +14,6 @@ import TabNavigatorBar from '@libs/Navigation/AppNavigator/Navigators/TabNavigat
 import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
 import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
@@ -25,15 +24,11 @@ import {StyleSheet, View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
 import NativeTabBarShadow from './NativeTabBarShadow';
-import SpendTabPressListener from './SpendTabPressListener';
+import TabPressListeners from './TabPressListeners';
 import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
-import WorkspacesTabPressListener from './WorkspacesTabPressListener';
 
 type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
 
-/** A tab's own navigation, which receives the tab's `tabPress` events. */
-type NativeTabNavigation = NativeTabLayoutProps['descriptors'][string]['navigation'];
-
 function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
@@ -43,13 +38,6 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     // The buttons follow whatever the navigator decided for the bar itself.
     const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
-    const getTabDescriptor = (routeName: string) => {
-        const route = state.routes.find((tabRoute) => tabRoute.name === routeName);
-        return route ? descriptors[route.key] : undefined;
-    };
-    const spendNavigation = getTabDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)?.navigation;
-    const spendOptions = getTabDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)?.options;
-    const workspacesNavigation = getTabDescriptor(NAVIGATORS.WORKSPACE_NAVIGATOR)?.navigation;
 
     if (!shouldUseNarrowLayout) {
         return (
@@ -63,13 +51,10 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     return (
         <View style={styles.flex1}>
             {children}
-            {!!spendNavigation && (
-                <SpendTabPressListener
-                    navigation={spendNavigation}
-                    isSwitchedByJS={spendOptions?.tabBarSelectionEnabled === false}
-                />
-            )}
-            {!!workspacesNavigation && <WorkspacesTabPressListener navigation={workspacesNavigation} />}
+            <TabPressListeners
+                state={state}
+                descriptors={descriptors}
+            />
             {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
             {shouldShowNativeTabBar && (
                 // The shadow and the buttons belong to the bar, so they fade with it rather than appearing in place.
@@ -98,4 +83,4 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
 }
 
 export default NativeTabLayout;
-export type {NativeTabLayoutProps, NativeTabNavigation};
+export type {NativeTabLayoutProps};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
deleted file mode 100644
index 9b540106dfc1..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/SpendTabPressListener.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import {getStoredSearchTabRoute} from '@components/Navigation/NavigationTabBar/getSearchTabRoute';
-
-import useOnyx from '@hooks/useOnyx';
-
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import Navigation from '@libs/Navigation/Navigation';
-import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
-
-import ONYXKEYS from '@src/ONYXKEYS';
-import {lastExpensesSearchQuerySelector} from '@src/selectors/SearchFilters';
-
-import {useEffect} from 'react';
-
-import type {NativeTabNavigation} from './NativeTabLayout';
-
-type SpendTabPressListenerProps = {
-    /** The Spend tab's own navigation. */
-    navigation: NativeTabNavigation;
-
-    /** Whether the native bar leaves the switch to Spend to this listener, until Spend is first selected. */
-    isSwitchedByJS: boolean;
-};
-
-/**
- * Runs the Spend tab button's navigation for a tap on the native Spend tab. The first visit opens the latest search kept
- * in Onyx, as the JS tab button does, because the tab mounted at startup shows the default one; later visits are switched
- * natively and only start the spans. It is its own component, so the search data it reads re-renders only this listener.
- */
-function SpendTabPressListener({navigation, isSwitchedByJS}: SpendTabPressListenerProps) {
-    const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY);
-    const [lastExpensesSearchQuery] = useOnyx(ONYXKEYS.SEARCH_FILTERS, {selector: lastExpensesSearchQuerySelector});
-
-    useEffect(
-        () =>
-            navigation.addListener('tabPress', () => {
-                if (navigation.isFocused()) {
-                    return;
-                }
-                interceptAnonymousUser(() => {
-                    startNavigateToReportsTabSpans();
-                    if (!isSwitchedByJS) {
-                        return;
-                    }
-                    Navigation.navigate(getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery));
-                });
-            }),
-        [navigation, isSwitchedByJS, lastSearchParams, lastExpensesSearchQuery],
-    );
-
-    return null;
-}
-
-export default SpendTabPressListener;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
new file mode 100644
index 000000000000..50fa3f285e8d
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
@@ -0,0 +1,58 @@
+import {getStoredSearchTabRoute} from '@components/Navigation/NavigationTabBar/getSearchTabRoute';
+
+import useOnyx from '@hooks/useOnyx';
+import useRestoreWorkspacesTabOnNavigate from '@hooks/useRestoreWorkspacesTabOnNavigate';
+
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {lastExpensesSearchQuerySelector} from '@src/selectors/SearchFilters';
+
+import {useEffect} from 'react';
+
+import type {NativeTabLayoutProps} from './NativeTabLayout';
+
+/**
+ * The native bar's taps on Spend and Workspaces, which run the JS tab buttons' navigation and need Onyx data, so the
+ * data re-renders only this component. Spend's first visit opens the latest search kept in Onyx, because the tab
+ * mounted at startup shows the default one. Workspaces restores the last workspace, or the list for one that is gone.
+ */
+function TabPressListeners({state, descriptors}: Pick<NativeTabLayoutProps, 'state' | 'descriptors'>) {
+    const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY);
+    const [lastExpensesSearchQuery] = useOnyx(ONYXKEYS.SEARCH_FILTERS, {selector: lastExpensesSearchQuerySelector});
+    const navigateToWorkspaces = useRestoreWorkspacesTabOnNavigate();
+    const getDescriptor = (routeName: string) => {
+        const route = state.routes.find((tabRoute) => tabRoute.name === routeName);
+        return route ? descriptors[route.key] : undefined;
+    };
+    const spendDescriptor = getDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+    const spendNavigation = spendDescriptor?.navigation;
+    const isSpendSwitchedByJS = spendDescriptor?.options.tabBarSelectionEnabled === false;
+    const workspacesNavigation = getDescriptor(NAVIGATORS.WORKSPACE_NAVIGATOR)?.navigation;
+
+    useEffect(
+        () =>
+            spendNavigation?.addListener('tabPress', () => {
+                if (spendNavigation.isFocused()) {
+                    return;
+                }
+                interceptAnonymousUser(() => {
+                    startNavigateToReportsTabSpans();
+                    if (isSpendSwitchedByJS) {
+                        Navigation.navigate(getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery));
+                    }
+                });
+            }),
+        [spendNavigation, isSpendSwitchedByJS, lastSearchParams, lastExpensesSearchQuery],
+    );
+
+    // Runs on the focused tab too, where it returns from a workspace to the list.
+    useEffect(() => workspacesNavigation?.addListener('tabPress', navigateToWorkspaces), [workspacesNavigation, navigateToWorkspaces]);
+
+    return null;
+}
+
+export default TabPressListeners;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx
deleted file mode 100644
index b78762fadfb4..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/WorkspacesTabPressListener.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import useRestoreWorkspacesTabOnNavigate from '@hooks/useRestoreWorkspacesTabOnNavigate';
-
-import {useEffect} from 'react';
-
-import type {NativeTabNavigation} from './NativeTabLayout';
-
-type WorkspacesTabPressListenerProps = {
-    /** The Workspaces tab's own navigation. */
-    navigation: NativeTabNavigation;
-};
-
-/**
- * Runs the Workspaces tab button's navigation for a tap on the native Workspaces tab, focused or not: it restores the
- * last workspace or domain, falls back to the list for one that is gone, and keeps anonymous users out. It is its own
- * component, so the policy and domain collections it reads re-render only this listener.
- */
-function WorkspacesTabPressListener({navigation}: WorkspacesTabPressListenerProps) {
-    const navigateToWorkspaces = useRestoreWorkspacesTabOnNavigate();
-
-    useEffect(() => navigation.addListener('tabPress', navigateToWorkspaces), [navigation, navigateToWorkspaces]);
-
-    return null;
-}
-
-export default WorkspacesTabPressListener;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
index 3cc992d09a9d..07534edf8143 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
@@ -21,7 +21,7 @@ const JS_SWITCHED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.INBOX, NAVIGATI
 
 /**
  * What a tap on the native bar does on top of the tab switch, mirroring the JS tab buttons the native bar replaces.
- * Spend and Workspaces are handled by SpendTabPressListener and WorkspacesTabPressListener, which need Onyx data.
+ * Spend and Workspaces are handled by TabPressListeners, which need Onyx data.
  */
 const NAVIGATION_TAB_PRESS_HANDLERS: Partial<Record<NavigationTab, () => void>> = {
     [NAVIGATION_TABS.INBOX]: navigateToInboxTab,
diff --git a/tests/unit/SplitRouterTest.ts b/tests/unit/SplitRouterTest.ts
index 04429342cbff..024c1bb67095 100644
--- a/tests/unit/SplitRouterTest.ts
+++ b/tests/unit/SplitRouterTest.ts
@@ -3,77 +3,32 @@ import SplitRouter from '@libs/Navigation/AppNavigator/createSplitNavigator/Spli
 
 import SCREENS from '@src/SCREENS';
 
-import type {ParamListBase, RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
+import type {ParamListBase, StackNavigationState} from '@react-navigation/native';
 
 import {CommonActions} from '@react-navigation/native';
 
 jest.mock('@libs/getIsNarrowLayout', () => jest.fn());
 
-const mockedGetIsNarrowLayout = jest.mocked(getIsNarrowLayout);
-
-const ROUTE_NAMES = [SCREENS.INBOX, SCREENS.REPORT];
-
-const CONFIG_OPTIONS: RouterConfigOptions = {
-    routeNames: ROUTE_NAMES,
-    routeParamList: {},
-    routeGetIdList: {},
-};
-
-const router = SplitRouter({
-    sidebarScreen: SCREENS.INBOX,
-    defaultCentralScreen: SCREENS.REPORT,
-    parentRoute: {key: 'ReportsSplitNavigator-key', name: 'ReportsSplitNavigator'},
-});
-
-function buildState(routeNames: string[]): StackNavigationState<ParamListBase> {
-    return {
-        stale: false,
-        type: 'stack',
-        key: 'stack-key',
-        index: routeNames.length - 1,
-        routeNames: ROUTE_NAMES,
-        preloadedRoutes: [],
-        routes: routeNames.map((name) => ({key: `${name}-key`, name})),
-    };
-}
-
 describe('SplitRouter', () => {
-    beforeEach(() => {
-        mockedGetIsNarrowLayout.mockReturnValue(true);
-    });
-
     it('handles navigating to the sidebar on a narrow layout when the sidebar is already the only screen', () => {
         // Given a narrow layout split navigator that shows only its sidebar, as the Inbox tab does at its chat list
-        const state = buildState([SCREENS.INBOX]);
+        jest.mocked(getIsNarrowLayout).mockReturnValue(true);
+        const router = SplitRouter({sidebarScreen: SCREENS.INBOX, defaultCentralScreen: SCREENS.REPORT, parentRoute: {key: 'split-key', name: 'ReportsSplitNavigator'}});
+        const routeNames = [SCREENS.INBOX, SCREENS.REPORT];
+        const state: StackNavigationState<ParamListBase> = {
+            stale: false,
+            type: 'stack',
+            key: 'stack-key',
+            index: 0,
+            routeNames,
+            preloadedRoutes: [],
+            routes: [{key: 'inbox-key', name: SCREENS.INBOX}],
+        };
 
         // When the sidebar is navigated to again, which happens when the tab's navigation params are applied to an already mounted navigator
-        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
+        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), {routeNames, routeParamList: {}, routeGetIdList: {}});
 
         // Then the action is handled without changes, because an unhandled (null) result makes React Navigation log an error and ignore the navigation
         expect(result).toBe(state);
     });
-
-    it('pops back to the sidebar on a narrow layout when a central screen is on top of it', () => {
-        // Given a narrow layout split navigator with a report opened over the sidebar
-        const state = buildState([SCREENS.INBOX, SCREENS.REPORT]);
-
-        // When the sidebar is navigated to
-        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
-
-        // Then the report is popped so the sidebar is the only screen left
-        expect(result?.index).toBe(0);
-        expect(result?.routes.map((route) => route.name)).toEqual([SCREENS.INBOX]);
-    });
-
-    it('keeps the central screen on a wide layout when the sidebar is navigated to', () => {
-        // Given a wide layout split navigator, where the sidebar is drawn next to the report opened over it
-        mockedGetIsNarrowLayout.mockReturnValue(false);
-        const state = buildState([SCREENS.INBOX, SCREENS.REPORT]);
-
-        // When the sidebar is navigated to
-        const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX, undefined, {pop: true}), CONFIG_OPTIONS);
-
-        // Then nothing changes, because the sidebar is already visible and popping would close the report next to it
-        expect(result).toBe(state);
-    });
 });
diff --git a/tests/unit/nativeTabScreenListenersTest.ts b/tests/unit/nativeTabScreenListenersTest.ts
index 5a38a08f2a35..8b990fef099f 100644
--- a/tests/unit/nativeTabScreenListenersTest.ts
+++ b/tests/unit/nativeTabScreenListenersTest.ts
@@ -1,73 +1,39 @@
 import navigateToInboxTab from '@components/Navigation/NavigationTabBar/navigateToInboxTab';
 
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import tabScreenListeners, {isNativeTabSelectionEnabled} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners';
 
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 jest.mock('@components/Navigation/NavigationTabBar/navigateToInboxTab', () => jest.fn());
-jest.mock('@libs/interceptAnonymousUser', () => jest.fn((callback: () => void) => callback()));
-
-function pressTab(routeName: string, isFocused: boolean) {
-    tabScreenListeners({route: {name: routeName}, navigation: {isFocused: () => isFocused}}).tabPress();
-}
 
 describe('tabScreenListeners', () => {
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('opens the Inbox chat list when Inbox is pressed from another tab', () => {
+    it('opens the Inbox chat list only when Inbox is pressed from another tab', () => {
         // Given the native bar, whose Inbox selection is left to JS so that it opens at the chat list like InboxTabButton
-        // When the user presses Inbox while another tab is focused
-        pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, false);
-
-        // Then the shared Inbox navigation runs
-        expect(navigateToInboxTab).toHaveBeenCalledTimes(1);
-    });
+        const pressInbox = (isFocused: boolean) => tabScreenListeners({route: {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}, navigation: {isFocused: () => isFocused}}).tabPress();
 
-    it('checks for an anonymous user when Account is pressed from another tab', () => {
-        // Given the native bar, which never renders the JS Account button that keeps anonymous users out
-        // When the user presses Account while another tab is focused
-        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, false);
+        // When the user presses Inbox while it is focused and then from another tab
+        pressInbox(true);
+        pressInbox(false);
 
-        // Then the same anonymous user check runs
-        expect(interceptAnonymousUser).toHaveBeenCalledTimes(1);
-    });
-
-    it('does nothing when the already focused tab is pressed again', () => {
-        // Given native tabs also emit tabPress for a tap on the focused tab
-        // When the user presses Inbox and Account while each is already focused
-        pressTab(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, true);
-        pressTab(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, true);
-
-        // Then nothing runs, the same as a JS tab button pressed on its own tab
-        expect(navigateToInboxTab).not.toHaveBeenCalled();
-        expect(interceptAnonymousUser).not.toHaveBeenCalled();
+        // Then only the press from another tab runs the shared Inbox navigation, as the JS tab button does
+        expect(navigateToInboxTab).toHaveBeenCalledTimes(1);
     });
 
-    it('leaves the switch to JS for Inbox and Workspaces and, for anonymous users, the tabs they are kept from', () => {
-        // Given a signed-in and an anonymous user who have both already been to Spend
+    it('leaves to JS the switches whose JS tab buttons do more than switching', () => {
+        // Given a signed-in user who has been to Spend, one who has not, and an anonymous user
         const signedIn = {isAnonymousUser: false, hasSpendBeenSelected: true};
+        const beforeSpend = {isAnonymousUser: false, hasSpendBeenSelected: false};
         const anonymous = {isAnonymousUser: true, hasSpendBeenSelected: true};
 
-        // When the native selection is decided for each tab
-        // Then Inbox and Workspaces are always switched by JS, and Spend, Insights and Account only for an anonymous user
+        // When the native selection is decided
+        // Then Inbox and Workspaces are always switched by JS, Spend's first visit is, and anonymous users are kept from Spend, Insights and Account
         expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, signedIn)).toBe(false);
         expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, signedIn)).toBe(false);
         expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, signedIn)).toBe(true);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, anonymous)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, beforeSpend)).toBe(false);
         expect(isNativeTabSelectionEnabled(SCREENS.INSIGHTS, anonymous)).toBe(false);
         expect(isNativeTabSelectionEnabled(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, anonymous)).toBe(false);
         expect(isNativeTabSelectionEnabled(SCREENS.HOME, anonymous)).toBe(true);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, anonymous)).toBe(false);
-    });
-
-    it('leaves the first switch to Spend to JS', () => {
-        // Given a signed-in user who has not been to Spend yet, whose tab was mounted at startup with the default search
-        // When the native selection is decided for Spend
-        // Then JS switches to it, so the first visit opens the latest search kept in Onyx as the JS tab button does
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, {isAnonymousUser: false, hasSpendBeenSelected: false})).toBe(false);
     });
 });
diff --git a/tests/unit/useHasTabBeenShownTest.ts b/tests/unit/useHasTabBeenShownTest.ts
index 8317bb3d88e4..ab5d0105203b 100644
--- a/tests/unit/useHasTabBeenShownTest.ts
+++ b/tests/unit/useHasTabBeenShownTest.ts
@@ -10,74 +10,28 @@ import type {NavigationState} from '@react-navigation/native';
 
 jest.mock('@hooks/useRootNavigationState', () => jest.fn());
 
-const mockedUseRootNavigationState = jest.mocked(useRootNavigationState);
-
-let rootState: NavigationState | undefined;
-
-function buildRootState(selectedTab: string): NavigationState {
-    const tabRoutes = [SCREENS.HOME, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR].map((name) => ({key: `${name}-key`, name}));
-    return {
-        stale: false,
-        type: 'stack',
-        key: 'root-key',
-        index: 0,
-        routeNames: [NAVIGATORS.TAB_NAVIGATOR],
-        routes: [
-            {
-                key: 'tab-navigator-key',
-                name: NAVIGATORS.TAB_NAVIGATOR,
-                state: {
-                    stale: false,
-                    type: 'tab',
-                    key: 'tab-key',
-                    index: tabRoutes.findIndex((route) => route.name === selectedTab),
-                    routeNames: tabRoutes.map((route) => route.name),
-                    routes: tabRoutes,
-                },
-            },
-        ],
-    } as NavigationState;
+function buildRootState(selectedTabIndex: number): NavigationState {
+    const routeNames = [SCREENS.HOME, NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR];
+    const tabState: NavigationState = {stale: false, type: 'tab', key: 'tab', index: selectedTabIndex, routeNames, routes: routeNames.map((name) => ({key: name, name}))};
+    return {stale: false, type: 'stack', key: 'root', index: 0, routeNames: [NAVIGATORS.TAB_NAVIGATOR], routes: [{key: 'tabs', name: NAVIGATORS.TAB_NAVIGATOR, state: tabState}]};
 }
 
 describe('useHasTabBeenShown', () => {
-    beforeEach(() => {
-        mockedUseRootNavigationState.mockImplementation((selector) => selector(rootState));
-    });
-
-    it('stays false while the tab is mounted in the background', () => {
+    it('stays false for a background tab and true once the tab has been selected', () => {
         // Given native tabs that mounted Spend at startup while Home is selected
-        rootState = buildRootState(SCREENS.HOME);
-
-        // When Spend's page reads whether it has been shown
-        const {result} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR));
-
-        // Then it has not, so the page holds back what it requests on mount
-        expect(result.current).toBe(false);
-    });
-
-    it('stays true once the tab has been selected, after the user leaves it', () => {
-        // Given Spend mounted in the background
-        rootState = buildRootState(SCREENS.HOME);
+        let rootState = buildRootState(0);
+        jest.mocked(useRootNavigationState).mockImplementation((selector) => selector(rootState));
         const {result, rerender} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR));
+        const wasShownInBackground = result.current;
 
         // When the user selects Spend and then goes back to Home
-        rootState = buildRootState(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+        rootState = buildRootState(1);
         rerender({});
-        rootState = buildRootState(SCREENS.HOME);
+        rootState = buildRootState(0);
         rerender({});
 
-        // Then Spend counts as shown, so its page keeps reacting to its query like a page mounted with the tab
-        expect(result.current).toBe(true);
-    });
-
-    it('is true before navigation is ready', () => {
-        // Given no navigation state yet, as when the page mounts with the tab on web
-        rootState = undefined;
-
-        // When the page reads whether its tab has been shown
-        const {result} = renderHook(() => useHasTabBeenShown(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR));
-
-        // Then it counts as shown, so nothing is held back when the tab is not a background one
+        // Then Spend held back its mount work in the background and keeps it running after the user leaves it
+        expect(wasShownInBackground).toBe(false);
         expect(result.current).toBe(true);
     });
 });

From 38cbe0094c5bad7415f8d59a39822caa4aa13946 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Tue, 6 Oct 2026 18:27:56 +0200
Subject: [PATCH 304/781] feat: add handle indicator

---
 src/CONST/index.ts                            |   5 +-
 .../columnResize/ColumnResizeHandle/index.tsx |  38 ++++-
 .../columnResize/columnWidthExpressions.ts    |   8 ++
 .../columnResize/useColumnResize/index.ts     |  11 +-
 .../columnResize/useColumnResize/types.ts     |   2 +-
 .../useColumnResize/useResizeIndicator.ts     |  46 +++++-
 .../components/Table/useColumnResizeTest.ts   | 133 +++++++++++++++++-
 7 files changed, 224 insertions(+), 19 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index c27211d29f1f..b3ac5bbff3d4 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9301,9 +9301,12 @@ const CONST = {
             /** Width of the invisible drag strip centred on a column's edge. */
             HANDLE_HIT_WIDTH: 12,
 
-            /** Width of the line shown while a column's edge is dragged. */
+            /** Width of the line shown while a column's edge is dragged, and of the grip shown while its heading is hovered. */
             INDICATOR_WIDTH: 2,
 
+            /** How long, in ms, the grip takes to stretch into the line once its edge is pressed. */
+            INDICATOR_MORPH_DURATION: 150,
+
             /** Shown on the handle, and on the whole page mid-drag so it doesn't flicker once the pointer outruns the handle. */
             CURSOR: 'col-resize',
         },
diff --git a/src/components/Table/columnResize/ColumnResizeHandle/index.tsx b/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
index bb187fcbbd4f..8fd783334ff9 100644
--- a/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
+++ b/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
@@ -1,4 +1,10 @@
-import {RESIZE_INDICATOR_HEIGHT_VARIABLE, RESIZE_INDICATOR_OPACITY_VARIABLE, RESIZE_INDICATOR_TOP_VARIABLE} from '@components/Table/columnResize/columnWidthExpressions';
+import {
+    RESIZE_GRIP_HOVER_VARIABLE,
+    RESIZE_INDICATOR_DATA_ATTRIBUTE,
+    RESIZE_INDICATOR_HEIGHT_VARIABLE,
+    RESIZE_INDICATOR_OPACITY_VARIABLE,
+    RESIZE_INDICATOR_TOP_VARIABLE,
+} from '@components/Table/columnResize/columnWidthExpressions';
 import type {ColumnResizeHandleProps} from '@components/Table/columnResize/types';
 import {useTableContext} from '@components/Table/TableContext';
 
@@ -8,21 +14,34 @@ import CONST from '@src/CONST';
 
 import React from 'react';
 
-// A DOM `div` style, which the React Native style system can't type because of the custom property expressions.
-const INDICATOR_STYLE: React.CSSProperties = {
+// DOM `div` styles, which the React Native style system can't type because of the custom property expressions.
+// The handle centres both bars on the column edge.
+const BAR_STYLE: React.CSSProperties = {
     position: 'absolute',
+    width: CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH,
+};
+
+const GRIP_STYLE: React.CSSProperties = {
+    ...BAR_STYLE,
+    height: '100%',
+    borderRadius: CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH / 2,
+    // Hidden while the line shows, since the line grew out of it.
+    opacity: `calc(var(${RESIZE_GRIP_HOVER_VARIABLE}, 0) * (1 - var(${RESIZE_INDICATOR_OPACITY_VARIABLE}, 0)))`,
+    transition: `opacity ${CONST.TABLES.COLUMN_RESIZE.INDICATOR_MORPH_DURATION}ms`,
+};
+
+const INDICATOR_STYLE: React.CSSProperties = {
+    ...BAR_STYLE,
     // Spans heading row to lowest row, which the handle's box doesn't match, so both are measured.
     top: `var(${RESIZE_INDICATOR_TOP_VARIABLE}, 0px)`,
     height: `var(${RESIZE_INDICATOR_HEIGHT_VARIABLE}, 100%)`,
-    left: '50%',
-    marginLeft: -CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH / 2,
-    width: CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH,
     opacity: `var(${RESIZE_INDICATOR_OPACITY_VARIABLE}, 0)`,
+    // Keeps its height while hidden, so it would otherwise hand the rows below the header to the handle.
     pointerEvents: 'none',
 };
 
 /**
- * Drag the strip over a column's right edge. Carries the indicator line, so it moves with the column through drags and scrolls.
+ * Drag the strip over a column's right edge. Carries the grip and the indicator line, so they move with the column through drags and scrolls.
  * A plain `div` because it relies on DOM pointer capture.
  */
 function ColumnResizeHandle({columnKey}: ColumnResizeHandleProps) {
@@ -38,6 +57,11 @@ function ColumnResizeHandle({columnKey}: ColumnResizeHandleProps) {
         <div {...handleProps}>
             <div
                 aria-hidden
+                style={{...GRIP_STYLE, backgroundColor: theme.border}}
+            />
+            <div
+                aria-hidden
+                {...{[RESIZE_INDICATOR_DATA_ATTRIBUTE]: true}}
                 style={{...INDICATOR_STYLE, backgroundColor: theme.iconMenu}}
             />
         </div>
diff --git a/src/components/Table/columnResize/columnWidthExpressions.ts b/src/components/Table/columnResize/columnWidthExpressions.ts
index e5374af6acbd..ef50acef79e2 100644
--- a/src/components/Table/columnResize/columnWidthExpressions.ts
+++ b/src/components/Table/columnResize/columnWidthExpressions.ts
@@ -12,6 +12,12 @@ const RESIZE_INDICATOR_HEIGHT_VARIABLE = '--table-resize-indicator-height';
 /** Opacity of a handle's line, set on that handle so hovering never re-renders the table. */
 const RESIZE_INDICATOR_OPACITY_VARIABLE = '--table-resize-indicator-opacity';
 
+/** `1` while the pointer is over a handle's heading cell, `0` otherwise. The grip shows while this is set and the line isn't. */
+const RESIZE_GRIP_HOVER_VARIABLE = '--table-resize-grip-hover';
+
+/** Marks a handle's line, so a reveal can grow it out of the grip. */
+const RESIZE_INDICATOR_DATA_ATTRIBUTE = 'data-resize-indicator';
+
 /** Marks the header row and the data rows, so the line can find where the table's rows start and end. */
 const TABLE_ROW_DATA_SET = {tableRow: true};
 
@@ -42,6 +48,8 @@ function getColumnsWidthExpression(columnWidthValues: string[], chromeWidth: num
 }
 
 export {
+    RESIZE_GRIP_HOVER_VARIABLE,
+    RESIZE_INDICATOR_DATA_ATTRIBUTE,
     RESIZE_INDICATOR_HEIGHT_VARIABLE,
     RESIZE_INDICATOR_OPACITY_VARIABLE,
     RESIZE_INDICATOR_TOP_VARIABLE,
diff --git a/src/components/Table/columnResize/useColumnResize/index.ts b/src/components/Table/columnResize/useColumnResize/index.ts
index bcc3f6f06d7f..259d93e379af 100644
--- a/src/components/Table/columnResize/useColumnResize/index.ts
+++ b/src/components/Table/columnResize/useColumnResize/index.ts
@@ -15,7 +15,7 @@ import {useEffect, useRef} from 'react';
 import type {ColumnResizeController, ColumnResizeHandleDOMProps, UseColumnResizeParams} from './types';
 
 import useLiveColumnWidths from './useLiveColumnWidths';
-import useResizeIndicator from './useResizeIndicator';
+import useResizeIndicator, {setGripHovered, trackHeadingHover} from './useResizeIndicator';
 
 /** A DOM `div` style, which the React Native style system can't type */
 function getHandleStyle(columnGap: number): React.CSSProperties {
@@ -26,6 +26,9 @@ function getHandleStyle(columnGap: number): React.CSSProperties {
         right: -(columnGap / 2 + CONST.TABLES.COLUMN_RESIZE.HANDLE_HIT_WIDTH / 2),
         width: CONST.TABLES.COLUMN_RESIZE.HANDLE_HIT_WIDTH,
         cursor: CONST.TABLES.COLUMN_RESIZE.CURSOR,
+        // Centres the grip and the line on the column edge.
+        display: 'flex',
+        justifyContent: 'center',
         // Otherwise a touch drag on the handle is taken over by the table's own horizontal scrolling.
         touchAction: 'none',
     };
@@ -113,6 +116,11 @@ function useColumnResize({columnResizingID, resizableColumnKeys, resolvedColumnW
         }
 
         endDrag(drag);
+
+        // Releasing capture doesn't reliably fire boundary events, so hit-test the heading, including the handle overhanging it.
+        const isPointerOnHeading = !!event.currentTarget.parentElement?.contains(document.elementFromPoint(event.clientX, event.clientY));
+
+        setGripHovered(event.currentTarget, isPointerOnHeading);
     };
 
     /** Ends a drag whose pointer capture the browser reclaimed. Also fires after a normal pointerup, when it's a no-op. */
@@ -149,6 +157,7 @@ function useColumnResize({columnResizingID, resizableColumnKeys, resolvedColumnW
 
         return {
             style: getHandleStyle(columnGap),
+            ref: trackHeadingHover,
             onPointerDown: (event) => handlePointerDown(columnKey, event),
             onPointerMove: handlePointerMove,
             onPointerUp: handlePointerUp,
diff --git a/src/components/Table/columnResize/useColumnResize/types.ts b/src/components/Table/columnResize/useColumnResize/types.ts
index 59dcab67581a..34f47a7214d9 100644
--- a/src/components/Table/columnResize/useColumnResize/types.ts
+++ b/src/components/Table/columnResize/useColumnResize/types.ts
@@ -17,7 +17,7 @@ type UseColumnResizeParams = {
     columnGap: number;
 };
 
-type ColumnResizeHandleDOMProps = React.HTMLAttributes<HTMLDivElement>;
+type ColumnResizeHandleDOMProps = React.ComponentPropsWithRef<'div'>;
 
 type ColumnResizeController = {
     /** Element holding the width custom properties. The header and rows inherit them, so one write repaints all. */
diff --git a/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts b/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
index c8446a1041d3..f7063215b91e 100644
--- a/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
+++ b/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
@@ -1,5 +1,14 @@
-/** The line marking a dragged column edge, toggled through custom properties so a drag never re-renders the table. */
-import {RESIZE_INDICATOR_HEIGHT_VARIABLE, RESIZE_INDICATOR_OPACITY_VARIABLE, RESIZE_INDICATOR_TOP_VARIABLE, TABLE_ROW_SELECTOR} from '@components/Table/columnResize/columnWidthExpressions';
+/** The line marking a dragged column edge and the grip marking a hovered heading's edge, toggled through custom properties so neither re-renders the table. */
+import {
+    RESIZE_GRIP_HOVER_VARIABLE,
+    RESIZE_INDICATOR_DATA_ATTRIBUTE,
+    RESIZE_INDICATOR_HEIGHT_VARIABLE,
+    RESIZE_INDICATOR_OPACITY_VARIABLE,
+    RESIZE_INDICATOR_TOP_VARIABLE,
+    TABLE_ROW_SELECTOR,
+} from '@components/Table/columnResize/columnWidthExpressions';
+
+import CONST from '@src/CONST';
 
 import type {RefObject} from 'react';
 
@@ -36,6 +45,38 @@ function drawIndicatorAtHandle(scopeElement: HTMLElement | null, handleElement:
     handleElement.style.setProperty(RESIZE_INDICATOR_TOP_VARIABLE, `${headerRowTop - handleRect.top}px`);
     handleElement.style.setProperty(RESIZE_INDICATOR_HEIGHT_VARIABLE, `${lowestRowBottom - headerRowTop}px`);
     handleElement.style.setProperty(RESIZE_INDICATOR_OPACITY_VARIABLE, INDICATOR_OPACITY.VISIBLE);
+
+    // Starts clipped to the handle's box, which the grip fills, so the grip reads as stretching into the line.
+    const gripTop = handleRect.top - headerRowTop;
+    const gripBottom = lowestRowBottom - handleRect.bottom;
+    handleElement.querySelector<HTMLElement>(`[${RESIZE_INDICATOR_DATA_ATTRIBUTE}]`)?.animate([{clipPath: `inset(${gripTop}px 0 ${gripBottom}px 0)`}, {clipPath: 'inset(0 0 0 0)'}], {
+        duration: CONST.TABLES.COLUMN_RESIZE.INDICATOR_MORPH_DURATION,
+        easing: 'ease-out',
+    });
+}
+
+function setGripHovered(handleElement: HTMLElement, isHovered: boolean) {
+    handleElement.style.setProperty(RESIZE_GRIP_HOVER_VARIABLE, isHovered ? INDICATOR_OPACITY.VISIBLE : INDICATOR_OPACITY.HIDDEN);
+}
+
+/** Ref callback for a handle: shows its grip while the pointer is over its heading cell, the handle's parent. */
+function trackHeadingHover(handleElement: HTMLElement | null): (() => void) | undefined {
+    const headingElement = handleElement?.parentElement;
+
+    if (!handleElement || !headingElement) {
+        return;
+    }
+
+    const showGrip = () => setGripHovered(handleElement, true);
+    const hideGrip = () => setGripHovered(handleElement, false);
+
+    headingElement.addEventListener('pointerenter', showGrip);
+    headingElement.addEventListener('pointerleave', hideGrip);
+
+    return () => {
+        headingElement.removeEventListener('pointerenter', showGrip);
+        headingElement.removeEventListener('pointerleave', hideGrip);
+    };
 }
 
 function useResizeIndicator(scopeElementRef: RefObject<HTMLElement | null>): ResizeIndicator {
@@ -56,3 +97,4 @@ function useResizeIndicator(scopeElementRef: RefObject<HTMLElement | null>): Res
 }
 
 export default useResizeIndicator;
+export {setGripHovered, trackHeadingHover};
diff --git a/tests/unit/components/Table/useColumnResizeTest.ts b/tests/unit/components/Table/useColumnResizeTest.ts
index 63f6abc3af6d..84f1962aa268 100644
--- a/tests/unit/components/Table/useColumnResizeTest.ts
+++ b/tests/unit/components/Table/useColumnResizeTest.ts
@@ -1,6 +1,6 @@
 import {act, renderHook} from '@testing-library/react-native';
 
-import {RESIZE_INDICATOR_OPACITY_VARIABLE, getColumnWidthVariableName} from '@components/Table/columnResize/columnWidthExpressions';
+import {RESIZE_GRIP_HOVER_VARIABLE, RESIZE_INDICATOR_OPACITY_VARIABLE, getColumnWidthVariableName} from '@components/Table/columnResize/columnWidthExpressions';
 import type UseColumnResize from '@components/Table/columnResize/useColumnResize';
 import type {UseColumnResizeParams} from '@components/Table/columnResize/useColumnResize/types';
 
@@ -23,22 +23,32 @@ const NAME_COLUMN_KEY = 'name';
 
 const resolvedColumnWidths = {name: 200, email: 200, role: 200};
 
-type PointerEventInit = {clientX: number; button?: number};
+type PointerEventInit = {clientX: number; clientY?: number; button?: number};
 
 /** A pointer event carrying only what the hook reads, aimed at the given handle. */
-function createPointerEvent(handleElement: HTMLDivElement, {clientX, button = 0}: PointerEventInit): React.PointerEvent<HTMLDivElement> {
-    const event = {button, clientX, clientY: 0, pointerId: 1, currentTarget: handleElement, preventDefault: jest.fn(), stopPropagation: jest.fn()};
+function createPointerEvent(handleElement: HTMLDivElement, {clientX, clientY = 0, button = 0}: PointerEventInit): React.PointerEvent<HTMLDivElement> {
+    const event = {button, clientX, clientY, pointerId: 1, currentTarget: handleElement, preventDefault: jest.fn(), stopPropagation: jest.fn()};
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the hook only reads the fields above
     return event as unknown as React.PointerEvent<HTMLDivElement>;
 }
 
-/** Renders the hook with a scope element and one handle inside it, the way the table mounts them. */
+/** Renders the hook with a scope element and one heading cell holding a handle inside it, the way the table mounts them. */
 function renderColumnResize(params?: Partial<UseColumnResizeParams>) {
     const scopeElement = document.createElement('div');
+    const headingElement = document.createElement('div');
     const handleElement = document.createElement('div');
 
-    scopeElement.appendChild(handleElement);
+    scopeElement.appendChild(headingElement);
+    headingElement.appendChild(handleElement);
+    // jsdom has no layout: a 200x40 heading whose handle overhangs its right edge by 6px.
+    document.elementFromPoint = (x, y) => {
+        if (y > 40 || x > 206) {
+            return document.body;
+        }
+
+        return x > 194 ? handleElement : headingElement;
+    };
     // jsdom has no pointer capture.
     const setPointerCapture = jest.fn();
 
@@ -75,7 +85,20 @@ function renderColumnResize(params?: Partial<UseColumnResizeParams>) {
 
     const readWidth = (columnKey: string) => scopeElement.style.getPropertyValue(getColumnWidthVariableName(columnKey));
 
-    return {...hook, initialProps, scopeElement, handleElement, setPointerCapture, getHandleProps, readWidth};
+    const readGripHover = () => handleElement.style.getPropertyValue(RESIZE_GRIP_HOVER_VARIABLE);
+
+    /** Hands the handle element to the handle's ref, the way React does when it mounts the handle. */
+    const mountHandle = () => {
+        const {ref} = getHandleProps();
+
+        if (typeof ref !== 'function') {
+            throw new Error('Expected the handle to take a callback ref');
+        }
+
+        return ref(handleElement);
+    };
+
+    return {...hook, initialProps, scopeElement, headingElement, handleElement, setPointerCapture, getHandleProps, readWidth, readGripHover, mountHandle};
 }
 
 describe('useColumnResize', () => {
@@ -197,6 +220,102 @@ describe('useColumnResize', () => {
         expect(readLineOpacity()).toBe('0');
     });
 
+    it('shows the grip while the heading is hovered', () => {
+        // Given a mounted resizable column
+        const {headingElement, readGripHover, mountHandle} = renderColumnResize();
+
+        mountHandle();
+
+        // When the pointer enters its heading cell anywhere, not only over the edge
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        // Then the grip shows, so the user can find the edge before reaching it
+        expect(readGripHover()).toBe('1');
+
+        // When the pointer leaves the heading
+        headingElement.dispatchEvent(new Event('pointerleave'));
+
+        // Then the grip goes away
+        expect(readGripHover()).toBe('0');
+    });
+
+    it('stops tracking the heading once the handle unmounts', () => {
+        // Given a resizable column whose handle mounted and then unmounted
+        const {headingElement, readGripHover, mountHandle} = renderColumnResize();
+
+        const cleanUp = mountHandle();
+        cleanUp?.();
+
+        // When the pointer enters the heading afterwards
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        // Then nothing is written, so a heading outliving its handle doesn't keep a listener writing to a detached element
+        expect(readGripHover()).toBe('');
+    });
+
+    it('hides the grip when a drag is released off the heading', () => {
+        // Given a hovered heading whose edge is being dragged
+        const {headingElement, handleElement, getHandleProps, readGripHover, mountHandle} = renderColumnResize();
+
+        mountHandle();
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        act(() => {
+            getHandleProps().onPointerDown?.(createPointerEvent(handleElement, {clientX: 190, clientY: 20}));
+            getHandleProps().onPointerMove?.(createPointerEvent(handleElement, {clientX: 400, clientY: 300}));
+        });
+
+        // When the pointer is released outside the heading, where pointer capture kept the heading from hearing it leave
+        act(() => {
+            getHandleProps().onPointerUp?.(createPointerEvent(handleElement, {clientX: 400, clientY: 300}));
+        });
+
+        // Then the grip hides rather than lingering on a heading the pointer isn't over
+        expect(readGripHover()).toBe('0');
+    });
+
+    it('keeps the grip when a drag is released on the heading', () => {
+        // Given a hovered heading whose edge is being dragged
+        const {headingElement, handleElement, getHandleProps, readGripHover, mountHandle} = renderColumnResize();
+
+        mountHandle();
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        act(() => {
+            getHandleProps().onPointerDown?.(createPointerEvent(handleElement, {clientX: 190, clientY: 20}));
+            getHandleProps().onPointerMove?.(createPointerEvent(handleElement, {clientX: 150, clientY: 20}));
+        });
+
+        // When the pointer is released still inside the heading
+        act(() => {
+            getHandleProps().onPointerUp?.(createPointerEvent(handleElement, {clientX: 150, clientY: 20}));
+        });
+
+        // Then the grip comes back, since the pointer is still over the heading
+        expect(readGripHover()).toBe('1');
+    });
+
+    it('keeps the grip when a drag is released on the handle overhanging the heading', () => {
+        // Given a hovered heading whose edge is being dragged
+        const {headingElement, handleElement, getHandleProps, readGripHover, mountHandle} = renderColumnResize();
+
+        mountHandle();
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        act(() => {
+            getHandleProps().onPointerDown?.(createPointerEvent(handleElement, {clientX: 190, clientY: 20}));
+            getHandleProps().onPointerMove?.(createPointerEvent(handleElement, {clientX: 203, clientY: 20}));
+        });
+
+        // When the pointer is released on the part of the handle past the heading's box, where a drag usually ends
+        act(() => {
+            getHandleProps().onPointerUp?.(createPointerEvent(handleElement, {clientX: 203, clientY: 20}));
+        });
+
+        // Then the grip comes back, since the browser still counts the pointer as inside the heading and won't fire another pointerenter
+        expect(readGripHover()).toBe('1');
+    });
+
     it('keeps a dragged width within the drag bounds', () => {
         // Given a 200px column that may not shrink below 180px
         const {handleElement, getHandleProps, readWidth} = renderColumnResize({dragMinWidths: {[NAME_COLUMN_KEY]: 180}});

From 4c9148e7120f17fc024604f9a857022b6b3043af Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 6 Oct 2026 23:31:35 +0200
Subject: [PATCH 305/781] fix: native bar switches to Inbox, Spend and
 Workspaces itself when they already show what their tab buttons open, so the
 iOS bubble no longer bounces back

---
 .../NavigationTabBar/getSearchTabRoute.ts     | 10 ++--
 .../NativeTabNavigator/TabPressListeners.tsx  | 58 +++++++++---------
 .../NativeTabNavigator/tabScreenListeners.ts  | 59 ++++++++++++-------
 .../useIsWorkspacesTabRestored.ts             | 50 ++++++++++++++++
 .../useNativeTabNavigator.ts                  | 14 ++---
 .../Navigators/TabNavigator.native.tsx        |  7 ++-
 tests/unit/nativeTabScreenListenersTest.ts    | 44 ++++++++------
 7 files changed, 162 insertions(+), 80 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIsWorkspacesTabRestored.ts

diff --git a/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts b/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
index 408f925a2d47..bfbc7bb71b85 100644
--- a/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
+++ b/src/components/Navigation/NavigationTabBar/getSearchTabRoute.ts
@@ -15,16 +15,16 @@ import type {OnyxEntry} from 'react-native-onyx';
 import getLastRoute from './getLastRoute';
 
 /** The latest Spend search kept in Onyx, for a Spend tab that has not shown a search yet. */
-function getStoredSearchTabRoute(lastSearchParams: OnyxEntry<LastSearchParams>, lastExpensesSearchQuery: string | undefined) {
+function getStoredSearchTabParams(lastSearchParams: OnyxEntry<LastSearchParams>, lastExpensesSearchQuery: string | undefined) {
     const lastQueryJSON = lastSearchParams?.queryJSON;
     const lastQueryFromOnyx = lastQueryJSON ? buildSearchQueryString(lastQueryJSON) : undefined;
     if (lastQueryFromOnyx) {
         // The persisted search key belongs to the persisted query, so it only travels with it.
-        return ROUTES.SEARCH_ROOT.getRoute({query: lastQueryFromOnyx, searchKey: lastSearchParams?.searchKey});
+        return {query: lastQueryFromOnyx, searchKey: lastSearchParams?.searchKey};
     }
 
     const defaultSearchQuery = buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE});
-    return ROUTES.SEARCH_ROOT.getRoute({query: getValidLastQuery(lastExpensesSearchQuery, defaultSearchQuery), searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES});
+    return {query: getValidLastQuery(lastExpensesSearchQuery, defaultSearchQuery), searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES};
 }
 
 function getSearchTabRoute(rootState: NavigationState, lastSearchParams: OnyxEntry<LastSearchParams>, lastExpensesSearchQuery: string | undefined) {
@@ -41,8 +41,8 @@ function getSearchTabRoute(rootState: NavigationState, lastSearchParams: OnyxEnt
         }
     }
 
-    return getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery);
+    return ROUTES.SEARCH_ROOT.getRoute(getStoredSearchTabParams(lastSearchParams, lastExpensesSearchQuery));
 }
 
 export default getSearchTabRoute;
-export {getStoredSearchTabRoute};
+export {getStoredSearchTabParams};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
index 50fa3f285e8d..31dad7553434 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
@@ -1,57 +1,61 @@
-import {getStoredSearchTabRoute} from '@components/Navigation/NavigationTabBar/getSearchTabRoute';
+import {getStoredSearchTabParams} from '@components/Navigation/NavigationTabBar/getSearchTabRoute';
 
+import useHasTabBeenShown from '@hooks/useHasTabBeenShown';
 import useOnyx from '@hooks/useOnyx';
 import useRestoreWorkspacesTabOnNavigate from '@hooks/useRestoreWorkspacesTabOnNavigate';
 
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import Navigation from '@libs/Navigation/Navigation';
-import {startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
+import navigationRef from '@libs/Navigation/navigationRef';
 
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {lastExpensesSearchQuerySelector} from '@src/selectors/SearchFilters';
 
+import {CommonActions} from '@react-navigation/native';
 import {useEffect} from 'react';
 
 import type {NativeTabLayoutProps} from './NativeTabLayout';
 
 /**
- * The native bar's taps on Spend and Workspaces, which run the JS tab buttons' navigation and need Onyx data, so the
- * data re-renders only this component. Spend's first visit opens the latest search kept in Onyx, because the tab
- * mounted at startup shows the default one. Workspaces restores the last workspace, or the list for one that is gone.
+ * The native bar's Spend and Workspaces handling that needs Onyx data, so the data re-renders only this component.
+ * Spend's first visit opens the latest search kept in Onyx, so the tab mounted at startup with the default search gets
+ * it before it is first shown and the native bar can switch to it. Workspaces restores the last workspace, or the list
+ * for one that is gone, whenever the tab does not already show it.
  */
 function TabPressListeners({state, descriptors}: Pick<NativeTabLayoutProps, 'state' | 'descriptors'>) {
     const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY);
     const [lastExpensesSearchQuery] = useOnyx(ONYXKEYS.SEARCH_FILTERS, {selector: lastExpensesSearchQuerySelector});
+    const hasSpendBeenShown = useHasTabBeenShown(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
     const navigateToWorkspaces = useRestoreWorkspacesTabOnNavigate();
-    const getDescriptor = (routeName: string) => {
-        const route = state.routes.find((tabRoute) => tabRoute.name === routeName);
-        return route ? descriptors[route.key] : undefined;
-    };
-    const spendDescriptor = getDescriptor(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
-    const spendNavigation = spendDescriptor?.navigation;
-    const isSpendSwitchedByJS = spendDescriptor?.options.tabBarSelectionEnabled === false;
-    const workspacesNavigation = getDescriptor(NAVIGATORS.WORKSPACE_NAVIGATOR)?.navigation;
+    const getTabRoute = (routeName: string) => state.routes.find((tabRoute) => tabRoute.name === routeName);
+    const spendNavigatorState = getTabRoute(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)?.state;
+    const spendNavigatorKey = spendNavigatorState?.key;
+    const spendRootRoute = spendNavigatorState?.routes.at(0);
+    const spendRootRouteKey = spendRootRoute?.key;
+    const spendRootQuery = spendRootRoute?.params && 'q' in spendRootRoute.params ? spendRootRoute.params.q : undefined;
+    const {query: storedQuery, searchKey: storedSearchKey} = getStoredSearchTabParams(lastSearchParams, lastExpensesSearchQuery);
+    const workspacesDescriptor = descriptors[getTabRoute(NAVIGATORS.WORKSPACE_NAVIGATOR)?.key ?? ''];
+    const workspacesNavigation = workspacesDescriptor?.navigation;
+    const isWorkspacesSwitchedByJS = workspacesDescriptor?.options.tabBarSelectionEnabled === false;
+
+    useEffect(() => {
+        if (hasSpendBeenShown || !spendNavigatorKey || !spendRootRouteKey || spendRootQuery === storedQuery) {
+            return;
+        }
+        navigationRef.dispatch({...CommonActions.setParams({q: storedQuery, searchKey: storedSearchKey}), source: spendRootRouteKey, target: spendNavigatorKey});
+    }, [hasSpendBeenShown, spendNavigatorKey, spendRootRouteKey, spendRootQuery, storedQuery, storedSearchKey]);
 
+    // Runs on the focused tab too, where it returns from a workspace to the list.
     useEffect(
         () =>
-            spendNavigation?.addListener('tabPress', () => {
-                if (spendNavigation.isFocused()) {
+            workspacesNavigation?.addListener('tabPress', () => {
+                if (!workspacesNavigation.isFocused() && !isWorkspacesSwitchedByJS) {
                     return;
                 }
-                interceptAnonymousUser(() => {
-                    startNavigateToReportsTabSpans();
-                    if (isSpendSwitchedByJS) {
-                        Navigation.navigate(getStoredSearchTabRoute(lastSearchParams, lastExpensesSearchQuery));
-                    }
-                });
+                navigateToWorkspaces();
             }),
-        [spendNavigation, isSpendSwitchedByJS, lastSearchParams, lastExpensesSearchQuery],
+        [workspacesNavigation, isWorkspacesSwitchedByJS, navigateToWorkspaces],
     );
 
-    // Runs on the focused tab too, where it returns from a workspace to the list.
-    useEffect(() => workspacesNavigation?.addListener('tabPress', navigateToWorkspaces), [workspacesNavigation, navigateToWorkspaces]);
-
     return null;
 }
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
index 07534edf8143..50b556171740 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabScreenListeners.ts
@@ -3,49 +3,68 @@ import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_
 import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import getFocusedLeafScreenName from '@libs/Navigation/helpers/getFocusedLeafScreenName';
+import {startNavigateToInboxTabSpan, startNavigateToReportsTabSpans} from '@libs/telemetry/startTabNavigationSpans';
 
-import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
 
+import type {NavigationState, PartialState} from '@react-navigation/native';
 import type {ValueOf} from 'type-fest';
 
 type NavigationTab = ValueOf<typeof NAVIGATION_TABS>;
 
 /** Tabs the JS tab buttons keep from anonymous users, who get the sign-in modal instead. */
-const ANONYMOUS_GATED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.SEARCH, NAVIGATION_TABS.INSIGHTS, NAVIGATION_TABS.SETTINGS]);
+const ANONYMOUS_GATED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.SEARCH, NAVIGATION_TABS.INSIGHTS, NAVIGATION_TABS.WORKSPACES, NAVIGATION_TABS.SETTINGS]);
 
-/**
- * Tabs switched by their own JS navigation rather than by the native selection, as their JS tab buttons do: Inbox opens
- * at its chat list, and Workspaces restores the last workspace or falls back to the list.
- */
-const JS_SWITCHED_TABS = new Set<NavigationTab>([NAVIGATION_TABS.INBOX, NAVIGATION_TABS.WORKSPACES]);
+type TabRoute = {
+    name: string;
+    state?: NavigationState | PartialState<NavigationState>;
+};
+
+/** Whether Inbox shows its chat list, which is where its JS tab button opens it. */
+function isInboxTabAtChatList(inboxRoute: TabRoute | undefined) {
+    return getFocusedLeafScreenName(inboxRoute?.state) === SCREENS.INBOX;
+}
 
 /**
  * What a tap on the native bar does on top of the tab switch, mirroring the JS tab buttons the native bar replaces.
- * Spend and Workspaces are handled by TabPressListeners, which need Onyx data.
+ * Workspaces is handled by TabPressListeners, which needs Onyx data.
  */
-const NAVIGATION_TAB_PRESS_HANDLERS: Partial<Record<NavigationTab, () => void>> = {
-    [NAVIGATION_TABS.INBOX]: navigateToInboxTab,
+const NAVIGATION_TAB_PRESS_HANDLERS: Partial<Record<NavigationTab, (route: TabRoute) => void>> = {
+    [NAVIGATION_TABS.INBOX]: (route) => (isInboxTabAtChatList(route) ? startNavigateToInboxTabSpan({isWideLayout: false}) : navigateToInboxTab()),
+    [NAVIGATION_TABS.SEARCH]: () => interceptAnonymousUser(startNavigateToReportsTabSpans),
     [NAVIGATION_TABS.INSIGHTS]: () => interceptAnonymousUser(() => {}),
     [NAVIGATION_TABS.SETTINGS]: () => interceptAnonymousUser(() => {}),
 };
 
 type NativeTabSelectionParams = {
     isAnonymousUser: boolean;
-    /** Spend's first visit opens the latest search kept in Onyx, which the tab mounted at startup does not show yet. */
-    hasSpendBeenSelected: boolean;
+    isInboxAtChatList: boolean;
+    /** Whether Workspaces shows what its JS tab button restores, see useIsWorkspacesTabRestored. */
+    isWorkspacesTabRestored: boolean;
 };
 
-/** Whether the native bar switches to the tab itself, or leaves the switch to the tab's press handler. */
-function isNativeTabSelectionEnabled(routeName: string, {isAnonymousUser, hasSpendBeenSelected}: NativeTabSelectionParams) {
-    if (routeName === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR && !hasSpendBeenSelected) {
+/**
+ * Whether the native bar switches to the tab itself, or leaves the switch to the tab's press handler. The native switch
+ * is kept whenever the tab already shows what its JS tab button opens, because a prevented selection makes the iOS bar
+ * slide back to the current tab before JS moves it to the new one.
+ */
+function isNativeTabSelectionEnabled(routeName: string, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored}: NativeTabSelectionParams) {
+    const tab = ROUTE_TO_NAVIGATION_TAB[routeName];
+    if (isAnonymousUser && ANONYMOUS_GATED_TABS.has(tab)) {
         return false;
     }
-    const tab = ROUTE_TO_NAVIGATION_TAB[routeName];
-    return !JS_SWITCHED_TABS.has(tab) && !(isAnonymousUser && ANONYMOUS_GATED_TABS.has(tab));
+    if (tab === NAVIGATION_TABS.INBOX) {
+        return isInboxAtChatList;
+    }
+    if (tab === NAVIGATION_TABS.WORKSPACES) {
+        return isWorkspacesTabRestored;
+    }
+    return true;
 }
 
 type TabScreenListenerProps = {
-    route: {name: string};
+    route: TabRoute;
     navigation: {isFocused: () => boolean};
 };
 
@@ -59,10 +78,10 @@ function tabScreenListeners({route, navigation}: TabScreenListenerProps) {
             if (navigation.isFocused()) {
                 return;
             }
-            NAVIGATION_TAB_PRESS_HANDLERS[ROUTE_TO_NAVIGATION_TAB[route.name]]?.();
+            NAVIGATION_TAB_PRESS_HANDLERS[ROUTE_TO_NAVIGATION_TAB[route.name]]?.(route);
         },
     };
 }
 
 export default tabScreenListeners;
-export {isNativeTabSelectionEnabled};
+export {isInboxTabAtChatList, isNativeTabSelectionEnabled};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIsWorkspacesTabRestored.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIsWorkspacesTabRestored.ts
new file mode 100644
index 000000000000..928dd7accded
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useIsWorkspacesTabRestored.ts
@@ -0,0 +1,50 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useOnyx from '@hooks/useOnyx';
+
+import getFocusedLeafScreenName from '@libs/Navigation/helpers/getFocusedLeafScreenName';
+import {isPendingDeletePolicy, shouldShowPolicy} from '@libs/PolicyUtils';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Domain, Policy} from '@src/types/onyx';
+
+import type {NavigationState, PartialState} from '@react-navigation/native';
+import type {OnyxEntry} from 'react-native-onyx';
+
+type WorkspacesTabRoute = {
+    state?: NavigationState | PartialState<NavigationState>;
+};
+
+const domainExistsSelector = (domain: OnyxEntry<Domain>) => !!domain?.accountID;
+
+/**
+ * Whether the Workspaces tab shows what its JS tab button restores on narrow layouts, so a plain switch to the tab
+ * lands on the same page: the workspaces list, the initial page of a workspace that is still shown, or a domain that
+ * still exists. Any other page is replaced by the tab button, see navigateToWorkspacesPage.
+ */
+function useIsWorkspacesTabRestored(workspacesTabRoute: WorkspacesTabRoute | undefined) {
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+    const navigatorState = workspacesTabRoute?.state;
+    const topRoute = navigatorState?.routes.at(navigatorState.index ?? -1);
+    const splitRootParams = topRoute?.state?.routes.at(0)?.params;
+    const policyID = topRoute?.name === NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR && splitRootParams && 'policyID' in splitRootParams ? String(splitRootParams.policyID) : undefined;
+    const domainAccountID =
+        topRoute?.name === NAVIGATORS.DOMAIN_SPLIT_NAVIGATOR && splitRootParams && 'domainAccountID' in splitRootParams ? String(splitRootParams.domainAccountID) : undefined;
+    const isPolicyShownSelector = (policy: OnyxEntry<Policy>) => shouldShowPolicy(policy, false, currentUserLogin) && !isPendingDeletePolicy(policy);
+    const [isPolicyShown = false] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: isPolicyShownSelector});
+    const [doesDomainExist = false] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainExistsSelector});
+
+    switch (topRoute?.name) {
+        case SCREENS.WORKSPACES_LIST:
+            return true;
+        case NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR:
+            return !!policyID && isPolicyShown && getFocusedLeafScreenName(topRoute.state) === SCREENS.WORKSPACE.INITIAL;
+        case NAVIGATORS.DOMAIN_SPLIT_NAVIGATOR:
+            return !!domainAccountID && doesDomainExist;
+        default:
+            return false;
+    }
+}
+
+export default useIsWorkspacesTabRestored;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index f99a5108c89a..eb65e080c3ad 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -27,9 +27,11 @@ import type {NavigationAction, NavigationState, PartialState, Router, TabNavigat
 
 import {findFocusedRoute, useNavigation, useNavigationState, useRoute} from '@react-navigation/native';
 import {isAnonymousSessionSelector} from '@selectors/Session';
-import {useEffect, useState} from 'react';
+import {useEffect} from 'react';
 
 import getTabWithoutBarItem from './getTabWithoutBarItem';
+import {isInboxTabAtChatList} from './tabScreenListeners';
+import useIsWorkspacesTabRestored from './useIsWorkspacesTabRestored';
 
 /**
  * Root-level tab screens where the swipe-back gesture should be disabled.
@@ -68,11 +70,9 @@ function useNativeTabNavigator() {
     // A tab with no item in the bar is drawn over the other tabs as a full screen, so the bar hides while it is focused.
     const isActiveTabWithoutBarItem = activeTabRoute?.name === tabWithoutBarItem;
     const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible && !isActiveTabWithoutBarItem;
-    const isSpendSelected = activeTabRoute?.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR;
-    const [hasSpendBeenSelected, setHasSpendBeenSelected] = useState(isSpendSelected);
-    if (isSpendSelected && !hasSpendBeenSelected) {
-        setHasSpendBeenSelected(true);
-    }
+    const getTabRoute = (tabName: string) => (isRealizedNavigationState(tabState) ? tabState.routes.find((tabRoute) => tabRoute.name === tabName) : undefined);
+    const isInboxAtChatList = isInboxTabAtChatList(getTabRoute(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR));
+    const isWorkspacesTabRestored = useIsWorkspacesTabRestored(getTabRoute(NAVIGATORS.WORKSPACE_NAVIGATOR));
 
     let inboxDotColor: string | undefined;
     if (chatTabBrickRoad) {
@@ -141,7 +141,7 @@ function useNativeTabNavigator() {
 
     const isAccountAvatarShown = shouldUseNarrowLayout && tabWithoutBarItem !== NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
 
-    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, hasSpendBeenSelected};
+    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index e46af455278f..6191e9d9b678 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -35,11 +35,14 @@ const HIDDEN_TAB_OPTIONS = {tabBarItemHidden: true};
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
-    const {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, hasSpendBeenSelected} = useNativeTabNavigator();
+    const {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored} =
+        useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels});
     // A tab with no bar item draws no icon.
     const getOptions = (name: NativeTabName) =>
-        name === tabWithoutBarItem ? HIDDEN_TAB_OPTIONS : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, {isAnonymousUser, hasSpendBeenSelected})};
+        name === tabWithoutBarItem
+            ? HIDDEN_TAB_OPTIONS
+            : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored})};
 
     return (
         <Tab.Navigator
diff --git a/tests/unit/nativeTabScreenListenersTest.ts b/tests/unit/nativeTabScreenListenersTest.ts
index 8b990fef099f..c96f17635948 100644
--- a/tests/unit/nativeTabScreenListenersTest.ts
+++ b/tests/unit/nativeTabScreenListenersTest.ts
@@ -6,33 +6,39 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 jest.mock('@components/Navigation/NavigationTabBar/navigateToInboxTab', () => jest.fn());
+jest.mock('@libs/telemetry/startTabNavigationSpans');
 
 describe('tabScreenListeners', () => {
-    it('opens the Inbox chat list only when Inbox is pressed from another tab', () => {
-        // Given the native bar, whose Inbox selection is left to JS so that it opens at the chat list like InboxTabButton
-        const pressInbox = (isFocused: boolean) => tabScreenListeners({route: {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}, navigation: {isFocused: () => isFocused}}).tabPress();
-
-        // When the user presses Inbox while it is focused and then from another tab
-        pressInbox(true);
-        pressInbox(false);
-
-        // Then only the press from another tab runs the shared Inbox navigation, as the JS tab button does
+    it('opens the Inbox chat list only when Inbox is pressed from another tab with a report open', () => {
+        // Given Inbox left with a report open, which the native bar does not switch to, so JS opens it at the chat list like InboxTabButton
+        const inboxWithReport = {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, state: {routes: [{name: SCREENS.INBOX}, {name: SCREENS.REPORT}], index: 1}};
+        const inboxAtChatList = {name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, state: {routes: [{name: SCREENS.INBOX}], index: 0}};
+        const pressInbox = (route: Parameters<typeof tabScreenListeners>[0]['route'], isFocused: boolean) => tabScreenListeners({route, navigation: {isFocused: () => isFocused}}).tabPress();
+
+        // When the user presses Inbox while it is focused, from another tab at the chat list, and from another tab with a report open
+        pressInbox(inboxWithReport, true);
+        pressInbox(inboxAtChatList, false);
+        pressInbox(inboxWithReport, false);
+
+        // Then only the last press runs the shared Inbox navigation, since the native switch already lands on the chat list
         expect(navigateToInboxTab).toHaveBeenCalledTimes(1);
     });
 
-    it('leaves to JS the switches whose JS tab buttons do more than switching', () => {
-        // Given a signed-in user who has been to Spend, one who has not, and an anonymous user
-        const signedIn = {isAnonymousUser: false, hasSpendBeenSelected: true};
-        const beforeSpend = {isAnonymousUser: false, hasSpendBeenSelected: false};
-        const anonymous = {isAnonymousUser: true, hasSpendBeenSelected: true};
+    it('leaves to JS only the switches that would land somewhere else than the JS tab buttons', () => {
+        // Given a signed-in user whose Inbox and Workspaces tabs show what their tab buttons open, one whose do not, and an anonymous user
+        const ready = {isAnonymousUser: false, isInboxAtChatList: true, isWorkspacesTabRestored: true};
+        const unrestored = {isAnonymousUser: false, isInboxAtChatList: false, isWorkspacesTabRestored: false};
+        const anonymous = {...ready, isAnonymousUser: true};
 
         // When the native selection is decided
-        // Then Inbox and Workspaces are always switched by JS, Spend's first visit is, and anonymous users are kept from Spend, Insights and Account
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, signedIn)).toBe(false);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, signedIn)).toBe(false);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, signedIn)).toBe(true);
-        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, beforeSpend)).toBe(false);
+        // Then Inbox and Workspaces are switched natively only when ready, Spend always is, and anonymous users are kept from Spend, Insights, Workspaces and Account
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, ready)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, ready)).toBe(true);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, unrestored)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, unrestored)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, unrestored)).toBe(true);
         expect(isNativeTabSelectionEnabled(SCREENS.INSIGHTS, anonymous)).toBe(false);
+        expect(isNativeTabSelectionEnabled(NAVIGATORS.WORKSPACE_NAVIGATOR, anonymous)).toBe(false);
         expect(isNativeTabSelectionEnabled(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, anonymous)).toBe(false);
         expect(isNativeTabSelectionEnabled(SCREENS.HOME, anonymous)).toBe(true);
     });

From fc2eb00a5c43c705d64b975345b9aec432b3f0be Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 6 Oct 2026 12:52:06 +0200
Subject: [PATCH 306/781] Split getMatchingFullScreenRoute out of
 getAdaptedStateFromPath and import linking config leaves

---
 src/libs/Navigation/Navigation.ts             |   4 +-
 .../helpers/getAdaptedStateFromPath.ts        | 235 +---------------
 .../helpers/getMatchingFullScreenRoute.ts     | 253 ++++++++++++++++++
 src/libs/Navigation/helpers/linkTo/index.ts   |   7 +-
 .../helpers/swapBackgroundTabForRHPTarget.ts  |   2 +-
 src/libs/ReportUtils.ts                       |   4 +-
 src/libs/actions/Welcome/OnboardingFlow.ts    |   4 +-
 .../getMatchingFullScreenRouteTests.ts        |   6 +-
 .../swapBackgroundTabForRHPTarget.test.ts     |   4 +-
 9 files changed, 268 insertions(+), 251 deletions(-)
 create mode 100644 src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts

diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
index ad356bac40ab..d0b7ff9d5e40 100644
--- a/src/libs/Navigation/Navigation.ts
+++ b/src/libs/Navigation/Navigation.ts
@@ -63,7 +63,7 @@ import {
 } from './helpers/preMountBuffer';
 import replaceWithSplitNavigator from './helpers/replaceWithSplitNavigator';
 import setNavigationActionToMicrotaskQueue from './helpers/setNavigationActionToMicrotaskQueue';
-import {linkingConfig} from './linkingConfig';
+import {config as linkingConfig} from './linkingConfig/config';
 import {SPLIT_TO_SIDEBAR} from './linkingConfig/RELATIONS';
 import navigationRef from './navigationRef';
 import TransitionTracker from './TransitionTracker';
@@ -515,7 +515,7 @@ function goUp(backToRoute: Route, options?: GoBackOptions): boolean {
 
     const stateFromPath = getStateFromPath(backToRoute);
 
-    const action = getActionFromState(stateFromPath, linkingConfig.config);
+    const action = getActionFromState(stateFromPath, linkingConfig);
 
     if (!action) {
         Log.hmmm(`[Navigation] Unable to go up. Action is undefined.`);
diff --git a/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts b/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
index 9e91620eaf3b..03c373c435a4 100644
--- a/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
+++ b/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
@@ -1,38 +1,20 @@
 import getInitialSplitNavigatorState from '@libs/Navigation/AppNavigator/createSplitNavigator/getInitialSplitNavigatorState';
 import TAB_SCREENS from '@libs/Navigation/AppNavigator/Navigators/TAB_SCREENS';
-import {
-    RHP_TO_DOMAIN,
-    RHP_TO_HOME,
-    RHP_TO_SEARCH,
-    RHP_TO_SEARCH_DEEPLINK,
-    RHP_TO_SETTINGS,
-    RHP_TO_SIDEBAR,
-    RHP_TO_WORKSPACE,
-    RHP_TO_WORKSPACES_LIST,
-} from '@libs/Navigation/linkingConfig/RELATIONS';
 import type {NavigationPartialRoute, NavigationRoute, RootNavigatorParamList} from '@libs/Navigation/types';
 import {getReportOrDraftReport} from '@libs/ReportUtils';
-import {getSearchParamFromPath} from '@libs/Url';
 
 import NAVIGATORS from '@src/NAVIGATORS';
 import type {Route as RoutePath} from '@src/ROUTES';
-import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {Screen} from '@src/SCREENS';
 
 import type {NavigationState, PartialState, getStateFromPath as RNGetStateFromPath, Route} from '@react-navigation/native';
 
-import pick from 'lodash/pick';
-
-import buildTabNavigatorNestedState from './buildTabNavigatorNestedState';
-import findAllMatchingDynamicSuffixes from './dynamicRoutesUtils/findAllMatchingDynamicSuffixes';
 import getDynamicRouteAdaptedState from './dynamicRoutesUtils/getDynamicRouteAdaptedState';
-import getPathWithoutDynamicSuffix from './dynamicRoutesUtils/getPathWithoutDynamicSuffix';
 import isDynamicRouteScreen from './dynamicRoutesUtils/isDynamicRouteScreen';
 import findFocusedRouteWithOnyxTabGuard from './findFocusedRouteWithOnyxTabGuard';
-import getDefaultDeeplinkSearchQuery from './getDefaultDeeplinkSearchQuery';
+import getMatchingFullScreenRoute, {getRoutesWithIndex, getTabNavigatorState} from './getMatchingFullScreenRoute';
 import getMatchingNewRoute from './getMatchingNewRoute';
-import getParamsFromRoute from './getParamsFromRoute';
 import getStateFromPath from './getStateFromPath';
 import {isFullScreenName} from './isNavigatorName';
 import normalizePath from './normalizePath';
@@ -42,9 +24,6 @@ type GetAdaptedStateReturnType = ReturnType<typeof getStateFromPath>;
 
 type GetAdaptedStateFromPath = (...args: [...Parameters<typeof RNGetStateFromPath>, shouldReplacePathInNestedState?: boolean]) => GetAdaptedStateReturnType;
 
-// The function getPathFromState that we are using in some places isn't working correctly without defined index.
-const getRoutesWithIndex = (routes: NavigationPartialRoute[]): PartialState<NavigationState> => ({routes, index: routes.length - 1});
-
 /**
  * Standalone full-screen public pages registered in PublicScreens (unauthenticated navigator) that
  * should NOT have TabNavigator prepended — they render on their own, with no tab navigator underneath.
@@ -61,221 +40,10 @@ const PUBLIC_SCREENS = new Set<string>([
     SCREENS.SAML_SIGN_IN,
 ]);
 
-/**
- * Builds TabNavigator state with all tabs and the correct selected tab.
- * Tab navigators require all routes in the state for proper rendering.
- */
-function getTabNavigatorState(selectedTabRoute: NavigationPartialRoute): NavigationPartialRoute {
-    return {
-        name: NAVIGATORS.TAB_NAVIGATOR,
-        state: buildTabNavigatorNestedState(selectedTabRoute),
-    };
-}
-
-function isRouteWithBackToParam(route: NavigationRoute): route is Route<string, {backTo: string}> {
-    return route.params !== undefined && 'backTo' in route.params && typeof route.params.backTo === 'string';
-}
-
 function isRouteWithReportID(route: NavigationRoute): route is Route<string, {reportID: string}> {
     return route.params !== undefined && 'reportID' in route.params && typeof route.params.reportID === 'string';
 }
 
-/**
- * @param route - The (focused) route to find a full screen route for.
- * @param isDeeplink - Whether the state is being built from a path (deeplink / browser refresh / cold
- *   load) as opposed to in-app navigation. When true, deeplink-only relations (e.g. RHP_TO_SEARCH_DEEPLINK)
- *   are also considered so an RHP can get a sensible default fullscreen underneath it. In-app callers
- *   (linkTo, swapBackgroundTabForRHPTarget) leave this false so the same RHP can open over any fullscreen
- *   without changing the page currently underneath.
- */
-function getMatchingFullScreenRoute(route: NavigationRoute, isDeeplink = false) {
-    const isDynamicScreen = isDynamicRouteScreen(route.name as Screen);
-
-    // Check for backTo param. One screen with different backTo value may need different screens visible under the overlay.
-    // Dynamic screens are skipped here because they never carry their own backTo - they only
-    // inherit it from the screen underneath. Letting backTo dictate the full-screen route for
-    // a dynamic screen would resolve the wrong page.
-    if (isRouteWithBackToParam(route) && !isDynamicScreen) {
-        const stateForBackTo = getStateFromPath(route.params.backTo as RoutePath);
-
-        // This may happen if the backTo url is invalid.
-        const lastRoute = stateForBackTo?.routes.at(-1);
-        if (!stateForBackTo || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
-            return undefined;
-        }
-
-        const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
-
-        // If the state for back to last route is a full screen route, we can use it
-        if (isLastRouteFullScreen) {
-            return lastRoute;
-        }
-
-        const focusedStateForBackToRoute = findFocusedRouteWithOnyxTabGuard(stateForBackTo);
-
-        if (!focusedStateForBackToRoute) {
-            return undefined;
-        }
-        // If not, get the matching full screen route for the back to state.
-        return getMatchingFullScreenRoute(focusedStateForBackToRoute, isDeeplink);
-    }
-
-    // Deeplink-only relations provide a default search screen underneath the RHP when the state is
-    // built from a path. They are ignored for in-app navigation so the RHP can open over any fullscreen.
-    const matchingSearchScreen = RHP_TO_SEARCH[route.name];
-    const matchingDeeplinkSearchScreen = isDeeplink ? RHP_TO_SEARCH_DEEPLINK[route.name] : undefined;
-    const resolvedSearchScreen = matchingSearchScreen ?? matchingDeeplinkSearchScreen;
-    if (resolvedSearchScreen) {
-        const paramsFromRoute = getParamsFromRoute(resolvedSearchScreen);
-        const copiedParams = paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : {};
-        let queryParam: Record<string, string> = {};
-        if (route.path) {
-            const query = getSearchParamFromPath(route.path, 'q');
-            if (query) {
-                queryParam = {q: query};
-            }
-        }
-
-        // Deeplink-only defaults (e.g. create flows) land on SCREENS.SEARCH.ROOT, which carries no path
-        // params and no `q`. Without an explicit query, SearchQueryProvider falls back to the previous
-        // defined query and can reveal a stale search when the RHP closes. Seed the canned expenses query
-        // so these deeplinks resolve to Spend > Expenses.
-        if (!queryParam.q && !matchingSearchScreen && matchingDeeplinkSearchScreen) {
-            queryParam = {q: getDefaultDeeplinkSearchQuery()};
-        }
-
-        const searchRoute = {
-            name: resolvedSearchScreen,
-            params: Object.keys({...copiedParams, ...queryParam}).length > 0 ? {...copiedParams, ...queryParam} : undefined,
-        };
-        const searchState = getRoutesWithIndex([searchRoute]);
-        return getTabNavigatorState({name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, state: searchState});
-    }
-
-    if (RHP_TO_HOME[route.name]) {
-        return {
-            ...getTabNavigatorState({name: SCREENS.HOME}),
-            path: normalizePath(ROUTES.HOME),
-        };
-    }
-
-    if (RHP_TO_WORKSPACES_LIST[route.name]) {
-        return getTabNavigatorState({
-            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
-            state: getRoutesWithIndex([
-                {
-                    name: SCREENS.WORKSPACES_LIST,
-                    // prepending a slash to ensure closing the RHP after refreshing the page
-                    // replaces the whole path with "/workspaces", instead of just replacing the last url segment ("/x/y/workspaces")
-                    path: normalizePath(ROUTES.WORKSPACES_LIST.route),
-                },
-            ]),
-        });
-    }
-
-    if (RHP_TO_WORKSPACE[route.name]) {
-        const paramsFromRoute = getParamsFromRoute(RHP_TO_WORKSPACE[route.name]);
-
-        const workspaceSplitRoute = getInitialSplitNavigatorState(
-            {
-                name: SCREENS.WORKSPACE.INITIAL,
-                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
-            },
-            {
-                name: RHP_TO_WORKSPACE[route.name],
-                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
-            },
-        );
-
-        return getTabNavigatorState({
-            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
-            state: getRoutesWithIndex([{name: SCREENS.WORKSPACES_LIST}, workspaceSplitRoute]),
-        });
-    }
-
-    if (RHP_TO_SETTINGS[route.name]) {
-        const paramsFromRoute = getParamsFromRoute(RHP_TO_SETTINGS[route.name]);
-
-        const settingsState = getInitialSplitNavigatorState(
-            {name: SCREENS.SETTINGS.ROOT},
-            {
-                name: RHP_TO_SETTINGS[route.name],
-                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
-            },
-        );
-        return getTabNavigatorState(settingsState);
-    }
-
-    if (RHP_TO_DOMAIN[route.name]) {
-        const paramsFromRoute = getParamsFromRoute(RHP_TO_DOMAIN[route.name]);
-
-        const domainSplitRoute = getInitialSplitNavigatorState(
-            {
-                name: SCREENS.DOMAIN.INITIAL,
-                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
-            },
-            {
-                name: RHP_TO_DOMAIN[route.name],
-                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
-            },
-        );
-
-        return getTabNavigatorState({
-            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
-            state: getRoutesWithIndex([{name: SCREENS.WORKSPACES_LIST}, domainSplitRoute]),
-        });
-    }
-
-    // Fallback: if no specific central screen RELATION matched, check if the RHP screen
-    // maps to a sidebar. This shows the split navigator with just the sidebar (no central screen).
-    if (RHP_TO_SIDEBAR[route.name]) {
-        const splitState = getInitialSplitNavigatorState({
-            name: RHP_TO_SIDEBAR[route.name],
-        });
-        return getTabNavigatorState(splitState);
-    }
-
-    // Handle dynamic routes: find the appropriate full screen route.
-    // Iterate all candidates so that a false-positive first match (e.g. a tag named "gl-code"
-    // colliding with the registered static suffix) does not produce a NOT_FOUND state.
-    if (route.path) {
-        const allSuffixMatches = findAllMatchingDynamicSuffixes(route.path);
-        for (const suffixMatch of allSuffixMatches) {
-            const pathWithoutDynamicSuffix = getPathWithoutDynamicSuffix(suffixMatch.pathUsedForMatching, suffixMatch.actualSuffix, suffixMatch.pattern);
-
-            if (!pathWithoutDynamicSuffix) {
-                continue;
-            }
-
-            // Parse the base path (without dynamic suffix) into a navigation state
-            // to determine which full-screen route should be visible underneath the overlay.
-            const stateUnderDynamicRoute = getStateFromPath(pathWithoutDynamicSuffix);
-            const lastRoute = stateUnderDynamicRoute?.routes.at(-1);
-
-            if (!stateUnderDynamicRoute || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
-                continue;
-            }
-
-            const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
-
-            if (isLastRouteFullScreen) {
-                return lastRoute;
-            }
-
-            const focusedRouteUnderDynamicRoute = findFocusedRouteWithOnyxTabGuard(stateUnderDynamicRoute);
-
-            if (!focusedRouteUnderDynamicRoute) {
-                continue;
-            }
-
-            // Recursively find the matching full screen route for the focused dynamic route
-            return getMatchingFullScreenRoute(focusedRouteUnderDynamicRoute, isDeeplink);
-        }
-    }
-
-    return undefined;
-}
-
 // If there is no particular matching route defined, we want to get the default route.
 // It is the reports split navigator with report. If the reportID is defined in the focused route, we want to use it for the default report.
 // This is separated from getMatchingFullScreenRoute because we want to use it only for the initial state.
@@ -445,4 +213,3 @@ const getAdaptedStateFromPath: GetAdaptedStateFromPath = (path, options, shouldR
 };
 
 export default getAdaptedStateFromPath;
-export {getMatchingFullScreenRoute, isFullScreenName};
diff --git a/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts b/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts
new file mode 100644
index 000000000000..83b2cf72cbc1
--- /dev/null
+++ b/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts
@@ -0,0 +1,253 @@
+import getInitialSplitNavigatorState from '@libs/Navigation/AppNavigator/createSplitNavigator/getInitialSplitNavigatorState';
+import {
+    RHP_TO_DOMAIN,
+    RHP_TO_HOME,
+    RHP_TO_SEARCH,
+    RHP_TO_SEARCH_DEEPLINK,
+    RHP_TO_SETTINGS,
+    RHP_TO_SIDEBAR,
+    RHP_TO_WORKSPACE,
+    RHP_TO_WORKSPACES_LIST,
+} from '@libs/Navigation/linkingConfig/RELATIONS';
+import type {NavigationPartialRoute, NavigationRoute} from '@libs/Navigation/types';
+import {getSearchParamFromPath} from '@libs/Url';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import type {Route as RoutePath} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {Screen} from '@src/SCREENS';
+
+import type {NavigationState, PartialState, Route} from '@react-navigation/native';
+
+import pick from 'lodash/pick';
+
+import buildTabNavigatorNestedState from './buildTabNavigatorNestedState';
+import findAllMatchingDynamicSuffixes from './dynamicRoutesUtils/findAllMatchingDynamicSuffixes';
+import getPathWithoutDynamicSuffix from './dynamicRoutesUtils/getPathWithoutDynamicSuffix';
+import isDynamicRouteScreen from './dynamicRoutesUtils/isDynamicRouteScreen';
+import findFocusedRouteWithOnyxTabGuard from './findFocusedRouteWithOnyxTabGuard';
+import getDefaultDeeplinkSearchQuery from './getDefaultDeeplinkSearchQuery';
+import getParamsFromRoute from './getParamsFromRoute';
+import getStateFromPath from './getStateFromPath';
+import {isFullScreenName} from './isNavigatorName';
+import normalizePath from './normalizePath';
+
+// The function getPathFromState that we are using in some places isn't working correctly without defined index.
+const getRoutesWithIndex = (routes: NavigationPartialRoute[]): PartialState<NavigationState> => ({routes, index: routes.length - 1});
+
+/**
+ * Builds TabNavigator state with all tabs and the correct selected tab.
+ * Tab navigators require all routes in the state for proper rendering.
+ */
+function getTabNavigatorState(selectedTabRoute: NavigationPartialRoute): NavigationPartialRoute {
+    return {
+        name: NAVIGATORS.TAB_NAVIGATOR,
+        state: buildTabNavigatorNestedState(selectedTabRoute),
+    };
+}
+
+function isRouteWithBackToParam(route: NavigationRoute): route is Route<string, {backTo: string}> {
+    return route.params !== undefined && 'backTo' in route.params && typeof route.params.backTo === 'string';
+}
+
+/**
+ * @param route - The (focused) route to find a full screen route for.
+ * @param isDeeplink - Whether the state is being built from a path (deeplink / browser refresh / cold
+ *   load) as opposed to in-app navigation. When true, deeplink-only relations (e.g. RHP_TO_SEARCH_DEEPLINK)
+ *   are also considered so an RHP can get a sensible default fullscreen underneath it. In-app callers
+ *   (linkTo, swapBackgroundTabForRHPTarget) leave this false so the same RHP can open over any fullscreen
+ *   without changing the page currently underneath.
+ */
+function getMatchingFullScreenRoute(route: NavigationRoute, isDeeplink = false) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- route names in navigation state are typed as string
+    const isDynamicScreen = isDynamicRouteScreen(route.name as Screen);
+
+    // Check for backTo param. One screen with different backTo value may need different screens visible under the overlay.
+    // Dynamic screens are skipped here because they never carry their own backTo - they only
+    // inherit it from the screen underneath. Letting backTo dictate the full-screen route for
+    // a dynamic screen would resolve the wrong page.
+    if (isRouteWithBackToParam(route) && !isDynamicScreen) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- backTo is a path string read from route params
+        const stateForBackTo = getStateFromPath(route.params.backTo as RoutePath);
+
+        // This may happen if the backTo url is invalid.
+        const lastRoute = stateForBackTo?.routes.at(-1);
+        if (!stateForBackTo || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
+            return undefined;
+        }
+
+        const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
+
+        // If the state for back to last route is a full screen route, we can use it
+        if (isLastRouteFullScreen) {
+            return lastRoute;
+        }
+
+        const focusedStateForBackToRoute = findFocusedRouteWithOnyxTabGuard(stateForBackTo);
+
+        if (!focusedStateForBackToRoute) {
+            return undefined;
+        }
+        // If not, get the matching full screen route for the back to state.
+        return getMatchingFullScreenRoute(focusedStateForBackToRoute, isDeeplink);
+    }
+
+    // Deeplink-only relations provide a default search screen underneath the RHP when the state is
+    // built from a path. They are ignored for in-app navigation so the RHP can open over any fullscreen.
+    const matchingSearchScreen = RHP_TO_SEARCH[route.name];
+    const matchingDeeplinkSearchScreen = isDeeplink ? RHP_TO_SEARCH_DEEPLINK[route.name] : undefined;
+    const resolvedSearchScreen = matchingSearchScreen ?? matchingDeeplinkSearchScreen;
+    if (resolvedSearchScreen) {
+        const paramsFromRoute = getParamsFromRoute(resolvedSearchScreen);
+        const copiedParams = paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : {};
+        let queryParam: Record<string, string> = {};
+        if (route.path) {
+            const query = getSearchParamFromPath(route.path, 'q');
+            if (query) {
+                queryParam = {q: query};
+            }
+        }
+
+        // Deeplink-only defaults (e.g. create flows) land on SCREENS.SEARCH.ROOT, which carries no path
+        // params and no `q`. Without an explicit query, SearchQueryProvider falls back to the previous
+        // defined query and can reveal a stale search when the RHP closes. Seed the canned expenses query
+        // so these deeplinks resolve to Spend > Expenses.
+        if (!queryParam.q && !matchingSearchScreen && matchingDeeplinkSearchScreen) {
+            queryParam = {q: getDefaultDeeplinkSearchQuery()};
+        }
+
+        const searchRoute = {
+            name: resolvedSearchScreen,
+            params: Object.keys({...copiedParams, ...queryParam}).length > 0 ? {...copiedParams, ...queryParam} : undefined,
+        };
+        const searchState = getRoutesWithIndex([searchRoute]);
+        return getTabNavigatorState({name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, state: searchState});
+    }
+
+    if (RHP_TO_HOME[route.name]) {
+        return {
+            ...getTabNavigatorState({name: SCREENS.HOME}),
+            path: normalizePath(ROUTES.HOME),
+        };
+    }
+
+    if (RHP_TO_WORKSPACES_LIST[route.name]) {
+        return getTabNavigatorState({
+            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
+            state: getRoutesWithIndex([
+                {
+                    name: SCREENS.WORKSPACES_LIST,
+                    // prepending a slash to ensure closing the RHP after refreshing the page
+                    // replaces the whole path with "/workspaces", instead of just replacing the last url segment ("/x/y/workspaces")
+                    path: normalizePath(ROUTES.WORKSPACES_LIST.route),
+                },
+            ]),
+        });
+    }
+
+    if (RHP_TO_WORKSPACE[route.name]) {
+        const paramsFromRoute = getParamsFromRoute(RHP_TO_WORKSPACE[route.name]);
+
+        const workspaceSplitRoute = getInitialSplitNavigatorState(
+            {
+                name: SCREENS.WORKSPACE.INITIAL,
+                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
+            },
+            {
+                name: RHP_TO_WORKSPACE[route.name],
+                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
+            },
+        );
+
+        return getTabNavigatorState({
+            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
+            state: getRoutesWithIndex([{name: SCREENS.WORKSPACES_LIST}, workspaceSplitRoute]),
+        });
+    }
+
+    if (RHP_TO_SETTINGS[route.name]) {
+        const paramsFromRoute = getParamsFromRoute(RHP_TO_SETTINGS[route.name]);
+
+        const settingsState = getInitialSplitNavigatorState(
+            {name: SCREENS.SETTINGS.ROOT},
+            {
+                name: RHP_TO_SETTINGS[route.name],
+                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
+            },
+        );
+        return getTabNavigatorState(settingsState);
+    }
+
+    if (RHP_TO_DOMAIN[route.name]) {
+        const paramsFromRoute = getParamsFromRoute(RHP_TO_DOMAIN[route.name]);
+
+        const domainSplitRoute = getInitialSplitNavigatorState(
+            {
+                name: SCREENS.DOMAIN.INITIAL,
+                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
+            },
+            {
+                name: RHP_TO_DOMAIN[route.name],
+                params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
+            },
+        );
+
+        return getTabNavigatorState({
+            name: NAVIGATORS.WORKSPACE_NAVIGATOR,
+            state: getRoutesWithIndex([{name: SCREENS.WORKSPACES_LIST}, domainSplitRoute]),
+        });
+    }
+
+    // Fallback: if no specific central screen RELATION matched, check if the RHP screen
+    // maps to a sidebar. This shows the split navigator with just the sidebar (no central screen).
+    if (RHP_TO_SIDEBAR[route.name]) {
+        const splitState = getInitialSplitNavigatorState({
+            name: RHP_TO_SIDEBAR[route.name],
+        });
+        return getTabNavigatorState(splitState);
+    }
+
+    // Handle dynamic routes: find the appropriate full screen route.
+    // Iterate all candidates so that a false-positive first match (e.g. a tag named "gl-code"
+    // colliding with the registered static suffix) does not produce a NOT_FOUND state.
+    if (route.path) {
+        const allSuffixMatches = findAllMatchingDynamicSuffixes(route.path);
+        for (const suffixMatch of allSuffixMatches) {
+            const pathWithoutDynamicSuffix = getPathWithoutDynamicSuffix(suffixMatch.pathUsedForMatching, suffixMatch.actualSuffix, suffixMatch.pattern);
+
+            if (!pathWithoutDynamicSuffix) {
+                continue;
+            }
+
+            // Parse the base path (without dynamic suffix) into a navigation state
+            // to determine which full-screen route should be visible underneath the overlay.
+            const stateUnderDynamicRoute = getStateFromPath(pathWithoutDynamicSuffix);
+            const lastRoute = stateUnderDynamicRoute?.routes.at(-1);
+
+            if (!stateUnderDynamicRoute || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
+                continue;
+            }
+
+            const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
+
+            if (isLastRouteFullScreen) {
+                return lastRoute;
+            }
+
+            const focusedRouteUnderDynamicRoute = findFocusedRouteWithOnyxTabGuard(stateUnderDynamicRoute);
+
+            if (!focusedRouteUnderDynamicRoute) {
+                continue;
+            }
+
+            // Recursively find the matching full screen route for the focused dynamic route
+            return getMatchingFullScreenRoute(focusedRouteUnderDynamicRoute, isDeeplink);
+        }
+    }
+
+    return undefined;
+}
+
+export default getMatchingFullScreenRoute;
+export {getRoutesWithIndex, getTabNavigatorState};
diff --git a/src/libs/Navigation/helpers/linkTo/index.ts b/src/libs/Navigation/helpers/linkTo/index.ts
index 7bafdef8d723..398a68898e57 100644
--- a/src/libs/Navigation/helpers/linkTo/index.ts
+++ b/src/libs/Navigation/helpers/linkTo/index.ts
@@ -1,8 +1,9 @@
-import {getMatchingFullScreenRoute, isFullScreenName} from '@libs/Navigation/helpers/getAdaptedStateFromPath';
+import getMatchingFullScreenRoute from '@libs/Navigation/helpers/getMatchingFullScreenRoute';
 import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
+import {isFullScreenName} from '@libs/Navigation/helpers/isNavigatorName';
 import normalizePath from '@libs/Navigation/helpers/normalizePath';
 import {getTabState} from '@libs/Navigation/helpers/tabNavigatorUtils';
-import {linkingConfig} from '@libs/Navigation/linkingConfig';
+import {config as linkingConfig} from '@libs/Navigation/linkingConfig/config';
 import type {PlatformStackNavigationState} from '@libs/Navigation/PlatformStackNavigation/types';
 import {shallowCompare} from '@libs/ObjectUtils';
 
@@ -204,7 +205,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootNavigatorP
         return;
     }
 
-    const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);
+    const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig);
 
     // If there is no action, just reset the whole state.
     if (!action) {
diff --git a/src/libs/Navigation/helpers/swapBackgroundTabForRHPTarget.ts b/src/libs/Navigation/helpers/swapBackgroundTabForRHPTarget.ts
index 3ba025bb76e3..3f283286e818 100644
--- a/src/libs/Navigation/helpers/swapBackgroundTabForRHPTarget.ts
+++ b/src/libs/Navigation/helpers/swapBackgroundTabForRHPTarget.ts
@@ -10,7 +10,7 @@ import type {NavigationState} from '@react-navigation/native';
 
 import {findFocusedRoute} from '@react-navigation/native';
 
-import {getMatchingFullScreenRoute} from './getAdaptedStateFromPath';
+import getMatchingFullScreenRoute from './getMatchingFullScreenRoute';
 import getStateFromPath from './getStateFromPath';
 import {getMatchingFullScreenRouteParams, shouldChangeToMatchingFullScreen} from './linkTo';
 import {getTabState} from './tabNavigatorUtils';
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 618345e4caaa..896b19fcd9da 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -131,7 +131,7 @@ import getReportURLForCurrentContext from './Navigation/helpers/getReportURLForC
 import getStateFromPath from './Navigation/helpers/getStateFromPath';
 import {isFullScreenName} from './Navigation/helpers/isNavigatorName';
 import isSearchTopmostFullScreenRoute from './Navigation/helpers/isSearchTopmostFullScreenRoute';
-import {linkingConfig} from './Navigation/linkingConfig';
+import linkingPrefixes from './Navigation/linkingConfig/prefixes';
 import Navigation, {navigationRef} from './Navigation/Navigation';
 import {getDBTimeWithSkew, getServerAnchoredDBTime} from './NetworkState';
 import {rand64} from './NumberUtils';
@@ -10923,7 +10923,7 @@ function getRouteFromLink(url: string | null): string {
     // Get the reportID from URL
     let route = url;
     const localWebAndroidRegEx = /^(https:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
-    for (const prefix of linkingConfig.prefixes) {
+    for (const prefix of linkingPrefixes) {
         if (route.startsWith(prefix)) {
             route = route.replace(prefix, '');
         } else if (localWebAndroidRegEx.test(route)) {
diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
index 45b7acede9d9..0d4903de7e84 100644
--- a/src/libs/actions/Welcome/OnboardingFlow.ts
+++ b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -1,6 +1,6 @@
 import {translate} from '@libs/Localize';
 import getAdaptedStateFromPath from '@libs/Navigation/helpers/getAdaptedStateFromPath';
-import {linkingConfig} from '@libs/Navigation/linkingConfig';
+import {config as linkingConfig} from '@libs/Navigation/linkingConfig/config';
 import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 
 import {openApp} from '@userActions/App';
@@ -119,7 +119,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
         isAccountValidated,
     } = getOnboardingInitialPathParams;
     const initialPath = onboardingInitialPath ?? '';
-    const state = getStateFromPath(initialPath, linkingConfig.config);
+    const state = getStateFromPath(initialPath, linkingConfig);
     const currentOnboardingValues = onboardingValuesParam ?? onboardingValues;
     const isVsb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
     const isSmb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
diff --git a/tests/navigation/getMatchingFullScreenRouteTests.ts b/tests/navigation/getMatchingFullScreenRouteTests.ts
index d4fee769c7a6..9ec3af259537 100644
--- a/tests/navigation/getMatchingFullScreenRouteTests.ts
+++ b/tests/navigation/getMatchingFullScreenRouteTests.ts
@@ -1,5 +1,5 @@
 import findFocusedRouteWithOnyxTabGuard from '@libs/Navigation/helpers/findFocusedRouteWithOnyxTabGuard';
-import {getMatchingFullScreenRoute} from '@libs/Navigation/helpers/getAdaptedStateFromPath';
+import getMatchingFullScreenRoute from '@libs/Navigation/helpers/getMatchingFullScreenRoute';
 import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
 
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -13,10 +13,6 @@ jest.mock('@libs/Navigation/linkingConfig/config', () => ({
     dynamicTabPatternToTabPaths: new Map(),
 }));
 
-jest.mock('@libs/ReportUtils', () => ({
-    getReportOrDraftReport: jest.fn(),
-}));
-
 jest.mock('@libs/Navigation/helpers/getStateFromPath', () => jest.fn());
 jest.mock('@libs/Navigation/helpers/findFocusedRouteWithOnyxTabGuard', () => jest.fn());
 
diff --git a/tests/unit/Navigation/swapBackgroundTabForRHPTarget.test.ts b/tests/unit/Navigation/swapBackgroundTabForRHPTarget.test.ts
index 29efcc74ceec..4fe2b20be48f 100644
--- a/tests/unit/Navigation/swapBackgroundTabForRHPTarget.test.ts
+++ b/tests/unit/Navigation/swapBackgroundTabForRHPTarget.test.ts
@@ -1,4 +1,4 @@
-import {getMatchingFullScreenRoute} from '@libs/Navigation/helpers/getAdaptedStateFromPath';
+import getMatchingFullScreenRoute from '@libs/Navigation/helpers/getMatchingFullScreenRoute';
 import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
 import swapBackgroundTabForRHPTarget from '@libs/Navigation/helpers/swapBackgroundTabForRHPTarget';
 import navigationRef from '@libs/Navigation/navigationRef';
@@ -13,7 +13,7 @@ import type {NavigationState} from '@react-navigation/native';
 
 import createMock from '../../utils/createMock';
 
-jest.mock('@libs/Navigation/helpers/getAdaptedStateFromPath', () => ({getMatchingFullScreenRoute: jest.fn()}));
+jest.mock('@libs/Navigation/helpers/getMatchingFullScreenRoute', () => jest.fn());
 jest.mock('@libs/Navigation/helpers/getStateFromPath', () => jest.fn());
 jest.mock('@libs/Navigation/navigationRef', () => ({dispatch: jest.fn()}));
 

From 1788540c433669ad78ee69d9a6ad8fc02def0165 Mon Sep 17 00:00:00 2001
From: oqildev <oqilahmad99@gmail.com>
Date: Tue, 6 Oct 2026 19:42:14 +0500
Subject: [PATCH 307/781] Stop doubling the bottom safe area padding on the
 Uber send invites page

The Send invites ScreenWrapper was left in legacy safe area mode, so it
rendered its own bottom inset spacer while the confirm button footer of the
SelectionList added the same inset again. On native that left an oversized
gap below the Confirm button.

The list ScreenWrapper now uses edge-to-edge mode, which drops the legacy
spacer and leaves the footer as the only place that adds the inset, like on
the workspace member invite page.

The "All set" branch stays in legacy mode on purpose. ConfirmationPage's
footer does not add the inset itself, so it still needs the ScreenWrapper
spacer to keep the button above the home indicator. The new tests cover both
branches.
---
 .../DynamicInviteReceiptPartnerPolicyPage.tsx |  5 +-
 tests/ui/WorkspaceReceiptPartnersTest.tsx     | 95 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx b/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
index 907e06819f86..9b6457299956 100644
--- a/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
+++ b/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
@@ -212,7 +212,10 @@ function DynamicInviteReceiptPartnerPolicyPage({route}: DynamicInviteReceiptPart
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED}
         >
-            <ScreenWrapper testID="DynamicInviteReceiptPartnerPolicyPage">
+            <ScreenWrapper
+                testID="DynamicInviteReceiptPartnerPolicyPage"
+                enableEdgeToEdgeBottomSafeAreaPadding
+            >
                 <HeaderWithBackButton
                     title={translate('workspace.receiptPartners.uber.sendInvites')}
                     onBackButtonPress={() => Navigation.goBack(backPath)}
diff --git a/tests/ui/WorkspaceReceiptPartnersTest.tsx b/tests/ui/WorkspaceReceiptPartnersTest.tsx
index 3b0a5d24ebd1..09b6b703888f 100644
--- a/tests/ui/WorkspaceReceiptPartnersTest.tsx
+++ b/tests/ui/WorkspaceReceiptPartnersTest.tsx
@@ -1,4 +1,4 @@
-import {act, render, screen, waitFor} from '@testing-library/react-native';
+import {act, render, renderHook, screen, waitFor} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
@@ -9,6 +9,8 @@ import PersonalDetailsByLoginProvider from '@components/PersonalDetailsByLoginPr
 import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
 import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
 import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
+import * as useSafeAreaInsetsModule from '@hooks/useSafeAreaInsets';
+import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 
@@ -26,6 +28,7 @@ import type {PersonalDetails} from '@src/types/onyx';
 import {PortalProvider} from '@gorhom/portal';
 import {NavigationContainer} from '@react-navigation/native';
 import React from 'react';
+import {StyleSheet} from 'react-native';
 import Onyx from 'react-native-onyx';
 
 import * as LHNTestUtils from '../utils/LHNTestUtils';
@@ -261,4 +264,94 @@ describe('WorkspaceReceiptPartners', () => {
         });
         expect(screen.getByText(TestHelper.translateLocal('workspace.receiptPartners.uber.centralBillingAccount'))).toBeOnTheScreen();
     });
+
+    describe('bottom safe area padding', () => {
+        const BOTTOM_INSET = 34;
+        let useSafeAreaInsetsSpy: jest.SpyInstance;
+
+        beforeEach(() => {
+            useSafeAreaInsetsSpy = jest.spyOn(useSafeAreaInsetsModule, 'default');
+        });
+
+        afterEach(() => {
+            useSafeAreaInsetsSpy.mockRestore();
+        });
+
+        /** Renders the invite page on a device with the given bottom inset and sums the bottom padding of every view on the screen. */
+        const getInvitePageBottomPadding = async (bottomInset: number, headerTitle: string) => {
+            useSafeAreaInsetsSpy.mockReturnValue({top: 0, right: 0, bottom: bottomInset, left: 0});
+            const {unmount} = renderInvitePage({policyID, integration: UBER_INTEGRATION});
+
+            await waitForBatchedUpdatesWithAct();
+            await waitFor(() => {
+                expect(screen.getByText(headerTitle)).toBeOnTheScreen();
+            });
+
+            const totalBottomPadding = screen
+                .getByTestId('DynamicInviteReceiptPartnerPolicyPage')
+                .findAll((node) => typeof node.type === 'string')
+                .reduce((total, node) => {
+                    const style: unknown = StyleSheet.flatten(node.props.style);
+                    if (!style || typeof style !== 'object' || !('paddingBottom' in style) || typeof style.paddingBottom !== 'number') {
+                        return total;
+                    }
+                    return total + style.paddingBottom;
+                }, 0);
+
+            unmount();
+            return totalBottomPadding;
+        };
+
+        /** Returns how much bottom padding the inset adds to the invite page, compared to a device without a bottom inset. */
+        const getBottomPaddingAddedByInset = async (headerTitle: string) => {
+            const bottomPaddingWithoutInset = await getInvitePageBottomPadding(0, headerTitle);
+            const bottomPaddingWithInset = await getInvitePageBottomPadding(BOTTOM_INSET, headerTitle);
+            return bottomPaddingWithInset - bottomPaddingWithoutInset;
+        };
+
+        const getSafeAreaPaddingBottom = () => renderHook(() => useSafeAreaPaddings(true)).result.current.paddingBottom;
+
+        it('applies the bottom safe area padding only once on the send invites page', async () => {
+            // Given a workspace with members that can still be invited to Uber, so the page shows the member list with the confirm button footer
+            await TestHelper.signInWithTestUser();
+            await act(async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, basePolicy);
+                await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, employeePersonalDetails);
+            });
+
+            // When the page is rendered on a device that has a bottom safe area inset
+            const bottomPaddingAddedByInset = await getBottomPaddingAddedByInset(TestHelper.translateLocal('workspace.receiptPartners.uber.sendInvites'));
+
+            // Then the inset should be added only once, because the confirm button footer already includes it and ScreenWrapper adding it again leaves an oversized gap below the button
+            expect(bottomPaddingAddedByInset).toBeCloseTo(getSafeAreaPaddingBottom());
+        });
+
+        it('keeps the bottom safe area padding on the all set page', async () => {
+            // Given a workspace where every member is already linked to Uber, so there is nobody left to invite and the page skips to the "All set" confirmation
+            await TestHelper.signInWithTestUser();
+            const linkedEmployee = {status: CONST.POLICY.RECEIPT_PARTNERS.UBER_EMPLOYEE_STATUS.LINKED};
+            await act(async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+                    ...basePolicy,
+                    receiptPartners: {
+                        ...basePolicy.receiptPartners,
+                        uber: {
+                            ...basePolicy.receiptPartners.uber,
+                            employees: {
+                                [EMPLOYEE_EMAIL]: linkedEmployee,
+                                [BILLING_EMAIL]: linkedEmployee,
+                            },
+                        },
+                    },
+                });
+                await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, employeePersonalDetails);
+            });
+
+            // When the page is rendered on a device that has a bottom safe area inset
+            const bottomPaddingAddedByInset = await getBottomPaddingAddedByInset(TestHelper.translateLocal('workspace.receiptPartners.uber.allSet'));
+
+            // Then the inset should still be added once, because the confirmation footer does not include it and relies on ScreenWrapper to keep the button above the home indicator
+            expect(bottomPaddingAddedByInset).toBeCloseTo(getSafeAreaPaddingBottom());
+        });
+    });
 });

From 45ff0ef2c03bfa92162af5a04cebdf4351e679db Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:09:17 +0700
Subject: [PATCH 308/781] Drop the unrelated ReceiptTypeValues export

The PR exported ReceiptTypeValues by mistake. No file imports it, and knip
flagged it as a new unused export.
---
 src/types/form/SearchAdvancedFiltersForm.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 81008ef74563..c8de24566052 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -942,7 +942,6 @@ export type {
     ExpenseTypeValues,
     MerchantMatchType,
     ReceiptTypeValue,
-    ReceiptTypeValues,
     TransactionStatusValue,
     SearchNegatableFilterKeys,
 };

From 941bca48e24766b6553186b948b2da69533c4f66 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 7 Oct 2026 11:28:46 +0200
Subject: [PATCH 309/781] Add multiple office handling

---
 src/CONST/index.ts                            |  11 +
 src/ONYXKEYS.ts                               |   3 +
 src/ROUTES.ts                                 |  12 +
 src/SCREENS.ts                                |   2 +
 src/components/AddressForm.tsx                |  58 +++-
 src/components/CheckboxWithLabel.tsx          |   6 +
 src/languages/de.ts                           |  21 ++
 src/languages/el.ts                           |  21 ++
 src/languages/en.ts                           |  21 ++
 src/languages/es.ts                           |  21 ++
 src/languages/fr.ts                           |  21 ++
 src/languages/it.ts                           |  21 ++
 src/languages/ja.ts                           |  21 ++
 src/languages/nl.ts                           |  21 ++
 src/languages/pl.ts                           |  21 ++
 src/languages/pt-BR.ts                        |  21 ++
 src/languages/zh-hans.ts                      |  21 ++
 .../API/parameters/AddOfficeLocationParams.ts |  17 ++
 .../parameters/DeleteOfficeLocationParams.ts  |   6 +
 .../parameters/UpdateOfficeLocationParams.ts  |  15 +
 src/libs/API/parameters/index.ts              |   3 +
 src/libs/API/types.ts                         |   6 +
 .../ModalStackNavigators/index.tsx            |   2 +
 .../RELATIONS/WORKSPACE_TO_RHP.ts             |   2 +
 src/libs/Navigation/linkingConfig/config.ts   |   2 +
 src/libs/Navigation/types.ts                  |   9 +
 src/libs/PolicyUtils/index.ts                 |   8 +
 src/libs/ReportActionsUtils.ts                |  42 +++
 src/libs/actions/Policy/DistanceRate.ts       | 190 ++++++++++++-
 .../actionContents/PolicyChangeLogContent.tsx |   6 +
 .../WorkspaceOfficeLocationAddPage.tsx        |  80 ++++++
 .../WorkspaceOfficeLocationEditPage.tsx       | 114 ++++++++
 .../workspace/WorkspaceOfficeLocationForm.tsx | 141 ++++++++++
 src/pages/workspace/WorkspaceOverviewPage.tsx |  97 ++++++-
 .../PolicyCommuterExclusionsPage.tsx          |   4 +-
 src/types/form/WorkspaceOfficeLocationForm.ts |  35 +++
 src/types/form/index.ts                       |   1 +
 src/types/onyx/OriginalMessage.ts             |  35 ++-
 src/types/onyx/Policy.ts                      |  19 ++
 tests/actions/PolicyOfficeLocationTest.ts     | 263 ++++++++++++++++++
 tests/unit/PolicyUtilsTest.ts                 |  18 ++
 tests/unit/ReportActionsUtilsTest.ts          |  59 ++++
 42 files changed, 1474 insertions(+), 23 deletions(-)
 create mode 100644 src/libs/API/parameters/AddOfficeLocationParams.ts
 create mode 100644 src/libs/API/parameters/DeleteOfficeLocationParams.ts
 create mode 100644 src/libs/API/parameters/UpdateOfficeLocationParams.ts
 create mode 100644 src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
 create mode 100644 src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
 create mode 100644 src/pages/workspace/WorkspaceOfficeLocationForm.tsx
 create mode 100644 src/types/form/WorkspaceOfficeLocationForm.ts
 create mode 100644 tests/actions/PolicyOfficeLocationTest.ts

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index bde832c72f9f..73346bd0f6c6 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1866,6 +1866,9 @@ const CONST = {
                     ADD_AGENT_RULE: 'POLICYCHANGELOG_ADD_AGENT_RULE',
                     UPDATE_AGENT_RULE: 'POLICYCHANGELOG_UPDATE_AGENT_RULE',
                     DELETE_AGENT_RULE: 'POLICYCHANGELOG_DELETE_AGENT_RULE',
+                    ADD_OFFICE_LOCATION: 'POLICYCHANGELOG_ADD_OFFICE_LOCATION',
+                    UPDATE_OFFICE_LOCATION: 'POLICYCHANGELOG_UPDATE_OFFICE_LOCATION',
+                    DELETE_OFFICE_LOCATION: 'POLICYCHANGELOG_DELETE_OFFICE_LOCATION',
                     ADD_RULE: 'POLICYCHANGELOG_ADD_RULE',
                     UPDATE_RULE: 'POLICYCHANGELOG_UPDATE_RULE',
                     REMOVE_RULE: 'POLICYCHANGELOG_REMOVE_RULE',
@@ -4795,6 +4798,11 @@ const CONST = {
             FIXED_DISTANCE: 'fixedDistance',
             DISABLED: 'disabled',
         },
+        OFFICE_LOCATION_FIELD: {
+            NAME: 'name',
+            ADDRESS: 'address',
+            IS_DEFAULT: 'isDefault',
+        },
         RECEIPT_PARTNERS: {
             NAME: {UBER: 'uber'},
             NAME_USER_FRIENDLY: {
@@ -9857,6 +9865,9 @@ const CONST = {
                 DESCRIPTION: 'WorkspaceOverview-Description',
                 CURRENCY: 'WorkspaceOverview-Currency',
                 ADDRESS: 'WorkspaceOverview-Address',
+                OFFICE_LOCATION: 'WorkspaceOverview-OfficeLocation',
+                ADD_OFFICE_LOCATION: 'WorkspaceOverview-AddOfficeLocation',
+                DELETE_OFFICE_LOCATION: 'WorkspaceOverview-DeleteOfficeLocation',
                 PLAN_TYPE: 'WorkspaceOverview-PlanType',
                 SHARE: 'WorkspaceOverview-Share',
                 CUSTOM_RULES: 'WorkspaceOverview-CustomRules',
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 68574f4d2581..7a075f661e8d 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1381,6 +1381,8 @@ const ONYXKEYS = {
         ADD_AGENT_RULE_FORM_DRAFT: 'addAgentRuleFormDraft',
         EDIT_AGENT_RULE_FORM: 'editAgentRuleForm',
         EDIT_AGENT_RULE_FORM_DRAFT: 'editAgentRuleFormDraft',
+        WORKSPACE_OFFICE_LOCATION_FORM: 'workspaceOfficeLocationForm',
+        WORKSPACE_OFFICE_LOCATION_FORM_DRAFT: 'workspaceOfficeLocationFormDraft',
         RILLET_CREDENTIALS_FORM: 'rilletCredentialsForm',
         RILLET_CREDENTIALS_FORM_DRAFT: 'rilletCredentialsFormDraft',
         DUALENTRY_CREDENTIALS_FORM: 'dualEntryCredentialsForm',
@@ -1542,6 +1544,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM]: FormTypes.EditAgentPromptForm;
     [ONYXKEYS.FORMS.ADD_AGENT_RULE_FORM]: FormTypes.AddAgentRuleForm;
     [ONYXKEYS.FORMS.EDIT_AGENT_RULE_FORM]: FormTypes.EditAgentRuleForm;
+    [ONYXKEYS.FORMS.WORKSPACE_OFFICE_LOCATION_FORM]: FormTypes.WorkspaceOfficeLocationForm;
     [ONYXKEYS.FORMS.RILLET_CREDENTIALS_FORM]: FormTypes.RilletCredentialsForm;
     [ONYXKEYS.FORMS.DUALENTRY_CREDENTIALS_FORM]: FormTypes.DualEntryCredentialsForm;
     [ONYXKEYS.FORMS.CAMPFIRE_CREDENTIALS_FORM]: FormTypes.CampfireCredentialsForm;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 5f66dbb0ad7d..3db7a5fc5f21 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -982,6 +982,8 @@ const DYNAMIC_ROUTES = {
             SCREENS.SETTINGS.PROFILE.ADDRESS,
             SCREENS.SETTINGS.PROFILE.PRIVATE_PERSONAL_DETAILS,
             SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS,
+            SCREENS.WORKSPACE.OFFICE_LOCATION_ADD,
+            SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT,
             SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS,
             SCREENS.DOMAIN_CARD.DOMAIN_CARD_UPDATE_ADDRESS,
             SCREENS.TRAVEL.ENABLE,
@@ -998,6 +1000,8 @@ const DYNAMIC_ROUTES = {
             SCREENS.SETTINGS.PROFILE.ADDRESS,
             SCREENS.SETTINGS.PROFILE.PRIVATE_PERSONAL_DETAILS,
             SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS,
+            SCREENS.WORKSPACE.OFFICE_LOCATION_ADD,
+            SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT,
             SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS,
             SCREENS.DOMAIN_CARD.DOMAIN_CARD_UPDATE_ADDRESS,
             SCREENS.TRAVEL.ENABLE,
@@ -3266,6 +3270,14 @@ const ROUTES = {
         route: 'workspaces/:policyID/overview/share',
         getRoute: (policyID: string) => `workspaces/${policyID}/overview/share` as const,
     },
+    WORKSPACE_OVERVIEW_OFFICE_LOCATION_ADD: {
+        route: 'workspaces/:policyID/overview/office-locations/new',
+        getRoute: (policyID: string) => `workspaces/${policyID}/overview/office-locations/new` as const,
+    },
+    WORKSPACE_OVERVIEW_OFFICE_LOCATION_EDIT: {
+        route: 'workspaces/:policyID/overview/office-locations/:officeID',
+        getRoute: (policyID: string, officeID: string) => `workspaces/${policyID}/overview/office-locations/${officeID}` as const,
+    },
     WORKSPACE_AVATAR: {
         route: 'workspaces/:policyID/avatar',
         getRoute: (policyID: string, fallbackLetter?: UpperCaseCharacters) => `workspaces/${policyID}/avatar${fallbackLetter ? `?letter=${fallbackLetter}` : ''}` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 2f77bf714cf3..2d70d53684b2 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -916,6 +916,8 @@ const SCREENS = {
         DESCRIPTION: 'Workspace_Overview_Description',
         SHARE: 'Workspace_Overview_Share',
         NAME: 'Workspace_Overview_Name',
+        OFFICE_LOCATION_ADD: 'Workspace_Overview_Office_Location_Add',
+        OFFICE_LOCATION_EDIT: 'Workspace_Overview_Office_Location_Edit',
         CLIENT_ID: 'Workspace_Overview_Client_ID',
         CATEGORY_CREATE: 'Category_Create',
         DYNAMIC_CATEGORY_CREATE: 'Dynamic_Category_Create',
diff --git a/src/components/AddressForm.tsx b/src/components/AddressForm.tsx
index 4f2c928a9243..02749b7f14cb 100644
--- a/src/components/AddressForm.tsx
+++ b/src/components/AddressForm.tsx
@@ -7,13 +7,14 @@ import type {Country} from '@src/CONST';
 import CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/HomeAddressForm';
-import type {Errors} from '@src/types/onyx/OnyxCommon';
+
+import type {ReactNode} from 'react';
 
 import {CONST as COMMON_CONST} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 
-import type {FormOnyxValues} from './Form/types';
+import type {FormInputErrors, FormOnyxValues} from './Form/types';
 import type {State} from './StateSelector';
 
 import AddressSearch from './AddressSearch';
@@ -28,7 +29,9 @@ type CountryZipRegex = {
     samples?: string;
 };
 
-type AddressFormProps = {
+type AddressFormID = typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM | typeof ONYXKEYS.FORMS.WORKSPACE_OFFICE_LOCATION_FORM;
+
+type AddressFormProps<TFormID extends AddressFormID> = {
     /** Address city field */
     city?: string;
 
@@ -51,7 +54,7 @@ type AddressFormProps = {
     onAddressChanged?: (value: unknown, key: unknown) => void;
 
     /** Callback which is executed when the user submits his address changes */
-    onSubmit: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) => void;
+    onSubmit: (values: FormOnyxValues<TFormID>) => void;
 
     /** Whether or not should the form data should be saved as draft */
     shouldSaveDraft?: boolean;
@@ -60,7 +63,16 @@ type AddressFormProps = {
     submitButtonText?: string;
 
     /** A unique Onyx key identifying the form */
-    formID: typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM;
+    formID: TFormID;
+
+    /** Inputs of the same form rendered above the address fields */
+    inputsBeforeAddress?: ReactNode;
+
+    /** Inputs of the same form rendered below the address fields */
+    inputsAfterAddress?: ReactNode;
+
+    /** Validates the inputs added above or below the address fields. Its errors are added to the address errors. */
+    validate?: (values: FormOnyxValues<TFormID>) => Record<string, string>;
 
     /** Whether to hide the country selector (e.g. when country cannot be changed) */
     shouldHideCountrySelector?: boolean;
@@ -86,7 +98,7 @@ type AddressFormProps = {
     addBottomSafeAreaPadding?: boolean;
 };
 
-function AddressForm({
+function AddressForm<TFormID extends AddressFormID>({
     city = '',
     country = '',
     formID,
@@ -103,7 +115,10 @@ function AddressForm({
     shouldRequireZip = false,
     shouldValidatePhysicalAddress = false,
     addBottomSafeAreaPadding = true,
-}: AddressFormProps) {
+    inputsBeforeAddress,
+    inputsAfterAddress,
+    validate,
+}: AddressFormProps<TFormID>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
@@ -121,13 +136,14 @@ function AddressForm({
      */
 
     const validator = useCallback(
-        (rawValues: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>): Errors => {
+        (rawValues: FormOnyxValues<TFormID>): FormInputErrors<TFormID> => {
+            // Every form rendered here has the home address fields, so they are validated the same way
+            const addressValues: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM> = rawValues;
+
             // When hidden, the country input is unregistered so fall back to the country prop.
-            const values = shouldHideCountrySelector ? {...rawValues, country: rawValues.country || country} : rawValues;
+            const values = shouldHideCountrySelector ? {...addressValues, country: addressValues.country || country} : addressValues;
 
-            const errors: Errors & {
-                zipPostCode?: string | string[];
-            } = {};
+            const errors: Record<string, string> = {};
             const baseRequiredFields = shouldHideCountrySelector ? (['addressLine1', 'city', 'state'] as const) : (['addressLine1', 'city', 'country', 'state'] as const);
             const requiredFields = shouldRequireZip ? ([...baseRequiredFields, 'zipPostCode'] as const) : baseRequiredFields;
 
@@ -193,9 +209,11 @@ function AddressForm({
                 errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat');
             }
 
-            return errors;
+            // TypeScript can't tell that the address input IDs are keys of a generic form, though every form in AddressFormID has them
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            return (validate ? {...errors, ...validate(rawValues)} : errors) as FormInputErrors<TFormID>;
         },
-        [translate, shouldHideCountrySelector, country, shouldRequireZip, shouldValidatePhysicalAddress],
+        [translate, shouldHideCountrySelector, country, shouldRequireZip, shouldValidatePhysicalAddress, validate],
     );
 
     return (
@@ -208,6 +226,12 @@ function AddressForm({
             enabledWhenOffline={enabledWhenOfflineProp}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
         >
+            {!!inputsBeforeAddress && (
+                <>
+                    {inputsBeforeAddress}
+                    <View style={styles.formSpaceVertical} />
+                </>
+            )}
             <View>
                 <InputWrapper
                     InputComponent={AddressSearch}
@@ -305,6 +329,12 @@ function AddressForm({
                 shouldSaveDraft={shouldSaveDraft}
                 autoComplete="postal-code"
             />
+            {!!inputsAfterAddress && (
+                <>
+                    <View style={styles.formSpaceVertical} />
+                    {inputsAfterAddress}
+                </>
+            )}
         </FormProvider>
     );
 }
diff --git a/src/components/CheckboxWithLabel.tsx b/src/components/CheckboxWithLabel.tsx
index 77d0f0c47bc6..4d9ec5ee97ff 100644
--- a/src/components/CheckboxWithLabel.tsx
+++ b/src/components/CheckboxWithLabel.tsx
@@ -48,6 +48,9 @@ type CheckboxWithLabelProps = RequiredLabelProps & {
 
     defaultValue?: boolean;
 
+    /** Whether the checkbox can't be toggled */
+    disabled?: boolean;
+
     /** The ID used to uniquely identify the input in a Form */
     /* eslint-disable-next-line react/no-unused-prop-types */
     inputID?: string;
@@ -70,6 +73,7 @@ function CheckboxWithLabel({
     accessibilityLabel,
     style,
     value,
+    disabled = false,
     ref,
 }: CheckboxWithLabelProps) {
     const styles = useThemeStyles();
@@ -96,6 +100,7 @@ function CheckboxWithLabel({
                     onPress={toggleCheckbox}
                     style={[styles.checkboxWithLabelCheckboxStyle]}
                     hasError={!!errorText}
+                    disabled={disabled}
                     ref={ref}
                     accessibilityLabel={accessibilityLabel ?? label ?? ''}
                 />
@@ -103,6 +108,7 @@ function CheckboxWithLabel({
                     tabIndex={-1}
                     accessible={false}
                     onPress={toggleCheckbox}
+                    disabled={disabled}
                     pressDimmingValue={variables.checkboxLabelActiveOpacity}
                     // We want to disable hover dimming
                     hoverDimmingValue={variables.checkboxLabelHoverOpacity}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index e1ac70e7b154..8493603bfe60 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7706,6 +7706,19 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             addressContext: 'Für die Aktivierung von Expensify Travel ist eine Workspace-Adresse erforderlich. Bitte gib eine Adresse ein, die deinem Unternehmen zugeordnet ist.',
             policy: 'Spesenrichtlinie',
         },
+        officeLocations: {
+            title: 'Bürostandorte',
+            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern zuzuweisen, zum Beispiel für die Entfernungserfassung.',
+            addOfficeLocation: 'Bürostandort hinzufügen',
+            editOfficeLocation: 'Bürostandort bearbeiten',
+            locationName: 'Standortname',
+            locationNameHint: 'Wählen Sie einen Spitznamen für den Standort, wenn Sie mehrere Bürostandorte hinzufügen',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Bürostandort ${officeNumber}`,
+            setAsPrimary: 'Als Hauptstandort festlegen',
+            primary: 'Hauptstandort',
+            deleteOfficeLocation: 'Bürostandort löschen',
+            deleteOfficeLocationConfirmation: 'Möchten Sie diesen Bürostandort wirklich löschen?',
+        },
         bankAccount: {
             continueWithSetup: 'Einrichtung fortsetzen',
             youAreAlmostDone:
@@ -9506,6 +9519,14 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ zu verbotenen Ausgaben hinzugefügt`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ aus verbotenen Ausgaben entfernt`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ (${address}) hinzugefügt`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `hat den Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `hat die Adresse des Bürostandorts „${name}“ in „${newAddress}“ geändert (zuvor „${oldAddress}“)`,
+            setAsPrimary: ({name}: {name: string}) => `hat den Bürostandort „${name}“ als Hauptstandort festgelegt`,
+            removed: ({name}: {name: string}) => `hat den Bürostandort „${name}“ entfernt`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `Ausschluss von Arbeitswegen in eine feste Entfernung pro Abrechnung geändert (zuvor ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `Ausschluss von Pendelstrecken geändert, um nach Wohnort und Büro zu berechnen (zuvor ${previousMethod})`,
diff --git a/src/languages/el.ts b/src/languages/el.ts
index efec389bde0d..586dfcfa304e 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -7999,6 +7999,19 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
                 'Απαιτείται μια διεύθυνση χώρου εργασίας για να ενεργοποιήσετε το Expensify Travel. Παρακαλούμε εισαγάγετε μια διεύθυνση που να σχετίζεται με την επιχείρησή σας.',
             policy: 'Πολιτική εξόδων',
         },
+        officeLocations: {
+            title: 'Τοποθεσίες γραφείων',
+            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αναθέσετε σε μέλη, για παράδειγμα για την παρακολούθηση αποστάσεων.',
+            addOfficeLocation: 'Προσθήκη τοποθεσίας γραφείου',
+            editOfficeLocation: 'Επεξεργασία τοποθεσίας γραφείου',
+            locationName: 'Όνομα τοποθεσίας',
+            locationNameHint: 'Επιλέξτε ένα ψευδώνυμο για την τοποθεσία αν προσθέτετε πολλές τοποθεσίες γραφείων',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Τοποθεσία γραφείου ${officeNumber}`,
+            setAsPrimary: 'Ορισμός ως κύριας',
+            primary: 'Κύρια',
+            deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
+            deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή την τοποθεσία γραφείου;',
+        },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
             youAreAlmostDone:
@@ -9631,6 +9644,14 @@ ${reportName}`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `προστέθηκε το "${prohibitedExpense}" στις απαγορευμένες δαπάνες`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `αφαιρέσατε το «${prohibitedExpense}» από τις απαγορευμένες δαπάνες`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `πρόσθεσε την τοποθεσία γραφείου «${name}» (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου «${oldName}» σε «${newName}»`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `άλλαξε τη διεύθυνση της τοποθεσίας γραφείου «${name}» σε «${newAddress}» (προηγουμένως «${oldAddress}»)`,
+            setAsPrimary: ({name}: {name: string}) => `όρισε την τοποθεσία γραφείου «${name}» ως κύρια`,
+            removed: ({name}: {name: string}) => `αφαίρεσε την τοποθεσία γραφείου «${name}»`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
                 `αλλάχθηκε ο αποκλεισμός μετακινήσεων από/προς εργασία σε σταθερή απόσταση ανά αίτημα (προηγουμένως ${previousMethod})`,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c323aab09500..855380b97627 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8217,6 +8217,19 @@ const translations = {
             addressContext: 'A Workspace Address is required to enable Expensify Travel. Please enter an address associated with your business.',
             policy: 'Expense policy',
         },
+        officeLocations: {
+            title: 'Office locations',
+            subtitle: 'Add office locations to assign to members for things like distance tracking.',
+            addOfficeLocation: 'Add office location',
+            editOfficeLocation: 'Edit office location',
+            locationName: 'Location name',
+            locationNameHint: 'Choose a location nickname if you are adding multiple office locations',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Office location ${officeNumber}`,
+            setAsPrimary: 'Set as primary',
+            primary: 'Primary',
+            deleteOfficeLocation: 'Delete office location',
+            deleteOfficeLocationConfirmation: 'Are you sure you want to delete this office location?',
+        },
         bankAccount: {
             continueWithSetup: 'Continue setup',
             youAreAlmostDone: "You're almost done setting up your bank account, which will let you issue corporate cards, reimburse expenses, collect invoices, and pay bills.",
@@ -9657,6 +9670,14 @@ const translations = {
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `added "${prohibitedExpense}" to prohibited expenses`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removed "${prohibitedExpense}" from prohibited expenses`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `added the office location "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renamed the office location "${oldName}" to "${newName}"`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `changed the address of the office location "${name}" to "${newAddress}" (previously "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `set the office location "${name}" as primary`,
+            removed: ({name}: {name: string}) => `removed the office location "${name}"`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `changed exclude commutes to a fixed distance per claim (previously ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `changed exclude commutes to calculate by home and office (previously ${previousMethod})`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 5d22f6494554..1ad8e38e72c7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7725,6 +7725,19 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             addressContext: 'Se requiere una dirección para habilitar Expensify Travel. Por favor, introduce una dirección asociada con tu negocio.',
             policy: 'Política de gastos',
         },
+        officeLocations: {
+            title: 'Ubicaciones de oficina',
+            subtitle: 'Añade ubicaciones de oficina para asignarlas a los miembros, por ejemplo, para el seguimiento de distancias.',
+            addOfficeLocation: 'Añadir ubicación de oficina',
+            editOfficeLocation: 'Editar ubicación de oficina',
+            locationName: 'Nombre de la ubicación',
+            locationNameHint: 'Elige un apodo para la ubicación si vas a añadir varias ubicaciones de oficina',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de oficina ${officeNumber}`,
+            setAsPrimary: 'Establecer como principal',
+            primary: 'Principal',
+            deleteOfficeLocation: 'Eliminar ubicación de oficina',
+            deleteOfficeLocationConfirmation: '¿Estás seguro de que quieres eliminar esta ubicación de oficina?',
+        },
         bankAccount: {
             continueWithSetup: 'Continuar con la configuración',
             youAreAlmostDone: 'Casi has acabado de configurar tu cuenta bancaria, que te permitirá emitir tarjetas corporativas, reembolsar gastos y cobrar pagar facturas.',
@@ -9282,6 +9295,14 @@ ${reportName}`,
         updatedTimeRate: (newRate, oldRate) => `cambió la tarifa por hora a "${newRate}" (anteriormente "${oldRate}")`,
         addedProhibitedExpense: ({prohibitedExpense}) => `añadió "${prohibitedExpense}" a los gastos prohibidos`,
         removedProhibitedExpense: ({prohibitedExpense}) => `eliminó "${prohibitedExpense}" de los gastos prohibidos`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `añadió la ubicación de oficina "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la ubicación de oficina "${oldName}" a "${newName}"`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `cambió la dirección de la ubicación de oficina "${name}" a "${newAddress}" (anteriormente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `estableció la ubicación de oficina "${name}" como principal`,
+            removed: ({name}: {name: string}) => `eliminó la ubicación de oficina "${name}"`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `cambió “excluir desplazamientos” a una distancia fija por solicitud (previamente ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `cambió la exclusión de desplazamientos para calcular por casa y oficina (previamente ${previousMethod})`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bb75b55e623f..1e5b36654de7 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7725,6 +7725,19 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             addressContext: 'Une adresse d’espace de travail est requise pour activer Expensify Travel. Veuillez saisir une adresse associée à votre entreprise.',
             policy: 'Politique de dépenses',
         },
+        officeLocations: {
+            title: 'Lieux de travail',
+            subtitle: 'Ajoutez des lieux de travail à attribuer aux membres, par exemple pour le suivi des distances.',
+            addOfficeLocation: 'Ajouter un lieu de travail',
+            editOfficeLocation: 'Modifier le lieu de travail',
+            locationName: 'Nom du lieu',
+            locationNameHint: 'Choisissez un surnom pour le lieu si vous ajoutez plusieurs lieux de travail',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Lieu de travail ${officeNumber}`,
+            setAsPrimary: 'Définir comme principal',
+            primary: 'Principal',
+            deleteOfficeLocation: 'Supprimer le lieu de travail',
+            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce lieu de travail ?',
+        },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
             youAreAlmostDone:
@@ -9526,6 +9539,14 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a ajouté « ${prohibitedExpense} » aux dépenses interdites`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a supprimé « ${prohibitedExpense} » des dépenses interdites`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de travail « ${name} » (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le lieu de travail « ${oldName} » en « ${newName} »`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `a modifié l’adresse du lieu de travail « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
+            setAsPrimary: ({name}: {name: string}) => `a défini le lieu de travail « ${name} » comme principal`,
+            removed: ({name}: {name: string}) => `a supprimé le lieu de travail « ${name} »`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
                 `modification de l’exclusion des trajets domicile-travail en une distance fixe par demande (auparavant ${previousMethod})`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 6d6fd5d0dc0a..1baacf938a53 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7662,6 +7662,19 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             addressContext: 'Per abilitare Expensify Travel è necessario un indirizzo dell’area di lavoro. Inserisci un indirizzo associato alla tua azienda.',
             policy: 'Politica di spesa',
         },
+        officeLocations: {
+            title: 'Sedi degli uffici',
+            subtitle: 'Aggiungi le sedi degli uffici da assegnare ai membri, ad esempio per il monitoraggio delle distanze.',
+            addOfficeLocation: 'Aggiungi sede dell’ufficio',
+            editOfficeLocation: 'Modifica sede dell’ufficio',
+            locationName: 'Nome della sede',
+            locationNameHint: 'Scegli un soprannome per la sede se stai aggiungendo più sedi degli uffici',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede dell’ufficio ${officeNumber}`,
+            setAsPrimary: 'Imposta come principale',
+            primary: 'Principale',
+            deleteOfficeLocation: 'Elimina sede dell’ufficio',
+            deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede dell’ufficio?',
+        },
         bankAccount: {
             continueWithSetup: 'Continua configurazione',
             youAreAlmostDone: 'Hai quasi finito di configurare il tuo conto bancario, che ti permetterà di emettere carte aziendali, rimborsare spese, incassare fatture e pagare bollette.',
@@ -9454,6 +9467,14 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha aggiunto "${prohibitedExpense}" alle spese vietate`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha rimosso "${prohibitedExpense}" dalle spese vietate`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `ha aggiunto la sede dell’ufficio "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede dell’ufficio "${oldName}" in "${newName}"`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `ha modificato l’indirizzo della sede dell’ufficio "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `ha impostato la sede dell’ufficio "${name}" come principale`,
+            removed: ({name}: {name: string}) => `ha rimosso la sede dell’ufficio "${name}"`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
                 `ha modificato l’esclusione tragitti casa-lavoro a una distanza fissa per richiesta (in precedenza ${previousMethod})`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index dedd9c28c5c9..e40c802c40b1 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7569,6 +7569,19 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             addressContext: 'Expensify Travel を有効にするには、ワークスペースの住所が必要です。お客様のビジネスに関連付けられた住所を入力してください。',
             policy: '経費ポリシー',
         },
+        officeLocations: {
+            title: 'オフィスの所在地',
+            subtitle: '距離の記録などのためにメンバーに割り当てるオフィスの所在地を追加します。',
+            addOfficeLocation: 'オフィスの所在地を追加',
+            editOfficeLocation: 'オフィスの所在地を編集',
+            locationName: '所在地名',
+            locationNameHint: '複数のオフィスの所在地を追加する場合は、所在地のニックネームを選択してください',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `オフィスの所在地 ${officeNumber}`,
+            setAsPrimary: 'メインに設定',
+            primary: 'メイン',
+            deleteOfficeLocation: 'オフィスの所在地を削除',
+            deleteOfficeLocationConfirmation: 'このオフィスの所在地を削除してもよろしいですか？',
+        },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
             youAreAlmostDone: '銀行口座の設定はほぼ完了です。これにより、コーポレートカードの発行、経費精算、請求書の回収、請求書の支払いが行えるようになります。',
@@ -9322,6 +9335,14 @@ ${reportName}`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費に「${prohibitedExpense}」を追加しました`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費から「${prohibitedExpense}」を削除しました`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `オフィスの所在地「${name}」（${address}）を追加しました`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `オフィスの所在地「${oldName}」の名前を「${newName}」に変更しました`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `オフィスの所在地「${name}」の住所を「${newAddress}」（以前は「${oldAddress}」）に変更しました`,
+            setAsPrimary: ({name}: {name: string}) => `オフィスの所在地「${name}」をメインに設定しました`,
+            removed: ({name}: {name: string}) => `オフィスの所在地「${name}」を削除しました`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `通勤分の除外方法を、申請ごとの固定距離に変更しました（以前は${previousMethod}）。`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `「通勤を除外」の計算方法を自宅とオフィスに基づいて行うよう変更しました（以前の方法：${previousMethod}）`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 2edb1f2c1f58..214afe08a6ea 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7643,6 +7643,19 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             addressContext: 'Een werkruimte-adres is vereist om Expensify Travel in te schakelen. Voer een adres in dat bij uw bedrijf hoort.',
             policy: 'Declaratiebeleid',
         },
+        officeLocations: {
+            title: 'Kantoorlocaties',
+            subtitle: 'Voeg kantoorlocaties toe om aan leden toe te wijzen, bijvoorbeeld voor het bijhouden van afstanden.',
+            addOfficeLocation: 'Kantoorlocatie toevoegen',
+            editOfficeLocation: 'Kantoorlocatie bewerken',
+            locationName: 'Locatienaam',
+            locationNameHint: 'Kies een bijnaam voor de locatie als je meerdere kantoorlocaties toevoegt',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Kantoorlocatie ${officeNumber}`,
+            setAsPrimary: 'Instellen als primair',
+            primary: 'Primair',
+            deleteOfficeLocation: 'Kantoorlocatie verwijderen',
+            deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
+        },
         bankAccount: {
             continueWithSetup: 'Setup voortzetten',
             youAreAlmostDone:
@@ -9426,6 +9439,14 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft ‘${prohibitedExpense}’ toegevoegd aan verboden uitgaven`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft „${prohibitedExpense}” verwijderd uit verboden uitgaven`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `heeft de kantoorlocatie ‘${name}’ (${address}) toegevoegd`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlocatie ‘${oldName}’ hernoemd naar ‘${newName}’`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `heeft het adres van de kantoorlocatie ‘${name}’ gewijzigd in ‘${newAddress}’ (voorheen ‘${oldAddress}’)`,
+            setAsPrimary: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ als primair ingesteld`,
+            removed: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ verwijderd`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `heeft woon-werkverkeer wijzigen in een vaste afstand per declaratie (voorheen ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) =>
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 2d63bc3cff66..710189cda337 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7665,6 +7665,19 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             addressContext: 'Adres miejsca pracy jest wymagany, aby włączyć Expensify Travel. Wprowadź adres powiązany z Twoją firmą.',
             policy: 'Polityka wydatków',
         },
+        officeLocations: {
+            title: 'Lokalizacje biur',
+            subtitle: 'Dodaj lokalizacje biur, aby przypisywać je członkom, np. na potrzeby śledzenia odległości.',
+            addOfficeLocation: 'Dodaj lokalizację biura',
+            editOfficeLocation: 'Edytuj lokalizację biura',
+            locationName: 'Nazwa lokalizacji',
+            locationNameHint: 'Wybierz nazwę dla lokalizacji, jeśli dodajesz kilka lokalizacji biur',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Lokalizacja biura ${officeNumber}`,
+            setAsPrimary: 'Ustaw jako główną',
+            primary: 'Główna',
+            deleteOfficeLocation: 'Usuń lokalizację biura',
+            deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
+        },
         bankAccount: {
             continueWithSetup: 'Kontynuuj konfigurację',
             youAreAlmostDone: 'Prawie zakończyłeś konfigurację konta bankowego, które pozwoli Ci wydawać firmowe karty, zwracać wydatki, pobierać faktury i opłacać rachunki.',
@@ -9436,6 +9449,14 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `dodano „${prohibitedExpense}” do zabronionych wydatków`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `usunięto „${prohibitedExpense}” z wydatków zabronionych`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `dodano lokalizację biura „${name}” (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmieniono nazwę lokalizacji biura „${oldName}” na „${newName}”`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `zmieniono adres lokalizacji biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
+            setAsPrimary: ({name}: {name: string}) => `ustawiono lokalizację biura „${name}” jako główną`,
+            removed: ({name}: {name: string}) => `usunięto lokalizację biura „${name}”`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `zmienił(-a) wykluczanie dojazdów na stałą odległość na zgłoszenie (wcześniej ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `zmienił(-a) wykluczanie dojazdów na obliczanie według domu i biura (wcześniej ${previousMethod})`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index fe7d8ea789cf..175834b68a1b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7648,6 +7648,19 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             addressContext: 'É necessário um Endereço do Espaço de Trabalho para ativar o Expensify Travel. Insira um endereço associado à sua empresa.',
             policy: 'Política de despesas',
         },
+        officeLocations: {
+            title: 'Locais de escritório',
+            subtitle: 'Adicione locais de escritório para atribuir aos membros, por exemplo, para o rastreamento de distâncias.',
+            addOfficeLocation: 'Adicionar local de escritório',
+            editOfficeLocation: 'Editar local de escritório',
+            locationName: 'Nome do local',
+            locationNameHint: 'Escolha um apelido para o local se estiver adicionando vários locais de escritório',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Local de escritório ${officeNumber}`,
+            setAsPrimary: 'Definir como principal',
+            primary: 'Principal',
+            deleteOfficeLocation: 'Excluir local de escritório',
+            deleteOfficeLocationConfirmation: 'Tem certeza de que deseja excluir este local de escritório?',
+        },
         bankAccount: {
             continueWithSetup: 'Continuar configuração',
             youAreAlmostDone:
@@ -9424,6 +9437,14 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `adicionou "${prohibitedExpense}" às despesas proibidas`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removeu "${prohibitedExpense}" das despesas proibidas`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `adicionou o local de escritório "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renomeou o local de escritório "${oldName}" para "${newName}"`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `alterou o endereço do local de escritório "${name}" para "${newAddress}" (antes "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `definiu o local de escritório "${name}" como principal`,
+            removed: ({name}: {name: string}) => `removeu o local de escritório "${name}"`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `alterou “excluir deslocamentos” para uma distância fixa por solicitação (antes ${previousMethod})`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `alterou a exclusão de deslocamentos para calcular por casa e escritório (antes ${previousMethod})`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 1175f91919be..c3febccb23cc 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7384,6 +7384,19 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             addressContext: '要启用 Expensify Travel，需要填写一个工作区地址。请输入与您企业关联的地址。',
             policy: '报销政策',
         },
+        officeLocations: {
+            title: '办公地点',
+            subtitle: '添加办公地点并分配给成员，用于距离跟踪等用途。',
+            addOfficeLocation: '添加办公地点',
+            editOfficeLocation: '编辑办公地点',
+            locationName: '地点名称',
+            locationNameHint: '如果要添加多个办公地点，请为地点选择一个昵称',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `办公地点 ${officeNumber}`,
+            setAsPrimary: '设为主要地点',
+            primary: '主要',
+            deleteOfficeLocation: '删除办公地点',
+            deleteOfficeLocationConfirmation: '确定要删除此办公地点吗？',
+        },
         bankAccount: {
             continueWithSetup: '继续设置',
             youAreAlmostDone: '您即将完成企业银行账户的设置，这将使您能够发放公司卡、报销费用、收取发票和支付账单。',
@@ -9078,6 +9091,14 @@ ${reportName}`,
         },
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已将“${prohibitedExpense}”添加到禁止报销的费用中`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已从禁用报销类别中移除“${prohibitedExpense}”`,
+        officeLocation: {
+            added: ({name, address}: {name: string; address: string}) => `已添加办公地点“${name}”（${address}）`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点“${oldName}”重命名为“${newName}”`,
+            changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
+                `已将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
+            setAsPrimary: ({name}: {name: string}) => `已将办公地点“${name}”设为主要地点`,
+            removed: ({name}: {name: string}) => `已删除办公地点“${name}”`,
+        },
         commuterExclusions: {
             changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `将排除通勤方式更改为按每次报销的固定距离（先前为 ${previousMethod}）`,
             changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `已将排除通勤的计算方式更改为按家庭和办公室计算（此前为 ${previousMethod}）`,
diff --git a/src/libs/API/parameters/AddOfficeLocationParams.ts b/src/libs/API/parameters/AddOfficeLocationParams.ts
new file mode 100644
index 000000000000..e5198d8b5748
--- /dev/null
+++ b/src/libs/API/parameters/AddOfficeLocationParams.ts
@@ -0,0 +1,17 @@
+type AddOfficeLocationParams = {
+    policyID: string;
+
+    /** Client-generated ID of the new office */
+    officeID: string;
+
+    /** JSON-encoded address with addressStreet, city, state, zipCode and country, the same shape as the workspace address */
+    address: string;
+
+    /** Nickname of the office. Offices added without one are named "Office location N" */
+    name?: string;
+
+    /** Whether the office becomes the workspace default */
+    isDefault?: boolean;
+};
+
+export default AddOfficeLocationParams;
diff --git a/src/libs/API/parameters/DeleteOfficeLocationParams.ts b/src/libs/API/parameters/DeleteOfficeLocationParams.ts
new file mode 100644
index 000000000000..2e825bc8d5ae
--- /dev/null
+++ b/src/libs/API/parameters/DeleteOfficeLocationParams.ts
@@ -0,0 +1,6 @@
+type DeleteOfficeLocationParams = {
+    policyID: string;
+    officeID: string;
+};
+
+export default DeleteOfficeLocationParams;
diff --git a/src/libs/API/parameters/UpdateOfficeLocationParams.ts b/src/libs/API/parameters/UpdateOfficeLocationParams.ts
new file mode 100644
index 000000000000..ba9c676f7bae
--- /dev/null
+++ b/src/libs/API/parameters/UpdateOfficeLocationParams.ts
@@ -0,0 +1,15 @@
+type UpdateOfficeLocationParams = {
+    policyID: string;
+    officeID: string;
+
+    /** New nickname of the office */
+    name?: string;
+
+    /** JSON-encoded address with addressStreet, city, state, zipCode and country, the same shape as the workspace address */
+    address?: string;
+
+    /** Makes the office the workspace default */
+    isDefault?: boolean;
+};
+
+export default UpdateOfficeLocationParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 21f15b086cbd..7e03dedb7764 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -595,6 +595,9 @@ export type {default as SetPolicyProhibitedExpensesParams} from './SetPolicyProh
 export type {default as SetPolicyCommuterExclusionsParams} from './SetPolicyCommuterExclusionsParams';
 export type {default as SetEmployeeWorkArrangementParams} from './SetEmployeeWorkArrangementParams';
 export type {default as DisablePolicyCommuterExclusionsParams} from './DisablePolicyCommuterExclusionsParams';
+export type {default as AddOfficeLocationParams} from './AddOfficeLocationParams';
+export type {default as UpdateOfficeLocationParams} from './UpdateOfficeLocationParams';
+export type {default as DeleteOfficeLocationParams} from './DeleteOfficeLocationParams';
 export type {default as SetPolicyRequireMapOrGPSParams} from './SetPolicyRequireMapOrGPSParams';
 export type {default as CreateDigitalWalletParams} from './CreateDigitalWalletParams';
 export type {default as GetGuideCallAvailabilityScheduleParams} from './GetGuideCallAvailabilitySchedule';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index d5b04efd0274..500712502f09 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -298,6 +298,9 @@ const WRITE_COMMANDS = {
     SET_POLICY_COMMUTER_EXCLUSIONS: 'SetPolicyCommuterExclusions',
     SET_EMPLOYEE_WORK_ARRANGEMENT: 'SetEmployeeWorkArrangement',
     DISABLE_POLICY_COMMUTER_EXCLUSIONS: 'DisablePolicyCommuterExclusions',
+    ADD_OFFICE_LOCATION: 'AddOfficeLocation',
+    UPDATE_OFFICE_LOCATION: 'UpdateOfficeLocation',
+    DELETE_OFFICE_LOCATION: 'DeleteOfficeLocation',
     SET_POLICY_REQUIRE_MAP_OR_GPS: 'SetPolicyRequireMapOrGPS',
     SET_POLICY_EXPENSE_MAX_AGE: 'SetPolicyExpenseMaxAge',
     ADD_POLICY_AGENT_RULE: 'AddPolicyAgentRule',
@@ -1202,6 +1205,9 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_COMMUTER_EXCLUSIONS]: Parameters.SetPolicyCommuterExclusionsParams;
     [WRITE_COMMANDS.SET_EMPLOYEE_WORK_ARRANGEMENT]: Parameters.SetEmployeeWorkArrangementParams;
     [WRITE_COMMANDS.DISABLE_POLICY_COMMUTER_EXCLUSIONS]: Parameters.DisablePolicyCommuterExclusionsParams;
+    [WRITE_COMMANDS.ADD_OFFICE_LOCATION]: Parameters.AddOfficeLocationParams;
+    [WRITE_COMMANDS.UPDATE_OFFICE_LOCATION]: Parameters.UpdateOfficeLocationParams;
+    [WRITE_COMMANDS.DELETE_OFFICE_LOCATION]: Parameters.DeleteOfficeLocationParams;
     [WRITE_COMMANDS.SET_POLICY_REQUIRE_MAP_OR_GPS]: Parameters.SetPolicyRequireMapOrGPSParams;
     [WRITE_COMMANDS.RETRACT_REPORT]: Parameters.RetractReportParams;
     [WRITE_COMMANDS.FINISH_CORPAY_BANK_ACCOUNT_ONBOARDING]: Parameters.FinishCorpayBankAccountOnboardingParams;
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 7fb4b2f6a34c..a43223fa94b6 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -565,6 +565,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.INVITE_MESSAGE_APPROVER]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceInviteMessageApproverPage').default,
     [SCREENS.WORKSPACE.WORKFLOWS_PAYER]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceWorkflowsPayerPage').default,
     [SCREENS.WORKSPACE.NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceNamePage').default,
+    [SCREENS.WORKSPACE.OFFICE_LOCATION_ADD]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOfficeLocationAddPage').default,
+    [SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOfficeLocationEditPage').default,
     [SCREENS.WORKSPACE.DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewDescriptionPage').default,
     [SCREENS.WORKSPACE.CLIENT_ID]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewClientIDPage').default,
     [SCREENS.WORKSPACE.SHARE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewSharePage').default,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
index ca599aeeca48..bc373a7d1931 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
@@ -10,6 +10,8 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
     [SCREENS.WORKSPACE.PROFILE]: [
         SCREENS.WORKSPACE.NAME,
         SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS,
+        SCREENS.WORKSPACE.OFFICE_LOCATION_ADD,
+        SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT,
         SCREENS.WORKSPACE.CURRENCY,
         SCREENS.WORKSPACE.DESCRIPTION,
         SCREENS.WORKSPACE.SHARE,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 21faa7a52348..c3348e23770b 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1294,6 +1294,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.SETTINGS.DYNAMIC_KEYBOARD_SHORTCUTS]: DYNAMIC_ROUTES.KEYBOARD_SHORTCUTS.path,
                         [SCREENS.SETTINGS.DYNAMIC_BETA_OVERRIDES]: DYNAMIC_ROUTES.BETA_OVERRIDES.path,
                         [SCREENS.WORKSPACE.NAME]: ROUTES.WORKSPACE_OVERVIEW_NAME.route,
+                        [SCREENS.WORKSPACE.OFFICE_LOCATION_ADD]: ROUTES.WORKSPACE_OVERVIEW_OFFICE_LOCATION_ADD.route,
+                        [SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT]: ROUTES.WORKSPACE_OVERVIEW_OFFICE_LOCATION_EDIT.route,
                         [SCREENS.SETTINGS.SHARE_CODE]: {
                             path: ROUTES.SETTINGS_SHARE_CODE,
                         },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index e48133cb37ce..d8a2d4beb145 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -352,6 +352,15 @@ type SettingsNavigatorParamList = {
         country?: Country | '';
     };
     [SCREENS.WORKSPACE.NAME]: undefined;
+    [SCREENS.WORKSPACE.OFFICE_LOCATION_ADD]: {
+        policyID: string;
+        country?: Country | '';
+    };
+    [SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT]: {
+        policyID: string;
+        officeID: string;
+        country?: Country | '';
+    };
     [SCREENS.WORKSPACE.DESCRIPTION]: undefined;
     [SCREENS.WORKSPACE.CLIENT_ID]: undefined;
     [SCREENS.WORKSPACE.SHARE]: undefined;
diff --git a/src/libs/PolicyUtils/index.ts b/src/libs/PolicyUtils/index.ts
index 124d59d9e476..bfea8fc847c1 100644
--- a/src/libs/PolicyUtils/index.ts
+++ b/src/libs/PolicyUtils/index.ts
@@ -387,6 +387,13 @@ function getNumericValue(value: number | string, toLocaleDigit: (arg: string) =>
     return parseFloat(numValue.toFixed(CONST.MAX_TAX_RATE_DECIMAL_PLACES));
 }
 
+/**
+ * Whether the workspace has a company address
+ */
+function hasCompanyAddress(policy: OnyxEntry<Policy>): boolean {
+    return !!policy?.address?.addressStreet?.trim();
+}
+
 /**
  * Retrieves the distance custom unit object for the given policy
  */
@@ -2865,6 +2872,7 @@ export {
     getSageIntacctCreditCards,
     getSageIntacctBankAccounts,
     getSageIntacctExpenseAccounts,
+    hasCompanyAddress,
     getDistanceRateCustomUnit,
     getPerDiemCustomUnit,
     getPolicyByCustomUnitID,
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 34f952b28885..8863ed0b99f4 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -4689,6 +4689,45 @@ function getUpdatedMemberWorkArrangementMessage(translate: LocalizedTranslate, r
     return translate('workspaceActions.updatedMemberWorkArrangement', {displayName, newArrangement, oldArrangement});
 }
 
+function getAddedOfficeLocationMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>): string {
+    if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION)) {
+        return getReportActionText(reportAction);
+    }
+    const {name = '', address} = getOriginalMessage(reportAction) ?? {};
+    return translate('workspaceActions.officeLocation.added', {name, address: formatAddressToString(address)});
+}
+
+function getUpdatedOfficeLocationMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>): string {
+    if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION)) {
+        return getReportActionText(reportAction);
+    }
+    const {name = '', updatedField, newValue, oldValue, newAddress, oldAddress} = getOriginalMessage(reportAction) ?? {};
+
+    if (updatedField === CONST.POLICY.OFFICE_LOCATION_FIELD.NAME) {
+        return translate('workspaceActions.officeLocation.renamed', {
+            oldName: typeof oldValue === 'string' ? oldValue : '',
+            newName: typeof newValue === 'string' ? newValue : '',
+        });
+    }
+
+    if (updatedField === CONST.POLICY.OFFICE_LOCATION_FIELD.ADDRESS) {
+        return translate('workspaceActions.officeLocation.changedAddress', {name, newAddress: formatAddressToString(newAddress), oldAddress: formatAddressToString(oldAddress)});
+    }
+
+    if (updatedField === CONST.POLICY.OFFICE_LOCATION_FIELD.IS_DEFAULT) {
+        return translate('workspaceActions.officeLocation.setAsPrimary', {name});
+    }
+
+    return getReportActionText(reportAction);
+}
+
+function getDeletedOfficeLocationMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>): string {
+    if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION)) {
+        return getReportActionText(reportAction);
+    }
+    return translate('workspaceActions.officeLocation.removed', {name: getOriginalMessage(reportAction)?.name ?? ''});
+}
+
 function getUpdatedProhibitedExpensesMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>) {
     const {newProhibitedExpenses, oldProhibitedExpenses} =
         getOriginalMessage(reportAction as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES>) ?? {};
@@ -5518,6 +5557,9 @@ export {
     getUpdatedProhibitedExpensesMessage,
     getUpdatedCommuterExclusionsMessage,
     getUpdatedMemberWorkArrangementMessage,
+    getAddedOfficeLocationMessage,
+    getUpdatedOfficeLocationMessage,
+    getDeletedOfficeLocationMessage,
     getWorkspaceTagUpdateMessage,
     getWorkspaceReportFieldUpdateMessage,
     getWorkspaceReportFieldDeleteMessage,
diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index 81ab3be24593..aa88eabe1442 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -2,7 +2,9 @@ import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
 import * as API from '@libs/API';
 import type {
+    AddOfficeLocationParams,
     CreatePolicyDistanceRateParams,
+    DeleteOfficeLocationParams,
     DeletePolicyDistanceRatesParams,
     DisablePolicyCommuterExclusionsParams,
     EnablePolicyDistanceRatesParams,
@@ -13,6 +15,7 @@ import type {
     SetPolicyDistanceRatesUnitParams,
     SetPolicyRequireMapOrGPSParams,
     SetWorkspaceDistanceAutoUpdateParams,
+    UpdateOfficeLocationParams,
     UpdatePolicyDistanceRateParams,
     UpdatePolicyDistanceRateValueParams,
 } from '@libs/API/parameters';
@@ -21,7 +24,7 @@ import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import Log from '@libs/Log';
-import {rand64} from '@libs/NumberUtils';
+import {generateHexadecimalValue, rand64} from '@libs/NumberUtils';
 import {buildOnyxDataForPolicyDistanceRateUpdates, getExpectedUnitForCurrency} from '@libs/PolicyDistanceRatesUtils';
 import {goBackWhenEnableFeature, removePendingFieldsFromCustomUnit} from '@libs/PolicyUtils';
 import {getRoom} from '@libs/ReportUtils';
@@ -30,8 +33,8 @@ import {getWorkArrangementLabel} from '@libs/WorkArrangementUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {GovernmentMileageRate, PersonalDetailsList, Policy, PolicyEmployee, ReportAction, TransactionViolation} from '@src/types/onyx';
-import type {ErrorFields} from '@src/types/onyx/OnyxCommon';
-import type {CommuterExclusions, CustomUnit, Rate} from '@src/types/onyx/Policy';
+import type {ErrorFields, PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {CommuterExclusions, CompanyAddress, CustomUnit, OfficeLocation, Rate} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
 
 import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
@@ -784,6 +787,183 @@ function setEmployeeWorkArrangement(
     API.write(WRITE_COMMANDS.SET_EMPLOYEE_WORK_ARRANGEMENT, parameters, onyxData);
 }
 
+/**
+ * Add an office to a workspace. Making it the default clears the flag on the current default office, so callers
+ * pass the workspace's current `officeLocations` for the failure path to restore it. An office added without a `name`
+ * is named by the server, and shows `defaultName` until then.
+ */
+function addOfficeLocation(policyID: string, officeLocations: Record<string, OfficeLocation> | undefined, address: CompanyAddress, isDefault: boolean, name: string, defaultName: string) {
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const officeID = generateHexadecimalValue(16);
+    const previousDefaultOfficeID = isDefault
+        ? Object.entries(officeLocations ?? {}).find(([, officeLocation]) => officeLocation.isDefault && officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)?.[0]
+        : undefined;
+
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {
+                        ...(previousDefaultOfficeID ? {[previousDefaultOfficeID]: {isDefault: false}} : {}),
+                        [officeID]: {name: name || defaultName, address, isDefault, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, errors: null},
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {[officeID]: {pendingAction: null}},
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {
+                        ...(previousDefaultOfficeID ? {[previousDefaultOfficeID]: {isDefault: true}} : {}),
+                        [officeID]: {isDefault: false, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: AddOfficeLocationParams = {policyID, officeID, name: name || undefined, address: JSON.stringify(address), isDefault};
+    API.write(WRITE_COMMANDS.ADD_OFFICE_LOCATION, parameters, onyxData);
+}
+
+/**
+ * Update the name, address or default flag of a workspace office. Callers pass the workspace's current
+ * `officeLocations` so the failure path can restore the office, and the default office it replaced.
+ */
+function updateOfficeLocation(
+    policyID: string,
+    officeLocations: Record<string, OfficeLocation> | undefined,
+    officeID: string,
+    changes: Partial<Pick<OfficeLocation, 'name' | 'address' | 'isDefault'>>,
+) {
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const officeLocation = officeLocations?.[officeID];
+    const previousDefaultOfficeID = changes.isDefault
+        ? Object.entries(officeLocations ?? {}).find(
+              ([, otherOfficeLocation]) => otherOfficeLocation.isDefault && otherOfficeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+          )?.[0]
+        : undefined;
+
+    // An office that hasn't reached the server yet stays pending addition, so dismissing a failed addition still removes it
+    const pendingAction = officeLocation?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
+
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {
+                        ...(previousDefaultOfficeID ? {[previousDefaultOfficeID]: {isDefault: false}} : {}),
+                        [officeID]: {...changes, pendingAction, errors: null},
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {[officeID]: {pendingAction: null}},
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {
+                        ...(previousDefaultOfficeID ? {[previousDefaultOfficeID]: {isDefault: true}} : {}),
+                        [officeID]: {
+                            name: officeLocation?.name,
+                            address: officeLocation?.address,
+                            isDefault: officeLocation?.isDefault ?? false,
+                            pendingAction: officeLocation?.pendingAction ?? null,
+                            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: UpdateOfficeLocationParams = {
+        policyID,
+        officeID,
+        name: changes.name,
+        address: changes.address ? JSON.stringify(changes.address) : undefined,
+        isDefault: changes.isDefault,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_OFFICE_LOCATION, parameters, onyxData);
+}
+
+/**
+ * Delete a workspace office. Deleting the default office makes the company address the default, or, in a workspace
+ * without a company address, the server makes another office the default.
+ */
+function deleteOfficeLocation(policyID: string, officeID: string) {
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {[officeID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null}},
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {[officeID]: null},
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    officeLocations: {[officeID]: {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')}},
+                },
+            },
+        ],
+    };
+
+    const parameters: DeleteOfficeLocationParams = {policyID, officeID};
+    API.write(WRITE_COMMANDS.DELETE_OFFICE_LOCATION, parameters, onyxData);
+}
+
+/**
+ * Dismiss the error on a workspace office. An office whose addition failed is removed, since the server never stored it.
+ */
+function clearOfficeLocationErrors(policyID: string, officeID: string, pendingAction: PendingAction | undefined) {
+    if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {officeLocations: {[officeID]: null}});
+        return;
+    }
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {officeLocations: {[officeID]: {errors: null}}});
+}
+
 /**
  * Turn the "Require GPS or map entry" setting on or off for a policy. When it's on, the manual and odometer
  * distance flows are unavailable because neither can produce a mapped route.
@@ -1010,6 +1190,10 @@ export {
     disablePolicyCommuterExclusions,
     clearPolicyCommuterExclusionsErrors,
     setEmployeeWorkArrangement,
+    addOfficeLocation,
+    updateOfficeLocation,
+    deleteOfficeLocation,
+    clearOfficeLocationErrors,
     setPolicyRequireMapOrGPS,
     clearPolicyRequireMapOrGPSErrors,
     setWorkspaceDistanceAutoUpdate,
diff --git a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
index 22286cfd3812..9042ff9407bf 100644
--- a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
+++ b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
@@ -13,6 +13,7 @@ import {
     getAddedBudgetMessage,
     getAddedCardFeedMessage,
     getAddedConnectionMessage,
+    getAddedOfficeLocationMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
     getAutoCategorizeNewExpensesMessage,
@@ -26,6 +27,7 @@ import {
     getDefaultApproverUpdateMessage,
     getDeletedApprovalRuleMessage,
     getDeletedBudgetMessage,
+    getDeletedOfficeLocationMessage,
     getForeignCurrencyDefaultTaxUpdateMessage,
     getForwardsToUpdateMessage,
     getInvoiceCompanyNameUpdateMessage,
@@ -67,6 +69,7 @@ import {
     getUpdatedDefaultTitleMessage,
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
+    getUpdatedOfficeLocationMessage,
     getUpdatedOwnershipMessage,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedReimbursementChoiceMessage,
@@ -234,6 +237,9 @@ const POLICY_CHANGE_LOG_RESOLVERS: Record<string, ResolverFn> = {
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES]: (translate, action) => getUpdatedProhibitedExpensesMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_COMMUTER_EXCLUSIONS]: (translate, action) => getUpdatedCommuterExclusionsMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT]: (translate, action) => getUpdatedMemberWorkArrangementMessage(translate, action),
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION]: (translate, action) => getAddedOfficeLocationMessage(translate, action),
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION]: (translate, action) => getUpdatedOfficeLocationMessage(translate, action),
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION]: (translate, action) => getDeletedOfficeLocationMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_CHOICE]: (translate, action) => getUpdatedReimbursementChoiceMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SET_AUTO_JOIN]: (translate, action) => getSetAutoJoinMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE]: (translate, action) => getUpdatedDefaultTitleMessage(translate, action),
diff --git a/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
new file mode 100644
index 000000000000..ce331b7646c1
--- /dev/null
+++ b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
@@ -0,0 +1,80 @@
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
+
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {hasCompanyAddress} from '@libs/PolicyUtils';
+
+import {addOfficeLocation} from '@userActions/Policy/DistanceRate';
+
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+import type {CompanyAddress} from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import React from 'react';
+
+import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
+import WorkspaceOfficeLocationForm from './WorkspaceOfficeLocationForm';
+
+type WorkspaceOfficeLocationAddPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.OFFICE_LOCATION_ADD>;
+
+function WorkspaceOfficeLocationAddPage({route}: WorkspaceOfficeLocationAddPageProps) {
+    const {policyID} = route.params;
+    const {translate} = useLocalize();
+    const {isBetaEnabled} = usePermissions();
+    const policy = usePolicy(policyID);
+    const officeLocations = policy?.officeLocations;
+
+    // Offices being deleted and additions that failed aren't on the server, so they don't count
+    const savedOfficeLocations = Object.values(officeLocations ?? {}).filter(
+        (officeLocation) =>
+            officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+            !(officeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(officeLocation.errors)),
+    );
+    const officeCount = savedOfficeLocations.length;
+
+    // The company address counts as an office, the primary one while no office is, so only a workspace without one makes
+    // its first office primary
+    const isOnlyOffice = officeCount === 0 && !hasCompanyAddress(policy);
+
+    const addOffice = (name: string, address: CompanyAddress, isPrimary: boolean) => {
+        // An office added without a name shows this one until the server names it the same way: numbered after the existing
+        // offices, skipping names already in use
+        const officeNames = new Set(savedOfficeLocations.map((officeLocation) => officeLocation.name));
+        let officeNumber = officeCount + 1;
+        while (officeNames.has(translate('workspace.officeLocations.defaultName', {officeNumber}))) {
+            officeNumber++;
+        }
+        addOfficeLocation(policyID, officeLocations, address, isPrimary, name, translate('workspace.officeLocations.defaultName', {officeNumber}));
+        Navigation.goBack();
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS)}
+        >
+            <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
+                testID="WorkspaceOfficeLocationAddPage"
+            >
+                <HeaderWithBackButtonAndTitle title={translate('workspace.officeLocations.addOfficeLocation')} />
+                <WorkspaceOfficeLocationForm
+                    isPrimary={isOnlyOffice}
+                    isPrimaryLocked={isOnlyOffice}
+                    isNameRequired={false}
+                    onSubmit={addOffice}
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+export default WorkspaceOfficeLocationAddPage;
diff --git a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
new file mode 100644
index 000000000000..13231f801a9a
--- /dev/null
+++ b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
@@ -0,0 +1,114 @@
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+import useConfirmModal from '@hooks/useConfirmModal';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
+
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {hasCompanyAddress} from '@libs/PolicyUtils';
+
+import {deleteOfficeLocation, updateOfficeLocation} from '@userActions/Policy/DistanceRate';
+
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+import type {CompanyAddress} from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import {deepEqual} from 'fast-equals';
+import React from 'react';
+
+import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
+import WorkspaceOfficeLocationForm from './WorkspaceOfficeLocationForm';
+
+type WorkspaceOfficeLocationEditPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.OFFICE_LOCATION_EDIT>;
+
+function WorkspaceOfficeLocationEditPage({route}: WorkspaceOfficeLocationEditPageProps) {
+    const {policyID, officeID} = route.params;
+    const {translate} = useLocalize();
+    const {isBetaEnabled} = usePermissions();
+    const {showConfirmModal} = useConfirmModal();
+    const icons = useMemoizedLazyExpensifyIcons(['Trashcan']);
+    const policy = usePolicy(policyID);
+    const officeLocations = policy?.officeLocations;
+    const officeLocation = officeLocations?.[officeID];
+
+    // The company address counts as an office, so only a workspace without one keeps at least one office and can't delete
+    // its last office. Offices being deleted and additions that failed aren't on the server, so they don't count.
+    const savedOfficeCount = Object.values(officeLocations ?? {}).filter(
+        (otherOfficeLocation) =>
+            otherOfficeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+            !(otherOfficeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(otherOfficeLocation.errors)),
+    ).length;
+    const canDelete = savedOfficeCount > 1 || hasCompanyAddress(policy);
+
+    const saveOffice = (name: string, address: CompanyAddress, isPrimary: boolean) => {
+        if (!officeLocation) {
+            return;
+        }
+        const changes = {
+            ...(name !== officeLocation.name ? {name} : {}),
+            ...(!deepEqual(address, officeLocation.address) ? {address} : {}),
+            ...(isPrimary && !officeLocation.isDefault ? {isDefault: true} : {}),
+        };
+        if (!isEmptyObject(changes)) {
+            updateOfficeLocation(policyID, officeLocations, officeID, changes);
+        }
+        Navigation.goBack();
+    };
+
+    const confirmDelete = () => {
+        showConfirmModal({
+            title: translate('workspace.officeLocations.deleteOfficeLocation'),
+            prompt: translate('workspace.officeLocations.deleteOfficeLocationConfirmation'),
+            confirmText: translate('common.delete'),
+            cancelText: translate('common.cancel'),
+            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+        }).then((result) => {
+            if (result.action !== ModalActions.CONFIRM) {
+                return;
+            }
+            deleteOfficeLocation(policyID, officeID);
+            Navigation.goBack();
+        });
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS) || !officeLocation || officeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}
+        >
+            <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
+                testID="WorkspaceOfficeLocationEditPage"
+            >
+                <HeaderWithBackButtonAndTitle title={translate('workspace.officeLocations.editOfficeLocation')}>
+                    {canDelete && (
+                        <Header.IconButton
+                            tooltipText={translate('common.delete')}
+                            onPress={confirmDelete}
+                            iconSrc={icons.Trashcan}
+                            sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.OVERVIEW.DELETE_OFFICE_LOCATION}
+                        />
+                    )}
+                </HeaderWithBackButtonAndTitle>
+                <WorkspaceOfficeLocationForm
+                    officeLocation={officeLocation}
+                    isPrimary={!!officeLocation?.isDefault}
+                    isPrimaryLocked={!!officeLocation?.isDefault}
+                    isNameRequired
+                    onSubmit={saveOffice}
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+export default WorkspaceOfficeLocationEditPage;
diff --git a/src/pages/workspace/WorkspaceOfficeLocationForm.tsx b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
new file mode 100644
index 000000000000..af5bc6b8cc48
--- /dev/null
+++ b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
@@ -0,0 +1,141 @@
+import AddressForm from '@components/AddressForm';
+import CheckboxWithLabel from '@components/CheckboxWithLabel';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import TextInput from '@components/TextInput';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {getWorkspaceAddressStreetLines} from '@libs/WorkspacesSettingsUtils';
+
+import type {Country} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/WorkspaceOfficeLocationForm';
+import type {CompanyAddress, OfficeLocation} from '@src/types/onyx/Policy';
+
+import React, {useState} from 'react';
+
+type WorkspaceOfficeLocationFormValues = FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_OFFICE_LOCATION_FORM>;
+
+type WorkspaceOfficeLocationFormProps = {
+    /** The office being edited, undefined when adding one */
+    officeLocation?: OfficeLocation;
+
+    /** Whether "Set as primary" starts checked */
+    isPrimary: boolean;
+
+    /** Whether "Set as primary" can't be changed, for an office that has to be the primary one */
+    isPrimaryLocked: boolean;
+
+    /** Whether the location name can't be left empty */
+    isNameRequired: boolean;
+
+    /** Called with the trimmed name, the office address and whether the office is the primary one */
+    onSubmit: (name: string, address: CompanyAddress, isPrimary: boolean) => void;
+};
+
+/** The location name, address and "Set as primary" fields shared by the pages that add and edit workspace offices */
+function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked, isNameRequired, onSubmit}: WorkspaceOfficeLocationFormProps) {
+    const {translate} = useLocalize();
+    const address = officeLocation?.address;
+    const {streetLineOne, streetLineTwo} = getWorkspaceAddressStreetLines(address?.addressStreet, address?.addressStreet2);
+    const [currentCountry, setCurrentCountry] = useState<Country | ''>(address?.country ?? '');
+    const [state, setState] = useState(address?.state ?? '');
+    const [city, setCity] = useState(address?.city ?? '');
+    const [zipCode, setZipCode] = useState(address?.zipCode ?? '');
+
+    const handleAddressChange = (value: unknown, key: unknown) => {
+        const addressPart = typeof value === 'string' ? value : '';
+        if (key === INPUT_IDS.COUNTRY && addressPart !== currentCountry) {
+            setCurrentCountry(Object.keys(CONST.ALL_COUNTRIES).find((countryCode): countryCode is Country => countryCode === addressPart) ?? '');
+            setState('');
+            setCity('');
+            setZipCode('');
+            return;
+        }
+        if (key === INPUT_IDS.STATE) {
+            setState(addressPart);
+            setCity('');
+            setZipCode('');
+            return;
+        }
+        if (key === INPUT_IDS.CITY) {
+            setCity(addressPart);
+            setZipCode('');
+            return;
+        }
+        if (key === INPUT_IDS.ZIP_POST_CODE) {
+            setZipCode(addressPart);
+        }
+    };
+
+    const validate = (values: WorkspaceOfficeLocationFormValues): Record<string, string> => {
+        const errors: Record<string, string> = {};
+        const name = values[INPUT_IDS.LOCATION_NAME].trim();
+        if (isNameRequired && !name) {
+            errors[INPUT_IDS.LOCATION_NAME] = translate('common.error.fieldRequired');
+        } else if (name.length > CONST.FORM_CHARACTER_LIMIT) {
+            errors[INPUT_IDS.LOCATION_NAME] = translate('common.error.characterLimitExceedCounter', name.length, CONST.FORM_CHARACTER_LIMIT);
+        }
+        return errors;
+    };
+
+    const submit = (values: WorkspaceOfficeLocationFormValues) => {
+        const addressLine1 = values[INPUT_IDS.ADDRESS_LINE_1].trim();
+        const addressLine2 = values[INPUT_IDS.ADDRESS_LINE_2].trim();
+        onSubmit(
+            values[INPUT_IDS.LOCATION_NAME].trim(),
+            {
+                // Offices store both address lines in addressStreet, the same shape the workspace address has
+                addressStreet: addressLine2 ? `${addressLine1}\n${addressLine2}` : addressLine1,
+                city: values[INPUT_IDS.CITY].trim(),
+                state: values[INPUT_IDS.STATE].trim(),
+                zipCode: values[INPUT_IDS.ZIP_POST_CODE].trim().toUpperCase(),
+                country: values[INPUT_IDS.COUNTRY],
+            },
+            values[INPUT_IDS.IS_PRIMARY],
+        );
+    };
+
+    return (
+        <AddressForm
+            formID={ONYXKEYS.FORMS.WORKSPACE_OFFICE_LOCATION_FORM}
+            onSubmit={submit}
+            validate={validate}
+            submitButtonText={translate('common.save')}
+            city={city}
+            country={currentCountry}
+            onAddressChanged={handleAddressChange}
+            state={state}
+            street1={streetLineOne}
+            street2={streetLineTwo}
+            zip={zipCode}
+            shouldRequireZip
+            inputsBeforeAddress={
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.LOCATION_NAME}
+                    label={translate('workspace.officeLocations.locationName')}
+                    aria-label={translate('workspace.officeLocations.locationName')}
+                    role={CONST.ROLE.PRESENTATION}
+                    defaultValue={officeLocation?.name}
+                    hint={translate('workspace.officeLocations.locationNameHint')}
+                    spellCheck={false}
+                />
+            }
+            inputsAfterAddress={
+                <InputWrapper
+                    InputComponent={CheckboxWithLabel}
+                    inputID={INPUT_IDS.IS_PRIMARY}
+                    label={translate('workspace.officeLocations.setAsPrimary')}
+                    accessibilityLabel={translate('workspace.officeLocations.setAsPrimary')}
+                    defaultValue={isPrimary}
+                    disabled={isPrimaryLocked}
+                />
+            }
+        />
+    );
+}
+
+export default WorkspaceOfficeLocationForm;
diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx
index 241875ed5041..b428d423de0a 100644
--- a/src/pages/workspace/WorkspaceOverviewPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewPage.tsx
@@ -39,6 +39,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {close} from '@libs/actions/Modal';
+import {clearOfficeLocationErrors} from '@libs/actions/Policy/DistanceRate';
 import {clearInviteDraft, clearWorkspaceOwnerChangeFlow, requestWorkspaceOwnerChange} from '@libs/actions/Policy/Member';
 import {
     clearAvatarErrors,
@@ -56,7 +57,15 @@ import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
-import {canEditWorkspaceSettings, getRulesDocumentSourceURL, getUserFriendlyWorkspaceType, goBackFromInvalidPolicy, isPendingDeletePolicy, isPolicyOwner} from '@libs/PolicyUtils';
+import {
+    canEditWorkspaceSettings,
+    getRulesDocumentSourceURL,
+    getUserFriendlyWorkspaceType,
+    goBackFromInvalidPolicy,
+    hasCompanyAddress,
+    isPendingDeletePolicy,
+    isPolicyOwner,
+} from '@libs/PolicyUtils';
 import {formatAddressToString} from '@libs/ReportActionsUtils';
 import shouldRenderTransferOwnerButton from '@libs/shouldRenderTransferOwnerButton';
 import StringUtils from '@libs/StringUtils';
@@ -93,12 +102,12 @@ const rulesDocumentMenuPositionStyle = {top: variables.spacing2, right: variable
 
 function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: WorkspaceOverviewPageProps) {
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
+    const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const {getCurrencySymbol} = useCurrencyListActions();
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Box', 'Exit', 'ImageCropSquareMask', 'QrCode', 'Transfer', 'Trashcan', 'Upload', 'UserPlus']);
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Box', 'Exit', 'ImageCropSquareMask', 'Plus', 'QrCode', 'Transfer', 'Trashcan', 'Upload', 'UserPlus']);
     const buildDynamicRoute = useScreenBoundDynamicRoute();
     const {isBetaEnabled} = usePermissions();
     const canArchivePolicies = isBetaEnabled(CONST.BETAS.ARCHIVE_POLICIES);
@@ -244,6 +253,19 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
         [translate, expensifyIcons, handleRulesDocumentPicked, policyID, rulesDocumentURL],
     );
     const shouldShowExpensePolicySection = isPolicyAdmin || hasRulesDocument || hasCustomRulesText;
+
+    // The primary office is listed first and the rest by name, since the server returns them keyed by random officeIDs
+    const officeLocationEntries = Object.entries(policy?.officeLocations ?? {}).sort(
+        ([, officeLocation], [, otherOfficeLocation]) =>
+            Number(!!otherOfficeLocation.isDefault) - Number(!!officeLocation.isDefault) || localeCompare(officeLocation.name, otherOfficeLocation.name),
+    );
+    const shouldShowCompanyAddressOffice = hasCompanyAddress(policy);
+
+    // The company address is the workspace's default office while no office is
+    const isCompanyAddressPrimary = !officeLocationEntries.some(
+        ([, officeLocation]) => officeLocation.isDefault && officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+    );
+    const shouldShowOfficeLocationsSection = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS) && (!readOnly || shouldShowCompanyAddressOffice || officeLocationEntries.length > 0);
     const shouldShowRulesDocumentSubSection = isPolicyAdmin || hasRulesDocument;
 
     const personalDetails = usePersonalDetails();
@@ -708,6 +730,75 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
                         </OfflineWithFeedback>
                     )}
                 </Section>
+                {shouldShowOfficeLocationsSection && (
+                    <Section
+                        isCentralPane
+                        title={translate('workspace.officeLocations.title')}
+                        titleStyles={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb0]}
+                        subtitle={translate('workspace.officeLocations.subtitle')}
+                        subtitleStyles={[styles.mb2]}
+                        subtitleTextStyles={[styles.textNormal, styles.colorMuted, styles.mr5]}
+                        containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
+                    >
+                        {shouldShowCompanyAddressOffice && (
+                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.address}>
+                                <MenuItemSectionRoot>
+                                    <MenuItem.Row>
+                                        <MenuItem.Content>
+                                            <MenuItem.Title>{translate('common.companyAddress')}</MenuItem.Title>
+                                            <MenuItem.Description>{formattedAddress}</MenuItem.Description>
+                                        </MenuItem.Content>
+                                        <MenuItem.Trailing>
+                                            {isCompanyAddressPrimary && <MenuItem.RightLabel>{translate('workspace.officeLocations.primary')}</MenuItem.RightLabel>}
+                                        </MenuItem.Trailing>
+                                    </MenuItem.Row>
+                                </MenuItemSectionRoot>
+                            </OfflineWithFeedback>
+                        )}
+                        {officeLocationEntries.map(([officeID, officeLocation]) => {
+                            const isEditable = !readOnly && officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                            return (
+                                <OfflineWithFeedback
+                                    key={officeID}
+                                    pendingAction={officeLocation.pendingAction}
+                                    errors={officeLocation.errors}
+                                    onClose={() => clearOfficeLocationErrors(routePolicyID, officeID, officeLocation.pendingAction)}
+                                >
+                                    <MenuItemSectionRoot
+                                        onPress={isEditable ? () => Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_OFFICE_LOCATION_EDIT.getRoute(routePolicyID, officeID)) : undefined}
+                                        sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.OVERVIEW.OFFICE_LOCATION}
+                                    >
+                                        <MenuItem.Row>
+                                            <MenuItem.Content>
+                                                <MenuItem.Title>{officeLocation.name}</MenuItem.Title>
+                                                <MenuItem.Description>{formatAddressToString(officeLocation.address)}</MenuItem.Description>
+                                            </MenuItem.Content>
+                                            <MenuItem.Trailing>
+                                                {!!officeLocation.isDefault && <MenuItem.RightLabel>{translate('workspace.officeLocations.primary')}</MenuItem.RightLabel>}
+                                                {isEditable && <MenuItem.Chevron />}
+                                            </MenuItem.Trailing>
+                                        </MenuItem.Row>
+                                    </MenuItemSectionRoot>
+                                </OfflineWithFeedback>
+                            );
+                        })}
+                        {!readOnly && (
+                            <MenuItemSectionRoot
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_OFFICE_LOCATION_ADD.getRoute(routePolicyID))}
+                                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.OVERVIEW.ADD_OFFICE_LOCATION}
+                            >
+                                <MenuItem.Row>
+                                    <MenuItem.Leading>
+                                        <MenuItem.Icon src={expensifyIcons.Plus} />
+                                    </MenuItem.Leading>
+                                    <MenuItem.Content>
+                                        <MenuItem.Title>{translate('workspace.officeLocations.addOfficeLocation')}</MenuItem.Title>
+                                    </MenuItem.Content>
+                                </MenuItem.Row>
+                            </MenuItemSectionRoot>
+                        )}
+                    </Section>
+                )}
                 {shouldShowExpensePolicySection ? (
                     <Section
                         isCentralPane
diff --git a/src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx b/src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx
index 6a8beb4ad1e5..49e990a3ea63 100644
--- a/src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx
@@ -19,7 +19,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
+import {getDistanceRateCustomUnit, hasCompanyAddress} from '@libs/PolicyUtils';
 import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -62,7 +62,7 @@ function PolicyCommuterExclusionsPage({route}: PolicyCommuterExclusionsPageProps
         selector: (policy) => ({
             commuterExclusions: policy?.commuterExclusions,
             unit: getDistanceRateCustomUnit(policy)?.attributes?.unit,
-            hasWorkspaceAddress: !!policy?.address?.addressStreet?.trim(),
+            hasWorkspaceAddress: hasCompanyAddress(policy),
             pendingFields: policy?.pendingFields,
             errorFields: policy?.errorFields,
         }),
diff --git a/src/types/form/WorkspaceOfficeLocationForm.ts b/src/types/form/WorkspaceOfficeLocationForm.ts
new file mode 100644
index 000000000000..1e2c9f0eb2ae
--- /dev/null
+++ b/src/types/form/WorkspaceOfficeLocationForm.ts
@@ -0,0 +1,35 @@
+import type {Country} from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
+import type Form from './Form';
+
+const INPUT_IDS = {
+    LOCATION_NAME: 'locationName',
+    ADDRESS_LINE_1: 'addressLine1',
+    ADDRESS_LINE_2: 'addressLine2',
+    COUNTRY: 'country',
+    STATE: 'state',
+    CITY: 'city',
+    ZIP_POST_CODE: 'zipPostCode',
+    IS_PRIMARY: 'isPrimary',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceOfficeLocationForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.LOCATION_NAME]: string;
+        [INPUT_IDS.ADDRESS_LINE_1]: string;
+        [INPUT_IDS.ADDRESS_LINE_2]: string;
+        [INPUT_IDS.COUNTRY]: Country | '';
+        [INPUT_IDS.STATE]: string;
+        [INPUT_IDS.CITY]: string;
+        [INPUT_IDS.ZIP_POST_CODE]: string;
+        [INPUT_IDS.IS_PRIMARY]: boolean;
+    }
+>;
+
+export type {WorkspaceOfficeLocationForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 47b94b46c3e7..48c5031df83e 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -129,6 +129,7 @@ export type {EditAgentNameForm} from './EditAgentNameForm';
 export type {EditAgentPromptForm} from './EditAgentPromptForm';
 export type {AddAgentRuleForm} from './AddAgentRuleForm';
 export type {EditAgentRuleForm} from './EditAgentRuleForm';
+export type {WorkspaceOfficeLocationForm} from './WorkspaceOfficeLocationForm';
 export type {RilletCredentialsForm} from './RilletCredentialsForm';
 export type {DualEntryCredentialsForm} from './DualEntryCredentialsForm';
 export type {CampfireCredentialsForm} from './CampfireCredentialsForm';
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 96c19988295b..4746ac13e91a 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -7,7 +7,7 @@ import type {CardID} from './Card';
 import type {PolicyRuleTaxRate} from './ExpenseRule';
 import type {Attendee} from './IOU';
 import type {OldDotOriginalMessageMap} from './OldDotAction';
-import type {AllConnectionName} from './Policy';
+import type {AllConnectionName, CompanyAddress} from './Policy';
 import type {PolicyChangeLogCopyReportActionNames} from './ReportAction';
 import type ReportActionName from './ReportActionName';
 import type {Reservation, TransactionCommentVendor} from './Transaction';
@@ -857,6 +857,36 @@ type OriginalMessageAgentRuleChangeLog = {
     prompt?: string;
 };
 
+/** Model of a workspace office location change log action (add, update, or delete) */
+type OriginalMessageOfficeLocationChangeLog = {
+    /** ID of the office that changed */
+    officeID?: string;
+
+    /** Nickname of the office */
+    name?: string;
+
+    /** Address of the added office */
+    address?: CompanyAddress;
+
+    /** Whether the added office is the workspace default */
+    isDefault?: boolean;
+
+    /** Field of the office that was updated */
+    updatedField?: ValueOf<typeof CONST.POLICY.OFFICE_LOCATION_FIELD>;
+
+    /** Name or default flag of the office after the change */
+    newValue?: string | boolean;
+
+    /** Name or default flag of the office before the change */
+    oldValue?: string | boolean;
+
+    /** Address of the office after an address change */
+    newAddress?: CompanyAddress;
+
+    /** Address of the office before an address change */
+    oldAddress?: CompanyAddress;
+};
+
 /** Model of a policy copy change log action */
 type OriginalMessagePolicyChangeCopyLog = {
     /** The ID of the source policy from which the user copied settings */
@@ -1770,6 +1800,9 @@ type OriginalMessageMap = {
         [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_AGENT_RULE]: OriginalMessageAgentRuleChangeLog;
         [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AGENT_RULE]: OriginalMessageAgentRuleChangeLog;
         [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_AGENT_RULE]: OriginalMessageAgentRuleChangeLog;
+        [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION]: OriginalMessageOfficeLocationChangeLog;
+        [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION]: OriginalMessageOfficeLocationChangeLog;
+        [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION]: OriginalMessageOfficeLocationChangeLog;
     } & Record<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>, OriginalMessageChangeLog>;
 
 type OriginalMessage<T extends ReportActionName> = T extends keyof OriginalMessageMap ? OriginalMessageMap[T] : never;
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 8d74500b1f7f..848d677a53a0 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -3108,6 +3108,21 @@ type CommuterExclusions = OnyxCommon.OnyxValueWithOfflineFeedback<{
     isOfficeWorkArrangement?: boolean;
 }>;
 
+/** An office location of a workspace */
+type OfficeLocation = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Nickname of the office */
+    name: string;
+
+    /** Address of the office */
+    address: CompanyAddress;
+
+    /** Whether this is the workspace's default office. At most one office is the default, and while none is, the company address is. */
+    isDefault?: boolean;
+
+    /** Errors from the last change to the office */
+    errors?: OnyxCommon.Errors;
+}>;
+
 /** Prohibited expense types */
 type ProhibitedExpenses = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Whether the policy prohibits alcohol expenses */
@@ -3668,6 +3683,9 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Commuter exclusion configuration applied to distance expenses on this workspace */
         commuterExclusions?: CommuterExclusions;
 
+        /** Offices of the workspace, keyed by officeID */
+        officeLocations?: Record<string, OfficeLocation>;
+
         /** Indicates if the Policy is in loading state */
         isLoading?: boolean;
 
@@ -3845,6 +3863,7 @@ export type {
     Subrate,
     ProhibitedExpenses,
     CommuterExclusions,
+    OfficeLocation,
     NetSuiteConnectionData,
     MergeApprovalMode,
     MergeHRConnectionConfig,
diff --git a/tests/actions/PolicyOfficeLocationTest.ts b/tests/actions/PolicyOfficeLocationTest.ts
new file mode 100644
index 000000000000..048d9ffe7da0
--- /dev/null
+++ b/tests/actions/PolicyOfficeLocationTest.ts
@@ -0,0 +1,263 @@
+import OnyxUpdateManager from '@libs/actions/OnyxUpdateManager';
+import {addOfficeLocation, clearOfficeLocationErrors, deleteOfficeLocation, updateOfficeLocation} from '@libs/actions/Policy/DistanceRate';
+import {WRITE_COMMANDS} from '@libs/API/types';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+import type {CompanyAddress, OfficeLocation} from '@src/types/onyx/Policy';
+
+import Onyx from 'react-native-onyx';
+
+import type {MockFetch} from '../utils/TestHelper';
+
+import createRandomPolicy from '../utils/collections/policies';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+OnyxUpdateManager();
+
+const HEADQUARTERS_ADDRESS: CompanyAddress = {
+    addressStreet: '88 Kearny St',
+    city: 'San Francisco',
+    state: 'CA',
+    zipCode: '94108',
+    country: 'US',
+};
+
+const NEW_JERSEY_ADDRESS: CompanyAddress = {
+    addressStreet: '900 Asbury Ave\nSuite 2',
+    city: 'Ocean City',
+    state: 'NJ',
+    zipCode: '08226',
+    country: 'US',
+};
+
+const HEADQUARTERS: OfficeLocation = {name: 'Headquarters', address: HEADQUARTERS_ADDRESS, isDefault: true};
+
+function getPolicy(policyID: string): Promise<Policy | undefined> {
+    return new Promise((resolve) => {
+        const connection = Onyx.connect({
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            callback: (policy) => {
+                Onyx.disconnect(connection);
+                resolve(policy);
+            },
+        });
+    });
+}
+
+function getRequestParams(command: typeof WRITE_COMMANDS.ADD_OFFICE_LOCATION | typeof WRITE_COMMANDS.UPDATE_OFFICE_LOCATION): Record<string, string> {
+    const body = TestHelper.getFetchMockCalls(command).at(0)?.[1]?.body;
+    if (!(body instanceof FormData)) {
+        return {};
+    }
+    return Object.fromEntries(Array.from(body.entries(), ([key, value]) => [key, typeof value === 'string' ? value : '']));
+}
+
+describe('actions/PolicyOfficeLocation', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    let mockFetch: MockFetch;
+    let policyID: string;
+    beforeEach(async () => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        mockFetch = fetch as MockFetch;
+        await Onyx.clear();
+
+        // Given a workspace whose only office is its primary one
+        const policy = createRandomPolicy(0);
+        policyID = policy.id;
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...policy, officeLocations: {OFFICE1: HEADQUARTERS}});
+        await waitForBatchedUpdates();
+    });
+
+    describe('addOfficeLocation', () => {
+        it('shows the new office as pending, makes it the primary office, and clears the pending state on success', async () => {
+            // When a new office is added as the primary one while the request is in flight
+            mockFetch?.pause?.();
+            addOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, NEW_JERSEY_ADDRESS, true, 'New Jersey Office', 'Office location 2');
+            await waitForBatchedUpdates();
+
+            // Then the request carries the client-generated officeID and the address as JSON, which is how Auth reads it
+            const params = getRequestParams(WRITE_COMMANDS.ADD_OFFICE_LOCATION);
+            const newOfficeID = params.officeID;
+            expect(JSON.parse(params.address)).toEqual(NEW_JERSEY_ADDRESS);
+
+            // And the new office shows as pending, and the previous primary office stops being the primary one
+            let officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(officeLocations[newOfficeID]).toMatchObject({
+                name: 'New Jersey Office',
+                address: NEW_JERSEY_ADDRESS,
+                isDefault: true,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            });
+            expect(officeLocations.OFFICE1?.isDefault).toBe(false);
+
+            // When the request succeeds
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+
+            // Then the new office is no longer pending
+            officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(officeLocations[newOfficeID]?.pendingAction).toBeFalsy();
+        });
+
+        it('keeps a failed office with its error, restores the primary office, and removes the failed office once the error is dismissed', async () => {
+            // When adding a new primary office fails
+            mockFetch?.fail?.();
+            addOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, NEW_JERSEY_ADDRESS, true, 'New Jersey Office', 'Office location 2');
+            await waitForBatchedUpdates();
+
+            // Then the failed office stays visible as pending with an error, so the admin can see it didn't save
+            const failedOfficeID = getRequestParams(WRITE_COMMANDS.ADD_OFFICE_LOCATION).officeID;
+            let officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            const failedOffice = officeLocations[failedOfficeID];
+            expect(failedOffice?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+            expect(Object.keys(failedOffice?.errors ?? {}).length).toBeGreaterThan(0);
+
+            // And the previous primary office is the only primary one again
+            expect(officeLocations.OFFICE1?.isDefault).toBe(true);
+            expect(failedOffice?.isDefault).toBe(false);
+
+            // When the error is dismissed
+            clearOfficeLocationErrors(policyID, failedOfficeID, failedOffice?.pendingAction);
+            await waitForBatchedUpdates();
+
+            // Then the office that never reached the server is removed
+            officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(Object.keys(officeLocations)).toEqual(['OFFICE1']);
+        });
+    });
+
+    describe('addOfficeLocation without a name', () => {
+        it('shows the default name until the server names the office, without sending a name', async () => {
+            // When an office is added without a name while the request is in flight
+            mockFetch?.pause?.();
+            addOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, NEW_JERSEY_ADDRESS, false, '', 'Office location 2');
+            await waitForBatchedUpdates();
+
+            // Then no name is sent, so the server names the office
+            const params = getRequestParams(WRITE_COMMANDS.ADD_OFFICE_LOCATION);
+            expect(params.name).toBeUndefined();
+
+            // And the office shows the default name meanwhile
+            const officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(officeLocations[params.officeID]?.name).toBe('Office location 2');
+
+            await mockFetch?.resume?.();
+        });
+
+        it('keeps an unsaved office pending addition when it is edited, so dismissing its error still removes it', async () => {
+            // Given an office whose addition failed
+            mockFetch?.fail?.();
+            addOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, NEW_JERSEY_ADDRESS, false, 'New Jersey Office', 'Office location 2');
+            await waitForBatchedUpdates();
+            const failedOfficeID = getRequestParams(WRITE_COMMANDS.ADD_OFFICE_LOCATION).officeID;
+
+            // When it is edited, which fails too since the server doesn't have it
+            const officeLocations = (await getPolicy(policyID))?.officeLocations;
+            updateOfficeLocation(policyID, officeLocations, failedOfficeID, {name: 'NJ Office'});
+            await waitForBatchedUpdates();
+
+            // Then it is still pending addition
+            const failedOffice = (await getPolicy(policyID))?.officeLocations?.[failedOfficeID];
+            expect(failedOffice?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+            // And dismissing its error removes it, like any office that never reached the server
+            clearOfficeLocationErrors(policyID, failedOfficeID, failedOffice?.pendingAction);
+            await waitForBatchedUpdates();
+            expect(Object.keys((await getPolicy(policyID))?.officeLocations ?? {})).toEqual(['OFFICE1']);
+        });
+    });
+
+    describe('updateOfficeLocation', () => {
+        it('shows the changes as pending and clears the pending state on success', async () => {
+            // When the office is renamed and moved while the request is in flight
+            mockFetch?.pause?.();
+            updateOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, 'OFFICE1', {name: 'HQ', address: NEW_JERSEY_ADDRESS});
+            await waitForBatchedUpdates();
+
+            // Then the office shows the new values as pending
+            let officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE1;
+            expect(officeLocation).toMatchObject({name: 'HQ', address: NEW_JERSEY_ADDRESS, isDefault: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE});
+
+            // And only the changed fields are sent
+            const params = getRequestParams(WRITE_COMMANDS.UPDATE_OFFICE_LOCATION);
+            expect(params.name).toBe('HQ');
+            expect(JSON.parse(params.address)).toEqual(NEW_JERSEY_ADDRESS);
+            expect(params.isDefault).toBeUndefined();
+
+            // When the request succeeds
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+
+            // Then the office keeps the new values and is no longer pending
+            officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE1;
+            expect(officeLocation?.name).toBe('HQ');
+            expect(officeLocation?.pendingAction).toBeFalsy();
+        });
+
+        it('restores both offices and shows an error when making another office the primary one fails', async () => {
+            // Given a second office that isn't the primary one
+            const newJerseyOffice: OfficeLocation = {name: 'New Jersey Office', address: NEW_JERSEY_ADDRESS, isDefault: false};
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {officeLocations: {OFFICE2: newJerseyOffice}});
+
+            // When making it the primary office fails
+            mockFetch?.fail?.();
+            updateOfficeLocation(policyID, {OFFICE1: HEADQUARTERS, OFFICE2: newJerseyOffice}, 'OFFICE2', {isDefault: true});
+            await waitForBatchedUpdates();
+
+            // Then the previous primary office is the primary one again, and the updated office shows an error
+            let officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(officeLocations.OFFICE1?.isDefault).toBe(true);
+            expect(officeLocations.OFFICE2?.isDefault).toBe(false);
+            expect(officeLocations.OFFICE2?.pendingAction).toBeFalsy();
+            expect(Object.keys(officeLocations.OFFICE2?.errors ?? {}).length).toBeGreaterThan(0);
+
+            // When the error is dismissed
+            clearOfficeLocationErrors(policyID, 'OFFICE2', officeLocations.OFFICE2?.pendingAction);
+            await waitForBatchedUpdates();
+
+            // Then the office stays, without the error, since it exists on the server
+            officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
+            expect(officeLocations.OFFICE2?.name).toBe('New Jersey Office');
+            expect(officeLocations.OFFICE2?.errors).toBeFalsy();
+        });
+    });
+
+    describe('deleteOfficeLocation', () => {
+        it('shows the office as pending deletion and removes it on success', async () => {
+            // When the office is deleted while the request is in flight
+            mockFetch?.pause?.();
+            deleteOfficeLocation(policyID, 'OFFICE1');
+            await waitForBatchedUpdates();
+
+            // Then it shows as pending deletion
+            expect((await getPolicy(policyID))?.officeLocations?.OFFICE1?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+            // When the request succeeds
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+
+            // Then the office is removed
+            expect((await getPolicy(policyID))?.officeLocations?.OFFICE1).toBeUndefined();
+        });
+
+        it('restores the office with an error when the deletion fails', async () => {
+            // When deleting the office fails
+            mockFetch?.fail?.();
+            deleteOfficeLocation(policyID, 'OFFICE1');
+            await waitForBatchedUpdates();
+
+            // Then the office is back, with an error explaining it wasn't deleted
+            const officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE1;
+            expect(officeLocation?.name).toBe('Headquarters');
+            expect(officeLocation?.pendingAction).toBeFalsy();
+            expect(Object.keys(officeLocation?.errors ?? {}).length).toBeGreaterThan(0);
+        });
+    });
+});
diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index 2fe5cc9d895d..972d84c7e338 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -16,6 +16,7 @@ import {
     evaluateApprovalWorkflowRule,
     findVendorByID,
     getVendorDisplayName,
+    hasCompanyAddress,
     hasVendorFeatureOnAnyPolicy,
     getActivePolicies,
     getActivePoliciesWithExpenseChat,
@@ -6705,3 +6706,20 @@ describe('shouldHideDynamicExternalWorkflowPeople', () => {
         expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(false);
     });
 });
+
+describe('hasCompanyAddress', () => {
+    it('only counts a company address that has a street, the same way Auth does', () => {
+        // Given workspaces without an address, with a blank street, and with a street
+        const policy = createRandomPolicy(0);
+        const address = {city: 'San Francisco', state: 'CA', zipCode: '94108', country: 'US' as const};
+        const withoutAddress: Policy = {...policy, address: undefined};
+        const withBlankStreet: Policy = {...policy, address: {...address, addressStreet: '  '}};
+        const withStreet: Policy = {...policy, address: {...address, addressStreet: '88 Kearny St'}};
+
+        // When checking whether each has a company address
+        // Then only the one with a street has one, since that's when Auth counts the company address as an office
+        expect(hasCompanyAddress(withoutAddress)).toBe(false);
+        expect(hasCompanyAddress(withBlankStreet)).toBe(false);
+        expect(hasCompanyAddress(withStreet)).toBe(true);
+    });
+});
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 8a4633313234..30473e16c00e 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -20,6 +20,7 @@ import Onyx from 'react-native-onyx';
 import type {CompanyAddressOriginalMessage, UpdateACHAccountOriginalMessage} from '../../src/libs/ReportActionsUtils';
 import type {Card, DecisionName, PersonalDetails, PersonalDetailsList, Report, ReportAction, ReportActions} from '../../src/types/onyx';
 import type {OriginalMessageExportIntegration} from '../../src/types/onyx/OriginalMessage';
+import type {CompanyAddress} from '../../src/types/onyx/Policy';
 import type {ReportCollectionDataSet} from '../../src/types/onyx/Report';
 import type {ReportActionsCollectionDataSet} from '../../src/types/onyx/ReportAction';
 
@@ -29,6 +30,7 @@ import CONST from '../../src/CONST';
 import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
 import {
     getAddedCardFeedMessage,
+    getAddedOfficeLocationMessage,
     getAssignedCompanyCardMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
@@ -41,6 +43,7 @@ import {
     getCurrencyConversionFeeMessage,
     getCurrencyDefaultTaxUpdateMessage,
     getCustomTaxNameUpdateMessage,
+    getDeletedOfficeLocationMessage,
     getForeignCurrencyDefaultTaxUpdateMessage,
     getHumanAgentAccountIDFromReportAction,
     getHumanAgentFirstName,
@@ -72,6 +75,7 @@ import {
     getUpdatedMemberWorkArrangementMessage,
     getUpdatedCardFeedLiabilityMessage,
     getUpdatedCardFeedStatementPeriodMessage,
+    getUpdatedOfficeLocationMessage,
     hasNextActionMadeBySameActor,
     hasReasoning,
     isConsecutiveActionMadeByPreviousActor,
@@ -4614,6 +4618,61 @@ describe('ReportActionsUtils', () => {
         });
     });
 
+    describe('office location change logs', () => {
+        const headquartersAddress: CompanyAddress = {addressStreet: '88 Kearny St', city: 'San Francisco', state: 'CA', zipCode: '94108', country: 'US'};
+        const newJerseyAddress: CompanyAddress = {addressStreet: '900 Asbury Ave\nSuite 2', city: 'Ocean City', state: 'NJ', zipCode: '08226', country: 'US'};
+
+        it('names the added office and its address', () => {
+            // Given an office added to the workspace
+            const action: ReportAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION,
+                reportActionID: '1',
+                created: '',
+                originalMessage: {officeID: 'OFFICE1', name: 'Headquarters', address: headquartersAddress, isDefault: true},
+            };
+
+            // When the change log is rendered
+            // Then it reads the same as the message Auth stores for it
+            expect(getAddedOfficeLocationMessage(translateLocal, action)).toBe('added the office location "Headquarters" (88 Kearny St, San Francisco, CA 94108)');
+        });
+
+        it.each([
+            ['a rename', {updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.NAME, name: 'HQ', newValue: 'HQ', oldValue: 'Headquarters'}, 'renamed the office location "Headquarters" to "HQ"'],
+            [
+                'an address change',
+                {updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.ADDRESS, name: 'HQ', newAddress: newJerseyAddress, oldAddress: headquartersAddress},
+                'changed the address of the office location "HQ" to "900 Asbury Ave, Suite 2, Ocean City, NJ 08226" (previously "88 Kearny St, San Francisco, CA 94108")',
+            ],
+            ['a new primary office', {updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.IS_DEFAULT, name: 'HQ', newValue: true, oldValue: false}, 'set the office location "HQ" as primary'],
+        ])('describes %s', (_description, originalMessage, expected) => {
+            // Given an office update that changed a single field
+            const action: ReportAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION,
+                reportActionID: '1',
+                created: '',
+                originalMessage: {officeID: 'OFFICE1', ...originalMessage},
+            };
+
+            // When the change log is rendered
+            // Then it describes the field that changed, the same way Auth does
+            expect(getUpdatedOfficeLocationMessage(translateLocal, action)).toBe(expected);
+        });
+
+        it('names the deleted office', () => {
+            // Given an office deleted from the workspace
+            const action: ReportAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION,
+                reportActionID: '1',
+                created: '',
+                originalMessage: {officeID: 'OFFICE2', name: 'New Jersey Office'},
+            };
+
+            // When the change log is rendered
+            // Then it reads the same as the message Auth stores for it
+            expect(getDeletedOfficeLocationMessage(translateLocal, action)).toBe('removed the office location "New Jersey Office"');
+        });
+    });
+
     describe('getUpdatedCardFeedLiabilityMessage', () => {
         it('should return enabled message when liabilityType is ALLOW', () => {
             const action = {

From cfc6130325d2016f93c94e8337260e0ff6f37abd Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:34:35 +0700
Subject: [PATCH 310/781] Remove the dead exactMatchFilterKeys code path

Merchant is no longer in isTextSearchField, so Merchant eq is sent to the
backend as eq. Group drill-down builds merchant=value and group export
selects with eq, so the exact-match key set no longer changes anything.

Remove withExactMatchFilterKeys, the exactMatch hash identity, the group
export key set, and the exactMatchFilterKeys query field. Add tests that
prove drill-down and export still send exact Merchant matches and that
Description eq still becomes contains.
---
 src/components/Search/types.ts               |  2 -
 src/hooks/useSearchBulkActions.ts            | 19 ++--
 src/libs/SearchQueryUtils.ts                 | 35 ++------
 src/libs/SearchUIUtils.ts                    |  7 +-
 src/libs/actions/Search.ts                   | 23 +++--
 tests/unit/Search/SearchQueryUtilsTest.ts    | 58 +++---------
 tests/unit/Search/SearchUIUtilsTest.ts       | 94 +++++++++++++++++++-
 tests/unit/hooks/useSearchBulkActionsTest.ts | 35 +++++++-
 8 files changed, 159 insertions(+), 114 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 1dc2fa805803..52704f19bb6f 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -429,8 +429,6 @@ type SearchQueryJSON = {
     similarSearchHash: number;
     flatFilters: QueryFilters;
     isViewExplicitlySet?: boolean;
-    /** Filters generated for a specific group that must keep exact-match semantics when sent to the backend. */
-    exactMatchFilterKeys?: SearchFilterKey[];
 } & SearchQueryAST;
 
 type SearchAutocompleteResult = {
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 96691e2d7ec3..25389fa4f986 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -7,7 +7,7 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
 import {useOpenSearchReportSubmitToPopover} from '@components/ReportSubmitToPopoverAnchor';
 import {useSearchQueryContext, useSearchResultsContext, useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 import {getSearchGroupCountByKey} from '@components/Search/selectionBuilders';
-import type {BulkPaySelectionData, PaymentData, QueryFilterKey, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
+import type {BulkPaySelectionData, PaymentData, QueryFilterKey, SearchColumnType, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
 
 import {getAccountingIntegrationDisplayName, getExportLabelForConnection, isIntuitEnterpriseSuiteConnection} from '@libs/AccountingUtils';
 import {getExpensifyCardStatementPDF} from '@libs/actions/CompanyCards';
@@ -443,12 +443,6 @@ function getAllMatchingReportQuery(queryJSON: SearchQueryJSON, excludedTransacti
     return buildSearchQueryJSON(buildSearchQueryString({...queryJSON, flatFilters}));
 }
 
-const MERCHANT_GROUP_EXACT_MATCH_FILTER_KEYS = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-
-function getGroupExportExactMatchFilterKeys(groupBy: SearchQueryJSON['groupBy']): ReadonlySet<SearchFilterKey> | undefined {
-    return groupBy === CONST.SEARCH.GROUP_BY.MERCHANT ? MERCHANT_GROUP_EXACT_MATCH_FILTER_KEYS : undefined;
-}
-
 type ShouldShowBulkDuplicateParams = {
     selectedTransactionsKeys: string[];
     selectedTransactions: Record<string, {reportID?: string; transaction?: Transaction}>;
@@ -1061,9 +1055,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         templateType,
                         // searchKey changes what the backend query matches (e.g. reconciliation includes Expensify Card cash back),
                         // so the export must send it exactly as search() does or the exported set differs from the viewed set.
-                        jsonQuery: groupExportQueryJSON
-                            ? serializeQueryJSONForBackend({...groupExportQueryJSON, searchKey: currentSearchKey}, getGroupExportExactMatchFilterKeys(queryJSON?.groupBy))
-                            : '{}',
+                        jsonQuery: groupExportQueryJSON ? serializeQueryJSONForBackend({...groupExportQueryJSON, searchKey: currentSearchKey}) : '{}',
                         reportIDList: isGroupExport ? [] : selectedTransactionReportIDs,
                         transactionIDList,
                         policyID,
@@ -1109,7 +1101,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const exportSearchType = searchResults?.search.type ?? queryJSON?.type;
 
     const getCSVExportParameters = useCallback(
-        (isBasicExport: boolean, queryJSONToExport: SearchQueryJSON | undefined, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>) => {
+        (isBasicExport: boolean, queryJSONToExport: SearchQueryJSON | undefined) => {
             const groupBy = getValidGroupBy(queryJSON?.groupBy);
             let columnsToExport: SearchColumnType[];
             let groupColumnsToExport: SearchColumnType[] = [];
@@ -1169,7 +1161,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                       searchKey: currentSearchKey,
                   }
                 : undefined;
-            const jsonQuery = queryToExport ? serializeQueryJSONForBackend(queryToExport, exactMatchFilterKeys) : (JSON.stringify(queryJSONToExport) ?? '');
+            const jsonQuery = queryToExport ? serializeQueryJSONForBackend(queryToExport) : (JSON.stringify(queryJSONToExport) ?? '');
 
             return {
                 jsonQuery,
@@ -1227,8 +1219,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             let didFail = false;
             const reportIDList = selectedReports.length > 0 ? selectedReportIDs : selectedTransactionReportIDs;
             const queryJSONToExport = isGroupExport && queryJSON ? addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data) : queryJSON;
-            const exactMatchFilterKeys = isGroupExport ? getGroupExportExactMatchFilterKeys(queryJSON?.groupBy) : undefined;
-            const exportParameters = getCSVExportParameters(isBasicExport, queryJSONToExport, exactMatchFilterKeys);
+            const exportParameters = getCSVExportParameters(isBasicExport, queryJSONToExport);
             await exportSearchItemsToCSV(
                 {
                     jsonQuery: exportParameters.jsonQuery,
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index ed2baaf18f2d..758042487167 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -860,12 +860,6 @@ function getQueryHashes(query: SearchQueryJSON) {
     }
 
     const filterSet = new Set<string>(orderedQuery);
-    const exactMatchFilterKeys = [...(query.exactMatchFilterKeys ?? [])].sort();
-    if (exactMatchFilterKeys.length > 0) {
-        const exactMatchIdentity = `exactMatch:${exactMatchFilterKeys.join(',')}`;
-        orderedQuery += ` ${exactMatchIdentity}`;
-        filterSet.add(exactMatchIdentity);
-    }
 
     // Certain filters shouldn't affect whether two searchers are similar or not, since they dont
     // actually filter out results
@@ -929,17 +923,6 @@ function getQueryHashes(query: SearchQueryJSON) {
     return {primaryHash, recentSearchHash, similarSearchHash};
 }
 
-function withExactMatchFilterKeys(queryJSON: Readonly<SearchQueryJSON>, exactMatchFilterKeys: SearchFilterKey[]): SearchQueryJSON {
-    const queryWithExactMatches = {...queryJSON, exactMatchFilterKeys};
-    const {primaryHash, recentSearchHash, similarSearchHash} = getQueryHashes(queryWithExactMatches);
-    return {
-        ...queryWithExactMatches,
-        hash: primaryHash,
-        recentSearchHash,
-        similarSearchHash,
-    };
-}
-
 /**
  * Returns whether a given string is a date preset (e.g. Last month)
  */
@@ -2912,18 +2895,16 @@ function isTextSearchField(key: string): key is SearchFilterKey {
  * Recursively traverses a search AST and replaces the `eq` operator with `contains`
  * for fields that still use partial matching on the backend (description).
  * Merchant is excluded because its parser output already distinguishes legacy contains from explicit exact matches.
- * Keys in `exactMatchFilterKeys` keep their original `eq` operator.
  */
-function applyContainsOperatorToTextFields(node: ASTNode, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>): ASTNode {
-    const filterKey = typeof node.left === 'string' && isTextSearchField(node.left) ? node.left : undefined;
-    if (filterKey && !exactMatchFilterKeys?.has(filterKey) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
+function applyContainsOperatorToTextFields(node: ASTNode): ASTNode {
+    if (typeof node.left === 'string' && isTextSearchField(node.left) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
         return {...node, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS};
     }
 
     return {
         ...node,
-        left: typeof node.left === 'object' && node.left ? applyContainsOperatorToTextFields(node.left, exactMatchFilterKeys) : node.left,
-        right: typeof node.right === 'object' && !Array.isArray(node.right) && node.right ? applyContainsOperatorToTextFields(node.right, exactMatchFilterKeys) : node.right,
+        left: typeof node.left === 'object' && node.left ? applyContainsOperatorToTextFields(node.left) : node.left,
+        right: typeof node.right === 'object' && !Array.isArray(node.right) && node.right ? applyContainsOperatorToTextFields(node.right) : node.right,
     };
 }
 
@@ -2945,14 +2926,13 @@ function getDateModifierTitle(modifier: ValueOf<typeof CONST.SEARCH.DATE_MODIFIE
  * Serializes a query object to a JSON string for backend commands (Search, export, CSV).
  * Applies text-field operator normalization (`eq` → `contains`) for `description` so all backend
  * commands use consistent partial-match semantics, while preserving parsed merchant operators.
- * Keys in `exactMatchFilterKeys` keep exact-match semantics for generated filters.
  * Do NOT use for saving/persisting query definitions (e.g. saveSearch), where the original operators must be preserved.
  */
-function serializeQueryJSONForBackend<T extends {filters?: ASTNode | null; rawFilterList?: RawQueryFilter[]}>(queryData: T, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>): string {
-    const normalizedFilters = queryData.filters ? applyContainsOperatorToTextFields(queryData.filters, exactMatchFilterKeys) : queryData.filters;
+function serializeQueryJSONForBackend<T extends {filters?: ASTNode | null; rawFilterList?: RawQueryFilter[]}>(queryData: T): string {
+    const normalizedFilters = queryData.filters ? applyContainsOperatorToTextFields(queryData.filters) : queryData.filters;
     const normalizedRawFilterList = queryData.rawFilterList
         ? queryData.rawFilterList.map((filter) => {
-              if (isTextSearchField(filter.key) && !exactMatchFilterKeys?.has(filter.key) && filter.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
+              if (isTextSearchField(filter.key) && filter.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
                   return {...filter, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS};
               }
               return filter;
@@ -3039,7 +3019,6 @@ export {
     getQueryHashes,
     hasFiltersChangedFromDefault,
     isSearchQuerySavable,
-    withExactMatchFilterKeys,
     isSearchDatePreset,
     getDateRangeForPreset,
     getDateFilterRange,
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 6548c70d0e4d..acfc6321667d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -210,7 +210,6 @@ import {
     isSearchDatePreset,
     removeNegation,
     sortOptionsWithEmptyValue,
-    withExactMatchFilterKeys,
 } from './SearchQueryUtils';
 import {expenseStatusActionMapping, getSuggestedSearches, isEligibleForStatus, SEARCH_TYPE_MENU_ICON_NAMES} from './SearchSuggestionUtils';
 import StringUtils from './StringUtils';
@@ -3037,11 +3036,7 @@ function buildSpecificGroupQuery(queryJSON: SearchQueryJSON, filterKey: QueryFil
         sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
         flatFilters: newFlatFilters,
     };
-    const specificGroupQueryJSON = buildSearchQueryJSON(buildSearchQueryString(newQueryJSON));
-    if (!specificGroupQueryJSON || filterKey !== CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
-        return specificGroupQueryJSON;
-    }
-    return withExactMatchFilterKeys(specificGroupQueryJSON, [filterKey]);
+    return buildSearchQueryJSON(buildSearchQueryString(newQueryJSON));
 }
 
 function getActiveGroupSearchHashes(data: OnyxTypes.SearchResults['data'] | undefined, queryJSON: Readonly<SearchQueryJSON> | undefined): number[] {
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 862eedff7979..f7e2dcfcab2c 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -1230,7 +1230,7 @@ function handlePreventSearchAPI(hash: number | undefined) {
  * columns to a backend-supported date sort.
  */
 function getBackendQueryJSON(queryJSON: Readonly<SearchQueryJSON>) {
-    const {exactMatchFilterKeys, flatFilters, limit, ...queryJSONWithoutFlatFilters} = queryJSON;
+    const {flatFilters, limit, ...queryJSONWithoutFlatFilters} = queryJSON;
     const backendQueryJSON = shouldUseBackendDateSortFallback(queryJSON.sortBy)
         ? {
               ...queryJSONWithoutFlatFilters,
@@ -1244,7 +1244,7 @@ function getBackendQueryJSON(queryJSON: Readonly<SearchQueryJSON>) {
               ),
           }
         : queryJSONWithoutFlatFilters;
-    return {backendQueryJSON, limit, exactMatchFilterKeys};
+    return {backendQueryJSON, limit};
 }
 
 function search({
@@ -1325,7 +1325,7 @@ function search({
     inFlightSearchRequests.set(dedupeKey, inFlightRequestState);
 
     const onyxLoadingData = getOnyxLoadingData(queryJSON.hash, queryJSON, offset, true, shouldCalculateTotals, shouldShowLoading);
-    const {backendQueryJSON, limit, exactMatchFilterKeys} = getBackendQueryJSON(queryJSON);
+    const {backendQueryJSON, limit} = getBackendQueryJSON(queryJSON);
     const query = {
         ...backendQueryJSON,
         searchKey,
@@ -1336,7 +1336,7 @@ function search({
         // Backend expects 'maximumResults' instead of 'limit'
         ...(limit !== undefined && {maximumResults: limit}),
     };
-    const jsonQuery = serializeQueryJSONForBackend(query, exactMatchFilterKeys ? new Set(exactMatchFilterKeys) : undefined);
+    const jsonQuery = serializeQueryJSONForBackend(query);
 
     if (shouldUpdateLastSearchParams) {
         saveLastSearchParams({
@@ -1507,15 +1507,12 @@ function getFooterConvertedAmounts({
 
     // searchKey changes what the backend query matches (e.g. unapprovedCash excludes card expenses), so it must be
     // sent exactly as search() sends it or the converted totals cover a different expense set than the snapshot.
-    const {backendQueryJSON, exactMatchFilterKeys} = getBackendQueryJSON(queryJSON);
-    const jsonQuery = serializeQueryJSONForBackend(
-        {
-            ...backendQueryJSON,
-            searchKey,
-            filters: backendQueryJSON.filters ?? null,
-        },
-        exactMatchFilterKeys ? new Set(exactMatchFilterKeys) : undefined,
-    );
+    const {backendQueryJSON} = getBackendQueryJSON(queryJSON);
+    const jsonQuery = serializeQueryJSONForBackend({
+        ...backendQueryJSON,
+        searchKey,
+        filters: backendQueryJSON.filters ?? null,
+    });
 
     read(
         READ_COMMANDS.GET_TRANSACTIONS_CONVERTED_AMOUNT,
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2829ddf59454..16bb3d15b774 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -52,7 +52,6 @@ import {
     shouldResetSort,
     shouldResetSortForViewChange,
     sortOptionsWithEmptyValue,
-    withExactMatchFilterKeys,
 } from '@src/libs/SearchQueryUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -4586,42 +4585,21 @@ describe('SearchQueryUtils', () => {
             expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList: normalizedRawFilterList}));
         });
 
-        it('should preserve exact merchant matches in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');
+        it('should keep merchant eq and turn description eq into contains', () => {
+            // Given a query with an exact merchant list and a description filter, both parsed as `eq`
+            const queryJSON = buildSearchQueryJSON('type:expense merchant=Amazon,"Amazon Marketplace" description:order');
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');
             }
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            expect(serializeQueryJSONForBackend(queryJSON, exactMatchFilterKeys)).toBe(JSON.stringify(queryJSON));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-        });
 
-        it('should preserve exact merchant matches in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, value: 'coffee'}];
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList}, exactMatchFilterKeys)).toBe(JSON.stringify({filters: undefined, rawFilterList}));
-        });
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend(queryJSON);
 
-        it('should preserve multiple exact merchant matches while keeping description as contains', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=Amazon,"Amazon Marketplace" description:order');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            const normalizedFilters = applyContainsOperatorToTextFields(queryJSON.filters, exactMatchFilterKeys);
-            expect(serializeQueryJSONForBackend(queryJSON, exactMatchFilterKeys)).toBe(JSON.stringify({...queryJSON, filters: normalizedFilters}));
-            const merchantNode = findNode(normalizedFilters, 'merchant');
-            const descriptionNode = findNode(normalizedFilters, 'description');
-            if (!merchantNode || !descriptionNode) {
-                throw new Error('Expected merchant and description nodes to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toEqual(['Amazon', 'Amazon Marketplace']);
-            expect(descriptionNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+            // Then merchant keeps exact matching, because the parser already tells `merchant=` from `merchant:`,
+            // and description still uses partial matching on the backend
+            expect(result).toContain('"operator":"eq","left":"merchant","right":["Amazon","Amazon Marketplace"]');
+            expect(result).toContain('"operator":"contains","left":"description","right":"order"');
+            expect(result).not.toContain('"operator":"contains","left":"merchant"');
         });
 
         it('should not affect non-text fields in rawFilterList', () => {
@@ -4630,22 +4608,6 @@ describe('SearchQueryUtils', () => {
         });
     });
 
-    describe('withExactMatchFilterKeys', () => {
-        it('should give exact queries distinct snapshot hashes', () => {
-            const partialQuery = buildSearchQueryJSON('type:expense merchant=Amazon');
-            if (!partialQuery) {
-                throw new Error('Expected partial query to be defined');
-            }
-
-            const exactQuery = withExactMatchFilterKeys(partialQuery, [CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-
-            expect(exactQuery.hash).not.toBe(partialQuery.hash);
-            expect(exactQuery.recentSearchHash).not.toBe(partialQuery.recentSearchHash);
-            expect(exactQuery.similarSearchHash).not.toBe(partialQuery.similarSearchHash);
-            expect(exactQuery.exactMatchFilterKeys).toEqual([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-        });
-    });
-
     describe('getKeywordQueryWithCurrentSearchContext', () => {
         it('should prepend current search context to keyword-only input', () => {
             const currentQueryJSON = buildSearchQueryJSON('type:trip status:outstanding');
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index d3f192babb87..2d219c1b0085 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -18,7 +18,7 @@ import type {
 } from '@components/Search/SearchList/ListItem/types';
 import {GROUP_ITEM_TYPES} from '@components/Search/SearchList/ListItem/types';
 import {getExpenseHeaders} from '@components/Search/SearchTableHeader';
-import type {SearchColumnType, SearchFilterKey, SelectedTransactionInfo, SortOrder} from '@components/Search/types';
+import type {ASTNode, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedTransactionInfo, SortOrder} from '@components/Search/types';
 
 import Navigation from '@navigation/Navigation';
 
@@ -5079,7 +5079,7 @@ describe('SearchUIUtils', () => {
             expect(emptyMerchantItem?.transactionsQueryJSON).toBeDefined();
             // The query should use 'none' (MERCHANT_EMPTY_VALUE) instead of empty string
             expect(emptyMerchantItem?.transactionsQueryJSON?.inputQuery).toContain(CONST.SEARCH.MERCHANT_EMPTY_VALUE);
-            expect(emptyMerchantItem?.transactionsQueryJSON?.exactMatchFilterKeys).toEqual([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
+            expect(emptyMerchantItem?.transactionsQueryJSON?.inputQuery).toContain(`merchant=${CONST.SEARCH.MERCHANT_EMPTY_VALUE}`);
         });
 
         it('should treat DEFAULT_MERCHANT "Expense" as empty merchant and display "No merchant"', () => {
@@ -7951,6 +7951,96 @@ describe('SearchUIUtils', () => {
         });
     });
 
+    describe('Merchant group exact match', () => {
+        function findFilterNode(node: ASTNode | null | undefined, key: string): ASTNode | undefined {
+            if (!node) {
+                return undefined;
+            }
+            if (node.left === key) {
+                return node;
+            }
+            const leftMatch = typeof node.left === 'object' ? findFilterNode(node.left, key) : undefined;
+            if (leftMatch) {
+                return leftMatch;
+            }
+            return typeof node.right === 'object' && !Array.isArray(node.right) ? findFilterNode(node.right, key) : undefined;
+        }
+
+        function getMerchantNode(queryJSON: SearchQueryJSON): ASTNode | undefined {
+            return findFilterNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+        }
+
+        function getMerchantDrillDownQuery(merchant: string): SearchQueryJSON | undefined {
+            const [result] = getSectionsByType(
+                SearchUIUtils.getSections({
+                    dateFnsLocale: undefined,
+                    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+                    data: {
+                        personalDetailsList: {},
+                        [`${CONST.SEARCH.GROUP_PREFIX}777777777` as const]: {merchant, count: 1, currency: 'USD', total: 10},
+                    },
+                    currentAccountID: 2074551,
+                    currentUserEmail: '',
+                    translate: translateLocal,
+                    formatPhoneNumber,
+                    bankAccountList: {},
+                    rules: undefined,
+                    groupBy: CONST.SEARCH.GROUP_BY.MERCHANT,
+                    queryJSON: buildSearchQueryJSON('type:expense groupBy:merchant'),
+                    conciergeReportID: undefined,
+                    convertToDisplayString,
+                    reportAttributesDerivedValue: {},
+                }),
+                SearchUIUtils.isTransactionMerchantGroupListItemType,
+            );
+            return result.at(0)?.transactionsQueryJSON;
+        }
+
+        it('should send an exact merchant match when drilling down into a merchant group', () => {
+            // Given a merchant group "Amazon", where a contains match would also load "Amazon Marketplace" expenses
+            // When the sections build the drill-down query for that group
+            const drillDownQueryJSON = getMerchantDrillDownQuery('Amazon');
+            if (!drillDownQueryJSON) {
+                throw new Error('Expected the merchant drill-down query to be defined');
+            }
+
+            // Then the query uses the exact `merchant=` syntax and the backend receives it unchanged as `eq`,
+            // so only the group's own expenses load
+            expect(drillDownQueryJSON.inputQuery).toContain('merchant=Amazon');
+            expect(SearchQueryUtils.serializeQueryJSONForBackend(drillDownQueryJSON)).toBe(JSON.stringify(drillDownQueryJSON));
+            const merchantNode = getMerchantNode(drillDownQueryJSON);
+            expect(merchantNode?.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+            expect(merchantNode?.right).toBe('Amazon');
+        });
+
+        it.each(['merchant:Amazon', 'merchant*:Amazon'])('should give the merchant drill-down query a different hash than the same search with %s', (containsFilter) => {
+            // Given the drill-down query of the "Amazon" group and the same search with a contains merchant filter
+            const drillDownQueryJSON = getMerchantDrillDownQuery('Amazon');
+            const containsQueryJSON = buildSearchQueryJSON(drillDownQueryJSON?.inputQuery.replace('merchant=Amazon', containsFilter) ?? '');
+
+            // When the two queries are compared
+            // Then their hashes differ, because `merchant=` already makes the query string differ, so the snapshots never share results
+            expect(containsQueryJSON?.inputQuery).toContain(containsFilter);
+            expect(drillDownQueryJSON?.hash).not.toBe(containsQueryJSON?.hash);
+            expect(drillDownQueryJSON?.recentSearchHash).not.toBe(containsQueryJSON?.recentSearchHash);
+        });
+
+        it('should give each selected merchant group a merchant filter entry with its own value', () => {
+            // Given the "Amazon" group and the "No merchant" group of a merchant-grouped search
+            const groups = [{merchant: 'Amazon'}, {merchant: ''}];
+
+            // When the export builds the filter entry for each selected group
+            const selectedGroupEntries = groups.map((group) => SearchUIUtils.getSelectedGroupFilterEntry(CONST.SEARCH.GROUP_BY.MERCHANT, group));
+
+            // Then each entry filters on merchant with the group's own value, and the empty merchant maps to `none`,
+            // so the export can match each group exactly. The hook test checks that the backend gets `eq`.
+            expect(selectedGroupEntries).toEqual([
+                {key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, value: 'Amazon'},
+                {key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, value: CONST.SEARCH.MERCHANT_EMPTY_VALUE},
+            ]);
+        });
+    });
+
     describe('Test getSortedSections', () => {
         it('should return getSortedReportActionData result when type is CHAT', () => {
             const sortedActions = getSortedSectionsByType(
diff --git a/tests/unit/hooks/useSearchBulkActionsTest.ts b/tests/unit/hooks/useSearchBulkActionsTest.ts
index 053ee015ff2d..4376cbdaaa92 100644
--- a/tests/unit/hooks/useSearchBulkActionsTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsTest.ts
@@ -5,7 +5,7 @@ import type {SearchQueryJSON, SelectedReports, SelectedTransactions} from '@comp
 
 import useSearchBulkActions from '@hooks/useSearchBulkActions';
 
-import {getExportTemplates, queueExportSearchItemsToCSV, queueExportSearchWithTemplate} from '@libs/actions/Search';
+import {exportSearchItemsToCSV, getExportTemplates, queueExportSearchItemsToCSV, queueExportSearchWithTemplate} from '@libs/actions/Search';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -14,6 +14,7 @@ import Onyx from 'react-native-onyx';
 
 const mockQueueExportSearchItemsToCSV = jest.mocked(queueExportSearchItemsToCSV);
 const mockQueueExportSearchWithTemplate = jest.mocked(queueExportSearchWithTemplate);
+const mockExportSearchItemsToCSV = jest.mocked(exportSearchItemsToCSV);
 const mockGetExportTemplates = jest.mocked(getExportTemplates);
 
 jest.mock('@libs/actions/Export', () => ({
@@ -328,6 +329,38 @@ describe('useSearchBulkActions - CSV export flow', () => {
         expect(exportPayload?.jsonQuery).not.toContain('group_123');
     });
 
+    it('exports a selected merchant group with an exact merchant match', async () => {
+        // Given a merchant-grouped search where the user ticked the "Amazon" group, so its loaded child is stamped with the group key
+        const merchantGroupKey = `${CONST.SEARCH.GROUP_PREFIX}123` as const;
+        mockSelectedTransactions = {tx1: makeSelectedTransaction({groupKey: merchantGroupKey, isSelectedViaGroup: true})};
+        mockCurrentSearchResults = {
+            search: {type: CONST.SEARCH.DATA_TYPES.EXPENSE},
+            data: {
+                [merchantGroupKey]: {merchant: 'Amazon', count: 3, total: 300, currency: 'USD'},
+            },
+        };
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(result.current.headerButtonsOptions.length).toBeGreaterThan(0);
+        });
+
+        // When the user exports the current view of that group selection
+        const onSelected = getExportMenuItems(result.current.headerButtonsOptions).find((item) => item.text === 'export.currentView')?.onSelected;
+
+        await act(async () => {
+            onSelected?.();
+        });
+
+        // Then the backend receives the merchant filter as `eq`, because a `contains` match on "Amazon" would also
+        // export "Amazon Marketplace" expenses that are not in the selected group
+        const [exportPayload] = mockExportSearchItemsToCSV.mock.calls.at(-1) ?? [];
+        expect(exportPayload?.isGroupExport).toBe(true);
+        expect(exportPayload?.jsonQuery).toContain(`"operator":"${CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}","left":"${CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}","right":"Amazon"`);
+        expect(exportPayload?.jsonQuery).not.toContain(`"operator":"${CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}"`);
+    });
+
     it('preserves excluded group negations when the query already filters the grouped field', async () => {
         const firstExcludedGroupKey = `${CONST.SEARCH.GROUP_PREFIX}123` as const;
         const secondExcludedGroupKey = `${CONST.SEARCH.GROUP_PREFIX}456` as const;

From 380f75dc1f9283d8ceaa8ca170251a38fceb33c1 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:38:05 +0700
Subject: [PATCH 311/781] Extract buildMerchantFilterQuery from the filter
 query builder

Move the Merchant clause reconciliation out of the mappedFilters callback
in buildQueryStringFromFilterFormValues into a helper next to
getMerchantOperator. Query strings do not change.
---
 src/libs/SearchQueryUtils.ts | 82 +++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 758042487167..8b44c821555c 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -110,6 +110,51 @@ function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantM
     return operator ?? DEFAULT_MERCHANT_OPERATOR;
 }
 
+/**
+ * Builds the Merchant part of the query. The form has one Merchant field, so a changed condition updates every Merchant clause from flatFilters.
+ */
+function buildMerchantFilterQuery(
+    value: string,
+    prefix: string,
+    isNegated: boolean,
+    isMerchantNegated: boolean,
+    merchantOperator: MerchantMatchType | undefined,
+    flatFilters: QueryFilters | undefined,
+): string {
+    const merchantFilters = flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const wasMerchantNegated = negativeMerchantFilters.length > 0;
+    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
+    const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
+    const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
+    const isMerchantValueUnchanged = value === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
+    if (lastMerchantFilter && isMerchantValueUnchanged) {
+        const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+            ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+            : DEFAULT_MERCHANT_OPERATOR;
+        const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
+        const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
+        const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
+        const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
+        // The single field cannot represent every clause or distinguish lists from names containing commas.
+        const merchantClauses = filtersToUpdate.map((filter) => {
+            const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
+            return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
+        });
+        // Different operators can become identical clauses after the change.
+        return [...new Set(merchantClauses)].join(' ');
+    }
+
+    let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+    if (!isNegated) {
+        operator = selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+    }
+    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}${operator}${sanitizeSearchValue(value)}`;
+}
+
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
 const VALID_EXPENSE_TYPES = new Set(Object.values(CONST.SEARCH.TRANSACTION_TYPE));
 const VALID_RECEIPT_TYPES = new Set<string>(Object.values(CONST.SEARCH.RECEIPT_TYPE));
@@ -1269,42 +1314,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    const value = filterValue as string;
                     if (filterKey === FILTER_KEYS.MERCHANT) {
-                        const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
-                        const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-                        const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-                        const wasMerchantNegated = negativeMerchantFilters.length > 0;
-                        const isMerchantNegated = !!supportedFilterValues.merchantNot;
-                        const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
-                        const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
-                        const selectedMerchantOperator = getMerchantOperator(merchantOperator);
-                        const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
-                        const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
-                        const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
-                        if (lastMerchantFilter && isMerchantValueUnchanged) {
-                            const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
-                                ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-                                : DEFAULT_MERCHANT_OPERATOR;
-                            const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
-                            const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
-                            const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
-                            const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
-                            // The single field cannot represent every clause or distinguish lists from names containing commas.
-                            const merchantClauses = filtersToUpdate.map((filter) => {
-                                const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
-                                return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
-                            });
-                            // Different operators can become identical clauses after the change.
-                            return [...new Set(merchantClauses)].join(' ');
-                        }
-
-                        if (!isNegated) {
-                            operator =
-                                selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
-                        }
+                        return buildMerchantFilterQuery(value, prefix, isNegated, !!supportedFilterValues.merchantNot, merchantOperator, options?.flatFilters);
                     }
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO]}${sanitizeSearchValue(value)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {

From afdf3706ced68edb4ffd5dc6594a9e1e4353655d Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 17:03:03 +0700
Subject: [PATCH 312/781] Reuse TextInputFilterContent for the Merchant filter

MerchantFilterContent forked TextInputFilterContent without its ScrollView
and in-list button handling. Add an optional, generic renderBelowInput slot
(plus buttonStyles and sentryLabel) to TextInputFilterContent, and make
MerchantFilterContent a thin wrapper that passes the match type selector
through the slot.

Reserve the row height of the match type list, because a flex list inside
a ScrollView can shrink to zero height when the keyboard is open.
---
 .../AdvancedFilters/MerchantFilterContent.tsx | 111 ++++++------------
 .../TextInputFilterContent.tsx                |  26 +++-
 .../MerchantMatchTypeSelector.tsx             |  17 ++-
 3 files changed, 67 insertions(+), 87 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
index 3a646817e684..badf05abfa88 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -1,29 +1,22 @@
 /**
  * Renders the advanced Merchant filter input, match type, and negation controls.
  */
-import Button from '@components/Button';
 import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
-import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
-import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
-import TextInput from '@components/TextInput';
-import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
-import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
-
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
-import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';
 
+import TextInputFilterContent from './TextInputFilterContent';
+
 type MerchantFilterContentProps = {
     /** The Merchant filter key. */
     baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
@@ -59,14 +52,10 @@ type MerchantFilterContentProps = {
     onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
 };
 
-function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
-    return !!element && 'isFocused' in element;
-}
-
 function MerchantFilterContent({
     baseFilterKey,
-    value: initialValue,
-    isNegated: initialIsNegated,
+    value,
+    isNegated,
     merchantOperator: initialMerchantOperator,
     buttonSize,
     buttonText,
@@ -76,76 +65,42 @@ function MerchantFilterContent({
     buttonStyles,
     onChange,
 }: MerchantFilterContentProps) {
-    const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const [value, setValue] = useState(initialValue);
-    const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    const shouldShowMerchantMatchType = !isNegated;
-    const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
-    const {inputCallbackRef} = useAutoFocusInput();
-    const error = useTextFilterValidation(baseFilterKey, value);
-
-    const filterInput = (
-        <TextInput
-            ref={(ref) => {
-                if (!autoFocus || !isTextInput(ref)) {
-                    return;
-                }
-                inputCallbackRef(ref);
-            }}
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
-        />
-    );
-
-    const updateMerchantFilter = () => {
-        if (error) {
-            return;
-        }
 
+    const updateMerchantFilter = (newValue: string | undefined, newIsNegated: boolean) => {
         onChange({
-            [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
-            [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? undefined : merchantOperator,
+            [FILTER_KEYS.MERCHANT]: newIsNegated ? undefined : newValue,
+            [FILTER_KEYS.MERCHANT_NOT]: newIsNegated ? newValue : undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: newIsNegated ? undefined : merchantOperator,
         });
     };
 
+    // A negated Merchant filter always uses the not-equal operator, so the match type is hidden.
+    const renderMatchTypeSelector = (isFilterNegated: boolean) =>
+        isFilterNegated ? null : (
+            <View style={[styles.flex1, styles.mt2]}>
+                <MerchantMatchTypeSelector
+                    value={merchantOperator}
+                    onChange={setMerchantOperator}
+                />
+            </View>
+        );
+
     return (
-        <View style={[styles.flex1, styles.justifyContentBetween, style]}>
-            <NegatableFilter
-                baseFilterKey={baseFilterKey}
-                isNegated={isNegated}
-                onNegationChange={setIsNegated}
-                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
-            >
-                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
-                    {filterInput}
-                    {shouldShowMerchantMatchType && (
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    )}
-                </View>
-            </NegatableFilter>
-            <Button
-                style={[styles.ph5, styles.pb5, buttonStyles]}
-                variant={CONST.BUTTON_VARIANT.SUCCESS}
-                size={buttonSize}
-                onPress={updateMerchantFilter}
-                sentryLabel={sentryLabel}
-            >
-                <Button.KeyboardShortcut />
-                <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
-            </Button>
-        </View>
+        <TextInputFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            size={buttonSize}
+            autoFocus={autoFocus}
+            style={style}
+            buttonText={buttonText}
+            buttonStyles={buttonStyles}
+            sentryLabel={sentryLabel}
+            renderBelowInput={renderMatchTypeSelector}
+            onChange={updateMerchantFilter}
+        />
     );
 }
 
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 6242f00b45ae..077606301b62 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -15,7 +15,7 @@ import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 
-import type {ComponentRef} from 'react';
+import type {ComponentRef, ReactNode} from 'react';
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
@@ -30,6 +30,12 @@ type TextInputFilterContentProps = {
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
     buttonText?: string;
+    buttonStyles?: StyleProp<ViewStyle>;
+    sentryLabel?: string;
+
+    /** Renders extra controls under the input, inside the scrollable area. Receives the current negation state, so the content can change when the user negates the filter. */
+    renderBelowInput?: (isNegated: boolean) => ReactNode;
+
     onChange: (value: string | undefined, isNegated: boolean) => void;
 };
 
@@ -37,7 +43,19 @@ function isTextInput(element: BaseTextInputRef | ComponentRef<typeof RNTextInput
     return !!element && 'isFocused' in element;
 }
 
-function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated: initialIsNegated, autoFocus, size, style, buttonText, onChange}: TextInputFilterContentProps) {
+function TextInputFilterContent({
+    baseFilterKey,
+    value: initialValue,
+    isNegated: initialIsNegated,
+    autoFocus,
+    size,
+    style,
+    buttonText,
+    buttonStyles,
+    sentryLabel,
+    renderBelowInput,
+    onChange,
+}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
@@ -50,7 +68,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
 
     const button = (
         <Button
-            style={[styles.ph5, styles.pb5]}
+            style={[styles.ph5, styles.pb5, buttonStyles]}
             variant={CONST.BUTTON_VARIANT.SUCCESS}
             size={size}
             onPress={() => {
@@ -59,6 +77,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                 }
                 onChange(value, isNegated);
             }}
+            sentryLabel={sentryLabel}
         >
             <Button.KeyboardShortcut />
             <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
@@ -93,6 +112,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                         containerStyles={[styles.ph5]}
                     />
                 </NegatableFilter>
+                {renderBelowInput?.(isNegated)}
                 {shouldButtonBeInScrollView && button}
             </ScrollView>
             {!shouldButtonBeInScrollView && button}
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 4cf7cf356cb3..cbcf743be352 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -9,6 +9,8 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import variables from '@styles/variables';
+
 import CONST from '@src/CONST';
 import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
@@ -44,12 +46,15 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
             <View style={[styles.pb2, styles.ph5]}>
                 <Text style={[styles.textLabelSupporting]}>{translate('search.filters.merchant.matchType')}</Text>
             </View>
-            <SelectionList
-                data={items}
-                ListItem={SingleSelectListItem}
-                onSelectRow={(item) => onChange(item.keyForList)}
-                shouldSingleExecuteRowSelect
-            />
+            {/* Inside a ScrollView a flex list can shrink to zero height when the keyboard is open, so reserve room for every row */}
+            <View style={[styles.flex1, {minHeight: items.length * variables.optionRowHeight}]}>
+                <SelectionList
+                    data={items}
+                    ListItem={SingleSelectListItem}
+                    onSelectRow={(item) => onChange(item.keyForList)}
+                    shouldSingleExecuteRowSelect
+                />
+            </View>
         </>
     );
 }

From 93596d722a8995f995559910839368f74cd95d00 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 17:18:08 +0700
Subject: [PATCH 313/781] Load the English locale in SearchSavePageTest

The Merchant filter value is now shown through translate as
Contains "Coffee Shop". The test loaded no locale, so translate returned
key paths and the Merchant text never rendered. Load English before the
tests and assert the localized label users see.
---
 tests/unit/pages/Search/SearchSavePageTest.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pages/Search/SearchSavePageTest.tsx b/tests/unit/pages/Search/SearchSavePageTest.tsx
index 9ca581247845..258c06a1d59e 100644
--- a/tests/unit/pages/Search/SearchSavePageTest.tsx
+++ b/tests/unit/pages/Search/SearchSavePageTest.tsx
@@ -11,6 +11,7 @@ import * as SearchUIUtils from '@libs/SearchUIUtils';
 import SearchSavePage from '@pages/Search/SearchSavePage';
 
 import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {Card, CardList} from '@src/types/onyx';
@@ -53,16 +54,24 @@ jest.mocked(useOnyx).mockImplementation((key) => {
             return [undefined, {status: 'loaded'}];
     }
 });
+// Without a loaded locale, translate returns key paths and translated filter values never show the user's text.
+beforeAll(() => IntlStore.load(CONST.LOCALES.EN));
 beforeEach(() => jest.clearAllMocks());
 it.each([[['12']], [['12', '23']], [['123']]])('renders canonical card selection %j exactly', (cardID) => {
+    // Given a saved search form with cards, feeds, tax rates and a Merchant filter that uses the default "contains" match
     form = {cardID, feed: ['feed-a', 'feed-b'], taxRate: ['tax-a', 'tax-b'], merchant: 'Coffee Shop'};
+
+    // When the save page renders the filter summary
     const output = JSON.stringify(render(<SearchSavePage />).toJSON());
+
+    // Then only the selected card titles, the feed and tax display values, and the localized Merchant label show
     const expectedDescriptions = cardID.at(0) === '123' ? [false, false, true] : [true, cardID.length === 2, false];
     expect(['Selected Alpha', 'Selected Beta', 'Unselected Overlap'].map((text) => output.includes(text))).toEqual(expectedDescriptions);
     expect(['12', '23', '123'].map((rawID) => output.includes(rawID))).toEqual([false, false, false]);
     expect(jest.mocked(useFilterFeedValue)).toHaveBeenCalledWith(['feed-a', 'feed-b']);
     expect(jest.mocked(useFilterTaxRateValue)).toHaveBeenCalledWith(['tax-a', 'tax-b']);
-    expect(['feed:feed-a|feed-b', 'tax:tax-a|tax-b', 'Coffee Shop'].every((text) => output.includes(text))).toBe(true);
+    // The output is a JSON string, so the quotes in the Merchant label are escaped.
+    expect(['feed:feed-a|feed-b', 'tax:tax-a|tax-b', 'Contains \\"Coffee Shop\\"'].every((text) => output.includes(text))).toBe(true);
 });
 it('renders scalar feed and tax values without calling array display hooks', () => {
     jest.spyOn(SearchUIUtils, 'mapFiltersFormToLabelValueList').mockReturnValueOnce([

From 6a5d4bfc5b884f01ff3436501dd003791cfa3678 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Wed, 7 Oct 2026 17:27:54 +0700
Subject: [PATCH 314/781] add create button on category dropdown

---
 src/CONST/index.ts                            |  1 +
 src/ROUTES.ts                                 |  2 +-
 .../CategoryPicker/CategoryPickerModal.tsx    | 39 ++++++++++-
 .../sections/CategoryFieldDropdown.tsx        | 16 +++++
 src/libs/PolicyUtils/index.ts                 |  6 ++
 .../step/DynamicIOURequestStepCategory.tsx    |  6 +-
 tests/unit/PolicyUtilsTest.ts                 | 31 +++++++++
 .../components/CategoryPickerModalTest.tsx    | 64 +++++++++++++++++++
 8 files changed, 159 insertions(+), 6 deletions(-)
 create mode 100644 tests/unit/components/CategoryPickerModalTest.tsx

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index bde832c72f9f..7549ab973a4b 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9618,6 +9618,7 @@ const CONST = {
             HOURS_FIELD: 'RequestConfirmationList-HoursField',
             TIME_RATE_FIELD: 'RequestConfirmationList-TimeRateField',
             CATEGORY_FIELD: 'RequestConfirmationList-CategoryField',
+            ADD_CATEGORY_BUTTON: 'RequestConfirmationList-AddCategoryButton',
             DATE_FIELD: 'RequestConfirmationList-DateField',
             TAG_FIELD: 'RequestConfirmationList-TagField',
             TAX_RATE_FIELD: 'RequestConfirmationList-TaxRateField',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 5f66dbb0ad7d..53c0db212256 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2045,7 +2045,7 @@ const DYNAMIC_ROUTES = {
     },
     MONEY_REQUEST_STEP_CATEGORY_CREATE: {
         path: 'add-category',
-        entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_CATEGORY],
+        entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_CATEGORY, SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, SCREENS.MONEY_REQUEST.CREATE],
     },
     MONEY_REQUEST_ATTENDEE: {
         path: 'attendees',
diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index 3fee5ad3886e..e55d429e2959 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -1,17 +1,26 @@
+import Icon from '@components/Icon';
 import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent';
 import type PopoverWithMeasuredContentProps from '@components/PopoverWithMeasuredContent/types';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {ListItem} from '@components/SelectionList/types';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
 
 import useKeyboardState from '@hooks/useKeyboardState';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getEnabledCategoriesCount} from '@libs/CategoryUtils';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import getSelectionListPopoverContentHeight from '@libs/getSelectionListPopoverContentHeight';
 
+import variables from '@styles/variables';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
@@ -47,6 +56,9 @@ type CategoryPickerModalProps = {
     /** Whether the pop-over shrinks to the height its list needs, treating `popoverHeight` as a ceiling. */
     shouldFitContentHeight?: boolean;
 
+    /** Shows a header with an add button, for users who can add a category to the workspace */
+    onAddCategory?: () => void;
+
     /** Whether the pop-over may flip to the other side of the anchor when it overflows. It shifts by a whole pop-over height, so a caller that already picked the side turns this off. */
     shouldSwitchPositionIfOverflow?: boolean;
 } & Omit<PopoverWithMeasuredContentProps, 'anchorRef' | 'children' | 'onClose'>;
@@ -64,8 +76,12 @@ function CategoryPickerModal({
     popoverHeight = CONST.POPOVER_DROPDOWN_MAX_HEIGHT,
     shouldFitContentHeight = false,
     shouldSwitchPositionIfOverflow = true,
+    onAddCategory,
 }: CategoryPickerModalProps) {
     const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const icons = useMemoizedLazyExpensifyIcons(['Plus']);
     const StyleUtils = useStyleUtils();
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth -- must match PopoverWithMeasuredContent's dock decision (bottom-docked only when isSmallScreenWidth)
     const {isSmallScreenWidth} = useResponsiveLayout();
@@ -77,7 +93,8 @@ function CategoryPickerModal({
 
     const categoriesCount = policyCategories ?? 0;
     const isSearchable = categoriesCount >= CONST.STANDARD_LIST_ITEM_LIMIT;
-    const estimatedContentHeight = getSelectionListPopoverContentHeight({optionCount: Math.max(renderedRowCount ?? categoriesCount, 1), isSearchable});
+    const headerHeight = onAddCategory ? variables.componentSizeNormal : 0;
+    const estimatedContentHeight = getSelectionListPopoverContentHeight({optionCount: Math.max(renderedRowCount ?? categoriesCount, 1), isSearchable}) + headerHeight;
 
     // A bottom sheet is sized by the screen, so the content estimate only applies to the pop-over.
     const resolvedHeight = shouldFitContentHeight && !isSmallScreenWidth ? Math.min(popoverHeight, estimatedContentHeight) : popoverHeight;
@@ -111,6 +128,26 @@ function CategoryPickerModal({
             enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[StyleUtils.getHeight(popoverDimensions.height), styles.flexColumn, styles.pt4]}>
+                {!!onAddCategory && (
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, StyleUtils.getHeight(headerHeight)]}>
+                        <Text style={styles.textLabelSupporting}>{translate('common.category')}</Text>
+                        <Tooltip text={translate('workspace.categories.addCategory')}>
+                            <PressableWithFeedback
+                                accessibilityLabel={translate('workspace.categories.addCategory')}
+                                role={CONST.ROLE.BUTTON}
+                                onPress={onAddCategory}
+                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.ADD_CATEGORY_BUTTON}
+                            >
+                                <Icon
+                                    src={icons.Plus}
+                                    fill={theme.icon}
+                                    width={variables.iconSizeNormal}
+                                    height={variables.iconSizeNormal}
+                                />
+                            </PressableWithFeedback>
+                        </Tooltip>
+                    </View>
+                )}
                 <CategoryPicker
                     onRenderedRowCountChange={setRenderedRowCount}
                     selectedCategory={selectedCategory}
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
index ab74261457b9..d402ac95c099 100644
--- a/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
@@ -2,13 +2,19 @@ import CategoryPickerModal from '@components/CategoryPicker/CategoryPickerModal'
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import type {ListItem} from '@components/SelectionList/types';
 
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
 import useUpdateTransactionCategory from '@hooks/useUpdateTransactionCategory';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import TransitionTracker from '@libs/Navigation/TransitionTracker';
+import {canCreateCategoryInSitu} from '@libs/PolicyUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
@@ -35,6 +41,7 @@ type CategoryFieldDropdownProps = ExpenseFieldDropdownRenderProps & {
  */
 function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose, ...popoverProps}: CategoryFieldDropdownProps) {
     const {reportID, isEditingSplitBill, action} = useConfirmationFields();
+    const currentUserLogin = useCurrentUserPersonalDetails().login;
 
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
@@ -51,6 +58,14 @@ function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose
         isEditingSplit: isEditingSplitBill,
     });
 
+    const openAddCategory = () => {
+        onClose();
+        TransitionTracker.runAfterTransitions({
+            callback: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.path)),
+            waitForUpcomingTransition: true,
+        });
+    };
+
     const handleSelected = (item: ListItem) => {
         // `CategoryPickerModal` hands back an empty item when the selected category is tapped again, clearing it.
         updateCategory(item.searchText ?? '');
@@ -64,6 +79,7 @@ function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose
             policyID={policy?.id}
             selectedCategory={selectedCategory}
             onSelected={handleSelected}
+            onAddCategory={canCreateCategoryInSitu(policy, currentUserLogin) ? openAddCategory : undefined}
         />
     );
 }
diff --git a/src/libs/PolicyUtils/index.ts b/src/libs/PolicyUtils/index.ts
index 124d59d9e476..a2d896a2404b 100644
--- a/src/libs/PolicyUtils/index.ts
+++ b/src/libs/PolicyUtils/index.ts
@@ -1551,6 +1551,11 @@ function hasAccountingConnections(policy: OnyxEntry<Policy>) {
     return !!getCurrentConnectionName(policy) || hasSupportedOnlyOnOldDotIntegration(policy);
 }
 
+/** Whether the user can add a category to the workspace straight from an expense's category picker */
+function canCreateCategoryInSitu(policy: OnyxEntry<Policy>, login?: string) {
+    return canEditWorkspaceSettings(policy, login) && !hasAccountingConnections(policy) && !!policy?.areCategoriesEnabled;
+}
+
 function hasAccountingFeatureConnection(policy: OnyxEntry<Policy>) {
     return hasAccountingConnections(policy) || hasUnsupportedIntegration(policy);
 }
@@ -2792,6 +2797,7 @@ export {
     goBackFromInvalidPolicy,
     hasAccountingFeatureConnection,
     hasAccountingConnections,
+    canCreateCategoryInSitu,
     shouldShowSyncError,
     shouldShowCustomUnitsError,
     shouldShowEmployeeListError,
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
index d5b747707863..e6b935ca4414 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
@@ -29,7 +29,7 @@ import {getSelectedWorkspacePolicyID, pickReportForPolicy} from '@libs/IOUUtils'
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
-import {canEditWorkspaceSettings, hasAccountingConnections, isGroupPolicy} from '@libs/PolicyUtils';
+import {canCreateCategoryInSitu, canEditWorkspaceSettings, isGroupPolicy} from '@libs/PolicyUtils';
 import {getTransactionDetails, isSelfDM} from '@libs/ReportUtils';
 import {getRequestType} from '@libs/TransactionUtils';
 
@@ -100,9 +100,7 @@ function DynamicIOURequestStepCategory({
 
     const categoryForDisplay = isCategoryMissing(transactionCategory) ? '' : transactionCategory;
 
-    const canCreateCategoryInSitu = canEditWorkspaceSettings(policy, currentUserEmailParam) && !hasAccountingConnections(policy) && !!policy?.areCategoriesEnabled;
-
-    const createCategoryMenuItems = canCreateCategoryInSitu
+    const createCategoryMenuItems = canCreateCategoryInSitu(policy, currentUserEmailParam)
         ? [
               {
                   icon: expensifyIcons.Plus,
diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index 2fe5cc9d895d..64f68a6a689f 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -7,6 +7,7 @@ import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {
     arePolicyRulesEnabled,
+    canCreateCategoryInSitu,
     canEditWorkspaceSettings,
     canMemberAssignRole,
     canMemberManageMemberWithRole,
@@ -430,6 +431,36 @@ describe('PolicyUtils', () => {
         });
     });
 
+    describe('canCreateCategoryInSitu', () => {
+        const categoriesPolicy = (role: ValueOf<typeof CONST.POLICY.ROLE>, areCategoriesEnabled = true): Policy => ({
+            ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+            role,
+            areCategoriesEnabled,
+            connections: undefined,
+        });
+
+        it('lets an admin add a category from the picker when the workspace uses categories', () => {
+            // Given an admin of a workspace with categories on and no accounting integration
+            // When we check whether the category picker can offer to add one
+            // Then it can, as the full-page selector's "+" does
+            expect(canCreateCategoryInSitu(categoriesPolicy(CONST.POLICY.ROLE.ADMIN))).toBe(true);
+        });
+
+        it('does not let a member add a category', () => {
+            // Given a member, who cannot change workspace settings
+            // When we check whether the category picker can offer to add one
+            // Then it cannot, so the pop-over hides its add button
+            expect(canCreateCategoryInSitu(categoriesPolicy(CONST.POLICY.ROLE.USER))).toBe(false);
+        });
+
+        it('does not offer to add a category when the workspace has categories turned off', () => {
+            // Given an admin of a workspace that has turned categories off
+            // When we check whether the category picker can offer to add one
+            // Then it cannot, because a new category would have nowhere to show
+            expect(canCreateCategoryInSitu(categoriesPolicy(CONST.POLICY.ROLE.ADMIN, false))).toBe(false);
+        });
+    });
+
     describe('isArchivedPolicy', () => {
         it('returns true when the policy has an archivedDate', () => {
             const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), archivedDate: '2024-01-01'};
diff --git a/tests/unit/components/CategoryPickerModalTest.tsx b/tests/unit/components/CategoryPickerModalTest.tsx
new file mode 100644
index 000000000000..8e3a034c7598
--- /dev/null
+++ b/tests/unit/components/CategoryPickerModalTest.tsx
@@ -0,0 +1,64 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import CategoryPickerModal from '@components/CategoryPicker/CategoryPickerModal';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@components/CategoryPicker', () => () => null);
+jest.mock(
+    '@components/PopoverWithMeasuredContent',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+
+const renderModal = (onAddCategory?: () => void) =>
+    render(
+        <CategoryPickerModal
+            isVisible
+            onClose={() => {}}
+            anchorPosition={{horizontal: 0, vertical: 0}}
+            policyID="policyID"
+            onAddCategory={onAddCategory}
+        />,
+    );
+
+describe('CategoryPickerModal', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('shows an add button that adds a category for users who can create one', () => {
+        // Given a user who can add categories to the workspace, as the full-page selector's "+" allows
+        const onAddCategory = jest.fn();
+        renderModal(onAddCategory);
+
+        // When they press the add button in the pop-over's header
+        fireEvent.press(screen.getByLabelText('workspace.categories.addCategory'));
+
+        // Then the pop-over hands over to the add-category flow, so the pop-over offers the same action the full page does
+        expect(screen.getByText('common.category')).toBeOnTheScreen();
+        expect(onAddCategory).toHaveBeenCalledTimes(1);
+    });
+
+    it('shows no header for users who cannot create a category', () => {
+        // Given a user who cannot add categories, e.g. a member or a workspace synced with an accounting integration
+        // When the pop-over opens
+        renderModal();
+
+        // Then there is no add button or header, matching the full page that hides its "+" for them
+        expect(screen.queryByLabelText('workspace.categories.addCategory')).toBeNull();
+        expect(screen.queryByText('common.category')).toBeNull();
+    });
+});

From 434ec5aa526100365083438b85679048c30d108d Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 7 Oct 2026 14:28:52 +0200
Subject: [PATCH 315/781] fix: iOS tab labels fall back for non-Latin scripts
 and truncate to the tab width, tabs keep their state across the breakpoint,
 wide Spend opens last search

---
 .../NativeTabNavigator/NativeTabLayout.tsx    | 15 ++---
 .../NativeTabNavigator/TabPressListeners.tsx  |  4 +-
 .../NativeTabNavigator/tabIconRasterizer.ts   | 63 +++++++++++--------
 .../useNativeTabBarOptions/index.ios.ts       |  7 ++-
 src/styles/variables.ts                       |  2 +
 5 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index 8dc42d5dfe64..11884432fdb6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -39,18 +39,11 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     // The buttons follow whatever the navigator decided for the bar itself.
     const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
 
-    if (!shouldUseNarrowLayout) {
-        return (
-            <View style={[styles.flex1, styles.flexRow]}>
-                <TabNavigatorBar state={state} />
-                <View style={styles.flex1}>{children}</View>
-            </View>
-        );
-    }
-
+    // The tabs stay at the same place in the tree in both layouts, so crossing the breakpoint does not remount them.
     return (
-        <View style={styles.flex1}>
-            {children}
+        <View style={[styles.flex1, !shouldUseNarrowLayout && styles.flexRow]}>
+            {!shouldUseNarrowLayout && <TabNavigatorBar state={state} />}
+            <View style={styles.flex1}>{children}</View>
             <TabPressListeners
                 state={state}
                 descriptors={descriptors}
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
index 31dad7553434..7e61362931a5 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/TabPressListeners.tsx
@@ -18,8 +18,8 @@ import type {NativeTabLayoutProps} from './NativeTabLayout';
 /**
  * The native bar's Spend and Workspaces handling that needs Onyx data, so the data re-renders only this component.
  * Spend's first visit opens the latest search kept in Onyx, so the tab mounted at startup with the default search gets
- * it before it is first shown and the native bar can switch to it. Workspaces restores the last workspace, or the list
- * for one that is gone, whenever the tab does not already show it.
+ * it before it is first shown, both for the native bar and for the side bar of a wide layout. Workspaces restores the
+ * last workspace, or the list for one that is gone, whenever the tab does not already show it.
  */
 function TabPressListeners({state, descriptors}: Pick<NativeTabLayoutProps, 'state' | 'descriptors'>) {
     const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY);
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index fa55746b019c..4c2efd1d9bd5 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -1,9 +1,9 @@
 import FontUtils from '@styles/utils/FontUtils';
 
 import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
-import type {SkCanvas, SkFont, SkImage, SkPath} from '@shopify/react-native-skia';
+import type {SkCanvas, SkImage, SkParagraph, SkPath} from '@shopify/react-native-skia';
 
-import {BlendMode, ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia} from '@shopify/react-native-skia';
+import {BlendMode, ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia, TextAlign} from '@shopify/react-native-skia';
 import {PixelRatio} from 'react-native';
 
 import type {NativeTabGlyph, NativeTabName} from './NATIVE_TAB_GLYPHS';
@@ -29,6 +29,8 @@ type TabIconLabel = {
     text: string;
     color: string;
     isBold: boolean;
+    /** Width of the tab's slot in the bar, past which the label is truncated with an ellipsis. */
+    maxWidth: number;
 };
 
 type TabIconParams = {
@@ -45,7 +47,6 @@ const MAX_CACHED_ICONS = 64;
 
 const iconCache = new Map<string, NativeBottomTabIcon | undefined>();
 const glyphPathCache = new Map<NativeTabName, SkPath[]>();
-const labelFontCache = new Map<string, SkFont>();
 
 function getGlyphPaths(name: NativeTabName): SkPath[] {
     const cachedPaths = glyphPathCache.get(name);
@@ -68,18 +69,19 @@ function getGlyphPaths(name: NativeTabName): SkPath[] {
     return paths;
 }
 
-function getLabelFont(isBold: boolean, size: number): SkFont {
-    const key = `${isBold}|${size}`;
-    const cachedFont = labelFontCache.get(key);
-    if (cachedFont) {
-        return cachedFont;
-    }
-    const typeface = Skia.FontMgr.System().matchFamilyStyle(FontUtils.fontFamily.single.EXP_NEUE.fontFamily, {
-        weight: isBold ? FontWeight.Bold : FontWeight.Normal,
-    });
-    const font = Skia.Font(typeface, size);
-    labelFontCache.set(key, font);
-    return font;
+/** A paragraph rather than a single font, because only a paragraph falls back to a system font for scripts Expensify Neue lacks. */
+function makeLabelParagraph({text, color, isBold, maxWidth}: TabIconLabel, fontSize: number, scale: number): SkParagraph {
+    const paragraph = Skia.ParagraphBuilder.Make({maxLines: 1, ellipsis: '…', textAlign: TextAlign.Left})
+        .pushStyle({
+            color: Skia.Color(color),
+            fontFamilies: [FontUtils.fontFamily.single.EXP_NEUE.fontFamily],
+            fontSize: fontSize * scale,
+            fontStyle: {weight: isBold ? FontWeight.Bold : FontWeight.Normal},
+        })
+        .addText(text)
+        .build();
+    paragraph.layout(maxWidth * scale);
+    return paragraph;
 }
 
 function drawGlyph(canvas: SkCanvas, name: NativeTabName, left: number, top: number, size: number, color: string) {
@@ -141,15 +143,15 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
     // every label lands at the same height.
     const rowSize = label ? Math.max(layout.glyphSize, layout.avatarSize) * scale : contentSize;
     const labelTop = (rowSize + layout.glyphSize * scale) / 2 + layout.labelGap * scale;
-    const font = label ? getLabelFont(label.isBold, layout.labelFontSize * scale) : undefined;
-    const labelWidth = label && font ? font.measureText(label.text).width : 0;
-    const labelMetrics = font?.getMetrics();
-    const labelHeight = labelMetrics ? labelMetrics.descent - labelMetrics.ascent : 0;
+    const paragraph = label ? makeLabelParagraph(label, layout.labelFontSize, scale) : undefined;
+    const labelWidth = paragraph?.getLongestLine() ?? 0;
+    const labelHeight = paragraph?.getHeight() ?? 0;
     const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
     const canvasHeight = Math.ceil(label ? labelTop + labelHeight : rowSize);
 
     const surface = Skia.Surface.Make(canvasWidth, canvasHeight);
     if (!surface) {
+        paragraph?.dispose();
         return undefined;
     }
 
@@ -164,12 +166,9 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
     if (dotColor) {
         drawStatusDot(canvas, contentLeft + contentSize, contentTop, layout.dotRadius * scale, layout.dotCutout * scale, dotColor);
     }
-    if (label && font && labelMetrics) {
-        const paint = Skia.Paint();
-        paint.setColor(Skia.Color(label.color));
-        paint.setAntiAlias(true);
-        canvas.drawText(label.text, (canvasWidth - labelWidth) / 2, labelTop - labelMetrics.ascent, paint, font);
-        paint.dispose();
+    if (paragraph) {
+        paragraph.paint(canvas, (canvasWidth - labelWidth) / 2, labelTop);
+        paragraph.dispose();
     }
 
     surface.flush();
@@ -191,7 +190,19 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
  */
 function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomTabIcon | undefined {
     const {name, color, avatar, dotColor, label} = params;
-    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, layout.glyphSize, layout.avatarSize, layout.dotRadius, layout.dotCutout].join('|');
+    const key = [
+        name,
+        avatar?.uri ?? color,
+        dotColor,
+        label?.text,
+        label?.color,
+        label?.isBold,
+        label?.maxWidth,
+        layout.glyphSize,
+        layout.avatarSize,
+        layout.dotRadius,
+        layout.dotCutout,
+    ].join('|');
     if (iconCache.has(key)) {
         return iconCache.get(key);
     }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 686535daa74e..e6f46ed27404 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -1,4 +1,5 @@
 import useTheme from '@hooks/useTheme';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
 import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
@@ -35,6 +36,10 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
 function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
     const theme = useTheme();
     const avatar = useTabAvatarImage(isAccountAvatarShown);
+    const {windowWidth} = useWindowDimensions();
+    // One of the tabs never has a bar item, so the bar splits its width between the others.
+    const barItemCount = Object.keys(tabLabels).length - 1;
+    const labelMaxWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount;
 
     const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
@@ -57,7 +62,7 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
                 color: isSelected ? theme.iconMenu : theme.icon,
                 avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
                 dotColor: dotColors[name],
-                label: {text: tabLabels[name], color: isSelected ? theme.text : theme.textSupporting, isBold: isSelected},
+                label: {text: tabLabels[name], color: isSelected ? theme.text : theme.textSupporting, isBold: isSelected, maxWidth: labelMaxWidth},
             });
         const inactiveIcon = getIcon(false);
         const activeIcon = getIcon(true);
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index a86fce69cfcd..d5eb6116b771 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -121,6 +121,8 @@ export default {
     nativeTabIconDotCutout: 2,
     /** Gap between the glyph and the label drawn under it in an iOS native tab bar icon. */
     nativeTabIconLabelGap: 6,
+    /** Space between the screen edge and the first tab of the iOS 26 floating tab bar. */
+    iosNativeTabBarHorizontalInset: 25,
     /** Material's BottomNavigationView row, without the gesture inset under it. */
     androidNativeTabBarHeight: 80,
     /** Material's bar row (androidNativeTabBarHeight) plus the 16 dp Material keeps between a FAB and the bar. */

From 1b99159ffb4e1736227fe529eb6e219455ab87b9 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 7 Oct 2026 14:35:47 +0200
Subject: [PATCH 316/781] refactor: review fixes, narrow overlay split out, tab
 options from screenOptions, Android options file, offline indicator above the
 mWeb bar

---
 .../useTabRootScreenWrapperProps/index.tsx    |  3 +-
 .../useTabRootScreenWrapperProps/types.ts     |  4 +-
 .../NativeTabBarOverlay.tsx                   | 65 ++++++++++++++++++
 .../NativeTabNavigator/NativeTabLayout.tsx    | 53 ++-------------
 .../useNativeTabBarOptions/index.android.ts   | 67 +++++++++++++++++++
 .../useNativeTabBarOptions/index.ts           | 61 ++---------------
 .../Navigators/TabNavigator.native.tsx        | 20 +++---
 src/pages/Search/SearchPageNarrow/index.tsx   |  2 +-
 src/pages/settings/InitialSettingsPage.tsx    |  7 ++
 src/styles/index.ts                           |  5 ++
 src/styles/variables.ts                       |  7 +-
 11 files changed, 174 insertions(+), 120 deletions(-)
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
 create mode 100644 src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 5621ca35e2fd..5bffa89b7a7c 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -11,7 +11,7 @@ import TabBarBottomContent from '..';
 
 /**
  * On narrow layouts the floating tab bar is laid over the bottom of a tab root screen, so the content runs under it
- * down to the bottom edge of the screen. Each tab root's list ends with room for the bar.
+ * down to the bottom edge of the screen. Each tab root's list and the offline indicator end with room for the bar.
  */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -20,6 +20,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
     return {
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
         bottomContentStyle: shouldUseNarrowLayout ? styles.floatingTabBarOverlay : styles.overflowVisible,
+        offlineIndicatorStyle: shouldUseNarrowLayout ? styles.floatingTabBarOfflineIndicator : undefined,
     };
 }
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index dab83f0477d5..7c3807848145 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -1,5 +1,7 @@
 import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
+import type {ScreenWrapperOfflineIndicatorsProps} from '@components/ScreenWrapper/ScreenWrapperOfflineIndicators';
 
-type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'>;
+type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'> &
+    Pick<ScreenWrapperOfflineIndicatorsProps, 'offlineIndicatorStyle'>;
 
 export default TabRootScreenWrapperProps;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
new file mode 100644
index 000000000000..827233ecc9b2
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
@@ -0,0 +1,65 @@
+import FloatingCameraButton from '@components/FloatingCameraButton';
+import FloatingGPSButton from '@components/FloatingGPSButton';
+import DebugTabView from '@components/Navigation/DebugTabView';
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
+
+import useOnyx from '@hooks/useOnyx';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+
+import React from 'react';
+import {StyleSheet, View} from 'react-native';
+import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+
+import type {NativeTabLayoutProps} from './NativeTabLayout';
+
+import NativeTabBarShadow from './NativeTabBarShadow';
+import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
+
+/** What a narrow layout draws over the tabs along with the native bar, kept apart so wide layouts skip its hooks. */
+function NativeTabBarOverlay({state, descriptors}: Pick<NativeTabLayoutProps, 'state' | 'descriptors'>) {
+    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
+    const styles = useThemeStyles();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+    const activeRoute = state.routes[state.index];
+    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+    // The buttons follow whatever the navigator decided for the bar itself.
+    const shouldShowNativeTabBar = !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
+
+    return (
+        <>
+            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
+            {shouldShowNativeTabBar && (
+                // The shadow and the buttons belong to the bar, so they fade with it rather than appearing in place.
+                // They leave faster than they come in, so they stop covering a bar that is still sliding out.
+                <Animated.View
+                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
+                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
+                    style={[StyleSheet.absoluteFill, styles.zIndex10]}
+                    pointerEvents="box-none"
+                >
+                    <NativeTabBarShadow />
+                    <View
+                        style={styles.nativeTabBarFloatingButtons(getFloatingButtonsBottom(bottomInset))}
+                        pointerEvents="box-none"
+                    >
+                        <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
+                            <NavigationTabBarFloatingActionButton />
+                        </View>
+                        <FloatingGPSButton />
+                        <FloatingCameraButton />
+                    </View>
+                </Animated.View>
+            )}
+        </>
+    );
+}
+
+export default NativeTabBarOverlay;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
index 11884432fdb6..777c74986afd 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabLayout.tsx
@@ -1,43 +1,21 @@
-import FloatingCameraButton from '@components/FloatingCameraButton';
-import FloatingGPSButton from '@components/FloatingGPSButton';
-import DebugTabView from '@components/Navigation/DebugTabView';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
-
-import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import TabNavigatorBar from '@libs/Navigation/AppNavigator/Navigators/TabNavigatorBar';
 
-import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
-
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import SCREENS from '@src/SCREENS';
-
 import type {NativeBottomTabNavigatorProps} from '@react-navigation/bottom-tabs/unstable';
 
 import React from 'react';
-import {StyleSheet, View} from 'react-native';
-import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
+import {View} from 'react-native';
 
-import NativeTabBarShadow from './NativeTabBarShadow';
+import NativeTabBarOverlay from './NativeTabBarOverlay';
 import TabPressListeners from './TabPressListeners';
-import {getFloatingButtonsBottom} from './useNativeTabBarOptions';
 
 type NativeTabLayoutProps = Parameters<NonNullable<NativeBottomTabNavigatorProps['layout']>>[0];
 
 function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const styles = useThemeStyles();
-    const {bottom: bottomInset} = useSafeAreaInsets();
-    const activeRoute = state.routes[state.index];
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
-    // The buttons follow whatever the navigator decided for the bar itself.
-    const shouldShowNativeTabBar = shouldUseNarrowLayout && !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
 
     // The tabs stay at the same place in the tree in both layouts, so crossing the breakpoint does not remount them.
     return (
@@ -48,28 +26,11 @@ function NativeTabLayout({children, state, descriptors}: NativeTabLayoutProps) {
                 state={state}
                 descriptors={descriptors}
             />
-            {!!isDebugModeEnabled && shouldShowNativeTabBar && <DebugTabView selectedTab={selectedTab} />}
-            {shouldShowNativeTabBar && (
-                // The shadow and the buttons belong to the bar, so they fade with it rather than appearing in place.
-                // They leave faster than they come in, so they stop covering a bar that is still sliding out.
-                <Animated.View
-                    entering={FadeIn.duration(CONST.MODAL.ANIMATION_TIMING.FAB_IN)}
-                    exiting={FadeOut.duration(CONST.MODAL.ANIMATION_TIMING.FAB_OUT)}
-                    style={[StyleSheet.absoluteFill, styles.zIndex10]}
-                    pointerEvents="box-none"
-                >
-                    <NativeTabBarShadow />
-                    <View
-                        style={styles.nativeTabBarFloatingButtons(getFloatingButtonsBottom(bottomInset))}
-                        pointerEvents="box-none"
-                    >
-                        <View style={[styles.navigationTabBarFABItem, styles.ph0, styles.floatingActionButtonPosition]}>
-                            <NavigationTabBarFloatingActionButton />
-                        </View>
-                        <FloatingGPSButton />
-                        <FloatingCameraButton />
-                    </View>
-                </Animated.View>
+            {shouldUseNarrowLayout && (
+                <NativeTabBarOverlay
+                    state={state}
+                    descriptors={descriptors}
+                />
             )}
         </View>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
new file mode 100644
index 000000000000..41a9ac389e2e
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
@@ -0,0 +1,67 @@
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
+import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
+
+import variables from '@styles/variables';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+
+import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
+
+import type NativeTabBarOptionsParams from './types';
+
+/** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
+const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
+
+/**
+ * Material draws each icon in its fixed icon slot, with a label of its own. The status dot is drawn into the icon rather
+ * than as a Material badge, because RNScreens paints every badge in the badge color of the selected tab.
+ */
+const TAB_ICON_LAYOUT: TabIconLayout = {
+    glyphSize: variables.iconBottomBar,
+    avatarSize: variables.iconBottomBar,
+    dotRadius: variables.nativeTabIconDotRadius,
+    dotCutout: variables.nativeTabIconDotCutout,
+    labelGap: 0,
+    labelFontSize: 0,
+};
+
+function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const avatar = useTabAvatarImage(isAccountAvatarShown);
+
+    // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
+    const screenOptions: NativeBottomTabNavigationOptions = {
+        headerShown: false,
+        tabBarActiveTintColor: theme.text,
+        tabBarInactiveTintColor: theme.textSupporting,
+        tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
+        tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
+        tabBarLabelVisibilityMode: 'labeled',
+        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
+        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG},
+    };
+
+    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
+        // The active indicator pill marks the selected tab, so the avatar is the same image in both selection states.
+        const tabAvatar = name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined;
+        const dotColor = dotColors[name];
+        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar, dotColor});
+        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar, dotColor});
+        return {
+            tabBarLabel: tabLabels[name],
+            // A function, because React Navigation derives the selected icon only from a function.
+            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
+        };
+    };
+
+    return {screenOptions, getTabOptions};
+}
+
+export default useNativeTabBarOptions;
+export {getFloatingButtonsBottom};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
index 41a9ac389e2e..2401d88a0b31 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ts
@@ -1,67 +1,18 @@
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
 import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
-import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
-import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
-import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
-
-import variables from '@styles/variables';
-
-import NAVIGATORS from '@src/NAVIGATORS';
 
 import type {NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
 
 import type NativeTabBarOptionsParams from './types';
 
-/** Material's bar sits above the system gesture inset, so the floating buttons clear both. */
-const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativeTabBarFloatingButtonsBottom + bottomInset;
-
-/**
- * Material draws each icon in its fixed icon slot, with a label of its own. The status dot is drawn into the icon rather
- * than as a Material badge, because RNScreens paints every badge in the badge color of the selected tab.
- */
-const TAB_ICON_LAYOUT: TabIconLayout = {
-    glyphSize: variables.iconBottomBar,
-    avatarSize: variables.iconBottomBar,
-    dotRadius: variables.nativeTabIconDotRadius,
-    dotCutout: variables.nativeTabIconDotCutout,
-    labelGap: 0,
-    labelFontSize: 0,
+type UseNativeTabBarOptions = (params: NativeTabBarOptionsParams) => {
+    screenOptions: NativeBottomTabNavigationOptions;
+    getTabOptions: (name: NativeTabName) => NativeBottomTabNavigationOptions;
 };
 
-function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const avatar = useTabAvatarImage(isAccountAvatarShown);
-
-    // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
-    const screenOptions: NativeBottomTabNavigationOptions = {
-        headerShown: false,
-        tabBarActiveTintColor: theme.text,
-        tabBarInactiveTintColor: theme.textSupporting,
-        tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
-        tabBarActiveIndicatorColor: theme.androidTabBarActiveIndicatorBG,
-        tabBarLabelVisibilityMode: 'labeled',
-        // Every tab shares one style, so the bar reads the current visibility in the same render that changed it.
-        tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG},
-    };
-
-    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
-        // The active indicator pill marks the selected tab, so the avatar is the same image in both selection states.
-        const tabAvatar = name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined;
-        const dotColor = dotColors[name];
-        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar, dotColor});
-        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar, dotColor});
-        return {
-            tabBarLabel: tabLabels[name],
-            // A function, because React Navigation derives the selected icon only from a function.
-            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
-        };
-    };
+/** Only iOS and Android have a native tab bar, so other platforms get no options. */
+const useNativeTabBarOptions: UseNativeTabBarOptions = () => ({screenOptions: {}, getTabOptions: () => ({})});
 
-    return {screenOptions, getTabOptions};
-}
+const getFloatingButtonsBottom = (bottomInset: number) => bottomInset;
 
 export default useNativeTabBarOptions;
 export {getFloatingButtonsBottom};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 6191e9d9b678..6972f020693c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -39,51 +39,49 @@ function TabNavigator() {
         useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels});
     // A tab with no bar item draws no icon.
-    const getOptions = (name: NativeTabName) =>
-        name === tabWithoutBarItem
-            ? HIDDEN_TAB_OPTIONS
-            : {...getTabOptions(name), tabBarSelectionEnabled: isNativeTabSelectionEnabled(name, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored})};
+    const getScreenOptions = ({route}: {route: {name: NativeTabName}}) =>
+        route.name === tabWithoutBarItem
+            ? {...screenOptions, ...HIDDEN_TAB_OPTIONS}
+            : {
+                  ...screenOptions,
+                  ...getTabOptions(route.name),
+                  tabBarSelectionEnabled: isNativeTabSelectionEnabled(route.name, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored}),
+              };
 
     return (
         <Tab.Navigator
             backBehavior="fullHistory"
             layout={renderNativeTabLayout}
             screenLayout={bottomTabScreenLayoutWrapper}
-            screenOptions={screenOptions}
+            screenOptions={getScreenOptions}
             UNSTABLE_router={tabRouterOverride}
             screenListeners={tabScreenListeners}
         >
             <Tab.Screen
                 name={SCREENS.HOME}
                 component={HomePage}
-                options={getOptions(SCREENS.HOME)}
             />
             <Tab.Screen
                 name={NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}
                 component={ReportsSplitNavigator}
-                options={getOptions(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)}
             />
             <Tab.Screen
                 name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
                 component={SearchFullscreenNavigator}
-                options={getOptions(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR)}
             />
             <Tab.Screen
                 name={SCREENS.INSIGHTS}
                 component={InsightsPage}
                 // The Insights tab button opens the Spend dashboard, so a tap on the native tab lands on it too.
                 initialParams={{dashboardID: CONST.INSIGHTS.DASHBOARD.SPEND}}
-                options={getOptions(SCREENS.INSIGHTS)}
             />
             <Tab.Screen
                 name={NAVIGATORS.WORKSPACE_NAVIGATOR}
                 component={WorkspaceNavigator}
-                options={getOptions(NAVIGATORS.WORKSPACE_NAVIGATOR)}
             />
             <Tab.Screen
                 name={NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}
                 component={SettingsSplitNavigator}
-                options={getOptions(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR)}
             />
         </Tab.Navigator>
     );
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index c565d5c75d6b..7a7be17a0238 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -265,9 +265,9 @@ function SearchPageNarrow({
                 <ScreenWrapper
                     testID="SearchPageNarrow"
                     shouldEnableMaxHeight
-                    offlineIndicatorStyle={styles.mtAuto}
                     shouldShowOfflineIndicator={!!searchResults}
                     {...tabRootScreenWrapperProps}
+                    offlineIndicatorStyle={[styles.mtAuto, tabRootScreenWrapperProps.offlineIndicatorStyle]}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index f4989443a0b0..310ed058aabd 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -61,6 +61,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
     const navigation = useNavigation();
     const isDrawnOverTabs = useIsSettingsDrawnOverTabs();
+
     // The tab navigator keeps the full tab history, so going back returns to the tab the user opened Account from.
     // With nothing behind it, as after a deep link, Home replaces Account so that going back does not reopen it.
     const goBackFromAccount = () => {
@@ -68,15 +69,19 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             navigation.goBack();
             return;
         }
+
         Navigation.navigate(ROUTES.HOME, {forceReplace: true});
     };
+
     useAndroidBackButtonHandler(() => {
         if (!isDrawnOverTabs) {
             return false;
         }
+
         goBackFromAccount();
         return true;
     });
+
     const isScreenFocused = useIsSidebarRouteActive(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, shouldUseNarrowLayout);
     const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails);
     const {accountMenuItemsData, generalMenuItemsData} = useInitialSettingsPageMenuData(currentUserPersonalDetails);
@@ -92,10 +97,12 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     }, [hasAccountBeenSwitched]);
 
     const hasAccountBeenShown = useHasTabBeenShown(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR);
+
     useEffect(() => {
         if (!hasAccountBeenShown) {
             return;
         }
+
         openInitialSettingsPage();
     }, [hasAccountBeenShown]);
 
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8551d8717e9d..7c69917bb011 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -790,6 +790,11 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
+        // The floating bar is laid over the bottom of a tab root screen, so the offline indicator sits above it.
+        floatingTabBarOfflineIndicator: {
+            marginBottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
+        },
+
         // The gap between the floating bar and the bottom edge of the screen.
         floatingTabBarBottomInset: {
             paddingBottom: variables.floatingTabBarBottomInset,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index d5eb6116b771..02fa82cd4e6e 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -29,16 +29,13 @@ const avatarSizes = {
     avatarBorderWidthLarge: 4,
 } as const;
 
-const floatingTabBarHeight = 60;
-const floatingTabBarBottomInset = 8;
-
 export default {
     bottomTabHeight: 72,
-    floatingTabBarHeight,
+    floatingTabBarHeight: 60,
     floatingTabBarHorizontalInset: 16,
     // How far the selected pill reaches past its tab on each side, whatever the label's length.
     floatingTabBarSelectedOverhang: 4,
-    floatingTabBarBottomInset,
+    floatingTabBarBottomInset: 8,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
     debugTabViewHeight: 64,
     contentHeaderHeight: getValueUsingPixelRatio(72, 100),

From b62774122e5cb7114e7746176d8262e639e9fe57 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 7 Oct 2026 15:07:16 +0200
Subject: [PATCH 317/781] chore: bump bottom-tabs to 7.18.16 and native to
 7.3.16, the newest without core 7.21.13 typing getRootState as possibly
 undefined

---
 package-lock.json                             | 40 ++++++++++++-------
 package.json                                  |  5 ++-
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...2+active-indicator-color-precedence.patch} |  0
 ...m-tabs+7.18.16+003+hidden-tab-items.patch} | 22 +++++-----
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...avigation+native+7.3.16+001+initial.patch} | 39 +++++++++---------
 ...-failing-jest-by-disabling-esmodule.patch} |  0
 ...istory-go-popstate-fallback-timeout.patch} |  8 ++--
 patches/react-navigation/details.md           | 15 +++----
 10 files changed, 71 insertions(+), 58 deletions(-)
 rename patches/react-navigation/{@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+bottom-tabs+7.18.16+001+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch => @react-navigation+bottom-tabs+7.18.16+002+active-indicator-color-precedence.patch} (100%)
 rename patches/react-navigation/{@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch => @react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch} (92%)
 rename patches/react-navigation/{@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+elements+2.9.38+001+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+native+7.2.6+001+initial.patch => @react-navigation+native+7.3.16+001+initial.patch} (86%)
 rename patches/react-navigation/{@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch => @react-navigation+native+7.3.16+002+fix-failing-jest-by-disabling-esmodule.patch} (100%)
 rename patches/react-navigation/{@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch => @react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch} (87%)

diff --git a/package-lock.json b/package-lock.json
index 57c19f91599b..032b736a5426 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,10 +45,10 @@
         "@react-native-firebase/app": "^22.2.1",
         "@react-native-google-signin/google-signin": "^10.0.1",
         "@react-native-picker/picker": "2.11.3",
-        "@react-navigation/bottom-tabs": "7.16.2",
+        "@react-navigation/bottom-tabs": "7.18.16",
         "@react-navigation/core": "7.21.12",
         "@react-navigation/material-top-tabs": "7.4.19",
-        "@react-navigation/native": "7.2.6",
+        "@react-navigation/native": "7.3.16",
         "@react-navigation/native-stack": "7.14.5",
         "@react-navigation/stack": "7.8.5",
         "@react-ng/bounds-observer": "^0.2.1",
@@ -15105,17 +15105,17 @@
       }
     },
     "node_modules/@react-navigation/bottom-tabs": {
-      "version": "7.16.2",
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.16.2.tgz",
-      "integrity": "sha512-Lbp++BGMc7SQXnyKuO/JrQJIhFH0zyB5v4kIEbnzDJLJfgubd5hoSe+QfCqy4YHfLA4phC4Xf/6Q2Ic8x7datQ==",
+      "version": "7.18.16",
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-7.18.16.tgz",
+      "integrity": "sha512-5tBFuxvsCQBvYauDZK6u/uPdD86i/caWgBzABlZfTh8W2J7YZSHjT9SWOsquSMmR6dpcNj6idMd4utCNzuOnZg==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/elements": "^2.9.19",
+        "@react-navigation/elements": "^2.9.38",
         "color": "^4.2.3",
         "sf-symbols-typescript": "^2.1.0"
       },
       "peerDependencies": {
-        "@react-navigation/native": "^7.2.5",
+        "@react-navigation/native": "^7.3.16",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0",
@@ -15163,9 +15163,9 @@
       }
     },
     "node_modules/@react-navigation/elements": {
-      "version": "2.9.19",
-      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.19.tgz",
-      "integrity": "sha512-gBUvCZuUkOGw1KpLQEZIkByUz8RYPwXeoA6mZFJy9K1mxd8GdqHDMFCIoB0lfPz9rgrHj99RvtdlGZ/ZzkZv2A==",
+      "version": "2.9.38",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.38.tgz",
+      "integrity": "sha512-M/2HWDiSO4zO7VyfAnovrTPWOAzTC+1DnVT7ZWZW93+/KVRF9OYlqixIUpPenQ0iQh2j1EaQ4zOe/134Arisqw==",
       "license": "MIT",
       "dependencies": {
         "color": "^4.2.3",
@@ -15174,7 +15174,7 @@
       },
       "peerDependencies": {
         "@react-native-masked-view/masked-view": ">= 0.2.0",
-        "@react-navigation/native": "^7.2.5",
+        "@react-navigation/native": "^7.3.16",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0"
@@ -15204,15 +15204,16 @@
       }
     },
     "node_modules/@react-navigation/native": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.2.6.tgz",
-      "integrity": "sha512-Lvxb8ShLnsuK1pjFoN1jym/8c68IvJQlkrDhQXDJq10o3lU36Oxsmc9BdtN+Z4yJRYSbx3Qh+Wpom75QehC4og==",
+      "version": "7.3.16",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.3.16.tgz",
+      "integrity": "sha512-Wy/6mai2HpA5AEVFk7JFfvv4RUArwuN2UenP/fc3NK7kOyfSlNu1tmb/3JDPpMzPIRbF1MPB8PKAHjVB29qNEQ==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/core": "^7.18.0",
+        "@react-navigation/core": "^7.21.12",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.3.11",
+        "standard-navigation": "^0.0.8",
         "use-latest-callback": "^0.2.4"
       },
       "peerDependencies": {
@@ -40264,6 +40265,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/standard-navigation": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/standard-navigation/-/standard-navigation-0.0.8.tgz",
+      "integrity": "sha512-TyVbo7INUDWtsUWDFn8RR7kwR87U0S4xHfLfbbnyeC581TmmyqQ+eM+nPw8rQTSD8QitRVcYfPaSHr/QJiUy1g==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "license": "MIT",
diff --git a/package.json b/package.json
index 4b2b5480cf40..afe4c68bf06b 100644
--- a/package.json
+++ b/package.json
@@ -121,10 +121,10 @@
     "@react-native-firebase/app": "^22.2.1",
     "@react-native-google-signin/google-signin": "^10.0.1",
     "@react-native-picker/picker": "2.11.3",
-    "@react-navigation/bottom-tabs": "7.16.2",
+    "@react-navigation/bottom-tabs": "7.18.16",
     "@react-navigation/core": "7.21.12",
     "@react-navigation/material-top-tabs": "7.4.19",
-    "@react-navigation/native": "7.2.6",
+    "@react-navigation/native": "7.3.16",
     "@react-navigation/native-stack": "7.14.5",
     "@react-navigation/stack": "7.8.5",
     "@react-ng/bounds-observer": "^0.2.1",
@@ -418,6 +418,7 @@
     "node-abi": "^3.78.0",
     "pdfjs-dist": "^5.5.207",
     "lightningcss": "1.30.1",
+    "@react-navigation/elements": "2.9.38",
     "@fullstory/react-native": {
       "expo": "57.0.8"
     },
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+001+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+001+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+002+active-indicator-color-precedence.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch
rename to patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+002+active-indicator-color-precedence.patch
diff --git a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch b/patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch
similarity index 92%
rename from patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
rename to patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch
index 0363ebe03089..9dd8d44e6bd1 100644
--- a/patches/react-navigation/@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch
+++ b/patches/react-navigation/@react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
-index 09ec68f..6645270 100644
+index e6ea55b..4d577fe 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/module/unstable/NativeBottomTabView.native.js
 @@ -4,11 +4,11 @@ import { getLabel, SafeAreaProviderCompat, Screen as ScreenContent } from '@reac
@@ -59,9 +59,9 @@ index 09ec68f..6645270 100644
 -      tabBarHidden: shouldHideTabBar,
 +      tabBarHidden: shouldHideTabBar || isFocusedRouteHidden,
        colorScheme: dark ? 'dark' : 'light',
-       ios: {
-         bottomAccessory: bottomAccessory ? environment => bottomAccessory({
-@@ -210,6 +222,9 @@ export function NativeBottomTabView({
+       nativeContainerStyle: {
+         backgroundColor: colors.background
+@@ -213,6 +225,9 @@ export function NativeBottomTabView({
          tabBarTintColor: activeTintColor
        },
        children: state.routes.map((route, index) => {
@@ -71,7 +71,7 @@ index 09ec68f..6645270 100644
          const {
            options,
            render,
-@@ -221,6 +236,7 @@ export function NativeBottomTabView({
+@@ -224,6 +239,7 @@ export function NativeBottomTabView({
            title,
            lazy = false,
            tabBarLabel,
@@ -79,15 +79,15 @@ index 09ec68f..6645270 100644
            tabBarSelectionEnabled,
            tabBarBadgeStyle,
            tabBarIcon,
-@@ -287,6 +303,7 @@ export function NativeBottomTabView({
+@@ -290,6 +306,7 @@ export function NativeBottomTabView({
            preventNativeSelection: tabBarSelectionEnabled === false,
            badgeValue: tabBarBadge?.toString(),
            title: tabTitle,
 +          tabBarItemAccessibilityLabel: tabBarAccessibilityLabel,
-           specialEffects: {
-             repeatedTabSelection: {
-               popToRoot: true,
-@@ -363,9 +380,40 @@ export function NativeBottomTabView({
+           nativeContainerStyle: {
+             backgroundColor: colors.background
+           },
+@@ -369,9 +386,40 @@ export function NativeBottomTabView({
            })
          }, route.key);
        })
@@ -130,7 +130,7 @@ index 09ec68f..6645270 100644
    isFocused,
    route,
 diff --git a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
-index 5a502c2..a2f2e85 100644
+index ac25ed1..c05b04b 100644
 --- a/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
 +++ b/node_modules/@react-navigation/bottom-tabs/lib/typescript/src/unstable/types.d.ts
 @@ -78,6 +78,15 @@ type IconIOSSfSymbol = {
diff --git a/patches/react-navigation/@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+elements+2.9.38+001+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+elements+2.9.38+001+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch b/patches/react-navigation/@react-navigation+native+7.3.16+001+initial.patch
similarity index 86%
rename from patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch
rename to patches/react-navigation/@react-navigation+native+7.3.16+001+initial.patch
index 36dc2bcd4e8c..123cb28cce74 100644
--- a/patches/react-navigation/@react-navigation+native+7.2.6+001+initial.patch
+++ b/patches/react-navigation/@react-navigation+native+7.3.16+001+initial.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-index 2ca4c08..0c204b9 100644
+index 58a543b..c475462 100644
 --- a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 +++ b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 @@ -1,6 +1,7 @@
@@ -7,7 +7,7 @@ index 2ca4c08..0c204b9 100644
  
  import { nanoid } from 'nanoid/non-secure';
 +import { findFocusedRouteKey } from "./findFocusedRouteKey.js";
- const getPathWithoutHash = path => path.split('#')[0];
+ const getPathWithoutHash = path => path.split('#')[0] ?? '';
  export function createMemoryHistory() {
    let index = 0;
 @@ -19,6 +20,9 @@ export function createMemoryHistory() {
@@ -20,7 +20,7 @@ index 2ca4c08..0c204b9 100644
      get index() {
        // We store an id in the state instead of an index
        // Index could get out of sync with in-memory values if page reloads
-@@ -33,14 +37,15 @@ export function createMemoryHistory() {
+@@ -33,7 +37,8 @@ export function createMemoryHistory() {
        return items[index];
      },
      backIndex({
@@ -30,15 +30,16 @@ index 2ca4c08..0c204b9 100644
      }) {
        const pathWithoutHash = getPathWithoutHash(path);
  
-       // We need to find the index from the element before current to get closest path to go back to
-       for (let i = index - 1; i >= 0; i--) {
-         const item = items[i];
+@@ -43,7 +48,7 @@ export function createMemoryHistory() {
+         if (item == null) {
+           continue;
+         }
 -        if (item.path === pathWithoutHash) {
 +        if (item.path === pathWithoutHash && findFocusedRouteKey(item.state) === findFocusedRouteKey(state)) {
            return i;
          }
        }
-@@ -82,7 +87,7 @@ export function createMemoryHistory() {
+@@ -85,7 +90,7 @@ export function createMemoryHistory() {
  
        // Need to keep the hash part of the path if there was no previous history entry
        // or the previous history entry had the same path
@@ -62,18 +63,18 @@ index 0000000..290e96f
 +}
 +//# sourceMappingURL=findFocusedRouteKey.js.map
 diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 6005f78..a932e78 100644
+index 66b73b5..6c201fd 100644
 --- a/node_modules/@react-navigation/native/lib/module/useLinking.js
 +++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
-@@ -4,6 +4,7 @@ import { findFocusedRoute, getActionFromState as getActionFromStateDefault, getP
+@@ -4,6 +4,7 @@ import { CommonActions, findFocusedRoute, getActionFromState as getActionFromSta
  import isEqual from 'fast-deep-equal';
  import * as React from 'react';
  import { createMemoryHistory } from "./createMemoryHistory.js";
 +import { findFocusedRouteKey } from "./findFocusedRouteKey.js";
  import { ServerContext } from "./ServerContext.js";
- const getRoutesUntilIndex = state => state.routes.slice(0, state.index + 1);
  
-@@ -65,6 +66,43 @@ export const series = cb => {
+ /**
+@@ -114,6 +115,43 @@ export const series = cb => {
    return callback;
  };
  const linkingHandlers = [];
@@ -117,17 +118,17 @@ index 6005f78..a932e78 100644
  export function useLinking(ref, {
    enabled = true,
    config,
-@@ -298,6 +336,9 @@ export function useLinking(ref, {
-       // Otherwise it's likely a change triggered by `popstate`
-       path !== pendingPath) {
-         const historyDelta = getHistoryLength(focusedState) - getHistoryLength(previousFocusedState);
+@@ -409,6 +447,9 @@ export function useLinking(ref, {
+         const historyDelta = getHistoryLength(focusedState) - getHistoryLength(previousFocusedState) - (
+         // Subtract the delta already applied by the browser to sync only the remaining changes
+         pendingPopStateDelta ?? 0);
 +
 +        // The historyDelta and historyDeltaByKeys may differ if the new state has an entry that didn't exist in previous state
-+        const historyDeltaByKeys = getHistoryDeltaByKeys(focusedState, previousFocusedState);
++        const historyDeltaByKeys = getHistoryDeltaByKeys(focusedState, previousFocusedState) - (pendingPopStateDelta ?? 0);
          if (historyDelta > 0) {
            // If history length is increased, we should pushState
            // Note that path might not actually change here, for example, drawer open should pushState
-@@ -309,7 +350,8 @@ export function useLinking(ref, {
+@@ -420,7 +461,8 @@ export function useLinking(ref, {
            // If history length is decreased, i.e. entries were removed, we want to go back
  
            const nextIndex = history.backIndex({
@@ -137,7 +138,7 @@ index 6005f78..a932e78 100644
            });
            const currentIndex = history.index;
            try {
-@@ -318,11 +360,26 @@ export function useLinking(ref, {
+@@ -429,11 +471,26 @@ export function useLinking(ref, {
              history.get(nextIndex)) {
                // An existing entry for this path exists and it's less than current index, go back to that
                await history.go(nextIndex - currentIndex);
@@ -165,7 +166,7 @@ index 6005f78..a932e78 100644
              }
  
              // Store the updated state as well as fix the path if incorrect
-@@ -335,10 +392,22 @@ export function useLinking(ref, {
+@@ -446,10 +503,22 @@ export function useLinking(ref, {
            }
          } else {
            // If history length is unchanged, we want to replaceState
diff --git a/patches/react-navigation/@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+native+7.3.16+002+fix-failing-jest-by-disabling-esmodule.patch
similarity index 100%
rename from patches/react-navigation/@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch
rename to patches/react-navigation/@react-navigation+native+7.3.16+002+fix-failing-jest-by-disabling-esmodule.patch
diff --git a/patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch b/patches/react-navigation/@react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch
similarity index 87%
rename from patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch
rename to patches/react-navigation/@react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch
index bda764b7f963..062073b6a427 100644
--- a/patches/react-navigation/@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch
+++ b/patches/react-navigation/@react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-index 07d02ef..3f7bc78 100644
+index c475462..f8e7d1c 100644
 --- a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 +++ b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-@@ -178,10 +178,14 @@ export function createMemoryHistory() {
+@@ -188,10 +188,14 @@ export function createMemoryHistory() {
            cb: done
          });
  
@@ -18,8 +18,8 @@ index 07d02ef..3f7bc78 100644
 +        // back/forward navigation and reset the app to a stale route
          // We're using a hacky timeout since there doesn't seem to be way to know for sure
          const timer = setTimeout(() => {
-           const foundIndex = pending.findIndex(it => it.ref === done);
-@@ -190,7 +194,7 @@ export function createMemoryHistory() {
+           window.removeEventListener('popstate', onPopState);
+@@ -201,7 +205,7 @@ export function createMemoryHistory() {
              pending.splice(foundIndex, 1);
            }
            index = this.index;
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index b186911582fb..43ccd25ca5ae 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -1,12 +1,12 @@
 # `@react-navigation` patches
 
 ### @react-navigation+package-name+7+fix-failing-jest-by-disabling-esmodule.patch
-#### [@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+bottom-tabs+7.16.2+001+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+bottom-tabs+7.18.16+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+bottom-tabs+7.18.16+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+core+7.21.12+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+core+7.21.12+001+fix-failing-jest-by-disabling-esmodule.patch)
-#### [@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.9.19+001+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+elements+2.9.38+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.9.38+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+material-top-tabs+7.4.19+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+material-top-tabs+7.4.19+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+native-stack+7.14.5+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native-stack+7.14.5+002+fix-failing-jest-by-disabling-esmodule.patch)
-#### [@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.2.6+002+fix-failing-jest-by-disabling-esmodule.patch)
+#### [@react-navigation+native+7.3.16+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.3.16+002+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+routers+7.6.4+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+routers+7.6.4+001+fix-failing-jest-by-disabling-esmodule.patch)
 #### [@react-navigation+stack+7.8.5+004+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+stack+7.8.5+004+fix-failing-jest-by-disabling-esmodule.patch)
 
@@ -24,7 +24,7 @@
 - PR Introducing Patch: [#37891](https://github.com/Expensify/App/pull/37891)
 - PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155), [#98097](https://github.com/Expensify/App/pull/98097)
 
-### [@react-navigation+native+7.2.6+001+initial.patch](@react-navigation+native+7.2.6+001+initial.patch)
+### [@react-navigation+native+7.3.16+001+initial.patch](@react-navigation+native+7.3.16+001+initial.patch)
 
 - Reason: Allows us to use some more advanced navigation actions without messing up the browser history
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/pull/12751 (`route.history` + `pushParams`, added upstream for this use case); originating issue https://github.com/react-navigation/react-navigation/issues/12460. On the v8 upgrade, evaluate adopting `pushParams` to shrink this patch.
@@ -49,7 +49,7 @@
 - PR Updating Patch: [#33280](https://github.com/Expensify/App/pull/33280) [#37421](https://github.com/Expensify/App/pull/37421) [#49539](https://github.com/Expensify/App/pull/49539) [#64155](https://github.com/Expensify/App/pull/64155) [#65119](https://github.com/Expensify/App/issues/65119)
 - Note: Not fully covered by the public `detachPreviousScreen` option (this also forces `activityState`). v8 replaces `detachInactiveScreens`/`detachPreviousScreen`/`freezeOnBlur` with a single `inactiveBehavior` option — re-evaluate this patch then.
 
-### [@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch](@react-navigation+native+7.2.6+003+increase-history-go-popstate-fallback-timeout.patch)
+### [@react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch](@react-navigation+native+7.3.16+003+increase-history-go-popstate-fallback-timeout.patch)
 
 - Reason:
 
@@ -68,8 +68,9 @@
 - E/App issue: [#94571](https://github.com/Expensify/App/issues/94571)
 - PR Introducing Patch: [#95980](https://github.com/Expensify/App/pull/95980)
 - PR Updating Patch: [#101339](https://github.com/Expensify/App/pull/101339)
+- Note: Upstream raised the timeout to 1000ms in `@react-navigation/native` 7.5.0, so this patch can be dropped on the bump to 7.5.0 or newer.
 
-### [@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.16.2+002+active-indicator-color-precedence.patch)
+### [@react-navigation+bottom-tabs+7.18.16+002+active-indicator-color-precedence.patch](@react-navigation+bottom-tabs+7.18.16+002+active-indicator-color-precedence.patch)
 
 - Reason: `tabBarActiveIndicatorColor` was never applied on the native Android tab bar: a missing pair of parentheses made `??` bind to the `typeof` check, so the indicator always got `tabBarActiveTintColor` at 10% alpha. The patch restores the intended precedence, so the active indicator pill takes the color from the design. **This patch can be removed on the upgrade to React Navigation v8**, whose rewritten native tab view no longer has the bug.
 - Upstream PR/issue: not reported, because the v8 branch already fixes it and the fix only matters until the App moves to v8. Still present on the `7.x` branch as of 7.20.0.
@@ -77,7 +78,7 @@
 - PR Introducing Patch: [#101339](https://github.com/Expensify/App/pull/101339)
 - PR Updating Patch: N/A
 
-### [@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.16.2+003+hidden-tab-items.patch)
+### [@react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch](@react-navigation+bottom-tabs+7.18.16+003+hidden-tab-items.patch)
 
 - Reason: Adds a `tabBarItemHidden` option to the native bottom tabs. The App registers six tabs but the native bar can show at most five (Material's `BottomNavigationView` throws past five, and `UITabBar` folds the rest into a "More" tab), and which five depends on the Insights beta: Insights with it, Account without it. A native tab bar cannot hide one of its items, so a route with `tabBarItemHidden` gets no `Tabs.Screen` at all. When such a route is focused, it is drawn in JS over the native host with the tab bar hidden, while the host keeps the last focused visible tab selected underneath. A hidden route stays mounted once visited. Nothing native changes. The host's selection is derived from the tab history, skipping routes that are hidden by then, so a beta change that hides the selected route cannot leave the host pointing at a removed tab. A route that moves between hidden and visible is remounted, and a hidden route ignores preloading and emits no transition events. The patch also forwards a `tabBarAccessibilityLabel` option to RNScreens' `tabBarItemAccessibilityLabel`. The iOS tab labels are drawn into the icon images, so without it VoiceOver announces the tabs with no name. **This part can be removed on the upgrade to React Navigation v8**, which forwards the same option. The `tabBarItemHidden` part has no upstream counterpart and stays.
 - Upstream PR/issue: not reported, because hiding an item from a native tab bar has no native counterpart and this works around it in JS for the App's tab set; the accessibility label part is already in v8.

From c1aabf4f82aec5fef8979439ccf25d065ede60df Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 7 Oct 2026 15:28:32 +0200
Subject: [PATCH 318/781] fix: iOS offline indicator sits above the native tab
 bar on every tab root, measured from the screen bottom

---
 .../useTabRootScreenWrapperProps/index.ios.tsx        | 11 +++++++++--
 src/styles/index.ts                                   | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index c7d86f32d2c4..4af99cca3d8c 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,14 +1,21 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getFloatingButtonsBottom} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions';
 
 import type TabRootScreenWrapperProps from './types';
 
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
- * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar.
+ * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar,
+ * and the offline indicator sits above the bar.
  */
 function useTabRootScreenWrapperProps(): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false} : {};
+    const styles = useThemeStyles();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+    return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false, offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset))} : {};
 }
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 7c69917bb011..d6a644d1597a 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -6978,6 +6978,16 @@ const staticStyles = (theme: ThemeColors) =>
 
 const dynamicStyles = (theme: ThemeColors) =>
     ({
+        // Measured from the bottom of the screen, because only some tab roots pad the indicator's container with the inset.
+        iosNativeTabBarOfflineIndicator: (bottom: number) =>
+            ({
+                position: 'absolute',
+                right: 0,
+                bottom,
+                left: 0,
+                backgroundColor: theme.appBG,
+            }) satisfies ViewStyle,
+
         // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
         // against it without taking part in the tab screen's layout.
         nativeTabBarFloatingButtons: (bottom: number) =>

From 4457e4b55a71f4c8926d603925dabbc02961b74d Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 7 Oct 2026 16:06:18 +0200
Subject: [PATCH 319/781] Show tooltips on mobile devices

---
 .../Charts/PieChart/PieChartContent.tsx       | 27 +++++++-
 .../Charts/hooks/useChartInteractions.ts      | 68 ++++++++++++++++---
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 180542eea001..b6cd81456bd1 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -14,7 +14,7 @@ import type {LayoutChangeEvent} from 'react-native';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import {Gesture, GestureDetector} from 'react-native-gesture-handler';
+import {Gesture, GestureDetector, PointerType} from 'react-native-gesture-handler';
 import Animated, {useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 import {Pie, PolarChart} from 'victory-native';
@@ -91,12 +91,21 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
         }
     };
 
+    const toggleActiveSlice = (x: number, y: number) => {
+        const {centerX, centerY} = pieGeometry;
+        const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
+        setActiveSliceIndex(sliceIndex === activeSliceIndex ? -1 : sliceIndex);
+    };
+
     // Hover gesture
     const hoverGesture = () =>
         Gesture.Hover()
             .onBegin((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 isHovering.set(true);
                 cursorX.set(e.x);
                 cursorY.set(e.y);
@@ -106,24 +115,36 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
             .onUpdate((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 cursorX.set(e.x);
                 cursorY.set(e.y);
                 tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
                 scheduleOnRN(updateActiveSlice, e.x, e.y);
             })
-            .onEnd(() => {
+            .onEnd((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 isHovering.set(false);
                 scheduleOnRN(setActiveSliceIndex, -1);
                 scheduleOnRN(setIsHoveringOverPie, false);
             });
 
-    // Tap gesture for click/tap navigation
+    // Tap gesture: touch toggles the tooltip, other pointers navigate on click
     const tapGesture = () =>
         Gesture.Tap().onEnd((e) => {
             'worklet';
 
+            if (e.pointerType === PointerType.TOUCH) {
+                tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
+                scheduleOnRN(toggleActiveSlice, e.x, e.y);
+                return;
+            }
+
             const {centerX, centerY} = pieGeometry;
             const sliceIndex = findSliceAtPosition(e.x, e.y, centerX, centerY, radius, innerRadius, processedSlices);
 
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 2be8c37384b5..c698f9570eeb 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -1,7 +1,7 @@
 import type {SharedValue} from 'react-native-reanimated';
 
 import {useCallback} from 'react';
-import {Gesture} from 'react-native-gesture-handler';
+import {Gesture, PointerType} from 'react-native-gesture-handler';
 import {useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
@@ -184,6 +184,9 @@ function useChartInteractions({
     const isCursorOverClickable = useSharedValue(false);
     const isTooltipActive = useSharedValue(false);
 
+    /** True while a tooltip opened by a touch tap stays visible until the next tap */
+    const isTouchPinned = useSharedValue(false);
+
     /**
      * Called by chart content from handleScaleChange to populate canvas positions.
      * Must be called with the positions derived from the current d3 scale.
@@ -305,11 +308,26 @@ function useChartInteractions({
      * customGestures prop, because Victory's internal GestureHandler view only covers
      * the plot area and would drop events from the label area.
      */
+    const hideTooltip = () => {
+        'worklet';
+
+        chartInteractionState.isActive.set(false);
+        isTouchPinned.set(false);
+        isCursorOverTarget.set(false);
+        isCursorOverClickable.set(false);
+        isTooltipActive.set(false);
+    };
+
     const hoverGesture = () =>
         Gesture.Hover()
             .onBegin((e) => {
                 'worklet';
 
+                // Touch on web can start a hover through pointerenter, which would fight the tap-to-show tooltip
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
+                isTouchPinned.set(false);
                 const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
                 const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
                 chartInteractionState.isActive.set(true);
@@ -324,6 +342,9 @@ function useChartInteractions({
             .onUpdate((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
                 const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
                 chartInteractionState.cursor.x.set(cursorX);
@@ -340,18 +361,45 @@ function useChartInteractions({
                     updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
                 }
             })
-            .onEnd(() => {
+            .onEnd((e) => {
                 'worklet';
 
-                chartInteractionState.isActive.set(false);
-                isCursorOverTarget.set(false);
-                isCursorOverClickable.set(false);
-                isTooltipActive.set(false);
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
+                hideTooltip();
             });
 
     /**
-     * Tap gesture. Resolves the nearest data point entirely on the UI thread,
-     * then schedules handlePress on the JS thread if the cursor is over the target.
+     * Touch taps toggle the tooltip instead of drilling in, since touch devices have no hover.
+     * Tapping a new target shows its tooltip; tapping the same target again or empty space hides it.
+     */
+    const handleTouchTap = (cursorX: number, cursorY: number) => {
+        'worklet';
+
+        const previousIndex = chartInteractionState.matchedIndex.get();
+        const wasPinned = isTouchPinned.get();
+        const bottom = chartBottom?.get() ?? cursorY;
+        const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
+        const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
+        if (targetIndex < 0 || (wasPinned && targetIndex === previousIndex)) {
+            hideTooltip();
+            return;
+        }
+
+        chartInteractionState.isActive.set(true);
+        applyTargetIndex(targetIndex);
+        const isOverTarget = updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+        if (!isOverTarget) {
+            hideTooltip();
+            return;
+        }
+        isTouchPinned.set(true);
+    };
+
+    /**
+     * Tap gesture. Resolves the nearest data point entirely on the UI thread.
+     * Touch taps toggle the tooltip; other pointers schedule handlePress on the JS thread if the cursor is over the target.
      */
     const tapGesture = () =>
         Gesture.Tap().onEnd((e) => {
@@ -361,6 +409,10 @@ function useChartInteractions({
             const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
             chartInteractionState.cursor.x.set(cursorX);
             chartInteractionState.cursor.y.set(cursorY);
+            if (e.pointerType === PointerType.TOUCH) {
+                handleTouchTap(cursorX, cursorY);
+                return;
+            }
             const ox = pointOX.get();
             const oy = pointOY.get();
             const idx = getResolvedTargetIndex(cursorX, cursorY, cursorX);

From a4481c10bd06a437ff13f03ec1a32683f09b8c29 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 7 Oct 2026 18:26:22 +0200
Subject: [PATCH 320/781] prevent same-name offices

---
 src/languages/de.ts                              |  3 ++-
 src/languages/el.ts                              |  1 +
 src/languages/en.ts                              |  1 +
 src/languages/es.ts                              |  1 +
 src/languages/fr.ts                              |  1 +
 src/languages/it.ts                              |  1 +
 src/languages/ja.ts                              |  1 +
 src/languages/nl.ts                              |  1 +
 src/languages/pl.ts                              |  1 +
 src/languages/pt-BR.ts                           |  1 +
 src/languages/zh-hans.ts                         |  1 +
 .../API/parameters/AddOfficeLocationParams.ts    |  2 +-
 .../API/parameters/UpdateOfficeLocationParams.ts |  2 +-
 src/libs/actions/Policy/DistanceRate.ts          |  4 ++--
 .../workspace/WorkspaceOfficeLocationAddPage.tsx | 13 +++++++++----
 .../WorkspaceOfficeLocationEditPage.tsx          | 16 ++++++++++++----
 .../workspace/WorkspaceOfficeLocationForm.tsx    |  8 +++++++-
 tests/actions/PolicyOfficeLocationTest.ts        |  4 ++--
 18 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 8493603bfe60..cc0034f4c4e9 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7717,7 +7717,8 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             setAsPrimary: 'Als Hauptstandort festlegen',
             primary: 'Hauptstandort',
             deleteOfficeLocation: 'Bürostandort löschen',
-            deleteOfficeLocationConfirmation: 'Möchten Sie diesen Bürostandort wirklich löschen?',
+            deleteOfficeLocationConfirmation: 'Möchtest du diesen Bürostandort wirklich löschen?',
+            existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen existiert bereits',
         },
         bankAccount: {
             continueWithSetup: 'Einrichtung fortsetzen',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 586dfcfa304e..14523cbb619e 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8011,6 +8011,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             primary: 'Κύρια',
             deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
             deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή την τοποθεσία γραφείου;',
+            existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
         },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 855380b97627..05b074bd6dcc 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8229,6 +8229,7 @@ const translations = {
             primary: 'Primary',
             deleteOfficeLocation: 'Delete office location',
             deleteOfficeLocationConfirmation: 'Are you sure you want to delete this office location?',
+            existingOfficeLocationError: 'An office location with this name already exists',
         },
         bankAccount: {
             continueWithSetup: 'Continue setup',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1ad8e38e72c7..663374bcd2e5 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7737,6 +7737,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             primary: 'Principal',
             deleteOfficeLocation: 'Eliminar ubicación de oficina',
             deleteOfficeLocationConfirmation: '¿Estás seguro de que quieres eliminar esta ubicación de oficina?',
+            existingOfficeLocationError: 'Ya existe una ubicación de oficina con este nombre',
         },
         bankAccount: {
             continueWithSetup: 'Continuar con la configuración',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1e5b36654de7..b8bc3c41a150 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7737,6 +7737,7 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             primary: 'Principal',
             deleteOfficeLocation: 'Supprimer le lieu de travail',
             deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce lieu de travail ?',
+            existingOfficeLocationError: 'Un lieu de travail portant ce nom existe déjà',
         },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 1baacf938a53..5019ca4693c1 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7674,6 +7674,7 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             primary: 'Principale',
             deleteOfficeLocation: 'Elimina sede dell’ufficio',
             deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede dell’ufficio?',
+            existingOfficeLocationError: 'Esiste già una sede dell’ufficio con questo nome',
         },
         bankAccount: {
             continueWithSetup: 'Continua configurazione',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index e40c802c40b1..9879c39c2c15 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7581,6 +7581,7 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             primary: 'メイン',
             deleteOfficeLocation: 'オフィスの所在地を削除',
             deleteOfficeLocationConfirmation: 'このオフィスの所在地を削除してもよろしいですか？',
+            existingOfficeLocationError: 'この名前のオフィスの所在地はすでに存在します',
         },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 214afe08a6ea..aab914274408 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7655,6 +7655,7 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             primary: 'Primair',
             deleteOfficeLocation: 'Kantoorlocatie verwijderen',
             deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
+            existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
         },
         bankAccount: {
             continueWithSetup: 'Setup voortzetten',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 710189cda337..a69697b7352d 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7677,6 +7677,7 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             primary: 'Główna',
             deleteOfficeLocation: 'Usuń lokalizację biura',
             deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
+            existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
         },
         bankAccount: {
             continueWithSetup: 'Kontynuuj konfigurację',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 175834b68a1b..c0325c9cc111 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7660,6 +7660,7 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             primary: 'Principal',
             deleteOfficeLocation: 'Excluir local de escritório',
             deleteOfficeLocationConfirmation: 'Tem certeza de que deseja excluir este local de escritório?',
+            existingOfficeLocationError: 'Já existe um local de escritório com este nome',
         },
         bankAccount: {
             continueWithSetup: 'Continuar configuração',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c3febccb23cc..451904e9acba 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7396,6 +7396,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             primary: '主要',
             deleteOfficeLocation: '删除办公地点',
             deleteOfficeLocationConfirmation: '确定要删除此办公地点吗？',
+            existingOfficeLocationError: '已存在同名的办公地点',
         },
         bankAccount: {
             continueWithSetup: '继续设置',
diff --git a/src/libs/API/parameters/AddOfficeLocationParams.ts b/src/libs/API/parameters/AddOfficeLocationParams.ts
index e5198d8b5748..d436044b5fbd 100644
--- a/src/libs/API/parameters/AddOfficeLocationParams.ts
+++ b/src/libs/API/parameters/AddOfficeLocationParams.ts
@@ -8,7 +8,7 @@ type AddOfficeLocationParams = {
     address: string;
 
     /** Nickname of the office. Offices added without one are named "Office location N" */
-    name?: string;
+    officeName?: string;
 
     /** Whether the office becomes the workspace default */
     isDefault?: boolean;
diff --git a/src/libs/API/parameters/UpdateOfficeLocationParams.ts b/src/libs/API/parameters/UpdateOfficeLocationParams.ts
index ba9c676f7bae..f0668f7b8ec4 100644
--- a/src/libs/API/parameters/UpdateOfficeLocationParams.ts
+++ b/src/libs/API/parameters/UpdateOfficeLocationParams.ts
@@ -3,7 +3,7 @@ type UpdateOfficeLocationParams = {
     officeID: string;
 
     /** New nickname of the office */
-    name?: string;
+    officeName?: string;
 
     /** JSON-encoded address with addressStreet, city, state, zipCode and country, the same shape as the workspace address */
     address?: string;
diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index aa88eabe1442..c27d7d69daa1 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -835,7 +835,7 @@ function addOfficeLocation(policyID: string, officeLocations: Record<string, Off
         ],
     };
 
-    const parameters: AddOfficeLocationParams = {policyID, officeID, name: name || undefined, address: JSON.stringify(address), isDefault};
+    const parameters: AddOfficeLocationParams = {policyID, officeID, officeName: name || undefined, address: JSON.stringify(address), isDefault};
     API.write(WRITE_COMMANDS.ADD_OFFICE_LOCATION, parameters, onyxData);
 }
 
@@ -905,7 +905,7 @@ function updateOfficeLocation(
     const parameters: UpdateOfficeLocationParams = {
         policyID,
         officeID,
-        name: changes.name,
+        officeName: changes.name,
         address: changes.address ? JSON.stringify(changes.address) : undefined,
         isDefault: changes.isDefault,
     };
diff --git a/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
index ce331b7646c1..d3b44b556fff 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
@@ -41,14 +41,18 @@ function WorkspaceOfficeLocationAddPage({route}: WorkspaceOfficeLocationAddPageP
 
     // The company address counts as an office, the primary one while no office is, so only a workspace without one makes
     // its first office primary
-    const isOnlyOffice = officeCount === 0 && !hasCompanyAddress(policy);
+    const isCompanyAddressShown = hasCompanyAddress(policy);
+    const isOnlyOffice = officeCount === 0 && !isCompanyAddressShown;
+
+    // The company address row is listed with the offices, so its label is taken too
+    const takenNames = [...savedOfficeLocations.map((officeLocation) => officeLocation.name), ...(isCompanyAddressShown ? [translate('common.companyAddress')] : [])];
 
     const addOffice = (name: string, address: CompanyAddress, isPrimary: boolean) => {
         // An office added without a name shows this one until the server names it the same way: numbered after the existing
-        // offices, skipping names already in use
-        const officeNames = new Set(savedOfficeLocations.map((officeLocation) => officeLocation.name));
+        // offices, skipping names already in use regardless of case
+        const lowerCaseTakenNames = new Set(takenNames.map((takenName) => takenName.toLowerCase()));
         let officeNumber = officeCount + 1;
-        while (officeNames.has(translate('workspace.officeLocations.defaultName', {officeNumber}))) {
+        while (lowerCaseTakenNames.has(translate('workspace.officeLocations.defaultName', {officeNumber}).toLowerCase())) {
             officeNumber++;
         }
         addOfficeLocation(policyID, officeLocations, address, isPrimary, name, translate('workspace.officeLocations.defaultName', {officeNumber}));
@@ -70,6 +74,7 @@ function WorkspaceOfficeLocationAddPage({route}: WorkspaceOfficeLocationAddPageP
                     isPrimary={isOnlyOffice}
                     isPrimaryLocked={isOnlyOffice}
                     isNameRequired={false}
+                    takenNames={takenNames}
                     onSubmit={addOffice}
                 />
             </ScreenWrapper>
diff --git a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
index 13231f801a9a..f521b2c52cc8 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
@@ -41,12 +41,19 @@ function WorkspaceOfficeLocationEditPage({route}: WorkspaceOfficeLocationEditPag
 
     // The company address counts as an office, so only a workspace without one keeps at least one office and can't delete
     // its last office. Offices being deleted and additions that failed aren't on the server, so they don't count.
-    const savedOfficeCount = Object.values(officeLocations ?? {}).filter(
-        (otherOfficeLocation) =>
+    const savedOfficeLocations = Object.entries(officeLocations ?? {}).filter(
+        ([, otherOfficeLocation]) =>
             otherOfficeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
             !(otherOfficeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(otherOfficeLocation.errors)),
-    ).length;
-    const canDelete = savedOfficeCount > 1 || hasCompanyAddress(policy);
+    );
+    const isCompanyAddressShown = hasCompanyAddress(policy);
+    const canDelete = savedOfficeLocations.length > 1 || isCompanyAddressShown;
+
+    // The company address row is listed with the offices, so its label is taken too
+    const takenNames = [
+        ...savedOfficeLocations.filter(([otherOfficeID]) => otherOfficeID !== officeID).map(([, otherOfficeLocation]) => otherOfficeLocation.name),
+        ...(isCompanyAddressShown ? [translate('common.companyAddress')] : []),
+    ];
 
     const saveOffice = (name: string, address: CompanyAddress, isPrimary: boolean) => {
         if (!officeLocation) {
@@ -104,6 +111,7 @@ function WorkspaceOfficeLocationEditPage({route}: WorkspaceOfficeLocationEditPag
                     isPrimary={!!officeLocation?.isDefault}
                     isPrimaryLocked={!!officeLocation?.isDefault}
                     isNameRequired
+                    takenNames={takenNames}
                     onSubmit={saveOffice}
                 />
             </ScreenWrapper>
diff --git a/src/pages/workspace/WorkspaceOfficeLocationForm.tsx b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
index af5bc6b8cc48..02f2017297fd 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
@@ -31,12 +31,15 @@ type WorkspaceOfficeLocationFormProps = {
     /** Whether the location name can't be left empty */
     isNameRequired: boolean;
 
+    /** Names of the other locations of the workspace, which the location name can't match regardless of case */
+    takenNames: string[];
+
     /** Called with the trimmed name, the office address and whether the office is the primary one */
     onSubmit: (name: string, address: CompanyAddress, isPrimary: boolean) => void;
 };
 
 /** The location name, address and "Set as primary" fields shared by the pages that add and edit workspace offices */
-function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked, isNameRequired, onSubmit}: WorkspaceOfficeLocationFormProps) {
+function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked, isNameRequired, takenNames, onSubmit}: WorkspaceOfficeLocationFormProps) {
     const {translate} = useLocalize();
     const address = officeLocation?.address;
     const {streetLineOne, streetLineTwo} = getWorkspaceAddressStreetLines(address?.addressStreet, address?.addressStreet2);
@@ -77,6 +80,9 @@ function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked
             errors[INPUT_IDS.LOCATION_NAME] = translate('common.error.fieldRequired');
         } else if (name.length > CONST.FORM_CHARACTER_LIMIT) {
             errors[INPUT_IDS.LOCATION_NAME] = translate('common.error.characterLimitExceedCounter', name.length, CONST.FORM_CHARACTER_LIMIT);
+        } else if (!!name && name !== officeLocation?.name && takenNames.some((takenName) => takenName.trim().toLowerCase() === name.toLowerCase())) {
+            // Like the server, only a changed name is checked, so an office whose name was already taken can still save other changes
+            errors[INPUT_IDS.LOCATION_NAME] = translate('workspace.officeLocations.existingOfficeLocationError');
         }
         return errors;
     };
diff --git a/tests/actions/PolicyOfficeLocationTest.ts b/tests/actions/PolicyOfficeLocationTest.ts
index 048d9ffe7da0..2f2c0ad79396 100644
--- a/tests/actions/PolicyOfficeLocationTest.ts
+++ b/tests/actions/PolicyOfficeLocationTest.ts
@@ -142,7 +142,7 @@ describe('actions/PolicyOfficeLocation', () => {
 
             // Then no name is sent, so the server names the office
             const params = getRequestParams(WRITE_COMMANDS.ADD_OFFICE_LOCATION);
-            expect(params.name).toBeUndefined();
+            expect(params.officeName).toBeUndefined();
 
             // And the office shows the default name meanwhile
             const officeLocations = (await getPolicy(policyID))?.officeLocations ?? {};
@@ -187,7 +187,7 @@ describe('actions/PolicyOfficeLocation', () => {
 
             // And only the changed fields are sent
             const params = getRequestParams(WRITE_COMMANDS.UPDATE_OFFICE_LOCATION);
-            expect(params.name).toBe('HQ');
+            expect(params.officeName).toBe('HQ');
             expect(JSON.parse(params.address)).toEqual(NEW_JERSEY_ADDRESS);
             expect(params.isDefault).toBeUndefined();
 

From 430af4dbe0fcea7812930710d227a400c7f2dc95 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:45:19 +0100
Subject: [PATCH 321/781] remove canvasProp

---
 patches/victory-native/details.md               | 17 -----------------
 .../components/VictoryChartCartesian.tsx        |  6 +-----
 .../components/VictoryChartContent.tsx          |  7 +------
 .../components/VictoryChartExpandModal.tsx      |  2 +-
 .../ExpandedChartBox.tsx                        |  1 -
 .../components/VictoryChartPolar.tsx            |  6 +-----
 .../getStaticChartCanvasProps/index.native.ts   |  6 ------
 .../utils/getStaticChartCanvasProps/index.ts    | 11 -----------
 .../utils/getStaticChartCanvasProps/types.ts    |  7 -------
 9 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.native.ts
 delete mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.ts
 delete mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/types.ts

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index 8abd6d85a317..745fbd8ef8f2 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -27,20 +27,3 @@
 - Upstream PR/issue: Not yet.
 - E/App issue: https://github.com/Expensify/App/issues/91883
 - PR introducing patch: https://github.com/Expensify/App/pull/100186
-
-// s77rt TODO verify if patch is needed, if not remove canvasProps prop
-### [victory-native+41.21.0+002+canvas-props.patch](victory-native+41.21.0+002+canvas-props.patch)
-
-- Reason:
-  
-    ```
-    Forwards a `canvasProps` prop from CartesianChart/PolarChart to the underlying Skia <Canvas>, so the
-    expanded (full-screen) chart can opt into Skia's `__destroyWebGLContextAfterRender` static renderer on
-    web. That renders the chart into a plain 2D canvas bitmap and releases the WebGL context, which keeps
-    the chart visible through the modal close animation without the WebGL white flash and without holding
-    a live GPU context per expanded chart.
-    ```
-  
-- Upstream PR/issue: Not yet.
-- E/App issue: https://github.com/Expensify/App/issues/92969
-- PR introducing patch: https://github.com/Expensify/App/pull/97698
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
index 54669fc1fab9..2db299d94b2e 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
@@ -29,9 +29,6 @@ type VictoryChartCartesianProps = {
     /** When true, renders without visible chrome (used for snapshots/tests) */
     headless?: boolean;
 
-    /** Render into a static bitmap canvas instead of a live WebGL canvas (web) */
-    shouldUseStaticCanvas?: boolean;
-
     onRenderArgs?: (renderArgs: CartesianChartRenderArg<CartesianChartData, YKey>) => void;
 };
 
@@ -39,7 +36,7 @@ type VictoryChartCartesianProps = {
  * Renders the CartesianChart with data, axes, and domain config drawn from context.
  * Labels and legend overlays are handled internally via `renderOutside`.
  */
-function VictoryChartCartesian({explicitSize, headless, shouldUseStaticCanvas, onRenderArgs}: VictoryChartCartesianProps) {
+function VictoryChartCartesian({explicitSize, headless, onRenderArgs}: VictoryChartCartesianProps) {
     const {tnode, data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems, chartContentStyles, pixelScale} = useVictoryChartContext();
     const theme = useTheme();
     const timezone = useCurrentTimezone();
@@ -69,7 +66,6 @@ function VictoryChartCartesian({explicitSize, headless, shouldUseStaticCanvas, o
             domainPadding={domainPadding}
             padding={padding}
             {...getChartLayoutModeProps(explicitSize, headless)}
-            canvasProps={shouldUseStaticCanvas ? getStaticChartCanvasProps() : undefined}
             renderOutside={(renderArgs) => {
                 const overlayContent = (
                     <VictoryChartRenderArgsProvider value={{...renderArgs, pixelScale}}>
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartContent.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartContent.tsx
index fbd751310a73..21904ab9e5ea 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartContent.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartContent.tsx
@@ -9,12 +9,9 @@ import VictoryChartPolar from './VictoryChartPolar';
 type VictoryChartContentProps = {
     explicitSize?: {width: number; height: number};
     headless?: boolean;
-
-    /** Render into a static bitmap canvas instead of a live WebGL canvas (web) */
-    shouldUseStaticCanvas?: boolean;
 };
 
-function VictoryChartContent({explicitSize, headless, shouldUseStaticCanvas}: VictoryChartContentProps) {
+function VictoryChartContent({explicitSize, headless}: VictoryChartContentProps) {
     const {type} = useVictoryChartContext();
     switch (type) {
         case CHART_TYPE.CARTESIAN:
@@ -22,7 +19,6 @@ function VictoryChartContent({explicitSize, headless, shouldUseStaticCanvas}: Vi
                 <VictoryChartCartesian
                     explicitSize={explicitSize}
                     headless={headless}
-                    shouldUseStaticCanvas={shouldUseStaticCanvas}
                 />
             );
         case CHART_TYPE.POLAR:
@@ -30,7 +26,6 @@ function VictoryChartContent({explicitSize, headless, shouldUseStaticCanvas}: Vi
                 <VictoryChartPolar
                     explicitSize={explicitSize}
                     headless={headless}
-                    shouldUseStaticCanvas={shouldUseStaticCanvas}
                 />
             );
         default:
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
index a104930fc5a0..10db813a50e9 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
@@ -103,7 +103,7 @@ function VictoryChartExpandModal({isVisible, onClose}: VictoryChartExpandModalPr
                                         styles.overflowHidden,
                                     ]}
                                 >
-                                    <VictoryChartContent shouldUseStaticCanvas />
+                                    <VictoryChartContent />
                                 </View>
                             ))}
                     </View>
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandedContent/ExpandedChartBox.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandedContent/ExpandedChartBox.tsx
index e17cbf07a196..5f4450d414f1 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandedContent/ExpandedChartBox.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandedContent/ExpandedChartBox.tsx
@@ -53,7 +53,6 @@ function ExpandedChartBox({width, height, clippedHeight, providerScale, backgrou
                     <VictoryChartContent
                         explicitSize={{width, height}}
                         headless={false}
-                        shouldUseStaticCanvas
                     />
                 </VictoryChartScaledProvider>
             </View>
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
index 1e6c3891c7b8..b060f9c125be 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
@@ -21,15 +21,12 @@ import VictoryChartLegend from './VictoryChartLegend';
 type VictoryChartPolarProps = {
     explicitSize?: {width: number; height: number};
     headless?: boolean;
-
-    /** Render into a static bitmap canvas instead of a live WebGL canvas (web) */
-    shouldUseStaticCanvas?: boolean;
 };
 
 /**
  * Renders the PolarChart with data drawn from context.
  */
-function VictoryChartPolar({explicitSize, headless, shouldUseStaticCanvas}: VictoryChartPolarProps) {
+function VictoryChartPolar({explicitSize, headless}: VictoryChartPolarProps) {
     const {tnode, data, labelItems, legendItems, chartContentStyles} = useVictoryChartContext();
     const theme = useTheme();
     const timezone = useCurrentTimezone();
@@ -67,7 +64,6 @@ function VictoryChartPolar({explicitSize, headless, shouldUseStaticCanvas}: Vict
             valueKey={VALUE_KEY}
             colorKey={COLOR_KEY}
             {...getChartLayoutModeProps(explicitSize, headless)}
-            canvasProps={shouldUseStaticCanvas ? getStaticChartCanvasProps() : undefined}
         >
             {headless ? (
                 <ThemeContext.Provider value={theme}>{chartContent}</ThemeContext.Provider>
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.native.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.native.ts
deleted file mode 100644
index a06c1d23f515..000000000000
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.native.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type GetStaticChartCanvasProps from './types';
-
-/** Native Skia views don't flash on re-composite, so the chart keeps its regular renderer. */
-const getStaticChartCanvasProps: GetStaticChartCanvasProps = () => undefined;
-
-export default getStaticChartCanvasProps;
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.ts
deleted file mode 100644
index 8b898def5617..000000000000
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type GetStaticChartCanvasProps from './types';
-
-/**
- * Web: renders the chart into a plain 2D canvas bitmap and releases the WebGL context right after
- * drawing. A bitmap stays visible through the modal close animation (a live WebGL canvas flashes
- * white when re-composited) and doesn't hold a GPU context per expanded chart.
- */
-// eslint-disable-next-line @typescript-eslint/naming-convention -- prop name is defined by react-native-skia
-const getStaticChartCanvasProps: GetStaticChartCanvasProps = () => ({__destroyWebGLContextAfterRender: true});
-
-export default getStaticChartCanvasProps;
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/types.ts
deleted file mode 100644
index 4d13cf87d8f2..000000000000
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type {CanvasProps} from '@shopify/react-native-skia';
-
-type StaticChartCanvasProps = Pick<CanvasProps, '__destroyWebGLContextAfterRender'> | undefined;
-
-type GetStaticChartCanvasProps = () => StaticChartCanvasProps;
-
-export default GetStaticChartCanvasProps;

From 67f6a72620e0f2674d37a6ee32df9412eed4a4cd Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:45:40 +0100
Subject: [PATCH 322/781] remove getStaticChartCanvasProps - fix ts

---
 .../VictoryChartRenderer/components/VictoryChartCartesian.tsx    | 1 -
 .../VictoryChartRenderer/components/VictoryChartPolar.tsx        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
index 2db299d94b2e..c411b025498a 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx
@@ -5,7 +5,6 @@ import type {CartesianChartData, YKey} from '@components/HTMLEngineProvider/HTML
 import getChartDesignWidth from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getChartDesignWidth';
 import getChartLayoutModeProps from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getChartLayoutModeProps';
 import getHierarchyID from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getHierarchyID';
-import getStaticChartCanvasProps from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps';
 import resolveChartThemeColor from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolveChartThemeColor';
 
 import useCurrentTimezone from '@hooks/useCurrentTimezone';
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
index b060f9c125be..c14a048ec76e 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartPolar.tsx
@@ -4,7 +4,6 @@ import {useVictoryChartContext} from '@components/HTMLEngineProvider/HTMLRendere
 import getChartDesignWidth from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getChartDesignWidth';
 import getChartLayoutModeProps from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getChartLayoutModeProps';
 import getHierarchyID from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getHierarchyID';
-import getStaticChartCanvasProps from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getStaticChartCanvasProps';
 
 import useCurrentTimezone from '@hooks/useCurrentTimezone';
 import useTheme from '@hooks/useTheme';

From aec44bd56188202e46af8ad6b30c86ea7a9e10b1 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:53:02 +0100
Subject: [PATCH 323/781] bump victory-native to 42.0.1

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f52335977834..3cb3050656b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "react-web-config": "^1.0.0",
         "react-webcam": "^7.1.1",
         "scheduler": "0.27.0",
-        "victory-native": "^41.21.0",
+        "victory-native": "^42.0.1",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
       },
       "devDependencies": {
@@ -42704,9 +42704,9 @@
       }
     },
     "node_modules/victory-native": {
-      "version": "41.21.0",
-      "resolved": "https://registry.npmjs.org/victory-native/-/victory-native-41.21.0.tgz",
-      "integrity": "sha512-qyldgowkkiAWzN765sODzp4REh2MxBoex+DF5LerIpssTXpxGYEF21bIrhAoQJLDXiZ2rrCj1Dye+MNVYJd7vw==",
+      "version": "42.0.1",
+      "resolved": "https://registry.npmjs.org/victory-native/-/victory-native-42.0.1.tgz",
+      "integrity": "sha512-W3dNBMeRtZ8AQGBkV1PrYYKLFSstTy6uulmlJJFch4hvPX/R1xH1VJXzZopK6GGbcq/ejcr8WwntWwhqTo0lzA==",
       "license": "MIT",
       "dependencies": {
         "d3-scale": "^4.0.2",
@@ -42716,11 +42716,11 @@
         "react-fast-compare": "^3.2.2"
       },
       "peerDependencies": {
-        "@shopify/react-native-skia": ">=1.2.3 <3.0.0",
+        "@shopify/react-native-skia": ">=2.6.0 <3.0.0",
         "react": "*",
         "react-native": "*",
         "react-native-gesture-handler": ">=2.0.0",
-        "react-native-reanimated": ">=3.0.0"
+        "react-native-reanimated": ">=3.19.1"
       }
     },
     "node_modules/vlq": {
diff --git a/package.json b/package.json
index 2ae91dcc2d03..e953f708321f 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,7 @@
     "react-web-config": "^1.0.0",
     "react-webcam": "^7.1.1",
     "scheduler": "0.27.0",
-    "victory-native": "^41.21.0",
+    "victory-native": "^42.0.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
   },
   "devDependencies": {

From aaa6113e96a972df5e28536f949ed65025fd1577 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 7 Oct 2026 18:36:02 +0100
Subject: [PATCH 324/781] restore .github folder

---
 .../javascript/authorChecklist/index.js       | 901 ++++++++++++-----
 .../javascript/awaitStagingDeploys/index.js   | 901 ++++++++++++-----
 .../actions/javascript/bumpVersion/index.js   | 901 ++++++++++++-----
 .../javascript/checkAndroidStatus/index.js    | 903 +++++++++++++-----
 .../javascript/checkDeployBlockers/index.js   | 901 ++++++++++++-----
 .../javascript/checkSVGCompression/index.js   | 901 ++++++++++++-----
 .../javascript/failureNotifier/index.js       | 901 ++++++++++++-----
 .../javascript/formatCodeCovComment/index.js  | 901 ++++++++++++-----
 .../generateHelpPreviewComment/index.js       | 901 ++++++++++++-----
 .../getAndroidRolloutPercentage/index.js      | 903 +++++++++++++-----
 .../javascript/getArtifactInfo/index.js       | 901 ++++++++++++-----
 .../getDeployPullRequestList/index.js         | 901 ++++++++++++-----
 .../javascript/getPreviousVersion/index.js    | 901 ++++++++++++-----
 .../javascript/getPullRequestDetails/index.js | 901 ++++++++++++-----
 .../getPullRequestIncrementalChanges/index.js | 901 ++++++++++++-----
 .../isAuthorizedContributor/index.js          | 901 ++++++++++++-----
 .../isDeployChecklistLocked/index.js          | 903 +++++++++++++-----
 .../markPullRequestsAsDeployed/index.js       | 901 ++++++++++++-----
 .../javascript/postOrReplaceComment/index.js  | 901 ++++++++++++-----
 .../javascript/proposalPoliceComment/index.js | 903 +++++++++++++-----
 .../reopenIssueWithComment/index.js           | 901 ++++++++++++-----
 .../javascript/reviewerChecklist/index.js     | 901 ++++++++++++-----
 .../validateReassureOutput/index.js           | 901 ++++++++++++-----
 .../javascript/verifySignedCommits/index.js   | 901 ++++++++++++-----
 .../verifyStagingBuildsSucceeded/index.js     | 901 ++++++++++++-----
 .github/workflows/README.md                   |   1 -
 .github/workflows/deploy.yml                  |   2 -
 27 files changed, 16829 insertions(+), 5707 deletions(-)

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index fc3426566448..03420b1771b7 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index 906a5fe20da8..00e2f735fcb4 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
index 479e50a322da..c2258fb0a82d 100644
--- a/.github/actions/javascript/bumpVersion/index.js
+++ b/.github/actions/javascript/bumpVersion/index.js
@@ -2312,10 +2312,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -2382,7 +2438,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -2394,6 +2454,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2503,13 +2566,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -6116,6 +6187,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -6162,6 +6234,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -6324,24 +6399,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -6361,6 +6467,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6404,7 +6514,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -6429,9 +6539,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6440,6 +6551,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6565,6 +6680,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6608,12 +6724,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6628,7 +6751,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6636,9 +6762,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6687,7 +6814,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6705,6 +6832,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6717,6 +6861,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6747,8 +6914,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6769,11 +6944,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -7129,6 +7311,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -7189,6 +7372,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -7352,16 +7539,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -7376,18 +7569,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7948,9 +8165,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8456,8 +8674,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8628,7 +8846,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8649,6 +8866,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8848,7 +9066,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8858,6 +9075,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -9298,6 +9516,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -9351,6 +9587,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -9360,6 +9597,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -9421,7 +9669,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9470,9 +9720,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9480,6 +9742,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9487,6 +9750,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9506,6 +9774,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9533,7 +9802,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -16332,14 +16601,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -16422,7 +16725,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16552,18 +16859,14 @@ var require_parse2 = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -17385,7 +17688,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17491,31 +17794,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17534,20 +17832,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17557,19 +17847,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17600,8 +17888,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17609,18 +17903,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17635,6 +17932,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17694,6 +17998,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17714,6 +18021,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17727,6 +18037,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17737,32 +18050,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17805,6 +18132,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -18016,8 +18363,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -18061,9 +18406,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -18247,7 +18589,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -18322,19 +18670,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -18413,6 +18748,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -18432,10 +18801,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18466,63 +18838,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18531,17 +18870,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18557,43 +18895,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18618,12 +18955,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkAndroidStatus/index.js b/.github/actions/javascript/checkAndroidStatus/index.js
index cf13138d08ce..de9e0e53ebc4 100644
--- a/.github/actions/javascript/checkAndroidStatus/index.js
+++ b/.github/actions/javascript/checkAndroidStatus/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 2ca391c52c00..c59c854097c1 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkSVGCompression/index.js b/.github/actions/javascript/checkSVGCompression/index.js
index 1bd2d9dfd701..cad1560febba 100644
--- a/.github/actions/javascript/checkSVGCompression/index.js
+++ b/.github/actions/javascript/checkSVGCompression/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/failureNotifier/index.js b/.github/actions/javascript/failureNotifier/index.js
index 7eedc830062e..208e6286e656 100644
--- a/.github/actions/javascript/failureNotifier/index.js
+++ b/.github/actions/javascript/failureNotifier/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/formatCodeCovComment/index.js b/.github/actions/javascript/formatCodeCovComment/index.js
index 133b8de4b0d2..9aac21e43b56 100644
--- a/.github/actions/javascript/formatCodeCovComment/index.js
+++ b/.github/actions/javascript/formatCodeCovComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/generateHelpPreviewComment/index.js b/.github/actions/javascript/generateHelpPreviewComment/index.js
index 4fffa145a897..222ea227535c 100644
--- a/.github/actions/javascript/generateHelpPreviewComment/index.js
+++ b/.github/actions/javascript/generateHelpPreviewComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request2, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request2, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getAndroidRolloutPercentage/index.js b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
index e970b3649819..1abd092e27ea 100644
--- a/.github/actions/javascript/getAndroidRolloutPercentage/index.js
+++ b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request.aborted) {
+          return;
+        }
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        util.errorRequest(client, request, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index 1d7315a4ae65..b511ee174521 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 86ebf2b747d2..c6a083ec32cf 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
index 0343158e5a02..dc48a205f79b 100644
--- a/.github/actions/javascript/getPreviousVersion/index.js
+++ b/.github/actions/javascript/getPreviousVersion/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index 78b36a004849..b7443787fc9b 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
index 21c54003dde2..e868a069ae7e 100644
--- a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
+++ b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error3) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error3 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error3) {
+          util.errorRequest(client, request2, error3);
+          util.destroy(socket, error3);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error3) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error3 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error3) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error3 || new RequestAbortedError());
+          }
+          return;
+        }
+        error3 = error3 || new RequestAbortedError();
+        util.errorRequest(client, request2, error3);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error3);
         }
-        util.destroy(body, err);
+        util.destroy(body, error3);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error3) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error3);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error3) {
+            stream.off("response", onResponse);
+            abort(error3);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error3, data) => {
-                  if (error3) {
-                    failWebsocketConnection(this.ws, error3.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error3, data) => {
+                    if (error3) {
+                      const code = error3 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error3.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isAuthorizedContributor/index.js b/.github/actions/javascript/isAuthorizedContributor/index.js
index fea991ad887f..d43a19fced4c 100644
--- a/.github/actions/javascript/isAuthorizedContributor/index.js
+++ b/.github/actions/javascript/isAuthorizedContributor/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isDeployChecklistLocked/index.js b/.github/actions/javascript/isDeployChecklistLocked/index.js
index ebdf2bf6961c..9321db05e6d7 100644
--- a/.github/actions/javascript/isDeployChecklistLocked/index.js
+++ b/.github/actions/javascript/isDeployChecklistLocked/index.js
@@ -28447,10 +28447,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -28517,7 +28573,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -28529,6 +28589,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -28638,13 +28701,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -32251,6 +32322,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -32297,6 +32369,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -32459,24 +32534,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -32496,6 +32602,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32539,7 +32649,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -32564,9 +32674,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -32575,6 +32686,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32700,6 +32815,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -32743,12 +32859,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -32763,7 +32886,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -32771,9 +32897,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -32822,7 +32949,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -32840,6 +32967,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -32852,6 +32996,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -32882,8 +33049,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -32904,11 +33079,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -33264,6 +33446,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -33324,6 +33507,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -33487,16 +33674,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -33511,18 +33704,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -34083,9 +34300,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -34591,8 +34809,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -34763,7 +34981,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -34784,6 +35001,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -34983,7 +35201,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -34993,6 +35210,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -35433,6 +35651,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -35486,6 +35722,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -35495,6 +35732,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -35556,7 +35804,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -35605,9 +35855,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -35615,6 +35877,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -35622,6 +35885,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -35641,6 +35909,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -35668,7 +35937,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -42467,14 +42736,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -42557,7 +42860,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -42687,18 +42994,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -43520,7 +43823,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -43626,31 +43929,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -43669,20 +43967,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -43692,19 +43982,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -43735,8 +44023,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -43744,18 +44038,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -43770,6 +44067,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -43829,6 +44133,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -43849,6 +44156,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -43862,6 +44172,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -43872,32 +44185,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -43940,6 +44267,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -44151,8 +44498,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -44196,9 +44541,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -44382,7 +44724,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -44457,19 +44805,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -44548,6 +44883,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -44567,10 +44936,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -44601,63 +44973,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -44666,17 +45005,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -44692,43 +45030,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -44753,12 +45090,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 62a50ec22616..5eca45f374da 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/postOrReplaceComment/index.js b/.github/actions/javascript/postOrReplaceComment/index.js
index fb9eb8df9e7b..195707dedc9f 100644
--- a/.github/actions/javascript/postOrReplaceComment/index.js
+++ b/.github/actions/javascript/postOrReplaceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
index 126b34462df4..beb367dd3ebd 100644
--- a/.github/actions/javascript/proposalPoliceComment/index.js
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str2 = `${val[i]}`;
+            if (!isValidHeaderValue(str2)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str2);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message2 = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message2, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message2 = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message2, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index f237f20694fd..2fe118ee3e64 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index a9419acf5a2e..8e220a2cf59e 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/validateReassureOutput/index.js b/.github/actions/javascript/validateReassureOutput/index.js
index b26522496b9c..e511f56ffd08 100644
--- a/.github/actions/javascript/validateReassureOutput/index.js
+++ b/.github/actions/javascript/validateReassureOutput/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index 087b5df387fd..d982728230d3 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
index 1e9b71a5c3e0..d5508591a07b 100644
--- a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
+++ b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 9aafb02e46eb..46781a17394d 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -88,7 +88,6 @@ git fetch origin tag 1.0.1-0 --no-tags --shallow-exclude=1.0.0-0 # This will fet
 ## Secrets
 The GitHub workflows require a large list of secrets to deploy, notify and test the code:
 1. `SLACK_WEBHOOK` - Sends Slack notifications via Slack WebHook https://expensify.slack.com/services/B01AX48D7MM
-1. `SLACK_RETEST_USER_TOKEN` - Read-only Slack user token with `channels:history` access to `#deployer` and `#retests`, used to link automated retest requests to their Cherry Pick Request threads
 1. `OS_BOTIFY_TOKEN` - Personal access token for @OSBotify user in GitHub
 1. `CLA_BOTIFY_TOKEN` - Personal access token for @CLABotify user in GitHub
 1. `CSC_LINK` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 348d7ddb6fee..0621b4cda065 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -988,9 +988,7 @@ jobs:
         run: npx bun scripts/createRetestRequestForCP.ts --deploy-sha=${{ needs.prep.outputs.DEPLOY_SHA }} --deploy-tag=${{ needs.prep.outputs.TAG }}
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
-          SLACK_RETEST_USER_TOKEN: ${{ secrets.SLACK_RETEST_USER_TOKEN }}
           SLACK_RETEST_WEBHOOK: ${{ steps.loadWebhook.outputs.SLACK_RETEST_WEBHOOK }}
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   createRelease:
     runs-on: blacksmith-2vcpu-ubuntu-2404

From 85f3c93710c148cd1c1dbe544e9740ba24a23035 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 7 Oct 2026 18:38:27 +0100
Subject: [PATCH 325/781] revert unintended changes

---
 .github/workflows/README.md  | 1 +
 .github/workflows/deploy.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 46781a17394d..9aafb02e46eb 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -88,6 +88,7 @@ git fetch origin tag 1.0.1-0 --no-tags --shallow-exclude=1.0.0-0 # This will fet
 ## Secrets
 The GitHub workflows require a large list of secrets to deploy, notify and test the code:
 1. `SLACK_WEBHOOK` - Sends Slack notifications via Slack WebHook https://expensify.slack.com/services/B01AX48D7MM
+1. `SLACK_RETEST_USER_TOKEN` - Read-only Slack user token with `channels:history` access to `#deployer` and `#retests`, used to link automated retest requests to their Cherry Pick Request threads
 1. `OS_BOTIFY_TOKEN` - Personal access token for @OSBotify user in GitHub
 1. `CLA_BOTIFY_TOKEN` - Personal access token for @CLABotify user in GitHub
 1. `CSC_LINK` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0621b4cda065..348d7ddb6fee 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -988,7 +988,9 @@ jobs:
         run: npx bun scripts/createRetestRequestForCP.ts --deploy-sha=${{ needs.prep.outputs.DEPLOY_SHA }} --deploy-tag=${{ needs.prep.outputs.TAG }}
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
+          SLACK_RETEST_USER_TOKEN: ${{ secrets.SLACK_RETEST_USER_TOKEN }}
           SLACK_RETEST_WEBHOOK: ${{ steps.loadWebhook.outputs.SLACK_RETEST_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   createRelease:
     runs-on: blacksmith-2vcpu-ubuntu-2404

From eee96ea18dd4fde20db0dbbb583aac075b3e63d2 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 7 Oct 2026 20:04:33 +0200
Subject: [PATCH 326/781] allow company address as default

---
 src/CONST/index.ts                            |  1 +
 src/languages/de.ts                           |  2 ++
 src/languages/el.ts                           |  2 ++
 src/languages/en.ts                           |  2 ++
 src/languages/es.ts                           |  2 ++
 src/languages/fr.ts                           |  2 ++
 src/languages/it.ts                           |  2 ++
 src/languages/ja.ts                           |  2 ++
 src/languages/nl.ts                           |  2 ++
 src/languages/pl.ts                           |  2 ++
 src/languages/pt-BR.ts                        |  2 ++
 src/languages/zh-hans.ts                      |  2 ++
 src/libs/ReportActionsUtils.ts                |  3 ++-
 src/libs/actions/Policy/DistanceRate.ts       |  5 ++--
 src/pages/workspace/WorkspaceOverviewPage.tsx | 27 +++++++++++++++----
 tests/actions/PolicyOfficeLocationTest.ts     | 22 +++++++++++++++
 tests/unit/ReportActionsUtilsTest.ts          |  5 ++++
 17 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 73346bd0f6c6..d19304b7a14a 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9866,6 +9866,7 @@ const CONST = {
                 CURRENCY: 'WorkspaceOverview-Currency',
                 ADDRESS: 'WorkspaceOverview-Address',
                 OFFICE_LOCATION: 'WorkspaceOverview-OfficeLocation',
+                COMPANY_ADDRESS_OFFICE_LOCATION: 'WorkspaceOverview-CompanyAddressOfficeLocation',
                 ADD_OFFICE_LOCATION: 'WorkspaceOverview-AddOfficeLocation',
                 DELETE_OFFICE_LOCATION: 'WorkspaceOverview-DeleteOfficeLocation',
                 PLAN_TYPE: 'WorkspaceOverview-PlanType',
diff --git a/src/languages/de.ts b/src/languages/de.ts
index cc0034f4c4e9..b6f331e22868 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7719,6 +7719,7 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             deleteOfficeLocation: 'Bürostandort löschen',
             deleteOfficeLocationConfirmation: 'Möchtest du diesen Bürostandort wirklich löschen?',
             existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen existiert bereits',
+            setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptstandort festlegen?',
         },
         bankAccount: {
             continueWithSetup: 'Einrichtung fortsetzen',
@@ -9526,6 +9527,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `hat die Adresse des Bürostandorts „${name}“ in „${newAddress}“ geändert (zuvor „${oldAddress}“)`,
             setAsPrimary: ({name}: {name: string}) => `hat den Bürostandort „${name}“ als Hauptstandort festgelegt`,
+            setCompanyAddressAsPrimary: 'hat die Firmenadresse als Hauptstandort festgelegt',
             removed: ({name}: {name: string}) => `hat den Bürostandort „${name}“ entfernt`,
         },
         commuterExclusions: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 14523cbb619e..9614c24bf569 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8012,6 +8012,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
             deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή την τοποθεσία γραφείου;',
             existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
+            setCompanyAddressAsPrimaryConfirmation: 'Ορισμός της διεύθυνσης εταιρείας ως κύριου γραφείου;',
         },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
@@ -9651,6 +9652,7 @@ ${reportName}`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `άλλαξε τη διεύθυνση της τοποθεσίας γραφείου «${name}» σε «${newAddress}» (προηγουμένως «${oldAddress}»)`,
             setAsPrimary: ({name}: {name: string}) => `όρισε την τοποθεσία γραφείου «${name}» ως κύρια`,
+            setCompanyAddressAsPrimary: 'όρισε τη διεύθυνση εταιρείας ως κύρια',
             removed: ({name}: {name: string}) => `αφαίρεσε την τοποθεσία γραφείου «${name}»`,
         },
         commuterExclusions: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 05b074bd6dcc..3f50fdff9045 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8230,6 +8230,7 @@ const translations = {
             deleteOfficeLocation: 'Delete office location',
             deleteOfficeLocationConfirmation: 'Are you sure you want to delete this office location?',
             existingOfficeLocationError: 'An office location with this name already exists',
+            setCompanyAddressAsPrimaryConfirmation: 'Set the company address as primary office?',
         },
         bankAccount: {
             continueWithSetup: 'Continue setup',
@@ -9677,6 +9678,7 @@ const translations = {
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `changed the address of the office location "${name}" to "${newAddress}" (previously "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `set the office location "${name}" as primary`,
+            setCompanyAddressAsPrimary: 'set the company address as primary',
             removed: ({name}: {name: string}) => `removed the office location "${name}"`,
         },
         commuterExclusions: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 663374bcd2e5..037805a73a55 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7738,6 +7738,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             deleteOfficeLocation: 'Eliminar ubicación de oficina',
             deleteOfficeLocationConfirmation: '¿Estás seguro de que quieres eliminar esta ubicación de oficina?',
             existingOfficeLocationError: 'Ya existe una ubicación de oficina con este nombre',
+            setCompanyAddressAsPrimaryConfirmation: '¿Establecer la dirección física de la empresa como oficina principal?',
         },
         bankAccount: {
             continueWithSetup: 'Continuar con la configuración',
@@ -9302,6 +9303,7 @@ ${reportName}`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `cambió la dirección de la ubicación de oficina "${name}" a "${newAddress}" (anteriormente "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `estableció la ubicación de oficina "${name}" como principal`,
+            setCompanyAddressAsPrimary: 'estableció la dirección física de la empresa como principal',
             removed: ({name}: {name: string}) => `eliminó la ubicación de oficina "${name}"`,
         },
         commuterExclusions: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index b8bc3c41a150..e28e34890077 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7738,6 +7738,7 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             deleteOfficeLocation: 'Supprimer le lieu de travail',
             deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce lieu de travail ?',
             existingOfficeLocationError: 'Un lieu de travail portant ce nom existe déjà',
+            setCompanyAddressAsPrimaryConfirmation: 'Définir l’adresse de l’entreprise comme bureau principal ?',
         },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
@@ -9546,6 +9547,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `a modifié l’adresse du lieu de travail « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
             setAsPrimary: ({name}: {name: string}) => `a défini le lieu de travail « ${name} » comme principal`,
+            setCompanyAddressAsPrimary: 'a défini l’adresse de l’entreprise comme principale',
             removed: ({name}: {name: string}) => `a supprimé le lieu de travail « ${name} »`,
         },
         commuterExclusions: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 5019ca4693c1..aa2cfb461ec9 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7675,6 +7675,7 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             deleteOfficeLocation: 'Elimina sede dell’ufficio',
             deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede dell’ufficio?',
             existingOfficeLocationError: 'Esiste già una sede dell’ufficio con questo nome',
+            setCompanyAddressAsPrimaryConfirmation: 'Impostare l’indirizzo dell’azienda come sede principale?',
         },
         bankAccount: {
             continueWithSetup: 'Continua configurazione',
@@ -9474,6 +9475,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `ha modificato l’indirizzo della sede dell’ufficio "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `ha impostato la sede dell’ufficio "${name}" come principale`,
+            setCompanyAddressAsPrimary: 'ha impostato l’indirizzo dell’azienda come principale',
             removed: ({name}: {name: string}) => `ha rimosso la sede dell’ufficio "${name}"`,
         },
         commuterExclusions: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 9879c39c2c15..df0d7b594649 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7582,6 +7582,7 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             deleteOfficeLocation: 'オフィスの所在地を削除',
             deleteOfficeLocationConfirmation: 'このオフィスの所在地を削除してもよろしいですか？',
             existingOfficeLocationError: 'この名前のオフィスの所在地はすでに存在します',
+            setCompanyAddressAsPrimaryConfirmation: '会社住所をメインのオフィスに設定しますか？',
         },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
@@ -9342,6 +9343,7 @@ ${reportName}`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `オフィスの所在地「${name}」の住所を「${newAddress}」（以前は「${oldAddress}」）に変更しました`,
             setAsPrimary: ({name}: {name: string}) => `オフィスの所在地「${name}」をメインに設定しました`,
+            setCompanyAddressAsPrimary: '会社住所をメインに設定しました',
             removed: ({name}: {name: string}) => `オフィスの所在地「${name}」を削除しました`,
         },
         commuterExclusions: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index aab914274408..62247756f3ee 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7656,6 +7656,7 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             deleteOfficeLocation: 'Kantoorlocatie verwijderen',
             deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
             existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
+            setCompanyAddressAsPrimaryConfirmation: 'Het adres van het bedrijf instellen als primair kantoor?',
         },
         bankAccount: {
             continueWithSetup: 'Setup voortzetten',
@@ -9446,6 +9447,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `heeft het adres van de kantoorlocatie ‘${name}’ gewijzigd in ‘${newAddress}’ (voorheen ‘${oldAddress}’)`,
             setAsPrimary: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ als primair ingesteld`,
+            setCompanyAddressAsPrimary: 'heeft het adres van het bedrijf als primair ingesteld',
             removed: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ verwijderd`,
         },
         commuterExclusions: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index a69697b7352d..439dffeef024 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7678,6 +7678,7 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             deleteOfficeLocation: 'Usuń lokalizację biura',
             deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
             existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
+            setCompanyAddressAsPrimaryConfirmation: 'Ustawić adres firmy jako główne biuro?',
         },
         bankAccount: {
             continueWithSetup: 'Kontynuuj konfigurację',
@@ -9456,6 +9457,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `zmieniono adres lokalizacji biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
             setAsPrimary: ({name}: {name: string}) => `ustawiono lokalizację biura „${name}” jako główną`,
+            setCompanyAddressAsPrimary: 'ustawiono adres firmy jako główny',
             removed: ({name}: {name: string}) => `usunięto lokalizację biura „${name}”`,
         },
         commuterExclusions: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index c0325c9cc111..4cf779ddeaed 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7661,6 +7661,7 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             deleteOfficeLocation: 'Excluir local de escritório',
             deleteOfficeLocationConfirmation: 'Tem certeza de que deseja excluir este local de escritório?',
             existingOfficeLocationError: 'Já existe um local de escritório com este nome',
+            setCompanyAddressAsPrimaryConfirmation: 'Definir o endereço da empresa como escritório principal?',
         },
         bankAccount: {
             continueWithSetup: 'Continuar configuração',
@@ -9444,6 +9445,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `alterou o endereço do local de escritório "${name}" para "${newAddress}" (antes "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `definiu o local de escritório "${name}" como principal`,
+            setCompanyAddressAsPrimary: 'definiu o endereço da empresa como principal',
             removed: ({name}: {name: string}) => `removeu o local de escritório "${name}"`,
         },
         commuterExclusions: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 451904e9acba..ff56d890a398 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7397,6 +7397,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             deleteOfficeLocation: '删除办公地点',
             deleteOfficeLocationConfirmation: '确定要删除此办公地点吗？',
             existingOfficeLocationError: '已存在同名的办公地点',
+            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公地点？',
         },
         bankAccount: {
             continueWithSetup: '继续设置',
@@ -9098,6 +9099,7 @@ ${reportName}`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `已将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
             setAsPrimary: ({name}: {name: string}) => `已将办公地点“${name}”设为主要地点`,
+            setCompanyAddressAsPrimary: '已将公司地址设为主要地点',
             removed: ({name}: {name: string}) => `已删除办公地点“${name}”`,
         },
         commuterExclusions: {
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 8863ed0b99f4..49b5684db489 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -4715,7 +4715,8 @@ function getUpdatedOfficeLocationMessage(translate: LocalizedTranslate, reportAc
     }
 
     if (updatedField === CONST.POLICY.OFFICE_LOCATION_FIELD.IS_DEFAULT) {
-        return translate('workspaceActions.officeLocation.setAsPrimary', {name});
+        // Unsetting the primary office makes the company address the primary one
+        return newValue === false ? translate('workspaceActions.officeLocation.setCompanyAddressAsPrimary') : translate('workspaceActions.officeLocation.setAsPrimary', {name});
     }
 
     return getReportActionText(reportAction);
diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index c27d7d69daa1..18bcdcc3570d 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -840,8 +840,9 @@ function addOfficeLocation(policyID: string, officeLocations: Record<string, Off
 }
 
 /**
- * Update the name, address or default flag of a workspace office. Callers pass the workspace's current
- * `officeLocations` so the failure path can restore the office, and the default office it replaced.
+ * Update the name, address or default flag of a workspace office. Unsetting the default flag makes the company address
+ * the default. Callers pass the workspace's current `officeLocations` so the failure path can restore the office, and
+ * the default office it replaced.
  */
 function updateOfficeLocation(
     policyID: string,
diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx
index b428d423de0a..90c55ebe8f72 100644
--- a/src/pages/workspace/WorkspaceOverviewPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewPage.tsx
@@ -39,7 +39,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {close} from '@libs/actions/Modal';
-import {clearOfficeLocationErrors} from '@libs/actions/Policy/DistanceRate';
+import {clearOfficeLocationErrors, updateOfficeLocation} from '@libs/actions/Policy/DistanceRate';
 import {clearInviteDraft, clearWorkspaceOwnerChangeFlow, requestWorkspaceOwnerChange} from '@libs/actions/Policy/Member';
 import {
     clearAvatarErrors,
@@ -262,9 +262,23 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
     const shouldShowCompanyAddressOffice = hasCompanyAddress(policy);
 
     // The company address is the workspace's default office while no office is
-    const isCompanyAddressPrimary = !officeLocationEntries.some(
-        ([, officeLocation]) => officeLocation.isDefault && officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    );
+    const defaultOfficeID = officeLocationEntries.find(([, officeLocation]) => officeLocation.isDefault && officeLocation.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)?.[0];
+    const isCompanyAddressPrimary = !defaultOfficeID;
+
+    // Taking the primary flag off the primary office makes the company address the primary one
+    const setCompanyAddressAsPrimary = () => {
+        showConfirmModal({
+            title: translate('common.companyAddress'),
+            prompt: translate('workspace.officeLocations.setCompanyAddressAsPrimaryConfirmation'),
+            confirmText: translate('workspace.officeLocations.setAsPrimary'),
+            cancelText: translate('common.cancel'),
+        }).then((result) => {
+            if (result.action !== ModalActions.CONFIRM || !defaultOfficeID) {
+                return;
+            }
+            updateOfficeLocation(routePolicyID, policy?.officeLocations, defaultOfficeID, {isDefault: false});
+        });
+    };
     const shouldShowOfficeLocationsSection = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS) && (!readOnly || shouldShowCompanyAddressOffice || officeLocationEntries.length > 0);
     const shouldShowRulesDocumentSubSection = isPolicyAdmin || hasRulesDocument;
 
@@ -742,7 +756,10 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
                     >
                         {shouldShowCompanyAddressOffice && (
                             <OfflineWithFeedback pendingAction={policy?.pendingFields?.address}>
-                                <MenuItemSectionRoot>
+                                <MenuItemSectionRoot
+                                    onPress={readOnly || isCompanyAddressPrimary ? undefined : setCompanyAddressAsPrimary}
+                                    sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.OVERVIEW.COMPANY_ADDRESS_OFFICE_LOCATION}
+                                >
                                     <MenuItem.Row>
                                         <MenuItem.Content>
                                             <MenuItem.Title>{translate('common.companyAddress')}</MenuItem.Title>
diff --git a/tests/actions/PolicyOfficeLocationTest.ts b/tests/actions/PolicyOfficeLocationTest.ts
index 2f2c0ad79396..4ed3b94cd0b3 100644
--- a/tests/actions/PolicyOfficeLocationTest.ts
+++ b/tests/actions/PolicyOfficeLocationTest.ts
@@ -227,6 +227,28 @@ describe('actions/PolicyOfficeLocation', () => {
             expect(officeLocations.OFFICE2?.name).toBe('New Jersey Office');
             expect(officeLocations.OFFICE2?.errors).toBeFalsy();
         });
+
+        it('takes the primary flag off the primary office to make the company address primary, and restores it when that fails', async () => {
+            // When the primary office stops being primary while the request is in flight, as making the company address
+            // primary does
+            mockFetch?.pause?.();
+            updateOfficeLocation(policyID, {OFFICE1: HEADQUARTERS}, 'OFFICE1', {isDefault: false});
+            await waitForBatchedUpdates();
+
+            // Then no office shows as primary, and the request clears the flag
+            expect((await getPolicy(policyID))?.officeLocations?.OFFICE1?.isDefault).toBe(false);
+            expect(getRequestParams(WRITE_COMMANDS.UPDATE_OFFICE_LOCATION).isDefault).toBe('false');
+
+            // When the request fails
+            mockFetch?.fail?.();
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+
+            // Then the office is the primary one again and shows an error
+            const officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE1;
+            expect(officeLocation?.isDefault).toBe(true);
+            expect(Object.keys(officeLocation?.errors ?? {}).length).toBeGreaterThan(0);
+        });
     });
 
     describe('deleteOfficeLocation', () => {
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 30473e16c00e..2e48f5702db9 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -4644,6 +4644,11 @@ describe('ReportActionsUtils', () => {
                 'changed the address of the office location "HQ" to "900 Asbury Ave, Suite 2, Ocean City, NJ 08226" (previously "88 Kearny St, San Francisco, CA 94108")',
             ],
             ['a new primary office', {updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.IS_DEFAULT, name: 'HQ', newValue: true, oldValue: false}, 'set the office location "HQ" as primary'],
+            [
+                'the company address becoming primary',
+                {updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.IS_DEFAULT, name: 'HQ', newValue: false, oldValue: true},
+                'set the company address as primary',
+            ],
         ])('describes %s', (_description, originalMessage, expected) => {
             // Given an office update that changed a single field
             const action: ReportAction = {

From 25ce76936b75d44c569f66c06f94dc532a763382 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 7 Oct 2026 20:27:23 +0200
Subject: [PATCH 327/781] better UI

---
 src/pages/workspace/WorkspaceOverviewPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx
index 90c55ebe8f72..2a1440e88049 100644
--- a/src/pages/workspace/WorkspaceOverviewPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewPage.tsx
@@ -748,9 +748,9 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
                     <Section
                         isCentralPane
                         title={translate('workspace.officeLocations.title')}
-                        titleStyles={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb0]}
+                        titleStyles={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.textLarge, styles.mb0]}
                         subtitle={translate('workspace.officeLocations.subtitle')}
-                        subtitleStyles={[styles.mb2]}
+                        subtitleStyles={[styles.mb5]}
                         subtitleTextStyles={[styles.textNormal, styles.colorMuted, styles.mr5]}
                         containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
                     >

From 006d89242fa8514129280086888848b6ca886bad Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 7 Oct 2026 23:14:02 +0000
Subject: [PATCH 328/781] Address review comments on the vacation delegate form

- Require the clear after time to be at least one minute ahead, matching the error copy
- Show the delegator list instead of the form while the user is someone else's delegate
- Pass the domain vacation delegate selector inline, as React Compiler memoizes it
- Split the help doc step into action-led steps for the date and time

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 .../settings/Delegate-when-out-of-office.md   |  5 +--
 src/components/VacationDelegateForm.tsx       |  3 +-
 src/libs/VacationDelegateUtils.ts             | 12 ++++++-
 .../DomainMemberVacationDelegateFormPage.tsx  |  5 ++-
 .../CustomStatus/VacationDelegateFormPage.tsx | 35 +++++++++++++------
 tests/ui/VacationDelegateFormPageTest.tsx     | 16 +++++++++
 tests/unit/libs/VacationDelegateUtilsTest.ts  | 12 +++++++
 7 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
index 5eab976fc0f5..8d3097664a55 100644
--- a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
+++ b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
@@ -19,8 +19,9 @@ All delegate actions are tracked in the report history for full visibility.
 
 1. Go to **Account > Profile > Vacation delegate**.
 2. Select the member who should approve on your behalf.
-3. Optional (recommended): Under **Clear after**, pick the last day the delegate should cover. Then, under **Time**, pick when the delegate should clear on that day. If you don't change the time, the delegate clears at the end of the day.
-4. Click **Save**.
+3. Under **Clear after (recommended)**, pick the last day the delegate should cover (optional).
+4. Under **Time**, pick when the delegate clears on that day (defaults to the end of the day).
+5. Click **Save**.
 
 Once set, any reports or chats that would normally come to you will be redirected to your delegate. You can view every action they take in the report's history and comments. The delegate and the date and time it clears are shown under **Vacation delegate** on your profile.
 
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 887f9c9361d9..2ac867b6e5bc 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -11,6 +11,7 @@ import {
     getVacationDelegateClearDate,
     getVacationDelegateClearDateTime,
     getVacationDelegateLocalClearDateTime,
+    isVacationDelegateClearAfterTooSoon,
     isVacationDelegateExpired,
 } from '@libs/VacationDelegateUtils';
 import {getDatePassedError} from '@libs/ValidationUtils';
@@ -90,7 +91,7 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
         const dateError = getDatePassedError(translate, values[INPUT_IDS.CLEAR_AFTER_DATE]);
         if (dateError) {
             formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = dateError;
-        } else if (isVacationDelegateExpired(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected))) {
+        } else if (isVacationDelegateClearAfterTooSoon(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected))) {
             formErrors[INPUT_IDS.CLEAR_AFTER_TIME] = translate('common.error.invalidTimeShouldBeFuture');
         }
         return formErrors;
diff --git a/src/libs/VacationDelegateUtils.ts b/src/libs/VacationDelegateUtils.ts
index 4cebb3ee6ae1..43dce0a20e1d 100644
--- a/src/libs/VacationDelegateUtils.ts
+++ b/src/libs/VacationDelegateUtils.ts
@@ -3,7 +3,7 @@ import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 
 import type {Locale as DateFnsLocale} from 'date-fns';
 
-import {format, isValid, parse} from 'date-fns';
+import {addMinutes, format, isValid, parse} from 'date-fns';
 import {fromZonedTime} from 'date-fns-tz';
 
 import DateUtils from './DateUtils';
@@ -79,6 +79,15 @@ function isVacationDelegateExpired(clearAfter: string | undefined): boolean {
     return !!clearAfter && clearAfter <= DateUtils.getDBTime();
 }
 
+/**
+ * Whether the picked clearAfter datetime is less than one minute from now. Such a delegate could clear while the request is still in
+ * flight, so the form asks for a time at least one minute ahead.
+ */
+function isVacationDelegateClearAfterTooSoon(clearAfter: string | undefined): boolean {
+    // Both values are UTC in the database format, so they compare as strings.
+    return !!clearAfter && clearAfter < DateUtils.formatDBTimeWithoutMilliseconds(addMinutes(new Date(), 1).valueOf());
+}
+
 export {
     getVacationDelegateClearAfter,
     getVacationDelegateClearDate,
@@ -86,4 +95,5 @@ export {
     getVacationDelegateLocalClearDateTime,
     formatVacationDelegateClearDateTime,
     isVacationDelegateExpired,
+    isVacationDelegateClearAfterTooSoon,
 };
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
index b6d802032c51..fcf58dfd335a 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
@@ -22,7 +22,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 import {vacationDelegateSelector} from '@selectors/Domain';
-import React, {useMemo} from 'react';
+import React from 'react';
 
 type DomainMemberVacationDelegateFormPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
 
@@ -32,9 +32,8 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
 
     const {login: currentUserLogin} = useCurrentUserPersonalDetails();
 
-    const memberVacationDelegateSelector = useMemo(() => vacationDelegateSelector(accountID), [accountID]);
     const [vacationDelegate] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
-        selector: memberVacationDelegateSelector,
+        selector: vacationDelegateSelector(accountID),
     });
 
     const [personalDetails] = usePersonalDetail(accountID);
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
index 23167ce66e10..e1fb8b2de6d0 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
@@ -1,3 +1,4 @@
+import DelegatorList from '@components/DelegatorList';
 import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import VacationDelegateForm from '@components/VacationDelegateForm';
@@ -6,6 +7,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearDraftValues} from '@libs/actions/FormActions';
 import {clearVacationDelegateError, deleteVacationDelegate, setVacationDelegate} from '@libs/actions/VacationDelegate';
@@ -19,6 +21,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useNavigation} from '@react-navigation/native';
 import React, {useRef} from 'react';
+import {View} from 'react-native';
 
 function goBackToProfile() {
     clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
@@ -33,11 +36,13 @@ function goBack() {
 
 function VacationDelegateFormPage() {
     const {translate} = useLocalize();
+    const styles = useThemeStyles();
     const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
     const {showConfirmModal} = useConfirmModal();
     const navigation = useNavigation();
 
     const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
+    const hasActiveDelegations = !!vacationDelegate?.delegatorFor?.length;
 
     const isSubmittingRef = useRef(false);
 
@@ -112,16 +117,26 @@ function VacationDelegateFormPage() {
                 title={translate('common.vacationDelegate')}
                 onBackButtonPress={goBack}
             />
-            <VacationDelegateForm
-                vacationDelegate={vacationDelegate}
-                description={translate('statusPage.setVacationDelegate')}
-                onChangeDelegate={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT)}
-                onSubmit={onSubmit}
-                onRemove={onRemove}
-                errors={getVacationDelegateErrors(vacationDelegate)}
-                pendingAction={vacationDelegate?.pendingAction}
-                onCloseError={() => clearVacationDelegateError(vacationDelegate?.previousDelegate, vacationDelegate?.previousClearAfter)}
-            />
+            {/* While the user is someone else's delegate, they can't change their own, same as on the member picker */}
+            {hasActiveDelegations ? (
+                <View style={styles.mt6}>
+                    <DelegatorList
+                        delegators={vacationDelegate?.delegatorFor}
+                        message={translate('statusPage.cannotSetVacationDelegate')}
+                    />
+                </View>
+            ) : (
+                <VacationDelegateForm
+                    vacationDelegate={vacationDelegate}
+                    description={translate('statusPage.setVacationDelegate')}
+                    onChangeDelegate={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT)}
+                    onSubmit={onSubmit}
+                    onRemove={onRemove}
+                    errors={getVacationDelegateErrors(vacationDelegate)}
+                    pendingAction={vacationDelegate?.pendingAction}
+                    onCloseError={() => clearVacationDelegateError(vacationDelegate?.previousDelegate, vacationDelegate?.previousClearAfter)}
+                />
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/tests/ui/VacationDelegateFormPageTest.tsx b/tests/ui/VacationDelegateFormPageTest.tsx
index 2e86d9859789..17b5a402ab6a 100644
--- a/tests/ui/VacationDelegateFormPageTest.tsx
+++ b/tests/ui/VacationDelegateFormPageTest.tsx
@@ -223,6 +223,22 @@ describe('VacationDelegateFormPage', () => {
         expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
     });
 
+    it('shows the delegator list instead of the form while the user is someone else’s delegate', async () => {
+        // Given a saved delegate, while the user is also the vacation delegate for another member
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: ORIGINAL_DELEGATE_EMAIL, delegatorFor: [DELEGATE_A_EMAIL]});
+        });
+
+        // When the form page opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the form is replaced by the explanation, so the user can't change or remove their own delegate, same as on the member picker
+        expect(screen.getByText(TestHelper.translateLocal('statusPage.cannotSetVacationDelegate'))).toBeOnTheScreen();
+        expect(screen.queryByTestId('select-delegate-a')).not.toBeOnTheScreen();
+        expect(screen.queryByTestId('remove-delegate')).not.toBeOnTheScreen();
+    });
+
     it('pops only the form and drops the unsaved pick when the header back button is pressed', async () => {
         // Given a member picked on the picker but not saved yet
         jest.mocked(Navigation.goBack).mockClear();
diff --git a/tests/unit/libs/VacationDelegateUtilsTest.ts b/tests/unit/libs/VacationDelegateUtilsTest.ts
index b520047b82f3..da5de9ff102d 100644
--- a/tests/unit/libs/VacationDelegateUtilsTest.ts
+++ b/tests/unit/libs/VacationDelegateUtilsTest.ts
@@ -4,6 +4,7 @@ import {
     getVacationDelegateClearDate,
     getVacationDelegateClearDateTime,
     getVacationDelegateLocalClearDateTime,
+    isVacationDelegateClearAfterTooSoon,
     isVacationDelegateExpired,
 } from '@libs/VacationDelegateUtils';
 
@@ -96,4 +97,15 @@ describe('VacationDelegateUtils', () => {
             expect(isVacationDelegateExpired(undefined)).toBe(false);
         });
     });
+
+    describe('isVacationDelegateClearAfterTooSoon', () => {
+        it('is true when the clear after datetime is less than one minute from now', () => {
+            // Given the current time is 2026-09-28 12:00 UTC
+            // When a time 30 seconds ahead, exactly one minute ahead, and no time are checked
+            // Then only the one under a minute ahead is too soon, since it could clear while the save request is in flight
+            expect(isVacationDelegateClearAfterTooSoon('2026-09-28 12:00:30')).toBe(true);
+            expect(isVacationDelegateClearAfterTooSoon('2026-09-28 12:01:00')).toBe(false);
+            expect(isVacationDelegateClearAfterTooSoon(undefined)).toBe(false);
+        });
+    });
 });

From 58f320b9920b51c638929bb48c3606b0f69e7aaf Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 8 Oct 2026 10:32:05 +0700
Subject: [PATCH 329/781] Render SearchColumnsPage inside OnyxListItemProvider
 in its test

After the main merge, SearchColumnsPage reads the session through
usePolicyForMovingExpenses, which needs OnyxListItemProvider. Wrap the
render in the provider and return the form only for its own Onyx key.
---
 tests/ui/SearchColumnsPageTest.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/ui/SearchColumnsPageTest.tsx b/tests/ui/SearchColumnsPageTest.tsx
index d64d732eb229..5c8b96f9eaea 100644
--- a/tests/ui/SearchColumnsPageTest.tsx
+++ b/tests/ui/SearchColumnsPageTest.tsx
@@ -1,6 +1,7 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import type ColumnsSettingsList from '@components/ColumnsSettingsList';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MockText from '@components/Text';
 
 import useOnyx from '@hooks/useOnyx';
@@ -9,6 +10,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {buildFilterFormValuesFromQuery, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import SearchColumnsPage from '@src/pages/Search/SearchColumnsPage';
 import SCREENS from '@src/SCREENS';
 
@@ -36,12 +38,16 @@ describe('SearchColumnsPage', () => {
         }
 
         const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-        (jest.mocked(useOnyx) as jest.Mock).mockReturnValue([form]);
+        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : undefined]);
         mockGetRootState.mockReturnValue({
             routes: [{name: NAVIGATORS.TAB_NAVIGATOR, params: {screen: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, params: {screen: SCREENS.SEARCH.ROOT, params: {q: input}}}}],
         });
 
-        render(<SearchColumnsPage />);
+        render(
+            <OnyxListItemProvider>
+                <SearchColumnsPage />
+            </OnyxListItemProvider>,
+        );
         fireEvent.press(screen.getByText('Save columns'));
 
         const [route] = jest.mocked(Navigation.navigate).mock.calls.at(-1) ?? [];

From bb885aab25c0f9eca6d448aa91d8a2c4d91fa077 Mon Sep 17 00:00:00 2001
From: huutech <20178761+huult@users.noreply.github.com>
Date: Thu, 8 Oct 2026 11:56:28 +0700
Subject: [PATCH 330/781] fix: hide redundant MARKED_REIMBURSED row in Search
 when sibling PAY is only in the snapshot

---
 src/libs/ReportActionsUtils.ts         |  57 +++++++----
 src/libs/SearchUIUtils.ts              |   5 +-
 tests/unit/ReportActionsUtilsTest.ts   | 133 +++++++++++++++++++++++++
 tests/unit/Search/SearchUIUtilsTest.ts |  47 +++++++++
 4 files changed, 220 insertions(+), 22 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index eeffab614908..1804440581ca 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -1304,6 +1304,7 @@ function shouldReportActionBeVisible(
     canUserPerformWriteAction?: boolean,
     currentUserAccountID?: number,
     reportID?: string,
+    reportActions?: OnyxEntry<ReportActions>,
 ): boolean {
     if (!reportAction) {
         return false;
@@ -1380,7 +1381,7 @@ function shouldReportActionBeVisible(
 
         // The isNewDot/shouldShow are baked at write time and can be stale for actions created outside NewDot (e.g OldDot or a background job).
         // Not applied to REIMBURSED, which carries bank account details PAY doesn't replace.
-        if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED) && hasSiblingPayReportAction(reportAction, reportAction.reportID ?? reportID)) {
+        if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED) && hasSiblingPayReportAction(reportAction, reportAction.reportID ?? reportID, reportActions)) {
             return false;
         }
     }
@@ -1414,6 +1415,7 @@ function isReportActionVisible(
     visibleReportActions?: VisibleReportActionsDerivedValue,
     // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
     currentUserAccountID?: number,
+    reportActions?: OnyxEntry<ReportActions>,
 ): boolean {
     if (!reportAction?.reportActionID) {
         return false;
@@ -1423,18 +1425,18 @@ function isReportActionVisible(
     // from what's cached in visibleReportActions (which reflects persisted Onyx data).
     // We must recalculate visibility at runtime to ensure accuracy for these transient states.
     if (reportAction.pendingAction) {
-        return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID);
+        return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID, reportActions);
     }
 
     if (visibleReportActions && reportID) {
         const reportCache = visibleReportActions[reportID];
         if (!reportCache) {
-            return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID);
+            return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID, reportActions);
         }
         const staticVisibility = reportCache[reportAction.reportActionID];
         // If action is not in derived value cache, fall back to runtime calculation
         if (staticVisibility === undefined) {
-            return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID);
+            return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID, reportActions);
         }
         if (!staticVisibility) {
             return false;
@@ -1444,7 +1446,7 @@ function isReportActionVisible(
         }
         return true;
     }
-    return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID);
+    return shouldReportActionBeVisible(reportAction, reportAction.reportActionID, canUserPerformWriteAction, currentUserAccountID, reportID, reportActions);
 }
 
 /**
@@ -1935,24 +1937,13 @@ function isPaymentAttemptBoundary(action: OnyxEntry<ReportAction>): boolean {
 }
 
 /**
- * Finds MARKED_REIMBURSED actions with a PAY sibling in the same payment attempt. A historical PAY
+ * Finds the MARKED_REIMBURSED actions that have a PAY sibling in the same payment attempt. A historical PAY
  * must not hide a later manual reimbursement after that payment was canceled or failed.
- * The write-time isNewDot/shouldShow flags can be stale for background jobs (Expensify/Expensify#636674).
  */
-function hasSiblingPayReportAction(reportAction: OnyxEntry<ReportAction>, reportID: string | undefined): boolean {
-    if (!reportID || !reportAction?.reportActionID) {
-        return false;
-    }
-
-    const reportActions = getAllReportActions(reportID);
-    // An action absent from loaded history cannot be matched. Avoid caching the empty fallback for unknown reports.
-    if (!reportActions[reportAction.reportActionID]) {
-        return false;
-    }
-
+function getPaySiblingActionIDs(reportActions: ReportActions): Set<string> {
     const cachedSiblings = paySiblingCache.get(reportActions);
     if (cachedSiblings) {
-        return cachedSiblings.has(reportAction.reportActionID);
+        return cachedSiblings;
     }
 
     const paymentActions = getSortedReportActions(
@@ -1982,7 +1973,33 @@ function hasSiblingPayReportAction(reportAction: OnyxEntry<ReportAction>, report
     // Cache all siblings together, but invalidate on any history update: even a positive match can
     // change if an intervening cancellation arrives later. Weak keys release obsolete snapshots.
     paySiblingCache.set(reportActions, siblings);
-    return siblings.has(reportAction.reportActionID);
+    return siblings;
+}
+
+/**
+ * Checks whether a MARKED_REIMBURSED action has a PAY sibling in the same payment attempt.
+ * The write-time isNewDot/shouldShow flags can be stale for background jobs (Expensify/Expensify#636674).
+ * `callerReportActions` (e.g. a Search snapshot) is used when the loaded Onyx history can't answer, e.g. the report's timeline isn't loaded.
+ */
+function hasSiblingPayReportAction(reportAction: OnyxEntry<ReportAction>, reportID: string | undefined, callerReportActions?: OnyxEntry<ReportActions>): boolean {
+    if (!reportID || !reportAction?.reportActionID) {
+        return false;
+    }
+
+    const reportActionID = reportAction.reportActionID;
+    const loadedReportActions = getAllReportActions(reportID);
+    // An action absent from a collection cannot be matched. Avoid caching the empty fallback for unknown reports.
+    if (loadedReportActions[reportActionID]) {
+        if (getPaySiblingActionIDs(loadedReportActions).has(reportActionID)) {
+            return true;
+        }
+        // A loaded history that contains a PAY also holds the cancellations that separate payment attempts, so its answer is final.
+        if (Object.values(loadedReportActions).some((action) => isPayAction(action))) {
+            return false;
+        }
+    }
+
+    return !!callerReportActions?.[reportActionID] && getPaySiblingActionIDs(callerReportActions).has(reportActionID);
 }
 
 function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 59034706b53b..148647b89e62 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2560,7 +2560,8 @@ function getReportActionsSections(
     for (const key in data) {
         if (isReportActionEntry(key)) {
             const reportIDFromKey = key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '');
-            const reportActions = Object.values(data[key]);
+            const reportActionsCollection = data[key];
+            const reportActions = Object.values(reportActionsCollection);
             n += reportActions.length;
             for (const reportAction of reportActions) {
                 // Always use the container reportID so "In <chat name>" rows open the parent chat, not a child task/thread report.
@@ -2577,7 +2578,7 @@ function getReportActionsSections(
                 const isReportArchived = isArchivedReport(data[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`]);
                 if (
                     !reportID ||
-                    !isReportActionVisible(reportAction, reportID, canUserPerformWriteAction(report, isReportArchived), visibleReportActionsData) ||
+                    !isReportActionVisible(reportAction, reportID, canUserPerformWriteAction(report, isReportArchived), visibleReportActionsData, undefined, reportActionsCollection) ||
                     isDeletedAction(reportAction) ||
                     isResolvedActionableWhisper(reportAction) ||
                     reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED ||
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 6875b41c6ee7..bb3e68e8a989 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -2831,6 +2831,139 @@ describe('ReportActionsUtils', () => {
             expect(actual).toBe(true);
         });
 
+        it('should return false for MARKED_REIMBURSED with a sibling IOU PAY action in the passed collection when the report timeline is not loaded into Onyx', () => {
+            // Given a MARKED_REIMBURSED action with stale write-time flags on a report whose actions are not in the Onyx collection
+            const reportID = 'reportOnlyInSearchSnapshot';
+            const markedReimbursedAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED> = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
+                reportActionID: '1',
+                reportID,
+                created: '2025-01-01 00:00:00',
+                message: [{type: 'TEXT', style: 'normal', text: 'Marked as reimbursed'}],
+                originalMessage: {},
+            };
+            // And a caller-provided collection (e.g. a Search snapshot) that contains a sibling IOU PAY action
+            const payAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                reportActionID: '2',
+                reportID,
+                created: '2025-01-01 00:00:01',
+                message: [{type: 'TEXT', style: 'normal', text: 'paid'}],
+                originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.PAY, IOUReportID: reportID, amount: 100, currency: CONST.CURRENCY.USD},
+            } as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>;
+            const snapshotReportActions = {
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+                [payAction.reportActionID]: payAction,
+            };
+
+            // When visibility is checked with the caller's collection
+            const actual = ReportActionsUtils.isReportActionVisible(markedReimbursedAction, reportID, true, undefined, undefined, snapshotReportActions);
+
+            // Then the MARKED_REIMBURSED action should NOT be visible, because the sibling is found in the passed collection
+            expect(actual).toBe(false);
+        });
+
+        it('should return false for MARKED_REIMBURSED when Onyx only has the action and the passed collection has the sibling IOU PAY action', async () => {
+            // Given a partially loaded Onyx history that contains the MARKED_REIMBURSED action but no PAY action
+            const reportID = 'reportPartiallyLoadedInOnyx';
+            const markedReimbursedAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED> = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
+                reportActionID: '1',
+                reportID,
+                created: '2025-01-01 00:00:00',
+                message: [{type: 'TEXT', style: 'normal', text: 'Marked as reimbursed'}],
+                originalMessage: {},
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+            });
+            // And a caller-provided collection (e.g. a Search snapshot) that contains the sibling IOU PAY action
+            const payAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                reportActionID: '2',
+                reportID,
+                created: '2025-01-01 00:00:01',
+                message: [{type: 'TEXT', style: 'normal', text: 'paid'}],
+                originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.PAY, IOUReportID: reportID, amount: 100, currency: CONST.CURRENCY.USD},
+            } as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>;
+            const snapshotReportActions = {
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+                [payAction.reportActionID]: payAction,
+            };
+
+            // When visibility is checked with the caller's collection
+            const actual = ReportActionsUtils.isReportActionVisible(markedReimbursedAction, reportID, true, undefined, undefined, snapshotReportActions);
+
+            // Then the MARKED_REIMBURSED action should NOT be visible, because Onyx can't answer and the caller's collection holds the sibling
+            expect(actual).toBe(false);
+        });
+
+        it('should return true for MARKED_REIMBURSED when the loaded Onyx history separates the PAY action with a cancellation, even if the passed collection has the PAY action', async () => {
+            // Given a loaded Onyx history where a PAY was canceled before the manual MARKED_REIMBURSED action
+            const reportID = 'reportWithCanceledPayInOnyx';
+            const payAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                reportActionID: '1',
+                reportID,
+                created: '2025-01-01 00:00:00',
+                message: [{type: 'TEXT', style: 'normal', text: 'paid'}],
+                originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.PAY, IOUReportID: reportID, amount: 100, currency: CONST.CURRENCY.USD},
+            } as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>;
+            const canceledAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED,
+                reportActionID: '2',
+                reportID,
+                created: '2025-01-01 00:00:10',
+                message: [{type: 'TEXT', style: 'normal', text: 'canceled payment'}],
+                originalMessage: {},
+            } as ReportAction;
+            const markedReimbursedAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED> = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
+                reportActionID: '3',
+                reportID,
+                created: '2025-01-01 00:00:20',
+                message: [{type: 'TEXT', style: 'normal', text: 'Marked as reimbursed'}],
+                originalMessage: {},
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+                [payAction.reportActionID]: payAction,
+                [canceledAction.reportActionID]: canceledAction,
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+            });
+            // And a filtered caller-provided collection that omits the cancellation
+            const snapshotReportActions = {
+                [payAction.reportActionID]: payAction,
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+            };
+
+            // When visibility is checked with the caller's collection
+            const actual = ReportActionsUtils.isReportActionVisible(markedReimbursedAction, reportID, true, undefined, undefined, snapshotReportActions);
+
+            // Then the MARKED_REIMBURSED action should stay visible, because the complete Onyx history shows it belongs to a new payment attempt
+            expect(actual).toBe(true);
+        });
+
+        it('should return true for MARKED_REIMBURSED when the passed collection has no PAY action', () => {
+            // Given a MARKED_REIMBURSED action on a report whose actions are not in the Onyx collection
+            const reportID = 'reportOnlyInSearchSnapshotWithoutPay';
+            const markedReimbursedAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED> = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
+                reportActionID: '1',
+                reportID,
+                created: '2025-01-01 00:00:00',
+                message: [{type: 'TEXT', style: 'normal', text: 'Marked as reimbursed'}],
+                originalMessage: {},
+            };
+
+            // When visibility is checked with a caller-provided collection that only contains the MARKED_REIMBURSED action
+            const actual = ReportActionsUtils.isReportActionVisible(markedReimbursedAction, reportID, true, undefined, undefined, {
+                [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+            });
+
+            // Then the MARKED_REIMBURSED action should stay visible, because there is no PAY action to replace it
+            expect(actual).toBe(true);
+        });
+
         it('should return true for TAKE_CONTROL when automaticAction is false', () => {
             const reportAction = buildTakeControlActionFixture(
                 {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index f3f2edc49e80..aa1df4b1bde3 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2782,6 +2782,53 @@ describe('SearchUIUtils', () => {
             expect(allReportActionsLength).toBe(6);
         });
 
+        it('should hide a MARKED_REIMBURSED action that has a sibling PAY action in the Search snapshot when the report is not loaded into Onyx', () => {
+            // Given a CHAT search result whose report only exists in the snapshot, with a stale MARKED_REIMBURSED action and its sibling PAY action
+            const snapshotReportID = 'snapshotOnlyReportID';
+            const markedReimbursedAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
+                reportActionID: 'markedReimbursedActionID',
+                reportID: snapshotReportID,
+                created: '2025-01-01 00:00:00',
+                message: [{type: 'TEXT', style: 'normal', text: 'Marked as reimbursed'}],
+                originalMessage: {},
+            } as OnyxTypes.ReportAction;
+            const payAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                reportActionID: 'payActionID',
+                reportID: snapshotReportID,
+                created: '2025-01-01 00:00:01',
+                message: [{type: 'TEXT', style: 'normal', text: 'paid'}],
+                originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.PAY, IOUReportID: snapshotReportID, amount: 100, currency: CONST.CURRENCY.USD},
+            } as OnyxTypes.ReportAction;
+            const data = {
+                personalDetailsList: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${snapshotReportID}`]: {
+                    [markedReimbursedAction.reportActionID]: markedReimbursedAction,
+                    [payAction.reportActionID]: payAction,
+                },
+            } as unknown as OnyxTypes.SearchResults['data'];
+
+            // When the CHAT sections are built from the snapshot
+            const [sections] = SearchUIUtils.getSections({
+                dateFnsLocale: undefined,
+                type: CONST.SEARCH.DATA_TYPES.CHAT,
+                data,
+                currentAccountID: 2074551,
+                currentUserEmail: '',
+                translate: translateLocal,
+                formatPhoneNumber,
+                bankAccountList: {},
+                rules: undefined,
+                conciergeReportID: undefined,
+                convertToDisplayString,
+                reportAttributesDerivedValue: {},
+            });
+
+            // Then only the PAY action is listed, because the snapshot is used to find the sibling of the MARKED_REIMBURSED action
+            expect((sections as Array<{reportActionID: string}>).map((item) => item.reportActionID)).toStrictEqual([payAction.reportActionID]);
+        });
+
         it('should return getTransactionsSections result when groupBy is undefined', () => {
             expect(
                 SearchUIUtils.getSections({

From e5803c52177b2d0632fc3864b78c15e2d7aa557a Mon Sep 17 00:00:00 2001
From: huutech <20178761+huult@users.noreply.github.com>
Date: Thu, 8 Oct 2026 12:21:16 +0700
Subject: [PATCH 331/781] update eslint

---
 tests/unit/Search/SearchUIUtilsTest.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index aa1df4b1bde3..f9c0da686dc9 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2801,13 +2801,13 @@ describe('SearchUIUtils', () => {
                 message: [{type: 'TEXT', style: 'normal', text: 'paid'}],
                 originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.PAY, IOUReportID: snapshotReportID, amount: 100, currency: CONST.CURRENCY.USD},
             } as OnyxTypes.ReportAction;
-            const data = {
-                personalDetailsList: {},
+            const data: OnyxTypes.SearchResults['data'] = {
+                ...searchResults.data,
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${snapshotReportID}`]: {
                     [markedReimbursedAction.reportActionID]: markedReimbursedAction,
                     [payAction.reportActionID]: payAction,
                 },
-            } as unknown as OnyxTypes.SearchResults['data'];
+            };
 
             // When the CHAT sections are built from the snapshot
             const [sections] = SearchUIUtils.getSections({
@@ -2826,7 +2826,11 @@ describe('SearchUIUtils', () => {
             });
 
             // Then only the PAY action is listed, because the snapshot is used to find the sibling of the MARKED_REIMBURSED action
-            expect((sections as Array<{reportActionID: string}>).map((item) => item.reportActionID)).toStrictEqual([payAction.reportActionID]);
+            const snapshotReportActionIDs = sections
+                .filter(SearchUIUtils.isReportActionListItemType)
+                .filter((item) => item.reportID === snapshotReportID)
+                .map((item) => item.reportActionID);
+            expect(snapshotReportActionIDs).toStrictEqual([payAction.reportActionID]);
         });
 
         it('should return getTransactionsSections result when groupBy is undefined', () => {

From 50fac94a4edd2f447bb45045764778f86f944e70 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 8 Oct 2026 05:45:52 +0000
Subject: [PATCH 332/781] Address review: shorten comments and reuse
 isPolicyValidForMovingExpenses for active policy

Co-authored-by: huult <huult@users.noreply.github.com>
---
 src/hooks/usePolicyForMovingExpenses.ts       | 22 +++++--------------
 .../Search/SearchTransactionsChangeReport.tsx |  3 ---
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/hooks/usePolicyForMovingExpenses.ts b/src/hooks/usePolicyForMovingExpenses.ts
index f60449456a35..732502112d89 100644
--- a/src/hooks/usePolicyForMovingExpenses.ts
+++ b/src/hooks/usePolicyForMovingExpenses.ts
@@ -22,10 +22,7 @@ function checkForUserPendingDelete(login: string, policy: OnyxEntry<Policy>) {
     return isPolicyMemberWithoutPendingDelete(login, policy);
 }
 
-// `policy.role` is only populated on the user's default/active policy, so fall back to the member's role in
-// `employeeList` via `getPolicyRole`. Without the login-aware lookup, a workspace the user is genuinely a member
-// of is rejected here while `getGroupPoliciesWhereReportCanBeCreated` (which uses `getPolicyRole`) accepts it,
-// and the two disagree about whether the user has a workspace at all.
+// `policy.role` is only set on the active policy, so fall back to `getPolicyRole` (matches `getGroupPoliciesWhereReportCanBeCreated`).
 function isPolicyMemberByRole(policy: OnyxEntry<Policy>, login: string) {
     const role = getPolicyRole(policy, login);
     return !!role && (Object.values(CONST.POLICY.ROLE) as string[]).includes(role);
@@ -96,10 +93,8 @@ type PolicyForMovingExpenses = {
     shouldSelectPolicy: boolean;
     shouldNavigateToUpgradePath: boolean;
     /**
-     * False while the policy collection is still being read from Onyx. Callers that *act* on the result — creating
-     * a report, moving transactions — must no-op until this is true, because `shouldNavigateToUpgradePath: false`
-     * during the read is "we don't know yet", not "this user has an eligible policy". `useCreateReport` gates the
-     * same way. Callers that only navigate to a picker can ignore it; they already handle an unresolved policy.
+     * False while policies are still loading from Onyx. Callers that act on the result (create report, move
+     * transactions) must no-op until true, as with `useCreateReport`. Picker-only callers can ignore it.
      */
     arePoliciesLoaded: boolean;
 };
@@ -137,9 +132,7 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
 
     // User has no eligible policy
     if (!resolvedPolicyID) {
-        // The active workspace can still be a valid destination even when the qualification pass came back
-        // empty, so check it before giving up. This has to run ahead of the upgrade path below, otherwise a
-        // perfectly valid active workspace can never rescue the user.
+        // The active workspace may still be valid when qualification finds nothing, so check it before the upgrade path.
         if (isPolicyValidForMovingExpenses(activePolicy, login, isPerDiemRequest, isTimeRequest)) {
             return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
         }
@@ -152,12 +145,7 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
         return {policyForMovingExpensesID: validExpensePolicyID, policyForMovingExpenses: resolvedPolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
-    if (
-        activePolicy &&
-        !isTeachersUnitePolicyID(activePolicy.id) &&
-        (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(activePolicy)) &&
-        (!isTimeRequest || isTimeTrackingEnabled(activePolicy))
-    ) {
+    if (isPolicyValidForMovingExpenses(activePolicy, login, isPerDiemRequest, isTimeRequest)) {
         return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx
index 96f563af465e..8433679b766a 100644
--- a/src/pages/Search/SearchTransactionsChangeReport.tsx
+++ b/src/pages/Search/SearchTransactionsChangeReport.tsx
@@ -235,9 +235,6 @@ function SearchTransactionsChangeReport() {
             return;
         }
 
-        // Unlike the other consumers of this hook, this path *mutates* — it creates a report and moves the selected
-        // transactions into it. Falling through while the policy collection is still loading would create that report
-        // with an undefined policy, so wait instead. `useCreateReport` no-ops the same way.
         if (!arePoliciesLoaded) {
             return;
         }

From c517355ec7ed750d8f41ad7ad4cf862ca9aecbaa Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 8 Oct 2026 05:45:59 +0000
Subject: [PATCH 333/781] Fix: add arePoliciesLoaded to
 usePolicyForMovingExpenses mock in SearchActionsBarCreateButtonTest

Co-authored-by: huult <huult@users.noreply.github.com>
---
 tests/ui/components/SearchActionsBarCreateButtonTest.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ui/components/SearchActionsBarCreateButtonTest.tsx b/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
index d99a408e2865..be2b56651b9f 100644
--- a/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
+++ b/tests/ui/components/SearchActionsBarCreateButtonTest.tsx
@@ -248,6 +248,7 @@ describe('SearchActionsBarCreateButton', () => {
             policyForMovingExpenses: MOCK_POLICY,
             shouldSelectPolicy: false,
             shouldNavigateToUpgradePath: false,
+            arePoliciesLoaded: true,
         });
         await act(async () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${MOCK_POLICY_ID}`, MOCK_POLICY);

From 107d3f79bbfac736435efd221f336ea67aeaecd7 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Thu, 8 Oct 2026 08:28:55 +0200
Subject: [PATCH 334/781] Explain why getMatchingFullScreenRoute is a separate
 module

---
 src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts b/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts
index 83b2cf72cbc1..10ee6caa4cad 100644
--- a/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts
+++ b/src/libs/Navigation/helpers/getMatchingFullScreenRoute.ts
@@ -1,3 +1,8 @@
+/**
+ * Finds the full screen route to render under a given route.
+ * Split from getAdaptedStateFromPath so linkTo and Navigation can import it without pulling in ReportUtils.
+ * Do not import ReportUtils or anything that imports Navigation here, or Navigation rejoins the import/no-cycle graph.
+ */
 import getInitialSplitNavigatorState from '@libs/Navigation/AppNavigator/createSplitNavigator/getInitialSplitNavigatorState';
 import {
     RHP_TO_DOMAIN,

From 0c26da13b635232a0388156bcff7392ee3f7b43f Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 8 Oct 2026 16:28:58 +0700
Subject: [PATCH 335/781] address comment

---
 src/ROUTES.ts                                 |   4 +-
 .../CategoryPicker/CategoryPickerModal.tsx    |   7 +-
 .../sections/CategoryField.tsx                |   8 ++
 .../sections/CategoryFieldDropdown.tsx        |  15 ++-
 .../sections/ExpenseFieldDropdown.tsx         |  14 +-
 .../step/DynamicIOURequestStepCategory.tsx    |   2 +-
 tests/unit/PolicyUtilsTest.ts                 |   9 ++
 .../components/CategoryPickerModalTest.tsx    |   2 +-
 .../components/ExpenseFieldDropdown.test.tsx  |  36 ++++-
 .../CategoryFieldDropdown.test.tsx            | 124 ++++++++++++++++++
 10 files changed, 205 insertions(+), 16 deletions(-)
 create mode 100644 tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 53c0db212256..e468728a30f2 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2045,7 +2045,9 @@ const DYNAMIC_ROUTES = {
     },
     MONEY_REQUEST_STEP_CATEGORY_CREATE: {
         path: 'add-category',
-        entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_CATEGORY, SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, SCREENS.MONEY_REQUEST.CREATE],
+        entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_CATEGORY, SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, SCREENS.MONEY_REQUEST.CREATE, SCREENS.SHARE.SUBMIT_DETAILS],
+        getRoute: (params: {action: IOUAction; iouType: IOUType; transactionID: string; reportID: string | undefined}) => getUrlWithParams('add-category', params),
+        queryParams: ['action', 'iouType', 'transactionID', 'reportID'],
     },
     MONEY_REQUEST_ATTENDEE: {
         path: 'attendees',
diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index e55d429e2959..1530ef768d14 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -59,6 +59,9 @@ type CategoryPickerModalProps = {
     /** Shows a header with an add button, for users who can add a category to the workspace */
     onAddCategory?: () => void;
 
+    /** Sentry label for the add button, so each caller's presses are attributed to it */
+    addCategorySentryLabel?: string;
+
     /** Whether the pop-over may flip to the other side of the anchor when it overflows. It shifts by a whole pop-over height, so a caller that already picked the side turns this off. */
     shouldSwitchPositionIfOverflow?: boolean;
 } & Omit<PopoverWithMeasuredContentProps, 'anchorRef' | 'children' | 'onClose'>;
@@ -77,6 +80,7 @@ function CategoryPickerModal({
     shouldFitContentHeight = false,
     shouldSwitchPositionIfOverflow = true,
     onAddCategory,
+    addCategorySentryLabel,
 }: CategoryPickerModalProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -136,7 +140,8 @@ function CategoryPickerModal({
                                 accessibilityLabel={translate('workspace.categories.addCategory')}
                                 role={CONST.ROLE.BUTTON}
                                 onPress={onAddCategory}
-                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.ADD_CATEGORY_BUTTON}
+                                style={styles.touchableButtonImage}
+                                sentryLabel={addCategorySentryLabel}
                             >
                                 <Icon
                                     src={icons.Plus}
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
index 3b10795901c6..581208a0bc1c 100644
--- a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
@@ -1,6 +1,7 @@
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -12,6 +13,9 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
+import {canCreateCategoryInSitu} from '@libs/PolicyUtils';
+
+import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
@@ -67,6 +71,7 @@ function CategoryField({
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['Sparkles']);
+    const currentUserLogin = useCurrentUserPersonalDetails().login;
 
     const categoryState = useTransactionSelector(transactionID, categoryStateSelector);
     const [hasEnabledCategories = false] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(policy?.id)}`, {selector: hasEnabledCategoriesSelector});
@@ -155,6 +160,7 @@ function CategoryField({
     const canUseAnchoredFieldDropdowns = isBetaEnabled(CONST.BETAS.ANCHORED_FIELD_DROPDOWNS);
     const shouldOpenInDropdown =
         canUseAnchoredFieldDropdowns && !!transactionID && !!policy && !shouldNavigateToUpgradePath && !shouldSelectPolicy && hasEnabledCategories && canSaveFromThisForm;
+    const canAddCategory = canCreateCategoryInSitu(policy, currentUserLogin);
 
     if (shouldUseDropdownRows) {
         return (
@@ -171,6 +177,7 @@ function CategoryField({
                 errorText={shouldDisplayCategoryError ? translate(formError as TranslationPaths) : ''}
                 onPress={openCategoryPage}
                 shouldOpenInDropdown={shouldOpenInDropdown && !isReadOnly && !didConfirm}
+                listHeaderHeight={canAddCategory ? variables.componentSizeNormal : 0}
                 renderDropdown={(dropdownProps) =>
                     !!transactionID && (
                         <CategoryFieldDropdown
@@ -178,6 +185,7 @@ function CategoryField({
                             transactionID={transactionID}
                             policy={policy}
                             selectedCategory={selectedCategory}
+                            canAddCategory={canAddCategory}
                         />
                     )
                 }
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
index d402ac95c099..e7e5eab40a76 100644
--- a/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
@@ -2,7 +2,6 @@ import CategoryPickerModal from '@components/CategoryPicker/CategoryPickerModal'
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import type {ListItem} from '@components/SelectionList/types';
 
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
 import useUpdateTransactionCategory from '@hooks/useUpdateTransactionCategory';
 
@@ -10,7 +9,6 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
-import {canCreateCategoryInSitu} from '@libs/PolicyUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -32,6 +30,9 @@ type CategoryFieldDropdownProps = ExpenseFieldDropdownRenderProps & {
 
     /** Category the expense already holds, so the list can mark it */
     selectedCategory: string;
+
+    /** Whether the user can add a category to the workspace from the list */
+    canAddCategory: boolean;
 };
 
 /**
@@ -39,9 +40,8 @@ type CategoryFieldDropdownProps = ExpenseFieldDropdownRenderProps & {
  * opened, keeping its Onyx subscriptions off the form's first render, and saves through the same hook the
  * full-page selector uses so both leave the expense in the same state.
  */
-function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose, ...popoverProps}: CategoryFieldDropdownProps) {
-    const {reportID, isEditingSplitBill, action} = useConfirmationFields();
-    const currentUserLogin = useCurrentUserPersonalDetails().login;
+function CategoryFieldDropdown({transactionID, policy, selectedCategory, canAddCategory, onClose, ...popoverProps}: CategoryFieldDropdownProps) {
+    const {reportID, isEditingSplitBill, action, iouType} = useConfirmationFields();
 
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
@@ -61,7 +61,7 @@ function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose
     const openAddCategory = () => {
         onClose();
         TransitionTracker.runAfterTransitions({
-            callback: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.path)),
+            callback: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.getRoute({action, iouType, transactionID, reportID}))),
             waitForUpcomingTransition: true,
         });
     };
@@ -79,7 +79,8 @@ function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose
             policyID={policy?.id}
             selectedCategory={selectedCategory}
             onSelected={handleSelected}
-            onAddCategory={canCreateCategoryInSitu(policy, currentUserLogin) ? openAddCategory : undefined}
+            onAddCategory={canAddCategory ? openAddCategory : undefined}
+            addCategorySentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.ADD_CATEGORY_BUTTON}
         />
     );
 }
diff --git a/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx
index 702258694444..9b5aee21acad 100644
--- a/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx
@@ -86,6 +86,9 @@ type ExpenseFieldDropdownProps = Omit<ExpenseFieldRowProps, 'onPress' | 'anchorR
 
     /** Opens the field's full-page selector, for every case `shouldOpenInDropdown` rules out */
     onPress: () => void;
+
+    /** Height of a header the list shows above its options, e.g. an add button, added to the container's limits so it still fits as many options */
+    listHeaderHeight?: number;
 };
 
 /**
@@ -95,7 +98,7 @@ type ExpenseFieldDropdownProps = Omit<ExpenseFieldRowProps, 'onPress' | 'anchorR
  * pop-over matches the row's width and opens below it, or above when there isn't room, capped so it is never
  * clipped. Knows nothing about any particular field: each passes its own list in through `renderDropdown`.
  */
-function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, ...rowProps}: ExpenseFieldDropdownProps) {
+function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, listHeaderHeight = 0, ...rowProps}: ExpenseFieldDropdownProps) {
     const {windowHeight} = useWindowDimensions();
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth -- must match PopoverWithMeasuredContent's dock decision, which is on isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
@@ -112,6 +115,9 @@ function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, ..
         shouldOpenAbove: false,
     });
 
+    const maxContainerHeight = MAX_CONTAINER_HEIGHT + listHeaderHeight;
+    const minUsableHeight = MIN_USABLE_HEIGHT + listHeaderHeight;
+
     const closeDropdown = () => setIsVisible(false);
 
     const openDropdown = () => {
@@ -124,10 +130,10 @@ function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, ..
         anchorRef.current?.measureInWindow((x, y, width, height) => {
             const spaceBelow = windowHeight - (y + height + CONTAINER_GAP);
             const spaceAbove = y - CONTAINER_GAP - (safeAreaTop + contentHeaderHeight);
-            const shouldOpenAbove = spaceBelow < MAX_CONTAINER_HEIGHT && spaceAbove > spaceBelow;
+            const shouldOpenAbove = spaceBelow < maxContainerHeight && spaceAbove > spaceBelow;
             const availableHeight = (shouldOpenAbove ? spaceAbove : spaceBelow) - CONTAINER_BORDER;
 
-            if (availableHeight < MIN_USABLE_HEIGHT) {
+            if (availableHeight < minUsableHeight) {
                 onPress();
                 return;
             }
@@ -136,7 +142,7 @@ function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, ..
                 horizontal: x,
                 vertical: shouldOpenAbove ? y - CONTAINER_GAP : y + height + CONTAINER_GAP,
                 width,
-                height: Math.min(MAX_CONTAINER_HEIGHT, availableHeight),
+                height: Math.min(maxContainerHeight, availableHeight),
                 shouldOpenAbove,
             });
             setHasEverOpened(true);
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
index e6b935ca4414..c41679493e04 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
@@ -110,7 +110,7 @@ function DynamicIOURequestStepCategory({
                       if (!policyID || !reportID) {
                           return;
                       }
-                      Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.path));
+                      Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.getRoute({action, iouType, transactionID, reportID})));
                   },
               },
           ]
diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index 64f68a6a689f..7d8bcdb97442 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -459,6 +459,15 @@ describe('PolicyUtils', () => {
             // Then it cannot, because a new category would have nowhere to show
             expect(canCreateCategoryInSitu(categoriesPolicy(CONST.POLICY.ROLE.ADMIN, false))).toBe(false);
         });
+
+        it('does not offer to add a category when the workspace syncs with an accounting integration', () => {
+            // Given an admin of a workspace whose categories come from an accounting integration
+            const policy = {...categoriesPolicy(CONST.POLICY.ROLE.ADMIN), connections: createMock<Connections>({[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {}})};
+
+            // When we check whether the category picker can offer to add one
+            // Then it cannot, because new categories have to be created in the integration
+            expect(canCreateCategoryInSitu(policy)).toBe(false);
+        });
     });
 
     describe('isArchivedPolicy', () => {
diff --git a/tests/unit/components/CategoryPickerModalTest.tsx b/tests/unit/components/CategoryPickerModalTest.tsx
index 8e3a034c7598..f9c9f6fddac0 100644
--- a/tests/unit/components/CategoryPickerModalTest.tsx
+++ b/tests/unit/components/CategoryPickerModalTest.tsx
@@ -43,12 +43,12 @@ describe('CategoryPickerModal', () => {
         // Given a user who can add categories to the workspace, as the full-page selector's "+" allows
         const onAddCategory = jest.fn();
         renderModal(onAddCategory);
+        expect(screen.getByText('common.category')).toBeOnTheScreen();
 
         // When they press the add button in the pop-over's header
         fireEvent.press(screen.getByLabelText('workspace.categories.addCategory'));
 
         // Then the pop-over hands over to the add-category flow, so the pop-over offers the same action the full page does
-        expect(screen.getByText('common.category')).toBeOnTheScreen();
         expect(onAddCategory).toHaveBeenCalledTimes(1);
     });
 
diff --git a/tests/unit/components/ExpenseFieldDropdown.test.tsx b/tests/unit/components/ExpenseFieldDropdown.test.tsx
index edc22989b19e..06a519d6e1fb 100644
--- a/tests/unit/components/ExpenseFieldDropdown.test.tsx
+++ b/tests/unit/components/ExpenseFieldDropdown.test.tsx
@@ -4,6 +4,8 @@ import type {ExpenseFieldDropdownRenderProps} from '@components/MoneyRequestConf
 import ExpenseFieldDropdown from '@components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown';
 import Text from '@components/Text';
 
+import getSelectionListPopoverContentHeight from '@libs/getSelectionListPopoverContentHeight';
+
 import variables from '@styles/variables';
 
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -74,7 +76,7 @@ describe('ExpenseFieldDropdown', () => {
         jest.restoreAllMocks();
     });
 
-    const renderField = (shouldOpenInDropdown = true, onPress: () => void = jest.fn()) =>
+    const renderField = (shouldOpenInDropdown = true, onPress: () => void = jest.fn(), listHeaderHeight?: number) =>
         render(
             <ExpenseFieldDropdown
                 name={FIELD_NAME}
@@ -82,9 +84,41 @@ describe('ExpenseFieldDropdown', () => {
                 shouldOpenInDropdown={shouldOpenInDropdown}
                 onPress={onPress}
                 renderDropdown={renderDropdown}
+                listHeaderHeight={listHeaderHeight}
             />,
         );
 
+    describe('with a header above the list', () => {
+        const HEADER_HEIGHT = variables.componentSizeNormal;
+
+        it('grows the container by the header so it still fits as many options', () => {
+            // Given a row with plenty of room below, whose list shows a header above its options
+            mockRowAt(ROW_TOP);
+            renderField(true, jest.fn(), HEADER_HEIGHT);
+
+            // When the row is pressed
+            act(() => pressRow());
+
+            // Then the container is taller by the header, so the header doesn't take the place of an option
+            expect(renderedProps?.popoverHeight).toBe(getSelectionListPopoverContentHeight({optionCount: 4}) + HEADER_HEIGHT);
+        });
+
+        it('falls back to the full page when the room left fits one option but not the header too', () => {
+            // Given a row with room below for one option, but not for one option and the header
+            const onPress = jest.fn();
+            mockWindowHeight = ROW_TOP + ROW_HEIGHT + 6 + getSelectionListPopoverContentHeight({optionCount: 1}) + HEADER_HEIGHT / 2;
+            mockRowAt(ROW_TOP);
+            renderField(true, onPress, HEADER_HEIGHT);
+
+            // When the row is pressed
+            act(() => pressRow());
+
+            // Then it opens the page, rather than a container showing the header and no categories
+            expect(onPress).toHaveBeenCalledTimes(1);
+            expect(renderCount).toBe(0);
+        });
+    });
+
     it('does not mount the list until the row is pressed', () => {
         // Given a field whose list opens in the container anchored to the row
         mockRowAt(ROW_TOP);
diff --git a/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
new file mode 100644
index 000000000000..b0a66555d698
--- /dev/null
+++ b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
@@ -0,0 +1,124 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFields/Provider';
+import CategoryFieldDropdown from '@components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown';
+
+import Navigation from '@libs/Navigation/Navigation';
+import type {CancelHandle} from '@libs/Navigation/TransitionTracker';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../../../utils/collections/policies';
+import waitForBatchedUpdates from '../../../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../../../utils/waitForBatchedUpdatesWithAct';
+
+const mockCallOrder: string[] = [];
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(() => mockCallOrder.push('navigate')),
+}));
+
+// Holds the post-transition work until the test runs it, standing in for the pop-over finishing its close.
+let mockRunPendingTransition: (() => void) | undefined;
+jest.mock('@libs/Navigation/TransitionTracker', () => ({
+    runAfterTransitions: ({callback}: {callback: () => void}): CancelHandle => {
+        mockRunPendingTransition = callback;
+        return {cancel: () => {}};
+    },
+}));
+
+jest.mock('@hooks/useUpdateTransactionCategory', () => () => ({updateCategory: jest.fn()}));
+
+jest.mock('@components/CategoryPicker/CategoryPickerModal', () => {
+    const {Pressable, Text} =
+        jest.requireActual<Record<'Pressable' | 'Text', React.ComponentType<{children?: React.ReactNode; onPress?: () => void; accessibilityLabel?: string}>>>('react-native');
+    return ({onAddCategory}: {onAddCategory?: () => void}) =>
+        onAddCategory ? (
+            <Pressable
+                accessibilityLabel="addCategory"
+                onPress={onAddCategory}
+            >
+                <Text>addCategory</Text>
+            </Pressable>
+        ) : null;
+});
+
+const TRANSACTION_ID = '1';
+const REPORT_ID = 'reportID';
+
+const renderDropdown = (onClose: () => void, canAddCategory = true) =>
+    render(
+        <ConfirmationFieldsProvider
+            transactionID={TRANSACTION_ID}
+            reportID={REPORT_ID}
+            action={CONST.IOU.ACTION.CREATE}
+            iouType={CONST.IOU.TYPE.SUBMIT}
+        >
+            <CategoryFieldDropdown
+                isVisible
+                onClose={onClose}
+                anchorPosition={{horizontal: 0, vertical: 0}}
+                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                shouldMeasureAnchorPositionFromTop
+                shouldSwitchPositionIfOverflow={false}
+                popoverWidth={CONST.POPOVER_DROPDOWN_WIDTH}
+                popoverHeight={CONST.POPOVER_DROPDOWN_MAX_HEIGHT}
+                transactionID={TRANSACTION_ID}
+                policy={createRandomPolicy(1)}
+                selectedCategory=""
+                canAddCategory={canAddCategory}
+            />
+        </ConfirmationFieldsProvider>,
+    );
+
+describe('CategoryFieldDropdown', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        mockCallOrder.length = 0;
+        mockRunPendingTransition = undefined;
+        jest.clearAllMocks();
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('closes the pop-over before opening the add-category page', async () => {
+        // Given an admin with the category pop-over open
+        const onClose = jest.fn(() => mockCallOrder.push('close'));
+        renderDropdown(onClose);
+        await waitForBatchedUpdatesWithAct();
+
+        // When they press the add button
+        fireEvent.press(screen.getByLabelText('addCategory'));
+
+        // Then the pop-over closes and nothing navigates until its close transition ends, since navigating while the
+        // modal is still up gets dropped on iOS
+        expect(onClose).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+
+        mockRunPendingTransition?.();
+
+        // And only then the add-category page opens, carrying the expense it belongs to
+        expect(mockCallOrder).toEqual(['close', 'navigate']);
+        const route = jest.mocked(Navigation.navigate).mock.calls.at(0)?.at(0);
+        expect(route).toContain('add-category');
+        expect(route).toContain(`transactionID=${TRANSACTION_ID}`);
+        expect(route).toContain(`reportID=${REPORT_ID}`);
+    });
+
+    it('offers no add button when the user cannot add a category', async () => {
+        // Given a user who cannot add categories to the workspace
+        // When the pop-over opens
+        renderDropdown(jest.fn(), false);
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it has no add button, so the user can only pick from the existing categories
+        expect(screen.queryByLabelText('addCategory')).toBeNull();
+    });
+});

From 7dacbabb366414fd5e55258ef308994491bdae3f Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 8 Oct 2026 16:32:14 +0700
Subject: [PATCH 336/781] address comment

---
 src/components/CategoryPicker/CategoryPickerModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index 1530ef768d14..7e0837a5f61d 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -133,14 +133,14 @@ function CategoryPickerModal({
         >
             <View style={[StyleUtils.getHeight(popoverDimensions.height), styles.flexColumn, styles.pt4]}>
                 {!!onAddCategory && (
-                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, StyleUtils.getHeight(headerHeight)]}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.pb5, StyleUtils.getHeight(headerHeight)]}>
                         <Text style={styles.textLabelSupporting}>{translate('common.category')}</Text>
                         <Tooltip text={translate('workspace.categories.addCategory')}>
                             <PressableWithFeedback
                                 accessibilityLabel={translate('workspace.categories.addCategory')}
                                 role={CONST.ROLE.BUTTON}
                                 onPress={onAddCategory}
-                                style={styles.touchableButtonImage}
+                                shouldUseAutoHitSlop
                                 sentryLabel={addCategorySentryLabel}
                             >
                                 <Icon

From 8d7cae6511b0c6aa76d9901503541e57dc9b945d Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 8 Oct 2026 09:59:35 +0000
Subject: [PATCH 337/781] Keep the time picker Save button visible in landscape
 mode

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/components/TimePicker/TimePicker.tsx | 213 ++++++++++++++---------
 tests/ui/components/TimePickerTest.tsx   |  29 ++-
 2 files changed, 154 insertions(+), 88 deletions(-)

diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx
index 22725c72cd83..3e027311d873 100644
--- a/src/components/TimePicker/TimePicker.tsx
+++ b/src/components/TimePicker/TimePicker.tsx
@@ -2,6 +2,7 @@ import AmountTextInput from '@components/AmountTextInput';
 import BigNumberPad from '@components/BigNumberPad';
 import Button from '@components/Button';
 import FormHelpMessage from '@components/FormHelpMessage';
+import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
@@ -735,117 +736,163 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
         </View>
     );
 
-    return (
-        <View style={styles.flex1}>
-            <View style={[styles.flex1, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                <View
-                    nativeID={AMOUNT_VIEW_ID}
-                    style={[styles.flexRow, !isInLandscapeMode && styles.w100, styles.justifyContentCenter, styles.timePickerInputsContainer, styles.mb2]}
-                >
+    const renderedInputs = (
+        <View
+            nativeID={AMOUNT_VIEW_ID}
+            style={[styles.flexRow, !isInLandscapeMode && styles.w100, styles.justifyContentCenter, styles.timePickerInputsContainer, styles.mb2]}
+        >
+            <AmountTextInput
+                placeholder={numberFormat(0)}
+                formattedAmount={hours}
+                onKeyPress={(e) => {
+                    lastPressedKey.current = e.nativeEvent.key;
+                }}
+                onChangeAmount={handleHourChange}
+                ref={(textInputRef) => {
+                    hourInputRef.current = textInputRef as TextInput | null;
+                }}
+                onSelectionChange={(e) => {
+                    setSelectionHour(e.nativeEvent.selection);
+                }}
+                style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
+                containerStyle={[styles.iouAmountTextInputContainer]}
+                touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
+                selection={selectionHour}
+                testID="hourInput"
+            />
+            <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
+            <AmountTextInput
+                placeholder={numberFormat(0)}
+                formattedAmount={minutes}
+                onKeyPress={(e) => {
+                    lastPressedKey.current = e.nativeEvent.key;
+                    handleFocusOnBackspace(e);
+                }}
+                onChangeAmount={handleMinutesChange}
+                ref={(textInputRef) => {
+                    minuteInputRef.current = textInputRef as TextInput | null;
+                    if (!showFullFormat) {
+                        inputCallbackRef(textInputRef as TextInput | null);
+                    }
+                }}
+                onSelectionChange={(e) => {
+                    setSelectionMinute(e.nativeEvent.selection);
+                }}
+                style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
+                containerStyle={[styles.iouAmountTextInputContainer]}
+                touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
+                selection={selectionMinute}
+                testID="minuteInput"
+            />
+            {showFullFormat && (
+                <>
+                    <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
                     <AmountTextInput
                         placeholder={numberFormat(0)}
-                        formattedAmount={hours}
+                        formattedAmount={seconds}
                         onKeyPress={(e) => {
                             lastPressedKey.current = e.nativeEvent.key;
+                            handleFocusOnBackspace(e);
                         }}
-                        onChangeAmount={handleHourChange}
+                        onChangeAmount={handleSecondsChange}
                         ref={(textInputRef) => {
-                            hourInputRef.current = textInputRef as TextInput | null;
+                            secondInputRef.current = textInputRef as TextInput | null;
                         }}
                         onSelectionChange={(e) => {
-                            setSelectionHour(e.nativeEvent.selection);
+                            setSelectionSecond(e.nativeEvent.selection);
                         }}
                         style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
                         containerStyle={[styles.iouAmountTextInputContainer]}
                         touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
-                        selection={selectionHour}
-                        testID="hourInput"
+                        selection={selectionSecond}
+                        testID="secondInput"
                     />
                     <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
                     <AmountTextInput
                         placeholder={numberFormat(0)}
-                        formattedAmount={minutes}
+                        formattedAmount={milliseconds}
                         onKeyPress={(e) => {
                             lastPressedKey.current = e.nativeEvent.key;
                             handleFocusOnBackspace(e);
                         }}
-                        onChangeAmount={handleMinutesChange}
+                        onChangeAmount={handleMillisecondsChange}
                         ref={(textInputRef) => {
-                            minuteInputRef.current = textInputRef as TextInput | null;
-                            if (!showFullFormat) {
+                            millisecondInputRef.current = textInputRef as TextInput | null;
+                            if (showFullFormat) {
                                 inputCallbackRef(textInputRef as TextInput | null);
                             }
                         }}
                         onSelectionChange={(e) => {
-                            setSelectionMinute(e.nativeEvent.selection);
+                            setSelectionMillisecond(e.nativeEvent.selection);
                         }}
                         style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
                         containerStyle={[styles.iouAmountTextInputContainer]}
                         touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
-                        selection={selectionMinute}
-                        testID="minuteInput"
+                        selection={selectionMillisecond}
+                        testID="millisecondInput"
                     />
-                    {showFullFormat && (
-                        <>
-                            <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
-                            <AmountTextInput
-                                placeholder={numberFormat(0)}
-                                formattedAmount={seconds}
-                                onKeyPress={(e) => {
-                                    lastPressedKey.current = e.nativeEvent.key;
-                                    handleFocusOnBackspace(e);
-                                }}
-                                onChangeAmount={handleSecondsChange}
-                                ref={(textInputRef) => {
-                                    secondInputRef.current = textInputRef as TextInput | null;
-                                }}
-                                onSelectionChange={(e) => {
-                                    setSelectionSecond(e.nativeEvent.selection);
-                                }}
-                                style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
-                                containerStyle={[styles.iouAmountTextInputContainer]}
-                                touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
-                                selection={selectionSecond}
-                                testID="secondInput"
-                            />
-                            <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
-                            <AmountTextInput
-                                placeholder={numberFormat(0)}
-                                formattedAmount={milliseconds}
-                                onKeyPress={(e) => {
-                                    lastPressedKey.current = e.nativeEvent.key;
-                                    handleFocusOnBackspace(e);
-                                }}
-                                onChangeAmount={handleMillisecondsChange}
-                                ref={(textInputRef) => {
-                                    millisecondInputRef.current = textInputRef as TextInput | null;
-                                    if (showFullFormat) {
-                                        inputCallbackRef(textInputRef as TextInput | null);
-                                    }
-                                }}
-                                onSelectionChange={(e) => {
-                                    setSelectionMillisecond(e.nativeEvent.selection);
-                                }}
-                                style={[styles.iouAmountTextInput, styles.timePickerInput, showFullFormat && [styles.textXXLarge, styles.mnw0]]}
-                                containerStyle={[styles.iouAmountTextInputContainer]}
-                                touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
-                                selection={selectionMillisecond}
-                                testID="millisecondInput"
-                            />
-                        </>
+                </>
+            )}
+        </View>
+    );
+
+    const renderedErrorMessage = isError ? (
+        <FormHelpMessage
+            isError={isError}
+            message={errorMessage}
+            style={[styles.ph5, styles.formHelperMessage, canUseTouchScreen && styles.mb5]}
+        />
+    ) : (
+        <View style={[styles.formHelperMessage, canUseTouchScreen && styles.mb5]} />
+    );
+
+    const renderedSaveButton = (
+        <Button
+            variant={CONST.BUTTON_VARIANT.SUCCESS}
+            size={isExtraSmallScreenHeight ? CONST.BUTTON_SIZE.MEDIUM : CONST.BUTTON_SIZE.LARGE}
+            style={[styles.mb5, styles.mh5]}
+            onPress={handleSubmit}
+        >
+            <Button.KeyboardShortcut />
+            <Button.Text>{translate('common.save')}</Button.Text>
+        </Button>
+    );
+
+    // In landscape there isn't enough height to stack the inputs, number pad and Save button, so place the inputs next to
+    // the number pad inside a ScrollView and keep the Save button pinned below it.
+    if (isInLandscapeMode) {
+        return (
+            <View style={styles.flex1}>
+                <ScrollView
+                    contentContainerStyle={[styles.flexGrow1, styles.flexRow]}
+                    style={[styles.flex1, styles.ph5]}
+                >
+                    <View style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.numberWithSymbolFormInputContainerLandscape]}>
+                        {renderedInputs}
+                        {renderedErrorMessage}
+                        {renderedAmPmButtons}
+                    </View>
+                    {canUseTouchScreen && (
+                        <View
+                            style={[styles.flex1, styles.justifyContentCenter]}
+                            nativeID={NUM_PAD_CONTAINER_VIEW_ID}
+                        >
+                            {numberPad()}
+                        </View>
                     )}
-                </View>
+                </ScrollView>
+                {renderedSaveButton}
+            </View>
+        );
+    }
+
+    return (
+        <View style={styles.flex1}>
+            <View style={[styles.flex1, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
+                {renderedInputs}
                 {!canUseTouchScreen && renderedAmPmButtons}
             </View>
-            {isError ? (
-                <FormHelpMessage
-                    isError={isError}
-                    message={errorMessage}
-                    style={[styles.ph5, styles.formHelperMessage, canUseTouchScreen && styles.mb5]}
-                />
-            ) : (
-                <View style={[styles.formHelperMessage, canUseTouchScreen && styles.mb5]} />
-            )}
+            {renderedErrorMessage}
             {canUseTouchScreen && renderedAmPmButtons}
             <View
                 style={[styles.numberPadWrapper, styles.pb4]}
@@ -853,15 +900,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
             >
                 {numberPad()}
             </View>
-            <Button
-                variant={CONST.BUTTON_VARIANT.SUCCESS}
-                size={isExtraSmallScreenHeight ? CONST.BUTTON_SIZE.MEDIUM : CONST.BUTTON_SIZE.LARGE}
-                style={[styles.mb5, styles.mh5]}
-                onPress={handleSubmit}
-            >
-                <Button.KeyboardShortcut />
-                <Button.Text>{translate('common.save')}</Button.Text>
-            </Button>
+            {renderedSaveButton}
         </View>
     );
 }
diff --git a/tests/ui/components/TimePickerTest.tsx b/tests/ui/components/TimePickerTest.tsx
index 47b162d66d10..ede337599b00 100644
--- a/tests/ui/components/TimePickerTest.tsx
+++ b/tests/ui/components/TimePickerTest.tsx
@@ -1,7 +1,12 @@
-import {fireEvent, render, screen} from '@testing-library/react-native';
+import {fireEvent, render, screen, within} from '@testing-library/react-native';
+
+import ScrollView from '@components/ScrollView';
+
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import TimePicker from '@src/components/TimePicker/TimePicker';
 import type {TimePickerProps} from '@src/components/TimePicker/TimePicker';
+import CONST from '@src/CONST';
 
 import type {ComponentRef, Ref} from 'react';
 import type {TextInput, TextInputProps} from 'react-native';
@@ -11,6 +16,10 @@ import React, {act} from 'react';
 
 import mockCreateMock from '../../utils/createMock';
 
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn());
+
+const mockUseResponsiveLayout = jest.mocked(useResponsiveLayout);
+
 // Store mocked inputs by testID so we can access them in tests
 const mockInputs: Record<string, ComponentRef<typeof TextInput>> = {};
 
@@ -73,6 +82,10 @@ describe('TimePicker Component', () => {
             </NavigationContainer>,
         );
 
+    beforeEach(() => {
+        mockUseResponsiveLayout.mockReturnValue(CONST.NAVIGATION_TESTS.DEFAULT_USE_RESPONSIVE_LAYOUT_VALUE);
+    });
+
     afterEach(() => {
         jest.clearAllMocks();
         // Clear stored mock inputs
@@ -145,4 +158,18 @@ describe('TimePicker Component', () => {
             pressBackspaceAndExpect({hours: '00', minutes: '00'});
         });
     });
+
+    it('keeps the Save button outside the scrollable area in landscape mode', () => {
+        // Given a landscape screen, which is too short to stack the inputs, number pad and Save button
+        mockUseResponsiveLayout.mockReturnValue({...CONST.NAVIGATION_TESTS.DEFAULT_USE_RESPONSIVE_LAYOUT_VALUE, isInLandscapeMode: true});
+
+        // When the time picker is rendered
+        renderTimePicker({defaultValue: '2025-01-01 12:34 AM'});
+
+        // Then the number pad sits in a scrollable area and the Save button stays pinned outside it, so it is never pushed off-screen
+        const scrollView = screen.UNSAFE_getByType(ScrollView);
+        expect(within(scrollView).getByTestId('button_<')).toBeOnTheScreen();
+        // The Save button is the only button rendered outside the scrollable area
+        expect(screen.getAllByRole('button')).toHaveLength(within(scrollView).getAllByRole('button').length + 1);
+    });
 });

From fa85fbad5d9afe258fd8e23c0a7ddab51f191e1b Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Thu, 8 Oct 2026 11:05:47 +0000
Subject: [PATCH 338/781] Remove unreachable reportID guard and scope merge
 list Onyx subscriptions

- Drop the redundant !transaction.reportID check in getTransactionsForMergingLocally; the unreported branch above handles it.
- Use selectors for POLICY and REPORT in MergeTransactionsListContent so the list only keeps fields used by merge eligibility.
---
 src/libs/actions/MergeTransaction.ts          |  4 --
 .../MergeTransactionsListContent.tsx          | 38 ++++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index 144bcc53e1cf..852545eaf9d8 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -223,10 +223,6 @@ function getTransactionsForMergingLocally(
             return areTransactionsEligibleForMerge(targetTransaction, transaction) && !isTransactionPendingDelete(transaction);
         }
 
-        if (!transaction.reportID) {
-            return false;
-        }
-
         // Resolve admin status against the candidate’s own workspace. If the policy is absent from
         // the local cache we cannot verify access, so we exclude the candidate rather than assuming
         // admin rights.
diff --git a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
index 7d6ebff95da4..6e1a992d249e 100644
--- a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
@@ -23,12 +23,12 @@ import {getAmount, getCreated, getCurrency, getDescription, getMerchant, isExpen
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {MergeTransaction} from '@src/types/onyx';
+import type {MergeTransaction, Policy, Report} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
-import React, {useEffect} from 'react';
+import React, {useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 
 import type {MergeTransactionListItemType} from './MergeTransactionItem';
@@ -40,6 +40,22 @@ type MergeTransactionsListContentProps = {
     mergeTransaction: OnyxEntry<MergeTransaction>;
 };
 
+const reportsSelector = (reports: OnyxCollection<Report>): OnyxCollection<Report> =>
+    Object.fromEntries(
+        Object.entries(reports ?? {}).map(([key, report]) => [
+            key,
+            report && {
+                reportID: report.reportID,
+                type: report.type,
+                policyID: report.policyID,
+                ownerAccountID: report.ownerAccountID,
+                managerID: report.managerID,
+                stateNum: report.stateNum,
+                statusNum: report.statusNum,
+            },
+        ]),
+    ) as OnyxCollection<Report>;
+
 function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTransactionsListContentProps) {
     const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']);
     const {translate, localeCompare} = useLocalize();
@@ -51,8 +67,20 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
     const currentUserLogin = session?.email;
     const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
-    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
+    const policiesSelector = useCallback(
+        (policies: OnyxCollection<Policy>): OnyxCollection<Policy> =>
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only the fields used by the admin check are kept
+            Object.fromEntries(
+                Object.entries(policies ?? {}).map(([key, policy]) => {
+                    const login = currentUserLogin ?? '';
+                    const employee = policy?.employeeList?.[login] ?? policy?.employeeList?.[login.toLowerCase()];
+                    return [key, policy && {id: policy.id, role: policy.role, employeeList: employee ? {[login]: employee} : undefined}];
+                }),
+            ) as OnyxCollection<Policy>,
+        [currentUserLogin],
+    );
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policiesSelector});
+    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: reportsSelector});
     const {isOffline} = useNetwork();
     const {convertToDisplayString, getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
 

From ba5e4d7e6cfd6da3d274aa8004ba8e65ad5cbd6f Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 12:29:23 +0100
Subject: [PATCH 339/781] add routing for WorkspaceAgentsPage

---
 src/CONST/index.ts                                       | 2 ++
 src/ROUTES.ts                                            | 9 +++++++++
 src/SCREENS.ts                                           | 1 +
 src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts | 1 +
 src/languages/en.ts                                      | 4 ++++
 .../AppNavigator/Navigators/WorkspaceSplitNavigator.tsx  | 1 +
 .../linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts          | 1 +
 src/libs/Navigation/linkingConfig/config.ts              | 3 +++
 src/libs/Navigation/types.ts                             | 3 +++
 src/pages/workspace/WorkspaceAgentsPage.tsx              | 0
 src/pages/workspace/getWorkspaceMenuItems.ts             | 7 +++++++
 tests/unit/getWorkspaceMenuItemsTest.ts                  | 2 ++
 12 files changed, 34 insertions(+)
 create mode 100644 src/pages/workspace/WorkspaceAgentsPage.tsx

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 41376e1a296a..f44efd8e17bf 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1162,6 +1162,7 @@ const CONST = {
         INSIGHTS_COMPARE: 'insightsCompare',
         PAYMENT_HISTORY: 'paymentHistory',
         ANCHORED_FIELD_DROPDOWNS: 'anchoredFieldDropdowns',
+        COMPANY_AGENTS: 'companyAgents',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -9883,6 +9884,7 @@ const CONST = {
             INITIAL: {
                 PROFILE: 'WorkspaceInitial-Profile',
                 MEMBERS: 'WorkspaceInitial-Members',
+                AGENTS: 'WorkspaceInitial-Agents',
                 ROOMS: 'WorkspaceInitial-Rooms',
                 REPORTS: 'WorkspaceInitial-Reports',
                 ACCOUNTING: 'WorkspaceInitial-Accounting',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 5ffce14a9771..61b640952260 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -3436,6 +3436,15 @@ const ROUTES = {
             return `workspaces/${policyID}/members` as const;
         },
     },
+    WORKSPACE_AGENTS: {
+        route: 'workspaces/:policyID/agents',
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_AGENTS route');
+            }
+            return `workspaces/${policyID}/agents` as const;
+        },
+    },
     WORKSPACE_ROOMS: {
         route: 'workspaces/:policyID/rooms',
         getRoute: (policyID: string | undefined) => {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 6c4b3ee4375f..5aaa0493fc58 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -851,6 +851,7 @@ const SCREENS = {
         DYNAMIC_INVOICE_FIELDS_INITIAL_LIST_VALUE: 'Dynamic_Invoice_Fields_Initial_List_Value',
         INVOICE_FIELDS_TYPE_SELECTOR: 'Workspace_InvoiceFields_TypeSelector',
         MEMBERS: 'Workspace_Members',
+        AGENTS: 'Workspace_Agents',
         ROOMS: 'Workspace_Rooms',
         ROOM_CREATE: 'Workspace_Room_Create',
         MEMBERS_IMPORT: 'Members_Import',
diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
index 9d62d4bc70d3..46def4936d45 100644
--- a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
+++ b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
@@ -24,6 +24,7 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
     SCREENS.WORKSPACE.WORKFLOWS,
     SCREENS.WORKSPACE.INVOICES,
     SCREENS.WORKSPACE.MEMBERS,
+    SCREENS.WORKSPACE.AGENTS,
     SCREENS.WORKSPACE.HR,
     SCREENS.WORKSPACE.RECRUITING,
     SCREENS.WORKSPACE.CATEGORIES,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index da4c1455f16c..ef309fef1d91 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5128,6 +5128,10 @@ const translations = {
             title: "You've created a workspace for your client!",
             description: 'Great news 🎉. Reach out to us if they need any help with the setup.',
         },
+        agents: {
+            title: 'Agents',
+            subtitle: `<muted-text>Agents handle your workflows for you, so you get hours back in your day. <a href="${CONST.CUSTOM_AGENTS_HELP_URL}">Learn more</a>.</muted-text>`,
+        },
         mcp: {
             connectors: 'Connectors',
             connectorsSubtitle: 'Connect an AI assistant to your Expensify account.',
diff --git a/src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx
index b016c03f4ffa..a7d86b4901c6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx
@@ -23,6 +23,7 @@ const CENTRAL_PANE_WORKSPACE_SCREENS = {
     [SCREENS.WORKSPACE.WORKFLOWS]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceWorkflowsPageRevamp').default,
     [SCREENS.WORKSPACE.INVOICES]: () => require<ReactComponentModule>('../../../../pages/workspace/invoices/WorkspaceInvoicesPage').default,
     [SCREENS.WORKSPACE.MEMBERS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceMembersPage').default,
+    [SCREENS.WORKSPACE.AGENTS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceAgentsPage').default,
     [SCREENS.WORKSPACE.ROOMS]: () => require<ReactComponentModule>('../../../../pages/workspace/rooms/WorkspaceRoomsPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/PolicyAccountingPage').default,
     [SCREENS.WORKSPACE.HR]: () => require<ReactComponentModule>('../../../../pages/workspace/hr/WorkspaceHRPage').default,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
index e827c9827c03..7b2a3d5e20c2 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
@@ -32,6 +32,7 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
         // would make getMatchingFullScreenRoute resolve that pane before reaching the dynamic base-path branch,
         // forcing Members underneath even when opened from Workflows. Leaving it out lets the base path decide.
     ],
+    [SCREENS.WORKSPACE.AGENTS]: [],
     [SCREENS.WORKSPACE.ROOMS]: [SCREENS.WORKSPACE.ROOM_CREATE],
     [SCREENS.WORKSPACE.WORKFLOWS]: [
         SCREENS.WORKSPACE.WORKFLOWS_IMPORT,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 758ac63789bf..7c1b31d60921 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -2490,6 +2490,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                                 [SCREENS.WORKSPACE.MEMBERS]: {
                                     path: ROUTES.WORKSPACE_MEMBERS.route,
                                 },
+                                [SCREENS.WORKSPACE.AGENTS]: {
+                                    path: ROUTES.WORKSPACE_AGENTS.route,
+                                },
                                 [SCREENS.WORKSPACE.ROOMS]: {
                                     path: ROUTES.WORKSPACE_ROOMS.route,
                                 },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 582270dda549..ea5a2ed9e9be 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -3291,6 +3291,9 @@ type WorkspaceSplitNavigatorParamList = {
     [SCREENS.WORKSPACE.MEMBERS]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.AGENTS]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ROOMS]: {
         policyID: string;
     };
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/pages/workspace/getWorkspaceMenuItems.ts b/src/pages/workspace/getWorkspaceMenuItems.ts
index 1f80a8a00759..6b3b43a7f65a 100644
--- a/src/pages/workspace/getWorkspaceMenuItems.ts
+++ b/src/pages/workspace/getWorkspaceMenuItems.ts
@@ -210,6 +210,13 @@ function getWorkspaceMenuItems({
             screenName: SCREENS.WORKSPACE.MEMBERS,
             sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.MEMBERS,
         },
+        {
+            translationKey: 'workspace.agents.title',
+            icon: icons.Bot,
+            getRoute: () => ROUTES.WORKSPACE_AGENTS.getRoute(policyID),
+            screenName: SCREENS.WORKSPACE.AGENTS,
+            sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.AGENTS,
+        },
         {
             translationKey: 'workspace.common.rooms',
             icon: icons.Hashtag,
diff --git a/tests/unit/getWorkspaceMenuItemsTest.ts b/tests/unit/getWorkspaceMenuItemsTest.ts
index 0be6c2a0dfd0..3f6e1c3bade4 100644
--- a/tests/unit/getWorkspaceMenuItemsTest.ts
+++ b/tests/unit/getWorkspaceMenuItemsTest.ts
@@ -535,6 +535,7 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.map((item) => item.getRoute())).toEqual([
             ROUTES.WORKSPACE_OVERVIEW.getRoute(policy.id),
             ROUTES.WORKSPACE_MEMBERS.getRoute(policy.id),
+            ROUTES.WORKSPACE_AGENTS.getRoute(policy.id),
             ROUTES.WORKSPACE_ROOMS.getRoute(policy.id),
             ROUTES.WORKSPACE_REPORTS.getRoute(policy.id),
             ROUTES.POLICY_ACCOUNTING.getRoute(policy.id),
@@ -560,6 +561,7 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.map((item) => item.screenName)).toEqual([
             SCREENS.WORKSPACE.PROFILE,
             SCREENS.WORKSPACE.MEMBERS,
+            SCREENS.WORKSPACE.AGENTS,
             SCREENS.WORKSPACE.ROOMS,
             SCREENS.WORKSPACE.REPORTS,
             SCREENS.WORKSPACE.ACCOUNTING.ROOT,

From ff4aba72bbabd3a35f328eeaea41610e7a9bbd79 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 12:43:11 +0100
Subject: [PATCH 340/781] lock company agents behind beta

---
 .../SearchRouter/useNavigationSuggestions.tsx |  5 +++++
 src/pages/workspace/WorkspaceInitialPage.tsx  |  1 +
 src/pages/workspace/getWorkspaceMenuItems.ts  | 21 ++++++++++++-------
 tests/unit/SearchRouterNavigationTest.ts      |  1 +
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/Search/SearchRouter/useNavigationSuggestions.tsx b/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
index 17f778062bce..fadb7cd287ba 100644
--- a/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
+++ b/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
@@ -143,6 +143,9 @@ type BuildWorkspaceNavigationItemsParams = {
     /** Whether the Merge ATS beta gating the Recruiting feature is enabled. */
     isRecruitingBetaEnabled: boolean;
 
+    /** Whether the company agents beta is enabled. */
+    isCompanyAgentsBetaEnabled: boolean;
+
     /** Whether navigation should use the narrow-layout Workspace flow. */
     shouldUseNarrowLayout: boolean;
 
@@ -291,6 +294,7 @@ function buildWorkspaceNavigationItems({
     isOffline,
     isVendorMatchingBetaEnabled,
     isRecruitingBetaEnabled,
+    isCompanyAgentsBetaEnabled,
     shouldUseNarrowLayout,
     convertToDisplayString,
     getItemText,
@@ -441,6 +445,7 @@ function useNavigationSuggestions(query: string, shouldWatchForApprovals = true)
         isOffline: !!isOffline,
         isVendorMatchingBetaEnabled: isBetaEnabled(CONST.BETAS.VENDOR_MATCHING),
         isRecruitingBetaEnabled: isBetaEnabled(CONST.BETAS.MERGE_ATS),
+        isCompanyAgentsBetaEnabled: isBetaEnabled(CONST.BETAS.COMPANY_AGENTS),
         shouldUseNarrowLayout,
         convertToDisplayString,
         getItemText: (item) => translate(item.translationKey),
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 2f252c1f6a59..63a438353ebd 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -192,6 +192,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         shouldShowRBR,
         isVendorMatchingBetaEnabled: isBetaEnabled(CONST.BETAS.VENDOR_MATCHING),
         isRecruitingBetaEnabled: isBetaEnabled(CONST.BETAS.MERGE_ATS),
+        isCompanyAgentsBetaEnabled: isBetaEnabled(CONST.BETAS.COMPANY_AGENTS),
         convertToDisplayString,
     }).map((item) => ({
         ...item,
diff --git a/src/pages/workspace/getWorkspaceMenuItems.ts b/src/pages/workspace/getWorkspaceMenuItems.ts
index 6b3b43a7f65a..8804a3a985ee 100644
--- a/src/pages/workspace/getWorkspaceMenuItems.ts
+++ b/src/pages/workspace/getWorkspaceMenuItems.ts
@@ -113,6 +113,8 @@ type GetWorkspaceMenuItemsParams = {
     isVendorMatchingBetaEnabled?: boolean;
     /** Whether the Merge ATS beta gating the Recruiting feature is enabled. */
     isRecruitingBetaEnabled?: boolean;
+    /** Whether the company agents beta is enabled. */
+    isCompanyAgentsBetaEnabled?: boolean;
     /** Formats the invoice account balance for its menu badge. */
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
 };
@@ -130,6 +132,7 @@ function getWorkspaceMenuItems({
     shouldShowRBR = false,
     isVendorMatchingBetaEnabled = false,
     isRecruitingBetaEnabled = false,
+    isCompanyAgentsBetaEnabled = false,
     convertToDisplayString,
 }: GetWorkspaceMenuItemsParams): WorkspaceMenuItem[] {
     const canReadPolicyFeature = (policyFeature: PolicyFeature) => canMemberRead(policy, currentUserLogin ?? '', policyFeature);
@@ -210,13 +213,6 @@ function getWorkspaceMenuItems({
             screenName: SCREENS.WORKSPACE.MEMBERS,
             sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.MEMBERS,
         },
-        {
-            translationKey: 'workspace.agents.title',
-            icon: icons.Bot,
-            getRoute: () => ROUTES.WORKSPACE_AGENTS.getRoute(policyID),
-            screenName: SCREENS.WORKSPACE.AGENTS,
-            sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.AGENTS,
-        },
         {
             translationKey: 'workspace.common.rooms',
             icon: icons.Hashtag,
@@ -226,6 +222,17 @@ function getWorkspaceMenuItems({
         },
     ];
 
+    if (isGroupPolicy(policy) && isCompanyAgentsBetaEnabled) {
+        const membersItemIndex = items.findIndex((item) => item.screenName === SCREENS.WORKSPACE.MEMBERS);
+        items.splice(membersItemIndex + 1, 0, {
+            translationKey: 'workspace.agents.title',
+            icon: icons.Bot,
+            getRoute: () => ROUTES.WORKSPACE_AGENTS.getRoute(policyID),
+            screenName: SCREENS.WORKSPACE.AGENTS,
+            sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.AGENTS,
+        });
+    }
+
     if (isGroupPolicy(policy) && shouldShowProtectedItems) {
         if (canReadPolicyFeature(CONST.POLICY.POLICY_FEATURE.REPORT_FIELDS)) {
             items.push({
diff --git a/tests/unit/SearchRouterNavigationTest.ts b/tests/unit/SearchRouterNavigationTest.ts
index 8de59663665f..1d71268c06ad 100644
--- a/tests/unit/SearchRouterNavigationTest.ts
+++ b/tests/unit/SearchRouterNavigationTest.ts
@@ -713,6 +713,7 @@ describe('Workspace Search Router navigation source', () => {
             isOffline,
             isVendorMatchingBetaEnabled: false,
             isRecruitingBetaEnabled: false,
+            isCompanyAgentsBetaEnabled: false,
             shouldUseNarrowLayout: false,
             convertToDisplayString: () => '$0.00',
             getItemText: (item) => {

From a8947b33a4f499e7bbfd406bd38512288352e65b Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 8 Oct 2026 14:11:39 +0200
Subject: [PATCH 341/781] fix: mWeb tab labels truncate inside their slot on
 one line, clear of the selected pill next to them

---
 .../Navigation/NavigationTabBar/TabBarItem.tsx        |  2 +-
 src/components/Navigation/NavigationTabBar/index.tsx  |  1 +
 src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx    | 10 ++++++++--
 src/styles/index.ts                                   | 11 ++++++++---
 src/styles/variables.ts                               |  2 ++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
index 87613dbe3f72..dcf891ed9d51 100644
--- a/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
+++ b/src/components/Navigation/NavigationTabBar/TabBarItem.tsx
@@ -38,7 +38,7 @@ function TabBarItem({icon, label, isSelected, isHovered = false, statusIndicator
     const iconSize = shouldUseNarrowLayout ? variables.iconFloatingTabBar : variables.iconBottomBar;
 
     return (
-        <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
+        <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && styles.navigationTabBarItemNarrow, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
             <View>
                 <Icon
                     src={icon}
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index f934146a96da..432f205cd96f 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -169,6 +169,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                         icon={expensifyIcons.Home}
                         label={translate('common.home')}
                         isSelected={selectedTab === NAVIGATION_TABS.HOME}
+                        numberOfLines={1}
                     />
                 </PressableWithFeedback>
                 <InboxTabButton
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index ddca563685f4..6699d926b7f5 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -44,7 +44,13 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.ACCOUNT}
         >
             {({hovered}) => (
-                <View style={[styles.navigationTabBarItem, shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected]}>
+                <View
+                    style={[
+                        styles.navigationTabBarItem,
+                        shouldUseNarrowLayout && styles.navigationTabBarItemNarrow,
+                        shouldUseNarrowLayout && isSelected && styles.navigationTabBarItemSelected,
+                    ]}
+                >
                     <View style={shouldUseNarrowLayout ? styles.navigationTabBarAvatar : styles.tn0Half}>
                         <AccountNavigationAvatar
                             // The floating bar marks the selected tab with a pill behind the whole item, so the
@@ -55,7 +61,7 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
                         />
                     </View>
                     <Text
-                        numberOfLines={2}
+                        numberOfLines={shouldUseNarrowLayout ? 1 : 2}
                         style={[
                             styles.textSmall,
                             styles.textAlignCenter,
diff --git a/src/styles/index.ts b/src/styles/index.ts
index d6a644d1597a..60ff872fe82d 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -768,12 +768,17 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'hidden',
         },
 
+        // Stretches every tab to its slot, so a long label truncates inside the slot instead of spilling into its neighbors.
+        navigationTabBarItemNarrow: {
+            alignSelf: 'stretch',
+            paddingHorizontal: variables.floatingTabBarLabelInset,
+        },
+
         navigationTabBarItemSelected: {
             backgroundColor: theme.floatingTabBarSelectedBG,
             borderRadius: variables.componentBorderRadiusCircle,
-            // The padding matches the negative margin, so the label keeps the tab's width to wrap in, selected or not.
-            alignSelf: 'stretch',
-            paddingHorizontal: variables.floatingTabBarSelectedOverhang,
+            // The extra padding matches the negative margin, so the label keeps the same width selected or not.
+            paddingHorizontal: variables.floatingTabBarLabelInset + variables.floatingTabBarSelectedOverhang,
             marginHorizontal: -variables.floatingTabBarSelectedOverhang,
         },
 
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 02fa82cd4e6e..4ebc7dced2e1 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -35,6 +35,8 @@ export default {
     floatingTabBarHorizontalInset: 16,
     // How far the selected pill reaches past its tab on each side, whatever the label's length.
     floatingTabBarSelectedOverhang: 4,
+    // Space between a label's truncation edge and its tab's edge, so a neighbor's selected pill never reaches the label.
+    floatingTabBarLabelInset: 8,
     floatingTabBarBottomInset: 8,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
     debugTabViewHeight: 64,

From e3e2dcebc68a0c347e8dba65e753f868564b0d59 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 8 Oct 2026 14:26:47 +0200
Subject: [PATCH 342/781] fix: iOS tab labels leave room for the selected pill
 next to them

---
 .../NativeTabNavigator/useNativeTabBarOptions/index.ios.ts     | 2 +-
 src/styles/variables.ts                                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index e6f46ed27404..4b20eaeaa88c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -39,7 +39,7 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
     const {windowWidth} = useWindowDimensions();
     // One of the tabs never has a bar item, so the bar splits its width between the others.
     const barItemCount = Object.keys(tabLabels).length - 1;
-    const labelMaxWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount;
+    const labelMaxWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount - variables.iosNativeTabBarLabelInset;
 
     const screenOptions: NativeBottomTabNavigationOptions = {
         headerShown: false,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 4ebc7dced2e1..15f28dd6fb25 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -122,6 +122,9 @@ export default {
     nativeTabIconLabelGap: 6,
     /** Space between the screen edge and the first tab of the iOS 26 floating tab bar. */
     iosNativeTabBarHorizontalInset: 25,
+    // UITabBar sizes its items to their icons and gives the selected pill a minimum width, so a label as wide as an even
+    // share of the bar lets that pill reach over the label next to it.
+    iosNativeTabBarLabelInset: 8,
     /** Material's BottomNavigationView row, without the gesture inset under it. */
     androidNativeTabBarHeight: 80,
     /** Material's bar row (androidNativeTabBarHeight) plus the 16 dp Material keeps between a FAB and the bar. */

From 51d09c1adf0bb1dac7925726e9959c072146b822 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Thu, 8 Oct 2026 15:06:12 +0200
Subject: [PATCH 343/781] beta change

---
 src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx  | 2 +-
 src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx | 2 +-
 src/pages/workspace/WorkspaceOverviewPage.tsx           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
index d3b44b556fff..248c5afbbfe2 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationAddPage.tsx
@@ -63,7 +63,7 @@ function WorkspaceOfficeLocationAddPage({route}: WorkspaceOfficeLocationAddPageP
         <AccessOrNotFoundWrapper
             policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
-            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS)}
+            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS)}
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
diff --git a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
index f521b2c52cc8..b432e12ad293 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
@@ -90,7 +90,7 @@ function WorkspaceOfficeLocationEditPage({route}: WorkspaceOfficeLocationEditPag
         <AccessOrNotFoundWrapper
             policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
-            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS) || !officeLocation || officeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}
+            shouldBeBlocked={!isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS) || !officeLocation || officeLocation.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx
index a0926c5fc024..9d464f9dedae 100644
--- a/src/pages/workspace/WorkspaceOverviewPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewPage.tsx
@@ -281,7 +281,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
             updateOfficeLocation(routePolicyID, policy?.officeLocations, defaultOfficeID, {isDefault: false});
         });
     };
-    const shouldShowOfficeLocationsSection = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS) && (!readOnly || shouldShowCompanyAddressOffice || officeLocationEntries.length > 0);
+    const shouldShowOfficeLocationsSection = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS) && (!readOnly || shouldShowCompanyAddressOffice || officeLocationEntries.length > 0);
     const shouldShowRulesDocumentSubSection = isPolicyAdmin || hasRulesDocument;
 
     const personalDetails = usePersonalDetails();

From 3ecd32cd61bab11476c2cb2beab2c0eb911692df Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 14:14:24 +0100
Subject: [PATCH 344/781] add useAgents hook

---
 src/CONST/index.ts                          |   1 +
 src/hooks/useAgents.ts                      | 165 ++++++++++++++++
 src/pages/settings/Agents/AgentsPage.tsx    | 209 +++-----------------
 src/pages/workspace/WorkspaceAgentsPage.tsx |  54 +++++
 src/pages/workspace/withPolicy.tsx          |   1 +
 5 files changed, 250 insertions(+), 180 deletions(-)
 create mode 100644 src/hooks/useAgents.ts

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index f44efd8e17bf..a9d7ef18c3d9 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -4561,6 +4561,7 @@ const CONST = {
         POLICY_FEATURE: {
             OVERVIEW: 'overview',
             MEMBERS: 'members',
+            AGENTS: 'agents',
             ASSIGN_ELEVATED_ROLES: 'assignElevatedRoles',
             WORKFLOWS: 'workflows',
             WORKFLOWS_APPROVALS: 'workflowsApprovals',
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
new file mode 100644
index 000000000000..018cc2d772f8
--- /dev/null
+++ b/src/hooks/useAgents.ts
@@ -0,0 +1,165 @@
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+import {usePersonalDetails} from '@components/OnyxListItemProvider';
+import {TableHandle} from '@components/Table';
+import {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable';
+
+import {clearAgentDeleteError, clearAgentError, clearAgentUpdateError, deleteAgent, openAgentsPage} from '@libs/actions/Agent';
+import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
+import {getLatestError} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {PendingAction} from '@src/types/onyx/OnyxCommon';
+
+import {useEffect, useRef, useState} from 'react';
+import {usePrevious} from 'victory-native';
+
+import useChatWithAgent from './useChatWithAgent';
+import useCleanupSelectedOptions from './useCleanupSelectedOptions';
+import useConfirmModal from './useConfirmModal';
+import useLocalize from './useLocalize';
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+import useRuleBotGuardModal from './useRuleBotGuardModal';
+import useSearchBackPress from './useSearchBackPress';
+import useSwitchToDelegator from './useSwitchToDelegator';
+
+const handleErrorClose = (pendingAction: PendingAction | null | undefined, accountID: number) => {
+    if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        clearAgentError(accountID);
+    } else if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+        clearAgentDeleteError(accountID);
+    } else {
+        clearAgentUpdateError(accountID);
+    }
+};
+
+function useAgents() {
+    useEffect(() => {
+        openAgentsPage();
+    }, []);
+
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const personalDetailsList = usePersonalDetails();
+    const chatWithAgent = useChatWithAgent();
+    const switchToDelegator = useSwitchToDelegator();
+    const {showConfirmModal} = useConfirmModal();
+    const showRuleBotGuardModal = useRuleBotGuardModal();
+    const [selectedAgents, setSelectedAgents] = useState<string[]>([]);
+
+    const agents: AgentRowData[] = Object.entries(agentPrompts ?? {}).flatMap(([key, agentPrompt]) => {
+        const accountID = Number(key.slice(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT.length));
+        const details = personalDetailsList?.[accountID];
+        if (!details) {
+            return [];
+        }
+        const pendingAction = agentPrompt?.pendingAction;
+        const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+
+        if (!isOffline && isPendingDeletion) {
+            return [];
+        }
+
+        const mergedErrors = {
+            ...getLatestError(agentPrompt?.errors ?? undefined),
+            ...getLatestError(agentPrompt?.nameErrors ?? undefined),
+            ...getLatestError(agentPrompt?.promptErrors ?? undefined),
+            ...getLatestError(agentPrompt?.avatarErrors ?? undefined),
+        };
+        const rowErrors = getLatestError(mergedErrors);
+
+        return [
+            {
+                keyForList: String(accountID),
+                accountID,
+                displayName: details.displayName ?? details.login ?? '',
+                login: details.login ?? '',
+                pendingAction,
+                errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
+                disabled: isPendingDeletion,
+                action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
+                onChatPress: () => chatWithAgent(accountID),
+                onCopilotPress: () => switchToDelegator(details.login ?? ''),
+                dismissError: () => handleErrorClose(pendingAction, accountID),
+            },
+        ];
+    });
+
+    const tableRef = useRef<TableHandle<AgentRowData, AgentsTableColumnKey, string>>(null);
+    const agentKeys = agents.map((agent) => agent.keyForList);
+    const prevAgentKeys = usePrevious(agentKeys);
+
+    // Highlight (and scroll to) a newly created agent's row once it appears in the table, mirroring
+    // the same pattern used for newly-invited workspace members (see WorkspaceMembersPage). Not
+    // gated on useIsFocused: on wide layouts this page is the central pane of a split navigator and
+    // stays visible (but unfocused per react-navigation) while the new agent's DM opens in the RHP.
+    useEffect(() => {
+        const newAgentKeys = agentKeys.filter((key) => !prevAgentKeys.includes(key));
+        if (!newAgentKeys.length) {
+            return;
+        }
+
+        const tableAgents = tableRef.current?.getProcessedData() ?? [];
+        const newAgentIndex = tableAgents.findIndex((agent) => newAgentKeys.includes(agent.keyForList));
+        if (newAgentIndex !== -1) {
+            tableRef.current?.scrollToIndex({
+                index: newAgentIndex,
+                animated: false,
+                viewPosition: 0.5,
+            });
+        }
+        tableRef.current?.highlightItems(newAgentKeys);
+    }, [agentKeys, prevAgentKeys]);
+
+    const agentsByAccountID = new Map(agents.map((agent) => [agent.keyForList, agent]));
+    const selectedAgentKeys = selectedAgents.filter((accountIDString) => {
+        const agent = agentsByAccountID.get(accountIDString);
+        return !!agent && agent.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    });
+
+    const clearSelectedAgents = () => setSelectedAgents((prevSelectedAgents) => (prevSelectedAgents.length > 0 ? [] : prevSelectedAgents));
+    useCleanupSelectedOptions(clearSelectedAgents);
+    useSearchBackPress({
+        onClearSelection: clearSelectedAgents,
+        onNavigationCallBack: () => Navigation.goBack(),
+    });
+
+    const removeSelectedAgents = () => {
+        for (const accountIDString of selectedAgentKeys) {
+            const accountID = Number(accountIDString);
+            const agentLogin = personalDetailsList?.[accountID]?.login;
+            deleteAgent(accountID, agentLogin, allPolicies, false);
+        }
+        clearSelectedAgents();
+    };
+    const askForConfirmationToDelete = async () => {
+        const ruleBotEnforcedPolicy = selectedAgentKeys.map((accountIDString) => getRuleBotEnforcedPolicy(Number(accountIDString), allPolicies)).find(Boolean);
+        if (ruleBotEnforcedPolicy) {
+            showRuleBotGuardModal('deleteAgent', ruleBotEnforcedPolicy.id);
+            return;
+        }
+        const result = await showConfirmModal({
+            title: translate('agentsPage.deleteAgentsTitle', {count: selectedAgentKeys.length}),
+            prompt: translate('agentsPage.deleteAgentsMessage', {count: selectedAgentKeys.length}),
+            confirmText: translate('common.delete'),
+            cancelText: translate('common.cancel'),
+            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+            shouldHandleNavigationBack: false,
+        });
+
+        if (result.action !== ModalActions.CONFIRM) {
+            return;
+        }
+
+        removeSelectedAgents();
+    };
+
+    return {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef};
+}
+
+export default useAgents;
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index deb62181cbee..5978edf14847 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -3,194 +3,54 @@ import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import {ModalActions} from '@components/Modal/Global/ModalContext';
-import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import RenderHTML from '@components/RenderHTML';
 import ScreenWrapper from '@components/ScreenWrapper';
-import type {TableHandle} from '@components/Table';
-import type {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable';
 import AgentsTable from '@components/Tables/AgentsTable';
 
-import useChatWithAgent from '@hooks/useChatWithAgent';
-import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
-import useConfirmModal from '@hooks/useConfirmModal';
+import useAgents from '@hooks/useAgents';
 import useDocumentTitle from '@hooks/useDocumentTitle';
 import useLayoutSpacing from '@hooks/useLayoutSpacing';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
-import useNetwork from '@hooks/useNetwork';
-import useOnyx from '@hooks/useOnyx';
-import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useRuleBotGuardModal from '@hooks/useRuleBotGuardModal';
-import useSearchBackPress from '@hooks/useSearchBackPress';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
-import useSwitchToDelegator from '@hooks/useSwitchToDelegator';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
-import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
-import {getLatestError} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 
-import {clearAgentDeleteError, clearAgentError, clearAgentUpdateError, deleteAgent, openAgentsPage} from '@userActions/Agent';
-
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
-import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 
 function AgentsPage() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
-    const {isOffline} = useNetwork();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const isMobileSelectionModeEnabled = useMobileSelectionMode();
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
+    const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
     const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
-    const chatWithAgent = useChatWithAgent();
-    const switchToDelegator = useSwitchToDelegator();
-    const {showConfirmModal} = useConfirmModal();
-    const showRuleBotGuardModal = useRuleBotGuardModal();
-    const [selectedAgents, setSelectedAgents] = useState<string[]>([]);
-    const isMobileSelectionModeEnabled = useMobileSelectionMode();
-    useDocumentTitle(translate('agentsPage.title'));
-
-    const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
-    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const personalDetailsList = usePersonalDetails();
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents();
+    const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
+    const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
 
-    useEffect(() => {
-        openAgentsPage();
-    }, []);
-
-    const handleErrorClose = (pendingAction: PendingAction | null | undefined, accountID: number) => {
-        if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
-            clearAgentError(accountID);
-        } else if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
-            clearAgentDeleteError(accountID);
-        } else {
-            clearAgentUpdateError(accountID);
-        }
-    };
-
-    const agents: AgentRowData[] = Object.entries(agentPrompts ?? {}).flatMap(([key, agentPrompt]) => {
-        const accountID = Number(key.slice(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT.length));
-        const details = personalDetailsList?.[accountID];
-        if (!details) {
-            return [];
-        }
-        const pendingAction = agentPrompt?.pendingAction;
-        const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-
-        if (!isOffline && isPendingDeletion) {
-            return [];
-        }
-
-        const mergedErrors = {
-            ...getLatestError(agentPrompt?.errors ?? undefined),
-            ...getLatestError(agentPrompt?.nameErrors ?? undefined),
-            ...getLatestError(agentPrompt?.promptErrors ?? undefined),
-            ...getLatestError(agentPrompt?.avatarErrors ?? undefined),
-        };
-        const rowErrors = getLatestError(mergedErrors);
-
-        return [
-            {
-                keyForList: String(accountID),
-                accountID,
-                displayName: details.displayName ?? details.login ?? '',
-                login: details.login ?? '',
-                pendingAction,
-                errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
-                disabled: isPendingDeletion,
-                action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
-                onChatPress: () => chatWithAgent(accountID),
-                onCopilotPress: () => switchToDelegator(details.login ?? ''),
-                dismissError: () => handleErrorClose(pendingAction, accountID),
-            },
-        ];
-    });
-
-    const tableRef = useRef<TableHandle<AgentRowData, AgentsTableColumnKey, string>>(null);
-    const agentKeys = agents.map((agent) => agent.keyForList);
-    const prevAgentKeys = usePrevious(agentKeys);
-
-    // Highlight (and scroll to) a newly created agent's row once it appears in the table, mirroring
-    // the same pattern used for newly-invited workspace members (see WorkspaceMembersPage). Not
-    // gated on useIsFocused: on wide layouts this page is the central pane of a split navigator and
-    // stays visible (but unfocused per react-navigation) while the new agent's DM opens in the RHP.
-    useEffect(() => {
-        const newAgentKeys = agentKeys.filter((key) => !prevAgentKeys.includes(key));
-        if (!newAgentKeys.length) {
-            return;
-        }
-
-        const tableAgents = tableRef.current?.getProcessedData() ?? [];
-        const newAgentIndex = tableAgents.findIndex((agent) => newAgentKeys.includes(agent.keyForList));
-        if (newAgentIndex !== -1) {
-            tableRef.current?.scrollToIndex({
-                index: newAgentIndex,
-                animated: false,
-                viewPosition: 0.5,
-            });
-        }
-        tableRef.current?.highlightItems(newAgentKeys);
-    }, [agentKeys, prevAgentKeys]);
-
-    const agentsByAccountID = new Map(agents.map((agent) => [agent.keyForList, agent]));
-    const selectedAgentKeys = selectedAgents.filter((accountIDString) => {
-        const agent = agentsByAccountID.get(accountIDString);
-        return !!agent && agent.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    });
-
-    const clearSelectedAgents = () => {
-        setSelectedAgents((prevSelectedAgents) => (prevSelectedAgents.length > 0 ? [] : prevSelectedAgents));
-    };
-
-    useCleanupSelectedOptions(clearSelectedAgents);
-
-    useSearchBackPress({
-        onClearSelection: clearSelectedAgents,
-        onNavigationCallBack: () => Navigation.goBack(),
-    });
-
-    const removeSelectedAgents = () => {
-        for (const accountIDString of selectedAgentKeys) {
-            const accountID = Number(accountIDString);
-            const agentLogin = personalDetailsList?.[accountID]?.login;
-            deleteAgent(accountID, agentLogin, allPolicies, false);
-        }
-        clearSelectedAgents();
-    };
-
-    const askForConfirmationToDelete = async () => {
-        const ruleBotEnforcedPolicy = selectedAgentKeys.map((accountIDString) => getRuleBotEnforcedPolicy(Number(accountIDString), allPolicies)).find(Boolean);
-        if (ruleBotEnforcedPolicy) {
-            showRuleBotGuardModal('deleteAgent', ruleBotEnforcedPolicy.id);
-            return;
-        }
-        const result = await showConfirmModal({
-            title: translate('agentsPage.deleteAgentsTitle', {count: selectedAgentKeys.length}),
-            prompt: translate('agentsPage.deleteAgentsMessage', {count: selectedAgentKeys.length}),
-            confirmText: translate('common.delete'),
-            cancelText: translate('common.cancel'),
-            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
-            shouldHandleNavigationBack: false,
-        });
-
-        if (result.action !== ModalActions.CONFIRM) {
-            return;
-        }
+    useDocumentTitle(translate('agentsPage.title'));
 
-        removeSelectedAgents();
-    };
+    const newAgentButton = (
+        <Button
+            variant="success"
+            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_NEW.getRoute())}
+        >
+            <Button.Icon src={icons.Plus} />
+            <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
+        </Button>
+    );
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {
@@ -202,20 +62,6 @@ function AgentsPage() {
         },
     ];
 
-    const hasAgents = agents.length > 0;
-    const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
-    const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
-
-    const newAgentButton = (
-        <Button
-            variant="success"
-            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_NEW.getRoute())}
-        >
-            <Button.Icon src={icons.Plus} />
-            <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
-        </Button>
-    );
-
     const headerButtons = shouldShowBulkActionsButton ? (
         <ButtonWithDropdownMenu<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>
             variant={CONST.BUTTON_VARIANT.SUCCESS}
@@ -226,7 +72,6 @@ function AgentsPage() {
             options={bulkActionsButtonOptions}
             isSplitButton={false}
             isDisabled={!selectedAgentKeys.length}
-            testID="AgentsPage-header-dropdown-menu-button"
         />
     ) : (
         newAgentButton
@@ -243,6 +88,17 @@ function AgentsPage() {
         </>
     );
 
+    const headerContent = shouldDisplayButtonsInSeparateLine ? undefined : headerButtons;
+
+    const onBackButtonPress = () => {
+        if (isMobileSelectionModeEnabled) {
+            clearSelectedAgents();
+            turnOffMobileSelectionMode();
+            return;
+        }
+        Navigation.goBack();
+    };
+
     return (
         <ScreenWrapper
             enableEdgeToEdgeBottomSafeAreaPadding
@@ -254,21 +110,14 @@ function AgentsPage() {
         >
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
-                    onBackButtonPress={() => {
-                        if (isMobileSelectionModeEnabled) {
-                            clearSelectedAgents();
-                            turnOffMobileSelectionMode();
-                            return;
-                        }
-                        Navigation.goBack();
-                    }}
+                    onBackButtonPress={onBackButtonPress}
                     shouldShowBackButton={shouldUseNarrowLayout}
                     shouldUseHeadlineHeader={!selectionModeHeader}
                     shouldDisplaySearchRouter
                     shouldDisplayHelpButton
                     title={selectionModeHeader ? translate('common.selectMultiple') : translate('agentsPage.title')}
                 >
-                    {!shouldDisplayButtonsInSeparateLine && headerButtons}
+                    {headerContent}
                 </HeaderWithBackButton>
             </CollapsibleHeaderOnKeyboard>
             <AgentsTable
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index e69de29bb2d1..e3eca862094d 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -0,0 +1,54 @@
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
+import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
+
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+
+import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
+
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type WorkspaceAgentsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.AGENTS>;
+function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
+    const policy = usePolicy(route.params.policyID);
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBetaEnabled} = usePermissions();
+    const isCompanyAgentsBetaEnabled = isBetaEnabled(CONST.BETAS.COMPANY_AGENTS);
+
+    useWorkspaceDocumentTitle(policy?.name, 'workspace.agents.title');
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={route.params.policyID}
+            policyFeature={CONST.POLICY.POLICY_FEATURE.AGENTS}
+            shouldBeBlocked={!isCompanyAgentsBetaEnabled}
+        >
+            <WorkspacePageWithSections
+                shouldUseScrollView
+                headerText={translate('workspace.agents.title')}
+                shouldShowOfflineIndicatorInWideScreen
+                route={route}
+                addBottomSafeAreaPadding
+                policyFeature={CONST.POLICY.POLICY_FEATURE.AGENTS}
+            >
+                {(policyID?: string) => <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}></View>}
+            </WorkspacePageWithSections>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+export default WorkspaceAgentsPage;
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index b82d3e72f03e..996b9f2a8544 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -24,6 +24,7 @@ type PolicyRouteName =
     | typeof SCREENS.WORKSPACE.PROFILE
     | typeof SCREENS.WORKSPACE.MORE_FEATURES
     | typeof SCREENS.WORKSPACE.MEMBERS
+    | typeof SCREENS.WORKSPACE.AGENTS
     | typeof SCREENS.WORKSPACE.EXPENSIFY_CARD
     | typeof SCREENS.WORKSPACE.COMPANY_CARDS
     | typeof SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_INVITE

From 8c50034d164cc52f96f9116dec92917432cf6f07 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 7 Oct 2026 16:06:18 +0200
Subject: [PATCH 345/781] Show tooltips on mobile devices

---
 .../Charts/PieChart/PieChartContent.tsx       | 27 +++++++-
 .../Charts/hooks/useChartInteractions.ts      | 68 ++++++++++++++++---
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index efc9c2a6654f..4bf58a685f5b 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -14,7 +14,7 @@ import type {LayoutChangeEvent} from 'react-native';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import {Gesture, GestureDetector} from 'react-native-gesture-handler';
+import {Gesture, GestureDetector, PointerType} from 'react-native-gesture-handler';
 import Animated, {useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN, scheduleOnUI} from 'react-native-worklets';
 import {Pie, PolarChart} from 'victory-native';
@@ -108,12 +108,21 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
     const onChartMoved = (deltaX: number, deltaY: number) => scheduleOnUI(handleChartMoved, deltaX, deltaY);
 
+    const toggleActiveSlice = (x: number, y: number) => {
+        const {centerX, centerY} = pieGeometry;
+        const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
+        setActiveSliceIndex(sliceIndex === activeSliceIndex ? -1 : sliceIndex);
+    };
+
     // Hover gesture
     const hoverGesture = () =>
         Gesture.Hover()
             .onBegin((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 isHovering.set(true);
                 cursorX.set(e.x);
                 cursorY.set(e.y);
@@ -123,24 +132,36 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
             .onUpdate((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 cursorX.set(e.x);
                 cursorY.set(e.y);
                 tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
                 scheduleOnRN(updateActiveSlice, e.x, e.y);
             })
-            .onEnd(() => {
+            .onEnd((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 isHovering.set(false);
                 scheduleOnRN(setActiveSliceIndex, -1);
                 scheduleOnRN(setIsHoveringOverPie, false);
             });
 
-    // Tap gesture for click/tap navigation
+    // Tap gesture: touch toggles the tooltip, other pointers navigate on click
     const tapGesture = () =>
         Gesture.Tap().onEnd((e) => {
             'worklet';
 
+            if (e.pointerType === PointerType.TOUCH) {
+                tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
+                scheduleOnRN(toggleActiveSlice, e.x, e.y);
+                return;
+            }
+
             const {centerX, centerY} = pieGeometry;
             const sliceIndex = findSliceAtPosition(e.x, e.y, centerX, centerY, radius, innerRadius, processedSlices);
 
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index b15420ef881d..ae15e365515f 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -1,7 +1,7 @@
 import type {SharedValue} from 'react-native-reanimated';
 
 import {useCallback} from 'react';
-import {Gesture} from 'react-native-gesture-handler';
+import {Gesture, PointerType} from 'react-native-gesture-handler';
 import {useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN, scheduleOnUI} from 'react-native-worklets';
 
@@ -184,6 +184,9 @@ function useChartInteractions({
     const isCursorOverClickable = useSharedValue(false);
     const isTooltipActive = useSharedValue(false);
 
+    /** True while a tooltip opened by a touch tap stays visible until the next tap */
+    const isTouchPinned = useSharedValue(false);
+
     /**
      * Called by chart content from handleScaleChange to populate canvas positions.
      * Must be called with the positions derived from the current d3 scale.
@@ -339,11 +342,26 @@ function useChartInteractions({
      * customGestures prop, because Victory's internal GestureHandler view only covers
      * the plot area and would drop events from the label area.
      */
+    const hideTooltip = () => {
+        'worklet';
+
+        chartInteractionState.isActive.set(false);
+        isTouchPinned.set(false);
+        isCursorOverTarget.set(false);
+        isCursorOverClickable.set(false);
+        isTooltipActive.set(false);
+    };
+
     const hoverGesture = () =>
         Gesture.Hover()
             .onBegin((e) => {
                 'worklet';
 
+                // Touch on web can start a hover through pointerenter, which would fight the tap-to-show tooltip
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
+                isTouchPinned.set(false);
                 const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
                 const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
                 chartInteractionState.isActive.set(true);
@@ -358,20 +376,50 @@ function useChartInteractions({
             .onUpdate((e) => {
                 'worklet';
 
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
                 updateHoverAt(normalizeChartCoordinate(e.x, coordinateScale), normalizeChartCoordinate(e.y, coordinateScale));
             })
-            .onEnd(() => {
+            .onEnd((e) => {
                 'worklet';
 
-                chartInteractionState.isActive.set(false);
-                isCursorOverTarget.set(false);
-                isCursorOverClickable.set(false);
-                isTooltipActive.set(false);
+                if (e.pointerType === PointerType.TOUCH) {
+                    return;
+                }
+                hideTooltip();
             });
 
     /**
-     * Tap gesture. Resolves the nearest data point entirely on the UI thread,
-     * then schedules handlePress on the JS thread if the cursor is over the target.
+     * Touch taps toggle the tooltip instead of drilling in, since touch devices have no hover.
+     * Tapping a new target shows its tooltip; tapping the same target again or empty space hides it.
+     */
+    const handleTouchTap = (cursorX: number, cursorY: number) => {
+        'worklet';
+
+        const previousIndex = chartInteractionState.matchedIndex.get();
+        const wasPinned = isTouchPinned.get();
+        const bottom = chartBottom?.get() ?? cursorY;
+        const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
+        const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
+        if (targetIndex < 0 || (wasPinned && targetIndex === previousIndex)) {
+            hideTooltip();
+            return;
+        }
+
+        chartInteractionState.isActive.set(true);
+        applyTargetIndex(targetIndex);
+        const isOverTarget = updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+        if (!isOverTarget) {
+            hideTooltip();
+            return;
+        }
+        isTouchPinned.set(true);
+    };
+
+    /**
+     * Tap gesture. Resolves the nearest data point entirely on the UI thread.
+     * Touch taps toggle the tooltip; other pointers schedule handlePress on the JS thread if the cursor is over the target.
      */
     const tapGesture = () =>
         Gesture.Tap().onEnd((e) => {
@@ -381,6 +429,10 @@ function useChartInteractions({
             const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
             chartInteractionState.cursor.x.set(cursorX);
             chartInteractionState.cursor.y.set(cursorY);
+            if (e.pointerType === PointerType.TOUCH) {
+                handleTouchTap(cursorX, cursorY);
+                return;
+            }
             const ox = pointOX.get();
             const oy = pointOY.get();
             const idx = getResolvedTargetIndex(cursorX, cursorY, cursorX);

From 8ddb8dbd18ba275460c30c34223e18c773ee5d85 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Thu, 8 Oct 2026 14:58:53 +0200
Subject: [PATCH 346/781] Fix comments

---
 .../Charts/hooks/useChartInteractions.ts      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index ae15e365515f..efe84fd6500f 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -183,8 +183,6 @@ function useChartInteractions({
     const isCursorOverTarget = useSharedValue(false);
     const isCursorOverClickable = useSharedValue(false);
     const isTooltipActive = useSharedValue(false);
-
-    /** True while a tooltip opened by a touch tap stays visible until the next tap */
     const isTouchPinned = useSharedValue(false);
 
     /**
@@ -334,14 +332,6 @@ function useChartInteractions({
 
     const onChartMoved = (deltaX: number, deltaY: number) => scheduleOnUI(handleChartMoved, deltaX, deltaY);
 
-    /**
-     * Hover gesture to be placed on the full-height outer container (chart + label area).
-     * Clamps the y coordinate to chartBottom before passing to Victory so that hovering
-     * over x-axis labels below the plot area still resolves the nearest data point.
-     * This gesture is returned separately and must NOT be passed to CartesianChart's
-     * customGestures prop, because Victory's internal GestureHandler view only covers
-     * the plot area and would drop events from the label area.
-     */
     const hideTooltip = () => {
         'worklet';
 
@@ -352,12 +342,19 @@ function useChartInteractions({
         isTooltipActive.set(false);
     };
 
+    /**
+     * Hover gesture to be placed on the full-height outer container (chart + label area).
+     * Clamps the y coordinate to chartBottom before passing to Victory so that hovering
+     * over x-axis labels below the plot area still resolves the nearest data point.
+     * This gesture is returned separately and must NOT be passed to CartesianChart's
+     * customGestures prop, because Victory's internal GestureHandler view only covers
+     * the plot area and would drop events from the label area.
+     */
     const hoverGesture = () =>
         Gesture.Hover()
             .onBegin((e) => {
                 'worklet';
 
-                // Touch on web can start a hover through pointerenter, which would fight the tap-to-show tooltip
                 if (e.pointerType === PointerType.TOUCH) {
                     return;
                 }
@@ -392,7 +389,7 @@ function useChartInteractions({
 
     /**
      * Touch taps toggle the tooltip instead of drilling in, since touch devices have no hover.
-     * Tapping a new target shows its tooltip; tapping the same target again or empty space hides it.
+     * Tapping a new target shows its tooltip and tapping the same target again or empty space hides it.
      */
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';

From d6cd599fa5ff9c9ccdd1f5d88b1f6ee39279f90f Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 15:11:09 +0100
Subject: [PATCH 347/781] update WorkspaceAgentsPage to use useAgents hook

---
 src/pages/workspace/WorkspaceAgentsPage.tsx | 97 ++++++++++++++++++++-
 1 file changed, 94 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index e3eca862094d..84b995d02a62 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -1,11 +1,23 @@
+import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import RenderHTML from '@components/RenderHTML';
+import AgentsTable from '@components/Tables/AgentsTable';
+
+import useAgents from '@hooks/useAgents';
+import useLayoutSpacing from '@hooks/useLayoutSpacing';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
-import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
@@ -14,7 +26,9 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import DeepValueOf from '@src/types/utils/DeepValueOf';
 
 import React from 'react';
 import {View} from 'react-native';
@@ -24,12 +38,77 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const {pageGutter} = useLayoutSpacing();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBetaEnabled} = usePermissions();
     const isCompanyAgentsBetaEnabled = isBetaEnabled(CONST.BETAS.COMPANY_AGENTS);
+    const isMobileSelectionModeEnabled = useMobileSelectionMode();
+    const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
+    const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
+    const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents();
+    const hasAgents = agents.length > 0;
+    const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
+    const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
 
     useWorkspaceDocumentTitle(policy?.name, 'workspace.agents.title');
 
+    const newAgentButton = (
+        <Button
+            variant="success"
+            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_NEW.getRoute())}
+        >
+            <Button.Icon src={icons.Plus} />
+            <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
+        </Button>
+    );
+
+    const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
+        {
+            text: translate('agentsPage.deleteAgentsTitle', {count: selectedAgentKeys.length}),
+            value: CONST.AGENTS.BULK_ACTION_TYPES.DELETE,
+            icon: icons.Trashcan,
+            shouldSkipFocusRestore: true,
+            onSelected: askForConfirmationToDelete,
+        },
+    ];
+
+    const headerButtons = shouldShowBulkActionsButton ? (
+        <ButtonWithDropdownMenu<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>
+            variant={CONST.BUTTON_VARIANT.SUCCESS}
+            shouldAlwaysShowDropdownMenu
+            customText={translate('workspace.common.selected', {count: selectedAgentKeys.length})}
+            size={CONST.BUTTON_SIZE.MEDIUM}
+            onPress={() => null}
+            options={bulkActionsButtonOptions}
+            isSplitButton={false}
+            isDisabled={!selectedAgentKeys.length}
+        />
+    ) : (
+        newAgentButton
+    );
+    const agentsTableHeaderComponent = (
+        <>
+            {shouldDisplayButtonsInSeparateLine && <View style={[pageGutter, styles.pb3]}>{headerButtons}</View>}
+            {hasAgents && (
+                <View style={[styles.renderHTML, styles.flexRow, styles.w100, styles.ph5, styles.pb5, styles.pt3]}>
+                    <RenderHTML html={translate('workspace.agents.subtitle')} />
+                </View>
+            )}
+        </>
+    );
+
+    const headerContent = shouldDisplayButtonsInSeparateLine ? undefined : headerButtons;
+
+    const onBackButtonPress = () => {
+        if (isMobileSelectionModeEnabled) {
+            clearSelectedAgents();
+            turnOffMobileSelectionMode();
+            return;
+        }
+        Navigation.goBack();
+    };
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -39,13 +118,25 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
         >
             <WorkspacePageWithSections
                 shouldUseScrollView
-                headerText={translate('workspace.agents.title')}
+                headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.agents.title')}
                 shouldShowOfflineIndicatorInWideScreen
                 route={route}
                 addBottomSafeAreaPadding
                 policyFeature={CONST.POLICY.POLICY_FEATURE.AGENTS}
+                onBackButtonPress={onBackButtonPress}
+                shouldUseHeadlineHeader={!selectionModeHeader}
+                headerContent={headerContent}
             >
-                {(policyID?: string) => <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}></View>}
+                {(policyID?: string) => (
+                    <AgentsTable
+                        ref={tableRef}
+                        agents={agents}
+                        headerComponent={agentsTableHeaderComponent}
+                        canSelectAgents
+                        selectedKeys={selectedAgentKeys}
+                        onRowSelectionChange={setSelectedAgents}
+                    />
+                )}
             </WorkspacePageWithSections>
         </AccessOrNotFoundWrapper>
     );

From 36fc0f6e118da4d0821c90b25ee7f9482728bbca Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 8 Oct 2026 16:39:22 +0200
Subject: [PATCH 348/781] fix: show Try again when tracking a scanned receipt
 fails.

---
 .../MoneyRequestReceiptView.tsx               |   1 +
 .../buildRetryPayload.ts                      |   2 +-
 .../buildTrackExpenseRetryPayload.ts          | 107 ++++++++++++++++++
 src/libs/ReceiptUploadRetryHandler/index.ts   |  14 ++-
 src/libs/ReceiptUploadRetryHandler/types.ts   |   4 +-
 src/libs/actions/IOU/TrackExpense.ts          |  13 ++-
 .../IOU/types/CreateTrackExpenseParams.ts     |   2 +
 tests/unit/ReceiptUploadRetryHandlerTest.ts   |   1 +
 8 files changed, 140 insertions(+), 4 deletions(-)
 create mode 100644 src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts

diff --git a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
index 6b4862cd75cd..1b1cfad7d947 100644
--- a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
@@ -453,6 +453,7 @@ function MoneyRequestReceiptView({
               transactionThreadReport,
               transactionViolations: rawTransactionViolations,
               currentUserPersonalDetails: currentUserPersonalDetail,
+              introSelected,
           }
         : undefined;
 
diff --git a/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
index 46f1bba80d55..edd253f59870 100644
--- a/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
+++ b/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
@@ -162,4 +162,4 @@ function buildRetryPayload(context: ReceiptRetryContext, receiptFile: FileObject
 }
 
 export default buildRetryPayload;
-export {canBuildRetryPayload};
+export {canBuildRetryPayload, getCurrentUserAccountID, getMerchantForRetry, isRetryableFlow, resolveParticipant};
diff --git a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
new file mode 100644
index 000000000000..f8391071c563
--- /dev/null
+++ b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
@@ -0,0 +1,107 @@
+/** Decides whether a failed `TrackExpense` can be retried and rebuilds the call from Onyx. */
+import {getTransactionDetails, isSelfDM} from '@libs/ReportUtils';
+import {getIsFromGlobalCreate} from '@libs/TransactionUtils';
+
+import {getAllReports, getCurrentUserPersonalDetails} from '@userActions/IOU';
+import type {CreateTrackExpenseParams} from '@userActions/IOU/types/CreateTrackExpenseParams';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Receipt} from '@src/types/onyx/Transaction';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+import type {ReceiptRetryContext} from './types';
+
+import {getCurrentUserAccountID, getMerchantForRetry, isRetryableFlow, resolveParticipant} from './buildRetryPayload';
+
+function canBuildTrackExpenseRetryPayload(context: ReceiptRetryContext): boolean {
+    const {transaction, iouReport, receiptError} = context;
+    if (receiptError.action !== CONST.IOU.ACTION_PARAMS.TRACK_EXPENSE || !isSelfDM(iouReport)) {
+        return false;
+    }
+    return isRetryableFlow(context) && !!iouReport?.reportID && !!transaction?.transactionID && !!resolveParticipant(iouReport);
+}
+
+/** Rebuilds the `TrackExpense` call behind a failed receipt upload from the records the failure left in Onyx. */
+function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile: FileObject): CreateTrackExpenseParams | undefined {
+    const {
+        transaction,
+        iouReport,
+        iouActionID,
+        transactionThreadReportID,
+        policyParams,
+        rules,
+        conciergeReportID,
+        isSelfTourViewed,
+        isASAPSubmitBetaEnabled,
+        introSelected,
+        delegateAccountID,
+        getCurrencyDecimals,
+    } = context;
+    const participant = resolveParticipant(iouReport);
+    if (!canBuildTrackExpenseRetryPayload(context) || !transaction || !iouReport || !participant) {
+        return undefined;
+    }
+
+    const currentUser = getCurrentUserPersonalDetails();
+    // Unreported amounts are stored negated; this returns them positive, as `trackExpense` expects.
+    const details = getTransactionDetails(transaction);
+    if (!details) {
+        return undefined;
+    }
+    const receipt: Receipt = {...receiptFile, source: context.receiptError.source, state: CONST.IOU.RECEIPT_STATE.SCAN_READY};
+
+    return {
+        report: iouReport,
+        isDraftPolicy: false,
+        isDraftChatReport: false,
+        participantParams: {
+            payeeEmail: currentUser?.login,
+            payeeAccountID: getCurrentUserAccountID(),
+            participant,
+        },
+        policyParams,
+        transactionParams: {
+            amount: details.amount,
+            currency: details.currency,
+            created: details.created,
+            merchant: getMerchantForRetry(details.merchant),
+            comment: details.comment,
+            category: details.category,
+            tag: details.tag,
+            taxCode: details.taxCode,
+            taxAmount: details.taxAmount,
+            billable: details.billable,
+            reimbursable: details.reimbursable,
+            // Read from the transaction because `details` widens this to `string | Attendee[]`.
+            attendees: transaction.comment?.attendees,
+            isFromGlobalCreate: getIsFromGlobalCreate(transaction),
+            receipt,
+        },
+        // Same ID, so if the first attempt reached Auth the retry gets `Transaction already created.` instead of a second expense.
+        optimisticTransactionID: transaction.transactionID,
+        // Without these two, the retry creates a second IOU action and thread for the same transaction.
+        currentReportActionID: iouActionID,
+        existingTransactionThreadReportID: transactionThreadReportID,
+        existingTransaction: transaction,
+        isASAPSubmitBetaEnabled,
+        currentUser: {
+            accountID: getCurrentUserAccountID(),
+            email: currentUser?.login ?? '',
+        },
+        introSelected,
+        conciergeChat: conciergeReportID ? getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`] : undefined,
+        quickAction: undefined,
+        recentWaypoints: [],
+        isSelfTourViewed,
+        // Only read when a draft chat report builds a new workspace, which the create path behind this error never does.
+        currentUserLocalCurrency: undefined,
+        delegateAccountID,
+        reportActionsList: undefined,
+        getCurrencyDecimals,
+        rules,
+    };
+}
+
+export default buildTrackExpenseRetryPayload;
+export {canBuildTrackExpenseRetryPayload};
diff --git a/src/libs/ReceiptUploadRetryHandler/index.ts b/src/libs/ReceiptUploadRetryHandler/index.ts
index e3bc6939f3d0..d1113692007e 100644
--- a/src/libs/ReceiptUploadRetryHandler/index.ts
+++ b/src/libs/ReceiptUploadRetryHandler/index.ts
@@ -2,7 +2,7 @@
 import Log from '@libs/Log';
 
 import {replaceReceipt} from '@userActions/IOU/Receipt';
-import {requestMoney} from '@userActions/IOU/TrackExpense';
+import {requestMoney, trackExpense} from '@userActions/IOU/TrackExpense';
 
 import CONST from '@src/CONST';
 import type {FileObject} from '@src/types/utils/Attachment';
@@ -11,6 +11,7 @@ import type {ReceiptRetryContext, RetryOutcome} from './types';
 
 import buildReplaceReceiptRetryPayload, {canBuildReplaceReceiptRetryPayload} from './buildReplaceReceiptRetryPayload';
 import buildRetryPayload, {canBuildRetryPayload} from './buildRetryPayload';
+import buildTrackExpenseRetryPayload, {canBuildTrackExpenseRetryPayload} from './buildTrackExpenseRetryPayload';
 import resolveReceiptFile from './resolveReceiptFile';
 
 type RetryFlow = {
@@ -41,6 +42,17 @@ const RETRY_FLOWS: Partial<Record<string, RetryFlow>> = {
             return true;
         },
     },
+    [CONST.IOU.ACTION_PARAMS.TRACK_EXPENSE]: {
+        canBuild: canBuildTrackExpenseRetryPayload,
+        dispatch: (context, receiptFile) => {
+            const payload = buildTrackExpenseRetryPayload(context, receiptFile);
+            if (!payload) {
+                return false;
+            }
+            trackExpense({...payload, isRetry: true, shouldPlaySound: false});
+            return true;
+        },
+    },
 };
 
 function getRetryFlow(context: ReceiptRetryContext): RetryFlow | undefined {
diff --git a/src/libs/ReceiptUploadRetryHandler/types.ts b/src/libs/ReceiptUploadRetryHandler/types.ts
index 4e93abee5b49..abdcd1dc38be 100644
--- a/src/libs/ReceiptUploadRetryHandler/types.ts
+++ b/src/libs/ReceiptUploadRetryHandler/types.ts
@@ -4,7 +4,7 @@ import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
 
 import type BasePolicyParams from '@userActions/IOU/types/BasePolicyParams';
 
-import type {Report, Rule, Transaction, TransactionViolations} from '@src/types/onyx';
+import type {IntroSelected, Report, Rule, Transaction, TransactionViolations} from '@src/types/onyx';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type {ReceiptError} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
@@ -53,6 +53,8 @@ type ReceiptRetryContext = {
     transactionViolations: OnyxEntry<TransactionViolations>;
 
     currentUserPersonalDetails: CurrentUserPersonalDetails;
+
+    introSelected: OnyxEntry<IntroSelected>;
 };
 
 type RetryOutcome = 'dispatched' | 'fileMissing' | 'payloadIncomplete' | 'unsupportedAction' | 'dispatchFailed';
diff --git a/src/libs/actions/IOU/TrackExpense.ts b/src/libs/actions/IOU/TrackExpense.ts
index 9d460ac14b93..bfb2eeac05db 100644
--- a/src/libs/actions/IOU/TrackExpense.ts
+++ b/src/libs/actions/IOU/TrackExpense.ts
@@ -192,6 +192,8 @@ type GetTrackExpenseInformationParams = {
     existingTransaction?: OnyxEntry<OnyxTypes.Transaction>;
     existingTransactionID?: string;
     optimisticTransactionID?: string;
+    currentReportActionID?: string;
+    existingTransactionThreadReportID?: string;
     participantParams: GetTrackExpenseInformationParticipantParams;
     policyParams: BasePolicyParams;
     transactionParams: GetTrackExpenseInformationTransactionParams;
@@ -426,6 +428,7 @@ function buildOnyxDataForTrackExpense({
             value: {
                 ...transactionThreadReport,
                 pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                errorFields: {createChat: null},
             },
         },
         {
@@ -881,6 +884,8 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
         existingTransaction,
         existingTransactionID,
         optimisticTransactionID: providedOptimisticTransactionID,
+        currentReportActionID,
+        existingTransactionThreadReportID,
         participantParams,
         policyParams,
         transactionParams,
@@ -1178,8 +1183,9 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
         participants: [participant],
         transactionID: optimisticTransaction.transactionID,
         isPersonalTrackingExpense: !shouldUseMoneyReport,
-        existingTransactionThreadReportID: linkedTrackedExpenseReportAction?.childReportID,
+        existingTransactionThreadReportID: existingTransactionThreadReportID ?? linkedTrackedExpenseReportAction?.childReportID,
         linkedTrackedExpenseReportAction,
+        reportActionID: currentReportActionID,
         currentUserAccountID: currentUserAccountIDParam,
         delegateAccountIDParam: delegateAccountID,
     });
@@ -1214,6 +1220,7 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
             threadReport: optimisticTransactionThread ?? {},
         },
         shouldCreateNewMoneyRequestReport,
+        existingTransactionThreadReportID,
         actionableTrackExpenseWhisper,
         retryParams,
         isASAPSubmitBetaEnabled,
@@ -2488,6 +2495,8 @@ function trackExpense(params: CreateTrackExpenseParams) {
         shouldPlaySound = true,
         optimisticChatReportID,
         optimisticTransactionID,
+        currentReportActionID,
+        existingTransactionThreadReportID,
         isASAPSubmitBetaEnabled,
         currentUser,
         introSelected,
@@ -2625,6 +2634,8 @@ function trackExpense(params: CreateTrackExpenseParams) {
         moneyRequestReportID,
         existingTransaction,
         optimisticTransactionID,
+        currentReportActionID,
+        existingTransactionThreadReportID,
         existingTransactionID:
             isMovingTransactionFromTrackExpense && linkedTrackedExpenseReportAction && isMoneyRequestAction(linkedTrackedExpenseReportAction)
                 ? getOriginalMessage(linkedTrackedExpenseReportAction)?.IOUTransactionID
diff --git a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
index 995614776d6a..997485c6fcd5 100644
--- a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
+++ b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
@@ -39,6 +39,8 @@ type CreateTrackExpenseParams = {
     draftTransactionIDs?: string[];
     optimisticChatReportID?: string;
     optimisticTransactionID?: string;
+    currentReportActionID?: string;
+    existingTransactionThreadReportID?: string;
     isASAPSubmitBetaEnabled: boolean;
     currentUser: CurrentUser;
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
diff --git a/tests/unit/ReceiptUploadRetryHandlerTest.ts b/tests/unit/ReceiptUploadRetryHandlerTest.ts
index 57c788ec2aa1..a241ee0d75ab 100644
--- a/tests/unit/ReceiptUploadRetryHandlerTest.ts
+++ b/tests/unit/ReceiptUploadRetryHandlerTest.ts
@@ -75,6 +75,7 @@ function buildContext(transaction: Transaction, receiptErrorOverrides: Partial<R
         transactionThreadReport: undefined,
         transactionViolations: undefined,
         currentUserPersonalDetails: {accountID: CURRENT_USER_ACCOUNT_ID, login: 'me@example.com'},
+        introSelected: undefined,
     };
 }
 

From 6cca7c335174cc5eb3384c071bb0cfa80a5e41f6 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 15:46:31 +0100
Subject: [PATCH 349/781] fix: address commuter indicator CI failures

---
 src/selectors/Policy.ts                                  | 3 ---
 tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts     | 1 +
 .../home/TimeSensitiveSection/AddHomeAddressTest.tsx     | 9 +++++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index b049967fa115..ef436cee18bd 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -451,8 +451,6 @@ const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>)
     policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
     policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
-const hasHomeAndOfficeCommuterExclusionPolicySelector = (policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some(isActiveHomeAndOfficeCommuterExclusionPolicy);
-
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
     Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
 
@@ -605,7 +603,6 @@ export {
     hasReusablePoliciesConnectedToSelector,
     lastWorkspaceNumberSelector,
     hasOnlyPersonalPoliciesSelector,
-    hasHomeAndOfficeCommuterExclusionPolicySelector,
     homeAndOfficeCommuterExclusionPolicyNameSelector,
     policyAvatarFieldsSelector,
     policyNameSelector,
diff --git a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
index 932a5698f818..caf753d50e1f 100644
--- a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
+++ b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
@@ -17,6 +17,7 @@ const POLICY_ID = '1';
 function makeHomeAndOfficePolicy(isOfficeWorkArrangement?: boolean, hasOfficeWorkArrangement?: boolean): Policy {
     return {
         ...createRandomPolicy(Number(POLICY_ID)),
+        areDistanceRatesEnabled: true,
         commuterExclusions: {
             method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
             ...(isOfficeWorkArrangement === undefined ? {} : {isOfficeWorkArrangement}),
diff --git a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
index bf434d34568d..0426ae775ac1 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
@@ -6,8 +6,8 @@ import navigationRef from '@libs/Navigation/navigationRef';
 
 import OnyxListItemProvider from '@src/components/OnyxListItemProvider';
 import ONYXKEYS from '@src/ONYXKEYS';
+import HomeTaskGroup from '@src/pages/home/HomeTaskGroup';
 import AddHomeAddress from '@src/pages/home/TimeSensitiveSection/items/AddHomeAddress';
-import TimeSensitiveGroup from '@src/pages/home/TimeSensitiveSection/TimeSensitiveGroup';
 import useTimeSensitiveItems from '@src/pages/home/TimeSensitiveSection/useTimeSensitiveItems';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
@@ -95,7 +95,12 @@ jest.mock('@hooks/useThemeStyles', () =>
 );
 
 function TimeSensitiveSection() {
-    return <TimeSensitiveGroup items={useTimeSensitiveItems()} />;
+    return (
+        <HomeTaskGroup
+            title="homePage.timeSensitiveSection.title"
+            rows={useTimeSensitiveItems()}
+        />
+    );
 }
 
 const renderTimeSensitiveSection = () =>

From 16c2c3473510d5a33264c7e09dc119219bf11760 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 15:57:29 +0100
Subject: [PATCH 350/781] Revert "fix: address commuter indicator CI failures"

This reverts commit 6cca7c335174cc5eb3384c071bb0cfa80a5e41f6.
---
 src/selectors/Policy.ts                                  | 3 +++
 tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts     | 1 -
 .../home/TimeSensitiveSection/AddHomeAddressTest.tsx     | 9 ++-------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index ef436cee18bd..b049967fa115 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -451,6 +451,8 @@ const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>)
     policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
     policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
+const hasHomeAndOfficeCommuterExclusionPolicySelector = (policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some(isActiveHomeAndOfficeCommuterExclusionPolicy);
+
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
     Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
 
@@ -603,6 +605,7 @@ export {
     hasReusablePoliciesConnectedToSelector,
     lastWorkspaceNumberSelector,
     hasOnlyPersonalPoliciesSelector,
+    hasHomeAndOfficeCommuterExclusionPolicySelector,
     homeAndOfficeCommuterExclusionPolicyNameSelector,
     policyAvatarFieldsSelector,
     policyNameSelector,
diff --git a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
index caf753d50e1f..932a5698f818 100644
--- a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
+++ b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
@@ -17,7 +17,6 @@ const POLICY_ID = '1';
 function makeHomeAndOfficePolicy(isOfficeWorkArrangement?: boolean, hasOfficeWorkArrangement?: boolean): Policy {
     return {
         ...createRandomPolicy(Number(POLICY_ID)),
-        areDistanceRatesEnabled: true,
         commuterExclusions: {
             method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
             ...(isOfficeWorkArrangement === undefined ? {} : {isOfficeWorkArrangement}),
diff --git a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
index 0426ae775ac1..bf434d34568d 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
@@ -6,8 +6,8 @@ import navigationRef from '@libs/Navigation/navigationRef';
 
 import OnyxListItemProvider from '@src/components/OnyxListItemProvider';
 import ONYXKEYS from '@src/ONYXKEYS';
-import HomeTaskGroup from '@src/pages/home/HomeTaskGroup';
 import AddHomeAddress from '@src/pages/home/TimeSensitiveSection/items/AddHomeAddress';
+import TimeSensitiveGroup from '@src/pages/home/TimeSensitiveSection/TimeSensitiveGroup';
 import useTimeSensitiveItems from '@src/pages/home/TimeSensitiveSection/useTimeSensitiveItems';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
@@ -95,12 +95,7 @@ jest.mock('@hooks/useThemeStyles', () =>
 );
 
 function TimeSensitiveSection() {
-    return (
-        <HomeTaskGroup
-            title="homePage.timeSensitiveSection.title"
-            rows={useTimeSensitiveItems()}
-        />
-    );
+    return <TimeSensitiveGroup items={useTimeSensitiveItems()} />;
 }
 
 const renderTimeSensitiveSection = () =>

From ce8ba4641747b96fc5ff49aeef92acb88c367266 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 16:08:55 +0100
Subject: [PATCH 351/781] chore: restore generated GitHub action bundles

---
 .../javascript/authorChecklist/index.js       | 901 ++++++++++++-----
 .../javascript/awaitStagingDeploys/index.js   | 901 ++++++++++++-----
 .../actions/javascript/bumpVersion/index.js   | 901 ++++++++++++-----
 .../javascript/checkAndroidStatus/index.js    | 903 +++++++++++++-----
 .../javascript/checkDeployBlockers/index.js   | 901 ++++++++++++-----
 .../javascript/checkSVGCompression/index.js   | 901 ++++++++++++-----
 .../javascript/failureNotifier/index.js       | 901 ++++++++++++-----
 .../javascript/formatCodeCovComment/index.js  | 901 ++++++++++++-----
 .../generateHelpPreviewComment/index.js       | 901 ++++++++++++-----
 .../getAndroidRolloutPercentage/index.js      | 903 +++++++++++++-----
 .../javascript/getArtifactInfo/index.js       | 901 ++++++++++++-----
 .../getDeployPullRequestList/index.js         | 901 ++++++++++++-----
 .../javascript/getPreviousVersion/index.js    | 901 ++++++++++++-----
 .../javascript/getPullRequestDetails/index.js | 901 ++++++++++++-----
 .../getPullRequestIncrementalChanges/index.js | 901 ++++++++++++-----
 .../isAuthorizedContributor/index.js          | 901 ++++++++++++-----
 .../isDeployChecklistLocked/index.js          | 903 +++++++++++++-----
 .../markPullRequestsAsDeployed/index.js       | 901 ++++++++++++-----
 .../javascript/postOrReplaceComment/index.js  | 901 ++++++++++++-----
 .../javascript/proposalPoliceComment/index.js | 903 +++++++++++++-----
 .../reopenIssueWithComment/index.js           | 901 ++++++++++++-----
 .../javascript/reviewerChecklist/index.js     | 901 ++++++++++++-----
 .../validateReassureOutput/index.js           | 901 ++++++++++++-----
 .../javascript/verifySignedCommits/index.js   | 901 ++++++++++++-----
 .../verifyStagingBuildsSucceeded/index.js     | 901 ++++++++++++-----
 25 files changed, 16829 insertions(+), 5704 deletions(-)

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index fc3426566448..03420b1771b7 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index 906a5fe20da8..00e2f735fcb4 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
index 479e50a322da..c2258fb0a82d 100644
--- a/.github/actions/javascript/bumpVersion/index.js
+++ b/.github/actions/javascript/bumpVersion/index.js
@@ -2312,10 +2312,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -2382,7 +2438,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -2394,6 +2454,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2503,13 +2566,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -6116,6 +6187,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -6162,6 +6234,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -6324,24 +6399,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -6361,6 +6467,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6404,7 +6514,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -6429,9 +6539,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6440,6 +6551,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6565,6 +6680,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6608,12 +6724,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6628,7 +6751,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6636,9 +6762,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6687,7 +6814,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6705,6 +6832,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6717,6 +6861,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6747,8 +6914,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6769,11 +6944,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -7129,6 +7311,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -7189,6 +7372,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -7352,16 +7539,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -7376,18 +7569,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7948,9 +8165,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8456,8 +8674,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8628,7 +8846,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8649,6 +8866,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8848,7 +9066,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8858,6 +9075,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -9298,6 +9516,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -9351,6 +9587,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -9360,6 +9597,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -9421,7 +9669,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9470,9 +9720,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9480,6 +9742,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9487,6 +9750,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9506,6 +9774,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9533,7 +9802,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -16332,14 +16601,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -16422,7 +16725,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16552,18 +16859,14 @@ var require_parse2 = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -17385,7 +17688,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17491,31 +17794,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17534,20 +17832,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17557,19 +17847,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17600,8 +17888,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17609,18 +17903,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17635,6 +17932,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17694,6 +17998,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17714,6 +18021,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17727,6 +18037,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17737,32 +18050,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17805,6 +18132,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -18016,8 +18363,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -18061,9 +18406,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -18247,7 +18589,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -18322,19 +18670,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -18413,6 +18748,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -18432,10 +18801,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18466,63 +18838,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18531,17 +18870,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18557,43 +18895,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18618,12 +18955,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkAndroidStatus/index.js b/.github/actions/javascript/checkAndroidStatus/index.js
index cf13138d08ce..de9e0e53ebc4 100644
--- a/.github/actions/javascript/checkAndroidStatus/index.js
+++ b/.github/actions/javascript/checkAndroidStatus/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 2ca391c52c00..c59c854097c1 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkSVGCompression/index.js b/.github/actions/javascript/checkSVGCompression/index.js
index 1bd2d9dfd701..cad1560febba 100644
--- a/.github/actions/javascript/checkSVGCompression/index.js
+++ b/.github/actions/javascript/checkSVGCompression/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/failureNotifier/index.js b/.github/actions/javascript/failureNotifier/index.js
index 7eedc830062e..208e6286e656 100644
--- a/.github/actions/javascript/failureNotifier/index.js
+++ b/.github/actions/javascript/failureNotifier/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/formatCodeCovComment/index.js b/.github/actions/javascript/formatCodeCovComment/index.js
index 133b8de4b0d2..9aac21e43b56 100644
--- a/.github/actions/javascript/formatCodeCovComment/index.js
+++ b/.github/actions/javascript/formatCodeCovComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/generateHelpPreviewComment/index.js b/.github/actions/javascript/generateHelpPreviewComment/index.js
index 4fffa145a897..222ea227535c 100644
--- a/.github/actions/javascript/generateHelpPreviewComment/index.js
+++ b/.github/actions/javascript/generateHelpPreviewComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request2, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request2, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getAndroidRolloutPercentage/index.js b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
index e970b3649819..1abd092e27ea 100644
--- a/.github/actions/javascript/getAndroidRolloutPercentage/index.js
+++ b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request.aborted) {
+          return;
+        }
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        util.errorRequest(client, request, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index 1d7315a4ae65..b511ee174521 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 86ebf2b747d2..c6a083ec32cf 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
index 0343158e5a02..dc48a205f79b 100644
--- a/.github/actions/javascript/getPreviousVersion/index.js
+++ b/.github/actions/javascript/getPreviousVersion/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index 78b36a004849..b7443787fc9b 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
index 21c54003dde2..e868a069ae7e 100644
--- a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
+++ b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error3) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error3 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error3) {
+          util.errorRequest(client, request2, error3);
+          util.destroy(socket, error3);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error3) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error3 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error3) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error3 || new RequestAbortedError());
+          }
+          return;
+        }
+        error3 = error3 || new RequestAbortedError();
+        util.errorRequest(client, request2, error3);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error3);
         }
-        util.destroy(body, err);
+        util.destroy(body, error3);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error3) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error3);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error3) {
+            stream.off("response", onResponse);
+            abort(error3);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error3, data) => {
-                  if (error3) {
-                    failWebsocketConnection(this.ws, error3.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error3, data) => {
+                    if (error3) {
+                      const code = error3 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error3.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isAuthorizedContributor/index.js b/.github/actions/javascript/isAuthorizedContributor/index.js
index fea991ad887f..d43a19fced4c 100644
--- a/.github/actions/javascript/isAuthorizedContributor/index.js
+++ b/.github/actions/javascript/isAuthorizedContributor/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isDeployChecklistLocked/index.js b/.github/actions/javascript/isDeployChecklistLocked/index.js
index ebdf2bf6961c..9321db05e6d7 100644
--- a/.github/actions/javascript/isDeployChecklistLocked/index.js
+++ b/.github/actions/javascript/isDeployChecklistLocked/index.js
@@ -28447,10 +28447,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -28517,7 +28573,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -28529,6 +28589,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -28638,13 +28701,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -32251,6 +32322,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -32297,6 +32369,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -32459,24 +32534,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -32496,6 +32602,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32539,7 +32649,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -32564,9 +32674,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -32575,6 +32686,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32700,6 +32815,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -32743,12 +32859,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -32763,7 +32886,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -32771,9 +32897,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -32822,7 +32949,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -32840,6 +32967,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -32852,6 +32996,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -32882,8 +33049,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -32904,11 +33079,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -33264,6 +33446,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -33324,6 +33507,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -33487,16 +33674,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -33511,18 +33704,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -34083,9 +34300,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -34591,8 +34809,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -34763,7 +34981,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -34784,6 +35001,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -34983,7 +35201,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -34993,6 +35210,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -35433,6 +35651,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -35486,6 +35722,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -35495,6 +35732,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -35556,7 +35804,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -35605,9 +35855,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -35615,6 +35877,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -35622,6 +35885,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -35641,6 +35909,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -35668,7 +35937,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -42467,14 +42736,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -42557,7 +42860,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -42687,18 +42994,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -43520,7 +43823,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -43626,31 +43929,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -43669,20 +43967,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -43692,19 +43982,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -43735,8 +44023,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -43744,18 +44038,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -43770,6 +44067,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -43829,6 +44133,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -43849,6 +44156,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -43862,6 +44172,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -43872,32 +44185,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -43940,6 +44267,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -44151,8 +44498,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -44196,9 +44541,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -44382,7 +44724,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -44457,19 +44805,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -44548,6 +44883,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -44567,10 +44936,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -44601,63 +44973,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -44666,17 +45005,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -44692,43 +45030,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -44753,12 +45090,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 62a50ec22616..5eca45f374da 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/postOrReplaceComment/index.js b/.github/actions/javascript/postOrReplaceComment/index.js
index fb9eb8df9e7b..195707dedc9f 100644
--- a/.github/actions/javascript/postOrReplaceComment/index.js
+++ b/.github/actions/javascript/postOrReplaceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
index 126b34462df4..beb367dd3ebd 100644
--- a/.github/actions/javascript/proposalPoliceComment/index.js
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str2 = `${val[i]}`;
+            if (!isValidHeaderValue(str2)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str2);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message2 = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message2, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message2 = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message2, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index f237f20694fd..2fe118ee3e64 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index a9419acf5a2e..8e220a2cf59e 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/validateReassureOutput/index.js b/.github/actions/javascript/validateReassureOutput/index.js
index b26522496b9c..e511f56ffd08 100644
--- a/.github/actions/javascript/validateReassureOutput/index.js
+++ b/.github/actions/javascript/validateReassureOutput/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index 087b5df387fd..d982728230d3 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
index 1e9b71a5c3e0..d5508591a07b 100644
--- a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
+++ b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {

From abc91a4c75e5b9a2bac96f63220ef8af38735277 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 16:15:53 +0100
Subject: [PATCH 352/781] fix: address commuter CI failures

---
 src/selectors/Policy.ts                                  | 3 ---
 tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts     | 1 +
 .../home/TimeSensitiveSection/AddHomeAddressTest.tsx     | 9 +++++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index b049967fa115..ef436cee18bd 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -451,8 +451,6 @@ const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>)
     policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
     policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
-const hasHomeAndOfficeCommuterExclusionPolicySelector = (policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some(isActiveHomeAndOfficeCommuterExclusionPolicy);
-
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
     Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
 
@@ -605,7 +603,6 @@ export {
     hasReusablePoliciesConnectedToSelector,
     lastWorkspaceNumberSelector,
     hasOnlyPersonalPoliciesSelector,
-    hasHomeAndOfficeCommuterExclusionPolicySelector,
     homeAndOfficeCommuterExclusionPolicyNameSelector,
     policyAvatarFieldsSelector,
     policyNameSelector,
diff --git a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
index 932a5698f818..caf753d50e1f 100644
--- a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
+++ b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
@@ -17,6 +17,7 @@ const POLICY_ID = '1';
 function makeHomeAndOfficePolicy(isOfficeWorkArrangement?: boolean, hasOfficeWorkArrangement?: boolean): Policy {
     return {
         ...createRandomPolicy(Number(POLICY_ID)),
+        areDistanceRatesEnabled: true,
         commuterExclusions: {
             method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
             ...(isOfficeWorkArrangement === undefined ? {} : {isOfficeWorkArrangement}),
diff --git a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
index bf434d34568d..0426ae775ac1 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
@@ -6,8 +6,8 @@ import navigationRef from '@libs/Navigation/navigationRef';
 
 import OnyxListItemProvider from '@src/components/OnyxListItemProvider';
 import ONYXKEYS from '@src/ONYXKEYS';
+import HomeTaskGroup from '@src/pages/home/HomeTaskGroup';
 import AddHomeAddress from '@src/pages/home/TimeSensitiveSection/items/AddHomeAddress';
-import TimeSensitiveGroup from '@src/pages/home/TimeSensitiveSection/TimeSensitiveGroup';
 import useTimeSensitiveItems from '@src/pages/home/TimeSensitiveSection/useTimeSensitiveItems';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
@@ -95,7 +95,12 @@ jest.mock('@hooks/useThemeStyles', () =>
 );
 
 function TimeSensitiveSection() {
-    return <TimeSensitiveGroup items={useTimeSensitiveItems()} />;
+    return (
+        <HomeTaskGroup
+            title="homePage.timeSensitiveSection.title"
+            rows={useTimeSensitiveItems()}
+        />
+    );
 }
 
 const renderTimeSensitiveSection = () =>

From 3ed341ba566fff042ee0ca9edd5f773fc5567571 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 16:39:39 +0100
Subject: [PATCH 353/781] make EditAgentPage dynamic

---
 config/eslint/eslint.seatbelt.tsv             |  2 +-
 src/ROUTES.ts                                 |  9 +++---
 src/SCREENS.ts                                |  2 +-
 src/hooks/useAgents.ts                        |  5 ++--
 .../ModalStackNavigators/index.tsx            |  2 +-
 .../RELATIONS/SETTINGS_TO_RHP.ts              |  2 +-
 src/libs/Navigation/linkingConfig/config.ts   |  4 +--
 src/libs/Navigation/types.ts                  |  2 +-
 .../replaceOptimisticAgentWithActualAgent.ts  |  7 ++++-
 ...AgentPage.tsx => DynamicEditAgentPage.tsx} | 15 +++++-----
 .../Agents/Fields/EditAgentAvatarPage.tsx     |  5 ++--
 .../settings/Agents/Fields/EditNamePage.tsx   |  7 +++--
 ...placeOptimisticAgentWithActualAgentTest.ts |  4 +--
 .../unit/pages/settings/EditAgentPageTest.tsx | 28 +++++++++----------
 14 files changed, 52 insertions(+), 42 deletions(-)
 rename src/pages/settings/Agents/{EditAgentPage.tsx => DynamicEditAgentPage.tsx} (93%)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index a5ed0909ebaf..e31e328848c9 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -1191,7 +1191,7 @@
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"react-hooks/refs"	1
 "../../src/pages/settings/Agents/AddAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/AgentsPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/EditAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicEditAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/EditNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/EditPromptPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 61b640952260..2ba41fa89bbe 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2091,6 +2091,11 @@ const DYNAMIC_ROUTES = {
         },
         queryParams: ['action', 'iouType', 'transactionID', 'reportID', 'upgradeBackTo', 'shouldSubmitExpense', 'upgradePath'],
     },
+    AGENT_EDIT: {
+        path: ':accountID/edit',
+        getRoute: (accountID: number) => `${accountID}/edit` as const,
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
 } as const satisfies DynamicRoutes;
 
 const ROUTES = {
@@ -2626,10 +2631,6 @@ const ROUTES = {
         },
     },
     SETTINGS_AGENTS_ADD_AVATAR: 'settings/agents/new/custom/avatar',
-    SETTINGS_AGENTS_EDIT: {
-        route: 'settings/agents/:accountID/edit',
-        getRoute: (accountID: number) => `settings/agents/${accountID}/edit` as const,
-    },
     SETTINGS_AGENTS_EDIT_NAME: {
         route: 'settings/agents/:accountID/edit/name',
         getRoute: (accountID: number) => `settings/agents/${accountID}/edit/name` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 5aaa0493fc58..cf488c6da99b 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -143,7 +143,7 @@ const SCREENS = {
             NEW: 'Settings_Agents_New',
             ADD: 'Settings_Agents_Add',
             ADD_AVATAR: 'Settings_Agents_Add_Avatar',
-            EDIT: 'Settings_Agents_Edit',
+            DYNAMIC_EDIT: 'Dynamic_Settings_Agents_Edit',
             EDIT_NAME: 'Settings_Agents_Edit_Name',
             EDIT_PROMPT: 'Settings_Agents_Edit_Prompt',
             EDIT_AVATAR: 'Settings_Agents_Edit_Avatar',
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index 018cc2d772f8..e8455a5698f6 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -6,11 +6,12 @@ import {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable
 import {clearAgentDeleteError, clearAgentError, clearAgentUpdateError, deleteAgent, openAgentsPage} from '@libs/actions/Agent';
 import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
 import {getLatestError} from '@libs/ErrorUtils';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import {PendingAction} from '@src/types/onyx/OnyxCommon';
 
 import {useEffect, useRef, useState} from 'react';
@@ -82,7 +83,7 @@ function useAgents() {
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
                 disabled: isPendingDeletion,
-                action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
+                action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID))),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
                 dismissError: () => handleErrorClose(pendingAction, accountID),
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 0206f5abda22..bd30307184a0 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -510,7 +510,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.AGENTS.NEW]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/NewAgentPage').default),
     [SCREENS.SETTINGS.AGENTS.ADD]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/AddAgentPage').default),
     [SCREENS.SETTINGS.AGENTS.ADD_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/AddAgentAvatarPage').default),
-    [SCREENS.SETTINGS.AGENTS.EDIT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/EditAgentPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/DynamicEditAgentPage').default),
     [SCREENS.SETTINGS.AGENTS.EDIT_NAME]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditNamePage').default),
     [SCREENS.SETTINGS.AGENTS.EDIT_PROMPT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditPromptPage').default),
     [SCREENS.SETTINGS.AGENTS.EDIT_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditAgentAvatarPage').default),
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
index e8091df20477..f0e604cf71bf 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
@@ -75,7 +75,7 @@ const SETTINGS_TO_RHP: Partial<Record<keyof SettingsSplitNavigatorParamList, str
         SCREENS.SETTINGS.AGENTS.NEW,
         SCREENS.SETTINGS.AGENTS.ADD,
         SCREENS.SETTINGS.AGENTS.ADD_AVATAR,
-        SCREENS.SETTINGS.AGENTS.EDIT,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT,
         SCREENS.SETTINGS.AGENTS.EDIT_NAME,
         SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
         SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 7c1b31d60921..2f5ca583cbed 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -384,8 +384,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             path: ROUTES.SETTINGS_AGENTS_ADD_AVATAR,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.AGENTS.EDIT]: {
-                            path: ROUTES.SETTINGS_AGENTS_EDIT.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: {
+                            path: DYNAMIC_ROUTES.AGENT_EDIT.path,
                             parse: {
                                 accountID: Number,
                             },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index ea5a2ed9e9be..2f7fd1992110 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -288,7 +288,7 @@ type SettingsNavigatorParamList = {
         policyID?: string;
     };
     [SCREENS.SETTINGS.AGENTS.ADD_AVATAR]: undefined;
-    [SCREENS.SETTINGS.AGENTS.EDIT]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: {
         accountID: number;
     };
     [SCREENS.SETTINGS.AGENTS.EDIT_NAME]: {
diff --git a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
index bcb75c6b7944..3feabfd7a85a 100644
--- a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
+++ b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
@@ -27,7 +27,12 @@ import Onyx from 'react-native-onyx';
  * rewrites the queued requests themselves.
  */
 
-const AGENT_SETTINGS_SCREENS = new Set<string>([SCREENS.SETTINGS.AGENTS.EDIT, SCREENS.SETTINGS.AGENTS.EDIT_NAME, SCREENS.SETTINGS.AGENTS.EDIT_PROMPT, SCREENS.SETTINGS.AGENTS.EDIT_AVATAR]);
+const AGENT_SETTINGS_SCREENS = new Set<string>([
+    SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT,
+    SCREENS.SETTINGS.AGENTS.EDIT_NAME,
+    SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
+    SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
+]);
 
 // Reports are only read inside the mapping callback, so connectWithoutView() is used. On app start the mapping can
 // arrive before this collection is hydrated, so consumers wait for this promise. Onyx always fires the callback at
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
similarity index 93%
rename from src/pages/settings/Agents/EditAgentPage.tsx
rename to src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 1a950b1497a2..40cd359a18ff 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -11,6 +11,7 @@ import ScrollView from '@components/ScrollView';
 
 import useChatWithAgent from '@hooks/useChatWithAgent';
 import useConfirmModal from '@hooks/useConfirmModal';
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -31,16 +32,16 @@ import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 
-type EditAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>;
+type DynamicEditAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT>;
 
-function EditAgentPage({route}: EditAgentPageProps) {
+function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'MagnifyingGlass', 'Users']);
@@ -57,7 +58,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const shouldShowNotFoundPage = isLoadingApp === false && isOnyxLoaded && !agent && !personalDetails;
 
     const agentLogin = personalDetails?.login ?? '';
-    const handleBackPress = () => Navigation.goBack();
+    const handleBackPress = () => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT.path));
     const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(accountID));
     const handleEditNamePress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_NAME.getRoute(accountID));
     const handleEditPromptPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.getRoute(accountID));
@@ -111,7 +112,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
 
     return (
         <ScreenWrapper
-            testID={EditAgentPage.displayName}
+            testID={DynamicEditAgentPage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
         >
@@ -187,6 +188,6 @@ function EditAgentPage({route}: EditAgentPageProps) {
     );
 }
 
-EditAgentPage.displayName = 'EditAgentPage';
+DynamicEditAgentPage.displayName = 'DynamicEditAgentPage';
 
-export default EditAgentPage;
+export default DynamicEditAgentPage;
diff --git a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
index 14443666d669..09e38f4a5146 100644
--- a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
@@ -21,6 +21,7 @@ import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
 import type {AgentAvatarID} from '@libs/Avatars/AgentAvatarCatalog';
 import {validateAvatarImage} from '@libs/AvatarUtils';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -30,7 +31,7 @@ import {updateAgentAvatar} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {FileObject} from '@src/types/utils/Attachment';
@@ -236,7 +237,7 @@ function EditAgentAvatarPage({route}: EditAgentAvatarPageProps) {
     return (
         <EditAgentAvatarContent
             accountID={accountID}
-            fallbackRoute={ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)}
+            fallbackRoute={createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID))}
         />
     );
 }
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/EditNamePage.tsx
index 092d13abb51f..83b5347a2feb 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/EditNamePage.tsx
@@ -11,13 +11,14 @@ import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentName} from '@libs/actions/Agent';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/EditAgentNameForm';
 
@@ -35,7 +36,7 @@ function EditNamePage({route}: EditNamePageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
         updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
-        Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID));
+        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)));
     };
 
     return (
@@ -47,7 +48,7 @@ function EditNamePage({route}: EditNamePageProps) {
         >
             <HeaderWithBackButton
                 title={translate('editAgentNamePage.title')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID))}
+                onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)))}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM}
diff --git a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
index 9b3cb83156d2..fbc1a17e7ab9 100644
--- a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
+++ b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
@@ -56,7 +56,7 @@ function buildAgentEditNavigationState(accountID: number): PartialState<Navigati
                 state: {
                     key: 'agent-settings-stack-key',
                     index: 0,
-                    routes: [{key: 'agents-edit-route-key', name: SCREENS.SETTINGS.AGENTS.EDIT, params: {accountID: String(accountID)}}],
+                    routes: [{key: 'agents-edit-route-key', name: SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT, params: {accountID: String(accountID)}}],
                 },
             },
         ],
@@ -264,7 +264,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
                         key: 'agent-settings-stack-key',
                         index: 1,
                         routes: [
-                            {key: 'agents-edit-route-key', name: SCREENS.SETTINGS.AGENTS.EDIT, params: {accountID: String(optimisticAccountID)}},
+                            {key: 'agents-edit-route-key', name: SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT, params: {accountID: String(optimisticAccountID)}},
                             {key: 'agents-edit-name-route-key', name: SCREENS.SETTINGS.AGENTS.EDIT_NAME, params: {accountID: String(optimisticAccountID)}},
                         ],
                     },
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 3d7bde35c08a..c47f56fefb0f 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -8,7 +8,7 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
 
-import EditAgentPage from '@pages/settings/Agents/EditAgentPage';
+import DynamicEditAgentPage from '@pages/settings/Agents/DynamicEditAgentPage';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -148,13 +148,13 @@ const mockUseOnyx = jest.mocked(useOnyx);
 
 const TEST_ACCOUNT_ID = 12345;
 
-type EditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['route'];
-type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['navigation'];
+type DynamicEditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT>['route'];
+type DynamicEditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT>['navigation'];
 
-const mockRoute = createMock<EditAgentPageRoute>({params: {accountID: TEST_ACCOUNT_ID}});
-const mockNavigation = createMock<EditAgentPageNavigation>({});
+const mockRoute = createMock<DynamicEditAgentPageRoute>({params: {accountID: TEST_ACCOUNT_ID}});
+const mockNavigation = createMock<DynamicEditAgentPageNavigation>({});
 
-describe('EditAgentPage', () => {
+describe('DynamicEditAgentPage', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         mockUseOnyx.mockImplementation((key, options) => {
@@ -177,7 +177,7 @@ describe('EditAgentPage', () => {
         });
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -195,7 +195,7 @@ describe('EditAgentPage', () => {
         });
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -206,7 +206,7 @@ describe('EditAgentPage', () => {
 
     it('renders delete agent menu item', () => {
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -224,7 +224,7 @@ describe('EditAgentPage', () => {
         });
 
         render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -248,7 +248,7 @@ describe('EditAgentPage', () => {
         });
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -266,7 +266,7 @@ describe('EditAgentPage', () => {
         });
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -284,7 +284,7 @@ describe('EditAgentPage', () => {
         });
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,
@@ -299,7 +299,7 @@ describe('EditAgentPage', () => {
         mockUseOnyx.mockReturnValue([undefined, {status: 'loading'}]);
 
         const {toJSON} = render(
-            <EditAgentPage
+            <DynamicEditAgentPage
                 route={mockRoute}
                 navigation={mockNavigation}
             />,

From d487f47d6ebcdfe463ceef92b64e665dcfcb310a Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 16:47:33 +0100
Subject: [PATCH 354/781] skipMatchingFullScreenRoute on opening agents pages

---
 src/hooks/useAgents.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index e8455a5698f6..79a8f254c51f 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -83,7 +83,7 @@ function useAgents() {
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
                 disabled: isPendingDeletion,
-                action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID))),
+                action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)), {skipMatchingFullScreenRoute: true}),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
                 dismissError: () => handleErrorClose(pendingAction, accountID),

From c23789066a1e161e798ee0e3b5528b0223b8b08e Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 8 Oct 2026 18:02:18 +0200
Subject: [PATCH 355/781] test: add unit test for track expense try again logic

---
 .../buildTrackExpenseRetryPayload.ts          |  4 -
 tests/actions/IOUTest/TrackExpenseTest.ts     | 39 ++++++++++
 tests/unit/ReceiptUploadRetryHandlerTest.ts   | 73 ++++++++++++++++++-
 3 files changed, 109 insertions(+), 7 deletions(-)

diff --git a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
index f8391071c563..45a27b5c10b0 100644
--- a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
+++ b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
@@ -44,7 +44,6 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
     }
 
     const currentUser = getCurrentUserPersonalDetails();
-    // Unreported amounts are stored negated; this returns them positive, as `trackExpense` expects.
     const details = getTransactionDetails(transaction);
     if (!details) {
         return undefined;
@@ -78,9 +77,7 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
             isFromGlobalCreate: getIsFromGlobalCreate(transaction),
             receipt,
         },
-        // Same ID, so if the first attempt reached Auth the retry gets `Transaction already created.` instead of a second expense.
         optimisticTransactionID: transaction.transactionID,
-        // Without these two, the retry creates a second IOU action and thread for the same transaction.
         currentReportActionID: iouActionID,
         existingTransactionThreadReportID: transactionThreadReportID,
         existingTransaction: transaction,
@@ -94,7 +91,6 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
         quickAction: undefined,
         recentWaypoints: [],
         isSelfTourViewed,
-        // Only read when a draft chat report builds a new workspace, which the create path behind this error never does.
         currentUserLocalCurrency: undefined,
         delegateAccountID,
         reportActionsList: undefined,
diff --git a/tests/actions/IOUTest/TrackExpenseTest.ts b/tests/actions/IOUTest/TrackExpenseTest.ts
index 2f622f819bf2..333647aed922 100644
--- a/tests/actions/IOUTest/TrackExpenseTest.ts
+++ b/tests/actions/IOUTest/TrackExpenseTest.ts
@@ -1385,6 +1385,45 @@ describe('actions/IOU/TrackExpense', () => {
             expect(actionableWhisper).toBeTruthy();
         });
 
+        it('reuses the failed IOU action and thread on a receipt retry, and clears the thread creation error', async () => {
+            // Given a self-DM and the thread a failed track left behind, still carrying its creation error
+            mockFetch?.pause?.();
+            const selfDMReport: Report = {
+                ...createRandomReport(1, CONST.REPORT.CHAT_TYPE.SELF_DM),
+                reportID: 'selfDM-retry',
+            };
+            const failedIOUActionID = '1111111111111111';
+            const failedThreadReportID = '2222222222222222';
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`, selfDMReport);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${failedThreadReportID}`, {
+                reportID: failedThreadReportID,
+                parentReportID: selfDMReport.reportID,
+                parentReportActionID: failedIOUActionID,
+                errorFields: {createChat: {error: 'report.genericCreateReportFailureMessage'}},
+            });
+
+            // When the receipt retry calls trackExpense with the failed attempt's IDs
+            trackExpense({
+                ...getDefaultTrackExpenseParams(selfDMReport, {amount: 1200}),
+                optimisticTransactionID: '3333333333333333',
+                currentReportActionID: failedIOUActionID,
+                existingTransactionThreadReportID: failedThreadReportID,
+                isRetry: true,
+            });
+            await waitForBatchedUpdates();
+
+            // Then the self-DM holds one IOU action under the failed ID, linked to the same thread, so no second expense or thread appears
+            const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`);
+            const iouActions = Object.values(reportActions ?? {}).filter((action) => isMoneyRequestAction(action));
+            expect(iouActions).toHaveLength(1);
+            expect(iouActions.at(0)?.reportActionID).toBe(failedIOUActionID);
+            expect(iouActions.at(0)?.childReportID).toBe(failedThreadReportID);
+
+            // And the thread no longer shows the creation error from the failed attempt
+            const threadReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${failedThreadReportID}`);
+            expect(threadReport?.errorFields?.createChat).toBeFalsy();
+        });
+
         it('should set correct tax fields when tax parameters are provided', async () => {
             // Given a selfDM report and transaction with tax
             const selfDMReport: Report = {
diff --git a/tests/unit/ReceiptUploadRetryHandlerTest.ts b/tests/unit/ReceiptUploadRetryHandlerTest.ts
index a241ee0d75ab..5a0d22abb861 100644
--- a/tests/unit/ReceiptUploadRetryHandlerTest.ts
+++ b/tests/unit/ReceiptUploadRetryHandlerTest.ts
@@ -1,12 +1,13 @@
 import retryReceiptUpload, {canRetryReceiptUpload} from '@libs/ReceiptUploadRetryHandler';
 import buildReplaceReceiptRetryPayload from '@libs/ReceiptUploadRetryHandler/buildReplaceReceiptRetryPayload';
 import buildRetryPayload, {canBuildRetryPayload} from '@libs/ReceiptUploadRetryHandler/buildRetryPayload';
+import buildTrackExpenseRetryPayload from '@libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload';
 import resolveReceiptFile from '@libs/ReceiptUploadRetryHandler/resolveReceiptFile';
 import type {ReceiptRetryContext} from '@libs/ReceiptUploadRetryHandler/types';
 
 import {replaceReceipt} from '@userActions/IOU/Receipt';
 import type {ReplaceReceiptRetryParams} from '@userActions/IOU/Receipt';
-import {requestMoney} from '@userActions/IOU/TrackExpense';
+import {requestMoney, trackExpense} from '@userActions/IOU/TrackExpense';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -21,7 +22,7 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('@libs/ReceiptUploadRetryHandler/resolveReceiptFile', () => ({__esModule: true, default: jest.fn()}));
 jest.mock('@userActions/IOU/Receipt', () => ({...jest.requireActual<Record<string, unknown>>('@userActions/IOU/Receipt'), replaceReceipt: jest.fn()}));
-jest.mock('@userActions/IOU/TrackExpense', () => ({...jest.requireActual<Record<string, unknown>>('@userActions/IOU/TrackExpense'), requestMoney: jest.fn()}));
+jest.mock('@userActions/IOU/TrackExpense', () => ({...jest.requireActual<Record<string, unknown>>('@userActions/IOU/TrackExpense'), requestMoney: jest.fn(), trackExpense: jest.fn()}));
 
 const CURRENT_USER_ACCOUNT_ID = 1;
 const TRANSACTION_ID = '7000000000000001';
@@ -30,6 +31,7 @@ const CHAT_REPORT_ID = '9000000000000001';
 const POLICY_ID = 'A0000000000000001';
 const IOU_ACTION_ID = '6000000000000001';
 const THREAD_REPORT_ID = '5000000000000001';
+const SELF_DM_REPORT_ID = '4000000000000001';
 
 const receiptFile: FileObject = {name: 'receipt.jpg', type: 'image/jpeg', uri: 'file:///receipts/receipt.jpg'};
 
@@ -92,6 +94,12 @@ function buildReplaceReceiptContext(retryParamsOverrides: Partial<ReplaceReceipt
     return buildContext(transaction, {action: CONST.IOU.ACTION_PARAMS.REPLACE_RECEIPT, retryParams: JSON.stringify(retryParams), ...receiptErrorOverrides});
 }
 
+function buildTrackExpenseContext(iouReport: Report = {reportID: SELF_DM_REPORT_ID, chatType: CONST.REPORT.CHAT_TYPE.SELF_DM} as Report): ReceiptRetryContext {
+    // A tracked expense in the self-DM is unreported, and its amount is stored negated.
+    const transaction = buildFailedTransaction({reportID: CONST.REPORT.UNREPORTED_REPORT_ID, amount: -1200});
+    return {...buildContext(transaction, {action: CONST.IOU.ACTION_PARAMS.TRACK_EXPENSE}), iouReport};
+}
+
 describe('buildRetryPayload', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -133,7 +141,7 @@ describe('buildRetryPayload', () => {
         expect(canBuildRetryPayload(buildContext(buildFailedTransaction(), {action: CONST.IOU.ACTION_PARAMS.REPLACE_RECEIPT}))).toBe(false);
     });
 
-    it('offers no retry for a trackExpense failure, whose convert-and-submit path the handler does not replay', () => {
+    it('does not rebuild a trackExpense failure as a RequestMoney call, because track has its own builder', () => {
         expect(canBuildRetryPayload(buildContext(buildFailedTransaction(), {action: CONST.IOU.ACTION_PARAMS.TRACK_EXPENSE}))).toBe(false);
     });
 
@@ -235,4 +243,63 @@ describe('buildRetryPayload', () => {
             expect(jest.mocked(replaceReceipt).mock.invocationCallOrder.at(0)).toBeLessThan(clearReceiptError.mock.invocationCallOrder.at(0) ?? 0);
         });
     });
+    describe('trackExpense retry', () => {
+        beforeEach(() => {
+            jest.mocked(resolveReceiptFile).mockResolvedValue(receiptFile);
+            jest.mocked(trackExpense).mockReset();
+            jest.mocked(requestMoney).mockReset();
+        });
+
+        it('offers a retry for a failed track in the self-DM', () => {
+            // Given a scan tracked in the self-DM whose upload failed
+            const context = buildTrackExpenseContext();
+
+            // When the receipt view asks whether it can retry
+            const canRetry = canRetryReceiptUpload(context);
+
+            // Then Try again is offered
+            expect(canRetry).toBe(true);
+        });
+
+        it('offers no retry for a track outside the self-DM, because a retry there would also have to leave the report totals alone', () => {
+            // Given a track failure whose expense sits on a workspace expense report
+            const context = buildTrackExpenseContext({reportID: IOU_REPORT_ID, chatReportID: CHAT_REPORT_ID, policyID: POLICY_ID, type: CONST.REPORT.TYPE.EXPENSE} as Report);
+
+            // When the receipt view asks whether it can retry
+            const canRetry = canRetryReceiptUpload(context);
+
+            // Then only Save is offered
+            expect(canRetry).toBe(false);
+        });
+
+        it('reuses the failed transaction, IOU action and thread, so the retry does not create a second tracked expense', () => {
+            // Given a failed track in the self-DM
+            const context = buildTrackExpenseContext();
+
+            // When the retry payload is rebuilt
+            const payload = buildTrackExpenseRetryPayload(context, receiptFile);
+
+            // Then it points at the records the failed attempt created, and passes the amount positive as trackExpense expects
+            expect(payload?.optimisticTransactionID).toBe(TRANSACTION_ID);
+            expect(payload?.currentReportActionID).toBe(IOU_ACTION_ID);
+            expect(payload?.existingTransactionThreadReportID).toBe(THREAD_REPORT_ID);
+            expect(payload?.report?.reportID).toBe(SELF_DM_REPORT_ID);
+            expect(payload?.transactionParams.amount).toBe(1200);
+        });
+
+        it('dispatches trackExpense as a retry and clears the error after it', async () => {
+            // Given a failed track in the self-DM
+            const clearReceiptError = jest.fn(() => Promise.resolve());
+
+            // When Try again is pressed
+            const outcome = await retryReceiptUpload(buildTrackExpenseContext(), clearReceiptError);
+
+            // Then trackExpense is sent once as a silent retry, not requestMoney, and the error is cleared only after it
+            expect(outcome).toBe('dispatched');
+            expect(jest.mocked(trackExpense)).toHaveBeenCalledTimes(1);
+            expect(jest.mocked(trackExpense)).toHaveBeenCalledWith(expect.objectContaining({isRetry: true, shouldPlaySound: false}));
+            expect(jest.mocked(requestMoney)).not.toHaveBeenCalled();
+            expect(jest.mocked(trackExpense).mock.invocationCallOrder.at(0)).toBeLessThan(clearReceiptError.mock.invocationCallOrder.at(0) ?? 0);
+        });
+    });
 });

From 01e610a09fcf8db3619c0ce4af35add1afb9baf7 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Thu, 8 Oct 2026 18:11:28 +0200
Subject: [PATCH 356/781] [Insights polish] Only offer Group by options on
 Spend over time that fit the Date range

---
 .../Insights/charts/InsightsChartWidget.tsx   | 17 ++--
 .../controls/InsightsGroupByDropdown.tsx      | 15 ++-
 src/pages/Insights/insightsGroupByOptions.ts  | 62 +++++++++++++
 src/pages/Insights/useInsightsFilters.ts      |  9 +-
 tests/ui/InsightsControlsTest.tsx             | 44 +++++++++
 tests/unit/hooks/useInsightsFilters.test.ts   | 88 +++++++++++++++++-
 tests/unit/insightsGroupByOptionsTest.ts      | 93 +++++++++++++++++++
 7 files changed, 312 insertions(+), 16 deletions(-)
 create mode 100644 src/pages/Insights/insightsGroupByOptions.ts
 create mode 100644 tests/unit/insightsGroupByOptionsTest.ts

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index aa881f1acf81..acb1d56ab332 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -20,6 +20,7 @@ import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsig
 import InsightsGroupByDropdown from '@pages/Insights/controls/InsightsGroupByDropdown';
 import type {InsightsChartSpec} from '@pages/Insights/dashboardSpecs';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
+import {getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -64,12 +65,16 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const isLoading = state === INSIGHTS_CHART_STATE.LOADING;
     const shouldShowTable = chart.view === CONST.SEARCH.VIEW.BAR || chart.view === CONST.SEARCH.VIEW.PIE;
 
-    const groupByControl = onGroupByChange ? (
-        <InsightsGroupByDropdown
-            groupBy={filters.groupBy}
-            onChange={onGroupByChange}
-        />
-    ) : null;
+    const groupByOptions = getInsightsGroupByOptions(filters.date);
+
+    const groupByControl =
+        onGroupByChange && groupByOptions.length > 0 ? (
+            <InsightsGroupByDropdown
+                groupBy={filters.groupBy}
+                options={groupByOptions}
+                onChange={onGroupByChange}
+            />
+        ) : null;
 
     const headerMenu =
         !!queryJSON && (state === INSIGHTS_CHART_STATE.READY || isLoading) ? (
diff --git a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
index cdab886e72b7..47d58bfa7eb3 100644
--- a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
+++ b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
@@ -7,7 +7,8 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import DEFAULT_INSIGHTS_FILTERS, {INSIGHTS_GROUP_BY_OPTIONS} from '@pages/Insights/insightsFilters';
+import DEFAULT_INSIGHTS_FILTERS from '@pages/Insights/insightsFilters';
+import {getFittingGroupBy} from '@pages/Insights/insightsGroupByOptions';
 
 import variables from '@styles/variables';
 
@@ -21,14 +22,18 @@ type InsightsGroupByDropdownProps = {
     /** Time bucket the headline chart aggregates into */
     groupBy: InsightsFilters['groupBy'];
 
+    /** Options that fit the date range */
+    options: Array<InsightsFilters['groupBy']>;
+
     onChange: (groupBy: InsightsFilters['groupBy']) => void;
 };
 
-function InsightsGroupByDropdown({groupBy, onChange}: InsightsGroupByDropdownProps) {
+function InsightsGroupByDropdown({groupBy, options, onChange}: InsightsGroupByDropdownProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const defaultGroupBy = getFittingGroupBy(DEFAULT_INSIGHTS_FILTERS.groupBy, options);
 
-    const items: Array<SingleSelectItem<InsightsFilters['groupBy']>> = INSIGHTS_GROUP_BY_OPTIONS.map((option) => ({
+    const items: Array<SingleSelectItem<InsightsFilters['groupBy']>> = options.map((option) => ({
         text: translate(`search.filters.groupBy.${option}`),
         value: option,
     }));
@@ -41,9 +46,9 @@ function InsightsGroupByDropdown({groupBy, onChange}: InsightsGroupByDropdownPro
             label={label}
             items={items}
             value={selectedItem}
-            defaultValue={DEFAULT_INSIGHTS_FILTERS.groupBy}
+            defaultValue={defaultGroupBy}
             closeOverlay={closeOverlay}
-            onChange={(item) => onChange(item?.value ?? DEFAULT_INSIGHTS_FILTERS.groupBy)}
+            onChange={(item) => onChange(item?.value ?? defaultGroupBy)}
         />
     );
 
diff --git a/src/pages/Insights/insightsGroupByOptions.ts b/src/pages/Insights/insightsGroupByOptions.ts
new file mode 100644
index 000000000000..cae9d72af9a8
--- /dev/null
+++ b/src/pages/Insights/insightsGroupByOptions.ts
@@ -0,0 +1,62 @@
+import {getDateRangeForPreset} from '@libs/SearchQueryUtils';
+
+import CONST from '@src/CONST';
+
+import {addDays, differenceInCalendarDays, differenceInMonths, parseISO} from 'date-fns';
+
+import type {InsightsFilters} from './insightsFilters';
+
+import {INSIGHTS_GROUP_BY_OPTIONS} from './insightsFilters';
+
+type InsightsGroupBy = InsightsFilters['groupBy'];
+
+/** Longest range, in days, still readable one point per day */
+const MAX_DAYS_GROUPED_BY_DAY = 62;
+
+const MIN_DAYS_GROUPED_BY_WEEK = 14;
+const MIN_MONTHS_BY_GROUP_BY = {
+    [CONST.SEARCH.GROUP_BY.MONTH]: 2,
+    [CONST.SEARCH.GROUP_BY.QUARTER]: 6,
+    [CONST.SEARCH.GROUP_BY.YEAR]: 24,
+} as const;
+
+/** Returns the Group by options that fit the date range, in the dropdown's order */
+function getInsightsGroupByOptions(date: InsightsFilters['date']): InsightsGroupBy[] {
+    // Custom date -> no group by
+    if ('on' in date) {
+        return [];
+    }
+
+    const boundaries = 'from' in date ? {start: date.from, end: date.to} : getDateRangeForPreset(date.preset);
+    if (!boundaries.start || !boundaries.end) {
+        return [];
+    }
+
+    const start = parseISO(boundaries.start);
+    const end = parseISO(boundaries.end);
+    const days = differenceInCalendarDays(end, start) + 1;
+    const months = differenceInMonths(addDays(end, 1), start);
+
+    return INSIGHTS_GROUP_BY_OPTIONS.filter((option) => {
+        switch (option) {
+            case CONST.SEARCH.GROUP_BY.DAY:
+                return days <= MAX_DAYS_GROUPED_BY_DAY;
+            case CONST.SEARCH.GROUP_BY.WEEK:
+                return days >= MIN_DAYS_GROUPED_BY_WEEK;
+            default:
+                return months >= MIN_MONTHS_BY_GROUP_BY[option];
+        }
+    });
+}
+
+/** Keeps the Group by when the options include it, otherwise picks the nearest option they do include. */
+function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[]): InsightsGroupBy {
+    if (options.length === 0 || options.includes(groupBy)) {
+        return groupBy;
+    }
+
+    const distanceFromSelection = (option: InsightsGroupBy) => Math.abs(INSIGHTS_GROUP_BY_OPTIONS.indexOf(option) - INSIGHTS_GROUP_BY_OPTIONS.indexOf(groupBy));
+    return options.reduce((nearest, option) => (distanceFromSelection(option) < distanceFromSelection(nearest) ? option : nearest));
+}
+
+export {getFittingGroupBy, getInsightsGroupByOptions};
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index 78498aa3f8a0..a681d276ee9e 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -13,6 +13,7 @@ import type {InsightsFilters} from './insightsFilters';
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 import {parseInsightsFilters} from './insightsFilterParsing';
 import DEFAULT_INSIGHTS_FILTERS from './insightsFilters';
+import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByOptions';
 import {buildInsightsQueryString} from './insightsQueries';
 
 type UseInsightsFiltersResult = {
@@ -29,6 +30,10 @@ type UseInsightsFiltersResult = {
     setFilters: (update: Partial<InsightsFilters>) => void;
 };
 
+function withFittingGroupBy(filters: InsightsFilters): InsightsFilters {
+    return {...filters, groupBy: getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date))};
+}
+
 function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersResult {
     const {searchKey} = INSIGHTS_DASHBOARD_SPECS[dashboard];
     const [activePolicyID, activePolicyIDMetadata] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
@@ -40,10 +45,10 @@ function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersR
         ...DEFAULT_INSIGHTS_FILTERS,
         groupCurrency: activePolicy?.outputCurrency ?? CONST.CURRENCY.USD,
     };
-    const filters: InsightsFilters = {...defaultFilters, ...parseInsightsFilters(storedQuery)};
+    const filters = withFittingGroupBy({...defaultFilters, ...parseInsightsFilters(storedQuery)});
 
     const setFilters = (update: Partial<InsightsFilters>) => {
-        setInsightsFilters(searchKey, buildInsightsQueryString({...filters, ...update}));
+        setInsightsFilters(searchKey, buildInsightsQueryString(withFittingGroupBy({...filters, ...update})));
     };
 
     return {
diff --git a/tests/ui/InsightsControlsTest.tsx b/tests/ui/InsightsControlsTest.tsx
index e0d32e742b8d..84f9f3390e0f 100644
--- a/tests/ui/InsightsControlsTest.tsx
+++ b/tests/ui/InsightsControlsTest.tsx
@@ -10,6 +10,7 @@ import InsightsGroupCurrencyControl from '@pages/Insights/controls/InsightsGroup
 import InsightsPageControls from '@pages/Insights/controls/InsightsPageControls';
 import InsightsWorkspaceControl from '@pages/Insights/controls/InsightsWorkspaceControl';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
+import {getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -122,6 +123,7 @@ describe('Insights controls', () => {
         renderWithProviders(
             <InsightsGroupByDropdown
                 groupBy={CONST.SEARCH.GROUP_BY.MONTH}
+                options={getInsightsGroupByOptions({preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS})}
                 onChange={onChange}
             />,
         );
@@ -142,6 +144,7 @@ describe('Insights controls', () => {
         renderWithProviders(
             <InsightsGroupByDropdown
                 groupBy={CONST.SEARCH.GROUP_BY.QUARTER}
+                options={getInsightsGroupByOptions({preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS})}
                 onChange={onChange}
             />,
         );
@@ -155,6 +158,47 @@ describe('Insights controls', () => {
         expect(onChange).toHaveBeenCalledWith(CONST.SEARCH.GROUP_BY.MONTH);
     });
 
+    it('only offers the groupings that fit the date range', async () => {
+        // Given the headline chart grouped by week over this month, which is too short for Month, Quarter and Year
+        const date: InsightsFilters['date'] = {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH};
+        renderWithProviders(
+            <InsightsGroupByDropdown
+                groupBy={CONST.SEARCH.GROUP_BY.WEEK}
+                options={getInsightsGroupByOptions(date)}
+                onChange={jest.fn()}
+            />,
+        );
+
+        // When the user opens the control
+        await openPill(/: Week$/);
+
+        // Then the groupings that would plot a single point are hidden
+        expect(screen.getByText(/^(Day|search\.filters\.groupBy\.day)$/)).toBeOnTheScreen();
+        expect(screen.queryByText(/^(Month|search\.filters\.groupBy\.month)$/)).toBeNull();
+        expect(screen.queryByText(/^(Quarter|search\.filters\.groupBy\.quarter)$/)).toBeNull();
+    });
+
+    it('resets the grouping to the nearest fit for month when the date range rules month out', async () => {
+        // Given the headline chart grouped by day over this month, which doesn't offer Month
+        const onChange = jest.fn();
+        const date: InsightsFilters['date'] = {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH};
+        renderWithProviders(
+            <InsightsGroupByDropdown
+                groupBy={CONST.SEARCH.GROUP_BY.DAY}
+                options={getInsightsGroupByOptions(date)}
+                onChange={onChange}
+            />,
+        );
+
+        // When the user resets the control
+        await openPill(/: Day$/);
+        fireEvent.press(screen.getByText(RESET));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the chart goes to Week, the closest offered grouping to the monthly default
+        expect(onChange).toHaveBeenCalledWith(CONST.SEARCH.GROUP_BY.WEEK);
+    });
+
     it('resets Workspace to every workspace', async () => {
         // Given a dashboard narrowed to one workspace
         const onChange = jest.fn();
diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index c342c2963900..2e0a74989730 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -42,12 +42,41 @@ async function getStoredQuery(): Promise<string | undefined> {
     return typeof searchFilter === 'object' ? (searchFilter as {query: string}).query : undefined;
 }
 
+async function storeFilters(filters: InsightsFilters) {
+    await Onyx.merge(ONYXKEYS.SEARCH_FILTERS, {[SPEND_SEARCH_KEY]: {query: buildInsightsQueryString(filters)}});
+    await waitForBatchedUpdates();
+}
+
 describe('useInsightsFilters', () => {
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
     });
 
     beforeEach(async () => {
+        // Only the clock is faked, so the presets cover a known range while Onyx keeps its real timers
+        jest.useFakeTimers({
+            now: new Date(2026, 9, 8),
+            doNotFake: [
+                'nextTick',
+                'setImmediate',
+                'clearImmediate',
+                'setInterval',
+                'clearInterval',
+                'setTimeout',
+                'clearTimeout',
+                'queueMicrotask',
+                'requestAnimationFrame',
+                'cancelAnimationFrame',
+                'requestIdleCallback',
+                'cancelIdleCallback',
+                'hrtime',
+                'performance',
+            ],
+        });
         await Onyx.clear();
         await waitForBatchedUpdates();
     });
@@ -73,7 +102,7 @@ describe('useInsightsFilters', () => {
         // Given a dashboard last left on a single workspace, grouped by quarter, in USD
         await setUpActivePolicy('PLN');
         const stored: InsightsFilters = {
-            date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_MONTH},
+            date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS},
             policyIDs: ['A1'],
             groupBy: CONST.SEARCH.GROUP_BY.QUARTER,
             groupCurrency: 'USD',
@@ -126,7 +155,7 @@ describe('useInsightsFilters', () => {
         await setUpActivePolicy('PLN');
         await Onyx.merge(ONYXKEYS.SEARCH_FILTERS, {
             [SPEND_SEARCH_KEY]: {
-                query: buildInsightsQueryString({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_MONTH}, policyIDs: ['A1'], groupBy: CONST.SEARCH.GROUP_BY.MONTH, groupCurrency: 'USD'}),
+                query: buildInsightsQueryString({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: ['A1'], groupBy: CONST.SEARCH.GROUP_BY.MONTH, groupCurrency: 'USD'}),
             },
         });
         await waitForBatchedUpdates();
@@ -140,6 +169,59 @@ describe('useInsightsFilters', () => {
         });
 
         // Then the stored query carries the new bucket and everything the other controls had already narrowed
-        expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD policyID:A1 date:last-month');
+        expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD policyID:A1 date:last-12-months');
+    });
+
+    it('opens on the nearest fitting grouping when the stored one no longer fits the date range', async () => {
+        // Given a dashboard stored as this month grouped by quarter, which plots a single point
+        await setUpActivePolicy('PLN');
+        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
+
+        // When the dashboard resolves its filters
+        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
+        await waitFor(() => expect(result.current.isResolved).toBe(true));
+
+        // Then it groups by week, the closest grouping to quarter that this month offers
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+    });
+
+    it('saves the nearest fitting grouping when a new date range rules out the selected one, and keeps it after', async () => {
+        // Given a dashboard over the last 12 months grouped by quarter
+        await setUpActivePolicy('PLN');
+        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
+        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
+        await waitFor(() => expect(result.current.isResolved).toBe(true));
+
+        // When the date is changed to this month, then back to the last 12 months
+        await act(async () => {
+            result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}});
+            await waitForBatchedUpdates();
+        });
+        const groupByOnThisMonth = (await getStoredQuery())?.split(' ').at(0);
+        await act(async () => {
+            result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}});
+            await waitForBatchedUpdates();
+        });
+
+        // Then week is saved as the new selection, so going back to a range that offers quarter doesn't restore it
+        expect(groupByOnThisMonth).toBe('groupBy:week');
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+    });
+
+    it('keeps the saved grouping on a single day, which has no grouping to pick', async () => {
+        // Given a dashboard over the last 12 months grouped by quarter
+        await setUpActivePolicy('PLN');
+        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
+        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
+        await waitFor(() => expect(result.current.isResolved).toBe(true));
+
+        // When the date is changed to a single day
+        await act(async () => {
+            result.current.setFilters({date: {on: '2026-03-04'}});
+            await waitForBatchedUpdates();
+        });
+
+        // Then the grouping stays quarter, ready for when a range is picked again
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
     });
 });
diff --git a/tests/unit/insightsGroupByOptionsTest.ts b/tests/unit/insightsGroupByOptionsTest.ts
new file mode 100644
index 000000000000..2d1492377ec1
--- /dev/null
+++ b/tests/unit/insightsGroupByOptionsTest.ts
@@ -0,0 +1,93 @@
+import type {InsightsFilters} from '@pages/Insights/insightsFilters';
+import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
+
+import CONST from '@src/CONST';
+
+const {DAY, WEEK, MONTH, QUARTER, YEAR} = CONST.SEARCH.GROUP_BY;
+const {THIS_MONTH, LAST_MONTH, YEAR_TO_DATE, LAST_12_MONTHS} = CONST.SEARCH.DATE_PRESETS;
+
+describe('insightsGroupByOptions', () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date(2026, 9, 8));
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    describe('getInsightsGroupByOptions', () => {
+        it.each<[string, InsightsFilters['date'], Array<InsightsFilters['groupBy']>]>([
+            ['this month', {preset: THIS_MONTH}, [DAY, WEEK]],
+            ['last month', {preset: LAST_MONTH}, [DAY, WEEK]],
+            ['year to date in October', {preset: YEAR_TO_DATE}, [WEEK, MONTH, QUARTER]],
+            ['last 12 months', {preset: LAST_12_MONTHS}, [WEEK, MONTH, QUARTER]],
+            ['a range under two weeks', {from: '2026-03-01', to: '2026-03-10'}, [DAY]],
+            ['a range of exactly two months', {from: '2026-01-01', to: '2026-02-28'}, [DAY, WEEK, MONTH]],
+            ['a range just over 62 days', {from: '2026-01-01', to: '2026-03-04'}, [WEEK, MONTH]],
+            ['a range of two years', {from: '2024-01-01', to: '2025-12-31'}, [WEEK, MONTH, QUARTER, YEAR]],
+            ['a single day', {on: '2026-03-04'}, []],
+        ])('offers the options that fit %s', (_label, date, expected) => {
+            // Given a dashboard reporting on that date range
+
+            // When the Group by options are listed
+            const options = getInsightsGroupByOptions(date);
+
+            // Then only groupings that give a readable trend for its length are offered, in the dropdown's order
+            expect(options).toEqual(expected);
+        });
+
+        it('offers Day and Week for year to date in January', () => {
+            // Given it's late January, so the year so far is a few weeks long
+            jest.setSystemTime(new Date(2026, 0, 20));
+
+            // When the Group by options are listed for year to date
+            const options = getInsightsGroupByOptions({preset: YEAR_TO_DATE});
+
+            // Then the range is too short for monthly points and short enough for daily ones
+            expect(options).toEqual([DAY, WEEK]);
+        });
+    });
+
+    describe('getFittingGroupBy', () => {
+        it('keeps a Group by the date range offers', () => {
+            // Given a monthly chart over the last 12 months, which offers Month
+
+            // When the Group by is fitted to the range
+            const groupBy = getFittingGroupBy(MONTH, getInsightsGroupByOptions({preset: LAST_12_MONTHS}));
+
+            // Then the selection stays as it is
+            expect(groupBy).toBe(MONTH);
+        });
+
+        it('switches to the nearest offered option when the range rules the selection out', () => {
+            // Given a quarterly chart moved to this month, which only offers Day and Week
+
+            // When the Group by is fitted to the range
+            const groupBy = getFittingGroupBy(QUARTER, getInsightsGroupByOptions({preset: THIS_MONTH}));
+
+            // Then Week is picked, the closest grouping to Quarter that the month offers
+            expect(groupBy).toBe(WEEK);
+        });
+
+        it('switches Day to Week when the range is too long for daily points', () => {
+            // Given a daily chart moved to the last 12 months
+
+            // When the Group by is fitted to the range
+            const groupBy = getFittingGroupBy(DAY, getInsightsGroupByOptions({preset: LAST_12_MONTHS}));
+
+            // Then Week is picked, the closest grouping to Day that the range offers
+            expect(groupBy).toBe(WEEK);
+        });
+
+        it('keeps the selection for a single day, which has no options to pick from', () => {
+            // Given a quarterly chart moved to a single day
+
+            // When the Group by is fitted to the day
+            const groupBy = getFittingGroupBy(QUARTER, getInsightsGroupByOptions({on: '2026-03-04'}));
+
+            // Then the saved selection is left alone, so it comes back when a range is picked again
+            expect(groupBy).toBe(QUARTER);
+        });
+    });
+});

From 614699b5559cf77824b499e34fb0660ea23c4696 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 17:59:00 +0100
Subject: [PATCH 357/781] make rest of agents pages dynamic

---
 src/ROUTES.ts                                 | 83 ++++++++++---------
 src/SCREENS.ts                                | 12 +--
 .../ModalStackNavigators/index.tsx            | 12 +--
 .../RELATIONS/SETTINGS_TO_RHP.ts              | 12 +--
 src/libs/Navigation/linkingConfig/config.ts   | 24 +++---
 src/libs/Navigation/types.ts                  | 12 +--
 .../replaceOptimisticAgentWithActualAgent.ts  |  6 +-
 src/pages/settings/Agents/AgentsPage.tsx      |  5 +-
 ...dAgentPage.tsx => DynamicAddAgentPage.tsx} | 26 +++---
 .../settings/Agents/DynamicEditAgentPage.tsx  |  7 +-
 ...wAgentPage.tsx => DynamicNewAgentPage.tsx} | 20 +++--
 ...Page.tsx => DynamicAddAgentAvatarPage.tsx} | 13 +--
 ...age.tsx => DynamicEditAgentAvatarPage.tsx} |  8 +-
 ...itNamePage.tsx => DynamicEditNamePage.tsx} | 14 ++--
 ...omptPage.tsx => DynamicEditPromptPage.tsx} | 16 ++--
 src/pages/workspace/WorkspaceAgentsPage.tsx   |  5 +-
 ...placeOptimisticAgentWithActualAgentTest.ts |  2 +-
 17 files changed, 148 insertions(+), 129 deletions(-)
 rename src/pages/settings/Agents/{AddAgentPage.tsx => DynamicAddAgentPage.tsx} (93%)
 rename src/pages/settings/Agents/{NewAgentPage.tsx => DynamicNewAgentPage.tsx} (89%)
 rename src/pages/settings/Agents/Fields/{AddAgentAvatarPage.tsx => DynamicAddAgentAvatarPage.tsx} (81%)
 rename src/pages/settings/Agents/Fields/{EditAgentAvatarPage.tsx => DynamicEditAgentAvatarPage.tsx} (96%)
 rename src/pages/settings/Agents/Fields/{EditNamePage.tsx => DynamicEditNamePage.tsx} (86%)
 rename src/pages/settings/Agents/Fields/{EditPromptPage.tsx => DynamicEditPromptPage.tsx} (90%)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 2ba41fa89bbe..8ab3e76cb56a 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -686,8 +686,8 @@ const DYNAMIC_ROUTES = {
         path: 'avatar-crop',
         entryScreens: [
             SCREENS.SETTINGS.PROFILE.AVATAR,
-            SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
-            SCREENS.SETTINGS.AGENTS.ADD_AVATAR,
+            SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR,
+            SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR,
             SCREENS.NEW_CHAT.NEW_CHAT_CONFIRM,
             SCREENS.WORKSPACE.PROFILE,
             SCREENS.WORKSPACE_CONFIRMATION.DYNAMIC_ROOT,
@@ -2091,11 +2091,55 @@ const DYNAMIC_ROUTES = {
         },
         queryParams: ['action', 'iouType', 'transactionID', 'reportID', 'upgradeBackTo', 'shouldSubmitExpense', 'upgradePath'],
     },
+    AGENT_NEW: {
+        path: 'new',
+        getRoute: ({policyID}: {policyID?: string} = {}) => {
+            const params = new URLSearchParams();
+            if (policyID) {
+                params.set('policyID', policyID);
+            }
+            const query = params.toString();
+            return `new${query ? `?${query}` : ''}` as const;
+        },
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
+    AGENT_ADD: {
+        path: 'new/custom',
+        getRoute: ({policyID}: {policyID?: string} = {}) => {
+            const params = new URLSearchParams();
+            if (policyID) {
+                params.set('policyID', policyID);
+            }
+            const query = params.toString();
+            return `new/custom${query ? `?${query}` : ''}` as const;
+        },
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
+    AGENT_ADD_AVATAR: {
+        path: 'new/custom/avatar',
+        getRoute: () => `new/custom/avatar` as const,
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
     AGENT_EDIT: {
         path: ':accountID/edit',
         getRoute: (accountID: number) => `${accountID}/edit` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
+    AGENT_EDIT_NAME: {
+        path: ':accountID/edit/name',
+        getRoute: (accountID: number) => `${accountID}/edit/name` as const,
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
+    AGENT_EDIT_PROMPT: {
+        path: ':accountID/edit/prompt',
+        getRoute: (accountID: number) => `${accountID}/edit/prompt` as const,
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
+    AGENT_EDIT_AVATAR: {
+        path: ':accountID/edit/avatar',
+        getRoute: (accountID: number) => `${accountID}/edit/avatar` as const,
+        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+    },
 } as const satisfies DynamicRoutes;
 
 const ROUTES = {
@@ -2608,41 +2652,6 @@ const ROUTES = {
     SETTINGS_WALLET_TRAVEL_CVV: 'settings/wallet/travel-cvv',
     SETTINGS_WALLET_TRAVEL_CVV_VERIFY_ACCOUNT: `settings/wallet/travel-cvv/${VERIFY_ACCOUNT}`,
     SETTINGS_AGENTS: 'settings/agents',
-    SETTINGS_AGENTS_NEW: {
-        route: 'settings/agents/new',
-        getRoute: ({policyID}: {policyID?: string} = {}) => {
-            const params = new URLSearchParams();
-            if (policyID) {
-                params.set('policyID', policyID);
-            }
-            const query = params.toString();
-            return `settings/agents/new${query ? `?${query}` : ''}` as const;
-        },
-    },
-    SETTINGS_AGENTS_ADD: {
-        route: 'settings/agents/new/custom',
-        getRoute: ({policyID}: {policyID?: string} = {}) => {
-            const params = new URLSearchParams();
-            if (policyID) {
-                params.set('policyID', policyID);
-            }
-            const query = params.toString();
-            return `settings/agents/new/custom${query ? `?${query}` : ''}` as const;
-        },
-    },
-    SETTINGS_AGENTS_ADD_AVATAR: 'settings/agents/new/custom/avatar',
-    SETTINGS_AGENTS_EDIT_NAME: {
-        route: 'settings/agents/:accountID/edit/name',
-        getRoute: (accountID: number) => `settings/agents/${accountID}/edit/name` as const,
-    },
-    SETTINGS_AGENTS_EDIT_PROMPT: {
-        route: 'settings/agents/:accountID/edit/prompt',
-        getRoute: (accountID: number) => `settings/agents/${accountID}/edit/prompt` as const,
-    },
-    SETTINGS_AGENTS_EDIT_AVATAR: {
-        route: 'settings/agents/:accountID/edit/avatar',
-        getRoute: (accountID: number) => `settings/agents/${accountID}/edit/avatar` as const,
-    },
     AGENT_REPORT: {
         route: 'settings/agents/r/:reportID',
         getRoute: (reportID: string) => `settings/agents/r/${reportID}` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index cf488c6da99b..568e31db0015 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -140,13 +140,13 @@ const SCREENS = {
 
         AGENTS: {
             ROOT: 'Settings_Agents',
-            NEW: 'Settings_Agents_New',
-            ADD: 'Settings_Agents_Add',
-            ADD_AVATAR: 'Settings_Agents_Add_Avatar',
+            DYNAMIC_NEW: 'Dynamic_Settings_Agents_New',
+            DYNAMIC_ADD: 'Dynamic_Settings_Agents_Add',
+            DYNAMIC_ADD_AVATAR: 'Dynamic_Settings_Agents_Add_Avatar',
             DYNAMIC_EDIT: 'Dynamic_Settings_Agents_Edit',
-            EDIT_NAME: 'Settings_Agents_Edit_Name',
-            EDIT_PROMPT: 'Settings_Agents_Edit_Prompt',
-            EDIT_AVATAR: 'Settings_Agents_Edit_Avatar',
+            DYNAMIC_EDIT_NAME: 'Dynamic_Settings_Agents_Edit_Name',
+            DYNAMIC_EDIT_PROMPT: 'Dynamic_Settings_Agents_Edit_Prompt',
+            DYNAMIC_EDIT_AVATAR: 'Dynamic_Settings_Agents_Edit_Avatar',
         },
 
         RULES: {
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index bd30307184a0..af46d9457b90 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -507,13 +507,13 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.UPDATE_PERSONAL_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/UpdatePersonalBankAccountPage').default,
     [SCREENS.SETTINGS.BANK_ACCOUNT_PURPOSE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/BankAccountPurposePage').default,
     [SCREENS.SETTINGS.RULES.ROOT]: () => require<ReactComponentModule>('../../../../pages/settings/Rules/ExpenseRulesPage').default,
-    [SCREENS.SETTINGS.AGENTS.NEW]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/NewAgentPage').default),
-    [SCREENS.SETTINGS.AGENTS.ADD]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/AddAgentPage').default),
-    [SCREENS.SETTINGS.AGENTS.ADD_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/AddAgentAvatarPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/DynamicNewAgentPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/DynamicAddAgentPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/DynamicAddAgentAvatarPage').default),
     [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/DynamicEditAgentPage').default),
-    [SCREENS.SETTINGS.AGENTS.EDIT_NAME]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditNamePage').default),
-    [SCREENS.SETTINGS.AGENTS.EDIT_PROMPT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditPromptPage').default),
-    [SCREENS.SETTINGS.AGENTS.EDIT_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/EditAgentAvatarPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/DynamicEditNamePage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/DynamicEditPromptPage').default),
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/settings/Agents/Fields/DynamicEditAgentAvatarPage').default),
     [SCREENS.SETTINGS.RULES.ADD]: () => require<ReactComponentModule>('../../../../pages/settings/Rules/AddRulePage').default,
     [SCREENS.SETTINGS.RULES.ADD_MERCHANT]: () => require<ReactComponentModule>('../../../../pages/settings/Rules/Fields/AddMerchantPage').default,
     [SCREENS.SETTINGS.RULES.ADD_RENAME_MERCHANT]: () => require<ReactComponentModule>('../../../../pages/settings/Rules/Fields/AddRenameMerchantPage').default,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
index f0e604cf71bf..83a7400fa6f8 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
@@ -72,13 +72,13 @@ const SETTINGS_TO_RHP: Partial<Record<keyof SettingsSplitNavigatorParamList, str
         SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN_ATM,
     ],
     [SCREENS.SETTINGS.AGENTS.ROOT]: [
-        SCREENS.SETTINGS.AGENTS.NEW,
-        SCREENS.SETTINGS.AGENTS.ADD,
-        SCREENS.SETTINGS.AGENTS.ADD_AVATAR,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR,
         SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT,
-        SCREENS.SETTINGS.AGENTS.EDIT_NAME,
-        SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
-        SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT,
+        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR,
         SCREENS.RIGHT_MODAL.AGENT_REPORT,
     ],
     [SCREENS.SETTINGS.RULES.ROOT]: [
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 2f5ca583cbed..e68881cf3c2d 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -373,15 +373,15 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             path: ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.AGENTS.NEW]: {
-                            path: ROUTES.SETTINGS_AGENTS_NEW.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW]: {
+                            path: DYNAMIC_ROUTES.AGENT_NEW.path,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.AGENTS.ADD]: {
-                            path: ROUTES.SETTINGS_AGENTS_ADD.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD]: {
+                            path: DYNAMIC_ROUTES.AGENT_ADD.path,
                         },
-                        [SCREENS.SETTINGS.AGENTS.ADD_AVATAR]: {
-                            path: ROUTES.SETTINGS_AGENTS_ADD_AVATAR,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR]: {
+                            path: DYNAMIC_ROUTES.AGENT_ADD_AVATAR.path,
                             exact: true,
                         },
                         [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: {
@@ -390,20 +390,20 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                                 accountID: Number,
                             },
                         },
-                        [SCREENS.SETTINGS.AGENTS.EDIT_NAME]: {
-                            path: ROUTES.SETTINGS_AGENTS_EDIT_NAME.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME]: {
+                            path: DYNAMIC_ROUTES.AGENT_EDIT_NAME.path,
                             parse: {
                                 accountID: Number,
                             },
                         },
-                        [SCREENS.SETTINGS.AGENTS.EDIT_PROMPT]: {
-                            path: ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT]: {
+                            path: DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path,
                             parse: {
                                 accountID: Number,
                             },
                         },
-                        [SCREENS.SETTINGS.AGENTS.EDIT_AVATAR]: {
-                            path: ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.route,
+                        [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR]: {
+                            path: DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.path,
                             parse: {
                                 accountID: Number,
                             },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 2f7fd1992110..96850a6ec981 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -281,23 +281,23 @@ type SettingsNavigatorParamList = {
         subPage?: string;
     };
     [SCREENS.SETTINGS.BANK_ACCOUNT_PURPOSE]: undefined;
-    [SCREENS.SETTINGS.AGENTS.NEW]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW]: {
         policyID?: string;
     };
-    [SCREENS.SETTINGS.AGENTS.ADD]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD]: {
         policyID?: string;
     };
-    [SCREENS.SETTINGS.AGENTS.ADD_AVATAR]: undefined;
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR]: undefined;
     [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT]: {
         accountID: number;
     };
-    [SCREENS.SETTINGS.AGENTS.EDIT_NAME]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME]: {
         accountID: number;
     };
-    [SCREENS.SETTINGS.AGENTS.EDIT_PROMPT]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT]: {
         accountID: number;
     };
-    [SCREENS.SETTINGS.AGENTS.EDIT_AVATAR]: {
+    [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR]: {
         accountID: number;
     };
     [SCREENS.SETTINGS.RULES.ADD]: undefined;
diff --git a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
index 3feabfd7a85a..7a73859b6269 100644
--- a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
+++ b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
@@ -29,9 +29,9 @@ import Onyx from 'react-native-onyx';
 
 const AGENT_SETTINGS_SCREENS = new Set<string>([
     SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT,
-    SCREENS.SETTINGS.AGENTS.EDIT_NAME,
-    SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
-    SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
+    SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME,
+    SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT,
+    SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR,
 ]);
 
 // Reports are only read inside the mapping callback, so connectWithoutView() is used. On app start the mapping can
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 5978edf14847..5e855f041274 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -18,10 +18,11 @@ import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButton
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
 import {View} from 'react-native';
@@ -45,7 +46,7 @@ function AgentsPage() {
     const newAgentButton = (
         <Button
             variant="success"
-            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_NEW.getRoute())}
+            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
diff --git a/src/pages/settings/Agents/AddAgentPage.tsx b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
similarity index 93%
rename from src/pages/settings/Agents/AddAgentPage.tsx
rename to src/pages/settings/Agents/DynamicAddAgentPage.tsx
index d9bc458715ac..55573be63cb3 100644
--- a/src/pages/settings/Agents/AddAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
@@ -12,6 +12,7 @@ import TextInput from '@components/TextInput';
 
 import useBeforeRemove from '@hooks/useBeforeRemove';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useKeyboardState from '@hooks/useKeyboardState';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -24,6 +25,7 @@ import {buildFileFromAvatarCropResult} from '@libs/AvatarCropUtils';
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import isInLandscapeModeUtil from '@libs/isInLandscapeMode';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -33,7 +35,7 @@ import {clearNewAgentAvatarDraft, clearNewAgentTemplate, createAgent, setNewAgen
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/AddAgentForm';
 import type NewAgentTemplate from '@src/types/onyx/NewAgentTemplate';
@@ -48,17 +50,17 @@ import {Platform, View} from 'react-native';
 import {PROMPT_MAX_AUTO_GROW_HEIGHT, PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE} from './const';
 import scrollToMultilineInput from './scrollToMultilineInput';
 
-type AddAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.ADD>;
+type DynamicAddAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD>;
 
-type AddAgentPageContentProps = {
+type DynamicAddAgentPageContentProps = {
     /** Route params (policyID) forwarded from the screen */
-    route: AddAgentPageProps['route'];
+    route: DynamicAddAgentPageProps['route'];
 
     /** Template picked in the "New agent" screen used to pre-fill the fields, or undefined for a blank agent */
     template: NewAgentTemplate | undefined;
 };
 
-function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
+function DynamicAddAgentPageContent({route, template}: DynamicAddAgentPageContentProps) {
     const StyleUtils = useStyleUtils();
     const policyID = route.params?.policyID;
     const {translate} = useLocalize();
@@ -198,7 +200,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
 
     return (
         <ScreenWrapper
-            testID={AddAgentPage.displayName}
+            testID={DynamicAddAgentPage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
             shouldEnableMaxHeight={shouldAutoGrowPromptInput}
@@ -206,7 +208,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
                     title={translate('addAgentPage.title')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_AGENTS_NEW.getRoute(policyID ? {policyID} : undefined))}
+                    onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_ADD.path))}
                 />
             </CollapsibleHeaderOnKeyboard>
             <FormProvider
@@ -228,7 +230,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
                         <AvatarButtonWithIcon
                             text={translate('addAgentPage.editAvatar')}
                             avatar={agentAvatar}
-                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_ADD_AVATAR)}
+                            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()))}
                             editIcon={expensifyIcons.Pencil}
                             editIconStyle={styles.smallEditIconAccount}
                             sentryLabel={CONST.SENTRY_LABEL.ADD_AGENT_PAGE.AVATAR}
@@ -280,7 +282,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     );
 }
 
-function AddAgentPage({route}: AddAgentPageProps) {
+function DynamicAddAgentPage({route}: DynamicAddAgentPageProps) {
     const [template, templateMetadata] = useOnyx(ONYXKEYS.NEW_AGENT_TEMPLATE);
 
     if (isLoadingOnyxValue(templateMetadata)) {
@@ -288,13 +290,13 @@ function AddAgentPage({route}: AddAgentPageProps) {
     }
 
     return (
-        <AddAgentPageContent
+        <DynamicAddAgentPageContent
             route={route}
             template={template}
         />
     );
 }
 
-AddAgentPage.displayName = 'AddAgentPage';
+DynamicAddAgentPage.displayName = 'DynamicAddAgentPage';
 
-export default AddAgentPage;
+export default DynamicAddAgentPage;
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 40cd359a18ff..758237f1118e 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -22,6 +22,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearAgentAvatarUpdateError, clearAgentNameUpdateError, clearAgentPromptUpdateError, deleteAgent} from '@libs/actions/Agent';
 import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -59,9 +60,9 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT.path));
-    const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(accountID));
-    const handleEditNamePress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_NAME.getRoute(accountID));
-    const handleEditPromptPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.getRoute(accountID));
+    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute(accountID)));
+    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)));
+    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)));
     const handleDeletePress = async () => {
         const ruleBotEnforcedPolicy = getRuleBotEnforcedPolicy(accountID, allPolicies);
         if (ruleBotEnforcedPolicy) {
diff --git a/src/pages/settings/Agents/NewAgentPage.tsx b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
similarity index 89%
rename from src/pages/settings/Agents/NewAgentPage.tsx
rename to src/pages/settings/Agents/DynamicNewAgentPage.tsx
index cc36f4ffef38..8cd5d0bf1d84 100644
--- a/src/pages/settings/Agents/NewAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
@@ -7,6 +7,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -16,6 +17,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
 import type {AgentAvatarID} from '@libs/Avatars/AgentAvatarCatalog';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -23,7 +25,7 @@ import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {clearNewAgentAvatarDraft, clearNewAgentTemplate, setNewAgentTemplate, getAgentTemplates} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type SuggestedAgent from '@src/types/onyx/SuggestedAgent';
 
@@ -73,9 +75,9 @@ function AgentTemplateCard({template, avatarID, onAdd}: AgentTemplateCardProps)
     );
 }
 
-type NewAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.NEW>;
+type DynamicNewAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW>;
 
-function NewAgentPage({route}: NewAgentPageProps) {
+function DynamicNewAgentPage({route}: DynamicNewAgentPageProps) {
     const policyID = route.params?.policyID;
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -98,14 +100,14 @@ function NewAgentPage({route}: NewAgentPageProps) {
     const handleBuildCustomAgent = () => {
         // Start from scratch — drop any previously stashed template and avatar draft.
         Promise.all([clearNewAgentTemplate(), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(ROUTES.SETTINGS_AGENTS_ADD.getRoute(policyID ? {policyID} : undefined));
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
         });
     };
 
     const handleAddTemplate = (template: SuggestedAgent, avatarID: AgentAvatarID) => {
         // Stash the template in Onyx (persists across refresh) and drop any stale avatar draft.
         Promise.all([setNewAgentTemplate({name: template.name, prompt: template.prompt, avatarID}), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(ROUTES.SETTINGS_AGENTS_ADD.getRoute(policyID ? {policyID} : undefined));
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
         });
     };
 
@@ -177,20 +179,20 @@ function NewAgentPage({route}: NewAgentPageProps) {
 
     return (
         <ScreenWrapper
-            testID={NewAgentPage.displayName}
+            testID={DynamicNewAgentPage.displayName}
             includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             offlineIndicatorStyle={styles.mtAuto}
         >
             <HeaderWithBackButton
                 title={translate('newAgentPage.title')}
-                onBackButtonPress={() => Navigation.goBack()}
+                onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_NEW.path))}
             />
             {body}
         </ScreenWrapper>
     );
 }
 
-NewAgentPage.displayName = 'NewAgentPage';
+DynamicNewAgentPage.displayName = 'DynamicNewAgentPage';
 
-export default NewAgentPage;
+export default DynamicNewAgentPage;
diff --git a/src/pages/settings/Agents/Fields/AddAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
similarity index 81%
rename from src/pages/settings/Agents/Fields/AddAgentAvatarPage.tsx
rename to src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
index 4682d0128bc0..5a54a3021b75 100644
--- a/src/pages/settings/Agents/Fields/AddAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
@@ -1,5 +1,6 @@
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useOnyx from '@hooks/useOnyx';
 
 import Log from '@libs/Log';
@@ -8,19 +9,19 @@ import Navigation from '@libs/Navigation/Navigation';
 import {setNewAgentAvatarPreset, setNewAgentUploadedAvatar} from '@userActions/Agent';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import {useNavigation} from '@react-navigation/native';
 import React from 'react';
 
-import type {OnSaveParams} from './EditAgentAvatarPage';
+import type {OnSaveParams} from './DynamicEditAgentAvatarPage';
 
-import {EditAgentAvatarContent} from './EditAgentAvatarPage';
+import {EditAgentAvatarContent} from './DynamicEditAgentAvatarPage';
 
-function AddAgentAvatarPage() {
+function DynamicAddAgentAvatarPage() {
     const navigation = useNavigation();
-    const returnRoute = ROUTES.SETTINGS_AGENTS_ADD.getRoute();
+    const returnRoute = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.path);
     const [avatarDraft, avatarDraftMetadata] = useOnyx(ONYXKEYS.AGENT_NEW_AVATAR_DRAFT);
     const initialPresetID = avatarDraft?.customExpensifyAvatarID;
 
@@ -55,4 +56,4 @@ function AddAgentAvatarPage() {
     );
 }
 
-export default AddAgentAvatarPage;
+export default DynamicAddAgentAvatarPage;
diff --git a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
similarity index 96%
rename from src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
rename to src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
index 09e38f4a5146..ec1945d60454 100644
--- a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
@@ -39,7 +39,7 @@ import type {FileObject} from '@src/types/utils/Attachment';
 import React, {useMemo, useState} from 'react';
 import {View} from 'react-native';
 
-type EditAgentAvatarPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_AVATAR>;
+type DynamicEditAgentAvatarPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR>;
 
 type ImageData = {
     uri: string;
@@ -232,7 +232,7 @@ function EditAgentAvatarContent({accountID, fallbackRoute, onSave, initialPreset
 
 EditAgentAvatarContent.displayName = 'EditAgentAvatarContent';
 
-function EditAgentAvatarPage({route}: EditAgentAvatarPageProps) {
+function DynamicEditAgentAvatarPage({route}: DynamicEditAgentAvatarPageProps) {
     const {accountID} = route.params;
     return (
         <EditAgentAvatarContent
@@ -242,8 +242,8 @@ function EditAgentAvatarPage({route}: EditAgentAvatarPageProps) {
     );
 }
 
-EditAgentAvatarPage.displayName = 'EditAgentAvatarPage';
+DynamicEditAgentAvatarPage.displayName = 'DynamicEditAgentAvatarPage';
 
 export type {OnSaveParams};
 export {EditAgentAvatarContent};
-export default EditAgentAvatarPage;
+export default DynamicEditAgentAvatarPage;
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
similarity index 86%
rename from src/pages/settings/Agents/Fields/EditNamePage.tsx
rename to src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
index 83b5347a2feb..b754ddd821db 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
@@ -24,9 +24,9 @@ import INPUT_IDS from '@src/types/form/EditAgentNameForm';
 
 import React from 'react';
 
-type EditNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_NAME>;
+type DynamicEditNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME>;
 
-function EditNamePage({route}: EditNamePageProps) {
+function DynamicEditNamePage({route}: DynamicEditNamePageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const accountID = route.params.accountID;
@@ -36,19 +36,19 @@ function EditNamePage({route}: EditNamePageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
         updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
-        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)));
+        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)));
     };
 
     return (
         <ScreenWrapper
-            testID={EditNamePage.displayName}
+            testID={DynamicEditNamePage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('editAgentNamePage.title')}
-                onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)))}
+                onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)))}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM}
@@ -74,6 +74,6 @@ function EditNamePage({route}: EditNamePageProps) {
     );
 }
 
-EditNamePage.displayName = 'EditNamePage';
+DynamicEditNamePage.displayName = 'DynamicEditNamePage';
 
-export default EditNamePage;
+export default DynamicEditNamePage;
diff --git a/src/pages/settings/Agents/Fields/EditPromptPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
similarity index 90%
rename from src/pages/settings/Agents/Fields/EditPromptPage.tsx
rename to src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
index 82349412396f..0488cc692c42 100644
--- a/src/pages/settings/Agents/Fields/EditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
@@ -16,6 +16,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentPrompt} from '@libs/actions/Agent';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -25,6 +26,7 @@ import scrollToMultilineInput from '@pages/settings/Agents/scrollToMultilineInpu
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/EditAgentPromptForm';
 
@@ -32,9 +34,9 @@ import {Str} from 'expensify-common';
 import React, {useRef} from 'react';
 import {Platform, View} from 'react-native';
 
-type EditPromptPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_PROMPT>;
+type DynamicEditPromptPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT>;
 
-function EditPromptPage({route}: EditPromptPageProps) {
+function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -61,7 +63,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>) => {
         updateAgentPrompt(accountID, values[INPUT_IDS.PROMPT].trim(), agentPrompt?.prompt ?? '');
-        Navigation.goBack();
+        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)));
     };
 
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, (e) => {
@@ -85,7 +87,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
 
     return (
         <ScreenWrapper
-            testID={EditPromptPage.displayName}
+            testID={DynamicEditPromptPage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
             shouldEnableMaxHeight={shouldAutoGrowPromptInput}
@@ -93,7 +95,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
                     title={translate('editAgentPromptPage.title')}
-                    onBackButtonPress={() => Navigation.goBack()}
+                    onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)))}
                 />
             </CollapsibleHeaderOnKeyboard>
             <FormProvider
@@ -147,6 +149,6 @@ function EditPromptPage({route}: EditPromptPageProps) {
     );
 }
 
-EditPromptPage.displayName = 'EditPromptPage';
+DynamicEditPromptPage.displayName = 'DynamicEditPromptPage';
 
-export default EditPromptPage;
+export default DynamicEditPromptPage;
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 84b995d02a62..f84f40307f77 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -17,6 +17,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 
@@ -26,7 +27,7 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import DeepValueOf from '@src/types/utils/DeepValueOf';
 
@@ -56,7 +57,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const newAgentButton = (
         <Button
             variant="success"
-            onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_NEW.getRoute())}
+            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
diff --git a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
index fbc1a17e7ab9..ea1e3093cc14 100644
--- a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
+++ b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
@@ -265,7 +265,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
                         index: 1,
                         routes: [
                             {key: 'agents-edit-route-key', name: SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT, params: {accountID: String(optimisticAccountID)}},
-                            {key: 'agents-edit-name-route-key', name: SCREENS.SETTINGS.AGENTS.EDIT_NAME, params: {accountID: String(optimisticAccountID)}},
+                            {key: 'agents-edit-name-route-key', name: SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME, params: {accountID: String(optimisticAccountID)}},
                         ],
                     },
                 },

From f1aca2f393b773a82562a2b95cc7ed9f588be371 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 18:09:11 +0100
Subject: [PATCH 358/781] fix routing conflic + some ts

---
 config/eslint/eslint.seatbelt.tsv                 | 14 +++++++-------
 src/ROUTES.ts                                     | 12 ++++++------
 .../Profile/Avatar/AgentProfileAvatar.tsx         |  4 ++--
 .../pages/settings/AddAgentAvatarPageTest.tsx     | 15 ++++++++-------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index e31e328848c9..a6b8f1b9cb23 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -1189,14 +1189,14 @@
 "../../src/pages/SetDefaultWorkspacePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"react-hooks/refs"	1
-"../../src/pages/settings/Agents/AddAgentPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/AgentsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicAddAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicAgentsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/DynamicEditAgentPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/Fields/EditNamePage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/Fields/EditPromptPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/settings/Agents/Fields/EditPromptPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/NewAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicNewAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AppDownloadLinks.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Copilot/CopilotPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Copilot/CopilotPage.tsx"	"no-restricted-imports"	1
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 8ab3e76cb56a..4270e2ed4dc0 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2092,32 +2092,32 @@ const DYNAMIC_ROUTES = {
         queryParams: ['action', 'iouType', 'transactionID', 'reportID', 'upgradeBackTo', 'shouldSubmitExpense', 'upgradePath'],
     },
     AGENT_NEW: {
-        path: 'new',
+        path: 'new-agent',
         getRoute: ({policyID}: {policyID?: string} = {}) => {
             const params = new URLSearchParams();
             if (policyID) {
                 params.set('policyID', policyID);
             }
             const query = params.toString();
-            return `new${query ? `?${query}` : ''}` as const;
+            return `new-agent${query ? `?${query}` : ''}` as const;
         },
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
     AGENT_ADD: {
-        path: 'new/custom',
+        path: 'new-agent/custom',
         getRoute: ({policyID}: {policyID?: string} = {}) => {
             const params = new URLSearchParams();
             if (policyID) {
                 params.set('policyID', policyID);
             }
             const query = params.toString();
-            return `new/custom${query ? `?${query}` : ''}` as const;
+            return `new-agent/custom${query ? `?${query}` : ''}` as const;
         },
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
     AGENT_ADD_AVATAR: {
-        path: 'new/custom/avatar',
-        getRoute: () => `new/custom/avatar` as const,
+        path: 'new-agent/custom/avatar',
+        getRoute: () => `new-agent/custom/avatar` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
     AGENT_EDIT: {
diff --git a/src/pages/settings/Profile/Avatar/AgentProfileAvatar.tsx b/src/pages/settings/Profile/Avatar/AgentProfileAvatar.tsx
index 8706a5ae7610..2b8101dd7292 100644
--- a/src/pages/settings/Profile/Avatar/AgentProfileAvatar.tsx
+++ b/src/pages/settings/Profile/Avatar/AgentProfileAvatar.tsx
@@ -3,8 +3,8 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
 import Navigation from '@libs/Navigation/Navigation';
 
-import type {OnSaveParams} from '@pages/settings/Agents/Fields/EditAgentAvatarPage';
-import {EditAgentAvatarContent} from '@pages/settings/Agents/Fields/EditAgentAvatarPage';
+import type {OnSaveParams} from '@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage';
+import {EditAgentAvatarContent} from '@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage';
 
 import {updateAvatar} from '@userActions/PersonalDetails';
 
diff --git a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
index ab6b3329b79f..4a553d0b1f15 100644
--- a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
@@ -2,13 +2,14 @@ import {render, waitFor} from '@testing-library/react-native';
 
 import useOnyx from '@hooks/useOnyx';
 
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
-import AddAgentAvatarPage from '@pages/settings/Agents/Fields/AddAgentAvatarPage';
-import type {OnSaveParams} from '@pages/settings/Agents/Fields/EditAgentAvatarPage';
+import AddAgentAvatarPage from '@pages/settings/Agents/Fields/DynamicAddAgentAvatarPage';
+import type {OnSaveParams} from '@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import type * as ReactNavigationNative from '@react-navigation/native';
 
@@ -90,7 +91,7 @@ describe('AddAgentAvatarPage', () => {
 
         expect(mockSetNewAgentAvatarPreset).toHaveBeenCalledWith('bot-avatar--blue');
         expect(mockSetNewAgentUploadedAvatar).not.toHaveBeenCalled();
-        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute()));
+        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute())));
     });
 
     it('serializes the uploaded file into the Onyx draft and navigates back when save is called with a file', async () => {
@@ -100,7 +101,7 @@ describe('AddAgentAvatarPage', () => {
 
         expect(mockSetNewAgentUploadedAvatar).toHaveBeenCalledWith(MOCK_FILE);
         expect(mockSetNewAgentAvatarPreset).not.toHaveBeenCalled();
-        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute()));
+        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute())));
     });
 
     it('waits for the uploaded-photo write to persist before navigating back', async () => {
@@ -119,7 +120,7 @@ describe('AddAgentAvatarPage', () => {
 
         resolveWrite();
 
-        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute()));
+        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute())));
     });
 
     it('logs a warning and still navigates back when the draft write fails', async () => {
@@ -128,7 +129,7 @@ describe('AddAgentAvatarPage', () => {
         render(<AddAgentAvatarPage />);
         mockEditAgentAvatarOnSave?.({file: MOCK_FILE, uri: 'file://photo.jpg'});
 
-        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute()));
+        await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute())));
         expect(mockLogWarn).toHaveBeenCalledTimes(1);
         expect(mockLogWarn.mock.calls.at(0)?.at(0)).toBe('Failed to persist the new-agent avatar draft');
     });

From 7003dd63b175081fbbb4d3e851038dc9bb6a90fe Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 18:31:34 +0100
Subject: [PATCH 359/781] fix entry screens

---
 src/ROUTES.ts                                          | 10 +++++-----
 .../Agents/Fields/DynamicEditAgentAvatarPage.tsx       |  3 ++-
 .../settings/Agents/Fields/DynamicEditNamePage.tsx     |  5 +++--
 .../settings/Agents/Fields/DynamicEditPromptPage.tsx   |  5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 4270e2ed4dc0..39fa5cacad6b 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2113,12 +2113,12 @@ const DYNAMIC_ROUTES = {
             const query = params.toString();
             return `new-agent/custom${query ? `?${query}` : ''}` as const;
         },
-        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW],
     },
     AGENT_ADD_AVATAR: {
         path: 'new-agent/custom/avatar',
         getRoute: () => `new-agent/custom/avatar` as const,
-        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD],
     },
     AGENT_EDIT: {
         path: ':accountID/edit',
@@ -2128,17 +2128,17 @@ const DYNAMIC_ROUTES = {
     AGENT_EDIT_NAME: {
         path: ':accountID/edit/name',
         getRoute: (accountID: number) => `${accountID}/edit/name` as const,
-        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
     AGENT_EDIT_PROMPT: {
         path: ':accountID/edit/prompt',
         getRoute: (accountID: number) => `${accountID}/edit/prompt` as const,
-        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
     AGENT_EDIT_AVATAR: {
         path: ':accountID/edit/avatar',
         getRoute: (accountID: number) => `${accountID}/edit/avatar` as const,
-        entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
 } as const satisfies DynamicRoutes;
 
diff --git a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
index ec1945d60454..aa05cc1305e7 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
@@ -11,6 +11,7 @@ import Text from '@components/Text';
 
 import useAvatarCrop from '@hooks/useAvatarCrop';
 import useDiscardChangesConfirmation from '@hooks/useDiscardChangesConfirmation';
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
@@ -237,7 +238,7 @@ function DynamicEditAgentAvatarPage({route}: DynamicEditAgentAvatarPageProps) {
     return (
         <EditAgentAvatarContent
             accountID={accountID}
-            fallbackRoute={createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID))}
+            fallbackRoute={useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.path)}
         />
     );
 }
diff --git a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
index b754ddd821db..eb6970cfe6b9 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
@@ -6,6 +6,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import TextInput from '@components/TextInput';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -36,7 +37,7 @@ function DynamicEditNamePage({route}: DynamicEditNamePageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
         updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
-        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)));
+        Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_NAME.path));
     };
 
     return (
@@ -48,7 +49,7 @@ function DynamicEditNamePage({route}: DynamicEditNamePageProps) {
         >
             <HeaderWithBackButton
                 title={translate('editAgentNamePage.title')}
-                onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)))}
+                onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_NAME.path))}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM}
diff --git a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
index 0488cc692c42..f87211e02711 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
@@ -7,6 +7,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 
+import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useKeyboardState from '@hooks/useKeyboardState';
@@ -63,7 +64,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>) => {
         updateAgentPrompt(accountID, values[INPUT_IDS.PROMPT].trim(), agentPrompt?.prompt ?? '');
-        Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)));
+        Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path));
     };
 
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, (e) => {
@@ -95,7 +96,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
                     title={translate('editAgentPromptPage.title')}
-                    onBackButtonPress={() => Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)))}
+                    onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path))}
                 />
             </CollapsibleHeaderOnKeyboard>
             <FormProvider

From 073dfed4d13e87272625a38be4dfa2dec5c6e1d9 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 8 Oct 2026 18:40:42 +0100
Subject: [PATCH 360/781] pass skipMatchingFullScreenRoute on agents routes

---
 src/pages/settings/Agents/AgentsPage.tsx           | 2 +-
 src/pages/settings/Agents/DynamicAddAgentPage.tsx  | 2 +-
 src/pages/settings/Agents/DynamicEditAgentPage.tsx | 6 +++---
 src/pages/settings/Agents/DynamicNewAgentPage.tsx  | 4 ++--
 src/pages/workspace/WorkspaceAgentsPage.tsx        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 5e855f041274..15b045bf944c 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -46,7 +46,7 @@ function AgentsPage() {
     const newAgentButton = (
         <Button
             variant="success"
-            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
+            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()), {skipMatchingFullScreenRoute: true})}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
diff --git a/src/pages/settings/Agents/DynamicAddAgentPage.tsx b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
index 55573be63cb3..8390db102066 100644
--- a/src/pages/settings/Agents/DynamicAddAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
@@ -230,7 +230,7 @@ function DynamicAddAgentPageContent({route, template}: DynamicAddAgentPageConten
                         <AvatarButtonWithIcon
                             text={translate('addAgentPage.editAvatar')}
                             avatar={agentAvatar}
-                            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()))}
+                            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true})}
                             editIcon={expensifyIcons.Pencil}
                             editIconStyle={styles.smallEditIconAccount}
                             sentryLabel={CONST.SENTRY_LABEL.ADD_AGENT_PAGE.AVATAR}
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 758237f1118e..2228965899f4 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -60,9 +60,9 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT.path));
-    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute(accountID)));
-    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)));
-    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)));
+    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
+    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
+    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
     const handleDeletePress = async () => {
         const ruleBotEnforcedPolicy = getRuleBotEnforcedPolicy(accountID, allPolicies);
         if (ruleBotEnforcedPolicy) {
diff --git a/src/pages/settings/Agents/DynamicNewAgentPage.tsx b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
index 8cd5d0bf1d84..03f811ce3af5 100644
--- a/src/pages/settings/Agents/DynamicNewAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
@@ -100,14 +100,14 @@ function DynamicNewAgentPage({route}: DynamicNewAgentPageProps) {
     const handleBuildCustomAgent = () => {
         // Start from scratch — drop any previously stashed template and avatar draft.
         Promise.all([clearNewAgentTemplate(), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)), {skipMatchingFullScreenRoute: true});
         });
     };
 
     const handleAddTemplate = (template: SuggestedAgent, avatarID: AgentAvatarID) => {
         // Stash the template in Onyx (persists across refresh) and drop any stale avatar draft.
         Promise.all([setNewAgentTemplate({name: template.name, prompt: template.prompt, avatarID}), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)), {skipMatchingFullScreenRoute: true});
         });
     };
 
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index f84f40307f77..f47bbcfd3633 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -57,7 +57,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const newAgentButton = (
         <Button
             variant="success"
-            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
+            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()), {skipMatchingFullScreenRoute: true})}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>

From fcf9bdfa6eda6b9f2e7c2c8f5b311755f6bff495 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 8 Oct 2026 19:11:43 +0000
Subject: [PATCH 361/781] Validate the vacation delegate clear date in the
 Profile timezone

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/VacationDelegateForm.tsx      | 15 ++++++-------
 src/libs/VacationDelegateUtils.ts            | 13 ++++++++++++
 tests/unit/libs/VacationDelegateUtilsTest.ts | 22 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 2ac867b6e5bc..28499e7eb1e5 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -12,9 +12,9 @@ import {
     getVacationDelegateClearDateTime,
     getVacationDelegateLocalClearDateTime,
     isVacationDelegateClearAfterTooSoon,
+    isVacationDelegateClearDatePassed,
     isVacationDelegateExpired,
 } from '@libs/VacationDelegateUtils';
-import {getDatePassedError} from '@libs/ValidationUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/VacationDelegateForm';
@@ -66,7 +66,7 @@ type VacationDelegateFormProps = {
 
 function VacationDelegateForm({vacationDelegate, description, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
     const styles = useThemeStyles();
-    const {translate, dateFnsLocale} = useLocalize();
+    const {translate, dateFnsLocale, getLocalDateFromDatetime} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['CalendarSolid', 'Trashcan']);
     const {timezone} = useCurrentUserPersonalDetails();
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
@@ -88,9 +88,9 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             return formErrors;
         }
 
-        const dateError = getDatePassedError(translate, values[INPUT_IDS.CLEAR_AFTER_DATE]);
-        if (dateError) {
-            formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = dateError;
+        // Both checks read the picked date and time in the Profile timezone, the same one clearAfter is built from, not the device's
+        if (isVacationDelegateClearDatePassed(values[INPUT_IDS.CLEAR_AFTER_DATE], timezone?.selected)) {
+            formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = translate('common.error.dateInvalid');
         } else if (isVacationDelegateClearAfterTooSoon(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected))) {
             formErrors[INPUT_IDS.CLEAR_AFTER_TIME] = translate('common.error.invalidTimeShouldBeFuture');
         }
@@ -127,13 +127,14 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
                 onPress={onChangeDelegate}
             />
             <View style={styles.ph5}>
-                {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups */}
+                {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups.
+                    The earliest day is today in the Profile timezone, so it matches the validation even when the device is in another timezone. */}
                 <InputWrapper
                     InputComponent={DatePicker}
                     inputID={INPUT_IDS.CLEAR_AFTER_DATE}
                     label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
                     defaultValue={savedClearDate}
-                    minDate={new Date()}
+                    minDate={getLocalDateFromDatetime()}
                     icon={icons.CalendarSolid}
                     shouldForceActiveLabel={false}
                     shouldKeepCalendarIconWhenSelected
diff --git a/src/libs/VacationDelegateUtils.ts b/src/libs/VacationDelegateUtils.ts
index 43dce0a20e1d..f40271c4f9f5 100644
--- a/src/libs/VacationDelegateUtils.ts
+++ b/src/libs/VacationDelegateUtils.ts
@@ -79,6 +79,18 @@ function isVacationDelegateExpired(clearAfter: string | undefined): boolean {
     return !!clearAfter && clearAfter <= DateUtils.getDBTime();
 }
 
+/**
+ * Whether the picked clear date (yyyy-MM-dd) has already ended in the given timezone. The day is read in the user's Profile timezone,
+ * not the device's, so a device in another timezone doesn't reject a day that hasn't ended yet for the user, or accept one that has.
+ */
+function isVacationDelegateClearDatePassed(clearDate: string, timezone: SelectedTimezone | undefined): boolean {
+    if (!isValid(parse(clearDate, CONST.DATE.FNS_FORMAT_STRING, new Date()))) {
+        return true;
+    }
+
+    return isVacationDelegateExpired(getVacationDelegateClearAfter(clearDate, undefined, timezone));
+}
+
 /**
  * Whether the picked clearAfter datetime is less than one minute from now. Such a delegate could clear while the request is still in
  * flight, so the form asks for a time at least one minute ahead.
@@ -95,5 +107,6 @@ export {
     getVacationDelegateLocalClearDateTime,
     formatVacationDelegateClearDateTime,
     isVacationDelegateExpired,
+    isVacationDelegateClearDatePassed,
     isVacationDelegateClearAfterTooSoon,
 };
diff --git a/tests/unit/libs/VacationDelegateUtilsTest.ts b/tests/unit/libs/VacationDelegateUtilsTest.ts
index da5de9ff102d..0d82e21570ca 100644
--- a/tests/unit/libs/VacationDelegateUtilsTest.ts
+++ b/tests/unit/libs/VacationDelegateUtilsTest.ts
@@ -5,6 +5,7 @@ import {
     getVacationDelegateClearDateTime,
     getVacationDelegateLocalClearDateTime,
     isVacationDelegateClearAfterTooSoon,
+    isVacationDelegateClearDatePassed,
     isVacationDelegateExpired,
 } from '@libs/VacationDelegateUtils';
 
@@ -98,6 +99,27 @@ describe('VacationDelegateUtils', () => {
         });
     });
 
+    describe('isVacationDelegateClearDatePassed', () => {
+        it('reads the clear date in the Profile timezone, not the device timezone', () => {
+            // Given it is 2026-10-08 03:00 UTC: still Oct 7 in Los Angeles, already Oct 8 in Tokyo, and Oct 8 on the UTC test device
+            jest.setSystemTime(new Date('2026-10-08T03:00:00Z'));
+
+            // When Oct 7 is checked for a user whose Profile timezone is Los Angeles, and for one whose Profile timezone is Tokyo
+            // Then it is still open in Los Angeles, even though the device's day has moved on, and it has ended in Tokyo
+            expect(isVacationDelegateClearDatePassed('2026-10-07', 'America/Los_Angeles')).toBe(false);
+            expect(isVacationDelegateClearDatePassed('2026-10-07', 'Asia/Tokyo')).toBe(true);
+            expect(isVacationDelegateClearDatePassed('2026-10-06', 'America/Los_Angeles')).toBe(true);
+            expect(isVacationDelegateClearDatePassed('2026-10-08', 'Asia/Tokyo')).toBe(false);
+        });
+
+        it('treats a date that does not parse as passed', () => {
+            // Given a clear date that isn't a yyyy-MM-dd date
+            // When it is checked
+            // Then it is rejected, so the form shows the invalid date error instead of building a clearAfter from it
+            expect(isVacationDelegateClearDatePassed('not-a-date', 'America/Los_Angeles')).toBe(true);
+        });
+    });
+
     describe('isVacationDelegateClearAfterTooSoon', () => {
         it('is true when the clear after datetime is less than one minute from now', () => {
             // Given the current time is 2026-09-28 12:00 UTC

From f8accf831dfe3f1e2f03a2794b26f8537dbaee19 Mon Sep 17 00:00:00 2001
From: "Carlos Miceli (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 8 Oct 2026 19:56:03 +0000
Subject: [PATCH 362/781] Add Join my company workspace option to help article

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
---
 .../getting-started/Join-your-company's-workspace.md            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
index 6564b3a6164b..8e12736a204b 100644
--- a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
+++ b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
@@ -19,6 +19,8 @@ Ask one of your company's Expensify workspace admins to send you an invite using
 
 Now, check your email inbox for the invite to join your company's workspace. If you don't see it, check your **Spam** and **Archive** folders.
 
+If you're signing up without an invite, select **Join my company workspace** when asked **What do you want to do today?** After you add and verify your work email, Expensify shows the workspaces at your company that you can join. Click **Join now**, or **Ask to join** if the workspace needs admin approval.
+
 ---
 
 # Step 1: Access Expensify

From ccfeb578f78e0452aef3b4f8c9b720339286913b Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 22:42:03 +0100
Subject: [PATCH 363/781] fix: keep distance rates enabled for commuter
 exclusions

---
 src/languages/de.ts                           |  2 +
 src/languages/el.ts                           |  2 +
 src/languages/en.ts                           |  2 +
 src/languages/es.ts                           |  2 +
 src/languages/fr.ts                           |  2 +
 src/languages/it.ts                           |  2 +
 src/languages/ja.ts                           |  2 +
 src/languages/nl.ts                           |  2 +
 src/languages/pl.ts                           |  2 +
 src/languages/pt-BR.ts                        |  2 +
 src/languages/zh-hans.ts                      |  1 +
 .../hooks/useTimeSensitiveHomeAddress.ts      |  1 -
 .../WorkspaceMoreFeaturesPage/index.tsx       | 19 +++++++-
 src/selectors/Policy.ts                       |  5 +--
 tests/ui/ProfilePageTest.tsx                  |  6 +--
 tests/ui/WorkspaceMoreFeaturesPageTest.tsx    | 43 +++++++++++++++++++
 .../hooks/useTimeSensitiveHomeAddress.test.ts | 13 ++++++
 17 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 556d4c464f55..7487abb03d2d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6564,6 +6564,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
             distanceRates: {
                 title: 'Kilometersätze',
                 subtitle: 'Sätze Tarife fest, aktualisiere sie und setze sie durch.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Du kannst Distanzsätze nicht deaktivieren, solange Ausschlüsse für den Arbeitsweg zwischen Zuhause und Büro aktiv sind. Stelle zuerst „Arbeitswege ausschließen“ auf „Keine Arbeitswege ausschließen“.',
             },
             perDiem: {
                 title: 'Tagegeld',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 584d2e962dc3..4db44e509df9 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -6672,6 +6672,8 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             distanceRates: {
                 title: 'Τιμές χιλιομετρικής αποζημίωσης',
                 subtitle: 'Προσθέστε, ενημερώστε και εφαρμόστε τιμές.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Δεν μπορείτε να απενεργοποιήσετε τις χιλιομετρικές αποζημιώσεις όσο είναι ενεργοί οι αποκλεισμοί μετακίνησης μεταξύ σπιτιού και γραφείου. Ορίστε πρώτα την επιλογή «Εξαίρεση μετακινήσεων» σε «Να μην εξαιρούνται οι μετακινήσεις».',
             },
             perDiem: {
                 title: 'Ημερήσια αποζημίωση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 433f16aa6e91..10c98c04e52e 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6893,6 +6893,8 @@ const translations = {
             distanceRates: {
                 title: 'Distance rates',
                 subtitle: 'Add, update, and enforce rates.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'You can’t turn off Distance rates while Home and office commuter exclusions are enabled. First set Exclude commutes to “Do not exclude commutes”.',
             },
             perDiem: {
                 title: 'Per diem',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index c7a03f7ac4d4..75f82a1a5c96 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6426,6 +6426,8 @@ ${amount} para ${merchant} - ${date}`,
             distanceRates: {
                 title: 'Tasas de distancia',
                 subtitle: 'Añade, actualiza y haz cumplir las tasas.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'No puedes desactivar las tasas de distancia mientras estén activas las exclusiones de desplazamientos entre casa y oficina. Primero establece Excluir desplazamientos en «No excluir desplazamientos».',
             },
             perDiem: {
                 title: 'Per diem',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 73091192f9ea..5b7297dac8f1 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6570,6 +6570,8 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
             distanceRates: {
                 title: 'Taux de distance',
                 subtitle: 'Ajoutez, mettez à jour et appliquez les taux.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Vous ne pouvez pas désactiver les taux de distance tant que les exclusions des trajets entre le domicile et le bureau sont activées. Définissez d’abord Exclure les trajets sur « Ne pas exclure les trajets ».',
             },
             perDiem: {
                 title: 'Indemnité journalière',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 2873b5767c73..a791172d0cf3 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6517,6 +6517,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
             distanceRates: {
                 title: 'Tariffe chilometriche',
                 subtitle: 'Aggiungi, aggiorna e applica le tariffe.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Non puoi disattivare le tariffe di distanza mentre sono attive le esclusioni per i tragitti tra casa e ufficio. Imposta prima Escludi tragitti su “Non escludere i tragitti”.',
             },
             perDiem: {
                 title: 'Diaria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 12997657181a..f864caeffd49 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6442,6 +6442,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
             distanceRates: {
                 title: '距離単価',
                 subtitle: 'レートを追加、更新し、適用します。',
+                disableLockedByCommuterExclusionsPrompt:
+                    '自宅とオフィス間の通勤除外が有効な間は、距離単価をオフにできません。距離単価をオフにするには、まず「通勤を除外」を「通勤を除外しない」に設定してください。',
             },
             perDiem: {
                 title: '日当',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c6c6f9bbd6df..c3571b9c56c7 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6510,6 +6510,8 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             distanceRates: {
                 title: 'Kilometertarieven',
                 subtitle: 'Tarieven toevoegen, bijwerken en afdwingen.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Je kunt kilometertarieven niet uitschakelen zolang woon-werkverkeer tussen huis en kantoor is uitgesloten. Stel Woon-werkverkeer uitsluiten eerst in op ‘Woon-werkverkeer niet uitsluiten’.',
             },
             perDiem: {
                 title: 'Dagvergoeding',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 45afb2cf89e4..1434d5eb3d35 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6532,6 +6532,8 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
             distanceRates: {
                 title: 'Stawki za dystans',
                 subtitle: 'Dodawaj, aktualizuj i egzekwuj stawki.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Nie możesz wyłączyć stawek za dystans, gdy aktywne są wykluczenia dojazdów między domem a biurem. Najpierw ustaw Wykluczaj dojazdy na „Nie wykluczaj dojazdów”.',
             },
             perDiem: {
                 title: 'Dieta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 4905ce40d7bd..71f61d09455f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6508,6 +6508,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
             distanceRates: {
                 title: 'Taxas de distância',
                 subtitle: 'Adicione, atualize e aplique tarifas.',
+                disableLockedByCommuterExclusionsPrompt:
+                    'Você não pode desativar as taxas de distância enquanto as exclusões de deslocamento entre casa e escritório estiverem ativas. Primeiro, defina Excluir deslocamentos como “Não excluir deslocamentos”.',
             },
             perDiem: {
                 title: 'Diária',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5ea2ef865899..6ea147ce1bee 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6297,6 +6297,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             distanceRates: {
                 title: '距离费率',
                 subtitle: '添加、更新并执行费率。',
+                disableLockedByCommuterExclusionsPrompt: '启用家庭与办公室通勤排除时，无法关闭距离费率。请先将“排除通勤”设为“不排除通勤”。',
             },
             perDiem: {
                 title: '每日津贴',
diff --git a/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts b/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
index e79b46d3b1bf..c7c20fe95084 100644
--- a/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
+++ b/src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress.ts
@@ -11,7 +11,6 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 const createNeedsHomeAddressWorkspaceSelector = (currentUserEmail: string | undefined) => (policies: OnyxCollection<Policy>) =>
     Object.values(policies ?? {}).some(
         (policy) =>
-            !!policy?.areDistanceRatesEnabled &&
             policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
             policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
             getEffectiveWorkArrangement(currentUserEmail ? policy.employeeList?.[currentUserEmail]?.hasOfficeWorkArrangement : undefined, policy.commuterExclusions.isOfficeWorkArrangement),
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
index 188e1f26b461..c0e64ce5373b 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
@@ -156,6 +156,8 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const paymentBankAccountID = settings?.paymentBankAccountID;
     const isTravelBillingEnabled = getIsTravelBillingEnabled(getCardSettings(travelCardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US));
     const {canWrite: canWriteMoreFeatures, withReadOnlyFallback} = usePolicyFeatureWriteAccess(policy, CONST.POLICY.POLICY_FEATURE.MORE_FEATURES);
+    const hasHomeAndOfficeCommuterExclusions = policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE;
+    const isDistanceRatesLockedByCommuterExclusions = !!policy?.areDistanceRatesEnabled && hasHomeAndOfficeCommuterExclusions;
 
     // The Vendors toggle reads policy.connections (via hasVendorFeature), which is empty on a
     // non-active workspace until a connections-aware read runs. OpenPolicyMoreFeaturesPage doesn't
@@ -322,6 +324,15 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
     };
 
+    const promptDisableDistanceRatesForCommuterExclusions = async () => {
+        await showConfirmModal({
+            title: translate('workspace.distanceRates.oopsNotSoFast'),
+            prompt: translate('workspace.moreFeatures.distanceRates.disableLockedByCommuterExclusionsPrompt'),
+            confirmText: translate('common.buttonConfirm'),
+            shouldShowCancelButton: false,
+        });
+    };
+
     const promptDisableSmartLimitForWorkflows = async () => {
         if (!isSmartLimitEnabled || !policyID) {
             return;
@@ -663,12 +674,16 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                             subtitle={translate('workspace.moreFeatures.distanceRates.subtitle')}
                             isActive={policy?.areDistanceRatesEnabled ?? false}
                             pendingAction={policy?.pendingFields?.areDistanceRatesEnabled}
-                            disabled={!canWriteMoreFeatures}
-                            disabledAction={withReadOnlyFallback()}
+                            disabled={!canWriteMoreFeatures || isDistanceRatesLockedByCommuterExclusions}
+                            disabledAction={withReadOnlyFallback(promptDisableDistanceRatesForCommuterExclusions)}
                             onToggle={(isEnabled) => {
                                 if (!policyID) {
                                     return;
                                 }
+                                if (!isEnabled && hasHomeAndOfficeCommuterExclusions) {
+                                    promptDisableDistanceRatesForCommuterExclusions();
+                                    return;
+                                }
                                 enablePolicyDistanceRates(policyID, isEnabled, distanceRateCustomUnit);
                             }}
                             onPress={() => {
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index ef436cee18bd..b710b3b6788b 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -446,10 +446,7 @@ const hasOnlyPersonalPoliciesSelector = (policies: OnyxCollection<Policy>): bool
  * home address, so the private home address row can name the workspace relying on it.
  */
 const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>): policy is Policy =>
-    !!policy &&
-    !!policy.areDistanceRatesEnabled &&
-    policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE &&
-    policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    !!policy && policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
     Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index a9bc0d8d031b..59f7f446a225 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -315,7 +315,7 @@ describe('ProfilePage - agent account', () => {
         expect(screen.queryByTestId('address-menu-item-further-details')).toBeNull();
     });
 
-    it('hides the commuter exclusion indicator when distance rates are disabled', async () => {
+    it('shows the commuter exclusion indicator when distance rates are disabled but the setting remains active', async () => {
         await setupUser('user@expensify.com');
         await act(async () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
@@ -329,8 +329,8 @@ describe('ProfilePage - agent account', () => {
         renderPageWithNavigation(SCREENS.SETTINGS.PROFILE.ROOT);
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.getByTestId('address-menu-item')).toHaveTextContent('none-brickRoadIndicator');
-        expect(screen.queryByTestId('address-menu-item-further-details')).toBeNull();
+        expect(screen.getByTestId('address-menu-item')).toHaveTextContent('info-brickRoadIndicator');
+        expect(screen.getByTestId('address-menu-item-further-details')).toHaveTextContent('Boulder Development uses this address for commuter exclusions.');
     });
 
     it('shows contact methods, pronouns, timezone and private section for non-agent account', async () => {
diff --git a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
index 04185e1f2a1f..2b472b46120b 100644
--- a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
+++ b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
@@ -169,6 +169,49 @@ describe('WorkspaceMoreFeaturesPage', () => {
         jest.clearAllMocks();
     });
 
+    describe('Distance rates toggle', () => {
+        it('locks Distance rates and explains why while home and office commuter exclusions are enabled', async () => {
+            await TestHelper.signInWithTestUser();
+            await act(async () => {
+                await Onyx.merge(
+                    `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
+                    buildPolicy({
+                        id: POLICY_ID,
+                        areDistanceRatesEnabled: true,
+                        commuterExclusions: {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE},
+                    }),
+                );
+            });
+
+            renderPage({policyID: POLICY_ID});
+            await waitForBatchedUpdatesWithAct();
+            fireEvent.press(await findLockedSwitch('workspace.moreFeatures.distanceRates.subtitle'));
+
+            await waitFor(() => {
+                expect(screen.getByText(TestHelper.translateLocal('workspace.moreFeatures.distanceRates.disableLockedByCommuterExclusionsPrompt'))).toBeOnTheScreen();
+            });
+        });
+
+        it('keeps Distance rates available to re-enable when commuter exclusions remain active', async () => {
+            await TestHelper.signInWithTestUser();
+            await act(async () => {
+                await Onyx.merge(
+                    `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
+                    buildPolicy({
+                        id: POLICY_ID,
+                        areDistanceRatesEnabled: false,
+                        commuterExclusions: {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE},
+                    }),
+                );
+            });
+
+            renderPage({policyID: POLICY_ID});
+            await waitForBatchedUpdatesWithAct();
+
+            await expect(findUnlockedSwitch('workspace.moreFeatures.distanceRates.subtitle')).resolves.toBeOnTheScreen();
+        });
+    });
+
     describe('Workflows toggle', () => {
         it('locks the Workflows switch when the workspace has a Smart-Limit Expensify Card', async () => {
             await TestHelper.signInWithTestUser();
diff --git a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
index caf753d50e1f..b97c00d759b6 100644
--- a/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
+++ b/tests/unit/hooks/useTimeSensitiveHomeAddress.test.ts
@@ -69,6 +69,19 @@ describe('useTimeSensitiveHomeAddress', () => {
         });
     });
 
+    it('asks for an address when Distance rates are disabled but home and office exclusions remain active', async () => {
+        // Given a workspace whose saved commuter setting is still enforced by the server
+        await setUpWorkspace({...makeHomeAndOfficePolicy(true), areDistanceRatesEnabled: false});
+
+        // When the time sensitive items are resolved
+        const {result} = renderHook(() => useTimeSensitiveHomeAddress());
+
+        // Then the task appears because disabling Distance rates does not remove the commuter setting
+        await waitFor(() => {
+            expect(result.current.shouldShowAddHomeAddress).toBe(true);
+        });
+    });
+
     it('stays quiet when the workspace default is no regular workplace', async () => {
         // Given a workspace on the method whose members have no regular workplace
         await setUpWorkspace(makeHomeAndOfficePolicy(false));

From c9a365b86620a9af52c8bd2ca7fd0202f7208caa Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Fri, 9 Oct 2026 03:23:25 +0530
Subject: [PATCH 364/781] Save distance route locally so Reuse route works
 offline

---
 src/libs/actions/IOU/MoneyRequestBuilder.ts   |  3 ++-
 src/libs/actions/IOU/Split.ts                 | 20 +++++++++++++++++++
 src/libs/actions/IOU/TrackExpense.ts          | 17 ++++++++++++++++
 .../IOU/types/CreateTrackExpenseParams.ts     |  3 +++
 .../actions/IOU/types/TrackedExpenseParams.ts |  3 ++-
 src/libs/actions/ReusableDistanceRoutes.ts    | 20 ++++++++++++++++++-
 ...andleMoneyRequestStepDistanceNavigation.ts |  7 +++++++
 .../hooks/useDistanceNavigation.ts            |  2 ++
 .../index.native.tsx                          |  2 ++
 .../submission/useTrackExpenseSubmission.ts   |  2 ++
 10 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/IOU/MoneyRequestBuilder.ts b/src/libs/actions/IOU/MoneyRequestBuilder.ts
index ed0df998d921..0e48071bcde7 100644
--- a/src/libs/actions/IOU/MoneyRequestBuilder.ts
+++ b/src/libs/actions/IOU/MoneyRequestBuilder.ts
@@ -108,7 +108,8 @@ type BuildOnyxDataForMoneyRequestKeys =
     | typeof ONYXKEYS.PERSONAL_DETAILS_LIST
     | typeof ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING
     | typeof ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE
-    | typeof ONYXKEYS.COLLECTION.SNAPSHOT;
+    | typeof ONYXKEYS.COLLECTION.SNAPSHOT
+    | typeof ONYXKEYS.REUSABLE_DISTANCE_ROUTES;
 
 type MoneyRequestInformation = {
     payerAccountID: number;
diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts
index 8ef1c03fa83e..17f2e169dc32 100644
--- a/src/libs/actions/IOU/Split.ts
+++ b/src/libs/actions/IOU/Split.ts
@@ -56,6 +56,7 @@ import {
 
 import {buildOptimisticPolicyRecentlyUsedTags} from '@userActions/Policy/Tag';
 import {notifyNewAction} from '@userActions/Report/reportActionSubscribers';
+import {getLocallyCreatedRouteOnyxData} from '@userActions/ReusableDistanceRoutes';
 import {sanitizeWaypointsForAPI} from '@userActions/Transaction';
 
 import CONST from '@src/CONST';
@@ -162,6 +163,9 @@ type CreateDistanceRequestInformation = {
     writeBarrier?: WriteReadyBarrier;
     rules: OnyxCollection<OnyxTypes.Rule>;
     isVendorMatchingBetaEnabled: boolean | undefined;
+
+    /** Current "Reuse route" list value, so the just used route can be saved locally */
+    reusableDistanceRoutes?: OnyxTypes.ReusableDistanceRoute[];
 };
 
 type CreateSplitsTransactionParams = BaseTransactionParams & {
@@ -2078,6 +2082,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         writeBarrier,
         rules,
         isVendorMatchingBetaEnabled,
+        reusableDistanceRoutes = [],
     } = distanceRequestInformation;
     const {policy, policyCategories, policyTagList, policyRecentlyUsedCategories, policyRecentlyUsedTags} = policyParams;
     const parsedComment = getParsedComment(transactionParams.comment);
@@ -2343,6 +2348,21 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         };
     }
 
+    if (!isManualDistanceRequest && validWaypoints) {
+        const reusableRouteOnyxData = getLocallyCreatedRouteOnyxData(
+            {
+                transactionID: parameters.transactionID,
+                waypoints: validWaypoints,
+                distance: distance ?? 0,
+                routeDistanceMeters: selectedRouteDistance,
+                inserted: created ?? DateUtils.getDBTime(),
+            },
+            reusableDistanceRoutes,
+        );
+        onyxData?.optimisticData?.push(...reusableRouteOnyxData.optimisticData);
+        onyxData?.failureData?.push(...reusableRouteOnyxData.failureData);
+    }
+
     if (previousOdometerDraft !== undefined && (odometerStart !== undefined || odometerEnd !== undefined)) {
         onyxData?.optimisticData?.push({
             onyxMethod: Onyx.METHOD.SET,
diff --git a/src/libs/actions/IOU/TrackExpense.ts b/src/libs/actions/IOU/TrackExpense.ts
index 9d460ac14b93..78e1df0c1b0a 100644
--- a/src/libs/actions/IOU/TrackExpense.ts
+++ b/src/libs/actions/IOU/TrackExpense.ts
@@ -87,6 +87,7 @@ import type {BuildPolicyDataKeys} from '@userActions/Policy/Policy';
 import type {GuidedSetupData} from '@userActions/Report';
 import {buildInviteToRoomOnyxData} from '@userActions/Report';
 import {notifyNewAction} from '@userActions/Report/reportActionSubscribers';
+import {getLocallyCreatedRouteOnyxData} from '@userActions/ReusableDistanceRoutes';
 import {stringifyWaypointsForAPI} from '@userActions/Transaction';
 import {getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow';
 
@@ -2506,6 +2507,7 @@ function trackExpense(params: CreateTrackExpenseParams) {
         writeBarrier,
         rules,
         personalDetailsByLogins,
+        reusableDistanceRoutes = [],
     } = params;
     const {accountID: currentUserAccountIDParam, email: currentUserEmailParam = ''} = currentUser;
     const {participant, payeeAccountID, payeeEmail} = participantParams;
@@ -2951,6 +2953,21 @@ function trackExpense(params: CreateTrackExpenseParams) {
                 parameters.actionableWhisperReportActionID = actionableWhisperReportActionIDParam;
             }
 
+            if (validWaypoints && transaction?.transactionID) {
+                const reusableRouteOnyxData = getLocallyCreatedRouteOnyxData(
+                    {
+                        transactionID: transaction.transactionID,
+                        waypoints: validWaypoints,
+                        distance: distance ?? 0,
+                        routeDistanceMeters: selectedRouteDistance,
+                        inserted: created ?? DateUtils.getDBTime(),
+                    },
+                    reusableDistanceRoutes,
+                );
+                onyxData?.optimisticData?.push(...reusableRouteOnyxData.optimisticData);
+                onyxData?.failureData?.push(...reusableRouteOnyxData.failureData);
+            }
+
             API.writeWhenReady(
                 WRITE_COMMANDS.TRACK_EXPENSE,
                 parameters,
diff --git a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
index 995614776d6a..bc108a924bc6 100644
--- a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
+++ b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
@@ -58,6 +58,9 @@ type CreateTrackExpenseParams = {
     writeBarrier?: WriteReadyBarrier;
     rules: OnyxCollection<OnyxTypes.Rule>;
     personalDetailsByLogins?: PersonalDetailsByLogin;
+
+    /** Current "Reuse route" list value, so the just used route can be saved locally */
+    reusableDistanceRoutes?: OnyxTypes.ReusableDistanceRoute[];
 };
 
 export type {CreateTrackExpenseParams, TrackExpenseAccountantParams};
diff --git a/src/libs/actions/IOU/types/TrackedExpenseParams.ts b/src/libs/actions/IOU/types/TrackedExpenseParams.ts
index 71ad91043fbf..fc20a2528c52 100644
--- a/src/libs/actions/IOU/types/TrackedExpenseParams.ts
+++ b/src/libs/actions/IOU/types/TrackedExpenseParams.ts
@@ -36,7 +36,8 @@ type BuildOnyxDataForTrackExpenseKeys =
     | typeof ONYXKEYS.COLLECTION.TRANSACTION
     | typeof ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE
     | typeof ONYXKEYS.COLLECTION.SNAPSHOT
-    | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS;
+    | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS
+    | typeof ONYXKEYS.REUSABLE_DISTANCE_ROUTES;
 
 type TrackedExpenseTransactionParams = Omit<BaseTransactionParams, 'taxCode' | 'taxAmount' | 'taxValue'> & {
     waypoints?: string;
diff --git a/src/libs/actions/ReusableDistanceRoutes.ts b/src/libs/actions/ReusableDistanceRoutes.ts
index b79f149fa206..b6c67919d308 100644
--- a/src/libs/actions/ReusableDistanceRoutes.ts
+++ b/src/libs/actions/ReusableDistanceRoutes.ts
@@ -13,6 +13,24 @@ import Onyx from 'react-native-onyx';
 
 import {updateWaypoints} from './Transaction';
 
+/**
+ * Onyx data saving the route of a newly created distance expense locally, so the just used
+ * route shows in "Reuse route" in offline mode before the server list refreshes.
+ */
+function getLocallyCreatedRouteOnyxData(
+    route: ReusableDistanceRoute,
+    currentRoutes: ReusableDistanceRoute[],
+): {
+    optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.REUSABLE_DISTANCE_ROUTES>>;
+    failureData: Array<OnyxUpdate<typeof ONYXKEYS.REUSABLE_DISTANCE_ROUTES>>;
+} {
+    const updatedRoutes = [route, ...currentRoutes.filter((item) => item.transactionID !== route.transactionID)];
+    return {
+        optimisticData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.REUSABLE_DISTANCE_ROUTES, value: updatedRoutes}],
+        failureData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.REUSABLE_DISTANCE_ROUTES, value: currentRoutes}],
+    };
+}
+
 function fetchReusableDistanceRoutes() {
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.IS_LOADING_REUSABLE_DISTANCE_ROUTES>> = [
         {
@@ -55,4 +73,4 @@ function selectReusableRoute(transactionID: string, route: ReusableDistanceRoute
     );
 }
 
-export {fetchReusableDistanceRoutes, selectReusableRoute};
+export {fetchReusableDistanceRoutes, getLocallyCreatedRouteOnyxData, selectReusableRoute};
diff --git a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
index 371972c1fa47..161172cace10 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
+++ b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
@@ -49,6 +49,7 @@ import type {
     Rule,
     Transaction,
     TransactionViolation,
+    ReusableDistanceRoute,
 } from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {Unit} from '@src/types/onyx/Policy';
@@ -117,6 +118,9 @@ type MoneyRequestStepDistanceNavigationParams = {
     participantsPolicyTags: ParticipantsPolicyTags;
     rules: OnyxCollection<Rule>;
     isVendorMatchingBetaEnabled: boolean | undefined;
+
+    /** Current "Reuse route" list value, so the just used route can be saved locally */
+    reusableDistanceRoutes?: ReusableDistanceRoute[];
 };
 
 /** Amount + merchant for a manual-distance submit; pending placeholders otherwise (waypoint/GPS distance is computed server-side). */
@@ -223,6 +227,7 @@ function handleMoneyRequestStepDistanceNavigation({
     isOffline = false,
     rules,
     isVendorMatchingBetaEnabled,
+    reusableDistanceRoutes = [],
 }: MoneyRequestStepDistanceNavigationParams): void {
     const isManualDistance = manualDistance !== undefined;
     const isOdometerDistance = odometerDistance !== undefined;
@@ -356,6 +361,7 @@ function handleMoneyRequestStepDistanceNavigation({
                             reportActionsList: undefined,
                             getCurrencyDecimals,
                             rules,
+                            reusableDistanceRoutes,
                         });
                         cleanupAfterSkipConfirmSubmit(overrides.shouldHandleNavigation, {
                             report,
@@ -443,6 +449,7 @@ function handleMoneyRequestStepDistanceNavigation({
                         getCurrencyDecimals,
                         participantsPolicyTags,
                         rules,
+                        reusableDistanceRoutes,
                     });
                     cleanupAfterSkipConfirmSubmit(overrides.shouldHandleNavigation, {
                         report,
diff --git a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts
index a1056136b76c..8c904e730bae 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts
+++ b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts
@@ -154,6 +154,7 @@ function useDistanceNavigation({
     const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${reportIDToCheck}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [reusableDistanceRoutes] = useOnyx(ONYXKEYS.REUSABLE_DISTANCE_ROUTES);
 
     const delegateAccountID = useDelegateAccountID();
     const {formatPhoneNumber, dateFnsLocale} = useLocalize();
@@ -227,6 +228,7 @@ function useDistanceNavigation({
             participants,
             participantsPolicyTags,
             rules,
+            reusableDistanceRoutes,
         });
     };
 }
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
index 96f1f205f212..fb41e1596f16 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
@@ -125,6 +125,7 @@ function IOURequestStepDistanceGPS({
 
     const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [reusableDistanceRoutes] = useOnyx(ONYXKEYS.REUSABLE_DISTANCE_ROUTES);
     const policyTagList = useMoneyRequestPolicyTagsForReport({report, currentUserAccountID: currentUserAccountIDParam});
 
     const {participants, participantsPolicyTags} = useMoneyRequestParticipantsPolicyTags({
@@ -205,6 +206,7 @@ function IOURequestStepDistanceGPS({
             participants,
             participantsPolicyTags,
             rules,
+            reusableDistanceRoutes,
         });
     };
 
diff --git a/src/pages/iou/request/step/confirmation/submission/useTrackExpenseSubmission.ts b/src/pages/iou/request/step/confirmation/submission/useTrackExpenseSubmission.ts
index 0f6e06b25dff..1f3f0755547a 100644
--- a/src/pages/iou/request/step/confirmation/submission/useTrackExpenseSubmission.ts
+++ b/src/pages/iou/request/step/confirmation/submission/useTrackExpenseSubmission.ts
@@ -134,6 +134,7 @@ function useTrackExpenseSubmission({
 
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
+    const [reusableDistanceRoutes] = useOnyx(ONYXKEYS.REUSABLE_DISTANCE_ROUTES);
 
     const isMoneyRequestReport = isMoneyRequestReportReportUtils(report);
     const currentChatReport = isMoneyRequestReport
@@ -273,6 +274,7 @@ function useTrackExpenseSubmission({
                 delegateAccountID,
                 rules,
                 personalDetailsByLogins: employeePersonalDetails,
+                reusableDistanceRoutes,
             });
         }
         performPostBatchCleanup({

From cd216af31b0c5eef3ad50de70b1a4cf4f0758379 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 22:58:10 +0100
Subject: [PATCH 365/781] test: update commuter home address expectation

---
 .../pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
index 0426ae775ac1..295d1736df3e 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/AddHomeAddressTest.tsx
@@ -136,7 +136,8 @@ describe('TimeSensitiveSection - AddHomeAddress', () => {
         expect(screen.getByText('homePage.timeSensitiveSection.addHomeAddress.title')).toBeTruthy();
     });
 
-    it('hides AddHomeAddress when distance rates are disabled', async () => {
+    it('renders AddHomeAddress when distance rates are disabled but commuter exclusions remain active', async () => {
+        // Given the workspace still has a home and office commuter exclusion, which requires a home address even if Distance rates are off
         await Onyx.set(ONYXKEYS.ACCOUNT, {validated: true});
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {
             id: '1',
@@ -146,9 +147,11 @@ describe('TimeSensitiveSection - AddHomeAddress', () => {
         });
         await waitForBatchedUpdates();
 
+        // When the time sensitive section renders for the member
         renderTimeSensitiveSection();
 
-        expect(screen.queryByText('homePage.timeSensitiveSection.addHomeAddress.title')).toBeNull();
+        // Then the home address task remains visible because the saved commuter exclusion is still enforced
+        expect(screen.getByText('homePage.timeSensitiveSection.addHomeAddress.title')).toBeTruthy();
     });
 });
 

From 70ccc90d8f82839dd235e24eb4829294a4f87307 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Thu, 8 Oct 2026 23:01:14 +0100
Subject: [PATCH 366/781] refactor: inline commuter exclusion predicate

---
 src/selectors/Policy.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index b710b3b6788b..2c5fb588c571 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -445,11 +445,11 @@ const hasOnlyPersonalPoliciesSelector = (policies: OnyxCollection<Policy>): bool
  * Returns the name of a workspace the member belongs to that calculates commuter exclusions from the member's
  * home address, so the private home address row can name the workspace relying on it.
  */
-const isActiveHomeAndOfficeCommuterExclusionPolicy = (policy: OnyxEntry<Policy>): policy is Policy =>
-    !!policy && policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-
 const homeAndOfficeCommuterExclusionPolicyNameSelector = (policies: OnyxCollection<Policy>): string | undefined =>
-    Object.values(policies ?? {}).find(isActiveHomeAndOfficeCommuterExclusionPolicy)?.name;
+    Object.values(policies ?? {}).find(
+        (policy): policy is Policy =>
+            !!policy && policy.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+    )?.name;
 
 function isAdminPolicyConnectedTo(policy: OnyxEntry<Policy>, connectionName: ReusablePolicyConnectionName): policy is Policy {
     return !!policy && policy.role === CONST.POLICY.ROLE.ADMIN && !!policy.connections?.[connectionName];

From 369f8406a59262c79b34302b7cd46d4d9fd03213 Mon Sep 17 00:00:00 2001
From: "Yauheni Horbach (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 07:02:12 +0000
Subject: [PATCH 367/781] Use useDecisionModal for Search bulk actions and
 SelectionToolbar alerts

Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>
---
 .../SelectionToolbar/index.tsx                |  45 +++----
 .../Search/SearchBulkActionsButton.tsx        |  39 +-----
 src/hooks/useSearchBulkActions.ts             | 122 ++++++++++--------
 .../Search/SearchBulkActionsButtonTest.tsx    |   2 -
 .../useSearchBulkActionsDownloadPDFTest.ts    |  16 ++-
 ...seSearchBulkActionsDownloadReceiptsTest.ts |  10 +-
 .../hooks/useSearchBulkActionsExportTest.ts   |  32 ++++-
 .../unit/hooks/useSearchBulkActionsPayTest.ts |   8 +-
 8 files changed, 150 insertions(+), 124 deletions(-)

diff --git a/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx b/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
index 326535b4fdac..78bcf1fdfca0 100644
--- a/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
+++ b/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
@@ -1,4 +1,3 @@
-import DecisionModal from '@components/DecisionModal';
 import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
 import HoldOrRejectEducationalModal from '@components/HoldOrRejectEducationalModal';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
@@ -10,6 +9,7 @@ import BulkDuplicateHandler from '@components/Search/BulkDuplicateHandler';
 import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 
 import useConfirmModal from '@hooks/useConfirmModal';
+import useDecisionModal from '@hooks/useDecisionModal';
 import useFilterSelectedTransactions from '@hooks/useFilterSelectedTransactions';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
@@ -91,9 +91,24 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
 
     const isMobileSelectionModeEnabled = useMobileSelectionMode();
     const {showConfirmModal} = useConfirmModal();
+    const {showDecisionModal} = useDecisionModal();
+
+    const showOfflineModal = () => {
+        showDecisionModal({
+            title: translate('common.youAppearToBeOffline'),
+            prompt: translate('common.offlinePrompt'),
+            secondOptionText: translate('common.buttonConfirm'),
+        });
+    };
+
+    const showDownloadErrorModal = () => {
+        showDecisionModal({
+            title: translate('common.downloadFailedTitle'),
+            prompt: translate('common.downloadFailedDescription'),
+            secondOptionText: translate('common.buttonConfirm'),
+        });
+    };
 
-    const [offlineModalVisible, setOfflineModalVisible] = useState(false);
-    const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false);
     const [rejectModalAction, setRejectModalAction] = useState<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT_BULK> | null>(null);
 
     const transactionsWithoutPendingDelete = transactions.filter((t) => !isTransactionPendingDelete(t));
@@ -102,7 +117,7 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
 
     const beginExportWithTemplate = (templateName: string, templateType: string, transactionIDList: string[], exportName: string) => {
         if (isOffline) {
-            setOfflineModalVisible(true);
+            showOfflineModal();
             return;
         }
 
@@ -164,8 +179,8 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
         reportActions,
         allTransactionsLength: transactions.length,
         session,
-        onExportFailed: () => setIsDownloadErrorModalVisible(true),
-        onExportOffline: () => setOfflineModalVisible(true),
+        onExportFailed: showDownloadErrorModal,
+        onExportOffline: showOfflineModal,
         policy,
         beginExportWithTemplate: (templateName, templateType, transactionIDList, exportName) => beginExportWithTemplate(templateName, templateType, transactionIDList, exportName),
         onDeleteSelected,
@@ -306,24 +321,6 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
                     onClearSelection={() => clearSelectedTransactions(true)}
                 />
             )}
-            <DecisionModal
-                title={translate('common.downloadFailedTitle')}
-                prompt={translate('common.downloadFailedDescription')}
-                isSmallScreenWidth={shouldUseNarrowLayout}
-                onSecondOptionSubmit={() => setIsDownloadErrorModalVisible(false)}
-                secondOptionText={translate('common.buttonConfirm')}
-                isVisible={isDownloadErrorModalVisible}
-                onClose={() => setIsDownloadErrorModalVisible(false)}
-            />
-            <DecisionModal
-                title={translate('common.youAppearToBeOffline')}
-                prompt={translate('common.offlinePrompt')}
-                isSmallScreenWidth={shouldUseNarrowLayout}
-                onSecondOptionSubmit={() => setOfflineModalVisible(false)}
-                secondOptionText={translate('common.buttonConfirm')}
-                isVisible={offlineModalVisible}
-                onClose={() => setOfflineModalVisible(false)}
-            />
             {!!rejectModalAction && (
                 <HoldOrRejectEducationalModal
                     onClose={dismissRejectModalBasedOnAction}
diff --git a/src/components/Search/SearchBulkActionsButton.tsx b/src/components/Search/SearchBulkActionsButton.tsx
index 47b6a774d9bf..aa1081449be8 100644
--- a/src/components/Search/SearchBulkActionsButton.tsx
+++ b/src/components/Search/SearchBulkActionsButton.tsx
@@ -1,6 +1,5 @@
 import BulkActionBar from '@components/BulkActionBar';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
-import DecisionModal from '@components/DecisionModal';
 import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
 import ExpensifyCardStatementPDFDownloadModal from '@components/ExpensifyCardStatementPDFDownloadModal';
 import HoldOrRejectEducationalModal from '@components/HoldOrRejectEducationalModal';
@@ -51,9 +50,7 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
     const {pageGutter} = useLayoutSpacing();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    // We need isSmallScreenWidth (not just shouldUseNarrowLayout) because DecisionModal requires it for correct modal type
-    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {selectedTransactions, excludedTransactions = getEmptyObject<SelectedTransactions>(), selectedReports, areAllMatchingItemsSelected} = useSearchSelectionContext();
     const {clearSelectedTransactions} = useSearchSelectionActions();
     const {currentSearchResults} = useSearchResultsContext();
@@ -80,20 +77,13 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
         selectedReportIDs,
         businessBankAccountOptions,
         confirmPayment,
-        isOfflineModalVisible,
-        isDownloadErrorModalVisible,
         isHoldEducationalModalVisible,
         areAllTransactionsFromDMReports,
         rejectModalAction,
-        emptyReportsCount,
-        handleOfflineModalClose,
-        handleDownloadErrorModalClose,
         isExpensifyCardStatementPDFModalVisible,
         setIsExpensifyCardStatementPDFModalVisible,
         expensifyCardStatementPDFParams,
         handleExpensifyCardStatementPDFModalHide,
-        isExpensifyCardStatementMultiFeedAlertVisible,
-        handleExpensifyCardStatementMultiFeedAlertClose,
         dismissModalAndUpdateUseHold,
         dismissRejectModalBasedOnAction,
         isDuplicateOptionVisible,
@@ -271,24 +261,6 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
                     )
                 }
             </KYCWall>
-            <DecisionModal
-                title={translate('common.youAppearToBeOffline')}
-                prompt={translate('common.offlinePrompt')}
-                isSmallScreenWidth={isSmallScreenWidth}
-                onSecondOptionSubmit={handleOfflineModalClose}
-                secondOptionText={translate('common.buttonConfirm')}
-                isVisible={isOfflineModalVisible}
-                onClose={handleOfflineModalClose}
-            />
-            <DecisionModal
-                title={translate('common.downloadFailedTitle')}
-                prompt={emptyReportsCount ? translate('common.downloadFailedEmptyReportDescription', {count: emptyReportsCount}) : translate('common.downloadFailedDescription')}
-                isSmallScreenWidth={isSmallScreenWidth}
-                onSecondOptionSubmit={handleDownloadErrorModalClose}
-                secondOptionText={translate('common.buttonConfirm')}
-                isVisible={isDownloadErrorModalVisible}
-                onClose={handleDownloadErrorModalClose}
-            />
             {!!expensifyCardStatementPDFParams && (
                 <ExpensifyCardStatementPDFDownloadModal
                     statementParams={expensifyCardStatementPDFParams}
@@ -297,15 +269,6 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
                     onModalHide={handleExpensifyCardStatementPDFModalHide}
                 />
             )}
-            <DecisionModal
-                title={translate('search.expensifyCardStatementPDF.title')}
-                prompt={translate('search.expensifyCardStatementPDF.oneFeedAtATime')}
-                isSmallScreenWidth={isSmallScreenWidth}
-                onSecondOptionSubmit={handleExpensifyCardStatementMultiFeedAlertClose}
-                secondOptionText={translate('common.buttonConfirm')}
-                isVisible={isExpensifyCardStatementMultiFeedAlertVisible}
-                onClose={handleExpensifyCardStatementMultiFeedAlertClose}
-            />
             {!!rejectModalAction && (
                 <HoldOrRejectEducationalModal
                     onClose={dismissRejectModalBasedOnAction}
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 44161a56b19e..2a63602efbac 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -141,6 +141,7 @@ import useBulkPayOptions from './useBulkPayOptions';
 import useConfirmModal from './useConfirmModal';
 import {useCurrencyListActions} from './useCurrencyList';
 import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useDecisionModal from './useDecisionModal';
 import useDefaultExpensePolicy from './useDefaultExpensePolicy';
 import useDelegateAccountID from './useDelegateAccountID';
 import useDeleteTransactions from './useDeleteTransactions';
@@ -665,12 +666,45 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     }, [currentSearchResults]);
     const searchResults = currentSearchResults?.data ? currentSearchResults : lastNonEmptySearchResultsRef.current;
 
-    const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false);
-    const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false);
     const [isExpensifyCardStatementPDFModalVisible, setIsExpensifyCardStatementPDFModalVisible] = useState(false);
     const [expensifyCardStatementPDFParams, setExpensifyCardStatementPDFParams] = useState<ExpensifyCardStatementParams | undefined>(undefined);
-    const [isExpensifyCardStatementMultiFeedAlertVisible, setIsExpensifyCardStatementMultiFeedAlertVisible] = useState(false);
     const {showConfirmModal} = useConfirmModal();
+    const {showDecisionModal} = useDecisionModal();
+
+    const showOfflineModal = useCallback(() => {
+        showDecisionModal({
+            title: translate('common.youAppearToBeOffline'),
+            prompt: translate('common.offlinePrompt'),
+            secondOptionText: translate('common.buttonConfirm'),
+        });
+    }, [showDecisionModal, translate]);
+
+    const showDownloadErrorModal = useCallback(() => {
+        showDecisionModal({
+            title: translate('common.downloadFailedTitle'),
+            prompt: translate('common.downloadFailedDescription'),
+            secondOptionText: translate('common.buttonConfirm'),
+        });
+    }, [showDecisionModal, translate]);
+
+    const showEmptyReportsDownloadErrorModal = useCallback(
+        (count: number) => {
+            showDecisionModal({
+                title: translate('common.downloadFailedTitle'),
+                prompt: translate('common.downloadFailedEmptyReportDescription', {count}),
+                secondOptionText: translate('common.buttonConfirm'),
+            });
+        },
+        [showDecisionModal, translate],
+    );
+
+    const showExpensifyCardStatementMultiFeedAlert = useCallback(() => {
+        showDecisionModal({
+            title: translate('search.expensifyCardStatementPDF.title'),
+            prompt: translate('search.expensifyCardStatementPDF.oneFeedAtATime'),
+            secondOptionText: translate('common.buttonConfirm'),
+        });
+    }, [showDecisionModal, translate]);
     const openSearchReportSubmitToPopover = useOpenSearchReportSubmitToPopover();
     const {showReportPDFDownloadModal} = useReportPDFDownloadModal();
     const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false);
@@ -678,8 +712,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD | typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT
     > | null>(null);
 
-    const [emptyReportsCount, setEmptyReportsCount] = useState<number>(0);
-
     const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION);
     const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
@@ -929,7 +961,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
     const exportExpensifyCardStatementPDF = useCallback(() => {
         if (isOffline) {
-            setIsOfflineModalVisible(true);
+            showOfflineModal();
             return;
         }
 
@@ -939,7 +971,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         }
 
         if (selection.hasMultipleFeeds) {
-            setIsExpensifyCardStatementMultiFeedAlertVisible(true);
+            showExpensifyCardStatementMultiFeedAlert();
             return;
         }
 
@@ -959,7 +991,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             }
             setIsExpensifyCardStatementPDFModalVisible(false);
             setExpensifyCardStatementPDFParams(undefined);
-            setIsDownloadErrorModalVisible(true);
+            showDownloadErrorModal();
         };
 
         setExpensifyCardStatementPDFParams(statementParams);
@@ -983,7 +1015,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 setExpensifyCardStatementPDFParams((currentParams) => (currentParams ? {...currentParams, statementKey} : currentParams));
             })
             .catch(showStatementError);
-    }, [isOffline]);
+    }, [isOffline, showOfflineModal, showExpensifyCardStatementMultiFeedAlert, showDownloadErrorModal]);
     const firstTransactionID = selectedTransactionsKeys.at(0);
     const firstTransaction =
         (firstTransactionID ? currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${firstTransactionID}`] : undefined) ??
@@ -1031,18 +1063,17 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const beginExportWithTemplate = useCallback(
         (templateName: string, templateType: string, policyID: string | undefined, exportName: string) => {
             if (hasOnlyEmptyReports) {
-                setEmptyReportsCount(emptyReports.length);
-                setIsDownloadErrorModalVisible(true);
+                showEmptyReportsDownloadErrorModal(emptyReports.length);
                 return;
             }
             if (isOffline) {
-                setIsOfflineModalVisible(true);
+                showOfflineModal();
                 return;
             }
             if (areAllMatchingItemsSelected) {
                 const allMatchingQueryJSON = queryJSON ? getUngroupedTemplateExportQuery(queryJSON) : undefined;
                 if (queryJSON && !allMatchingQueryJSON) {
-                    setIsDownloadErrorModalVisible(true);
+                    showDownloadErrorModal();
                     return;
                 }
                 queueExportSearchWithTemplate(
@@ -1063,7 +1094,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 const {isGroupExport, transactionIDList} = getGroupExportScope(queryJSON, selectedTransactions);
                 const groupExportQueryJSON = isGroupExport && queryJSON ? getTemplateGroupExportQuery(queryJSON, selectedTransactions, currentSearchResults?.data) : undefined;
                 if (isGroupExport && !groupExportQueryJSON) {
-                    setIsDownloadErrorModalVisible(true);
+                    showDownloadErrorModal();
                     return;
                 }
                 queueExportSearchWithTemplate(
@@ -1093,6 +1124,9 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             emptyReports.length,
             selectedTransactions,
             isOffline,
+            showOfflineModal,
+            showDownloadErrorModal,
+            showEmptyReportsDownloadErrorModal,
             areAllMatchingItemsSelected,
             currentSearchResults?.data,
             currentSearchKey,
@@ -1194,12 +1228,11 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const handleCSVExport = useCallback(
         async (isBasicExport: boolean) => {
             if (hasOnlyEmptyReports) {
-                setEmptyReportsCount(emptyReports.length);
-                setIsDownloadErrorModalVisible(true);
+                showEmptyReportsDownloadErrorModal(emptyReports.length);
                 return;
             }
             if (isOffline) {
-                setIsOfflineModalVisible(true);
+                showOfflineModal();
                 return;
             }
 
@@ -1213,7 +1246,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 const allMatchingExportData = isExpenseType && queryJSON ? getAllMatchingExportQueryAndExclusions(queryJSON, excludedTransactions, currentSearchResults?.data) : undefined;
                 const allMatchingReportExportQuery = isExpenseReportType && queryJSON ? getAllMatchingReportQuery(queryJSON, excludedTransactions) : undefined;
                 if ((isExpenseType && !allMatchingExportData) || (isExpenseReportType && !allMatchingReportExportQuery)) {
-                    setIsDownloadErrorModalVisible(true);
+                    showDownloadErrorModal();
                     return;
                 }
                 const reportIDList = selectedReports?.map((report) => report?.reportID).filter((reportID) => reportID !== undefined) ?? [];
@@ -1252,8 +1285,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 },
                 () => {
                     didFail = true;
-                    setEmptyReportsCount(0);
-                    setIsDownloadErrorModalVisible(true);
+                    showDownloadErrorModal();
                 },
                 translate,
                 allReportsTransactionsAndViolations,
@@ -1266,6 +1298,9 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             hasOnlyEmptyReports,
             emptyReports.length,
             isOffline,
+            showOfflineModal,
+            showDownloadErrorModal,
+            showEmptyReportsDownloadErrorModal,
             areAllMatchingItemsSelected,
             queryJSON,
             selectedReports,
@@ -1291,7 +1326,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
     const handleApproveWithDEWCheck = useCallback(async () => {
         if (isOffline) {
-            setIsOfflineModalVisible(true);
+            showOfflineModal();
             return;
         }
 
@@ -1370,6 +1405,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         }
     }, [
         isOffline,
+        showOfflineModal,
         isDelegateAccessRestricted,
         showDelegateNoAccessModal,
         selectedReports,
@@ -1558,7 +1594,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             if (isOffline) {
                 // On iOS, presenting the offline modal while the payment popover is still dismissing freezes the app,
                 // so defer it until the popover transition completes (matching the delegate/locked-account guards).
-                deferModalPresentationAfterPopoverDismiss(() => setIsOfflineModalVisible(true));
+                deferModalPresentationAfterPopoverDismiss(() => showOfflineModal());
                 return;
             }
 
@@ -1835,6 +1871,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         },
         [
             hash,
+            showOfflineModal,
             areAllMatchingItemsSelected,
             queryJSON,
             excludedTransactions,
@@ -2346,7 +2383,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                             return;
                         }
                         if (isOffline) {
-                            setIsOfflineModalVisible(true);
+                            showOfflineModal();
                             return;
                         }
                         clearSelectedTransactions();
@@ -2526,7 +2563,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             onSelected: () => {
                 // A queued all-matching move would send a stale query, so ask the user to reconnect like export does
                 if (areAllMatchingItemsSelected && isOffline) {
-                    setIsOfflineModalVisible(true);
+                    showOfflineModal();
                     return;
                 }
                 Navigation.navigate(ROUTES.MOVE_TRANSACTIONS_SEARCH_RHP.getRoute());
@@ -2558,7 +2595,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             shouldCloseModalOnSelect: true,
             onSelected: async () => {
                 if (isOffline) {
-                    setIsOfflineModalVisible(true);
+                    showOfflineModal();
                     return;
                 }
                 // In "Select all" mode the matching reports aren't enumerated on the client (results are paged),
@@ -2567,7 +2604,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 if (areAllMatchingItemsSelected) {
                     const allMatchingReportQuery = queryJSON ? getAllMatchingReportQuery(queryJSON, excludedTransactions) : undefined;
                     if (!allMatchingReportQuery) {
-                        setIsDownloadErrorModalVisible(true);
+                        showDownloadErrorModal();
                         return;
                     }
                     const serializedQuery = serializeQueryJSONForBackend({...allMatchingReportQuery, searchKey: currentSearchKey});
@@ -2720,7 +2757,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
 
@@ -2780,7 +2817,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
 
@@ -2951,7 +2988,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
                     exportReceiptsToZip({reportIDs: selectedReportIDs});
@@ -2981,7 +3018,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
                     exportReceiptsToZip({transactionIDs});
@@ -3016,7 +3053,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
 
@@ -3049,7 +3086,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
                     if (isOffline) {
-                        setIsOfflineModalVisible(true);
+                        showOfflineModal();
                         return;
                     }
 
@@ -3217,6 +3254,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         return buildResult(options);
     }, [
         selectedTransactionsKeys,
+        showOfflineModal,
+        showDownloadErrorModal,
         cardList,
         hash,
         selectedTransactions,
@@ -3320,14 +3359,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         dropdownButtonsOptions.length > 0 && dropdownButtonsOptions.every((option) => option.value === CONST.SEARCH.BULK_ACTION_TYPES.EXPORT && !option.subMenuItems);
     const bulkActionsMenuHeaderText = isShowingExportOptionsDirectly ? translate('common.export') : undefined;
 
-    const handleOfflineModalClose = useCallback(() => {
-        setIsOfflineModalVisible(false);
-    }, [setIsOfflineModalVisible]);
-
-    const handleDownloadErrorModalClose = useCallback(() => {
-        setIsDownloadErrorModalVisible(false);
-    }, [setIsDownloadErrorModalVisible]);
-
     const handleExpensifyCardStatementPDFModalHide = useCallback(() => {
         setExpensifyCardStatementPDFParams(undefined);
         // Clear the selection when the statement modal closes (after download or failure), like the other bulk
@@ -3336,10 +3367,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         clearSelectedTransactions();
     }, [clearSelectedTransactions]);
 
-    const handleExpensifyCardStatementMultiFeedAlertClose = useCallback(() => {
-        setIsExpensifyCardStatementMultiFeedAlertVisible(false);
-    }, []);
-
     const dismissModalAndUpdateUseHold = useCallback(() => {
         setIsHoldEducationalModalVisible(false);
         setNameValuePair(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, true, false, !isOffline);
@@ -3370,20 +3397,13 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         selectedReportIDs,
         businessBankAccountOptions,
         confirmPayment: stableOnBulkPaySelected,
-        isOfflineModalVisible,
-        isDownloadErrorModalVisible,
         isHoldEducationalModalVisible,
         areAllTransactionsFromDMReports,
         rejectModalAction,
-        emptyReportsCount,
-        handleOfflineModalClose,
-        handleDownloadErrorModalClose,
         isExpensifyCardStatementPDFModalVisible,
         setIsExpensifyCardStatementPDFModalVisible,
         expensifyCardStatementPDFParams,
         handleExpensifyCardStatementPDFModalHide,
-        isExpensifyCardStatementMultiFeedAlertVisible,
-        handleExpensifyCardStatementMultiFeedAlertClose,
         dismissModalAndUpdateUseHold,
         dismissRejectModalBasedOnAction,
         isDuplicateOptionVisible,
diff --git a/tests/unit/Search/SearchBulkActionsButtonTest.tsx b/tests/unit/Search/SearchBulkActionsButtonTest.tsx
index 5a9f10fe5efd..39d8a09c1776 100644
--- a/tests/unit/Search/SearchBulkActionsButtonTest.tsx
+++ b/tests/unit/Search/SearchBulkActionsButtonTest.tsx
@@ -38,7 +38,6 @@ jest.mock('@components/ButtonWithDropdownMenu', () => ({
     __esModule: true,
     default: (props: MockButtonProps) => mockButtonWithDropdownMenu(props),
 }));
-jest.mock('@components/DecisionModal', () => () => null);
 jest.mock('@components/HoldOrRejectEducationalModal', () => () => null);
 jest.mock('@components/HoldSubmitterEducationalModal', () => () => null);
 jest.mock('@components/ReportPDFDownloadModal', () => () => null);
@@ -77,7 +76,6 @@ jest.mock('@hooks/useSearchBulkActions', () => ({
         selectedTransactionReportIDs: [],
         selectedReportIDs: [],
         businessBankAccountOptions: [],
-        emptyReportsCount: 0,
         isDuplicateOptionVisible: false,
         isDuplicateReportOptionVisible: false,
         allTransactions: {},
diff --git a/tests/unit/hooks/useSearchBulkActionsDownloadPDFTest.ts b/tests/unit/hooks/useSearchBulkActionsDownloadPDFTest.ts
index 1b59af832309..24ead3724068 100644
--- a/tests/unit/hooks/useSearchBulkActionsDownloadPDFTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsDownloadPDFTest.ts
@@ -40,6 +40,12 @@ jest.mock('@hooks/useNetwork', () => ({
     default: () => ({isOffline: mockIsOffline}),
 }));
 
+const mockShowDecisionModal = jest.fn();
+jest.mock('@hooks/useDecisionModal', () => ({
+    __esModule: true,
+    default: () => ({showDecisionModal: mockShowDecisionModal}),
+}));
+
 jest.mock('@hooks/useEnvironment', () => ({
     __esModule: true,
     default: () => ({isProduction: false, isDevelopment: true, environment: 'development'}),
@@ -587,7 +593,7 @@ describe('useSearchBulkActions - Download report', () => {
 
         // Then no incomplete export is started and the existing download error is shown
         expect(exportReportsToPDF).not.toHaveBeenCalled();
-        expect(result.current.isDownloadErrorModalVisible).toBe(true);
+        expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.downloadFailedTitle', prompt: 'common.downloadFailedDescription'}));
     });
 
     it('should show Export as PDF for selected Expensify Card settlement groups', async () => {
@@ -666,7 +672,7 @@ describe('useSearchBulkActions - Download report', () => {
 
         // The loading modal is dismissed and the download-error modal is shown instead of hanging on "waiting".
         await waitFor(() => {
-            expect(result.current.isDownloadErrorModalVisible).toBe(true);
+            expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.downloadFailedTitle', prompt: 'common.downloadFailedDescription'}));
         });
         expect(result.current.isExpensifyCardStatementPDFModalVisible).toBe(false);
         expect(result.current.expensifyCardStatementPDFParams).toBeUndefined();
@@ -718,7 +724,7 @@ describe('useSearchBulkActions - Download report', () => {
             await Promise.resolve();
         });
 
-        expect(result.current.isDownloadErrorModalVisible).toBe(false);
+        expect(mockShowDecisionModal).not.toHaveBeenCalled();
         expect(result.current.isExpensifyCardStatementPDFModalVisible).toBe(true);
         expect(result.current.expensifyCardStatementPDFParams?.entryIDs).toEqual([456]);
     });
@@ -748,7 +754,9 @@ describe('useSearchBulkActions - Download report', () => {
         });
 
         expect(getExpensifyCardStatementPDF).not.toHaveBeenCalled();
-        expect(result.current.isExpensifyCardStatementMultiFeedAlertVisible).toBe(true);
+        expect(mockShowDecisionModal).toHaveBeenCalledWith(
+            expect.objectContaining({title: 'search.expensifyCardStatementPDF.title', prompt: 'search.expensifyCardStatementPDF.oneFeedAtATime'}),
+        );
     });
 
     it('should export a cross-workspace settlement as the whole settlement (no policyID)', async () => {
diff --git a/tests/unit/hooks/useSearchBulkActionsDownloadReceiptsTest.ts b/tests/unit/hooks/useSearchBulkActionsDownloadReceiptsTest.ts
index e7559784eb1a..06b4f72d9263 100644
--- a/tests/unit/hooks/useSearchBulkActionsDownloadReceiptsTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsDownloadReceiptsTest.ts
@@ -31,6 +31,12 @@ jest.mock('@hooks/useNetwork', () => ({
     default: () => ({isOffline: mockIsOffline}),
 }));
 
+const mockShowDecisionModal = jest.fn();
+jest.mock('@hooks/useDecisionModal', () => ({
+    __esModule: true,
+    default: () => ({showDecisionModal: mockShowDecisionModal}),
+}));
+
 jest.mock('@hooks/useEnvironment', () => ({
     __esModule: true,
     default: () => ({isProduction: false, isDevelopment: true, environment: 'development'}),
@@ -344,7 +350,7 @@ describe('useSearchBulkActions - Download receipts', () => {
             });
 
             expect(exportReceiptsToZip).not.toHaveBeenCalled();
-            expect(result.current.isOfflineModalVisible).toBe(true);
+            expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.youAppearToBeOffline', prompt: 'common.offlinePrompt'}));
         });
     });
 
@@ -451,7 +457,7 @@ describe('useSearchBulkActions - Download receipts', () => {
             });
 
             expect(exportReceiptsToZip).not.toHaveBeenCalled();
-            expect(result.current.isOfflineModalVisible).toBe(true);
+            expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.youAppearToBeOffline', prompt: 'common.offlinePrompt'}));
         });
     });
 });
diff --git a/tests/unit/hooks/useSearchBulkActionsExportTest.ts b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
index d3b6991c18d5..0e948567ee1e 100644
--- a/tests/unit/hooks/useSearchBulkActionsExportTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
@@ -151,6 +151,12 @@ jest.mock('@hooks/useNetwork', () => ({
     default: () => ({isOffline: mockIsOffline}),
 }));
 
+const mockShowDecisionModal = jest.fn();
+jest.mock('@hooks/useDecisionModal', () => ({
+    __esModule: true,
+    default: () => ({showDecisionModal: mockShowDecisionModal}),
+}));
+
 jest.mock('@hooks/useEnvironment', () => ({
     __esModule: true,
     default: () => ({isProduction: true, isDevelopment: false, environment: 'production'}),
@@ -1379,12 +1385,34 @@ describe('useSearchBulkActions - export options', () => {
 
         // Then: the offline modal opens and nothing is queued, matching bulk pay's offline behavior.
         await waitFor(() => {
-            expect(result.current.isOfflineModalVisible).toBe(true);
+            expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.youAppearToBeOffline', prompt: 'common.offlinePrompt'}));
         });
         expect(queueBulkMarkAsExported).not.toHaveBeenCalled();
         expect(mockClearSelectedTransactions).not.toHaveBeenCalled();
     });
 
+    it('shows the empty-report download error with the empty report count when every selected report has no expenses', async () => {
+        // Given a selected report that the search snapshot says has no expenses, so there is nothing to export
+        mockCurrentSearchResults = makeSearchResults([{...makeSnapshotReport(), transactionCount: 0}]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.currentView')).toBeDefined();
+        });
+
+        // When the user runs the Current view CSV export
+        getExportOptionByText(result.current.headerButtonsOptions, 'export.currentView')?.onSelected?.();
+
+        // Then the download error explains the reports are empty, because the prompt is passed when the modal is shown rather than read from shared state
+        await waitFor(() => {
+            expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.downloadFailedTitle', prompt: 'common.downloadFailedEmptyReportDescription'}));
+        });
+        expect(exportSearchItemsToCSV).not.toHaveBeenCalled();
+    });
+
     it('marks the specific selected report IDs, not the search query, for a limited (non-select-all) selection', async () => {
         // Given: a finite selection of specific reports ("Select all" is NOT checked).
         mockAreAllMatchingItemsSelected = false;
@@ -1701,7 +1729,7 @@ describe('useSearchBulkActions - export options', () => {
 
             // Then nothing is exported, because dropping groupBy without a cardID filter would export every card in the search
             await waitFor(() => {
-                expect(result.current.isDownloadErrorModalVisible).toBe(true);
+                expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.downloadFailedTitle', prompt: 'common.downloadFailedDescription'}));
             });
             expect(queueExportSearchWithTemplate).not.toHaveBeenCalled();
         });
diff --git a/tests/unit/hooks/useSearchBulkActionsPayTest.ts b/tests/unit/hooks/useSearchBulkActionsPayTest.ts
index 01a6d3bf7cc6..42039125021b 100644
--- a/tests/unit/hooks/useSearchBulkActionsPayTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsPayTest.ts
@@ -124,6 +124,12 @@ jest.mock('@hooks/useNetwork', () => ({
     default: () => ({isOffline: mockIsOffline}),
 }));
 
+const mockShowDecisionModal = jest.fn();
+jest.mock('@hooks/useDecisionModal', () => ({
+    __esModule: true,
+    default: () => ({showDecisionModal: mockShowDecisionModal}),
+}));
+
 jest.mock('@hooks/useEnvironment', () => ({
     __esModule: true,
     default: () => ({isProduction: false, isDevelopment: true, environment: 'development'}),
@@ -338,7 +344,7 @@ describe('useSearchBulkActions - Pay option', () => {
         });
 
         // Then the offline modal should open and no payment should be triggered because payments must not be queued while offline
-        expect(result.current.isOfflineModalVisible).toBe(true);
+        expect(mockShowDecisionModal).toHaveBeenCalledWith(expect.objectContaining({title: 'common.youAppearToBeOffline', prompt: 'common.offlinePrompt'}));
         expect(payMoneyRequest).not.toHaveBeenCalled();
     });
 

From 0a22005d0adb4bd9040335a2f80342c75921cfb5 Mon Sep 17 00:00:00 2001
From: "Yauheni Horbach (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 07:04:42 +0000
Subject: [PATCH 368/781] Separate decision modal helpers from the hooks below
 them

Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>
---
 src/hooks/useSearchBulkActions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 2a63602efbac..4aee583983c2 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -705,6 +705,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             secondOptionText: translate('common.buttonConfirm'),
         });
     }, [showDecisionModal, translate]);
+
     const openSearchReportSubmitToPopover = useOpenSearchReportSubmitToPopover();
     const {showReportPDFDownloadModal} = useReportPDFDownloadModal();
     const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false);

From 3cee9129ccf33a608c01d44008097037a4519055 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Fri, 9 Oct 2026 14:05:24 +0700
Subject: [PATCH 369/781] address comment

---
 src/components/CategoryPicker/CategoryPickerModal.tsx    | 6 +++++-
 .../sections/CategoryField.tsx                           | 5 ++---
 .../iou/request/step/DynamicIOURequestStepCategory.tsx   | 2 +-
 .../CategoryFieldDropdown.test.tsx                       | 9 +++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index 7e0837a5f61d..86cc64ff7019 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -31,6 +31,9 @@ import {View} from 'react-native';
 
 import CategoryPicker from '.';
 
+/** Height of the add-category header the list shows above its options. Shared with the row sizing the container, so the two never disagree. */
+const CATEGORY_PICKER_HEADER_HEIGHT = variables.componentSizeNormal;
+
 const DEFAULT_ANCHOR_ALIGNMENT = {
     horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
@@ -97,7 +100,7 @@ function CategoryPickerModal({
 
     const categoriesCount = policyCategories ?? 0;
     const isSearchable = categoriesCount >= CONST.STANDARD_LIST_ITEM_LIMIT;
-    const headerHeight = onAddCategory ? variables.componentSizeNormal : 0;
+    const headerHeight = onAddCategory ? CATEGORY_PICKER_HEADER_HEIGHT : 0;
     const estimatedContentHeight = getSelectionListPopoverContentHeight({optionCount: Math.max(renderedRowCount ?? categoriesCount, 1), isSearchable}) + headerHeight;
 
     // A bottom sheet is sized by the screen, so the content estimate only applies to the pop-over.
@@ -167,3 +170,4 @@ function CategoryPickerModal({
 }
 
 export default CategoryPickerModal;
+export {CATEGORY_PICKER_HEADER_HEIGHT};
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
index 7979e7b843c3..552c476ad68f 100644
--- a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
@@ -1,3 +1,4 @@
+import {CATEGORY_PICKER_HEADER_HEIGHT} from '@components/CategoryPicker/CategoryPickerModal';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import usePolicyCategoriesForConfirmation from '@components/MoneyRequestConfirmationList/hooks/usePolicyCategoriesForConfirmation';
@@ -15,8 +16,6 @@ import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import {canCreateCategoryInSitu} from '@libs/PolicyUtils';
 
-import variables from '@styles/variables';
-
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -231,7 +230,7 @@ function CategoryField({
                 errorText={shouldDisplayCategoryError ? translate(formError as TranslationPaths) : ''}
                 onPress={openCategoryPage}
                 shouldOpenInDropdown={canOpenListInPlace}
-                listHeaderHeight={canAddCategory ? variables.componentSizeNormal : 0}
+                listHeaderHeight={canAddCategory ? CATEGORY_PICKER_HEADER_HEIGHT : 0}
                 renderDropdown={(dropdownProps) =>
                     !!transactionID && (
                         <CategoryFieldDropdown
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
index c41679493e04..e6b935ca4414 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
@@ -110,7 +110,7 @@ function DynamicIOURequestStepCategory({
                       if (!policyID || !reportID) {
                           return;
                       }
-                      Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.getRoute({action, iouType, transactionID, reportID})));
+                      Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY_CREATE.path));
                   },
               },
           ]
diff --git a/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
index b0a66555d698..2db200d73da1 100644
--- a/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
+++ b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
@@ -4,11 +4,13 @@ import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFiel
 import CategoryFieldDropdown from '@components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown';
 
 import Navigation from '@libs/Navigation/Navigation';
-import type {CancelHandle} from '@libs/Navigation/TransitionTracker';
+import type TransitionTracker from '@libs/Navigation/TransitionTracker';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
+import type * as ReactNative from 'react-native';
+
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
@@ -25,7 +27,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
 // Holds the post-transition work until the test runs it, standing in for the pop-over finishing its close.
 let mockRunPendingTransition: (() => void) | undefined;
 jest.mock('@libs/Navigation/TransitionTracker', () => ({
-    runAfterTransitions: ({callback}: {callback: () => void}): CancelHandle => {
+    runAfterTransitions: ({callback}: Parameters<typeof TransitionTracker.runAfterTransitions>[0]): ReturnType<typeof TransitionTracker.runAfterTransitions> => {
         mockRunPendingTransition = callback;
         return {cancel: () => {}};
     },
@@ -34,8 +36,7 @@ jest.mock('@libs/Navigation/TransitionTracker', () => ({
 jest.mock('@hooks/useUpdateTransactionCategory', () => () => ({updateCategory: jest.fn()}));
 
 jest.mock('@components/CategoryPicker/CategoryPickerModal', () => {
-    const {Pressable, Text} =
-        jest.requireActual<Record<'Pressable' | 'Text', React.ComponentType<{children?: React.ReactNode; onPress?: () => void; accessibilityLabel?: string}>>>('react-native');
+    const {Pressable, Text} = jest.requireActual<typeof ReactNative>('react-native');
     return ({onAddCategory}: {onAddCategory?: () => void}) =>
         onAddCategory ? (
             <Pressable

From 37377aa5397887918b9c6b9d8bb902c1f722b06e Mon Sep 17 00:00:00 2001
From: oqildev <oqilahmad99@gmail.com>
Date: Fri, 9 Oct 2026 12:07:37 +0500
Subject: [PATCH 370/781] Assert which view owns the bottom safe area padding
 in the invite page tests

The tests summed every bottom padding on the screen, so they only proved the
inset was added once. Leaving the ScreenWrapper in legacy mode and dropping
addBottomSafeAreaPadding from the list would have passed too, although the
inset would then sit on the wrapper spacer instead of the footer.

Each case now finds the views that reserve room for the inset and checks
whether they hold the confirm button: on Send invites it has to be the footer
alone, on All set the ScreenWrapper spacer alone.

The page is rendered once per case, so the manual unmount between two renders
is gone.
---
 tests/ui/WorkspaceReceiptPartnersTest.tsx | 77 ++++++++++-------------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/tests/ui/WorkspaceReceiptPartnersTest.tsx b/tests/ui/WorkspaceReceiptPartnersTest.tsx
index 09b6b703888f..9ca34888b6f8 100644
--- a/tests/ui/WorkspaceReceiptPartnersTest.tsx
+++ b/tests/ui/WorkspaceReceiptPartnersTest.tsx
@@ -1,4 +1,4 @@
-import {act, render, renderHook, screen, waitFor} from '@testing-library/react-native';
+import {act, render, renderHook, screen, waitFor, within} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
@@ -266,52 +266,35 @@ describe('WorkspaceReceiptPartners', () => {
     });
 
     describe('bottom safe area padding', () => {
-        const BOTTOM_INSET = 34;
+        // Larger than any regular spacing on these pages, so a view whose bottom padding reaches it can only be reserving room for the inset
+        const BOTTOM_INSET = 100;
+        const SCREEN_TEST_ID = 'DynamicInviteReceiptPartnerPolicyPage';
         let useSafeAreaInsetsSpy: jest.SpyInstance;
+        let safeAreaPaddingBottom: number;
 
         beforeEach(() => {
-            useSafeAreaInsetsSpy = jest.spyOn(useSafeAreaInsetsModule, 'default');
+            useSafeAreaInsetsSpy = jest.spyOn(useSafeAreaInsetsModule, 'default').mockReturnValue({top: 0, right: 0, bottom: BOTTOM_INSET, left: 0});
+            safeAreaPaddingBottom = renderHook(() => useSafeAreaPaddings(true)).result.current.paddingBottom;
         });
 
         afterEach(() => {
             useSafeAreaInsetsSpy.mockRestore();
         });
 
-        /** Renders the invite page on a device with the given bottom inset and sums the bottom padding of every view on the screen. */
-        const getInvitePageBottomPadding = async (bottomInset: number, headerTitle: string) => {
-            useSafeAreaInsetsSpy.mockReturnValue({top: 0, right: 0, bottom: bottomInset, left: 0});
-            const {unmount} = renderInvitePage({policyID, integration: UBER_INTEGRATION});
-
-            await waitForBatchedUpdatesWithAct();
-            await waitFor(() => {
-                expect(screen.getByText(headerTitle)).toBeOnTheScreen();
-            });
-
-            const totalBottomPadding = screen
-                .getByTestId('DynamicInviteReceiptPartnerPolicyPage')
-                .findAll((node) => typeof node.type === 'string')
-                .reduce((total, node) => {
-                    const style: unknown = StyleSheet.flatten(node.props.style);
-                    if (!style || typeof style !== 'object' || !('paddingBottom' in style) || typeof style.paddingBottom !== 'number') {
-                        return total;
+        /** Finds every view on the invite page that reserves room for the bottom safe area inset and tells whether it holds the given button. */
+        const doViewsWithBottomSafeAreaPaddingHoldButton = (buttonText: string) =>
+            screen
+                .getByTestId(SCREEN_TEST_ID)
+                .findAll((node) => {
+                    if (typeof node.type !== 'string') {
+                        return false;
                     }
-                    return total + style.paddingBottom;
-                }, 0);
-
-            unmount();
-            return totalBottomPadding;
-        };
-
-        /** Returns how much bottom padding the inset adds to the invite page, compared to a device without a bottom inset. */
-        const getBottomPaddingAddedByInset = async (headerTitle: string) => {
-            const bottomPaddingWithoutInset = await getInvitePageBottomPadding(0, headerTitle);
-            const bottomPaddingWithInset = await getInvitePageBottomPadding(BOTTOM_INSET, headerTitle);
-            return bottomPaddingWithInset - bottomPaddingWithoutInset;
-        };
-
-        const getSafeAreaPaddingBottom = () => renderHook(() => useSafeAreaPaddings(true)).result.current.paddingBottom;
+                    const style: unknown = StyleSheet.flatten(node.props.style);
+                    return !!style && typeof style === 'object' && 'paddingBottom' in style && typeof style.paddingBottom === 'number' && style.paddingBottom >= safeAreaPaddingBottom;
+                })
+                .map((view) => within(view).queryByText(buttonText) !== null);
 
-        it('applies the bottom safe area padding only once on the send invites page', async () => {
+        it('lets only the confirm button footer add the bottom safe area padding on the send invites page', async () => {
             // Given a workspace with members that can still be invited to Uber, so the page shows the member list with the confirm button footer
             await TestHelper.signInWithTestUser();
             await act(async () => {
@@ -320,13 +303,17 @@ describe('WorkspaceReceiptPartners', () => {
             });
 
             // When the page is rendered on a device that has a bottom safe area inset
-            const bottomPaddingAddedByInset = await getBottomPaddingAddedByInset(TestHelper.translateLocal('workspace.receiptPartners.uber.sendInvites'));
+            renderInvitePage({policyID, integration: UBER_INTEGRATION});
+            await waitForBatchedUpdatesWithAct();
+            await waitFor(() => {
+                expect(screen.getByText(TestHelper.translateLocal('workspace.receiptPartners.uber.sendInvites'))).toBeOnTheScreen();
+            });
 
-            // Then the inset should be added only once, because the confirm button footer already includes it and ScreenWrapper adding it again leaves an oversized gap below the button
-            expect(bottomPaddingAddedByInset).toBeCloseTo(getSafeAreaPaddingBottom());
+            // Then the footer holding the confirm button should be the only view that reserves room for the inset, because ScreenWrapper adding its own spacer below it leaves an oversized gap under the button
+            expect(doViewsWithBottomSafeAreaPaddingHoldButton(TestHelper.translateLocal('workspace.receiptPartners.uber.confirm'))).toEqual([true]);
         });
 
-        it('keeps the bottom safe area padding on the all set page', async () => {
+        it('lets only ScreenWrapper add the bottom safe area padding on the all set page', async () => {
             // Given a workspace where every member is already linked to Uber, so there is nobody left to invite and the page skips to the "All set" confirmation
             await TestHelper.signInWithTestUser();
             const linkedEmployee = {status: CONST.POLICY.RECEIPT_PARTNERS.UBER_EMPLOYEE_STATUS.LINKED};
@@ -348,10 +335,14 @@ describe('WorkspaceReceiptPartners', () => {
             });
 
             // When the page is rendered on a device that has a bottom safe area inset
-            const bottomPaddingAddedByInset = await getBottomPaddingAddedByInset(TestHelper.translateLocal('workspace.receiptPartners.uber.allSet'));
+            renderInvitePage({policyID, integration: UBER_INTEGRATION});
+            await waitForBatchedUpdatesWithAct();
+            await waitFor(() => {
+                expect(screen.getByText(TestHelper.translateLocal('workspace.receiptPartners.uber.allSet'))).toBeOnTheScreen();
+            });
 
-            // Then the inset should still be added once, because the confirmation footer does not include it and relies on ScreenWrapper to keep the button above the home indicator
-            expect(bottomPaddingAddedByInset).toBeCloseTo(getSafeAreaPaddingBottom());
+            // Then the ScreenWrapper spacer below the page should be the only view that reserves room for the inset, because the confirmation footer does not add it and needs the spacer to keep the button above the home indicator
+            expect(doViewsWithBottomSafeAreaPaddingHoldButton(TestHelper.translateLocal('common.buttonConfirm'))).toEqual([false]);
         });
     });
 });

From 54f949725befb0b6354f2ee0661252db19dbd704 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Fri, 9 Oct 2026 14:11:07 +0700
Subject: [PATCH 371/781] adjust test files

---
 .../CategoryFieldDropdown.test.tsx                       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
index 2db200d73da1..d9f93747220c 100644
--- a/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
+++ b/tests/unit/components/MoneyRequestConfirmationList/CategoryFieldDropdown.test.tsx
@@ -2,6 +2,8 @@ import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFields/Provider';
 import CategoryFieldDropdown from '@components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown';
+import type PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import type TextComponent from '@components/Text';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type TransitionTracker from '@libs/Navigation/TransitionTracker';
@@ -9,8 +11,6 @@ import type TransitionTracker from '@libs/Navigation/TransitionTracker';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import type * as ReactNative from 'react-native';
-
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
@@ -25,7 +25,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
 }));
 
 // Holds the post-transition work until the test runs it, standing in for the pop-over finishing its close.
-let mockRunPendingTransition: (() => void) | undefined;
+let mockRunPendingTransition: Parameters<typeof TransitionTracker.runAfterTransitions>[0]['callback'] | undefined;
 jest.mock('@libs/Navigation/TransitionTracker', () => ({
     runAfterTransitions: ({callback}: Parameters<typeof TransitionTracker.runAfterTransitions>[0]): ReturnType<typeof TransitionTracker.runAfterTransitions> => {
         mockRunPendingTransition = callback;
@@ -36,7 +36,8 @@ jest.mock('@libs/Navigation/TransitionTracker', () => ({
 jest.mock('@hooks/useUpdateTransactionCategory', () => () => ({updateCategory: jest.fn()}));
 
 jest.mock('@components/CategoryPicker/CategoryPickerModal', () => {
-    const {Pressable, Text} = jest.requireActual<typeof ReactNative>('react-native');
+    const {default: Pressable} = jest.requireActual<{default: typeof PressableWithoutFeedback}>('@components/Pressable/PressableWithoutFeedback');
+    const {default: Text} = jest.requireActual<{default: typeof TextComponent}>('@components/Text');
     return ({onAddCategory}: {onAddCategory?: () => void}) =>
         onAddCategory ? (
             <Pressable

From 21434e43168c79faf25de6e004bddd4908d1e14e Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Fri, 9 Oct 2026 10:56:46 +0200
Subject: [PATCH 372/781] Rename some identifiers

---
 src/pages/Insights/insightsGroupByOptions.ts | 4 ++--
 src/pages/Insights/useInsightsFilters.ts     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Insights/insightsGroupByOptions.ts b/src/pages/Insights/insightsGroupByOptions.ts
index cae9d72af9a8..77a6106c3a13 100644
--- a/src/pages/Insights/insightsGroupByOptions.ts
+++ b/src/pages/Insights/insightsGroupByOptions.ts
@@ -55,8 +55,8 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
         return groupBy;
     }
 
-    const distanceFromSelection = (option: InsightsGroupBy) => Math.abs(INSIGHTS_GROUP_BY_OPTIONS.indexOf(option) - INSIGHTS_GROUP_BY_OPTIONS.indexOf(groupBy));
-    return options.reduce((nearest, option) => (distanceFromSelection(option) < distanceFromSelection(nearest) ? option : nearest));
+    const getDistanceFromSelection = (option: InsightsGroupBy) => Math.abs(INSIGHTS_GROUP_BY_OPTIONS.indexOf(option) - INSIGHTS_GROUP_BY_OPTIONS.indexOf(groupBy));
+    return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
 export {getFittingGroupBy, getInsightsGroupByOptions};
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index a681d276ee9e..d5ce7187236c 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -30,7 +30,7 @@ type UseInsightsFiltersResult = {
     setFilters: (update: Partial<InsightsFilters>) => void;
 };
 
-function withFittingGroupBy(filters: InsightsFilters): InsightsFilters {
+function normalizeInsightsFilters(filters: InsightsFilters): InsightsFilters {
     return {...filters, groupBy: getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date))};
 }
 
@@ -45,10 +45,10 @@ function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersR
         ...DEFAULT_INSIGHTS_FILTERS,
         groupCurrency: activePolicy?.outputCurrency ?? CONST.CURRENCY.USD,
     };
-    const filters = withFittingGroupBy({...defaultFilters, ...parseInsightsFilters(storedQuery)});
+    const filters = normalizeInsightsFilters({...defaultFilters, ...parseInsightsFilters(storedQuery)});
 
     const setFilters = (update: Partial<InsightsFilters>) => {
-        setInsightsFilters(searchKey, buildInsightsQueryString(withFittingGroupBy({...filters, ...update})));
+        setInsightsFilters(searchKey, buildInsightsQueryString(normalizeInsightsFilters({...filters, ...update})));
     };
 
     return {

From 90389899204bb4ea2c0805c422af2ba2cc8d5e4b Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Fri, 9 Oct 2026 11:32:36 +0200
Subject: [PATCH 373/781] Always group by day for custom date

---
 src/pages/Insights/charts/InsightsChartWidget.tsx |  4 ++--
 src/pages/Insights/insightsGroupByOptions.ts      |  7 ++++++-
 src/pages/Insights/insightsQueries.ts             |  5 +++--
 tests/unit/insightsGroupByOptionsTest.ts          |  5 ++++-
 tests/unit/insightsQueriesTest.ts                 | 15 +++++++++++++--
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index acb1d56ab332..9c0556cb1e5b 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -20,7 +20,7 @@ import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsig
 import InsightsGroupByDropdown from '@pages/Insights/controls/InsightsGroupByDropdown';
 import type {InsightsChartSpec} from '@pages/Insights/dashboardSpecs';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
+import {getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByOptions';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -61,7 +61,7 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const {isOffline} = useNetwork();
     const sortedData = useGroupedItems(snapshot, queryJSON);
     const {data, state} = resolveInsightsChartData({snapshot, queryJSON, sortedData, isOffline});
-    const groupBy = chart.groupBy ?? filters.groupBy;
+    const groupBy = chart.groupBy ?? getQueryGroupBy(filters);
     const isLoading = state === INSIGHTS_CHART_STATE.LOADING;
     const shouldShowTable = chart.view === CONST.SEARCH.VIEW.BAR || chart.view === CONST.SEARCH.VIEW.PIE;
 
diff --git a/src/pages/Insights/insightsGroupByOptions.ts b/src/pages/Insights/insightsGroupByOptions.ts
index 77a6106c3a13..609df8814c0c 100644
--- a/src/pages/Insights/insightsGroupByOptions.ts
+++ b/src/pages/Insights/insightsGroupByOptions.ts
@@ -59,4 +59,9 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
     return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
-export {getFittingGroupBy, getInsightsGroupByOptions};
+/** Returns the Group by the charts are queried with. A single date has no options to pick from, so its one point is grouped by day. */
+function getQueryGroupBy(filters: InsightsFilters): InsightsGroupBy {
+    return 'on' in filters.date ? CONST.SEARCH.GROUP_BY.DAY : filters.groupBy;
+}
+
+export {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy};
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index fe61577ac23b..8cd26ebb22e2 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -10,6 +10,7 @@ import type {InsightsChartSpec} from './dashboardSpecs';
 import type {InsightsFilters} from './insightsFilters';
 
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
+import {getQueryGroupBy} from './insightsGroupByOptions';
 
 /** How many periods before the selected date range the Average mode spans (Typical on the ranking charts) */
 const COMPARE_TYPICAL_PERIOD_COUNT = 1;
@@ -42,7 +43,7 @@ function buildInsightsQueryString(filters: InsightsFilters): SearchQueryString {
 /** Builds a chart's query with the page's filters applied. */
 function applyInsightsFilters(chart: InsightsChartSpec, filters: InsightsFilters, compare?: SearchCompareMode): SearchQueryString {
     return buildQueryStringFromFilterFormValues(
-        {...buildFilterFormValues(filters), groupBy: chart.groupBy ?? filters.groupBy, view: chart.view, compare},
+        {...buildFilterFormValues(filters), groupBy: chart.groupBy ?? getQueryGroupBy(filters), view: chart.view, compare},
         {sortBy: chart.sortBy, sortOrder: chart.sortOrder, limit: chart.limit},
     );
 }
@@ -94,7 +95,7 @@ type InsightsQuery = {
 
 /** Builds one request for the whole dashboard, naming each graph's snapshots by its chart's query hashes, and returns those chart queries to read the snapshots back with. */
 function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsQuery | undefined {
-    const inputQuery = buildInsightsQueryString({...filters, compare: undefined});
+    const inputQuery = buildInsightsQueryString({...filters, groupBy: getQueryGroupBy(filters), compare: undefined});
     const queryJSON = buildSearchQueryJSON(inputQuery);
     if (!queryJSON) {
         return undefined;
diff --git a/tests/unit/insightsGroupByOptionsTest.ts b/tests/unit/insightsGroupByOptionsTest.ts
index 2d1492377ec1..1f787e595850 100644
--- a/tests/unit/insightsGroupByOptionsTest.ts
+++ b/tests/unit/insightsGroupByOptionsTest.ts
@@ -23,8 +23,11 @@ describe('insightsGroupByOptions', () => {
             ['year to date in October', {preset: YEAR_TO_DATE}, [WEEK, MONTH, QUARTER]],
             ['last 12 months', {preset: LAST_12_MONTHS}, [WEEK, MONTH, QUARTER]],
             ['a range under two weeks', {from: '2026-03-01', to: '2026-03-10'}, [DAY]],
+            ['a range of 13 days', {from: '2026-03-01', to: '2026-03-13'}, [DAY]],
+            ['a range of 14 days', {from: '2026-03-01', to: '2026-03-14'}, [DAY, WEEK]],
+            ['a range of 62 days', {from: '2026-03-01', to: '2026-05-01'}, [DAY, WEEK, MONTH]],
+            ['a range of 63 days', {from: '2026-03-01', to: '2026-05-02'}, [WEEK, MONTH]],
             ['a range of exactly two months', {from: '2026-01-01', to: '2026-02-28'}, [DAY, WEEK, MONTH]],
-            ['a range just over 62 days', {from: '2026-01-01', to: '2026-03-04'}, [WEEK, MONTH]],
             ['a range of two years', {from: '2024-01-01', to: '2025-12-31'}, [WEEK, MONTH, QUARTER, YEAR]],
             ['a single day', {on: '2026-03-04'}, []],
         ])('offers the options that fit %s', (_label, date, expected) => {
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index cf78f1d50a66..8fe5a163086d 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -144,8 +144,8 @@ describe('insightsQueries', () => {
             // When its request is built
             const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
-            // Then the query names that day, the same way it names a preset
-            expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
+            // Then the query names that day the same way it names a preset, grouped by day since a single date offers no grouping to pick
+            expect(parsePayload(request)?.inputQuery).toBe('groupBy:day groupCurrency:USD date:2026-03-04');
             expect(parsePayload(request)).toEqual(expect.objectContaining({insightsHashes: buildExpectedHashes(filters)}));
         });
         it('leaves the workspaces out of the query until some are selected', () => {
@@ -230,5 +230,16 @@ describe('insightsQueries', () => {
             expect(buildSearchQueryJSON(headlineQuery)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
             expect(supportingGroupBys).toEqual(SPEND_SPEC.supportingCharts.map((chart) => chart.groupBy));
         });
+
+        it('groups the headline chart by day on a single date, whatever grouping is saved', () => {
+            // Given the page filters saved as quarterly and narrowed to a single date
+            const filters: InsightsFilters = {...FILTERS, date: {on: '2026-03-04'}, groupBy: CONST.SEARCH.GROUP_BY.QUARTER};
+
+            // When the filters are applied to the headline chart
+            const headlineQuery = applyInsightsFilters(SPEND_SPEC.headlineChart, filters);
+
+            // Then its one point is grouped by day, so it's labeled with the date rather than the quarter
+            expect(buildSearchQueryJSON(headlineQuery)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
+        });
     });
 });

From 75a1d8de9fb35355986fff3198165c6e62a07adb Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Fri, 9 Oct 2026 11:38:40 +0200
Subject: [PATCH 374/781] Move file

---
 src/pages/Insights/charts/InsightsChartWidget.tsx             | 2 +-
 src/pages/Insights/controls/InsightsGroupByDropdown.tsx       | 2 +-
 .../{insightsGroupByOptions.ts => insightsGroupByUtils.ts}    | 4 ++--
 src/pages/Insights/insightsQueries.ts                         | 2 +-
 src/pages/Insights/useInsightsFilters.ts                      | 2 +-
 tests/ui/InsightsControlsTest.tsx                             | 2 +-
 ...ightsGroupByOptionsTest.ts => insightsGroupByUtilsTest.ts} | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/pages/Insights/{insightsGroupByOptions.ts => insightsGroupByUtils.ts} (96%)
 rename tests/unit/{insightsGroupByOptionsTest.ts => insightsGroupByUtilsTest.ts} (98%)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 9c0556cb1e5b..c2b29e7acba3 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -20,7 +20,7 @@ import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsig
 import InsightsGroupByDropdown from '@pages/Insights/controls/InsightsGroupByDropdown';
 import type {InsightsChartSpec} from '@pages/Insights/dashboardSpecs';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByOptions';
+import {getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
diff --git a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
index 47d58bfa7eb3..d31d8b27a9dc 100644
--- a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
+++ b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
@@ -8,7 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
 import DEFAULT_INSIGHTS_FILTERS from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy} from '@pages/Insights/insightsGroupByOptions';
+import {getFittingGroupBy} from '@pages/Insights/insightsGroupByUtils';
 
 import variables from '@styles/variables';
 
diff --git a/src/pages/Insights/insightsGroupByOptions.ts b/src/pages/Insights/insightsGroupByUtils.ts
similarity index 96%
rename from src/pages/Insights/insightsGroupByOptions.ts
rename to src/pages/Insights/insightsGroupByUtils.ts
index 609df8814c0c..bdfaa4638b17 100644
--- a/src/pages/Insights/insightsGroupByOptions.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -10,9 +10,7 @@ import {INSIGHTS_GROUP_BY_OPTIONS} from './insightsFilters';
 
 type InsightsGroupBy = InsightsFilters['groupBy'];
 
-/** Longest range, in days, still readable one point per day */
 const MAX_DAYS_GROUPED_BY_DAY = 62;
-
 const MIN_DAYS_GROUPED_BY_WEEK = 14;
 const MIN_MONTHS_BY_GROUP_BY = {
     [CONST.SEARCH.GROUP_BY.MONTH]: 2,
@@ -28,6 +26,8 @@ function getInsightsGroupByOptions(date: InsightsFilters['date']): InsightsGroup
     }
 
     const boundaries = 'from' in date ? {start: date.from, end: date.to} : getDateRangeForPreset(date.preset);
+
+    // Presets like "never" have no fixed range, so there's no length to fit a grouping to
     if (!boundaries.start || !boundaries.end) {
         return [];
     }
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index 8cd26ebb22e2..49b03b98ff4f 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -10,7 +10,7 @@ import type {InsightsChartSpec} from './dashboardSpecs';
 import type {InsightsFilters} from './insightsFilters';
 
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
-import {getQueryGroupBy} from './insightsGroupByOptions';
+import {getQueryGroupBy} from './insightsGroupByUtils';
 
 /** How many periods before the selected date range the Average mode spans (Typical on the ranking charts) */
 const COMPARE_TYPICAL_PERIOD_COUNT = 1;
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index d5ce7187236c..376d4fbb7bb3 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -13,7 +13,7 @@ import type {InsightsFilters} from './insightsFilters';
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 import {parseInsightsFilters} from './insightsFilterParsing';
 import DEFAULT_INSIGHTS_FILTERS from './insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByOptions';
+import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByUtils';
 import {buildInsightsQueryString} from './insightsQueries';
 
 type UseInsightsFiltersResult = {
diff --git a/tests/ui/InsightsControlsTest.tsx b/tests/ui/InsightsControlsTest.tsx
index 84f9f3390e0f..61717f2ebd81 100644
--- a/tests/ui/InsightsControlsTest.tsx
+++ b/tests/ui/InsightsControlsTest.tsx
@@ -10,7 +10,7 @@ import InsightsGroupCurrencyControl from '@pages/Insights/controls/InsightsGroup
 import InsightsPageControls from '@pages/Insights/controls/InsightsPageControls';
 import InsightsWorkspaceControl from '@pages/Insights/controls/InsightsWorkspaceControl';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
+import {getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
diff --git a/tests/unit/insightsGroupByOptionsTest.ts b/tests/unit/insightsGroupByUtilsTest.ts
similarity index 98%
rename from tests/unit/insightsGroupByOptionsTest.ts
rename to tests/unit/insightsGroupByUtilsTest.ts
index 1f787e595850..991369dd50cf 100644
--- a/tests/unit/insightsGroupByOptionsTest.ts
+++ b/tests/unit/insightsGroupByUtilsTest.ts
@@ -1,12 +1,12 @@
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByOptions';
+import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 
 const {DAY, WEEK, MONTH, QUARTER, YEAR} = CONST.SEARCH.GROUP_BY;
 const {THIS_MONTH, LAST_MONTH, YEAR_TO_DATE, LAST_12_MONTHS} = CONST.SEARCH.DATE_PRESETS;
 
-describe('insightsGroupByOptions', () => {
+describe('insightsGroupByUtils', () => {
     beforeEach(() => {
         jest.useFakeTimers();
         jest.setSystemTime(new Date(2026, 9, 8));

From 67b7b9fcbbe3f9d3c6913d1190e0ec75c1fc9902 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Fri, 9 Oct 2026 11:47:02 +0200
Subject: [PATCH 375/781] Small test fix

---
 tests/unit/hooks/useInsightsFilters.test.ts | 23 +++------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index 2e0a74989730..c0a61f845fef 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -57,26 +57,9 @@ describe('useInsightsFilters', () => {
     });
 
     beforeEach(async () => {
-        // Only the clock is faked, so the presets cover a known range while Onyx keeps its real timers
-        jest.useFakeTimers({
-            now: new Date(2026, 9, 8),
-            doNotFake: [
-                'nextTick',
-                'setImmediate',
-                'clearImmediate',
-                'setInterval',
-                'clearInterval',
-                'setTimeout',
-                'clearTimeout',
-                'queueMicrotask',
-                'requestAnimationFrame',
-                'cancelAnimationFrame',
-                'requestIdleCallback',
-                'cancelIdleCallback',
-                'hrtime',
-                'performance',
-            ],
-        });
+        // Pin the date, so the presets cover a known range
+        jest.useFakeTimers({doNotFake: ['nextTick', 'setImmediate']});
+        jest.setSystemTime(new Date(2026, 9, 8));
         await Onyx.clear();
         await waitForBatchedUpdates();
     });

From a5d8f4432749918fca2a033a706d38c136ef601d Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 12:11:42 +0200
Subject: [PATCH 376/781] fix: mWeb offline indicator floats above the bar, so
 tab root content runs under it

---
 src/styles/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/styles/index.ts b/src/styles/index.ts
index 60ff872fe82d..6f09c7bc881f 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -795,9 +795,14 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'visible',
         },
 
-        // The floating bar is laid over the bottom of a tab root screen, so the offline indicator sits above it.
+        // The floating bar is laid over the bottom of a tab root screen, so the offline indicator floats above it
+        // without shrinking the content that runs under the bar.
         floatingTabBarOfflineIndicator: {
-            marginBottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
+            position: 'absolute',
+            right: 0,
+            bottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
+            left: 0,
+            backgroundColor: theme.appBG,
         },
 
         // The gap between the floating bar and the bottom edge of the screen.

From e084f413813d9f68155a7cfdbb8b54e39b1b036e Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 12:11:45 +0200
Subject: [PATCH 377/781] fix: iOS Account drawn over the tabs keeps the
 offline indicator at the screen bottom, like Android

---
 .../useTabRootScreenWrapperProps/index.ios.tsx   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 4af99cca3d8c..22dd8278c1ba 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,3 +1,7 @@
+import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+
+import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -9,13 +13,19 @@ import type TabRootScreenWrapperProps from './types';
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
  * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar,
- * and the offline indicator sits above the bar.
+ * and the offline indicator sits above the bar. Account drawn over the tabs hides the bar.
  */
-function useTabRootScreenWrapperProps(): TabRootScreenWrapperProps {
+function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
     const styles = useThemeStyles();
     const {bottom: bottomInset} = useSafeAreaInsets();
-    return shouldUseNarrowLayout ? {includeSafeAreaPaddingBottom: false, offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset))} : {};
+
+    if (!shouldUseNarrowLayout || (selectedTab === NAVIGATION_TABS.SETTINGS && isSettingsDrawnOverTabs)) {
+        return {};
+    }
+
+    return {includeSafeAreaPaddingBottom: false, offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset))};
 }
 
 export default useTabRootScreenWrapperProps;

From 3b58de9dbf04937dcda72619521aec49615630c0 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Fri, 9 Oct 2026 11:12:32 +0100
Subject: [PATCH 378/781] fix: shorten commuter exclusions prompt

---
 src/languages/de.ts                                     | 4 ++--
 src/languages/el.ts                                     | 3 ++-
 src/languages/en.ts                                     | 4 ++--
 src/languages/es.ts                                     | 4 ++--
 src/languages/fr.ts                                     | 3 ++-
 src/languages/it.ts                                     | 4 ++--
 src/languages/ja.ts                                     | 4 ++--
 src/languages/nl.ts                                     | 4 ++--
 src/languages/pl.ts                                     | 4 ++--
 src/languages/pt-BR.ts                                  | 4 ++--
 src/languages/zh-hans.ts                                | 3 ++-
 src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx | 2 +-
 tests/ui/WorkspaceMoreFeaturesPageTest.tsx              | 2 ++
 13 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 7487abb03d2d..9f7b52a66e25 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6564,8 +6564,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
             distanceRates: {
                 title: 'Kilometersätze',
                 subtitle: 'Sätze Tarife fest, aktualisiere sie und setze sie durch.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'Du kannst Distanzsätze nicht deaktivieren, solange Ausschlüsse für den Arbeitsweg zwischen Zuhause und Büro aktiv sind. Stelle zuerst „Arbeitswege ausschließen“ auf „Keine Arbeitswege ausschließen“.',
+                commuterExclusionsOnTitle: 'Pendlerfahrten-Ausschlüsse sind aktiviert',
+                disableLockedByCommuterExclusionsPrompt: 'Um Entfernungsraten zu deaktivieren, stellen Sie zuerst „Arbeitswege ausschließen“ auf „Arbeitswege nicht ausschließen“.',
             },
             perDiem: {
                 title: 'Tagegeld',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 4db44e509df9..24bf3915b5e9 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -6672,8 +6672,9 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             distanceRates: {
                 title: 'Τιμές χιλιομετρικής αποζημίωσης',
                 subtitle: 'Προσθέστε, ενημερώστε και εφαρμόστε τιμές.',
+                commuterExclusionsOnTitle: 'Οι εξαιρέσεις μετακίνησης είναι ενεργές',
                 disableLockedByCommuterExclusionsPrompt:
-                    'Δεν μπορείτε να απενεργοποιήσετε τις χιλιομετρικές αποζημιώσεις όσο είναι ενεργοί οι αποκλεισμοί μετακίνησης μεταξύ σπιτιού και γραφείου. Ορίστε πρώτα την επιλογή «Εξαίρεση μετακινήσεων» σε «Να μην εξαιρούνται οι μετακινήσεις».',
+                    'Για να απενεργοποιήσετε τις χρεώσεις απόστασης, πρώτα ορίστε την επιλογή «Εξαίρεση μετακινήσεων από και προς την εργασία» σε «Να μην εξαιρούνται οι μετακινήσεις από και προς την εργασία».',
             },
             perDiem: {
                 title: 'Ημερήσια αποζημίωση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 10c98c04e52e..ff9d1a539c32 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6893,8 +6893,8 @@ const translations = {
             distanceRates: {
                 title: 'Distance rates',
                 subtitle: 'Add, update, and enforce rates.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'You can’t turn off Distance rates while Home and office commuter exclusions are enabled. First set Exclude commutes to “Do not exclude commutes”.',
+                commuterExclusionsOnTitle: 'Commute exclusions are on',
+                disableLockedByCommuterExclusionsPrompt: 'To turn off Distance rates, first set Exclude commutes to “Do not exclude commutes.”',
             },
             perDiem: {
                 title: 'Per diem',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 75f82a1a5c96..b8ae8d285465 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6426,8 +6426,8 @@ ${amount} para ${merchant} - ${date}`,
             distanceRates: {
                 title: 'Tasas de distancia',
                 subtitle: 'Añade, actualiza y haz cumplir las tasas.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'No puedes desactivar las tasas de distancia mientras estén activas las exclusiones de desplazamientos entre casa y oficina. Primero establece Excluir desplazamientos en «No excluir desplazamientos».',
+                commuterExclusionsOnTitle: 'Las exclusiones de desplazamiento están activadas',
+                disableLockedByCommuterExclusionsPrompt: 'Para desactivar las tarifas de distancia, primero establece Excluir desplazamientos a “No excluir desplazamientos”.',
             },
             perDiem: {
                 title: 'Per diem',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5b7297dac8f1..fa99009bce3b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6570,8 +6570,9 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
             distanceRates: {
                 title: 'Taux de distance',
                 subtitle: 'Ajoutez, mettez à jour et appliquez les taux.',
+                commuterExclusionsOnTitle: 'Les exclusions de trajet domicile-travail sont activées',
                 disableLockedByCommuterExclusionsPrompt:
-                    'Vous ne pouvez pas désactiver les taux de distance tant que les exclusions des trajets entre le domicile et le bureau sont activées. Définissez d’abord Exclure les trajets sur « Ne pas exclure les trajets ».',
+                    'Pour désactiver les taux de distance, commencez par définir Exclure les trajets domicile-travail sur « Ne pas exclure les trajets domicile-travail ».',
             },
             perDiem: {
                 title: 'Indemnité journalière',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index a791172d0cf3..b050dd9ffb85 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6517,8 +6517,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
             distanceRates: {
                 title: 'Tariffe chilometriche',
                 subtitle: 'Aggiungi, aggiorna e applica le tariffe.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'Non puoi disattivare le tariffe di distanza mentre sono attive le esclusioni per i tragitti tra casa e ufficio. Imposta prima Escludi tragitti su “Non escludere i tragitti”.',
+                commuterExclusionsOnTitle: 'Le esclusioni del tragitto casa-lavoro sono attive',
+                disableLockedByCommuterExclusionsPrompt: 'Per disattivare le tariffe distanza, prima imposta Escludi spostamenti casa-lavoro su “Non escludere spostamenti casa-lavoro”.',
             },
             perDiem: {
                 title: 'Diaria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index f864caeffd49..799a7ab1d76a 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6442,8 +6442,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
             distanceRates: {
                 title: '距離単価',
                 subtitle: 'レートを追加、更新し、適用します。',
-                disableLockedByCommuterExclusionsPrompt:
-                    '自宅とオフィス間の通勤除外が有効な間は、距離単価をオフにできません。距離単価をオフにするには、まず「通勤を除外」を「通勤を除外しない」に設定してください。',
+                commuterExclusionsOnTitle: '通勤除外が有効になっています',
+                disableLockedByCommuterExclusionsPrompt: '距離レートをオフにするには、まず「通勤を除外しない」に通勤の除外設定を変更してください。',
             },
             perDiem: {
                 title: '日当',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c3571b9c56c7..f3cca4a00bee 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6510,8 +6510,8 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             distanceRates: {
                 title: 'Kilometertarieven',
                 subtitle: 'Tarieven toevoegen, bijwerken en afdwingen.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'Je kunt kilometertarieven niet uitschakelen zolang woon-werkverkeer tussen huis en kantoor is uitgesloten. Stel Woon-werkverkeer uitsluiten eerst in op ‘Woon-werkverkeer niet uitsluiten’.',
+                commuterExclusionsOnTitle: 'Woon-werkuitzonderingen zijn ingeschakeld',
+                disableLockedByCommuterExclusionsPrompt: 'Om afstandstarieven uit te schakelen, stel je eerst Woon-werkverkeer uitsluiten in op ‘Woon-werkverkeer niet uitsluiten’.',
             },
             perDiem: {
                 title: 'Dagvergoeding',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 1434d5eb3d35..62ce346ff256 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6532,8 +6532,8 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
             distanceRates: {
                 title: 'Stawki za dystans',
                 subtitle: 'Dodawaj, aktualizuj i egzekwuj stawki.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'Nie możesz wyłączyć stawek za dystans, gdy aktywne są wykluczenia dojazdów między domem a biurem. Najpierw ustaw Wykluczaj dojazdy na „Nie wykluczaj dojazdów”.',
+                commuterExclusionsOnTitle: 'Wykluczenia dojazdów są włączone',
+                disableLockedByCommuterExclusionsPrompt: 'Aby wyłączyć stawki za dystans, najpierw ustaw Wykluczanie dojazdów na „Nie wykluczaj dojazdów”.',
             },
             perDiem: {
                 title: 'Dieta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 71f61d09455f..b75e858f3a2f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6508,8 +6508,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
             distanceRates: {
                 title: 'Taxas de distância',
                 subtitle: 'Adicione, atualize e aplique tarifas.',
-                disableLockedByCommuterExclusionsPrompt:
-                    'Você não pode desativar as taxas de distância enquanto as exclusões de deslocamento entre casa e escritório estiverem ativas. Primeiro, defina Excluir deslocamentos como “Não excluir deslocamentos”.',
+                commuterExclusionsOnTitle: 'Exclusões de deslocamento estão ativadas',
+                disableLockedByCommuterExclusionsPrompt: 'Para desativar as tarifas de distância, primeiro defina Excluir deslocamentos como “Não excluir deslocamentos”.',
             },
             perDiem: {
                 title: 'Diária',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 6ea147ce1bee..6d3505e737c0 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6297,7 +6297,8 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             distanceRates: {
                 title: '距离费率',
                 subtitle: '添加、更新并执行费率。',
-                disableLockedByCommuterExclusionsPrompt: '启用家庭与办公室通勤排除时，无法关闭距离费率。请先将“排除通勤”设为“不排除通勤”。',
+                commuterExclusionsOnTitle: '通勤排除已开启',
+                disableLockedByCommuterExclusionsPrompt: '若要关闭距离费率，首先将“排除通勤”设置为“不要排除通勤”。',
             },
             perDiem: {
                 title: '每日津贴',
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
index c0e64ce5373b..807875f3f34e 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
@@ -326,7 +326,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
 
     const promptDisableDistanceRatesForCommuterExclusions = async () => {
         await showConfirmModal({
-            title: translate('workspace.distanceRates.oopsNotSoFast'),
+            title: translate('workspace.moreFeatures.distanceRates.commuterExclusionsOnTitle'),
             prompt: translate('workspace.moreFeatures.distanceRates.disableLockedByCommuterExclusionsPrompt'),
             confirmText: translate('common.buttonConfirm'),
             shouldShowCancelButton: false,
diff --git a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
index 2b472b46120b..dd793a8f8814 100644
--- a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
+++ b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
@@ -188,7 +188,9 @@ describe('WorkspaceMoreFeaturesPage', () => {
             fireEvent.press(await findLockedSwitch('workspace.moreFeatures.distanceRates.subtitle'));
 
             await waitFor(() => {
+                expect(screen.getByText(TestHelper.translateLocal('workspace.moreFeatures.distanceRates.commuterExclusionsOnTitle'))).toBeOnTheScreen();
                 expect(screen.getByText(TestHelper.translateLocal('workspace.moreFeatures.distanceRates.disableLockedByCommuterExclusionsPrompt'))).toBeOnTheScreen();
+                expect(screen.getByText(TestHelper.translateLocal('common.buttonConfirm'))).toBeOnTheScreen();
             });
         });
 

From 0164a09693da462c134152c8d7af41b1b9dcf8e3 Mon Sep 17 00:00:00 2001
From: "mkhutornyi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 10:37:38 +0000
Subject: [PATCH 379/781] Revert shouldShowPayer to only show for
 REIMBURSEMENT_MANUAL

Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
---
 src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
index 5d44999801c2..c8b9897eddf9 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
@@ -139,7 +139,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     const hasOtherEligibleExistingAccounts = getEligibleExistingBusinessBankAccounts(bankAccountList, policy?.outputCurrency, true, bankAccountID).length > 0;
 
     const shouldShowBankAccount = (!!isBankAccountFullySetup || !!bankAccountConnectedToWorkspace) && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-    const shouldShowPayer = shouldShowBankAccount || policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+    const shouldShowPayer = shouldShowBankAccount || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
     const bankAccountPendingAction = bankAccountConnectedToWorkspace?.pendingAction;
     const isBankAccountPendingDelete = bankAccountPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 

From 139dc97ae00fce43e038f5da3a8975e2851717d7 Mon Sep 17 00:00:00 2001
From: "mkhutornyi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 10:48:06 +0000
Subject: [PATCH 380/781] Remove Payer row test that asserts the reverted
 shouldShowPayer change

Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
---
 tests/ui/WorkspaceWorkflowsPayerRowTest.tsx | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
index aa514fa2eb5b..2e25014d7356 100644
--- a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
+++ b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
@@ -144,33 +144,6 @@ describe('WorkspaceWorkflowsPage - Payer row visibility', () => {
         expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
     });
 
-    it('keeps the Payer row when reimbursementChoice is REIMBURSEMENT_YES after the bank account is disconnected', async () => {
-        await TestHelper.signInWithTestUser();
-        await act(async () => {
-            // Disconnecting the bank account clears the bank data (no open state, removed from BANK_ACCOUNT_LIST)
-            // but preserves the reimburser and leaves reimbursementChoice as REIMBURSEMENT_YES.
-            await Onyx.merge(
-                `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
-                buildPolicy({
-                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
-                    achAccount: {
-                        reimburser: 'test@user.com',
-                        bankAccountID: 0,
-                        accountNumber: '',
-                        routingNumber: '',
-                        addressName: '',
-                        bankName: '',
-                    },
-                }),
-            );
-        });
-
-        renderPage();
-        await waitForBatchedUpdatesWithAct();
-
-        expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
-    });
-
     it('shows the Payer row when reimbursementChoice is REIMBURSEMENT_MANUAL', async () => {
         await TestHelper.signInWithTestUser();
         await act(async () => {

From 92af6866a5ad599b8efbeed8b90f32a27fb9c1df Mon Sep 17 00:00:00 2001
From: "mkhutornyi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 10:56:36 +0000
Subject: [PATCH 381/781] Show Payer row unless reimbursements are disabled and
 restore its regression test

Restores the test removed in 139dc97ae00.

Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
---
 .../workflows/tabs/WorkflowsPaymentsTab.tsx   |  2 +-
 tests/ui/WorkspaceWorkflowsPayerRowTest.tsx   | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
index a74f63595c5e..dd124efa1600 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
@@ -141,7 +141,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     const hasOtherEligibleExistingAccounts = getEligibleExistingBusinessBankAccounts(bankAccountList, policy?.outputCurrency, true, bankAccountID).length > 0;
 
     const shouldShowBankAccount = (!!isBankAccountFullySetup || !!bankAccountConnectedToWorkspace) && getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-    const shouldShowPayer = shouldShowBankAccount || getReimbursementChoice(policy) === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+    const shouldShowPayer = shouldShowBankAccount || getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
     const bankAccountPendingAction = bankAccountConnectedToWorkspace?.pendingAction;
     const isBankAccountPendingDelete = bankAccountPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
diff --git a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
index 04091c346258..234c369dfdb7 100644
--- a/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
+++ b/tests/ui/WorkspaceWorkflowsPayerRowTest.tsx
@@ -144,6 +144,33 @@ describe('WorkspaceWorkflowsPageRevamp - Payer row visibility', () => {
         expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
     });
 
+    it('keeps the Payer row when reimbursementChoice is REIMBURSEMENT_YES after the bank account is disconnected', async () => {
+        await TestHelper.signInWithTestUser();
+        await act(async () => {
+            // Disconnecting the bank account clears the bank data (no open state, removed from BANK_ACCOUNT_LIST)
+            // but preserves the reimburser and leaves reimbursementChoice as REIMBURSEMENT_YES.
+            await Onyx.merge(
+                `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
+                buildPolicy({
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                    achAccount: {
+                        reimburser: 'test@user.com',
+                        bankAccountID: 0,
+                        accountNumber: '',
+                        routingNumber: '',
+                        addressName: '',
+                        bankName: '',
+                    },
+                }),
+            );
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByText(TestHelper.translateLocal('workflowsPayerPage.payer'))).toBeOnTheScreen();
+    });
+
     it('shows the Payer row when reimbursementChoice is REIMBURSEMENT_MANUAL', async () => {
         await TestHelper.signInWithTestUser();
         await act(async () => {

From 9d282fbaff2bb76357471a2938421244a0a7fc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 9 Oct 2026 13:02:42 +0200
Subject: [PATCH 382/781] Bump Re.Pack to 5.4.1 and drop upstreamed patches

---
 .npmrc                                        |   7 +
 package-lock.json                             |  60 +--
 package.json                                  |   6 +-
 ...+5.3.0+001+clamp-dev-server-progress.patch |  48 ---
 ...+5.3.0+002+lazy-platform-compilation.patch | 358 ------------------
 ...k+repack+5.3.0+003+android-fonts-raw.patch |  15 -
 ...ck+repack+5.3.0+004+android-keep-xml.patch |  46 ---
 ...+5.4.1+001+clamp-dev-server-progress.patch |  46 +++
 8 files changed, 86 insertions(+), 500 deletions(-)
 delete mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch
 delete mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+002+lazy-platform-compilation.patch
 delete mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
 delete mode 100644 patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch
 create mode 100644 patches/@callstack/repack/@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch

diff --git a/.npmrc b/.npmrc
index 2a14ea859d36..7066c50c4ef6 100644
--- a/.npmrc
+++ b/.npmrc
@@ -10,3 +10,10 @@ min-release-age-exclude[]=@expensify/react-native-wallet
 min-release-age-exclude[]=react-fast-pdf
 min-release-age-exclude[]=react-native-key-command
 min-release-age-exclude[]=react-native-qrcode-svg
+
+# Temporary: pin of @callstack/repack@5.4.1 predates the age window.
+# Remove these entries once a dependency on 5.4.1 has been installable for 7+ days.
+min-release-age-exclude[]=@callstack/repack
+min-release-age-exclude[]=@callstack/repack-dev-server
+min-release-age-exclude[]=@callstack/repack-plugin-expo-modules
+min-release-age-exclude[]=@callstack/repack-plugin-reanimated
diff --git a/package-lock.json b/package-lock.json
index f656c125faa8..3caefaa3a42b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -165,9 +165,9 @@
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@babel/plugin-transform-export-namespace-from": "^7.27.1",
         "@callstack/reassure-compare": "^1.0.0-rc.4",
-        "@callstack/repack": "5.3.0",
-        "@callstack/repack-plugin-expo-modules": "5.3.0",
-        "@callstack/repack-plugin-reanimated": "5.3.0",
+        "@callstack/repack": "5.4.1",
+        "@callstack/repack-plugin-expo-modules": "5.4.1",
+        "@callstack/repack-plugin-reanimated": "5.4.1",
         "@dword-design/eslint-plugin-import-alias": "^5.0.0",
         "@fullstory/babel-plugin-annotate-react": "^2.4.0",
         "@fullstory/babel-plugin-react-native": "^1.7.1",
@@ -4026,13 +4026,13 @@
       }
     },
     "node_modules/@callstack/repack": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@callstack/repack/-/repack-5.3.0.tgz",
-      "integrity": "sha512-/5pnG6bz+nkV8DkVZfRDpRSVMUU+znLEfKy49HQgxsJx5vxlxL3MV7Pn2+APetitB9NEGFP+GQApj5hesUKQCw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@callstack/repack/-/repack-5.4.1.tgz",
+      "integrity": "sha512-vlpXdlVLiu9mi2ca3TMBv1MydnTGX789EHTDQ7RMBZO43DHx6RDrWh5snzbWclhy3+HmvdUkKA4eyYduRoDWUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@callstack/repack-dev-server": "5.3.0",
+        "@callstack/repack-dev-server": "5.4.1",
         "@discoveryjs/json-ext": "^0.5.7",
         "@rspack/plugin-react-refresh": "1.0.0",
         "babel-loader": "^9.2.1",
@@ -4080,9 +4080,9 @@
       }
     },
     "node_modules/@callstack/repack-dev-server": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@callstack/repack-dev-server/-/repack-dev-server-5.3.0.tgz",
-      "integrity": "sha512-WW5onAddhO12wM59VCCpLQYn7NIPZc2HvM+mmcTvJsi8k3ggeW61pYsOnnX6GMNWmy/2Wu4AiecouQa4+zGuwA==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@callstack/repack-dev-server/-/repack-dev-server-5.4.1.tgz",
+      "integrity": "sha512-aRXPBx1ZRWuO9m3JVI5RWXO9GqxTLRX1Z3Ca+T724CQqqj/VK7q91+uEc7ReqiqHKrCMYwTY2CM8lNpZDKggUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4182,22 +4182,22 @@
       }
     },
     "node_modules/@callstack/repack-plugin-expo-modules": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@callstack/repack-plugin-expo-modules/-/repack-plugin-expo-modules-5.3.0.tgz",
-      "integrity": "sha512-4tnnb4ujLckWqYQOAzPIeOM9vWvVPdzS4SD+y5kjiFckVu0N6COzF29gl3EYZfJwKLU4tGkPqUqfvIa60HzQaQ==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@callstack/repack-plugin-expo-modules/-/repack-plugin-expo-modules-5.4.1.tgz",
+      "integrity": "sha512-YCCQXbjdnI3euHZYcpCMSngwBVovNFNUfD3HOsntAzCEyClpU1DVg2kWdI9wM9ZsTUPRr/eH49L2KZ1xyyzzOA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@callstack/repack": "^5.3.0"
+        "@callstack/repack": "^5.4.1"
       }
     },
     "node_modules/@callstack/repack-plugin-reanimated": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@callstack/repack-plugin-reanimated/-/repack-plugin-reanimated-5.3.0.tgz",
-      "integrity": "sha512-TtuVhhAlvLdg+wrHf8k15Q5zNLiemOuFavsFiOQQhQP5vX299eEp2lw/1tr25vYsdoGvdc0Na0BsePRIF4ujGg==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@callstack/repack-plugin-reanimated/-/repack-plugin-reanimated-5.4.1.tgz",
+      "integrity": "sha512-qwiiLlqb1xWf3K2Qv3yVO/ujnkaTOkGSg2gPq4+x8IcFqZRftiW3qlZYTRN913OXqB7e3ZajOepwDUUMWmZJCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4208,7 +4208,7 @@
       },
       "peerDependencies": {
         "@babel/core": "^7.20",
-        "@callstack/repack": "^5.3.0"
+        "@callstack/repack": "^5.4.1"
       }
     },
     "node_modules/@callstack/repack-plugin-reanimated/node_modules/semver": {
@@ -8612,9 +8612,9 @@
       "license": "MIT"
     },
     "node_modules/@fastify/proxy-addr": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@fastify/proxy-addr/-/proxy-addr-5.1.0.tgz",
-      "integrity": "sha512-INS+6gh91cLUjB+PVHfu1UqcB76Sqtpyp7bnL+FYojhjygvOPA9ctiD/JDKsyD9Xgu4hUhCSJBPig/w7duNajw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@fastify/proxy-addr/-/proxy-addr-5.1.1.tgz",
+      "integrity": "sha512-zv07Y9GEuDsJPegZoDFd4SDWaZOW8N2pa0GSrYmKpId/tjt1Hgo3BjZBVjdVpfVrHaA+Qv5jawtS2O50J5xM9g==",
       "dev": true,
       "funding": [
         {
@@ -8633,9 +8633,9 @@
       }
     },
     "node_modules/@fastify/sensible": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@fastify/sensible/-/sensible-6.0.5.tgz",
-      "integrity": "sha512-v4mGejwT6EJA2zd2rS6XwlyUSva2ILsqzG0aGkyrlS7l2jIpUgFACclSPN3kDijX//cf8+GutRLhJVKx3ae2Cw==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@fastify/sensible/-/sensible-6.0.6.tgz",
+      "integrity": "sha512-2OhR9prEDmjeVSrBUBXgP9e595WWrBGQxjo/JMweA7DgJ5gseotN0OhRWZLom1nnmFkLywkccdQc10ihFtT6fw==",
       "dev": true,
       "funding": [
         {
@@ -27212,9 +27212,9 @@
       }
     },
     "node_modules/fast-uri": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-4.1.4.tgz",
-      "integrity": "sha512-dODXrIxlS9JSdgAnhIUKOosKV1oMtU2VtVw87QRaHzyl5jxO290Ii5tEZfCfzfWNHi3jKWwBSdQj0qIyshdZdQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-4.2.1.tgz",
+      "integrity": "sha512-TmHQgewjHtMq1E5QKA0tOE0yeYGQs25KZC/ziJpubRtWI15W92e6vPFydWOeZBVROSHBYw/QhD9d5OefdD6LDg==",
       "dev": true,
       "funding": [
         {
@@ -27270,9 +27270,9 @@
       }
     },
     "node_modules/fastify": {
-      "version": "5.12.3",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.12.3.tgz",
-      "integrity": "sha512-reZ8wce5VNCcufIt9AVtzZa3L4u1j8esikn7OEgHWLVpRpL5R7Y2+Xzj70OUkv5zDfzUAxXZT6cu4Rt0zr3EKA==",
+      "version": "5.12.5",
+      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.12.5.tgz",
+      "integrity": "sha512-OB2k1dlxs5/NAABqeKV2FUHkSD2BbENsCak8yULVcymn3fHIPDVa9TI3SDnJSWYSllZmSYuZXy2gTnsT+Sut1A==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 9a8893604467..27c4300259aa 100644
--- a/package.json
+++ b/package.json
@@ -241,9 +241,9 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/plugin-transform-export-namespace-from": "^7.27.1",
     "@callstack/reassure-compare": "^1.0.0-rc.4",
-    "@callstack/repack": "5.3.0",
-    "@callstack/repack-plugin-expo-modules": "5.3.0",
-    "@callstack/repack-plugin-reanimated": "5.3.0",
+    "@callstack/repack": "5.4.1",
+    "@callstack/repack-plugin-expo-modules": "5.4.1",
+    "@callstack/repack-plugin-reanimated": "5.4.1",
     "@dword-design/eslint-plugin-import-alias": "^5.0.0",
     "@fullstory/babel-plugin-annotate-react": "^2.4.0",
     "@fullstory/babel-plugin-react-native": "^1.7.1",
diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch
deleted file mode 100644
index a9ea9ca1aa0e..000000000000
--- a/patches/@callstack/repack/@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-index 0121929..7c2856b 100644
---- a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-+++ b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-@@ -17,6 +17,7 @@ class Compiler {
-   statsCache = {};
-   resolvers = {};
-   progressSenders = {};
-+  lastProgress = {};
-   isCompilationInProgress = false;
-   // late-init
- 
-@@ -24,7 +25,9 @@ class Compiler {
-     this.reporter = reporter;
-     this.rootDir = rootDir;
-     const handler = (platform, value) => {
--      const percentage = Math.floor(value * 100);
-+      const rawPercentage = Math.floor(value * 100);
-+      const percentage = Math.max(rawPercentage, this.lastProgress[platform] ?? 0);
-+      this.lastProgress[platform] = percentage;
-       this.progressSenders[platform]?.forEach(sendProgress => {
-         sendProgress({
-           completed: percentage,
-@@ -36,7 +39,7 @@ class Compiler {
-         message: [{
-           progress: {
-             platform,
--            value
-+            value: percentage / 100
-           }
-         }],
-         timestamp: Date.now(),
-@@ -78,6 +81,7 @@ class Compiler {
-   setupCompiler() {
-     this.compiler.hooks.watchRun.tap('repack:watch', () => {
-       this.isCompilationInProgress = true;
-+      this.lastProgress = {};
-       this.platforms.forEach(platform => {
-         if (platform === 'android') {
-           void (0, _index2.runAdbReverse)({
-@@ -96,6 +100,7 @@ class Compiler {
-     });
-     this.compiler.hooks.invalid.tap('repack:invalid', () => {
-       this.isCompilationInProgress = true;
-+      this.lastProgress = {};
-       this.platforms.forEach(platform => {
-         this.devServerContext.notifyBuildStart(platform);
-         this.devServerContext.broadcastToHmrClients({
diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+002+lazy-platform-compilation.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+002+lazy-platform-compilation.patch
deleted file mode 100644
index 9865f8152739..000000000000
--- a/patches/@callstack/repack/@callstack+repack+5.3.0+002+lazy-platform-compilation.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-diff --git a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.d.ts b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.d.ts
-index 26d726c..d8999a0 100644
---- a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.d.ts
-+++ b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.d.ts
-@@ -13,8 +13,11 @@ export declare class Compiler {
-     statsCache: Record<string, StatsCompilation | undefined>;
-     resolvers: Record<string, Array<(error?: Error) => void>>;
-     progressSenders: Record<string, SendProgress[]>;
--    isCompilationInProgress: boolean;
-+    isCompilationInProgress: Record<string, boolean>;
-     devServerContext: Server.DelegateContext;
-+    private pendingCompilations;
-+    private activePlatforms;
-+    private isClosed;
-     constructor(configs: MultiRspackOptions, reporter: Reporter, rootDir: string);
-     get devServerOptions(): import("@rspack/core").DevServer;
-     get watchOptions(): import("@rspack/core").WatchOptions;
-@@ -23,7 +26,10 @@ export declare class Compiler {
-     private removeProgressSender;
-     setDevServerContext(ctx: Server.DelegateContext): void;
-     private setupCompiler;
-+    private setupChildCompilerHooks;
-+    private activatePlatform;
-     start(): void;
-+    close(callback?: (error?: Error | null) => void): void;
-     getAsset(filename: string, platform: string, sendProgress?: SendProgress): Promise<CompilerAsset>;
-     getSource(filename: string, platform: string | undefined, sendProgress?: SendProgress): Promise<string | Buffer>;
-     getSourceMap(filename: string, platform: string | undefined): Promise<string | Buffer>;
-diff --git a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-index 7c2856b..cabce76 100644
---- a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-+++ b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
-@@ -18,13 +18,20 @@ class Compiler {
-   resolvers = {};
-   progressSenders = {};
-   lastProgress = {};
--  isCompilationInProgress = false;
-+  isCompilationInProgress = {};
-   // late-init
- 
-+  pendingCompilations = new Map();
-+  activePlatforms = new Set();
-+  isClosed = false;
-+
-   constructor(configs, reporter, rootDir) {
-     this.reporter = reporter;
-     this.rootDir = rootDir;
-     const handler = (platform, value) => {
-+      // An unrequested platform is parked, so its progress must not reach the terminal or
-+      // the device: it would drive a second progress bar beside the platform in use.
-+      if (!this.activePlatforms.has(platform)) return;
-       const rawPercentage = Math.floor(value * 100);
-       const percentage = Math.max(rawPercentage, this.lastProgress[platform] ?? 0);
-       this.lastProgress[platform] = percentage;
-@@ -79,43 +86,66 @@ class Compiler {
-     this.devServerContext = ctx;
-   }
-   setupCompiler() {
--    this.compiler.hooks.watchRun.tap('repack:watch', () => {
--      this.isCompilationInProgress = true;
--      this.lastProgress = {};
--      this.platforms.forEach(platform => {
--        if (platform === 'android') {
--          void (0, _index2.runAdbReverse)({
--            port: this.devServerContext.options.port,
--            logger: this.devServerContext.log
--          });
-+    // rspack's MultiCompiler fires the aggregated `done` only when every child has reported
-+    // (@rspack/core: `doneCompilers === this.compilers.length`). A parked child never reports, so
-+    // that event stays pending and the server never settles. Upstream moves this bookkeeping onto
-+    // the child compilers for the same reason.
-+    for (const childCompiler of this.compiler.compilers) {
-+      this.setupChildCompilerHooks(childCompiler);
-+    }
-+  }
-+  setupChildCompilerHooks(childCompiler) {
-+    const platform = childCompiler.options.name;
-+    childCompiler.hooks.watchRun.tapAsync('repack:lazy-compilation', (_compiler, done) => {
-+      if (this.activePlatforms.has(platform)) {
-+        done();
-+        return;
-+      }
-+      this.pendingCompilations.set(platform, () => {
-+        // Exclude time spent waiting for the platform to be requested and
-+        // avoid replaying file changes that happened before that request.
-+        if (childCompiler.watching) {
-+          const startTime = Date.now();
-+          childCompiler.watching.startTime = startTime;
-+          childCompiler.watching.lastWatcherStartTime = startTime;
-         }
--        this.devServerContext.notifyBuildStart(platform);
--        this.devServerContext.broadcastToHmrClients({
--          action: 'compiling',
--          body: {
--            name: platform
--          }
--        });
-+        done();
-       });
-     });
--    this.compiler.hooks.invalid.tap('repack:invalid', () => {
--      this.isCompilationInProgress = true;
--      this.lastProgress = {};
--      this.platforms.forEach(platform => {
--        this.devServerContext.notifyBuildStart(platform);
--        this.devServerContext.broadcastToHmrClients({
--          action: 'compiling',
--          body: {
--            name: platform
--          }
-+    childCompiler.hooks.watchRun.tap('repack:watch', () => {
-+      if (!this.activePlatforms.has(platform)) return;
-+      this.isCompilationInProgress[platform] = true;
-+      this.lastProgress[platform] = 0;
-+      if (platform === 'android') {
-+        void (0, _index2.runAdbReverse)({
-+          port: this.devServerContext.options.port,
-+          logger: this.devServerContext.log
-         });
-+      }
-+      this.devServerContext.notifyBuildStart(platform);
-+      this.devServerContext.broadcastToHmrClients({
-+        action: 'compiling',
-+        body: {
-+          name: platform
-+        }
-       });
-     });
--    this.compiler.hooks.done.tap('repack:done', multiStats => {
--      const stats = multiStats.toJson({
-+    childCompiler.hooks.invalid.tap('repack:invalid', () => {
-+      if (!this.activePlatforms.has(platform)) return;
-+      this.isCompilationInProgress[platform] = true;
-+      this.lastProgress[platform] = 0;
-+      this.devServerContext.notifyBuildStart(platform);
-+      this.devServerContext.broadcastToHmrClients({
-+        action: 'compiling',
-+        body: {
-+          name: platform
-+        }
-+      });
-+    });
-+    childCompiler.hooks.done.tap('repack:done', stats => {
-+      const childStats = stats.toJson({
-         all: false,
-         assets: true,
--        children: true,
-         outputPath: true,
-         timings: true,
-         hash: true,
-@@ -123,49 +153,46 @@ class Compiler {
-         warnings: true
-       });
-       try {
--        stats.children.map(childStats => {
--          const platform = childStats.name;
--          this.devServerContext.broadcastToHmrClients({
--            action: 'hash',
--            body: {
--              name: platform,
--              hash: childStats.hash
--            }
--          });
--          this.statsCache[platform] = childStats;
--          const assets = childStats.assets;
--          this.assetsCache[platform] = assets.filter(asset => asset.type === 'asset').reduce((acc, {
--            name,
-+        this.devServerContext.broadcastToHmrClients({
-+          action: 'hash',
-+          body: {
-+            name: platform,
-+            hash: childStats.hash
-+          }
-+        });
-+        this.statsCache[platform] = childStats;
-+        const assets = childStats.assets;
-+        this.assetsCache[platform] = assets.filter(asset => asset.type === 'asset').reduce((acc, {
-+          name,
-+          info,
-+          size
-+        }) => {
-+          const assetPath = _nodePath.default.join(childStats.outputPath, name);
-+          const data = this.filesystem.readFileSync(assetPath);
-+          const asset = {
-+            data,
-             info,
-             size
--          }) => {
--            const assetPath = _nodePath.default.join(childStats.outputPath, name);
--            const data = this.filesystem.readFileSync(assetPath);
--            const asset = {
--              data,
--              info,
--              size
--            };
--            acc[(0, _index.adaptFilenameToPlatform)(name)] = asset;
--            if (info.related?.sourceMap) {
--              const sourceMapName = Array.isArray(info.related.sourceMap) ? info.related.sourceMap[0] : info.related.sourceMap;
--              const sourceMapPath = _nodePath.default.join(childStats.outputPath, sourceMapName);
--              const sourceMapData = this.filesystem.readFileSync(sourceMapPath);
--              const sourceMapAsset = {
--                data: sourceMapData,
--                info: {
--                  hotModuleReplacement: info.hotModuleReplacement,
--                  size: sourceMapData.length
--                },
-+          };
-+          acc[(0, _index.adaptFilenameToPlatform)(name)] = asset;
-+          if (info.related?.sourceMap) {
-+            const sourceMapName = Array.isArray(info.related.sourceMap) ? info.related.sourceMap[0] : info.related.sourceMap;
-+            const sourceMapPath = _nodePath.default.join(childStats.outputPath, sourceMapName);
-+            const sourceMapData = this.filesystem.readFileSync(sourceMapPath);
-+            const sourceMapAsset = {
-+              data: sourceMapData,
-+              info: {
-+                hotModuleReplacement: info.hotModuleReplacement,
-                 size: sourceMapData.length
--              };
--              acc[(0, _index.adaptFilenameToPlatform)(sourceMapName)] = sourceMapAsset;
--            }
--            return acc;
--          },
--          // keep old assets
--          this.assetsCache[platform] ?? {});
--        });
-+              },
-+              size: sourceMapData.length
-+            };
-+            acc[(0, _index.adaptFilenameToPlatform)(sourceMapName)] = sourceMapAsset;
-+          }
-+          return acc;
-+        },
-+        // keep old assets
-+        this.assetsCache[platform] ?? {});
-       } catch (error) {
-         this.reporter.process({
-           type: 'error',
-@@ -174,32 +201,41 @@ class Compiler {
-           message: ['An error occured while processing assets from compilation:', String(error)]
-         });
-       }
--      this.isCompilationInProgress = false;
--      stats.children?.forEach(childStats => {
--        const platform = childStats.name;
--        const time = childStats.time;
--        this.callPendingResolvers(platform);
--        this.devServerContext.notifyBuildEnd(platform);
--        this.devServerContext.broadcastToHmrClients({
--          action: 'ok',
--          body: {
--            name: platform
-+      this.isCompilationInProgress[platform] = false;
-+      this.callPendingResolvers(platform);
-+      this.devServerContext.notifyBuildEnd(platform);
-+      this.devServerContext.broadcastToHmrClients({
-+        action: 'ok',
-+        body: {
-+          name: platform
-+        }
-+      });
-+      this.reporter.process({
-+        issuer: 'DevServer',
-+        message: [{
-+          progress: {
-+            platform,
-+            time: childStats.time
-           }
--        });
--        this.reporter.process({
--          issuer: 'DevServer',
--          message: [{
--            progress: {
--              platform,
--              time
--            }
--          }],
--          timestamp: Date.now(),
--          type: 'progress'
--        });
-+        }],
-+        timestamp: Date.now(),
-+        type: 'progress'
-       });
-     });
-   }
-+  activatePlatform(platform) {
-+    if (!this.platforms.includes(platform)) {
-+      throw new _index.CLIError(`Unrecognized platform: ${platform}`);
-+    }
-+    if (this.activePlatforms.has(platform)) return;
-+    this.activePlatforms.add(platform);
-+    this.isCompilationInProgress[platform] = true;
-+    const resumeCompilation = this.pendingCompilations.get(platform);
-+    if (resumeCompilation) {
-+      this.pendingCompilations.delete(platform);
-+      resumeCompilation();
-+    }
-+  }
-   start() {
-     this.compiler.watch(this.watchOptions, error => {
-       if (!error) return;
-@@ -208,14 +244,33 @@ class Compiler {
-       });
-     });
-   }
-+  close(callback = () => {}) {
-+    this.isClosed = true;
-+    const error = new Error('Compiler closed before compilation completed');
-+    this.platforms.forEach(platform => {
-+      this.callPendingResolvers(platform, error);
-+    });
-+
-+    // Resume pending compilations so the Watching instances can be closed
-+    for (const resumeCompilation of this.pendingCompilations.values()) {
-+      resumeCompilation();
-+    }
-+    this.pendingCompilations.clear();
-+    this.compiler.close(callback);
-+  }
-   async getAsset(filename, platform, sendProgress) {
-+    if (this.isClosed) {
-+      throw new Error('Compiler closed before compilation completed');
-+    }
-+    this.activatePlatform(platform);
-+
-     // Return file from assetsCache if exists
-     const fileFromCache = this.assetsCache[platform]?.[filename];
-     if (fileFromCache) {
-       return fileFromCache;
-     }
-     this.addProgressSender(platform, sendProgress);
--    if (!this.isCompilationInProgress) {
-+    if (!this.isCompilationInProgress[platform]) {
-       this.removeProgressSender(platform, sendProgress);
-       return Promise.reject(new Error(`File ${filename} for ${platform} not found in compilation assets (no compilation in progress)`));
-     }
-diff --git a/node_modules/@callstack/repack/dist/commands/rspack/start.js b/node_modules/@callstack/repack/dist/commands/rspack/start.js
-index cc57d82..6ae7930 100644
---- a/node_modules/@callstack/repack/dist/commands/rspack/start.js
-+++ b/node_modules/@callstack/repack/dist/commands/rspack/start.js
-@@ -191,7 +191,15 @@ async function start(_, cliConfig, args) {
-   return {
-     stop: async () => {
-       reporter.stop();
--      await stop();
-+      try {
-+        // A platform nobody asked for is parked mid watch-run; resume it so the Watching
-+        // instances can shut down instead of hanging (callstack/repack#1430).
-+        await new Promise((resolve, reject) => {
-+          compiler.close(error => (error ? reject(error) : resolve()));
-+        });
-+      } finally {
-+        await stop();
-+      }
-     }
-   };
- }
-\ No newline at end of file
diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
deleted file mode 100644
index 07cd5dea69e9..000000000000
--- a/patches/@callstack/repack/@callstack+repack+5.3.0+003+android-fonts-raw.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js b/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
---- a/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
-+++ b/node_modules/@callstack/repack/dist/loaders/assetsLoader/assetsLoader.js
-@@ -83,8 +83,9 @@
-         if (testXml.test(resourceNormalizedFilename) && content?.indexOf('font-family') !== -1) {
-           destination = 'font';
-         } else if (testFonts.test(resourceNormalizedFilename)) {
--          // font extensions
--          destination = 'font';
-+          // font extensions: `raw`, as Metro does, because JS loaders (e.g. Skia's `useFont`)
-+          // resolve the asset through `drawable`/`raw` and never look in `res/font`
-+          destination = 'raw';
-         } else if (testMP4.test(resourceNormalizedFilename)) {
-           // video files extensions
-           destination = 'raw';
diff --git a/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch b/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch
deleted file mode 100644
index d28b9a6009f9..000000000000
--- a/patches/@callstack/repack/@callstack+repack+5.3.0+004+android-keep-xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js b/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
---- a/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
-+++ b/node_modules/@callstack/repack/dist/plugins/utils/AssetsCopyProcessor.js
-@@ -9,6 +9,7 @@
- function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
- class AssetsCopyProcessor {
-   queue = [];
-+  androidResources = new Set();
-   constructor(config, filesystem = _nodeFs.default) {
-     this.config = config;
-     this.filesystem = filesystem;
-@@ -101,6 +102,14 @@
-     // Copy regular assets
-     const mediaAssets = [...chunk.auxiliaryFiles].filter(file => !/\.(map|bundle\.json)$/.test(file)).filter(file => !/^remote-assets/.test(file));
-     this.queue.push(...mediaAssets.map(asset => () => this.copyAsset(_nodePath.default.join(outputPath, asset), _nodePath.default.join(assetsDest, asset))));
-+    if (platform === 'android') {
-+      mediaAssets.forEach(asset => {
-+        const match = asset.match(/^(drawable|raw|font)(?:-[^/]+)?\/([^/]+?)(?:\.[^./]+)?$/);
-+        if (match) {
-+          this.androidResources.add(`@${match[1]}/${match[2]}`);
-+        }
-+      });
-+    }
- 
-     // Manifest file name e.g: `index.bundle.json`, src_App_js.chunk.bundle.json`
-     const [manifest] = [...chunk.auxiliaryFiles].filter(file => /\.bundle\.json$/.test(file));
-@@ -126,6 +135,19 @@
-     }
-   }
-   execute() {
-+    if (this.androidResources.size) {
-+      // Like Metro, list every bundled resource in `raw/keep.xml` so `shrinkResources` keeps them:
-+      // JS looks them up by name at runtime, which the resource shrinker cannot see.
-+      const keepPath = _nodePath.default.join(this.config.assetsDest, 'raw/keep.xml');
-+      const content = `<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="${[...this.androidResources].join(',')}" />\n`;
-+      this.androidResources = new Set();
-+      this.queue.push(async () => {
-+        await this.filesystem.promises.mkdir(_nodePath.default.dirname(keepPath), {
-+          recursive: true
-+        });
-+        await this.filesystem.promises.writeFile(keepPath, content);
-+      });
-+    }
-     const queue = this.queue;
-     this.queue = [];
-     return queue.map(work => work());
diff --git a/patches/@callstack/repack/@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch b/patches/@callstack/repack/@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch
new file mode 100644
index 000000000000..1e29ef76c8e9
--- /dev/null
+++ b/patches/@callstack/repack/@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch
@@ -0,0 +1,46 @@
+--- a/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
++++ b/node_modules/@callstack/repack/dist/commands/rspack/Compiler.js
+@@ -17,6 +17,7 @@
+   statsCache = {};
+   resolvers = {};
+   progressSenders = {};
++  lastProgress = {};
+   isCompilationInProgress = {};
+   // late-init
+ 
+@@ -28,7 +29,9 @@
+     this.rootDir = rootDir;
+     const handler = (platform, value) => {
+       if (!this.activePlatforms.has(platform)) return;
+-      const percentage = Math.floor(value * 100);
++      const rawPercentage = Math.floor(value * 100);
++      const percentage = Math.max(rawPercentage, this.lastProgress[platform] ?? 0);
++      this.lastProgress[platform] = percentage;
+       this.progressSenders[platform]?.forEach(sendProgress => {
+         sendProgress({
+           completed: percentage,
+@@ -40,7 +43,7 @@
+         message: [{
+           progress: {
+             platform,
+-            value
++            value: percentage / 100
+           }
+         }],
+         timestamp: Date.now(),
+@@ -104,6 +107,7 @@
+     childCompiler.hooks.watchRun.tap('repack:watch', () => {
+       if (!this.activePlatforms.has(platform)) return;
+       this.isCompilationInProgress[platform] = true;
++      this.lastProgress[platform] = 0;
+       if (platform === 'android') {
+         void (0, _index2.runAdbReverse)({
+           port: this.devServerContext.options.port,
+@@ -121,6 +125,7 @@
+     childCompiler.hooks.invalid.tap('repack:invalid', () => {
+       if (!this.activePlatforms.has(platform)) return;
+       this.isCompilationInProgress[platform] = true;
++      this.lastProgress[platform] = 0;
+       this.devServerContext.notifyBuildStart(platform);
+       this.devServerContext.broadcastToHmrClients({
+         action: 'compiling',

From 38f597cfc0e963f4b7330f322021d79ce807a627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 9 Oct 2026 13:26:52 +0200
Subject: [PATCH 383/781] Update repack patch notes for 5.4.1

---
 patches/@callstack/repack/details.md | 65 +++-------------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

diff --git a/patches/@callstack/repack/details.md b/patches/@callstack/repack/details.md
index f0eda3361715..ad585c4c8c31 100644
--- a/patches/@callstack/repack/details.md
+++ b/patches/@callstack/repack/details.md
@@ -1,6 +1,6 @@
 # `@callstack/repack` patches
 
-### [@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch](@callstack+repack+5.3.0+001+clamp-dev-server-progress.patch)
+### [@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch](@callstack+repack+5.4.1+001+clamp-dev-server-progress.patch)
 
 - Reason:
 
@@ -12,65 +12,12 @@
     and resets it on the `watchRun` and `invalid` hooks when a new compilation starts.
     ```
 
-- Upstream PR/issue: https://github.com/callstack/repack/issues/1459 - filed with a standalone reproduction. Delete this patch once a release clamps the forwarded percentage.
+- Rewritten against 5.4.1 on the bump from 5.3.0. The 5.3.0 version of this patch targeted the pre-lazy-compilation `Compiler.js` and no longer applies: upstream released per-platform lazy compilation, so the progress handler now sits behind an `activePlatforms` guard and `isCompilationInProgress` is a per-platform record. Same clamp, new anchors.
+- Upstream PR/issue: https://github.com/callstack/repack/issues/1459 - filed with a standalone reproduction; closed as will-not-fix, so this stays until upstream changes its mind.
 - E/App issue: None. Reported during review of the PR below.
 - PR Introducing Patch: https://github.com/Expensify/App/pull/99407
 
-### [@callstack+repack+5.3.0+002+lazy-platform-compilation.patch](@callstack+repack+5.3.0+002+lazy-platform-compilation.patch)
+Removed on the bump to `@callstack/repack@5.4.1`:
 
-- Reason:
-
-    ```
-    Back-port of upstream lazy platform compilation. On 5.3.0 the dev server starts every configured
-    platform compiling immediately, so a machine running one app also pays for a full compile of the
-    other platform (measured: iOS 188.3s and Android 190.7s, both compiled although only iOS was ever
-    requested). Narrowing the server to one platform does not fix it: that server cannot serve the
-    other platform's bundle at all, so a second app reusing the running server gets nothing.
-
-    This patch keeps every platform configured and parks each child compiler at its first watch run
-    until something actually asks for that platform's bundle. A platform is activated by
-    `getAsset`, i.e. by a bundle request, and only activated platforms emit progress and build
-    signals, so one progress stream serves the platform in use. Bookkeeping moved from the
-    MultiCompiler hooks to the child compilers because rspack only fires the aggregated `done` once
-    every child has reported, and a parked child never reports. `close()` releases parked compilations
-    before the compiler closes, as upstream does.
-    ```
-
-- Also updates `dist/commands/rspack/Compiler.d.ts`: its declarations describe the pre-patch shape (`isCompilationInProgress: boolean`) and omit the new members.
-- Depends on `001`: both patches edit the progress handling in `dist/commands/rspack/Compiler.js`, and this one is authored against the post-`001` file. Keep them in numeric order.
-- Upstream PR/issue: https://github.com/callstack/repack/pull/1430 - merged into `main`, not in any release yet; staged for 5.4.0 by https://github.com/callstack/repack/pull/1441. Delete this patch when a release containing it is pinned.
-- E/App issue: None. Found while answering review on the PR below.
-- PR Introducing Patch: https://github.com/Expensify/App/pull/99407
-
-### [@callstack+repack+5.3.0+003+android-fonts-raw.patch](@callstack+repack+5.3.0+003+android-fonts-raw.patch)
-
-- Reason:
-
-    ```
-    In Android release builds Re.Pack's assets loader writes `.ttf`/`.otf`/`.ttc` files to `res/font/`,
-    while Metro writes every non-image asset to `res/raw/`. Fonts loaded from JS with `require()` (Skia's
-    `useFont`/`matchFont`, used by the Home charts) resolve the asset as an Android resource and only look
-    in `drawable` and `raw`, so they never load and the chart spinner never stops. This patch sends font
-    files to `raw`, as Metro does. XML font-family resources still go to `font/`.
-    ```
-
-- Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
-- E/App issue: https://github.com/Expensify/App/issues/102619
-- PR Introducing Patch: https://github.com/Expensify/App/pull/102766
-
-### [@callstack+repack+5.3.0+004+android-keep-xml.patch](@callstack+repack+5.3.0+004+android-keep-xml.patch)
-
-- Reason:
-
-    ```
-    Metro writes `res/raw/keep.xml` next to the Android assets, listing every bundled resource with
-    `tools:keep`. JS loads these resources by name at runtime, which Android's resource shrinker cannot
-    see, so without the file a release build with `shrinkResources` (the standalone Android app) can
-    strip images and fonts that are still in use. Re.Pack writes no such file. This patch makes the
-    assets copy step write the same `raw/keep.xml` for Android, with one `@drawable/...`, `@raw/...` or
-    `@font/...` entry per copied resource.
-    ```
-
-- Upstream PR/issue: https://github.com/callstack/repack/issues/1472 - delete this patch once a release fixes it.
-- E/App issue: None. Found while comparing Re.Pack and Metro Android release asset output for https://github.com/Expensify/App/issues/102619.
-- PR Introducing Patch: https://github.com/Expensify/App/pull/102766
+- `002+lazy-platform-compilation` — upstream released the feature (`dist/commands/rspack/Compiler.js` now parks each child compiler until `getAsset` requests that platform). Was https://github.com/callstack/repack/pull/1430.
+- `003+android-fonts-raw` and `004+android-keep-xml` — https://github.com/callstack/repack/issues/1472 fixed both: the assets loader emits `require()`'d font files to `res/raw` as well as `res/font` (`dist/loaders/assetsLoader/assetsLoader.js`), and the assets copy step writes `res/raw/keep.xml` with `tools:keep` for every copied resource (`dist/plugins/utils/AssetsCopyProcessor.js`), matching Metro. Verified against the published 5.4.1 tarball, and on device: Expensify/App#103243 shipped an AdHoc build on the 5.4.1 canary where fonts resolve from `raw` and all 765 `raw` assets plus 22 drawables survive `shrinkResources=true`. E/App issue: https://github.com/Expensify/App/issues/102619.

From 44037e4a2d234b68af10d3fa8d23a1838aab5815 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Fri, 9 Oct 2026 13:50:04 +0200
Subject: [PATCH 384/781] Improve chart tooltips on mobile devices

---
 src/CONST/index.ts                            |  1 +
 .../BarChart/VerticalBarChartContent.tsx      |  3 +-
 .../Charts/LineChart/LineChartContent.tsx     | 16 +++---
 .../Charts/PieChart/PieChartContent.tsx       | 18 +++++--
 .../Charts/components/ChartTooltip.tsx        | 29 ++++++++--
 .../Charts/components/ChartTooltipLayer.tsx   |  6 ++-
 .../Charts/hooks/useChartInteractions.ts      | 33 ++++++------
 src/pages/Insights/InsightsDashboard.tsx      | 54 ++++++++++---------
 src/pages/home/HomePage.tsx                   |  4 +-
 9 files changed, 109 insertions(+), 55 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index bde832c72f9f..85a055b0fa60 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6949,6 +6949,7 @@ const CONST = {
     },
     EVENTS: {
         SCROLLING: 'scrolling',
+        CHART_TOOLTIP_DISMISS: 'chartTooltipDismiss',
         TRANSITION_END_SCREEN_WRAPPER: 'transitionEndScreenWrapper',
     },
     SELECTION_BUTTON_POSITION: {
diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index 6daeefc70cc0..d2b36f22b2ac 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -127,7 +127,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         return isWithinX && args.cursorY >= plotTop.get() && args.cursorY <= plotBottom.get();
     };
 
-    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, onChartMoved} = useChartInteractions({
+    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, onChartMoved, onTooltipDismiss} = useChartInteractions({
         handlePress: handleBarPress,
         checkIsOver: checkIsOverBar,
         isCursorOverLabel: shouldShowLabels ? isCursorOverLabel : undefined,
@@ -282,6 +282,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
                     chartWidth={chartWidth}
                     initialTooltipPosition={initialTooltipPosition}
                     onChartMoved={onChartMoved}
+                    onDismiss={onTooltipDismiss}
                 />
             </Animated.View>
         </GestureDetector>
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index a2375540b752..1459457ac77a 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -168,13 +168,14 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         return isInPlotArea(args) && isCursorOverLabel(args, activeIndex);
     };
 
-    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, activePointPosition, onChartMoved} = useChartInteractions({
-        handlePress: handlePointPress,
-        checkIsOver: checkIsOverBand,
-        isCursorOverLabel: checkIsOverLabelInPlotArea,
-        resolveLabelTouchX: findLabelCursorX,
-        chartBottom,
-    });
+    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, activePointPosition, onChartMoved, onTooltipDismiss} =
+        useChartInteractions({
+            handlePress: handlePointPress,
+            checkIsOver: checkIsOverBand,
+            isCursorOverLabel: checkIsOverLabelInPlotArea,
+            resolveLabelTouchX: findLabelCursorX,
+            chartBottom,
+        });
 
     const isActivePointHollow = useDerivedValue(() => isLastPointInProgress && matchedIndex.get() === data.length - 1);
 
@@ -341,6 +342,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                     chartWidth={chartWidth}
                     initialTooltipPosition={initialTooltipPosition}
                     onChartMoved={onChartMoved}
+                    onDismiss={onTooltipDismiss}
                 />
             </Animated.View>
         </GestureDetector>
diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 4bf58a685f5b..8513de1e983f 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -41,6 +41,9 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     const [canvasWidth, setCanvasWidth] = useState(0);
     const [canvasHeight, setCanvasHeight] = useState(0);
     const [activeSliceIndex, setActiveSliceIndex] = useState(-1);
+
+    /** True while a slice tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
+    const [isTouchPinned, setIsTouchPinned] = useState(false);
     const [isHoveringOverPie, setIsHoveringOverPie] = useState(false);
 
     // Shared values for hover state
@@ -108,10 +111,17 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
     const onChartMoved = (deltaX: number, deltaY: number) => scheduleOnUI(handleChartMoved, deltaX, deltaY);
 
-    const toggleActiveSlice = (x: number, y: number) => {
+    // Touch taps show the slice tooltip instead of drilling in, and the next touch anywhere on the screen hides it
+    const showTouchedSlice = (x: number, y: number) => {
         const {centerX, centerY} = pieGeometry;
         const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
-        setActiveSliceIndex(sliceIndex === activeSliceIndex ? -1 : sliceIndex);
+        setActiveSliceIndex(sliceIndex);
+        setIsTouchPinned(sliceIndex >= 0);
+    };
+
+    const dismissTouchedSlice = () => {
+        setActiveSliceIndex(-1);
+        setIsTouchPinned(false);
     };
 
     // Hover gesture
@@ -124,6 +134,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                     return;
                 }
                 isHovering.set(true);
+                scheduleOnRN(setIsTouchPinned, false);
                 cursorX.set(e.x);
                 cursorY.set(e.y);
                 tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
@@ -158,7 +169,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
             if (e.pointerType === PointerType.TOUCH) {
                 tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
-                scheduleOnRN(toggleActiveSlice, e.x, e.y);
+                scheduleOnRN(showTouchedSlice, e.x, e.y);
                 return;
             }
 
@@ -261,6 +272,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                             chartWidth={canvasWidth}
                             initialTooltipPosition={tooltipPosition}
                             onChartMoved={onChartMoved}
+                            onDismiss={isTouchPinned ? dismissTouchedSlice : undefined}
                         />
                     )}
                 </Animated.View>
diff --git a/src/components/Charts/components/ChartTooltip.tsx b/src/components/Charts/components/ChartTooltip.tsx
index 0c04c266fe76..46c6f219f256 100644
--- a/src/components/Charts/components/ChartTooltip.tsx
+++ b/src/components/Charts/components/ChartTooltip.tsx
@@ -8,12 +8,15 @@ import PopoverWithMeasuredContentUtils from '@libs/PopoverWithMeasuredContentUti
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
+
 import type {ComponentRef} from 'react';
 import type {LayoutChangeEvent} from 'react-native';
 import type {DerivedValue, SharedValue} from 'react-native-reanimated';
 
-import React, {useLayoutEffect, useRef, useState} from 'react';
-import {View} from 'react-native';
+import {useIsFocused} from '@react-navigation/native';
+import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
+import {DeviceEventEmitter, View} from 'react-native';
 import Animated, {useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
@@ -43,6 +46,9 @@ type ChartTooltipProps = {
 
     /** Updates the hovered point after the chart is moved in the window (e.g. via scroll) by the given offset */
     onChartMoved?: (deltaX: number, deltaY: number) => void;
+
+    /** Hides a tooltip pinned by a touch tap, passed only while it is pinned; called on any touch on the screen or when the screen loses focus */
+    onDismiss?: () => void;
 };
 
 function getAmountContent(amount: string, percentage?: string): string {
@@ -53,7 +59,7 @@ function getAmountContent(amount: string, percentage?: string): string {
     return `${amount} (${percentage})`;
 }
 
-function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, initialTooltipPosition, isVisible, onChartMoved}: ChartTooltipProps) {
+function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, initialTooltipPosition, isVisible, onChartMoved, onDismiss}: ChartTooltipProps) {
     const styles = useThemeStyles();
     const {windowWidth, windowHeight} = useWindowDimensions();
 
@@ -109,6 +115,23 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
         },
     );
 
+    const isFocused = useIsFocused();
+
+    // A pinned tooltip has no hover to end it, so the screen's touch start (which still lets the touch through) hides it
+    useEffect(() => {
+        if (!isShown || !onDismiss) {
+            return;
+        }
+
+        // The tooltip is drawn in a root portal, so it would stay on top of the next screen after navigating away
+        if (!isFocused) {
+            onDismiss();
+            return;
+        }
+        const dismissListener = DeviceEventEmitter.addListener(CONST.EVENTS.CHART_TOOLTIP_DISMISS, onDismiss);
+        return () => dismissListener.remove();
+    }, [isShown, isFocused, onDismiss]);
+
     const handleOriginChange = (x: number, y: number) => {
         const previousOrigin = origin.get();
         const wasOriginMeasured = isOriginMeasured.get();
diff --git a/src/components/Charts/components/ChartTooltipLayer.tsx b/src/components/Charts/components/ChartTooltipLayer.tsx
index a9cb04c80a45..553b9a9740fb 100644
--- a/src/components/Charts/components/ChartTooltipLayer.tsx
+++ b/src/components/Charts/components/ChartTooltipLayer.tsx
@@ -29,13 +29,16 @@ type ChartTooltipLayerProps = {
 
     /** Called with how far the chart moved in the window while the tooltip is shown */
     onChartMoved?: (deltaX: number, deltaY: number) => void;
+
+    /** Hides a tooltip pinned by a touch tap, passed only while it is pinned */
+    onDismiss?: () => void;
 };
 
 /**
  * Renders the chart tooltip in an isolated subtree so that hover-driven state changes
  * (active index, visibility) only re-render this lightweight component, not the chart itself.
  */
-function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, chartWidth, initialTooltipPosition, onChartMoved}: ChartTooltipLayerProps) {
+function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, chartWidth, initialTooltipPosition, onChartMoved, onDismiss}: ChartTooltipLayerProps) {
     const [activeDataIndex, setActiveDataIndex] = useState(-1);
 
     useAnimatedReaction(
@@ -61,6 +64,7 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
             initialTooltipPosition={initialTooltipPosition}
             isVisible={isTooltipActive}
             onChartMoved={onChartMoved}
+            onDismiss={onDismiss}
         />
     );
 }
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index efe84fd6500f..68bac6cfd827 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -1,6 +1,6 @@
 import type {SharedValue} from 'react-native-reanimated';
 
-import {useCallback} from 'react';
+import {useCallback, useState} from 'react';
 import {Gesture, PointerType} from 'react-native-gesture-handler';
 import {useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN, scheduleOnUI} from 'react-native-worklets';
@@ -183,7 +183,9 @@ function useChartInteractions({
     const isCursorOverTarget = useSharedValue(false);
     const isCursorOverClickable = useSharedValue(false);
     const isTooltipActive = useSharedValue(false);
-    const isTouchPinned = useSharedValue(false);
+
+    /** True while a tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
+    const [isTouchPinned, setIsTouchPinned] = useState(false);
 
     /**
      * Called by chart content from handleScaleChange to populate canvas positions.
@@ -336,7 +338,6 @@ function useChartInteractions({
         'worklet';
 
         chartInteractionState.isActive.set(false);
-        isTouchPinned.set(false);
         isCursorOverTarget.set(false);
         isCursorOverClickable.set(false);
         isTooltipActive.set(false);
@@ -358,7 +359,7 @@ function useChartInteractions({
                 if (e.pointerType === PointerType.TOUCH) {
                     return;
                 }
-                isTouchPinned.set(false);
+                scheduleOnRN(setIsTouchPinned, false);
                 const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
                 const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
                 chartInteractionState.isActive.set(true);
@@ -388,22 +389,15 @@ function useChartInteractions({
             });
 
     /**
-     * Touch taps toggle the tooltip instead of drilling in, since touch devices have no hover.
-     * Tapping a new target shows its tooltip and tapping the same target again or empty space hides it.
+     * Touch taps show the tooltip instead of drilling in, since touch devices have no hover.
+     * While it is shown, the next touch anywhere on the screen hides it.
      */
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';
 
-        const previousIndex = chartInteractionState.matchedIndex.get();
-        const wasPinned = isTouchPinned.get();
         const bottom = chartBottom?.get() ?? cursorY;
         const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
         const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
-        if (targetIndex < 0 || (wasPinned && targetIndex === previousIndex)) {
-            hideTooltip();
-            return;
-        }
-
         chartInteractionState.isActive.set(true);
         applyTargetIndex(targetIndex);
         const isOverTarget = updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
@@ -411,12 +405,19 @@ function useChartInteractions({
             hideTooltip();
             return;
         }
-        isTouchPinned.set(true);
+        scheduleOnRN(setIsTouchPinned, true);
+    };
+
+    const dismissTouchTooltip = () => {
+        hideTooltip();
+        // Clearing the target unmounts the tooltip, so the next tap mounts a fresh one instead of revealing the old content for a frame
+        applyTargetIndex(-1);
+        setIsTouchPinned(false);
     };
 
     /**
      * Tap gesture. Resolves the nearest data point entirely on the UI thread.
-     * Touch taps toggle the tooltip; other pointers schedule handlePress on the JS thread if the cursor is over the target.
+     * Touch taps show the tooltip; other pointers schedule handlePress on the JS thread if the cursor is over the target.
      */
     const tapGesture = () =>
         Gesture.Tap().onEnd((e) => {
@@ -494,6 +495,8 @@ function useChartInteractions({
         activePointPosition,
         /** Call with how far the chart moved in the window, e.g. on page scroll, to re-check the hover under a still cursor */
         onChartMoved,
+        /** Hides the tooltip pinned by a touch tap, undefined while nothing is pinned */
+        onTooltipDismiss: isTouchPinned ? dismissTouchTooltip : undefined,
     };
 }
 
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index d161d3f98493..c2bfa46fe794 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -29,7 +29,7 @@ import type {InsightsDashboardID} from '@src/types/onyx';
 
 import {useIsFocused} from '@react-navigation/native';
 import React, {useEffect, useEffectEvent} from 'react';
-import {View} from 'react-native';
+import {DeviceEventEmitter, View} from 'react-native';
 
 import type {InsightsFilters} from './insightsFilters';
 import type {InsightsDashboardChart, InsightsDashboardState} from './resolveDashboardState';
@@ -166,6 +166,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {translate} = useLocalize();
+    const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
     const {login} = useCurrentUserPersonalDetails();
@@ -211,32 +212,37 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const state = getDashboardState(dashboard, isOffline, charts);
 
     return (
-        <ScreenWrapper
-            shouldShowOfflineIndicatorInWideScreen
-            enableEdgeToEdgeBottomSafeAreaPadding={false}
-            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
-            testID="InsightsPage"
+        <View
+            style={styles.flex1}
+            onTouchStart={() => DeviceEventEmitter.emit(CONST.EVENTS.CHART_TOOLTIP_DISMISS)}
         >
-            <TopBar
-                breadcrumbLabel={translate('common.insights')}
-                shouldDisplayHelpButton
-            />
-            {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
-                <InsightsPageControls
+            <ScreenWrapper
+                shouldShowOfflineIndicatorInWideScreen
+                enableEdgeToEdgeBottomSafeAreaPadding={false}
+                bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
+                testID="InsightsPage"
+            >
+                <TopBar
+                    breadcrumbLabel={translate('common.insights')}
+                    shouldDisplayHelpButton
+                />
+                {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
+                    <InsightsPageControls
+                        filters={filters}
+                        defaultFilters={defaultFilters}
+                        onChange={setFilters}
+                    />
+                )}
+                <InsightsDashboardContent
+                    state={state}
+                    headlineChart={headlineChart}
+                    supportingCharts={supportingCharts}
                     filters={filters}
-                    defaultFilters={defaultFilters}
-                    onChange={setFilters}
+                    onRetry={requestDashboard}
+                    onGroupByChange={(groupBy) => setFilters({groupBy})}
                 />
-            )}
-            <InsightsDashboardContent
-                state={state}
-                headlineChart={headlineChart}
-                supportingCharts={supportingCharts}
-                filters={filters}
-                onRetry={requestDashboard}
-                onGroupByChange={(groupBy) => setFilters({groupBy})}
-            />
-        </ScreenWrapper>
+            </ScreenWrapper>
+        </View>
     );
 }
 
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index a09a8bb0a4f1..4e11ee4b568f 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -19,6 +19,7 @@ import openHomePage from '@libs/actions/HomePage';
 
 import variables from '@styles/variables';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import type {ComponentRef} from 'react';
@@ -26,7 +27,7 @@ import type {ComponentRef} from 'react';
 import {PortalHost} from '@gorhom/portal';
 import {useFocusEffect} from '@react-navigation/native';
 import {useRef, useState} from 'react';
-import {View} from 'react-native';
+import {DeviceEventEmitter, View} from 'react-native';
 
 import EarlyRenewalOfferSection from './EarlyRenewalOfferSection';
 import ForYouSection from './ForYouSection';
@@ -136,6 +137,7 @@ function HomePage() {
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
+            onTouchStart={() => DeviceEventEmitter.emit(CONST.EVENTS.CHART_TOOLTIP_DISMISS)}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}

From bc38888ef55b326343afa51d351ef28a17ad61ae Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 9 Oct 2026 18:10:35 +0530
Subject: [PATCH 385/781] fix: start Import settings filters empty when enabled

---
 src/languages/de.ts                                |  2 +-
 src/languages/el.ts                                |  2 +-
 src/languages/en.ts                                |  2 +-
 src/languages/es.ts                                |  2 +-
 src/languages/fr.ts                                |  2 +-
 src/languages/it.ts                                |  2 +-
 src/languages/ja.ts                                |  2 +-
 src/languages/nl.ts                                |  2 +-
 src/languages/pl.ts                                |  2 +-
 src/languages/pt-BR.ts                             |  2 +-
 src/languages/zh-hans.ts                           |  2 +-
 .../merge/filters/MergeATSFiltersPage.tsx          | 14 +++++++++++---
 12 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 872300374feb..16bbccbe0e25 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8941,7 +8941,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                     toggleTitle: 'Büros',
                     allSelected: 'Alle Büros',
                 },
-                enableJobStagesOrTags: 'Aktivieren Sie Jobphasen oder Tags, um fortzufahren',
+                enableJobStagesOrTags: 'Wählen Sie mindestens eine Jobphase oder ein Tag aus, um fortzufahren',
             },
             subtitle: 'Verknüpfen Sie Recruiting-Tools und halten Sie Kandidatengenehmigungen synchron.',
             syncResults: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 1f8811310519..7bbd8a653602 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -7873,7 +7873,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
                     toggleTitle: 'Γραφεία',
                     allSelected: 'Όλα τα γραφεία',
                 },
-                enableJobStagesOrTags: 'Ενεργοποιήστε τα στάδια εργασίας ή τις ετικέτες για να συνεχίσετε',
+                enableJobStagesOrTags: 'Επιλέξτε τουλάχιστον ένα στάδιο εργασίας ή ετικέτα για να συνεχίσετε',
             },
             subtitle: 'Συνδέστε τα εργαλεία προσλήψεων και διατηρήστε τις εγκρίσεις υποψηφίων συγχρονισμένες.',
             syncResults: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2df7a9ab4af1..0885ee474eb0 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8097,7 +8097,7 @@ const translations = {
             },
             filters: {
                 description: (providerName: string) => `Select which members get imported from ${providerName}. You can choose from job stages, tags, and offices.`,
-                enableJobStagesOrTags: 'Enable Job stages or Tags to continue',
+                enableJobStagesOrTags: 'Select at least one Job stage or Tag to continue',
                 stages: {
                     title: 'Job stage',
                     toggleTitle: 'Job stages',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index aa408a7da996..0436f78f0f8d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7609,7 +7609,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
                     toggleTitle: 'Oficinas',
                     allSelected: 'Todas las oficinas',
                 },
-                enableJobStagesOrTags: 'Habilita las etapas de trabajo o las etiquetas para continuar',
+                enableJobStagesOrTags: 'Selecciona al menos una etapa de trabajo o etiqueta para continuar',
             },
             subtitle: 'Conecta herramientas de selección y mantén sincronizadas las aprobaciones de candidatos.',
             syncResults: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5fc64c2ebe76..c962db2e71d2 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8959,7 +8959,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                     toggleTitle: 'Bureaux',
                     allSelected: 'Tous les bureaux',
                 },
-                enableJobStagesOrTags: 'Activez les étapes de mission ou les Tags pour continuer',
+                enableJobStagesOrTags: 'Sélectionnez au moins une étape de poste ou un tag pour continuer',
             },
             subtitle: 'Connectez les outils de recrutement et synchronisez les validations de candidats.',
             syncResults: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 45db25154298..e4c37b414a29 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8884,7 +8884,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                     toggleTitle: 'Uffici',
                     allSelected: 'Tutti gli uffici',
                 },
-                enableJobStagesOrTags: 'Abilita le fasi di lavoro o i tag per continuare',
+                enableJobStagesOrTags: 'Seleziona almeno una fase del lavoro o un tag per continuare',
             },
             subtitle: 'Collega gli strumenti di recruiting e mantieni sincronizzate le approvazioni dei candidati.',
             syncResults: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c5aa93b9171d..a93cdc4117d8 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8768,7 +8768,7 @@ ${reportName}`,
                     allSelected: 'すべてのタグ',
                 },
                 offices: {title: 'オフィス', description: 'このワークスペースと同期したい候補者のオフィスを選択してください', toggleTitle: 'オフィス', allSelected: 'すべてのオフィス'},
-                enableJobStagesOrTags: '続行するにはジョブステージまたはタグを有効にしてください',
+                enableJobStagesOrTags: '続行するには、少なくとも 1 つのジョブのステージまたはタグを選択してください',
             },
             subtitle: '採用ツールを連携して、候補者の承認を常に同期させます。',
             syncResults: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 721de86a5802..b8eba07e4ccd 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8863,7 +8863,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                     toggleTitle: 'Kantoren',
                     allSelected: 'Alle kantoren',
                 },
-                enableJobStagesOrTags: 'Schakel functiestadia of labels in om door te gaan',
+                enableJobStagesOrTags: 'Selecteer minstens één functiestap of tag om door te gaan',
             },
             subtitle: 'Koppel wervingstools en houd kandidaategoedkeuringen gesynchroniseerd.',
             syncResults: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 643b9ff57ebb..cb9262a0f1f5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8877,7 +8877,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                     allSelected: 'Wszystkie tagi',
                 },
                 offices: {title: 'Biuro', description: 'Wybierz biura kandydatów, które chcesz zsynchronizować z tym miejscem pracy', toggleTitle: 'Biura', allSelected: 'Wszystkie biura'},
-                enableJobStagesOrTags: 'Włącz etapy zleceń lub tagi, aby kontynuować',
+                enableJobStagesOrTags: 'Wybierz co najmniej jeden etap zadania lub znacznik, aby kontynuować',
             },
             subtitle: 'Połącz narzędzia rekrutacyjne i utrzymuj zgody kandydatów w synchronizacji.',
             syncResults: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 69b1709e95fb..0a176e41111f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8866,7 +8866,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                     toggleTitle: 'Escritórios',
                     allSelected: 'Todos os escritórios',
                 },
-                enableJobStagesOrTags: 'Ative Estágios de Trabalho ou Tags para continuar',
+                enableJobStagesOrTags: 'Selecione pelo menos um estágio de trabalho ou etiqueta para continuar',
             },
             subtitle: 'Conecte ferramentas de recrutamento e mantenha as aprovações de candidatos em sincronia.',
             syncResults: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 25b4c533a608..d508f7f41a21 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8542,7 +8542,7 @@ ${reportName}`,
                 },
                 tags: {title: '标签', description: '选择要与此工作区同步的候选人标签', toggleTitle: '标签', allSelected: '所有标签'},
                 offices: {title: '办公室', description: '选择你想与此工作区同步的候选人办公地点', toggleTitle: '办公室', allSelected: '所有办公室'},
-                enableJobStagesOrTags: '启用职位阶段或标签以继续',
+                enableJobStagesOrTags: '请选择至少一个工作阶段或标签以继续',
             },
             subtitle: '连接招聘工具并保持候选人审批同步。',
             syncResults: {
diff --git a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
index 903bdb9c6726..f96b4019963c 100644
--- a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
+++ b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
@@ -14,7 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateMergeATSFilters} from '@libs/actions/connections/merge/ATS';
 import {isMergeConnected} from '@libs/merge/MergeUtils';
-import {getMergeATSFilterValues, getConnectedATSProvider, getMergeATSFilterLabel} from '@libs/merge/RecruitingUtils';
+import {getConnectedATSProvider, getMergeATSFilterLabel} from '@libs/merge/RecruitingUtils';
 import type {MergeATSFilterType} from '@libs/merge/RecruitingUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -51,6 +51,13 @@ function MergeATSFiltersPage({
     const filters = useMergeATSFiltersDraftState(policyID);
     const {setFilter} = useMergeATSFiltersDraftActions();
 
+    // A freshly enabled dimension has no values yet, so the toggle can't be derived from the values alone
+    const [enabledFilters, setEnabledFilters] = useState<Record<MergeATSFilterType, boolean>>(() => ({
+        [CONST.MERGE.ATS_FILTER_TYPE.STAGES]: !!filters.stages?.length,
+        [CONST.MERGE.ATS_FILTER_TYPE.TAGS]: !!filters.tags?.length,
+        [CONST.MERGE.ATS_FILTER_TYPE.OFFICES]: !!filters.offices?.length,
+    }));
+
     const providerName = getConnectedATSProvider(policy)?.displayName ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.merge_ats;
 
     const filterRows: Array<{filterType: MergeATSFilterType; toggleTitle: string; rowDescription: string}> = [
@@ -77,7 +84,8 @@ function MergeATSFiltersPage({
         if (errorKey && isEnabled && filterType !== CONST.MERGE.ATS_FILTER_TYPE.OFFICES) {
             setErrorKey(undefined);
         }
-        setFilter(filterType, isEnabled ? getMergeATSFilterValues(filterType, mergeATS?.data) : []);
+        setEnabledFilters((previous) => ({...previous, [filterType]: isEnabled}));
+        setFilter(filterType, []);
     };
 
     const handleSave = () => {
@@ -114,7 +122,7 @@ function MergeATSFiltersPage({
                                     title={toggleTitle}
                                     switchAccessibilityLabel={toggleTitle}
                                     toggleContainerStyles={[styles.pv3, styles.mh5]}
-                                    isActive={!!filters[filterType]?.length}
+                                    isActive={enabledFilters[filterType]}
                                     onToggle={(isEnabled) => toggleFilter(filterType, isEnabled)}
                                     subMenuItems={
                                         <>

From 84b4d4d6f881ecd20a5c395a3993a3907ce4d851 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Fri, 9 Oct 2026 15:28:15 +0200
Subject: [PATCH 386/781] Stop HeaderView re-rendering on every message in the
 report or its thread

---
 src/components/TaskHeaderActionButton.tsx     | 15 ++--
 src/hooks/useParentReportAction.ts            | 21 +++--
 src/pages/inbox/HeaderView.tsx                | 18 +++--
 src/selectors/ReportAction.ts                 | 21 ++++-
 tests/ui/components/HeaderViewTest.tsx        | 13 +++-
 .../components/TaskHeaderActionButtonTest.tsx | 67 ++++++++++++++++
 tests/unit/useParentReportActionTest.tsx      | 78 +++++++++++++++++++
 7 files changed, 213 insertions(+), 20 deletions(-)
 create mode 100644 tests/ui/components/TaskHeaderActionButtonTest.tsx
 create mode 100644 tests/unit/useParentReportActionTest.tsx

diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 0109abb97e51..e79b635d5a08 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -15,7 +15,6 @@ import {canActionTask, completeTask, reopenTask} from '@userActions/Task';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type * as OnyxTypes from '@src/types/onyx';
 
 import {delegateEmailSelector} from '@selectors/Account';
 import React from 'react';
@@ -24,21 +23,25 @@ import {View} from 'react-native';
 import Button from './Button';
 
 type TaskHeaderActionButtonProps = {
-    report: OnyxTypes.Report;
+    /** ID of the task report */
+    reportID: string;
 };
 
-function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
+function TaskHeaderActionButton({reportID}: TaskHeaderActionButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const parentReport = useParentReport(report.reportID);
+    // Subscribes to the full report because completing a task builds failure data from `lastReadTime`, which the header's
+    // stable projection drops.
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const parentReport = useParentReport(reportID);
     const isParentReportArchived = useReportIsArchived(parentReport?.reportID);
     const hasOutstandingChildTask = useHasOutstandingChildTask(report);
     const parentReportAction = useParentReportAction(report);
     const [delegateEmail] = useOnyx(ONYXKEYS.ACCOUNT, {selector: delegateEmailSelector});
     const isTaskActionable = canActionTask(report, parentReportAction, currentUserPersonalDetails?.accountID, parentReport, isParentReportArchived);
 
-    if (!canWriteInReport(report)) {
+    if (!report || !canWriteInReport(report)) {
         return null;
     }
 
@@ -49,7 +52,7 @@ function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
                 isDisabled={!isTaskActionable}
                 onPress={callFunctionIfActionIsAllowed(() => {
                     // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
-                    if (isActiveTaskEditRoute(report.reportID)) {
+                    if (isActiveTaskEditRoute(reportID)) {
                         return;
                     }
                     if (isCompletedTaskReport(report)) {
diff --git a/src/hooks/useParentReportAction.ts b/src/hooks/useParentReportAction.ts
index 5a183d00bab5..3b23a1788004 100644
--- a/src/hooks/useParentReportAction.ts
+++ b/src/hooks/useParentReportAction.ts
@@ -1,19 +1,30 @@
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportActions} from '@src/types/onyx';
+import type {Report, ReportAction, ReportActions} from '@src/types/onyx';
 
+import type {ReportActionWithoutThreadReplyCounters} from '@selectors/ReportAction';
 import type {OnyxEntry} from 'react-native-onyx';
 
-import {getParentReportActionSelector} from '@selectors/ReportAction';
+import {getParentReportActionSelector, getParentReportActionWithoutThreadRepliesSelector} from '@selectors/ReportAction';
 import {useCallback} from 'react';
 
 import useOnyx from './useOnyx';
 
-function useParentReportAction(report: OnyxEntry<Report>) {
+type UseParentReportActionOptions = {
+    /** Drop the parent action's thread reply counters (`childVisibleActionCount`, ...), so replies in the thread don't re-render the caller. */
+    shouldIgnoreThreadReplies?: boolean;
+};
+
+function useParentReportAction(report: OnyxEntry<Report>): OnyxEntry<ReportAction>;
+function useParentReportAction(report: OnyxEntry<Report>, options: UseParentReportActionOptions): ReportActionWithoutThreadReplyCounters | undefined;
+function useParentReportAction(report: OnyxEntry<Report>, {shouldIgnoreThreadReplies = false}: UseParentReportActionOptions = {}) {
     const getParentReportAction = useCallback(
-        (parentReportActions: OnyxEntry<ReportActions>) => getParentReportActionSelector(parentReportActions, report?.parentReportActionID),
-        [report?.parentReportActionID],
+        (parentReportActions: OnyxEntry<ReportActions>) =>
+            shouldIgnoreThreadReplies
+                ? getParentReportActionWithoutThreadRepliesSelector(parentReportActions, report?.parentReportActionID)
+                : getParentReportActionSelector(parentReportActions, report?.parentReportActionID),
+        [report?.parentReportActionID, shouldIgnoreThreadReplies],
     );
 
     const parentReportID = getNonEmptyStringOnyxID(report?.parentReportID);
diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx
index e34589c1eb67..aaa29962bef8 100644
--- a/src/pages/inbox/HeaderView.tsx
+++ b/src/pages/inbox/HeaderView.tsx
@@ -92,6 +92,7 @@ import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
+import {getStableReportSelector} from '@src/selectors/Report';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useRoute} from '@react-navigation/native';
@@ -110,8 +111,10 @@ type HeaderViewProps = {
 };
 
 function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps) {
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
-    const parentReportAction = useParentReportAction(report);
+    // The header does not read the chat heartbeat fields (`last*`), so it must not re-render on every message.
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getStableReportSelector});
+    // The header renders the parent message, not its reply counters, which change on every reply in this thread.
+    const parentReportAction = useParentReportAction(report, {shouldIgnoreThreadReplies: true});
 
     const icons = useMemoizedLazyExpensifyIcons(['BackArrow', 'Close', 'DotIndicator']);
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -119,9 +122,12 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
     const isInSidePanel = useIsInSidePanel();
     const route = useRoute();
     const openParentReportInCurrentTab = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT;
-    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID) ?? getNonEmptyStringOnyxID(report?.reportID)}`);
+    // Falls back to the report itself when there is no parent, so it needs the same stable projection.
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID) ?? getNonEmptyStringOnyxID(report?.reportID)}`, {
+        selector: getStableReportSelector,
+    });
     const [grandParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(parentReport?.parentReportID)}`);
-    const grandParentReportAction = useParentReportAction(parentReport);
+    const grandParentReportAction = useParentReportAction(parentReport, {shouldIgnoreThreadReplies: true});
     const policy = usePolicy(report?.policyID);
     const isPaidPolicyAdmin = useIsPaidPolicyAdmin();
     const [personalDetails] = useAllPersonalDetails();
@@ -493,7 +499,7 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
                                         />
                                     )}
                                     {!shouldUseNarrowLayout && chatIncludesChronos(report) && <ChronosTimerHeaderButton report={report} />}
-                                    {!shouldUseNarrowLayout && isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
+                                    {!shouldUseNarrowLayout && isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton reportID={report.reportID} />}
                                     {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
                                 </View>
                                 {shouldShowCloseButton && (
@@ -543,7 +549,7 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
                 {!!report && shouldUseNarrowLayout && isOpenTaskReport(report, parentReportAction) && (
                     <View style={[styles.appBG, styles.pl0]}>
                         <View style={[styles.ph5, styles.pb3]}>
-                            <TaskHeaderActionButton report={report} />
+                            <TaskHeaderActionButton reportID={report.reportID} />
                         </View>
                     </View>
                 )}
diff --git a/src/selectors/ReportAction.ts b/src/selectors/ReportAction.ts
index 468dd9bfd28c..40e8eefa82cb 100644
--- a/src/selectors/ReportAction.ts
+++ b/src/selectors/ReportAction.ts
@@ -142,6 +142,24 @@ function getReceiptScanFailedIOUActionDataSelector(
 const transactionThreadReportIDSelector = (transactionID: string | undefined) => (reportActions: OnyxEntry<ReportActions>) =>
     transactionID ? getIOUActionForTransactionID(Object.values(reportActions ?? {}), transactionID)?.childReportID : undefined;
 
+/** Reply counters on a parent action. They change on every reply in its thread, while the parent message itself does not. */
+type ThreadReplyCounterFields = 'childVisibleActionCount' | 'childCommenterCount' | 'childLastVisibleActionCreated' | 'childOldestFourAccountIDs';
+
+type ReportActionWithoutThreadReplyCounters = Omit<ReportAction, ThreadReplyCounterFields>;
+
+/**
+ * Like `getParentReportActionSelector`, but drops the thread reply counters so a thread's own screen (e.g. its header) does
+ * not re-render on every reply it receives. Only use it where none of the counters are read.
+ */
+function getParentReportActionWithoutThreadRepliesSelector(parentReportActions: OnyxEntry<ReportActions>, parentReportActionID?: string): ReportActionWithoutThreadReplyCounters | undefined {
+    const parentReportAction = getParentReportActionSelector(parentReportActions, parentReportActionID);
+    if (!parentReportAction) {
+        return undefined;
+    }
+    const {childVisibleActionCount, childCommenterCount, childLastVisibleActionCreated, childOldestFourAccountIDs, ...parentReportActionWithoutThreadReplies} = parentReportAction;
+    return parentReportActionWithoutThreadReplies;
+}
+
 export {
     getParentReportActionSelector,
     getLastClosedReportAction,
@@ -151,5 +169,6 @@ export {
     getReceiptScanFailedIOUActionDataSelector,
     reportVisibleActionsSelector,
     transactionThreadReportIDSelector,
+    getParentReportActionWithoutThreadRepliesSelector,
 };
-export type {NewestReportAction};
+export type {NewestReportAction, ReportActionWithoutThreadReplyCounters};
diff --git a/tests/ui/components/HeaderViewTest.tsx b/tests/ui/components/HeaderViewTest.tsx
index d2a49066a5f9..227411d07ab9 100644
--- a/tests/ui/components/HeaderViewTest.tsx
+++ b/tests/ui/components/HeaderViewTest.tsx
@@ -149,9 +149,18 @@ describe('HeaderView', () => {
         const joinButton = screen.getByText('Join');
         expect(joinButton).toBeTruthy();
 
-        // Then the joinRoom action should be called when the user presses the Join button
+        // Then the joinRoom action should be called with the fields it joins by. The header subscribes to a projection without
+        // the chat heartbeat fields (`last*`), so the call gets that projection rather than the stored object.
         fireEvent.press(joinButton);
-        expect(joinRoom).toHaveBeenCalledWith(report, currentUserAccountID);
+        expect(joinRoom).toHaveBeenCalledWith(
+            expect.objectContaining({
+                reportID: report.reportID,
+                parentReportID: report.parentReportID,
+                parentReportActionID: report.parentReportActionID,
+                participants: report.participants,
+            }),
+            currentUserAccountID,
+        );
     });
 
     it('should display correct title for report with CREATED_REPORT_FOR_UNAPPROVED_TRANSACTIONS parent action', async () => {
diff --git a/tests/ui/components/TaskHeaderActionButtonTest.tsx b/tests/ui/components/TaskHeaderActionButtonTest.tsx
new file mode 100644
index 000000000000..7e5f91b9a88c
--- /dev/null
+++ b/tests/ui/components/TaskHeaderActionButtonTest.tsx
@@ -0,0 +1,67 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
+
+import {completeTask} from '@userActions/Task';
+import type * as TaskType from '@userActions/Task';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import {createRandomReport} from '../../utils/collections/reports';
+import {translateLocal} from '../../utils/TestHelper';
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@userActions/Task', () => ({
+    ...jest.requireActual<typeof TaskType>('@userActions/Task'),
+    canActionTask: jest.fn(() => true),
+    completeTask: jest.fn(),
+    reopenTask: jest.fn(),
+}));
+
+describe('TaskHeaderActionButton', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('should complete the task with the full stored report', async () => {
+        // Given an open task report stored with a read position, because completing the task restores lastReadTime from
+        // that report if the request fails, and the header's own report projection drops it
+        const taskReport: Report = {
+            ...createRandomReport(1, undefined),
+            type: CONST.REPORT.TYPE.TASK,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            permissions: [CONST.REPORT.PERMISSIONS.READ, CONST.REPORT.PERMISSIONS.WRITE],
+            lastReadTime: '2026-10-08 12:00:00.000',
+        };
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${taskReport.reportID}`, taskReport);
+        await waitForBatchedUpdates();
+        render(
+            <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+                <TaskHeaderActionButton reportID={taskReport.reportID} />
+            </ComposeProviders>,
+        );
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user marks the task as complete
+        fireEvent.press(screen.getByText(translateLocal('task.markAsComplete')));
+
+        // Then the action gets the stored report, including the read position it needs for its failure data
+        expect(jest.mocked(completeTask).mock.calls.at(0)?.at(0)).toEqual(expect.objectContaining({reportID: taskReport.reportID, lastReadTime: taskReport.lastReadTime}));
+    });
+});
diff --git a/tests/unit/useParentReportActionTest.tsx b/tests/unit/useParentReportActionTest.tsx
new file mode 100644
index 000000000000..46a413567cfd
--- /dev/null
+++ b/tests/unit/useParentReportActionTest.tsx
@@ -0,0 +1,78 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useParentReportAction from '@hooks/useParentReportAction';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report, ReportAction} from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const PARENT_REPORT_ID = '1';
+const PARENT_REPORT_ACTION_ID = '100';
+
+const threadReport = {reportID: '2', parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID} as Report;
+
+const parentReportAction = {
+    reportActionID: PARENT_REPORT_ACTION_ID,
+    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+    created: '2026-10-08 10:00:00.000',
+    childReportID: threadReport.reportID,
+    childVisibleActionCount: 1,
+    childLastVisibleActionCreated: '2026-10-08 10:00:00.000',
+} as ReportAction;
+
+describe('useParentReportAction', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`, {[PARENT_REPORT_ACTION_ID]: parentReportAction});
+        await waitForBatchedUpdates();
+    });
+
+    const replyInThread = async () => {
+        // A reply in the thread bumps the reply counters on the parent action (see getOptimisticDataForAncestors)
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`, {
+                [PARENT_REPORT_ACTION_ID]: {childVisibleActionCount: 2, childLastVisibleActionCreated: '2026-10-08 11:00:00.000'},
+            });
+            await waitForBatchedUpdates();
+        });
+    };
+
+    it('should keep the parent action identity on a reply when thread replies are ignored', async () => {
+        // Given a thread screen that only renders its parent message
+        const {result} = renderHook(() => useParentReportAction(threadReport, {shouldIgnoreThreadReplies: true}));
+        await act(async () => {
+            await waitForBatchedUpdates();
+        });
+        const firstResult = result.current;
+        expect(firstResult).toEqual(expect.objectContaining({reportActionID: PARENT_REPORT_ACTION_ID}));
+        expect(firstResult).not.toHaveProperty('childVisibleActionCount');
+
+        // When someone replies in the thread
+        await replyInThread();
+
+        // Then the parent action keeps its identity, so the caller does not re-render for every reply
+        expect(result.current).toBe(firstResult);
+    });
+
+    it('should return the reply counters by default', async () => {
+        // Given a caller that needs the reply counters (e.g. the thread replies row)
+        const {result} = renderHook(() => useParentReportAction(threadReport));
+        await act(async () => {
+            await waitForBatchedUpdates();
+        });
+
+        // When someone replies in the thread
+        await replyInThread();
+
+        // Then the parent action carries the updated counters
+        expect(result.current?.childVisibleActionCount).toBe(2);
+    });
+});

From efd3713d9c2fb5e95a024680bf680267a4d3bd15 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 15:32:23 +0200
Subject: [PATCH 387/781] fix: iOS tab roots run edge to edge, so the offline
 indicator no longer covers content under the bar on Inbox, Spend and Account

---
 .../useTabRootScreenWrapperProps/index.ios.tsx         | 10 +++++++---
 .../useTabRootScreenWrapperProps/types.ts              |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 22dd8278c1ba..4578b8da005e 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -12,8 +12,9 @@ import type TabRootScreenWrapperProps from './types';
 
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
- * the screen, so the ScreenWrapper adds no bottom padding. Each tab root's list lets UIKit inset its end past the bar,
- * and the offline indicator sits above the bar. Account drawn over the tabs hides the bar.
+ * the screen, so the ScreenWrapper runs edge to edge and adds no bottom padding, to the screen or to the offline
+ * indicator. Each tab root's list lets UIKit inset its end past the bar, and the offline indicator sits above the bar.
+ * Account drawn over the tabs hides the bar.
  */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -25,7 +26,10 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
         return {};
     }
 
-    return {includeSafeAreaPaddingBottom: false, offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset))};
+    return {
+        enableEdgeToEdgeBottomSafeAreaPadding: false,
+        offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
+    };
 }
 
 export default useTabRootScreenWrapperProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index 7c3807848145..74130e388d00 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -1,7 +1,7 @@
 import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
 import type {ScreenWrapperOfflineIndicatorsProps} from '@components/ScreenWrapper/ScreenWrapperOfflineIndicators';
 
-type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom'> &
+type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom' | 'enableEdgeToEdgeBottomSafeAreaPadding'> &
     Pick<ScreenWrapperOfflineIndicatorsProps, 'offlineIndicatorStyle'>;
 
 export default TabRootScreenWrapperProps;

From 1ccb1e8b19df56eb86f118597b4bda672b979c62 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 15:40:16 +0200
Subject: [PATCH 388/781] test: mock the tab root hooks in the HomePage and
 WorkspaceInitialPage tests, whose partial style mocks lack the native tab bar
 styles

---
 tests/ui/WorkspaceInitialPageTest.tsx | 2 ++
 tests/unit/pages/HomePage.test.tsx    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/ui/WorkspaceInitialPageTest.tsx b/tests/ui/WorkspaceInitialPageTest.tsx
index d056856626cb..0da7ce4577d7 100644
--- a/tests/ui/WorkspaceInitialPageTest.tsx
+++ b/tests/ui/WorkspaceInitialPageTest.tsx
@@ -67,6 +67,8 @@ jest.mock('@components/BlockingViews/FullPageNotFoundView', () => (props: {child
 jest.mock('@components/HeaderWithBackButton', () => jest.fn());
 jest.mock('@components/HighlightableMenuItem', () => jest.fn());
 jest.mock('@components/Navigation/TabBarBottomContent', () => jest.fn());
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps', () => () => ({}));
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
 jest.mock(
     '@components/OfflineWithFeedback',
     () =>
diff --git a/tests/unit/pages/HomePage.test.tsx b/tests/unit/pages/HomePage.test.tsx
index 78284e673804..a36b0115beca 100644
--- a/tests/unit/pages/HomePage.test.tsx
+++ b/tests/unit/pages/HomePage.test.tsx
@@ -58,6 +58,8 @@ jest.mock('@components/ScrollView', () => {
     }
     return MockScrollView;
 });
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps', () => () => ({}));
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
 jest.mock('@components/Navigation/NavigationTabBar', () => {
     function MockNavigationTabBar() {
         return null;

From 8ecbb45c886565ebb55371ce6ea60ddc814b3cef Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 9 Oct 2026 19:23:05 +0530
Subject: [PATCH 389/781] fix: derive filter toggles from saved values and
 clear the error once satisfied

---
 .../merge/filters/MergeATSFiltersPage.tsx       | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
index f96b4019963c..c243a019f8a5 100644
--- a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
+++ b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
@@ -51,12 +51,8 @@ function MergeATSFiltersPage({
     const filters = useMergeATSFiltersDraftState(policyID);
     const {setFilter} = useMergeATSFiltersDraftActions();
 
-    // A freshly enabled dimension has no values yet, so the toggle can't be derived from the values alone
-    const [enabledFilters, setEnabledFilters] = useState<Record<MergeATSFilterType, boolean>>(() => ({
-        [CONST.MERGE.ATS_FILTER_TYPE.STAGES]: !!filters.stages?.length,
-        [CONST.MERGE.ATS_FILTER_TYPE.TAGS]: !!filters.tags?.length,
-        [CONST.MERGE.ATS_FILTER_TYPE.OFFICES]: !!filters.offices?.length,
-    }));
+    // A freshly enabled dimension has no values yet, so a toggle is on when it has values or was switched on by the admin
+    const [switchedOnFilters, setSwitchedOnFilters] = useState<Partial<Record<MergeATSFilterType, boolean>>>({});
 
     const providerName = getConnectedATSProvider(policy)?.displayName ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.merge_ats;
 
@@ -81,10 +77,7 @@ function MergeATSFiltersPage({
     const hasRequiredFilter = !!filters.tags?.length || !!filters.stages?.length;
 
     const toggleFilter = (filterType: MergeATSFilterType, isEnabled: boolean) => {
-        if (errorKey && isEnabled && filterType !== CONST.MERGE.ATS_FILTER_TYPE.OFFICES) {
-            setErrorKey(undefined);
-        }
-        setEnabledFilters((previous) => ({...previous, [filterType]: isEnabled}));
+        setSwitchedOnFilters((previous) => ({...previous, [filterType]: isEnabled}));
         setFilter(filterType, []);
     };
 
@@ -122,7 +115,7 @@ function MergeATSFiltersPage({
                                     title={toggleTitle}
                                     switchAccessibilityLabel={toggleTitle}
                                     toggleContainerStyles={[styles.pv3, styles.mh5]}
-                                    isActive={enabledFilters[filterType]}
+                                    isActive={!!filters[filterType]?.length || !!switchedOnFilters[filterType]}
                                     onToggle={(isEnabled) => toggleFilter(filterType, isEnabled)}
                                     subMenuItems={
                                         <>
@@ -142,7 +135,7 @@ function MergeATSFiltersPage({
                     </OfflineWithFeedback>
                 </ScrollView>
                 <FixedFooter addBottomSafeAreaPadding>
-                    {!!errorKey && (
+                    {!!errorKey && !hasRequiredFilter && (
                         <FormHelpMessage
                             isError
                             message={translate(errorKey)}

From cfec9db748803726b921477b56a2930ad06519e2 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Fri, 9 Oct 2026 15:53:50 +0200
Subject: [PATCH 390/781] parrot

---
 src/languages/de.ts      | 22 +++++++++++-----------
 src/languages/el.ts      | 20 ++++++++++----------
 src/languages/es.ts      | 28 ++++++++++++++--------------
 src/languages/fr.ts      | 30 +++++++++++++++---------------
 src/languages/it.ts      | 30 +++++++++++++++---------------
 src/languages/ja.ts      | 32 ++++++++++++++++----------------
 src/languages/nl.ts      | 18 +++++++++---------
 src/languages/pl.ts      | 22 +++++++++++-----------
 src/languages/pt-BR.ts   | 30 +++++++++++++++---------------
 src/languages/zh-hans.ts | 22 +++++++++++-----------
 10 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 020d5bf9e303..8ef54298d971 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7836,18 +7836,18 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
         },
         officeLocations: {
             title: 'Bürostandorte',
-            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern zuzuweisen, zum Beispiel für die Entfernungserfassung.',
+            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern für Dinge wie die Entfernungserfassung zuzuweisen.',
             addOfficeLocation: 'Bürostandort hinzufügen',
             editOfficeLocation: 'Bürostandort bearbeiten',
             locationName: 'Standortname',
-            locationNameHint: 'Wählen Sie einen Spitznamen für den Standort, wenn Sie mehrere Bürostandorte hinzufügen',
+            locationNameHint: 'Wählen Sie einen Standort-Spitznamen, wenn Sie mehrere Bürostandorte hinzufügen',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Bürostandort ${officeNumber}`,
-            setAsPrimary: 'Als Hauptstandort festlegen',
-            primary: 'Hauptstandort',
-            deleteOfficeLocation: 'Bürostandort löschen',
-            deleteOfficeLocationConfirmation: 'Möchtest du diesen Bürostandort wirklich löschen?',
+            setAsPrimary: 'Als primär festlegen',
+            primary: 'Primär',
+            deleteOfficeLocation: 'Standort löschen',
+            deleteOfficeLocationConfirmation: 'Sind Sie sicher, dass Sie diesen Bürostandort löschen möchten?',
             existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen existiert bereits',
-            setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptstandort festlegen?',
+            setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptbüro festlegen?',
         },
         bankAccount: {
             continueWithSetup: 'Einrichtung fortsetzen',
@@ -9667,12 +9667,12 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ zu verbotenen Ausgaben hinzugefügt`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ aus verbotenen Ausgaben entfernt`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ (${address}) hinzugefügt`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `hat den Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
+            added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ hinzugefügt (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `hat die Adresse des Bürostandorts „${name}“ in „${newAddress}“ geändert (zuvor „${oldAddress}“)`,
-            setAsPrimary: ({name}: {name: string}) => `hat den Bürostandort „${name}“ als Hauptstandort festgelegt`,
-            setCompanyAddressAsPrimary: 'hat die Firmenadresse als Hauptstandort festgelegt',
+            setAsPrimary: ({name}: {name: string}) => `Legen Sie den Bürostandort „${name}“ als primären fest`,
+            setCompanyAddressAsPrimary: 'Firmenadresse als primär festlegen',
             removed: ({name}: {name: string}) => `hat den Bürostandort „${name}“ entfernt`,
         },
         workArrangement: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index cc25033acd21..ca4207cef5db 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8130,18 +8130,18 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
         },
         officeLocations: {
             title: 'Τοποθεσίες γραφείων',
-            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αναθέσετε σε μέλη, για παράδειγμα για την παρακολούθηση αποστάσεων.',
-            addOfficeLocation: 'Προσθήκη τοποθεσίας γραφείου',
+            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αναθέτετε στα μέλη, για χρήσεις όπως η παρακολούθηση αποστάσεων.',
+            addOfficeLocation: 'Προσθέστε τοποθεσία γραφείου',
             editOfficeLocation: 'Επεξεργασία τοποθεσίας γραφείου',
             locationName: 'Όνομα τοποθεσίας',
-            locationNameHint: 'Επιλέξτε ένα ψευδώνυμο για την τοποθεσία αν προσθέτετε πολλές τοποθεσίες γραφείων',
+            locationNameHint: 'Επιλέξτε ένα ψευδώνυμο τοποθεσίας αν προσθέτετε πολλές τοποθεσίες γραφείων',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Τοποθεσία γραφείου ${officeNumber}`,
-            setAsPrimary: 'Ορισμός ως κύριας',
-            primary: 'Κύρια',
+            setAsPrimary: 'Ορισμός ως κύριο',
+            primary: 'Κύριο',
             deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
-            deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή την τοποθεσία γραφείου;',
+            deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τοποθεσία γραφείου;',
             existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
-            setCompanyAddressAsPrimaryConfirmation: 'Ορισμός της διεύθυνσης εταιρείας ως κύριου γραφείου;',
+            setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η διεύθυνση της εταιρείας ως κύριο γραφείο;',
         },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
@@ -9789,11 +9789,11 @@ ${reportName}`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `αφαιρέσατε το «${prohibitedExpense}» από τις απαγορευμένες δαπάνες`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `πρόσθεσε την τοποθεσία γραφείου «${name}» (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου «${oldName}» σε «${newName}»`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου "${oldName}" σε "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `άλλαξε τη διεύθυνση της τοποθεσίας γραφείου «${name}» σε «${newAddress}» (προηγουμένως «${oldAddress}»)`,
-            setAsPrimary: ({name}: {name: string}) => `όρισε την τοποθεσία γραφείου «${name}» ως κύρια`,
-            setCompanyAddressAsPrimary: 'όρισε τη διεύθυνση εταιρείας ως κύρια',
+            setAsPrimary: ({name}: {name: string}) => `ορισμός της τοποθεσίας γραφείου «${name}» ως κύριας`,
+            setCompanyAddressAsPrimary: 'ορίστε τη διεύθυνση της εταιρείας ως κύρια',
             removed: ({name}: {name: string}) => `αφαίρεσε την τοποθεσία γραφείου «${name}»`,
         },
         workArrangement: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ea36c8dd47ca..0d7ec5008d97 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7858,19 +7858,19 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             policy: 'Política de gastos',
         },
         officeLocations: {
-            title: 'Ubicaciones de oficina',
-            subtitle: 'Añade ubicaciones de oficina para asignarlas a los miembros, por ejemplo, para el seguimiento de distancias.',
-            addOfficeLocation: 'Añadir ubicación de oficina',
-            editOfficeLocation: 'Editar ubicación de oficina',
+            title: 'Ubicaciones de oficinas',
+            subtitle: 'Añade ubicaciones de oficina para asignarlas a miembros para cosas como el seguimiento de distancias.',
+            addOfficeLocation: 'Añadir ubicación de la oficina',
+            editOfficeLocation: 'Editar ubicación de la oficina',
             locationName: 'Nombre de la ubicación',
-            locationNameHint: 'Elige un apodo para la ubicación si vas a añadir varias ubicaciones de oficina',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de oficina ${officeNumber}`,
+            locationNameHint: 'Elige un alias de ubicación si vas a añadir varias oficinas',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de la oficina ${officeNumber}`,
             setAsPrimary: 'Establecer como principal',
             primary: 'Principal',
             deleteOfficeLocation: 'Eliminar ubicación de oficina',
-            deleteOfficeLocationConfirmation: '¿Estás seguro de que quieres eliminar esta ubicación de oficina?',
+            deleteOfficeLocationConfirmation: '¿Seguro que quieres eliminar esta oficina?',
             existingOfficeLocationError: 'Ya existe una ubicación de oficina con este nombre',
-            setCompanyAddressAsPrimaryConfirmation: '¿Establecer la dirección física de la empresa como oficina principal?',
+            setCompanyAddressAsPrimaryConfirmation: '¿Establecer la dirección de la empresa como oficina principal?',
         },
         bankAccount: {
             continueWithSetup: 'Continuar con la configuración',
@@ -9437,13 +9437,13 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}) => `añadió "${prohibitedExpense}" a los gastos prohibidos`,
         removedProhibitedExpense: ({prohibitedExpense}) => `eliminó "${prohibitedExpense}" de los gastos prohibidos`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `añadió la ubicación de oficina "${name}" (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la ubicación de oficina "${oldName}" a "${newName}"`,
+            added: ({name, address}: {name: string; address: string}) => `añadió la oficina "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la oficina de "${oldName}" a "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `cambió la dirección de la ubicación de oficina "${name}" a "${newAddress}" (anteriormente "${oldAddress}")`,
-            setAsPrimary: ({name}: {name: string}) => `estableció la ubicación de oficina "${name}" como principal`,
-            setCompanyAddressAsPrimary: 'estableció la dirección física de la empresa como principal',
-            removed: ({name}: {name: string}) => `eliminó la ubicación de oficina "${name}"`,
+                `cambió la dirección de la oficina "${name}" a "${newAddress}" (previamente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `establecer la ubicación de oficina "${name}" como principal`,
+            setCompanyAddressAsPrimary: 'establecer la dirección de la empresa como principal',
+            removed: ({name}: {name: string}) => `eliminó la ubicación de la oficina «${name}»`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `establecer la modalidad de trabajo predeterminada en ${arrangement}`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 66a5b071694d..1990b95a4464 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7855,19 +7855,19 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             policy: 'Politique de dépenses',
         },
         officeLocations: {
-            title: 'Lieux de travail',
-            subtitle: 'Ajoutez des lieux de travail à attribuer aux membres, par exemple pour le suivi des distances.',
-            addOfficeLocation: 'Ajouter un lieu de travail',
+            title: 'Sites de bureaux',
+            subtitle: 'Ajoutez des bureaux pour les assigner aux membres, par exemple pour le suivi des distances.',
+            addOfficeLocation: 'Ajouter un bureau',
             editOfficeLocation: 'Modifier le lieu de travail',
             locationName: 'Nom du lieu',
-            locationNameHint: 'Choisissez un surnom pour le lieu si vous ajoutez plusieurs lieux de travail',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Lieu de travail ${officeNumber}`,
+            locationNameHint: 'Choisissez un surnom pour l’emplacement si vous ajoutez plusieurs bureaux',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Emplacement de bureau ${officeNumber}`,
             setAsPrimary: 'Définir comme principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Supprimer le lieu de travail',
-            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce lieu de travail ?',
-            existingOfficeLocationError: 'Un lieu de travail portant ce nom existe déjà',
-            setCompanyAddressAsPrimaryConfirmation: 'Définir l’adresse de l’entreprise comme bureau principal ?',
+            deleteOfficeLocation: 'Supprimer le site du bureau',
+            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ?',
+            existingOfficeLocationError: 'Un bureau portant ce nom existe déjà',
+            setCompanyAddressAsPrimaryConfirmation: "Définir l'adresse de l'entreprise comme bureau principal ?",
         },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
@@ -9688,13 +9688,13 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a ajouté « ${prohibitedExpense} » aux dépenses interdites`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a supprimé « ${prohibitedExpense} » des dépenses interdites`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de travail « ${name} » (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le lieu de travail « ${oldName} » en « ${newName} »`,
+            added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de bureau « ${name} » (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le lieu de bureau « ${oldName} » en « ${newName} »`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `a modifié l’adresse du lieu de travail « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
-            setAsPrimary: ({name}: {name: string}) => `a défini le lieu de travail « ${name} » comme principal`,
-            setCompanyAddressAsPrimary: 'a défini l’adresse de l’entreprise comme principale',
-            removed: ({name}: {name: string}) => `a supprimé le lieu de travail « ${name} »`,
+                `a modifié l’adresse de l’emplacement de bureau « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
+            setAsPrimary: ({name}: {name: string}) => `définir l’emplacement de bureau « ${name} » comme principal`,
+            setCompanyAddressAsPrimary: 'définir l’adresse de l’entreprise comme principale',
+            removed: ({name}: {name: string}) => `a supprimé le site "${name}"`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `définir l’organisation de travail par défaut sur ${arrangement}`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index cee6ac59f83a..f217ba993d41 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7790,18 +7790,18 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             policy: 'Politica di spesa',
         },
         officeLocations: {
-            title: 'Sedi degli uffici',
-            subtitle: 'Aggiungi le sedi degli uffici da assegnare ai membri, ad esempio per il monitoraggio delle distanze.',
+            title: 'Sedi dell’ufficio',
+            subtitle: 'Aggiungi sedi degli uffici da assegnare ai membri per attività come il tracciamento delle distanze.',
             addOfficeLocation: 'Aggiungi sede dell’ufficio',
-            editOfficeLocation: 'Modifica sede dell’ufficio',
-            locationName: 'Nome della sede',
-            locationNameHint: 'Scegli un soprannome per la sede se stai aggiungendo più sedi degli uffici',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede dell’ufficio ${officeNumber}`,
+            editOfficeLocation: 'Modifica sede ufficio',
+            locationName: 'Nome località',
+            locationNameHint: 'Scegli un nome abbreviato per la sede se stai aggiungendo più sedi di ufficio',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ${officeNumber}`,
             setAsPrimary: 'Imposta come principale',
             primary: 'Principale',
-            deleteOfficeLocation: 'Elimina sede dell’ufficio',
-            deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede dell’ufficio?',
-            existingOfficeLocationError: 'Esiste già una sede dell’ufficio con questo nome',
+            deleteOfficeLocation: 'Elimina sede ufficio',
+            deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede?',
+            existingOfficeLocationError: 'Esiste già una sede con questo nome',
             setCompanyAddressAsPrimaryConfirmation: 'Impostare l’indirizzo dell’azienda come sede principale?',
         },
         bankAccount: {
@@ -9614,13 +9614,13 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha aggiunto "${prohibitedExpense}" alle spese vietate`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha rimosso "${prohibitedExpense}" dalle spese vietate`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `ha aggiunto la sede dell’ufficio "${name}" (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede dell’ufficio "${oldName}" in "${newName}"`,
+            added: ({name, address}: {name: string; address: string}) => `ha aggiunto la sede "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede dell’ufficio da "${oldName}" a "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `ha modificato l’indirizzo della sede dell’ufficio "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
-            setAsPrimary: ({name}: {name: string}) => `ha impostato la sede dell’ufficio "${name}" come principale`,
-            setCompanyAddressAsPrimary: 'ha impostato l’indirizzo dell’azienda come principale',
-            removed: ({name}: {name: string}) => `ha rimosso la sede dell’ufficio "${name}"`,
+                `ha modificato l’indirizzo della sede "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `imposta la sede "${name}" come principale`,
+            setCompanyAddressAsPrimary: 'imposta l’indirizzo dell’azienda come principale',
+            removed: ({name}: {name: string}) => `ha rimosso la sede "${name}"`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `imposta la modalità di lavoro predefinita su ${arrangement}`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index bb85b98a9ef9..04cc722fd385 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7696,19 +7696,19 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             policy: '経費ポリシー',
         },
         officeLocations: {
-            title: 'オフィスの所在地',
-            subtitle: '距離の記録などのためにメンバーに割り当てるオフィスの所在地を追加します。',
+            title: 'オフィス所在地',
+            subtitle: 'オフィス所在地を追加して、距離の追跡などのためにメンバーに割り当てましょう。',
             addOfficeLocation: 'オフィスの所在地を追加',
-            editOfficeLocation: 'オフィスの所在地を編集',
-            locationName: '所在地名',
-            locationNameHint: '複数のオフィスの所在地を追加する場合は、所在地のニックネームを選択してください',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `オフィスの所在地 ${officeNumber}`,
+            editOfficeLocation: 'オフィス所在地を編集',
+            locationName: '場所名',
+            locationNameHint: '複数のオフィス所在地を追加する場合は、場所のニックネームを選択してください',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `オフィス所在地 ${officeNumber}`,
             setAsPrimary: 'メインに設定',
             primary: 'メイン',
-            deleteOfficeLocation: 'オフィスの所在地を削除',
-            deleteOfficeLocationConfirmation: 'このオフィスの所在地を削除してもよろしいですか？',
-            existingOfficeLocationError: 'この名前のオフィスの所在地はすでに存在します',
-            setCompanyAddressAsPrimaryConfirmation: '会社住所をメインのオフィスに設定しますか？',
+            deleteOfficeLocation: 'オフィス所在地を削除',
+            deleteOfficeLocationConfirmation: 'このオフィス所在地を削除してもよろしいですか？',
+            existingOfficeLocationError: 'この名前のオフィス所在地はすでに存在します',
+            setCompanyAddressAsPrimaryConfirmation: '会社住所を主なオフィスとして設定しますか？',
         },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
@@ -9480,13 +9480,13 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費に「${prohibitedExpense}」を追加しました`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費から「${prohibitedExpense}」を削除しました`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `オフィスの所在地「${name}」（${address}）を追加しました`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `オフィスの所在地「${oldName}」の名前を「${newName}」に変更しました`,
+            added: ({name, address}: {name: string; address: string}) => `オフィス所在地「${name}」（${address}）を追加しました`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `オフィス所在地名を「${oldName}」から「${newName}」に変更しました`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `オフィスの所在地「${name}」の住所を「${newAddress}」（以前は「${oldAddress}」）に変更しました`,
-            setAsPrimary: ({name}: {name: string}) => `オフィスの所在地「${name}」をメインに設定しました`,
-            setCompanyAddressAsPrimary: '会社住所をメインに設定しました',
-            removed: ({name}: {name: string}) => `オフィスの所在地「${name}」を削除しました`,
+                `オフィス所在地「${name}」の住所を「${newAddress}」に変更しました（以前の住所：「${oldAddress}」）`,
+            setAsPrimary: ({name}: {name: string}) => `オフィス所在地「${name}」を主所在地に設定します`,
+            setCompanyAddressAsPrimary: '会社の住所を主に設定する',
+            removed: ({name}: {name: string}) => `オフィス所在地「${name}」を削除しました`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `デフォルトの勤務形態を${arrangement}に設定します`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 56b70c0a4fb9..b59deeb064f5 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7772,18 +7772,18 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
         },
         officeLocations: {
             title: 'Kantoorlocaties',
-            subtitle: 'Voeg kantoorlocaties toe om aan leden toe te wijzen, bijvoorbeeld voor het bijhouden van afstanden.',
+            subtitle: 'Voeg kantoorlocaties toe om aan leden toe te wijzen voor zaken als afstandsregistratie.',
             addOfficeLocation: 'Kantoorlocatie toevoegen',
             editOfficeLocation: 'Kantoorlocatie bewerken',
             locationName: 'Locatienaam',
-            locationNameHint: 'Kies een bijnaam voor de locatie als je meerdere kantoorlocaties toevoegt',
+            locationNameHint: 'Kies een locatiebijnaam als je meerdere kantoorlocaties toevoegt',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Kantoorlocatie ${officeNumber}`,
             setAsPrimary: 'Instellen als primair',
             primary: 'Primair',
             deleteOfficeLocation: 'Kantoorlocatie verwijderen',
             deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
             existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
-            setCompanyAddressAsPrimaryConfirmation: 'Het adres van het bedrijf instellen als primair kantoor?',
+            setCompanyAddressAsPrimaryConfirmation: 'Het bedrijfsadres als hoofdvestiging instellen?',
         },
         bankAccount: {
             continueWithSetup: 'Setup voortzetten',
@@ -9586,13 +9586,13 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft ‘${prohibitedExpense}’ toegevoegd aan verboden uitgaven`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft „${prohibitedExpense}” verwijderd uit verboden uitgaven`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `heeft de kantoorlocatie ‘${name}’ (${address}) toegevoegd`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlocatie ‘${oldName}’ hernoemd naar ‘${newName}’`,
+            added: ({name, address}: {name: string; address: string}) => `heeft de kantoorlocatie "${name}" (${address}) toegevoegd`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlocatie “${oldName}” hernoemd naar “${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `heeft het adres van de kantoorlocatie ‘${name}’ gewijzigd in ‘${newAddress}’ (voorheen ‘${oldAddress}’)`,
-            setAsPrimary: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ als primair ingesteld`,
-            setCompanyAddressAsPrimary: 'heeft het adres van het bedrijf als primair ingesteld',
-            removed: ({name}: {name: string}) => `heeft de kantoorlocatie ‘${name}’ verwijderd`,
+                `heeft het adres van de kantoorlocatie „${name}” gewijzigd naar „${newAddress}” (voorheen „${oldAddress}”)`,
+            setAsPrimary: ({name}: {name: string}) => `stel de kantoorlocatie ‘${name}’ in als primair`,
+            setCompanyAddressAsPrimary: 'stel het bedrijfsadres in als primair',
+            removed: ({name}: {name: string}) => `heeft de kantoorlocatie "${name}" verwijderd`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `stel de standaard werkregeling in op ${arrangement}`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index ff0edbda8c54..47dd9a4c551e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7794,14 +7794,14 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
         },
         officeLocations: {
             title: 'Lokalizacje biur',
-            subtitle: 'Dodaj lokalizacje biur, aby przypisywać je członkom, np. na potrzeby śledzenia odległości.',
-            addOfficeLocation: 'Dodaj lokalizację biura',
+            subtitle: 'Dodaj lokalizacje biur, aby przypisywać je członkom na potrzeby m.in. śledzenia dystansu.',
+            addOfficeLocation: 'Dodaj siedzibę biura',
             editOfficeLocation: 'Edytuj lokalizację biura',
             locationName: 'Nazwa lokalizacji',
-            locationNameHint: 'Wybierz nazwę dla lokalizacji, jeśli dodajesz kilka lokalizacji biur',
+            locationNameHint: 'Wybierz nazwę lokalizacji, jeśli dodajesz wiele biur',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Lokalizacja biura ${officeNumber}`,
-            setAsPrimary: 'Ustaw jako główną',
-            primary: 'Główna',
+            setAsPrimary: 'Ustaw jako główny',
+            primary: 'Główny',
             deleteOfficeLocation: 'Usuń lokalizację biura',
             deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
             existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
@@ -9596,13 +9596,13 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `dodano „${prohibitedExpense}” do zabronionych wydatków`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `usunięto „${prohibitedExpense}” z wydatków zabronionych`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `dodano lokalizację biura „${name}” (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmieniono nazwę lokalizacji biura „${oldName}” na „${newName}”`,
+            added: ({name, address}: {name: string; address: string}) => `dodał(a) lokalizację biura „${name}” (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmienił nazwę lokalizacji biura „${oldName}” na „${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `zmieniono adres lokalizacji biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
-            setAsPrimary: ({name}: {name: string}) => `ustawiono lokalizację biura „${name}” jako główną`,
-            setCompanyAddressAsPrimary: 'ustawiono adres firmy jako główny',
-            removed: ({name}: {name: string}) => `usunięto lokalizację biura „${name}”`,
+                `zmienił(a) adres lokalizacji biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
+            setAsPrimary: ({name}: {name: string}) => `ustaw główną lokalizację biura „${name}”`,
+            setCompanyAddressAsPrimary: 'ustaw adres firmy jako główny',
+            removed: ({name}: {name: string}) => `usunął lokalizację biura „${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `ustaw domyślny tryb pracy na ${arrangement}`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 845bab786f17..6df6ab60451f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7776,18 +7776,18 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             policy: 'Política de despesas',
         },
         officeLocations: {
-            title: 'Locais de escritório',
-            subtitle: 'Adicione locais de escritório para atribuir aos membros, por exemplo, para o rastreamento de distâncias.',
-            addOfficeLocation: 'Adicionar local de escritório',
-            editOfficeLocation: 'Editar local de escritório',
+            title: 'Locais do escritório',
+            subtitle: 'Adicione locais de escritório para atribuir a membros em coisas como rastreamento de distância.',
+            addOfficeLocation: 'Adicionar local do escritório',
+            editOfficeLocation: 'Editar local do escritório',
             locationName: 'Nome do local',
-            locationNameHint: 'Escolha um apelido para o local se estiver adicionando vários locais de escritório',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Local de escritório ${officeNumber}`,
+            locationNameHint: 'Escolha um apelido para o local se você estiver adicionando vários escritórios',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Local do escritório ${officeNumber}`,
             setAsPrimary: 'Definir como principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Excluir local de escritório',
-            deleteOfficeLocationConfirmation: 'Tem certeza de que deseja excluir este local de escritório?',
-            existingOfficeLocationError: 'Já existe um local de escritório com este nome',
+            deleteOfficeLocation: 'Excluir local do escritório',
+            deleteOfficeLocationConfirmation: 'Tem certeza de que quer excluir este endereço do escritório?',
+            existingOfficeLocationError: 'Já existe um local de escritório com esse nome',
             setCompanyAddressAsPrimaryConfirmation: 'Definir o endereço da empresa como escritório principal?',
         },
         bankAccount: {
@@ -9584,13 +9584,13 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `adicionou "${prohibitedExpense}" às despesas proibidas`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removeu "${prohibitedExpense}" das despesas proibidas`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `adicionou o local de escritório "${name}" (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renomeou o local de escritório "${oldName}" para "${newName}"`,
+            added: ({name, address}: {name: string; address: string}) => `adicionou o local do escritório "${name}" (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renomeou o local do escritório de "${oldName}" para "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `alterou o endereço do local de escritório "${name}" para "${newAddress}" (antes "${oldAddress}")`,
-            setAsPrimary: ({name}: {name: string}) => `definiu o local de escritório "${name}" como principal`,
-            setCompanyAddressAsPrimary: 'definiu o endereço da empresa como principal',
-            removed: ({name}: {name: string}) => `removeu o local de escritório "${name}"`,
+                `alterou o endereço da unidade "${name}" para "${newAddress}" (anteriormente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `definir o local do escritório "${name}" como principal`,
+            setCompanyAddressAsPrimary: 'definir o endereço da empresa como principal',
+            removed: ({name}: {name: string}) => `removeu o local do escritório "${name}"`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `definir o arranjo de trabalho padrão como ${arrangement}`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a8fe3c3aade6..533f8648783c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7512,18 +7512,18 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
         },
         officeLocations: {
             title: '办公地点',
-            subtitle: '添加办公地点并分配给成员，用于距离跟踪等用途。',
+            subtitle: '添加办公地点，以便将其分配给成员用于里程跟踪等用途。',
             addOfficeLocation: '添加办公地点',
             editOfficeLocation: '编辑办公地点',
             locationName: '地点名称',
-            locationNameHint: '如果要添加多个办公地点，请为地点选择一个昵称',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `办公地点 ${officeNumber}`,
-            setAsPrimary: '设为主要地点',
+            locationNameHint: '如果要添加多个办公地点，请为此地点选择一个昵称',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `办公室地点 ${officeNumber}`,
+            setAsPrimary: '设为主要',
             primary: '主要',
             deleteOfficeLocation: '删除办公地点',
             deleteOfficeLocationConfirmation: '确定要删除此办公地点吗？',
             existingOfficeLocationError: '已存在同名的办公地点',
-            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公地点？',
+            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公室地址？',
         },
         bankAccount: {
             continueWithSetup: '继续设置',
@@ -9235,13 +9235,13 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已将“${prohibitedExpense}”添加到禁止报销的费用中`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已从禁用报销类别中移除“${prohibitedExpense}”`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `已添加办公地点“${name}”（${address}）`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点“${oldName}”重命名为“${newName}”`,
+            added: ({name, address}: {name: string; address: string}) => `已添加办公室地点“${name}”（${address}）`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点从“${oldName}”重命名为“${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `已将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
-            setAsPrimary: ({name}: {name: string}) => `已将办公地点“${name}”设为主要地点`,
-            setCompanyAddressAsPrimary: '已将公司地址设为主要地点',
-            removed: ({name}: {name: string}) => `已删除办公地点“${name}”`,
+                `将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
+            setAsPrimary: ({name}: {name: string}) => `将办公地点“${name}”设为主要地点`,
+            setCompanyAddressAsPrimary: '将公司地址设为主要地址',
+            removed: ({name}: {name: string}) => `已移除办公室地点“${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `将默认工作安排设置为 ${arrangement}`,

From 670657e13be93507525c1d6aa15afb733a58bd2c Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 16:02:07 +0200
Subject: [PATCH 391/781] refactor: drop leftovers, unused props type key,
 default headerShown, a duplicate overlay style and dead test mocks

---
 .../useTabRootScreenWrapperProps/index.tsx               | 2 +-
 .../useTabRootScreenWrapperProps/types.ts                | 2 +-
 .../useNativeTabBarOptions/index.android.ts              | 1 -
 .../useNativeTabBarOptions/index.ios.ts                  | 1 -
 src/styles/index.ts                                      | 9 ---------
 src/styles/utils/index.ts                                | 1 -
 tests/ui/BaseSidebarScreenTest.tsx                       | 1 -
 tests/ui/InitialSettingsPageTest.tsx                     | 8 --------
 tests/ui/WorkspaceInitialPageTest.tsx                    | 2 --
 tests/unit/pages/HomePage.test.tsx                       | 7 -------
 10 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 5bffa89b7a7c..4516f58a67b8 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -19,7 +19,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
 
     return {
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
-        bottomContentStyle: shouldUseNarrowLayout ? styles.floatingTabBarOverlay : styles.overflowVisible,
+        bottomContentStyle: shouldUseNarrowLayout ? [styles.stickToBottom, styles.overflowVisible] : styles.overflowVisible,
         offlineIndicatorStyle: shouldUseNarrowLayout ? styles.floatingTabBarOfflineIndicator : undefined,
     };
 }
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
index 74130e388d00..44e8a56a8a2f 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/types.ts
@@ -1,7 +1,7 @@
 import type {ScreenWrapperContainerProps} from '@components/ScreenWrapper/ScreenWrapperContainer';
 import type {ScreenWrapperOfflineIndicatorsProps} from '@components/ScreenWrapper/ScreenWrapperOfflineIndicators';
 
-type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'includeSafeAreaPaddingBottom' | 'enableEdgeToEdgeBottomSafeAreaPadding'> &
+type TabRootScreenWrapperProps = Pick<ScreenWrapperContainerProps, 'bottomContent' | 'bottomContentStyle' | 'enableEdgeToEdgeBottomSafeAreaPadding'> &
     Pick<ScreenWrapperOfflineIndicatorsProps, 'offlineIndicatorStyle'>;
 
 export default TabRootScreenWrapperProps;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
index 41a9ac389e2e..02abcedda9f8 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
@@ -37,7 +37,6 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
 
     // The tint only reaches the labels, since the icons arrive already recolored (react-native-screens patch 003).
     const screenOptions: NativeBottomTabNavigationOptions = {
-        headerShown: false,
         tabBarActiveTintColor: theme.text,
         tabBarInactiveTintColor: theme.textSupporting,
         tabBarLabelStyle: {fontFamily: styles.textSmall.fontFamily, fontSize: styles.textSmall.fontSize},
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index 4b20eaeaa88c..bfd62e1d818c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -42,7 +42,6 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
     const labelMaxWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount - variables.iosNativeTabBarLabelInset;
 
     const screenOptions: NativeBottomTabNavigationOptions = {
-        headerShown: false,
         // The labels are drawn into the icons.
         tabBarLabel: '',
         tabBarActiveTintColor: theme.iconMenu,
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8d3d4fb04c6e..c2a77427eeac 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -792,15 +792,6 @@ const staticStyles = (theme: ThemeColors) =>
             height: variables.androidNativeTabBarHeight,
         },
 
-        // Lays a tab root screen's copy of the floating bar over the bottom of its content.
-        floatingTabBarOverlay: {
-            position: 'absolute',
-            right: 0,
-            bottom: 0,
-            left: 0,
-            overflow: 'visible',
-        },
-
         // The floating bar is laid over the bottom of a tab root screen, so the offline indicator floats above it
         // without shrinking the content that runs under the bar.
         floatingTabBarOfflineIndicator: {
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 73a5f734f2f6..285cdf62b964 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -2527,7 +2527,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         overflow: 'visible',
         marginTop: -(variables.floatingTabBarHeight + variables.floatingTabBarBottomInset + safeAreaPaddingBottom),
         paddingBottom: variables.floatingTabBarBottomInset + safeAreaPaddingBottom,
-        backgroundColor: theme.transparent,
     }),
 
     getStyleWithEnvSafeAreaPadding: (style: ViewStyle): ViewStyle => ({
diff --git a/tests/ui/BaseSidebarScreenTest.tsx b/tests/ui/BaseSidebarScreenTest.tsx
index 1daf35d456c8..eaf55a117f57 100644
--- a/tests/ui/BaseSidebarScreenTest.tsx
+++ b/tests/ui/BaseSidebarScreenTest.tsx
@@ -43,7 +43,6 @@ jest.mock('@components/ScreenWrapper', () => {
 });
 
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => () => null);
-jest.mock('@components/Navigation/TabBarBottomContent', () => () => null);
 jest.mock('@pages/inbox/sidebar/InboxTabSelector', () => () => null);
 jest.mock('@components/OptionsListSkeletonView', () => {
     const ReactModule = jest.requireActual<typeof React>('react');
diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index a0a0d8959c4e..df1b2a4cbd94 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -87,14 +87,6 @@ jest.mock('@components/AccountSwitcherSkeletonView', () => {
     return MockAccountSwitcherSkeletonView;
 });
 
-jest.mock('@components/Navigation/TabBarBottomContent', () => {
-    function MockTabBarBottomContent() {
-        return null;
-    }
-    MockTabBarBottomContent.displayName = 'TabBarBottomContent';
-    return MockTabBarBottomContent;
-});
-
 jest.mock('@components/Navigation/TopBarWithLoadingBar', () => {
     function MockTopBarWithLoadingBar() {
         return null;
diff --git a/tests/ui/WorkspaceInitialPageTest.tsx b/tests/ui/WorkspaceInitialPageTest.tsx
index 0da7ce4577d7..7d62d218c221 100644
--- a/tests/ui/WorkspaceInitialPageTest.tsx
+++ b/tests/ui/WorkspaceInitialPageTest.tsx
@@ -66,9 +66,7 @@ jest.mock('@hooks/useWorkspaceAccountID', () => jest.fn());
 jest.mock('@components/BlockingViews/FullPageNotFoundView', () => (props: {children: React.ReactNode; shouldShow: boolean}) => mockFullPageNotFoundView(props));
 jest.mock('@components/HeaderWithBackButton', () => jest.fn());
 jest.mock('@components/HighlightableMenuItem', () => jest.fn());
-jest.mock('@components/Navigation/TabBarBottomContent', () => jest.fn());
 jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps', () => () => ({}));
-jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
 jest.mock(
     '@components/OfflineWithFeedback',
     () =>
diff --git a/tests/unit/pages/HomePage.test.tsx b/tests/unit/pages/HomePage.test.tsx
index a36b0115beca..92959b872903 100644
--- a/tests/unit/pages/HomePage.test.tsx
+++ b/tests/unit/pages/HomePage.test.tsx
@@ -59,13 +59,6 @@ jest.mock('@components/ScrollView', () => {
     return MockScrollView;
 });
 jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps', () => () => ({}));
-jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
-jest.mock('@components/Navigation/NavigationTabBar', () => {
-    function MockNavigationTabBar() {
-        return null;
-    }
-    return MockNavigationTabBar;
-});
 jest.mock('@components/Navigation/QuickCreationActionsBar', () => {
     function MockQuickCreationActionsBar() {
         return null;

From ad3da72b00cf1efdedfceea4e57e10e96d1290ec Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 9 Oct 2026 16:14:11 +0200
Subject: [PATCH 392/781] refactor: one offline indicator style, shared Inbox
 dot color and tab icon builder, span cancel in the overlay, simpler selection
 and layout wrappers

---
 .../NavigationTabBar/InboxTabButton.tsx       | 13 +---
 .../index.ios.tsx                             |  2 +-
 .../useTabRootScreenWrapperProps/index.tsx    |  4 +-
 src/hooks/useInboxTabIndicatorStatus.ts       | 26 ++++++++
 .../NativeTabBarOverlay.tsx                   | 11 +++-
 .../NativeTabNavigator/tabIconRasterizer.ts   | 61 ++++++++-----------
 .../useNativeTabBarOptions/index.android.ts   | 26 +++-----
 .../useNativeTabBarOptions/index.ios.ts       | 42 ++++++-------
 .../useNativeTabNavigator.ts                  | 29 ++-------
 .../NativeTabNavigator/useTabAvatarImage.ts   |  1 +
 .../Navigators/TabNavigator.native.tsx        |  7 +--
 .../PlatformStackNavigation/ScreenLayout.tsx  |  9 +--
 src/styles/index.ts                           | 15 +----
 13 files changed, 113 insertions(+), 133 deletions(-)
 create mode 100644 src/hooks/useInboxTabIndicatorStatus.ts

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index 39257ebeba21..3902325f5668 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -1,11 +1,10 @@
 import {PressableWithFeedback} from '@components/Pressable';
 
+import useInboxTabIndicatorStatus from '@hooks/useInboxTabIndicatorStatus';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useRootNavigationState from '@hooks/useRootNavigationState';
-import {useChatTabBrickRoad} from '@hooks/useSidebarOrderedReports';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getTabNavigatorStateKey, isReportsTabPreloaded} from '@libs/Navigation/helpers/tabNavigatorUtils';
@@ -205,18 +204,10 @@ function WideInboxTabButton({selectedTab, statusIndicatorColor, accessibilityLab
 
 function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
     const styles = useThemeStyles();
-    const theme = useTheme();
     const {translate} = useLocalize();
-    const chatTabBrickRoad = useChatTabBrickRoad();
+    const {status: chatTabBrickRoad, indicatorColor: statusIndicatorColor} = useInboxTabIndicatorStatus();
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Inbox']);
 
-    let statusIndicatorColor: string | undefined;
-    if (chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO) {
-        statusIndicatorColor = theme.iconSuccessFill;
-    } else if (chatTabBrickRoad) {
-        statusIndicatorColor = theme.danger;
-    }
-
     const accessibilityLabel = chatTabBrickRoad ? `${translate('common.inbox')}. ${translate('common.yourReviewIsRequired')}` : translate('common.inbox');
 
     if (isWideLayout) {
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 4578b8da005e..3b815cf130c2 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -28,7 +28,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
 
     return {
         enableEdgeToEdgeBottomSafeAreaPadding: false,
-        offlineIndicatorStyle: styles.iosNativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
+        offlineIndicatorStyle: styles.tabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
     };
 }
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 4516f58a67b8..c2acf741d829 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -3,6 +3,8 @@ import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomCo
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import variables from '@styles/variables';
+
 import React from 'react';
 
 import type TabRootScreenWrapperProps from './types';
@@ -20,7 +22,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
     return {
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
         bottomContentStyle: shouldUseNarrowLayout ? [styles.stickToBottom, styles.overflowVisible] : styles.overflowVisible,
-        offlineIndicatorStyle: shouldUseNarrowLayout ? styles.floatingTabBarOfflineIndicator : undefined,
+        offlineIndicatorStyle: shouldUseNarrowLayout ? styles.tabBarOfflineIndicator(variables.floatingTabBarHeight + variables.floatingTabBarBottomInset) : undefined,
     };
 }
 
diff --git a/src/hooks/useInboxTabIndicatorStatus.ts b/src/hooks/useInboxTabIndicatorStatus.ts
new file mode 100644
index 000000000000..0420652be03a
--- /dev/null
+++ b/src/hooks/useInboxTabIndicatorStatus.ts
@@ -0,0 +1,26 @@
+import CONST from '@src/CONST';
+
+import {useChatTabBrickRoad} from './useSidebarOrderedReports';
+import useTheme from './useTheme';
+
+type InboxTabIndicatorStatusResult = {
+    /** The chat tab's brick road status, or undefined when no chat needs attention. */
+    status: ReturnType<typeof useChatTabBrickRoad>;
+
+    /** The indicator dot color: success for an info status, danger for anything else, none without a status. */
+    indicatorColor: string | undefined;
+};
+
+function useInboxTabIndicatorStatus(): InboxTabIndicatorStatusResult {
+    const theme = useTheme();
+    const status = useChatTabBrickRoad();
+
+    let indicatorColor: string | undefined;
+    if (status) {
+        indicatorColor = status === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
+    }
+
+    return {status, indicatorColor};
+}
+
+export default useInboxTabIndicatorStatus;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
index 827233ecc9b2..1328b8270df7 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NativeTabBarOverlay.tsx
@@ -8,13 +8,15 @@ import useOnyx from '@hooks/useOnyx';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import cancelTabNavigationSpans, {NAVIGATION_TAB_TO_SPANS} from '@libs/telemetry/cancelTabNavigationSpans';
+
 import NavigationTabBarFloatingActionButton from '@pages/inbox/sidebar/NavigationTabBarFloatingActionButton';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 
-import React from 'react';
+import React, {useEffect} from 'react';
 import {StyleSheet, View} from 'react-native';
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated';
 
@@ -30,6 +32,13 @@ function NativeTabBarOverlay({state, descriptors}: Pick<NativeTabLayoutProps, 's
     const {bottom: bottomInset} = useSafeAreaInsets();
     const activeRoute = state.routes[state.index];
     const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
+
+    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab. The new tab's span is started at
+    // the tap, before navigation, so it is kept. On wide layouts the JS side bar does this.
+    useEffect(() => {
+        cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
+    }, [selectedTab]);
+
     // The buttons follow whatever the navigator decided for the bar itself.
     const shouldShowNativeTabBar = !!activeRoute && descriptors[activeRoute.key]?.options.tabBarStyle?.display !== 'none';
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index 4c2efd1d9bd5..baeb69da5aaa 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -1,12 +1,14 @@
 import FontUtils from '@styles/utils/FontUtils';
+import variables from '@styles/variables';
 
-import type {NativeBottomTabIcon} from '@react-navigation/bottom-tabs/unstable';
+import type {NativeBottomTabIcon, NativeBottomTabNavigationOptions} from '@react-navigation/bottom-tabs/unstable';
 import type {SkCanvas, SkImage, SkParagraph, SkPath} from '@shopify/react-native-skia';
 
 import {BlendMode, ClipOp, FillType, FilterMode, FontWeight, ImageFormat, MipmapMode, Skia, TextAlign} from '@shopify/react-native-skia';
 import {PixelRatio} from 'react-native';
 
 import type {NativeTabGlyph, NativeTabName} from './NATIVE_TAB_GLYPHS';
+import type {TabAvatarImage} from './useTabAvatarImage';
 
 import NATIVE_TAB_GLYPHS from './NATIVE_TAB_GLYPHS';
 
@@ -15,20 +17,15 @@ type TabIconLayout = {
     glyphSize: number;
     /** Side of the account avatar's box. */
     avatarSize: number;
-    /** Radius of the status dot drawn at the content's top right corner. */
-    dotRadius: number;
-    /** Width of the transparent ring cut out of the content around the status dot. */
-    dotCutout: number;
-    /** Gap between the glyph box and the label drawn under it. */
-    labelGap: number;
-    /** Font size of the label drawn under the glyph. */
-    labelFontSize: number;
 };
 
 type TabIconLabel = {
     text: string;
     color: string;
     isBold: boolean;
+    fontSize: number;
+    /** Gap between the glyph box and the label. */
+    gap: number;
     /** Width of the tab's slot in the bar, past which the label is truncated with an ellipsis. */
     maxWidth: number;
 };
@@ -37,7 +34,7 @@ type TabIconParams = {
     /** The glyph drawn unless an avatar is given. */
     name: NativeTabName;
     color: string;
-    avatar?: {uri: string; image: SkImage};
+    avatar?: TabAvatarImage;
     dotColor?: string;
     label?: TabIconLabel;
 };
@@ -70,7 +67,7 @@ function getGlyphPaths(name: NativeTabName): SkPath[] {
 }
 
 /** A paragraph rather than a single font, because only a paragraph falls back to a system font for scripts Expensify Neue lacks. */
-function makeLabelParagraph({text, color, isBold, maxWidth}: TabIconLabel, fontSize: number, scale: number): SkParagraph {
+function makeLabelParagraph({text, color, isBold, fontSize, maxWidth}: TabIconLabel, scale: number): SkParagraph {
     const paragraph = Skia.ParagraphBuilder.Make({maxLines: 1, ellipsis: '…', textAlign: TextAlign.Left})
         .pushStyle({
             color: Skia.Color(color),
@@ -121,16 +118,16 @@ function drawCircularImage(canvas: SkCanvas, image: SkImage, left: number, top:
     circle.dispose();
 }
 
-function drawStatusDot(canvas: SkCanvas, right: number, top: number, radius: number, cutout: number, color: string) {
+/** A cutout rather than a border in the bar's color, because the iOS 26 bar is glass and has no single color. */
+function drawStatusDot(canvas: SkCanvas, right: number, top: number, scale: number, color: string) {
+    const radius = variables.nativeTabIconDotRadius * scale;
     const centerX = right - radius;
     const centerY = top + radius;
     const paint = Skia.Paint();
     paint.setAntiAlias(true);
-    if (cutout > 0) {
-        paint.setBlendMode(BlendMode.Clear);
-        canvas.drawCircle(centerX, centerY, radius + cutout, paint);
-        paint.setBlendMode(BlendMode.SrcOver);
-    }
+    paint.setBlendMode(BlendMode.Clear);
+    canvas.drawCircle(centerX, centerY, radius + variables.nativeTabIconDotCutout * scale, paint);
+    paint.setBlendMode(BlendMode.SrcOver);
     paint.setColor(Skia.Color(color));
     canvas.drawCircle(centerX, centerY, radius, paint);
     paint.dispose();
@@ -142,8 +139,8 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
     // With a label, every tab shares one row as tall as the avatar, so glyphs and the avatar share a centre and
     // every label lands at the same height.
     const rowSize = label ? Math.max(layout.glyphSize, layout.avatarSize) * scale : contentSize;
-    const labelTop = (rowSize + layout.glyphSize * scale) / 2 + layout.labelGap * scale;
-    const paragraph = label ? makeLabelParagraph(label, layout.labelFontSize, scale) : undefined;
+    const labelTop = (rowSize + layout.glyphSize * scale) / 2 + (label?.gap ?? 0) * scale;
+    const paragraph = label ? makeLabelParagraph(label, scale) : undefined;
     const labelWidth = paragraph?.getLongestLine() ?? 0;
     const labelHeight = paragraph?.getHeight() ?? 0;
     const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
@@ -164,7 +161,7 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
         drawGlyph(canvas, name, contentLeft, contentTop, contentSize, color);
     }
     if (dotColor) {
-        drawStatusDot(canvas, contentLeft + contentSize, contentTop, layout.dotRadius * scale, layout.dotCutout * scale, dotColor);
+        drawStatusDot(canvas, contentLeft + contentSize, contentTop, scale, dotColor);
     }
     if (paragraph) {
         paragraph.paint(canvas, (canvasWidth - labelWidth) / 2, labelTop);
@@ -190,19 +187,8 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
  */
 function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomTabIcon | undefined {
     const {name, color, avatar, dotColor, label} = params;
-    const key = [
-        name,
-        avatar?.uri ?? color,
-        dotColor,
-        label?.text,
-        label?.color,
-        label?.isBold,
-        label?.maxWidth,
-        layout.glyphSize,
-        layout.avatarSize,
-        layout.dotRadius,
-        layout.dotCutout,
-    ].join('|');
+    // The layout and the label's font are fixed per platform, so they are left out of the key.
+    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, label?.maxWidth].join('|');
     if (iconCache.has(key)) {
         return iconCache.get(key);
     }
@@ -214,5 +200,12 @@ function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomT
     return icon;
 }
 
-export default getTabIcon;
+/** Both selection states as images, given as a function, because React Navigation derives the selected icon only from a function. */
+function getTabBarIcon(layout: TabIconLayout, getParams: (isSelected: boolean) => TabIconParams): NativeBottomTabNavigationOptions['tabBarIcon'] {
+    const inactiveIcon = getTabIcon(layout, getParams(false));
+    const activeIcon = getTabIcon(layout, getParams(true));
+    return inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined;
+}
+
+export default getTabBarIcon;
 export type {TabIconLayout};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
index 02abcedda9f8..795b7afa62b9 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
@@ -2,7 +2,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
-import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import getTabBarIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
 import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
 import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
 
@@ -24,10 +24,6 @@ const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativ
 const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconBottomBar,
     avatarSize: variables.iconBottomBar,
-    dotRadius: variables.nativeTabIconDotRadius,
-    dotCutout: variables.nativeTabIconDotCutout,
-    labelGap: 0,
-    labelFontSize: 0,
 };
 
 function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
@@ -46,18 +42,16 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
         tabBarStyle: {display: shouldShowNativeTabBar ? 'flex' : 'none', backgroundColor: theme.appBG},
     };
 
-    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
+    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => ({
+        tabBarLabel: tabLabels[name],
         // The active indicator pill marks the selected tab, so the avatar is the same image in both selection states.
-        const tabAvatar = name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined;
-        const dotColor = dotColors[name];
-        const inactiveIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.icon, avatar: tabAvatar, dotColor});
-        const activeIcon = getTabIcon(TAB_ICON_LAYOUT, {name, color: theme.iconMenu, avatar: tabAvatar, dotColor});
-        return {
-            tabBarLabel: tabLabels[name],
-            // A function, because React Navigation derives the selected icon only from a function.
-            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
-        };
-    };
+        tabBarIcon: getTabBarIcon(TAB_ICON_LAYOUT, (isSelected) => ({
+            name,
+            color: isSelected ? theme.iconMenu : theme.icon,
+            avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
+            dotColor: dotColors[name],
+        })),
+    });
 
     return {screenOptions, getTabOptions};
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index bfd62e1d818c..f6142f252a13 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -2,7 +2,7 @@ import useTheme from '@hooks/useTheme';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import type {NativeTabName} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/NATIVE_TAB_GLYPHS';
-import getTabIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
+import getTabBarIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
 import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
 import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
 
@@ -21,11 +21,6 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconNativeTabBarIOS,
     // A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs.
     avatarSize: variables.avatarNativeTabBarIOS,
-    dotRadius: variables.nativeTabIconDotRadius,
-    // A cutout rather than a border in the bar's color, because the iOS 26 bar is glass and has no single color.
-    dotCutout: variables.nativeTabIconDotCutout,
-    labelGap: variables.nativeTabIconLabelGap,
-    labelFontSize: variables.fontSizeSmall,
 };
 
 /**
@@ -54,23 +49,24 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
         tabBarMinimizeBehavior: 'none',
     };
 
-    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => {
-        const getIcon = (isSelected: boolean) =>
-            getTabIcon(TAB_ICON_LAYOUT, {
-                name,
-                color: isSelected ? theme.iconMenu : theme.icon,
-                avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
-                dotColor: dotColors[name],
-                label: {text: tabLabels[name], color: isSelected ? theme.text : theme.textSupporting, isBold: isSelected, maxWidth: labelMaxWidth},
-            });
-        const inactiveIcon = getIcon(false);
-        const activeIcon = getIcon(true);
-        return {
-            tabBarIcon: inactiveIcon && activeIcon ? ({focused}) => (focused ? activeIcon : inactiveIcon) : undefined,
-            // The label is drawn into the icon, so VoiceOver reads it from here.
-            tabBarAccessibilityLabel: tabLabels[name],
-        };
-    };
+    const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => ({
+        tabBarIcon: getTabBarIcon(TAB_ICON_LAYOUT, (isSelected) => ({
+            name,
+            color: isSelected ? theme.iconMenu : theme.icon,
+            avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
+            dotColor: dotColors[name],
+            label: {
+                text: tabLabels[name],
+                color: isSelected ? theme.text : theme.textSupporting,
+                isBold: isSelected,
+                fontSize: variables.fontSizeSmall,
+                gap: variables.nativeTabIconLabelGap,
+                maxWidth: labelMaxWidth,
+            },
+        })),
+        // The label is drawn into the icon, so VoiceOver reads it from here.
+        tabBarAccessibilityLabel: tabLabels[name],
+    });
 
     return {screenOptions, getTabOptions};
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
index eb65e080c3ad..4d2de8177d63 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts
@@ -1,21 +1,17 @@
 import {useFullScreenBlockingViewState} from '@components/FullScreenBlockingViewContextProvider';
-import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
-import ROUTE_TO_NAVIGATION_TAB from '@components/Navigation/NavigationTabBar/ROUTE_TO_NAVIGATION_TAB';
 
 import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
+import useInboxTabIndicatorStatus from '@hooks/useInboxTabIndicatorStatus';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import {useChatTabBrickRoad} from '@hooks/useSidebarOrderedReports';
-import useTheme from '@hooks/useTheme';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
-import cancelTabNavigationSpans, {NAVIGATION_TAB_TO_SPANS} from '@libs/telemetry/cancelTabNavigationSpans';
 
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -30,7 +26,7 @@ import {isAnonymousSessionSelector} from '@selectors/Session';
 import {useEffect} from 'react';
 
 import getTabWithoutBarItem from './getTabWithoutBarItem';
-import {isInboxTabAtChatList} from './tabScreenListeners';
+import {isInboxTabAtChatList, isNativeTabSelectionEnabled} from './tabScreenListeners';
 import useIsWorkspacesTabRestored from './useIsWorkspacesTabRestored';
 
 /**
@@ -53,8 +49,7 @@ function useNativeTabNavigator() {
     const [isAnonymousUser = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector});
     const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const tabWithoutBarItem = getTabWithoutBarItem(isInsightsTabVisible);
-    const theme = useTheme();
-    const chatTabBrickRoad = useChatTabBrickRoad();
+    const {indicatorColor: inboxDotColor} = useInboxTabIndicatorStatus();
     const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
     const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
     const navigation = useNavigation();
@@ -66,7 +61,6 @@ function useNativeTabNavigator() {
     // mounts, so the nearest navigation listener context is still the parent stack's.
     const tabState = useNavigationState((parentState) => parentState.routes.find((parentRoute) => parentRoute.key === route.key)?.state);
     const activeTabRoute = isRealizedNavigationState(tabState) ? tabState.routes[tabState.index] : undefined;
-    const selectedTab = ROUTE_TO_NAVIGATION_TAB[activeTabRoute?.name ?? SCREENS.HOME] ?? NAVIGATION_TABS.HOME;
     // A tab with no item in the bar is drawn over the other tabs as a full screen, so the bar hides while it is focused.
     const isActiveTabWithoutBarItem = activeTabRoute?.name === tabWithoutBarItem;
     const shouldShowNativeTabBar = shouldUseNarrowLayout && isTabRouteAtRoot(activeTabRoute) && !isBlockingViewVisible && !isActiveTabWithoutBarItem;
@@ -74,10 +68,6 @@ function useNativeTabNavigator() {
     const isInboxAtChatList = isInboxTabAtChatList(getTabRoute(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR));
     const isWorkspacesTabRestored = useIsWorkspacesTabRestored(getTabRoute(NAVIGATORS.WORKSPACE_NAVIGATOR));
 
-    let inboxDotColor: string | undefined;
-    if (chatTabBrickRoad) {
-        inboxDotColor = chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger;
-    }
     const dotColors: Record<string, string | undefined> = {
         [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: inboxDotColor,
         [NAVIGATORS.WORKSPACE_NAVIGATOR]: workspacesIndicatorStatus ? workspacesIndicatorColor : undefined,
@@ -117,15 +107,6 @@ function useNativeTabNavigator() {
         Navigation.navigate(ROUTES.HOME, {forceReplace: true});
     }, [isInsightsTabFocusedWithoutBeta]);
 
-    // Cancel any in-flight tab-navigation span that doesn't match the new focused tab. The new tab's span is started at
-    // the tap, before navigation, so it is kept. On wide layouts the JS side bar does this.
-    useEffect(() => {
-        if (!shouldUseNarrowLayout) {
-            return;
-        }
-        cancelTabNavigationSpans(NAVIGATION_TAB_TO_SPANS[selectedTab]);
-    }, [selectedTab, shouldUseNarrowLayout]);
-
     // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
     // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
     // state by overriding the bottom-tab router's getInitialState, the same pattern SplitRouter
@@ -141,7 +122,9 @@ function useNativeTabNavigator() {
 
     const isAccountAvatarShown = shouldUseNarrowLayout && tabWithoutBarItem !== NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
 
-    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored};
+    const isTabSelectionEnabled = (routeName: string) => isNativeTabSelectionEnabled(routeName, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored});
+
+    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isTabSelectionEnabled};
 }
 
 export default useNativeTabNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
index 0e97954f4866..b38d210f3cd0 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage.ts
@@ -51,3 +51,4 @@ function useTabAvatarImage(isShown: boolean): TabAvatarImage | undefined {
 }
 
 export default useTabAvatarImage;
+export type {TabAvatarImage};
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
index 6972f020693c..6c4b97d1fedc 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx
@@ -15,7 +15,7 @@ import type {NativeTabName} from './NativeTabNavigator/NATIVE_TAB_GLYPHS';
 import type {NativeTabLayoutProps} from './NativeTabNavigator/NativeTabLayout';
 
 import NativeTabLayout from './NativeTabNavigator/NativeTabLayout';
-import tabScreenListeners, {isNativeTabSelectionEnabled} from './NativeTabNavigator/tabScreenListeners';
+import tabScreenListeners from './NativeTabNavigator/tabScreenListeners';
 import useNativeTabBarOptions from './NativeTabNavigator/useNativeTabBarOptions';
 import useNativeTabNavigator from './NativeTabNavigator/useNativeTabNavigator';
 import ReportsSplitNavigator from './ReportsSplitNavigator';
@@ -35,8 +35,7 @@ const HIDDEN_TAB_OPTIONS = {tabBarItemHidden: true};
 const renderNativeTabLayout = (props: NativeTabLayoutProps) => <NativeTabLayout {...props} />;
 
 function TabNavigator() {
-    const {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored} =
-        useNativeTabNavigator();
+    const {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isTabSelectionEnabled} = useNativeTabNavigator();
     const {screenOptions, getTabOptions} = useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels});
     // A tab with no bar item draws no icon.
     const getScreenOptions = ({route}: {route: {name: NativeTabName}}) =>
@@ -45,7 +44,7 @@ function TabNavigator() {
             : {
                   ...screenOptions,
                   ...getTabOptions(route.name),
-                  tabBarSelectionEnabled: isNativeTabSelectionEnabled(route.name, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored}),
+                  tabBarSelectionEnabled: isTabSelectionEnabled(route.name),
               };
 
     return (
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index bf0e8308a45b..c50b7a92b33a 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -29,13 +29,8 @@ function screenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBa
 
 // Same as screenLayoutWrapper above, but for bottom-tab navigators, JS and native. No cast needed here - their
 // `navigation` props' `addListener` structurally satisfies TransitionAwareNavigation.
-function bottomTabScreenLayoutWrapper({navigation, ...rest}: ScreenLayoutProps) {
-    return (
-        <ScreenLayout
-            {...rest}
-            navigation={navigation}
-        />
-    );
+function bottomTabScreenLayoutWrapper(props: ScreenLayoutProps) {
+    return <ScreenLayout {...props} />;
 }
 
 type ScreenLayoutProps = ScreenLayoutArgs<
diff --git a/src/styles/index.ts b/src/styles/index.ts
index c2a77427eeac..f43d80a9d9c5 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -792,16 +792,6 @@ const staticStyles = (theme: ThemeColors) =>
             height: variables.androidNativeTabBarHeight,
         },
 
-        // The floating bar is laid over the bottom of a tab root screen, so the offline indicator floats above it
-        // without shrinking the content that runs under the bar.
-        floatingTabBarOfflineIndicator: {
-            position: 'absolute',
-            right: 0,
-            bottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
-            left: 0,
-            backgroundColor: theme.appBG,
-        },
-
         // The gap between the floating bar and the bottom edge of the screen.
         floatingTabBarBottomInset: {
             paddingBottom: variables.floatingTabBarBottomInset,
@@ -6996,8 +6986,9 @@ const staticStyles = (theme: ThemeColors) =>
 
 const dynamicStyles = (theme: ThemeColors) =>
     ({
-        // Measured from the bottom of the screen, because only some tab roots pad the indicator's container with the inset.
-        iosNativeTabBarOfflineIndicator: (bottom: number) =>
+        // The tab bar is laid over the bottom of a tab root screen, so the offline indicator floats above it without
+        // shrinking the content that runs under the bar.
+        tabBarOfflineIndicator: (bottom: number) =>
             ({
                 position: 'absolute',
                 right: 0,

From c8bde9266b1080d2f7c934462cca4eb3d329195b Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Fri, 9 Oct 2026 16:25:21 +0200
Subject: [PATCH 393/781] Use stable report projections in thread row and
 action avatars

---
 src/components/ReportActionAvatars/index.tsx               | 3 ++-
 .../ReportActionAvatars/useReportActionAvatars.ts          | 7 ++++---
 src/pages/inbox/report/ReportActionItemThread.tsx          | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionAvatars/index.tsx b/src/components/ReportActionAvatars/index.tsx
index 3970c3121711..a90d735c6bff 100644
--- a/src/components/ReportActionAvatars/index.tsx
+++ b/src/components/ReportActionAvatars/index.tsx
@@ -17,6 +17,7 @@ import {sortIconsByName} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {getStableReportSelector} from '@src/selectors/Report';
 import type {InvitedEmailsToAccountIDs, Policy, Report, ReportAction} from '@src/types/onyx';
 import type {CardFeed} from '@src/types/onyx/CardFeeds';
 import type {Icon as IconType} from '@src/types/onyx/OnyxCommon';
@@ -125,7 +126,7 @@ function ReportActionAvatars({
 
     // reportID can be an empty string causing Onyx to fetch the whole collection
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const [reportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || undefined}`);
+    const [reportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || undefined}`, {selector: getStableReportSelector});
     // When the search hash changes, report from the snapshot will be undefined if it hasn't been fetched yet.
     // Therefore, we will fall back to reportProp while the data is being fetched.
     const report = reportFromOnyx ?? reportProp;
diff --git a/src/components/ReportActionAvatars/useReportActionAvatars.ts b/src/components/ReportActionAvatars/useReportActionAvatars.ts
index 05fecf1a87c8..a4320ee71678 100644
--- a/src/components/ReportActionAvatars/useReportActionAvatars.ts
+++ b/src/components/ReportActionAvatars/useReportActionAvatars.ts
@@ -33,6 +33,7 @@ import {buildUserIcon} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {getReportPolicyID, getStableReportSelector} from '@src/selectors/Report';
 import {getReportActionByIDSelector} from '@src/selectors/ReportAction';
 import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData';
 import type {InvitedEmailsToAccountIDs, OnyxInputOrEntry, Policy, Report, ReportAction} from '@src/types/onyx';
@@ -82,7 +83,7 @@ function useReportActionAvatars({
     const isReportAChatReport = report?.type === CONST.REPORT.TYPE.CHAT && report?.chatType !== CONST.REPORT.CHAT_TYPE.TRIP_ROOM;
 
     const chatReportID = report?.chatReportID ?? passedChatReportID;
-    const [reportChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);
+    const [reportChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, {selector: getStableReportSelector});
 
     const chatReport = isReportAChatReport ? report : reportChatReport;
     const iouReport = isReportAChatReport ? undefined : report;
@@ -100,7 +101,7 @@ function useReportActionAvatars({
     // Support tickets use the assigned rep's avatar, not the parent message's author.
     const action = passedAction ?? (isSupportTicket(report) ? undefined : derivedAction);
 
-    const [actionChildReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${action?.childReportID}`);
+    const [actionChildReportPolicyID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${action?.childReportID}`, {selector: getReportPolicyID});
 
     const isAReportPreviewAction = action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
 
@@ -114,7 +115,7 @@ function useReportActionAvatars({
 
     const reportPolicyID = iouReport?.policyID ?? chatReport?.policyID;
     const chatReportPolicyIDExists = chatReport?.policyID === CONST.POLICY.ID_FAKE || !chatReport?.policyID;
-    const changedPolicyID = actionChildReport?.policyID ?? iouReport?.policyID;
+    const changedPolicyID = actionChildReportPolicyID ?? iouReport?.policyID;
     const shouldUseChangedPolicyID = !!changedPolicyID && changedPolicyID !== (reportPolicyID ?? iouReport?.policyID);
     const retrievedPolicyID = chatReportPolicyIDExists ? reportPolicyID : chatReport?.policyID;
 
diff --git a/src/pages/inbox/report/ReportActionItemThread.tsx b/src/pages/inbox/report/ReportActionItemThread.tsx
index 4a11ab1825b6..133986df2a73 100644
--- a/src/pages/inbox/report/ReportActionItemThread.tsx
+++ b/src/pages/inbox/report/ReportActionItemThread.tsx
@@ -13,6 +13,7 @@ import {getParticipantsPersonalDetails} from '@libs/PersonalDetailsUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {getStableReportSelector} from '@src/selectors/Report';
 import type {Report, ReportAction} from '@src/types/onyx';
 
 import type {GestureResponderEvent} from 'react-native';
@@ -43,11 +44,11 @@ function ReportActionItemThread({report, reportAction, isHovered, onSecondaryInt
     const styles = useThemeStyles();
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const {translate, datetimeToCalendarTime} = useLocalize();
-    const [childReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportAction.childReportID}`);
+    const [childReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportAction.childReportID}`, {selector: getStableReportSelector});
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
-    const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
+    const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`, {selector: getStableReportSelector});
     const personalDetails = usePersonalDetails();
 
     const numberOfReplies = reportAction.childVisibleActionCount ?? 0;

From 7b02b2111ddd182182cc215d4e0d2504f9593356 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Fri, 9 Oct 2026 16:54:24 +0200
Subject: [PATCH 394/781] Fix chart tooltip unexpected behaviour on mobile
 devices

---
 src/CONST/index.ts                            |  1 -
 .../BarChart/VerticalBarChartContent.tsx      | 18 ++--
 .../Charts/LineChart/LineChartContent.tsx     | 27 ++++--
 .../Charts/PieChart/PieChartContent.tsx       | 48 +++++++---
 .../Charts/components/ChartTooltip.tsx        | 18 ++--
 .../Charts/components/ChartTooltipLayer.tsx   | 12 ++-
 .../Charts/hooks/useChartInteractions.ts      | 88 +++++++++++--------
 .../Charts/utils/pinnedChartTooltip.ts        | 39 ++++++++
 src/pages/Insights/InsightsDashboard.tsx      | 56 ++++++------
 src/pages/home/HomePage.tsx                   |  6 +-
 10 files changed, 202 insertions(+), 111 deletions(-)
 create mode 100644 src/components/Charts/utils/pinnedChartTooltip.ts

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 85a055b0fa60..bde832c72f9f 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6949,7 +6949,6 @@ const CONST = {
     },
     EVENTS: {
         SCROLLING: 'scrolling',
-        CHART_TOOLTIP_DISMISS: 'chartTooltipDismiss',
         TRANSITION_END_SCREEN_WRAPPER: 'transitionEndScreenWrapper',
     },
     SELECTION_BUTTON_POSITION: {
diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index d2b36f22b2ac..a7d5e98b3484 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -127,14 +127,15 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         return isWithinX && args.cursorY >= plotTop.get() && args.cursorY <= plotBottom.get();
     };
 
-    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, onChartMoved, onTooltipDismiss} = useChartInteractions({
-        handlePress: handleBarPress,
-        checkIsOver: checkIsOverBar,
-        isCursorOverLabel: shouldShowLabels ? isCursorOverLabel : undefined,
-        resolveLabelTouchX: shouldShowLabels ? findLabelCursorX : undefined,
-        chartBottom,
-        yZero,
-    });
+    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, onChartMoved, onTooltipDismiss, onChartTouchStart} =
+        useChartInteractions({
+            handlePress: handleBarPress,
+            checkIsOver: checkIsOverBar,
+            isCursorOverLabel: shouldShowLabels ? isCursorOverLabel : undefined,
+            resolveLabelTouchX: shouldShowLabels ? findLabelCursorX : undefined,
+            chartBottom,
+            yZero,
+        });
 
     const handleScaleChange = (xScale: Scale, yScale: Scale) => {
         yZero.set(yScale(0));
@@ -231,6 +232,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
             <Animated.View
                 style={[styles.chartContent, dynamicChartStyle, cursorStyle]}
                 onLayout={handleLayout}
+                onTouchStart={onChartTouchStart}
             >
                 {chartWidth > 0 && (
                     <CartesianChart
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index 1459457ac77a..d66b34fa88ab 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -168,14 +168,24 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         return isInPlotArea(args) && isCursorOverLabel(args, activeIndex);
     };
 
-    const {customGestures, setPointPositions, matchedIndex, isTooltipActive, isCursorOverClickable, initialTooltipPosition, activePointPosition, onChartMoved, onTooltipDismiss} =
-        useChartInteractions({
-            handlePress: handlePointPress,
-            checkIsOver: checkIsOverBand,
-            isCursorOverLabel: checkIsOverLabelInPlotArea,
-            resolveLabelTouchX: findLabelCursorX,
-            chartBottom,
-        });
+    const {
+        customGestures,
+        setPointPositions,
+        matchedIndex,
+        isTooltipActive,
+        isCursorOverClickable,
+        initialTooltipPosition,
+        activePointPosition,
+        onChartMoved,
+        onTooltipDismiss,
+        onChartTouchStart,
+    } = useChartInteractions({
+        handlePress: handlePointPress,
+        checkIsOver: checkIsOverBand,
+        isCursorOverLabel: checkIsOverLabelInPlotArea,
+        resolveLabelTouchX: findLabelCursorX,
+        chartBottom,
+    });
 
     const isActivePointHollow = useDerivedValue(() => isLastPointInProgress && matchedIndex.get() === data.length - 1);
 
@@ -295,6 +305,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
             <Animated.View
                 style={[styles.chartContent, dynamicChartStyle, cursorStyle]}
                 onLayout={handleLayout}
+                onTouchStart={onChartTouchStart}
             >
                 {chartWidth > 0 && (
                     <CartesianChart
diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 8513de1e983f..de5e1c677f38 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -3,6 +3,7 @@ import ChartTooltip from '@components/Charts/components/ChartTooltip';
 import {TOOLTIP_BAR_GAP, useChartLabelFormats, useTooltipData} from '@components/Charts/hooks';
 import type {ChartDataPoint, ChartProps, PieSlice, UnitPosition} from '@components/Charts/types';
 import {findSliceAtPosition, processDataIntoSlices} from '@components/Charts/utils';
+import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
 import VictoryTheme from '@components/Charts/VictoryTheme';
 import Text from '@components/Text';
 
@@ -12,7 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {LayoutChangeEvent} from 'react-native';
 
-import React, {useState} from 'react';
+import React, {useLayoutEffect, useState} from 'react';
 import {View} from 'react-native';
 import {Gesture, GestureDetector, PointerType} from 'react-native-gesture-handler';
 import Animated, {useSharedValue} from 'react-native-reanimated';
@@ -44,6 +45,8 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
     /** True while a slice tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
     const [isTouchPinned, setIsTouchPinned] = useState(false);
+    /** Point of the last touch tap */
+    const [touchedPoint, setTouchedPoint] = useState<{x: number; y: number}>();
     const [isHoveringOverPie, setIsHoveringOverPie] = useState(false);
 
     // Shared values for hover state
@@ -117,8 +120,16 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
         const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
         setActiveSliceIndex(sliceIndex);
         setIsTouchPinned(sliceIndex >= 0);
+        setTouchedPoint({x, y});
     };
 
+    useLayoutEffect(() => {
+        if (!touchedPoint) {
+            return;
+        }
+        tooltipPosition.set({x: touchedPoint.x, y: touchedPoint.y - TOOLTIP_BAR_GAP});
+    }, [touchedPoint, tooltipPosition]);
+
     const dismissTouchedSlice = () => {
         setActiveSliceIndex(-1);
         setIsTouchPinned(false);
@@ -164,22 +175,30 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
     // Tap gesture: touch toggles the tooltip, other pointers navigate on click
     const tapGesture = () =>
-        Gesture.Tap().onEnd((e) => {
-            'worklet';
+        Gesture.Tap()
+            .onFinalize((e, success) => {
+                'worklet';
 
-            if (e.pointerType === PointerType.TOUCH) {
-                tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
-                scheduleOnRN(showTouchedSlice, e.x, e.y);
-                return;
-            }
+                if (success || e.pointerType !== PointerType.TOUCH || !isTouchPinned) {
+                    return;
+                }
+                scheduleOnRN(dismissTouchedSlice);
+            })
+            .onEnd((e) => {
+                'worklet';
+
+                if (e.pointerType === PointerType.TOUCH) {
+                    scheduleOnRN(showTouchedSlice, e.x, e.y);
+                    return;
+                }
 
-            const {centerX, centerY} = pieGeometry;
-            const sliceIndex = findSliceAtPosition(e.x, e.y, centerX, centerY, radius, innerRadius, processedSlices);
+                const {centerX, centerY} = pieGeometry;
+                const sliceIndex = findSliceAtPosition(e.x, e.y, centerX, centerY, radius, innerRadius, processedSlices);
 
-            if (sliceIndex >= 0) {
-                scheduleOnRN(handleSlicePress, sliceIndex);
-            }
-        });
+                if (sliceIndex >= 0) {
+                    scheduleOnRN(handleSlicePress, sliceIndex);
+                }
+            });
 
     // Combined gestures - Race allows both hover and tap to work independently
     const combinedGesture = Gesture.Race(hoverGesture(), tapGesture());
@@ -224,6 +243,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                 <Animated.View
                     style={[styles.chartContent, isHoveringOverPie && styles.cursorPointer]}
                     onLayout={handleLayout}
+                    onTouchStart={() => markChartTouch(isTouchPinned ? dismissTouchedSlice : undefined)}
                 >
                     {processedSlices.length > 0 && (
                         <PolarChart
diff --git a/src/components/Charts/components/ChartTooltip.tsx b/src/components/Charts/components/ChartTooltip.tsx
index 46c6f219f256..94b931aa8217 100644
--- a/src/components/Charts/components/ChartTooltip.tsx
+++ b/src/components/Charts/components/ChartTooltip.tsx
@@ -1,4 +1,5 @@
 import {TOOLTIP_BAR_GAP} from '@components/Charts/hooks';
+import {pinChartTooltip, unpinChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import Text from '@components/Text';
 
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -8,15 +9,13 @@ import PopoverWithMeasuredContentUtils from '@libs/PopoverWithMeasuredContentUti
 
 import variables from '@styles/variables';
 
-import CONST from '@src/CONST';
-
 import type {ComponentRef} from 'react';
 import type {LayoutChangeEvent} from 'react-native';
 import type {DerivedValue, SharedValue} from 'react-native-reanimated';
 
 import {useIsFocused} from '@react-navigation/native';
 import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
-import {DeviceEventEmitter, View} from 'react-native';
+import {View} from 'react-native';
 import Animated, {useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
@@ -44,6 +43,9 @@ type ChartTooltipProps = {
     /** Whether the tooltip should be shown, treated as always shown when omitted */
     isVisible?: DerivedValue<boolean>;
 
+    /** Whether the rendered content belongs to the current target, so the old content is never drawn at the new position */
+    isContentCurrent?: DerivedValue<boolean>;
+
     /** Updates the hovered point after the chart is moved in the window (e.g. via scroll) by the given offset */
     onChartMoved?: (deltaX: number, deltaY: number) => void;
 
@@ -59,7 +61,7 @@ function getAmountContent(amount: string, percentage?: string): string {
     return `${amount} (${percentage})`;
 }
 
-function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, initialTooltipPosition, isVisible, onChartMoved, onDismiss}: ChartTooltipProps) {
+function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, initialTooltipPosition, isVisible, isContentCurrent, onChartMoved, onDismiss}: ChartTooltipProps) {
     const styles = useThemeStyles();
     const {windowWidth, windowHeight} = useWindowDimensions();
 
@@ -117,7 +119,7 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
 
     const isFocused = useIsFocused();
 
-    // A pinned tooltip has no hover to end it, so the screen's touch start (which still lets the touch through) hides it
+    // A pinned tooltip has no hover to end it, so it is registered for the screen's touch start to hide it
     useEffect(() => {
         if (!isShown || !onDismiss) {
             return;
@@ -128,8 +130,8 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
             onDismiss();
             return;
         }
-        const dismissListener = DeviceEventEmitter.addListener(CONST.EVENTS.CHART_TOOLTIP_DISMISS, onDismiss);
-        return () => dismissListener.remove();
+        pinChartTooltip(onDismiss);
+        return () => unpinChartTooltip(onDismiss);
     }, [isShown, isFocused, onDismiss]);
 
     const handleOriginChange = (x: number, y: number) => {
@@ -165,7 +167,7 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
         const topAbove = originY + y - height;
         const shiftedLeft = left + PopoverWithMeasuredContentUtils.computeHorizontalShift(left, width, windowWidth);
         const shiftedTop = topAbove + PopoverWithMeasuredContentUtils.computeVerticalShift(topAbove, height, windowHeight, 2 * TOOLTIP_BAR_GAP, true);
-        const isTooltipShown = (isVisible?.get() ?? true) && isOriginMeasured.get() && width > 0;
+        const isTooltipShown = (isVisible?.get() ?? true) && (isContentCurrent?.get() ?? true) && isOriginMeasured.get() && width > 0;
 
         return {
             left: Math.max(0, Math.min(windowWidth - width, shiftedLeft)),
diff --git a/src/components/Charts/components/ChartTooltipLayer.tsx b/src/components/Charts/components/ChartTooltipLayer.tsx
index 553b9a9740fb..33c6c44f11e5 100644
--- a/src/components/Charts/components/ChartTooltipLayer.tsx
+++ b/src/components/Charts/components/ChartTooltipLayer.tsx
@@ -3,8 +3,8 @@ import type {ChartDataPoint} from '@components/Charts/types';
 
 import type {DerivedValue, SharedValue} from 'react-native-reanimated';
 
-import React, {useState} from 'react';
-import {useAnimatedReaction} from 'react-native-reanimated';
+import React, {useLayoutEffect, useState} from 'react';
+import {useAnimatedReaction, useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
 import ChartTooltip from './ChartTooltip';
@@ -48,6 +48,13 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
         },
     );
 
+    // The target changes on the UI thread a frame before its content renders, so the tooltip stays hidden until both match
+    const renderedIndex = useSharedValue(-1);
+    useLayoutEffect(() => {
+        renderedIndex.set(activeDataIndex);
+    }, [activeDataIndex, renderedIndex]);
+    const isContentCurrent = useDerivedValue(() => matchedIndex.get() === renderedIndex.get());
+
     const tooltipData = useTooltipData(activeDataIndex, data, formatValue);
 
     if (!tooltipData) {
@@ -63,6 +70,7 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
             chartWidth={chartWidth}
             initialTooltipPosition={initialTooltipPosition}
             isVisible={isTooltipActive}
+            isContentCurrent={isContentCurrent}
             onChartMoved={onChartMoved}
             onDismiss={onDismiss}
         />
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 68bac6cfd827..8d6b83fb55b7 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -1,3 +1,5 @@
+import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
+
 import type {SharedValue} from 'react-native-reanimated';
 
 import {useCallback, useState} from 'react';
@@ -388,9 +390,16 @@ function useChartInteractions({
                 hideTooltip();
             });
 
+    const dismissTouchTooltip = () => {
+        hideTooltip();
+        // Clearing the target unmounts the tooltip, so the next tap mounts a fresh one instead of revealing the old content for a frame
+        applyTargetIndex(-1);
+        setIsTouchPinned(false);
+    };
+
     /**
      * Touch taps show the tooltip instead of drilling in, since touch devices have no hover.
-     * While it is shown, the next touch anywhere on the screen hides it.
+     * While it is shown, a tap on this chart switches it and a touch anywhere else hides it.
      */
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';
@@ -402,52 +411,55 @@ function useChartInteractions({
         applyTargetIndex(targetIndex);
         const isOverTarget = updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
         if (!isOverTarget) {
-            hideTooltip();
+            scheduleOnRN(dismissTouchTooltip);
             return;
         }
         scheduleOnRN(setIsTouchPinned, true);
     };
 
-    const dismissTouchTooltip = () => {
-        hideTooltip();
-        // Clearing the target unmounts the tooltip, so the next tap mounts a fresh one instead of revealing the old content for a frame
-        applyTargetIndex(-1);
-        setIsTouchPinned(false);
-    };
-
     /**
      * Tap gesture. Resolves the nearest data point entirely on the UI thread.
      * Touch taps show the tooltip; other pointers schedule handlePress on the JS thread if the cursor is over the target.
      */
     const tapGesture = () =>
-        Gesture.Tap().onEnd((e) => {
-            'worklet';
-
-            const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
-            const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
-            chartInteractionState.cursor.x.set(cursorX);
-            chartInteractionState.cursor.y.set(cursorY);
-            if (e.pointerType === PointerType.TOUCH) {
-                handleTouchTap(cursorX, cursorY);
-                return;
-            }
-            const ox = pointOX.get();
-            const oy = pointOY.get();
-            const idx = getResolvedTargetIndex(cursorX, cursorY, cursorX);
-            applyTargetIndex(idx);
-            if (idx < 0) {
-                return;
-            }
-            const targetX = ox.at(idx) ?? 0;
-            const targetY = oy.at(idx) ?? 0;
-            const currentChartBottom = chartBottom?.get() ?? 0;
-            const hitTestArgs = getHitTestArgs(idx, cursorX, cursorY, targetX, targetY, currentChartBottom);
-            const isClickable = (checkIsClickable ?? checkIsOver)(hitTestArgs);
-            updateInteractionFlags(idx, cursorX, cursorY, currentChartBottom);
-            if (isClickable) {
-                scheduleOnRN(handlePress, idx);
-            }
-        });
+        Gesture.Tap()
+            // A touch on this chart that turns into a scroll leaves the pinned tooltip to the chart, so the chart hides it
+            .onFinalize((e, success) => {
+                'worklet';
+
+                if (success || e.pointerType !== PointerType.TOUCH || !isTouchPinned) {
+                    return;
+                }
+                scheduleOnRN(dismissTouchTooltip);
+            })
+            .onEnd((e) => {
+                'worklet';
+
+                const cursorX = normalizeChartCoordinate(e.x, coordinateScale);
+                const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
+                chartInteractionState.cursor.x.set(cursorX);
+                chartInteractionState.cursor.y.set(cursorY);
+                if (e.pointerType === PointerType.TOUCH) {
+                    handleTouchTap(cursorX, cursorY);
+                    return;
+                }
+                const ox = pointOX.get();
+                const oy = pointOY.get();
+                const idx = getResolvedTargetIndex(cursorX, cursorY, cursorX);
+                applyTargetIndex(idx);
+                if (idx < 0) {
+                    return;
+                }
+                const targetX = ox.at(idx) ?? 0;
+                const targetY = oy.at(idx) ?? 0;
+                const currentChartBottom = chartBottom?.get() ?? 0;
+                const hitTestArgs = getHitTestArgs(idx, cursorX, cursorY, targetX, targetY, currentChartBottom);
+                const isClickable = (checkIsClickable ?? checkIsOver)(hitTestArgs);
+                updateInteractionFlags(idx, cursorX, cursorY, currentChartBottom);
+                if (isClickable) {
+                    scheduleOnRN(handlePress, idx);
+                }
+            });
 
     /**
      * Raw tooltip positioning data.
@@ -497,6 +509,8 @@ function useChartInteractions({
         onChartMoved,
         /** Hides the tooltip pinned by a touch tap, undefined while nothing is pinned */
         onTooltipDismiss: isTouchPinned ? dismissTouchTooltip : undefined,
+        /** Marks a touch on this chart, so the screen's touch start keeps the tooltip and lets the tap switch it */
+        onChartTouchStart: () => markChartTouch(isTouchPinned ? dismissTouchTooltip : undefined),
     };
 }
 
diff --git a/src/components/Charts/utils/pinnedChartTooltip.ts b/src/components/Charts/utils/pinnedChartTooltip.ts
new file mode 100644
index 000000000000..01e1eba77527
--- /dev/null
+++ b/src/components/Charts/utils/pinnedChartTooltip.ts
@@ -0,0 +1,39 @@
+/** Hides the tooltip pinned by a touch tap */
+let dismissPinnedTooltip: (() => void) | undefined;
+
+/** Tooltip whose chart received the current touch */
+let touchedTooltip: (() => void) | undefined;
+
+/** Pins the given tooltip and hides the previous one */
+function pinChartTooltip(dismiss: () => void) {
+    if (dismissPinnedTooltip !== dismiss) {
+        dismissPinnedTooltip?.();
+    }
+    dismissPinnedTooltip = dismiss;
+}
+
+/** Forgets the given tooltip if it is still the pinned one */
+function unpinChartTooltip(dismiss: () => void) {
+    if (dismissPinnedTooltip !== dismiss) {
+        return;
+    }
+    dismissPinnedTooltip = undefined;
+}
+
+function markChartTouch(dismiss: (() => void) | undefined) {
+    touchedTooltip = dismiss;
+}
+
+/** Hides the pinned tooltip, unless the touch landed on its own chart */
+function dismissPinnedChartTooltip() {
+    const isOwnChartTouch = !!touchedTooltip && touchedTooltip === dismissPinnedTooltip;
+    touchedTooltip = undefined;
+    if (isOwnChartTouch) {
+        return;
+    }
+    const dismiss = dismissPinnedTooltip;
+    dismissPinnedTooltip = undefined;
+    dismiss?.();
+}
+
+export {pinChartTooltip, unpinChartTooltip, markChartTouch, dismissPinnedChartTooltip};
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index c2bfa46fe794..ab73d3e3f910 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,5 +1,6 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
+import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
@@ -29,7 +30,7 @@ import type {InsightsDashboardID} from '@src/types/onyx';
 
 import {useIsFocused} from '@react-navigation/native';
 import React, {useEffect, useEffectEvent} from 'react';
-import {DeviceEventEmitter, View} from 'react-native';
+import {View} from 'react-native';
 
 import type {InsightsFilters} from './insightsFilters';
 import type {InsightsDashboardChart, InsightsDashboardState} from './resolveDashboardState';
@@ -127,6 +128,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
         <ScrollView
             style={styles.insightsDashboardScrollView}
             onScroll={triggerScrollEvent}
+            onTouchStart={dismissPinnedChartTooltip}
             contentContainerStyle={[styles.flexGrow1, pageGutter, styles.pb5]}
             addBottomSafeAreaPadding
         >
@@ -166,7 +168,6 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {translate} = useLocalize();
-    const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
     const {login} = useCurrentUserPersonalDetails();
@@ -212,37 +213,32 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const state = getDashboardState(dashboard, isOffline, charts);
 
     return (
-        <View
-            style={styles.flex1}
-            onTouchStart={() => DeviceEventEmitter.emit(CONST.EVENTS.CHART_TOOLTIP_DISMISS)}
+        <ScreenWrapper
+            shouldShowOfflineIndicatorInWideScreen
+            enableEdgeToEdgeBottomSafeAreaPadding={false}
+            bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
+            testID="InsightsPage"
         >
-            <ScreenWrapper
-                shouldShowOfflineIndicatorInWideScreen
-                enableEdgeToEdgeBottomSafeAreaPadding={false}
-                bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
-                testID="InsightsPage"
-            >
-                <TopBar
-                    breadcrumbLabel={translate('common.insights')}
-                    shouldDisplayHelpButton
-                />
-                {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
-                    <InsightsPageControls
-                        filters={filters}
-                        defaultFilters={defaultFilters}
-                        onChange={setFilters}
-                    />
-                )}
-                <InsightsDashboardContent
-                    state={state}
-                    headlineChart={headlineChart}
-                    supportingCharts={supportingCharts}
+            <TopBar
+                breadcrumbLabel={translate('common.insights')}
+                shouldDisplayHelpButton
+            />
+            {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
+                <InsightsPageControls
                     filters={filters}
-                    onRetry={requestDashboard}
-                    onGroupByChange={(groupBy) => setFilters({groupBy})}
+                    defaultFilters={defaultFilters}
+                    onChange={setFilters}
                 />
-            </ScreenWrapper>
-        </View>
+            )}
+            <InsightsDashboardContent
+                state={state}
+                headlineChart={headlineChart}
+                supportingCharts={supportingCharts}
+                filters={filters}
+                onRetry={requestDashboard}
+                onGroupByChange={(groupBy) => setFilters({groupBy})}
+            />
+        </ScreenWrapper>
     );
 }
 
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 4e11ee4b568f..8a21ceaad301 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,3 +1,4 @@
+import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
@@ -19,7 +20,6 @@ import openHomePage from '@libs/actions/HomePage';
 
 import variables from '@styles/variables';
 
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import type {ComponentRef} from 'react';
@@ -27,7 +27,7 @@ import type {ComponentRef} from 'react';
 import {PortalHost} from '@gorhom/portal';
 import {useFocusEffect} from '@react-navigation/native';
 import {useRef, useState} from 'react';
-import {DeviceEventEmitter, View} from 'react-native';
+import {View} from 'react-native';
 
 import EarlyRenewalOfferSection from './EarlyRenewalOfferSection';
 import ForYouSection from './ForYouSection';
@@ -137,7 +137,6 @@ function HomePage() {
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
-            onTouchStart={() => DeviceEventEmitter.emit(CONST.EVENTS.CHART_TOOLTIP_DISMISS)}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
@@ -158,6 +157,7 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
+                        onTouchStart={dismissPinnedChartTooltip}
                         contentContainerStyle={[styles.homePageContentContainer, pageGutter]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"

From e6470e3382709a8f0f4bb02940cf9533860e3e6c Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Fri, 9 Oct 2026 16:21:49 +0100
Subject: [PATCH 395/781] fix: sync commuter exclusion unit optimistically

---
 src/libs/actions/Policy/DistanceRate.ts       | 25 ++++++-
 .../PolicyDistanceRateUnitPage.tsx            | 11 ++-
 tests/unit/DistanceRateTest.ts                | 68 ++++++++++++++++++-
 3 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index 9917ea5bf656..7f95f5727604 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -261,7 +261,12 @@ function clearPolicyDistanceRateErrorFields(policyID: string, customUnitID: stri
     });
 }
 
-function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
+function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit, previousCommuterExclusions?: CommuterExclusions) {
+    const newDistanceUnit = newCustomUnit.attributes?.unit;
+    const shouldUpdateCommuterExclusionUnit =
+        previousCommuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE && typeof previousCommuterExclusions.fixedDistance === 'number' && !!newDistanceUnit;
+    const optimisticCommuterExclusions = shouldUpdateCommuterExclusionUnit ? {...previousCommuterExclusions, fixedDistanceUnit: newDistanceUnit} : undefined;
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -273,6 +278,13 @@ function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomU
                         pendingFields: {attributes: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
                     },
                 },
+                ...(optimisticCommuterExclusions
+                    ? {
+                          commuterExclusions: optimisticCommuterExclusions,
+                          pendingFields: {commuterExclusions: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                          errorFields: {commuterExclusions: null},
+                      }
+                    : {}),
             },
         },
     ];
@@ -287,6 +299,7 @@ function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomU
                         pendingFields: {attributes: null},
                     },
                 },
+                ...(optimisticCommuterExclusions ? {pendingFields: {commuterExclusions: null}} : {}),
             },
         },
     ];
@@ -303,6 +316,16 @@ function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomU
                         pendingFields: {attributes: null},
                     },
                 },
+                ...(optimisticCommuterExclusions
+                    ? {
+                          commuterExclusions: {
+                              ...previousCommuterExclusions,
+                              fixedDistanceUnit: previousCommuterExclusions?.fixedDistanceUnit ?? null,
+                          },
+                          pendingFields: {commuterExclusions: null},
+                          errorFields: {commuterExclusions: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                      }
+                    : {}),
             },
         },
     ];
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx
index a8496ed73ef0..2a4bb089e974 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx
@@ -32,7 +32,14 @@ function PolicyDistanceRateUnitPage({route}: PolicyDistanceRateUnitPageProps) {
     const policyID = route.params.policyID;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [customUnit] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: (policy) => getDistanceRateCustomUnit(policy)});
+    // eslint-disable-next-line rulesdir/no-inline-useOnyx-selector
+    const [distanceRateData] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        selector: (policy) => ({
+            customUnit: getDistanceRateCustomUnit(policy),
+            commuterExclusions: policy?.commuterExclusions,
+        }),
+    });
+    const customUnit = distanceRateData?.customUnit;
 
     const FullPageBlockingView = !customUnit ? FullPageOfflineBlockingView : View;
 
@@ -41,7 +48,7 @@ function PolicyDistanceRateUnitPage({route}: PolicyDistanceRateUnitPageProps) {
             return;
         }
         const attributes = {...customUnit.attributes, unit: unit.value};
-        setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes});
+        setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes}, distanceRateData?.commuterExclusions);
         Navigation.goBack(ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.getRoute(policyID));
     };
 
diff --git a/tests/unit/DistanceRateTest.ts b/tests/unit/DistanceRateTest.ts
index f25bc3200e03..d5f62f603a3e 100644
--- a/tests/unit/DistanceRateTest.ts
+++ b/tests/unit/DistanceRateTest.ts
@@ -1,6 +1,12 @@
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
-import {deletePolicyDistanceRates, enablePolicyDistanceRates, setEmployeeWorkArrangement, setWorkspaceDistanceAutoUpdate} from '@libs/actions/Policy/DistanceRate';
+import {
+    deletePolicyDistanceRates,
+    enablePolicyDistanceRates,
+    setEmployeeWorkArrangement,
+    setPolicyDistanceRatesUnit,
+    setWorkspaceDistanceAutoUpdate,
+} from '@libs/actions/Policy/DistanceRate';
 import * as API from '@libs/API';
 import {pause, resetQueue} from '@libs/Network/SequentialQueue';
 import {isGovernmentRateUnmodified} from '@libs/PolicyDistanceRatesUtils';
@@ -386,6 +392,66 @@ describe('DistanceRate', () => {
         });
     });
 
+    describe('setPolicyDistanceRatesUnit', () => {
+        const customUnitID = '5A55C2B68DDCB';
+
+        function getPolicyFromOnyx(policyID: string): Promise<Policy> {
+            return new Promise<Policy>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const,
+                    callback: (value) => {
+                        if (!value) {
+                            return;
+                        }
+                        Onyx.disconnect(connection);
+                        resolve(value);
+                    },
+                });
+            });
+        }
+
+        afterEach(() => {
+            resetQueue();
+            return Onyx.clear();
+        });
+
+        it('optimistically updates the commuter exclusion unit without converting its distance', async () => {
+            // Given a fixed-distance commuter exclusion saved in miles
+            const customUnit: CustomUnit = {
+                customUnitID,
+                name: 'Distance',
+                enabled: true,
+                rates: {},
+                attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            };
+            const policy: Policy = {
+                ...createRandomPolicy(5),
+                customUnits: {[customUnitID]: customUnit},
+                commuterExclusions: {
+                    method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE,
+                    fixedDistance: 5,
+                    fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+                },
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+
+            // When the workspace unit changes while the request is queued offline
+            pause();
+            setPolicyDistanceRatesUnit(policy.id, customUnit, {...customUnit, attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS}}, policy.commuterExclusions);
+            await waitForBatchedUpdates();
+
+            // Then both displayed units update immediately while the configured distance stays unchanged
+            const optimisticPolicy = await getPolicyFromOnyx(policy.id);
+            expect(optimisticPolicy.customUnits?.[customUnitID].attributes?.unit).toBe(CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS);
+            expect(optimisticPolicy.commuterExclusions).toMatchObject({
+                method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE,
+                fixedDistance: 5,
+                fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS,
+            });
+            expect(optimisticPolicy.pendingFields?.commuterExclusions).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+        });
+    });
+
     describe('setEmployeeWorkArrangement', () => {
         const member1AccountID = 11;
         const member2AccountID = 12;

From 20d87a3cc556929ba54a43e9efcf5440d2b1b292 Mon Sep 17 00:00:00 2001
From: Fedi Rajhi <fedirjh@gmail.com>
Date: Fri, 9 Oct 2026 16:34:38 +0100
Subject: [PATCH 396/781] test: cover commuter exclusion unit update outcomes

---
 tests/unit/DistanceRateTest.ts | 117 +++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/tests/unit/DistanceRateTest.ts b/tests/unit/DistanceRateTest.ts
index 044e99994322..c61477e32742 100644
--- a/tests/unit/DistanceRateTest.ts
+++ b/tests/unit/DistanceRateTest.ts
@@ -548,6 +548,123 @@ describe('DistanceRate', () => {
             });
             expect(optimisticPolicy.pendingFields?.commuterExclusions).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
         });
+
+        it('clears the commuter exclusion pending state when changing the unit succeeds', async () => {
+            const customUnit: CustomUnit = {
+                customUnitID,
+                name: 'Distance',
+                enabled: true,
+                rates: {},
+                attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            };
+            const commuterExclusions = {
+                method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE,
+                fixedDistance: 5,
+                fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+            };
+            const policy: Policy = {...createRandomPolicy(5), customUnits: {[customUnitID]: customUnit}, commuterExclusions};
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+
+            const mockFetch = TestHelper.createGlobalFetchMock();
+            const originalFetch = global.fetch;
+            global.fetch = mockFetch;
+            try {
+                setPolicyDistanceRatesUnit(policy.id, customUnit, {...customUnit, attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS}}, commuterExclusions);
+                await waitForBatchedUpdates();
+            } finally {
+                global.fetch = originalFetch;
+            }
+
+            const updatedPolicy = await getPolicyFromOnyx(policy.id);
+            expect(updatedPolicy.commuterExclusions).toMatchObject({fixedDistance: 5, fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS});
+            expect(updatedPolicy.pendingFields?.commuterExclusions).toBeUndefined();
+            expect(updatedPolicy.errorFields?.commuterExclusions).toBeUndefined();
+        });
+
+        it('restores the commuter exclusion unit and sets an error when changing the unit fails', async () => {
+            const customUnit: CustomUnit = {
+                customUnitID,
+                name: 'Distance',
+                enabled: true,
+                rates: {},
+                attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            };
+            const commuterExclusions = {
+                method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE,
+                fixedDistance: 5,
+                fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+            };
+            const policy: Policy = {...createRandomPolicy(5), customUnits: {[customUnitID]: customUnit}, commuterExclusions};
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+
+            const mockFetch = TestHelper.createGlobalFetchMock();
+            const originalFetch = global.fetch;
+            global.fetch = mockFetch;
+            mockFetch.fail();
+            try {
+                setPolicyDistanceRatesUnit(policy.id, customUnit, {...customUnit, attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS}}, commuterExclusions);
+                await waitForBatchedUpdates();
+            } finally {
+                global.fetch = originalFetch;
+            }
+
+            const revertedPolicy = await getPolicyFromOnyx(policy.id);
+            expect(revertedPolicy.commuterExclusions).toMatchObject({fixedDistance: 5, fixedDistanceUnit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES});
+            expect(revertedPolicy.pendingFields?.commuterExclusions).toBeUndefined();
+            expect(revertedPolicy.errorFields?.commuterExclusions).toBeDefined();
+        });
+
+        it('removes the optimistic commuter exclusion unit when the original unit was unset', async () => {
+            const customUnit: CustomUnit = {
+                customUnitID,
+                name: 'Distance',
+                enabled: true,
+                rates: {},
+                attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            };
+            const commuterExclusions = {
+                method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE,
+                fixedDistance: 5,
+            };
+            const policy: Policy = {...createRandomPolicy(5), customUnits: {[customUnitID]: customUnit}, commuterExclusions};
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+
+            const mockFetch = TestHelper.createGlobalFetchMock();
+            const originalFetch = global.fetch;
+            global.fetch = mockFetch;
+            mockFetch.fail();
+            try {
+                setPolicyDistanceRatesUnit(policy.id, customUnit, {...customUnit, attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS}}, commuterExclusions);
+                await waitForBatchedUpdates();
+            } finally {
+                global.fetch = originalFetch;
+            }
+
+            const revertedPolicy = await getPolicyFromOnyx(policy.id);
+            expect(revertedPolicy.commuterExclusions).toMatchObject({fixedDistance: 5});
+            expect(revertedPolicy.commuterExclusions?.fixedDistanceUnit).toBeUndefined();
+            expect(revertedPolicy.errorFields?.commuterExclusions).toBeDefined();
+        });
+
+        it('does not update commuter exclusions when none are configured', async () => {
+            const customUnit: CustomUnit = {
+                customUnitID,
+                name: 'Distance',
+                enabled: true,
+                rates: {},
+                attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            };
+            const policy: Policy = {...createRandomPolicy(5), customUnits: {[customUnitID]: customUnit}};
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+
+            pause();
+            setPolicyDistanceRatesUnit(policy.id, customUnit, {...customUnit, attributes: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS}});
+            await waitForBatchedUpdates();
+
+            const updatedPolicy = await getPolicyFromOnyx(policy.id);
+            expect(updatedPolicy.commuterExclusions).toBeUndefined();
+            expect(updatedPolicy.pendingFields?.commuterExclusions).toBeUndefined();
+        });
     });
 
     describe('setEmployeeWorkArrangement', () => {

From bea00efc4ad6a8ed52263378bc2c30090c6523e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 9 Oct 2026 18:20:02 +0200
Subject: [PATCH 397/781] Drop repack min-release-age excludes: npm ci installs
 from the lockfile, the age gate does not fire

---
 .npmrc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.npmrc b/.npmrc
index 7066c50c4ef6..0917984fd816 100644
--- a/.npmrc
+++ b/.npmrc
@@ -11,9 +11,3 @@ min-release-age-exclude[]=react-fast-pdf
 min-release-age-exclude[]=react-native-key-command
 min-release-age-exclude[]=react-native-qrcode-svg
 
-# Temporary: pin of @callstack/repack@5.4.1 predates the age window.
-# Remove these entries once a dependency on 5.4.1 has been installable for 7+ days.
-min-release-age-exclude[]=@callstack/repack
-min-release-age-exclude[]=@callstack/repack-dev-server
-min-release-age-exclude[]=@callstack/repack-plugin-expo-modules
-min-release-age-exclude[]=@callstack/repack-plugin-reanimated

From 95635a80473468d0d7b36571468f9bc1f11f5867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 9 Oct 2026 18:30:22 +0200
Subject: [PATCH 398/781] Remove trailing blank line left in .npmrc

---
 .npmrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.npmrc b/.npmrc
index 0917984fd816..2a14ea859d36 100644
--- a/.npmrc
+++ b/.npmrc
@@ -10,4 +10,3 @@ min-release-age-exclude[]=@expensify/react-native-wallet
 min-release-age-exclude[]=react-fast-pdf
 min-release-age-exclude[]=react-native-key-command
 min-release-age-exclude[]=react-native-qrcode-svg
-

From b4d4012a2b73f55a208ebae136d12df24e25e2c0 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Fri, 9 Oct 2026 19:00:29 +0200
Subject: [PATCH 399/781] styles

---
 src/components/AddressForm.tsx                | 274 ++++++++++--------
 .../workspace/WorkspaceOfficeLocationForm.tsx |  49 ++--
 2 files changed, 175 insertions(+), 148 deletions(-)

diff --git a/src/components/AddressForm.tsx b/src/components/AddressForm.tsx
index 02749b7f14cb..e3a3a5994643 100644
--- a/src/components/AddressForm.tsx
+++ b/src/components/AddressForm.tsx
@@ -11,7 +11,7 @@ import INPUT_IDS from '@src/types/form/HomeAddressForm';
 import type {ReactNode} from 'react';
 
 import {CONST as COMMON_CONST} from 'expensify-common';
-import React, {useCallback} from 'react';
+import React, {createContext, useCallback, useContext} from 'react';
 import {View} from 'react-native';
 
 import type {FormInputErrors, FormOnyxValues} from './Form/types';
@@ -65,13 +65,10 @@ type AddressFormProps<TFormID extends AddressFormID> = {
     /** A unique Onyx key identifying the form */
     formID: TFormID;
 
-    /** Inputs of the same form rendered above the address fields */
-    inputsBeforeAddress?: ReactNode;
+    /** The inputs of the form, which place the address inputs with `<AddressForm.Fields />`. Defaults to the address inputs alone. */
+    children?: ReactNode;
 
-    /** Inputs of the same form rendered below the address fields */
-    inputsAfterAddress?: ReactNode;
-
-    /** Validates the inputs added above or below the address fields. Its errors are added to the address errors. */
+    /** Validates the inputs the form adds to the address inputs. Its errors are added to the address errors. */
     validate?: (values: FormOnyxValues<TFormID>) => Record<string, string>;
 
     /** Whether to hide the country selector (e.g. when country cannot be changed) */
@@ -98,6 +95,146 @@ type AddressFormProps<TFormID extends AddressFormID> = {
     addBottomSafeAreaPadding?: boolean;
 };
 
+/** The values the address inputs start from and report changes to, shared by AddressForm with its AddressForm.Fields */
+type AddressFieldsSettings = {
+    city: string;
+    country: Country | '';
+    state: string;
+    street1: string;
+    street2: string;
+    zip: string;
+    onAddressChanged: (value: unknown, key: unknown) => void;
+    shouldSaveDraft: boolean;
+    shouldHideCountrySelector: boolean;
+};
+
+const AddressFieldsContext = createContext<AddressFieldsSettings>({
+    city: '',
+    country: '',
+    state: '',
+    street1: '',
+    street2: '',
+    zip: '',
+    onAddressChanged: () => {},
+    shouldSaveDraft: false,
+    shouldHideCountrySelector: false,
+});
+
+/** The address inputs of an AddressForm */
+function AddressFormFields() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {city, country, state, street1, street2, zip, onAddressChanged, shouldSaveDraft, shouldHideCountrySelector} = useContext(AddressFieldsContext);
+
+    const zipSampleFormat = (country && (COMMON_CONST.COUNTRY_ZIP_REGEX_DATA[country] as CountryZipRegex)?.samples) ?? '';
+
+    const zipFormat = translate('common.zipCodeExampleFormat', zipSampleFormat);
+
+    const isUSAForm = country === CONST.COUNTRY.US;
+
+    return (
+        <>
+            <View>
+                <InputWrapper
+                    InputComponent={AddressSearch}
+                    inputID={INPUT_IDS.ADDRESS_LINE_1}
+                    label={translate('common.addressLine', 1)}
+                    onValueChange={(data: unknown, key: unknown) => {
+                        onAddressChanged(data, key);
+                    }}
+                    defaultValue={street1}
+                    renamedInputKeys={{
+                        street: INPUT_IDS.ADDRESS_LINE_1,
+                        street2: INPUT_IDS.ADDRESS_LINE_2,
+                        city: INPUT_IDS.CITY,
+                        state: INPUT_IDS.STATE,
+                        zipCode: INPUT_IDS.ZIP_POST_CODE,
+                        country: INPUT_IDS.COUNTRY as Country,
+                    }}
+                    shouldSaveDraft={shouldSaveDraft}
+                    autoComplete="address-line1"
+                />
+            </View>
+            <View style={styles.formSpaceVertical} />
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.ADDRESS_LINE_2}
+                label={translate('common.addressLine', 2)}
+                aria-label={translate('common.addressLine', 2)}
+                role={CONST.ROLE.PRESENTATION}
+                defaultValue={street2}
+                spellCheck={false}
+                shouldSaveDraft={shouldSaveDraft}
+                autoComplete="address-line2"
+            />
+            <View style={styles.formSpaceVertical} />
+            {!shouldHideCountrySelector && (
+                <>
+                    <View style={styles.mhn5}>
+                        <InputWrapper
+                            InputComponent={CountrySelector}
+                            inputID={INPUT_IDS.COUNTRY}
+                            value={country}
+                            onValueChange={onAddressChanged}
+                            shouldSaveDraft={shouldSaveDraft}
+                        />
+                    </View>
+                    <View style={styles.formSpaceVertical} />
+                </>
+            )}
+            {isUSAForm ? (
+                <View style={styles.mhn5}>
+                    <InputWrapper
+                        InputComponent={StateSelector}
+                        inputID={INPUT_IDS.STATE}
+                        value={state as State}
+                        onValueChange={onAddressChanged}
+                        shouldSaveDraft={shouldSaveDraft}
+                    />
+                </View>
+            ) : (
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.STATE}
+                    label={translate('common.stateOrProvince')}
+                    aria-label={translate('common.stateOrProvince')}
+                    role={CONST.ROLE.PRESENTATION}
+                    value={state}
+                    spellCheck={false}
+                    onValueChange={onAddressChanged}
+                    shouldSaveDraft={shouldSaveDraft}
+                />
+            )}
+            <View style={styles.formSpaceVertical} />
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.CITY}
+                label={translate('common.city')}
+                aria-label={translate('common.city')}
+                role={CONST.ROLE.PRESENTATION}
+                defaultValue={city}
+                spellCheck={false}
+                onValueChange={onAddressChanged}
+                shouldSaveDraft={shouldSaveDraft}
+            />
+            <View style={styles.formSpaceVertical} />
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.ZIP_POST_CODE}
+                label={translate('common.zipPostCode')}
+                aria-label={translate('common.zipPostCode')}
+                role={CONST.ROLE.PRESENTATION}
+                autoCapitalize="characters"
+                defaultValue={zip}
+                hint={zipFormat}
+                onValueChange={onAddressChanged}
+                shouldSaveDraft={shouldSaveDraft}
+                autoComplete="postal-code"
+            />
+        </>
+    );
+}
+
 function AddressForm<TFormID extends AddressFormID>({
     city = '',
     country = '',
@@ -115,19 +252,12 @@ function AddressForm<TFormID extends AddressFormID>({
     shouldRequireZip = false,
     shouldValidatePhysicalAddress = false,
     addBottomSafeAreaPadding = true,
-    inputsBeforeAddress,
-    inputsAfterAddress,
+    children,
     validate,
 }: AddressFormProps<TFormID>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const zipSampleFormat = (country && (COMMON_CONST.COUNTRY_ZIP_REGEX_DATA[country] as CountryZipRegex)?.samples) ?? '';
-
-    const zipFormat = translate('common.zipCodeExampleFormat', zipSampleFormat);
-
-    const isUSAForm = country === CONST.COUNTRY.US;
-
     /**
      * @param translate - translate function
      * @param isUSAForm - selected country ISO code is US
@@ -226,117 +356,11 @@ function AddressForm<TFormID extends AddressFormID>({
             enabledWhenOffline={enabledWhenOfflineProp}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
         >
-            {!!inputsBeforeAddress && (
-                <>
-                    {inputsBeforeAddress}
-                    <View style={styles.formSpaceVertical} />
-                </>
-            )}
-            <View>
-                <InputWrapper
-                    InputComponent={AddressSearch}
-                    inputID={INPUT_IDS.ADDRESS_LINE_1}
-                    label={translate('common.addressLine', 1)}
-                    onValueChange={(data: unknown, key: unknown) => {
-                        onAddressChanged(data, key);
-                    }}
-                    defaultValue={street1}
-                    renamedInputKeys={{
-                        street: INPUT_IDS.ADDRESS_LINE_1,
-                        street2: INPUT_IDS.ADDRESS_LINE_2,
-                        city: INPUT_IDS.CITY,
-                        state: INPUT_IDS.STATE,
-                        zipCode: INPUT_IDS.ZIP_POST_CODE,
-                        country: INPUT_IDS.COUNTRY as Country,
-                    }}
-                    shouldSaveDraft={shouldSaveDraft}
-                    autoComplete="address-line1"
-                />
-            </View>
-            <View style={styles.formSpaceVertical} />
-            <InputWrapper
-                InputComponent={TextInput}
-                inputID={INPUT_IDS.ADDRESS_LINE_2}
-                label={translate('common.addressLine', 2)}
-                aria-label={translate('common.addressLine', 2)}
-                role={CONST.ROLE.PRESENTATION}
-                defaultValue={street2}
-                spellCheck={false}
-                shouldSaveDraft={shouldSaveDraft}
-                autoComplete="address-line2"
-            />
-            <View style={styles.formSpaceVertical} />
-            {!shouldHideCountrySelector && (
-                <>
-                    <View style={styles.mhn5}>
-                        <InputWrapper
-                            InputComponent={CountrySelector}
-                            inputID={INPUT_IDS.COUNTRY}
-                            value={country}
-                            onValueChange={onAddressChanged}
-                            shouldSaveDraft={shouldSaveDraft}
-                        />
-                    </View>
-                    <View style={styles.formSpaceVertical} />
-                </>
-            )}
-            {isUSAForm ? (
-                <View style={styles.mhn5}>
-                    <InputWrapper
-                        InputComponent={StateSelector}
-                        inputID={INPUT_IDS.STATE}
-                        value={state as State}
-                        onValueChange={onAddressChanged}
-                        shouldSaveDraft={shouldSaveDraft}
-                    />
-                </View>
-            ) : (
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.STATE}
-                    label={translate('common.stateOrProvince')}
-                    aria-label={translate('common.stateOrProvince')}
-                    role={CONST.ROLE.PRESENTATION}
-                    value={state}
-                    spellCheck={false}
-                    onValueChange={onAddressChanged}
-                    shouldSaveDraft={shouldSaveDraft}
-                />
-            )}
-            <View style={styles.formSpaceVertical} />
-            <InputWrapper
-                InputComponent={TextInput}
-                inputID={INPUT_IDS.CITY}
-                label={translate('common.city')}
-                aria-label={translate('common.city')}
-                role={CONST.ROLE.PRESENTATION}
-                defaultValue={city}
-                spellCheck={false}
-                onValueChange={onAddressChanged}
-                shouldSaveDraft={shouldSaveDraft}
-            />
-            <View style={styles.formSpaceVertical} />
-            <InputWrapper
-                InputComponent={TextInput}
-                inputID={INPUT_IDS.ZIP_POST_CODE}
-                label={translate('common.zipPostCode')}
-                aria-label={translate('common.zipPostCode')}
-                role={CONST.ROLE.PRESENTATION}
-                autoCapitalize="characters"
-                defaultValue={zip}
-                hint={zipFormat}
-                onValueChange={onAddressChanged}
-                shouldSaveDraft={shouldSaveDraft}
-                autoComplete="postal-code"
-            />
-            {!!inputsAfterAddress && (
-                <>
-                    <View style={styles.formSpaceVertical} />
-                    {inputsAfterAddress}
-                </>
-            )}
+            <AddressFieldsContext.Provider value={{city, country, state, street1, street2, zip, onAddressChanged, shouldSaveDraft, shouldHideCountrySelector}}>
+                {children ?? <AddressFormFields />}
+            </AddressFieldsContext.Provider>
         </FormProvider>
     );
 }
 
-export default AddressForm;
+export default Object.assign(AddressForm, {Fields: AddressFormFields});
diff --git a/src/pages/workspace/WorkspaceOfficeLocationForm.tsx b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
index 02f2017297fd..090373753b02 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationForm.tsx
@@ -5,6 +5,7 @@ import type {FormOnyxValues} from '@components/Form/types';
 import TextInput from '@components/TextInput';
 
 import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getWorkspaceAddressStreetLines} from '@libs/WorkspacesSettingsUtils';
 
@@ -15,6 +16,7 @@ import INPUT_IDS from '@src/types/form/WorkspaceOfficeLocationForm';
 import type {CompanyAddress, OfficeLocation} from '@src/types/onyx/Policy';
 
 import React, {useState} from 'react';
+import {View} from 'react-native';
 
 type WorkspaceOfficeLocationFormValues = FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_OFFICE_LOCATION_FORM>;
 
@@ -41,6 +43,7 @@ type WorkspaceOfficeLocationFormProps = {
 /** The location name, address and "Set as primary" fields shared by the pages that add and edit workspace offices */
 function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked, isNameRequired, takenNames, onSubmit}: WorkspaceOfficeLocationFormProps) {
     const {translate} = useLocalize();
+    const styles = useThemeStyles();
     const address = officeLocation?.address;
     const {streetLineOne, streetLineTwo} = getWorkspaceAddressStreetLines(address?.addressStreet, address?.addressStreet2);
     const [currentCountry, setCurrentCountry] = useState<Country | ''>(address?.country ?? '');
@@ -118,29 +121,29 @@ function WorkspaceOfficeLocationForm({officeLocation, isPrimary, isPrimaryLocked
             street2={streetLineTwo}
             zip={zipCode}
             shouldRequireZip
-            inputsBeforeAddress={
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.LOCATION_NAME}
-                    label={translate('workspace.officeLocations.locationName')}
-                    aria-label={translate('workspace.officeLocations.locationName')}
-                    role={CONST.ROLE.PRESENTATION}
-                    defaultValue={officeLocation?.name}
-                    hint={translate('workspace.officeLocations.locationNameHint')}
-                    spellCheck={false}
-                />
-            }
-            inputsAfterAddress={
-                <InputWrapper
-                    InputComponent={CheckboxWithLabel}
-                    inputID={INPUT_IDS.IS_PRIMARY}
-                    label={translate('workspace.officeLocations.setAsPrimary')}
-                    accessibilityLabel={translate('workspace.officeLocations.setAsPrimary')}
-                    defaultValue={isPrimary}
-                    disabled={isPrimaryLocked}
-                />
-            }
-        />
+        >
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.LOCATION_NAME}
+                label={translate('workspace.officeLocations.locationName')}
+                aria-label={translate('workspace.officeLocations.locationName')}
+                role={CONST.ROLE.PRESENTATION}
+                defaultValue={officeLocation?.name}
+                hint={translate('workspace.officeLocations.locationNameHint')}
+                spellCheck={false}
+            />
+            <View style={styles.formSpaceVertical} />
+            <AddressForm.Fields />
+            <View style={styles.formSpaceVertical} />
+            <InputWrapper
+                InputComponent={CheckboxWithLabel}
+                inputID={INPUT_IDS.IS_PRIMARY}
+                label={translate('workspace.officeLocations.setAsPrimary')}
+                accessibilityLabel={translate('workspace.officeLocations.setAsPrimary')}
+                defaultValue={isPrimary}
+                disabled={isPrimaryLocked}
+            />
+        </AddressForm>
     );
 }
 

From 00a15b6c54962fe4028e2689873fbcdcc387d283 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Fri, 9 Oct 2026 19:07:48 +0200
Subject: [PATCH 400/781] delete failures

---
 src/libs/actions/Policy/DistanceRate.ts       | 15 +++++--
 .../WorkspaceOfficeLocationEditPage.tsx       |  2 +-
 tests/actions/PolicyOfficeLocationTest.ts     | 42 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index 825046f94bdf..29f32082e5db 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -36,6 +36,7 @@ import type {GovernmentMileageRate, PersonalDetailsList, Policy, PolicyEmployee,
 import type {ErrorFields, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {CommuterExclusions, CompanyAddress, CustomUnit, OfficeLocation, Rate} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -972,10 +973,18 @@ function updateOfficeLocation(
 
 /**
  * Delete a workspace office. Deleting the default office makes the company address the default, or, in a workspace
- * without a company address, the server makes another office the default.
+ * without a company address, the server makes another office the default. An office whose addition failed was never
+ * stored by the server, so it is only removed locally.
  */
-function deleteOfficeLocation(policyID: string, officeID: string) {
+function deleteOfficeLocation(policyID: string, officeID: string, officeLocation: OfficeLocation | undefined) {
     const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    if (officeLocation?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(officeLocation.errors)) {
+        Onyx.merge(policyKey, {officeLocations: {[officeID]: null}});
+        return;
+    }
+
+    // An office that hasn't reached the server yet stays pending addition, so dismissing the error still removes it
+    const failedPendingAction = officeLocation?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : null;
 
     const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
         optimisticData: [
@@ -1001,7 +1010,7 @@ function deleteOfficeLocation(policyID: string, officeID: string) {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: policyKey,
                 value: {
-                    officeLocations: {[officeID]: {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')}},
+                    officeLocations: {[officeID]: {pendingAction: failedPendingAction, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')}},
                 },
             },
         ],
diff --git a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
index b432e12ad293..a489c43e3c72 100644
--- a/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
+++ b/src/pages/workspace/WorkspaceOfficeLocationEditPage.tsx
@@ -81,7 +81,7 @@ function WorkspaceOfficeLocationEditPage({route}: WorkspaceOfficeLocationEditPag
             if (result.action !== ModalActions.CONFIRM) {
                 return;
             }
-            deleteOfficeLocation(policyID, officeID);
+            deleteOfficeLocation(policyID, officeID, officeLocation);
             Navigation.goBack();
         });
     };
diff --git a/tests/actions/PolicyOfficeLocationTest.ts b/tests/actions/PolicyOfficeLocationTest.ts
index 4ed3b94cd0b3..7282fc1a25f0 100644
--- a/tests/actions/PolicyOfficeLocationTest.ts
+++ b/tests/actions/PolicyOfficeLocationTest.ts
@@ -255,7 +255,7 @@ describe('actions/PolicyOfficeLocation', () => {
         it('shows the office as pending deletion and removes it on success', async () => {
             // When the office is deleted while the request is in flight
             mockFetch?.pause?.();
-            deleteOfficeLocation(policyID, 'OFFICE1');
+            deleteOfficeLocation(policyID, 'OFFICE1', HEADQUARTERS);
             await waitForBatchedUpdates();
 
             // Then it shows as pending deletion
@@ -272,7 +272,7 @@ describe('actions/PolicyOfficeLocation', () => {
         it('restores the office with an error when the deletion fails', async () => {
             // When deleting the office fails
             mockFetch?.fail?.();
-            deleteOfficeLocation(policyID, 'OFFICE1');
+            deleteOfficeLocation(policyID, 'OFFICE1', HEADQUARTERS);
             await waitForBatchedUpdates();
 
             // Then the office is back, with an error explaining it wasn't deleted
@@ -281,5 +281,43 @@ describe('actions/PolicyOfficeLocation', () => {
             expect(officeLocation?.pendingAction).toBeFalsy();
             expect(Object.keys(officeLocation?.errors ?? {}).length).toBeGreaterThan(0);
         });
+
+        it('removes an office whose addition failed without asking the server to delete it', async () => {
+            // Given an office whose addition failed, so the server never stored it
+            const failedOffice: OfficeLocation = {...HEADQUARTERS, isDefault: false, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, errors: {addFailed: 'Something went wrong'}};
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {officeLocations: {OFFICE2: failedOffice}});
+
+            // When it is deleted
+            deleteOfficeLocation(policyID, 'OFFICE2', failedOffice);
+            await waitForBatchedUpdates();
+
+            // Then it is removed right away, without a request for an office the server doesn't have
+            expect((await getPolicy(policyID))?.officeLocations?.OFFICE2).toBeUndefined();
+            expect(TestHelper.getFetchMockCalls(WRITE_COMMANDS.DELETE_OFFICE_LOCATION)).toHaveLength(0);
+        });
+
+        it('keeps an unsaved office pending addition when deleting it fails, so dismissing the error still removes it', async () => {
+            // Given an office still waiting to be added
+            const unsavedOffice: OfficeLocation = {...HEADQUARTERS, isDefault: false, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {officeLocations: {OFFICE2: unsavedOffice}});
+
+            // When deleting it fails
+            mockFetch?.fail?.();
+            deleteOfficeLocation(policyID, 'OFFICE2', unsavedOffice);
+            await waitForBatchedUpdates();
+
+            // Then it is still pending addition, with an error
+            let officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE2;
+            expect(officeLocation?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+            expect(Object.keys(officeLocation?.errors ?? {}).length).toBeGreaterThan(0);
+
+            // When the error is dismissed
+            clearOfficeLocationErrors(policyID, 'OFFICE2', officeLocation?.pendingAction);
+            await waitForBatchedUpdates();
+
+            // Then the office is removed instead of counting as a saved one
+            officeLocation = (await getPolicy(policyID))?.officeLocations?.OFFICE2;
+            expect(officeLocation).toBeUndefined();
+        });
     });
 });

From 69eddeaf926c19947129b0bdce55b833142e2bfd Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Fri, 9 Oct 2026 22:42:31 +0530
Subject: [PATCH 401/781] Fix reusable distance route caching and distance

---
 src/libs/actions/IOU/Split.ts                 | 21 +++++++++++++++----
 src/libs/actions/IOU/TrackExpense.ts          | 19 +++++++++++++----
 ...andleMoneyRequestStepDistanceNavigation.ts |  2 +-
 .../index.native.tsx                          |  2 --
 .../submission/useDistanceSubmission.ts       |  2 ++
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts
index 17f2e169dc32..60768a9ba11d 100644
--- a/src/libs/actions/IOU/Split.ts
+++ b/src/libs/actions/IOU/Split.ts
@@ -9,6 +9,7 @@ import type {WriteReadyBarrier} from '@libs/API';
 import type {CompleteSplitBillParams, CreateDistanceRequestParams, SplitBillParams, StartSplitBillParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import DateUtils from '@libs/DateUtils';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import {calculateAmount as calculateIOUAmount, updateIOUOwnerAndTotal} from '@libs/IOUUtils';
 import * as Localize from '@libs/Localize';
@@ -51,6 +52,7 @@ import {
     getUpdatedTransaction,
     isDistanceExpenseType,
     isDistanceRequest as isDistanceRequestTransactionUtils,
+    isMapDistanceRequest,
     isScanRequest as isScanRequestTransactionUtils,
 } from '@libs/TransactionUtils';
 
@@ -2082,7 +2084,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         writeBarrier,
         rules,
         isVendorMatchingBetaEnabled,
-        reusableDistanceRoutes = [],
+        reusableDistanceRoutes,
     } = distanceRequestInformation;
     const {policy, policyCategories, policyTagList, policyRecentlyUsedCategories, policyRecentlyUsedTags} = policyParams;
     const parsedComment = getParsedComment(transactionParams.comment);
@@ -2348,16 +2350,27 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         };
     }
 
-    if (!isManualDistanceRequest && validWaypoints) {
+    const isMapDistance =
+        (distanceRequestType ? distanceRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP : isMapDistanceRequest(existingTransaction)) ||
+        (!distanceRequestType && !gpsCoordinates && odometerStart === undefined && odometerEnd === undefined && !isManualDistanceRequest);
+
+    if (isMapDistance && validWaypoints && reusableDistanceRoutes !== undefined) {
+        const distanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy});
+        const effectiveDistance =
+            modifiedDistance ??
+            distance ??
+            existingTransaction?.comment?.customUnit?.quantity ??
+            (selectedRouteDistance ? Number(DistanceRequestUtils.convertDistanceUnit(selectedRouteDistance, distanceUnit).toFixed(CONST.DISTANCE_DECIMAL_PLACES)) : 0);
+
         const reusableRouteOnyxData = getLocallyCreatedRouteOnyxData(
             {
                 transactionID: parameters.transactionID,
                 waypoints: validWaypoints,
-                distance: distance ?? 0,
+                distance: effectiveDistance,
                 routeDistanceMeters: selectedRouteDistance,
                 inserted: created ?? DateUtils.getDBTime(),
             },
-            reusableDistanceRoutes,
+            reusableDistanceRoutes ?? [],
         );
         onyxData?.optimisticData?.push(...reusableRouteOnyxData.optimisticData);
         onyxData?.failureData?.push(...reusableRouteOnyxData.failureData);
diff --git a/src/libs/actions/IOU/TrackExpense.ts b/src/libs/actions/IOU/TrackExpense.ts
index 78e1df0c1b0a..ee1a85e03890 100644
--- a/src/libs/actions/IOU/TrackExpense.ts
+++ b/src/libs/actions/IOU/TrackExpense.ts
@@ -2507,7 +2507,7 @@ function trackExpense(params: CreateTrackExpenseParams) {
         writeBarrier,
         rules,
         personalDetailsByLogins,
-        reusableDistanceRoutes = [],
+        reusableDistanceRoutes,
     } = params;
     const {accountID: currentUserAccountIDParam, email: currentUserEmailParam = ''} = currentUser;
     const {participant, payeeAccountID, payeeEmail} = participantParams;
@@ -2953,16 +2953,27 @@ function trackExpense(params: CreateTrackExpenseParams) {
                 parameters.actionableWhisperReportActionID = actionableWhisperReportActionIDParam;
             }
 
-            if (validWaypoints && transaction?.transactionID) {
+            const isMapDistance =
+                (distanceRequestType ? distanceRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP : isMapDistanceRequest(existingTransaction)) ||
+                (!distanceRequestType && !gpsCoordinates && odometerStart === undefined && odometerEnd === undefined);
+
+            if (isMapDistance && validWaypoints && transaction?.transactionID && reusableDistanceRoutes !== undefined) {
+                const distanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy});
+                const effectiveDistance =
+                    modifiedDistance ??
+                    distance ??
+                    existingTransaction?.comment?.customUnit?.quantity ??
+                    (selectedRouteDistance ? Number(DistanceRequestUtils.convertDistanceUnit(selectedRouteDistance, distanceUnit).toFixed(CONST.DISTANCE_DECIMAL_PLACES)) : 0);
+
                 const reusableRouteOnyxData = getLocallyCreatedRouteOnyxData(
                     {
                         transactionID: transaction.transactionID,
                         waypoints: validWaypoints,
-                        distance: distance ?? 0,
+                        distance: effectiveDistance,
                         routeDistanceMeters: selectedRouteDistance,
                         inserted: created ?? DateUtils.getDBTime(),
                     },
-                    reusableDistanceRoutes,
+                    reusableDistanceRoutes ?? [],
                 );
                 onyxData?.optimisticData?.push(...reusableRouteOnyxData.optimisticData);
                 onyxData?.failureData?.push(...reusableRouteOnyxData.failureData);
diff --git a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
index 161172cace10..7502b8c7ba64 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
+++ b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts
@@ -227,7 +227,7 @@ function handleMoneyRequestStepDistanceNavigation({
     isOffline = false,
     rules,
     isVendorMatchingBetaEnabled,
-    reusableDistanceRoutes = [],
+    reusableDistanceRoutes,
 }: MoneyRequestStepDistanceNavigationParams): void {
     const isManualDistance = manualDistance !== undefined;
     const isOdometerDistance = odometerDistance !== undefined;
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
index fb41e1596f16..96f1f205f212 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
@@ -125,7 +125,6 @@ function IOURequestStepDistanceGPS({
 
     const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
-    const [reusableDistanceRoutes] = useOnyx(ONYXKEYS.REUSABLE_DISTANCE_ROUTES);
     const policyTagList = useMoneyRequestPolicyTagsForReport({report, currentUserAccountID: currentUserAccountIDParam});
 
     const {participants, participantsPolicyTags} = useMoneyRequestParticipantsPolicyTags({
@@ -206,7 +205,6 @@ function IOURequestStepDistanceGPS({
             participants,
             participantsPolicyTags,
             rules,
-            reusableDistanceRoutes,
         });
     };
 
diff --git a/src/pages/iou/request/step/confirmation/submission/useDistanceSubmission.ts b/src/pages/iou/request/step/confirmation/submission/useDistanceSubmission.ts
index 890acd1ec6b0..1f48fed2eeb4 100644
--- a/src/pages/iou/request/step/confirmation/submission/useDistanceSubmission.ts
+++ b/src/pages/iou/request/step/confirmation/submission/useDistanceSubmission.ts
@@ -120,6 +120,7 @@ function useDistanceSubmission({
     const [selectedParticipantsReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${firstSelectedParticipantReportID}`);
     const iouReportPolicyID = (moneyRequestReportID ? moneyRequestReport?.policyID : undefined) ?? currentChatReport?.policyID ?? selectedParticipantsReport?.policyID;
     const [iouReportPolicyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${iouReportPolicyID}`);
+    const [reusableDistanceRoutes] = useOnyx(ONYXKEYS.REUSABLE_DISTANCE_ROUTES);
 
     function createTransaction({shouldHandleNavigation = true, writeBarrier}: CreateTransactionParams) {
         if (!transaction) {
@@ -199,6 +200,7 @@ function useDistanceSubmission({
             formatPhoneNumber,
             participantsPolicyTags,
             rules,
+            reusableDistanceRoutes,
         });
 
         const isExpenseReport = isMoneyRequestReportReportUtils(report);

From 43a9c0c962dd051c4e52a860104b49b0a980f545 Mon Sep 17 00:00:00 2001
From: "Yuwen Memon (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 17:24:49 +0000
Subject: [PATCH 402/781] Update AI Agent help docs from generated script
 output

Generated from Web-Expensify main (3eceda1) with script/generateCustomAgentTriggers.php and script/generateCustomAgentCapabilities.php.

Co-authored-by: Yuwen Memon <yuwenmemon@users.noreply.github.com>
---
 .../ai-agents/AI-Agent-Capabilities.md        | 49 ++++++++++++++-----
 .../ai-agents/AI-Agent-Triggers.md            | 18 ++++---
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
index 75edd7314e20..a110a1eae691 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
@@ -1,13 +1,11 @@
 ---
 title: Agent Capability Reference
-description: Every action your agent can take, with ready-to-copy instruction phrases and disambiguation notes to avoid common mis-routings.
+description: Every action your Agent can take, with ready-to-copy instruction phrases and disambiguation notes to avoid common mis-routings.
 keywords: [Custom Agent, Agent, agent capabilities, agent actions, submit report, approve report, reject report, add comment, analyze expenses, agent instructions, workspace automation, Expensify automation, Rulebot, rule bot]
-internalScope: Audience is all members configuring agents. Covers all supported ManageReport sub-actions, AddComment, and AnalyzeExpenses. Does not cover read-only report context or NoResponse behavior.
-contentType: topic
-order: 8
+internalScope: Audience is all members configuring Agents. Covers all supported ManageReport sub-actions, AddComment, and AnalyzeExpenses. Does not cover read-only report context or NoResponse behavior.
 ---
 
-An agent acts on expense reports using the actions described below. This reference helps you phrase your instructions so your agent reliably does what you intend — and doesn't accidentally take the wrong action.
+An Agent acts on expense reports using the actions described below. This reference helps you phrase your instructions so your agent reliably does what you intend — and doesn't accidentally take the wrong action.
 
 # Agent Capability Reference
 
@@ -52,6 +50,18 @@ To accomplish this, include phrases like:
 
 ---
 
+## How to write instructions that unapprove expense reports
+
+**Goal:** Undoes the approval of an Approved expense report so it can be reviewed and approved again. The report returns to Outstanding (submitted), or to Draft if the submitter approved it themselves or the workspace uses Bill.com. Requires Workspace Admin role, unless the agent is the approver who gave the final approval. On a workspace that uses Dynamic External Workflow approvals, only a Workspace Admin can unapprove. A report that has already been paid through Expensify cannot be unapproved.
+
+To accomplish this, include phrases like:
+- Unapprove reports over $10,000
+- Unapprove this report so it can be reviewed again
+- Undo the approval on reports that were approved with violations
+- Unapprove reports that were approved while an expense was missing a receipt
+
+---
+
 ## How to write instructions that reject expense reports
 
 **Goal:** Sends an entire Outstanding (submitted) expense report back to the submitter with a user-facing rejection comment explaining why.
@@ -92,7 +102,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that take over a report as approver
 
-**Goal:** Reassigns the agent as the current approver on a report that was routed to someone else, giving the agent the authority to approve or reject it. Requires workspace admin role.
+**Goal:** Reassigns the agent as the current approver on a report that was routed to someone else, giving the agent the authority to approve or reject it. Requires Workspace Admin role.
 
 To accomplish this, include phrases like:
 - Take over reports over $10,000 regardless of who they were submitted to
@@ -104,7 +114,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that route reports to a specific approver
 
-**Goal:** Routes a submitted report to a specific approver by email, replacing the current approver in the workflow. Requires workspace admin role.
+**Goal:** Routes a submitted report to a specific approver by email, replacing the current approver in the workflow. Requires Workspace Admin role.
 
 To accomplish this, include phrases like:
 - Route reports over $5,000 to the finance manager
@@ -140,7 +150,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that export reports to accounting
 
-**Goal:** Exports a report to the workspace's connected accounting integration (QuickBooks, Xero, NetSuite, Sage Intacct, etc.), or marks it as manually exported. Works for expense reports, invoices, and bills. Requires workspace admin role, except that the report's current approver (its manager) can export a report submitted to them, and an invoice's owner can export their own invoice.
+**Goal:** Exports a report to the workspace's connected accounting integration (QuickBooks, Xero, NetSuite, Sage Intacct, etc.), or marks it as manually exported. Works for expense reports, invoices, and bills. Requires Workspace Admin role, except that the report's current approver (its manager) can export a report submitted to them, and an invoice's owner can export their own invoice.
 
 To accomplish this, include phrases like:
 - Export this report to QuickBooks
@@ -177,7 +187,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that delete expense reports
 
-**Goal:** Deletes an unsubmitted expense report the requester owns, after they confirm the deletion. Only reports that are still open or in draft can be deleted — a report that has been submitted, approved, reimbursed, or closed cannot be. Deleting an individual expense rather than a whole report is covered by the edit-expenses capability.
+**Goal:** Deletes an unsubmitted expense report the requester owns, after they confirm the deletion. Only OPEN or draft reports can be deleted — a report that has been submitted, approved, reimbursed, or closed cannot be. Deleting an expense rather than a whole report is handled by EditExpense.
 
 To accomplish this, include phrases like:
 - Delete this report
@@ -236,8 +246,8 @@ To accomplish this, include phrases like:
 To accomplish this, include phrases like:
 - Send each employee a reminder to submit their expenses at the end of the month
 - Message the submitter directly when their report is rejected
-- Notify individual workspace members of a workspace change
-- DM each person with outstanding reports a personalized nudge
+- Notify individual workspace members of a policy change
+- DM each person with outstanding reports a personalised nudge
 - Send a private message to the submitter when a receipt is missing
 - Reach out to each team member individually with their spending summary
 
@@ -268,9 +278,21 @@ To accomplish this, include phrases like:
 
 ---
 
+## How to write instructions that export a report as a PDF
+
+**Goal:** Generates a PDF of an expense report and attaches it to the chat as a downloadable file. When the chat is itself an expense report, it exports that report. From any other chat, such as a Concierge DM, the requester can choose a report by report ID, by submitter, or by what was bought. It does not change the report, and anyone who can view the report can ask for one.
+
+To accomplish this, include phrases like:
+- Send me a PDF of this report
+- Download this expense report as a PDF
+- Export Alice's latest report to PDF
+- Send me a PDF of my most recent report
+
+---
+
 ## How to write instructions that manage workspace settings and members
 
-**Goal:** Inspects workspace configuration, answers membership questions, and — for workspace admins — adds or removes members, lists and assigns company cards from a connected card feed, and modifies workspace settings such as categories and approval rules.
+**Goal:** Inspects Workspace configuration, answers membership questions, reads the Expensify Card limit and remaining spend for anyone allowed to see the Expensify Card, and — for Workspace Admins — adds or removes members, lists and assigns company cards from a connected card feed, and modifies workspace settings such as categories and approval rules.
 
 To accomplish this, include phrases like:
 - Add new employees to the workspace when they join
@@ -280,6 +302,7 @@ To accomplish this, include phrases like:
 - What is the current approval mode for this workspace?
 - Copy the category list from one workspace to another
 - Assign all unassigned company cards to the matching members
+- How much of our Expensify Card limit is left?
 
 ---
 
@@ -297,4 +320,4 @@ To accomplish this, include phrases like:
 
 ---
 
-*This reference covers all 22 AI agent capabilities.*
+*This reference covers all 24 AI Agent capabilities.*
diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
index 35d0c3fdcd6c..3957bb92277c 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
@@ -1,13 +1,11 @@
 ---
 title: Agent Trigger Reference
-description: Every event your agent can react to, with ready-to-copy instruction phrases for your agent's prompt.
+description: Every event your Agent can react to, with ready-to-copy instruction phrases for your agent's prompt.
 keywords: [Custom Agent, Agent, agent triggers, report_activity, agent instructions, expense report events, workspace automation, when to trigger agent, report submitted, report approved, Expensify automation]
-internalScope: Audience is workspace admins configuring agents. Covers all expose-level report_activity events. Does not cover chat message triggers or report-received triggers.
-contentType: topic
-order: 9
+internalScope: Audience is workspace admins configuring Agents. Covers all expose-level report_activity events. Does not cover chat message triggers or report-received triggers.
 ---
 
-An agent reacts to expense report events when its instructions match what happened. This reference lists every event your agent can respond to, along with example phrases you can paste directly into your prompt.
+An Agent reacts to expense report events when its instructions match what happened. This reference lists every event your agent can respond to, along with example phrases you can paste directly into your prompt.
 
 # Agent Trigger Reference
 
@@ -350,7 +348,7 @@ To react to this event, include phrases like:
 To react to this event, include phrases like:
 - When someone leaves a comment or message in a report
 - When a user asks a question or leaves a note in the conversation
-- When someone @mentions an agent in a report
+- When someone @mentions an Agent in a report
 
 **An approver at an intermediate step in a multi-level approval chain approved the expense report and forwarded it to the next approver.**
 
@@ -636,6 +634,12 @@ To react to this event, include phrases like:
 - When QuickBooks / NetSuite / Xero sync fails
 - When the accounting connection breaks
 
+**A running count of how many of the workspace's reports are currently failing to export. There is one of these per workspace in its #admins room, kept up to date in place as reports start and stop failing, and addressed to the workspace's configured exporter.**
+
+To react to this event, include phrases like:
+- When reports fail to export to accounting
+- How many reports failed to export
+
 **An accounting integration export failed for a specific report. This notification appears on the expense report itself, not in #admins.**
 
 To react to this event, include phrases like:
@@ -920,4 +924,4 @@ To react to this event, include phrases like:
 
 ---
 
-*This reference covers all 126 events AI agents can react to.*
+*This reference covers all 127 events AI Agents can react to.*

From 063fd97749f858e85c6e1a1dc1f06b13a4c32cfd Mon Sep 17 00:00:00 2001
From: "Yuwen Memon (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 17:31:39 +0000
Subject: [PATCH 403/781] Fix: Use US spelling 'personalized' to pass
 spellcheck

Co-authored-by: Yuwen Memon <yuwenmemon@users.noreply.github.com>
---
 docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
index a110a1eae691..ac5be2673f59 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
@@ -247,7 +247,7 @@ To accomplish this, include phrases like:
 - Send each employee a reminder to submit their expenses at the end of the month
 - Message the submitter directly when their report is rejected
 - Notify individual workspace members of a policy change
-- DM each person with outstanding reports a personalised nudge
+- DM each person with outstanding reports a personalized nudge
 - Send a private message to the submitter when a receipt is missing
 - Reach out to each team member individually with their spending summary
 

From 91e069c7132441aa18cbc8001d7051fc1ff5ed9f Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 20:03:29 +0000
Subject: [PATCH 404/781] Address C+ review on vacation delegates: domain
 guard, member timezone, shared expiry helper

- Show the DelegatorList on the domain admin form while the member is someone else's delegate
- Pick and show a domain member's clear date in the member's timezone
- Add getActiveVacationDelegate and use it on every screen that shows or opens the delegate
- Skip the personal details lookup for an expired delegate
- Use one route const for the Profile row
- Type the domain optimistic delegate without an as cast
- Use one term for delegate in the el and nl chooseDelegate strings

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/VacationDelegateForm.tsx       | 32 +++---
 src/components/VacationDelegateMenuItem.tsx   | 20 ++--
 src/languages/el.ts                           |  2 +-
 src/languages/nl.ts                           |  2 +-
 src/libs/VacationDelegateUtils.ts             | 10 ++
 src/libs/actions/Domain.ts                    | 17 ++--
 .../Members/DomainMemberDetailsPage.tsx       |  5 +-
 .../DomainMemberVacationDelegateFormPage.tsx  | 27 +++--
 src/pages/settings/Profile/ProfilePage.tsx    | 18 ++--
 ...mainMemberVacationDelegateFormPageTest.tsx | 98 +++++++++++++++++++
 .../VacationDelegateMenuItemTest.tsx          |  3 +-
 tests/unit/libs/VacationDelegateUtilsTest.ts  | 13 +++
 12 files changed, 201 insertions(+), 46 deletions(-)
 create mode 100644 tests/ui/DomainMemberVacationDelegateFormPageTest.tsx

diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 28499e7eb1e5..006c5595d8da 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -7,18 +7,19 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import DateUtils from '@libs/DateUtils';
 import {
     formatVacationDelegateClearDateTime,
+    getActiveVacationDelegate,
     getVacationDelegateClearAfter,
     getVacationDelegateClearDate,
     getVacationDelegateClearDateTime,
     getVacationDelegateLocalClearDateTime,
     isVacationDelegateClearAfterTooSoon,
     isVacationDelegateClearDatePassed,
-    isVacationDelegateExpired,
 } from '@libs/VacationDelegateUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/VacationDelegateForm';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
 
 import React from 'react';
@@ -41,6 +42,12 @@ type VacationDelegateFormProps = {
     /** Text shown above the form */
     description?: string;
 
+    /**
+     * Timezone the clear date and time are picked in. Defaults to the current user's Profile timezone.
+     * A domain admin passes the member's, so the delegate clears at the end of the vacationer's day, not the admin's.
+     */
+    timezone?: SelectedTimezone;
+
     /** Opens the member selection screen. The picked member is stored in the form draft. */
     onChangeDelegate: () => void;
 
@@ -64,16 +71,17 @@ type VacationDelegateFormProps = {
     onCloseError?: () => void;
 };
 
-function VacationDelegateForm({vacationDelegate, description, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
+function VacationDelegateForm({vacationDelegate, description, timezone: timezoneProp, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
     const styles = useThemeStyles();
     const {translate, dateFnsLocale, getLocalDateFromDatetime} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['CalendarSolid', 'Trashcan']);
-    const {timezone} = useCurrentUserPersonalDetails();
+    const {timezone: currentUserTimezone} = useCurrentUserPersonalDetails();
+    const timezone = timezoneProp ?? currentUserTimezone?.selected;
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
 
-    const savedDelegate = isVacationDelegateExpired(vacationDelegate?.clearAfter) ? undefined : vacationDelegate?.delegate;
-    const savedClearDateTime = savedDelegate ? getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone?.selected) : '';
-    const savedClearDate = savedDelegate ? getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone?.selected) : '';
+    const savedDelegate = getActiveVacationDelegate(vacationDelegate);
+    const savedClearDateTime = savedDelegate ? getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone) : '';
+    const savedClearDate = savedDelegate ? getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone) : '';
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty draft means no member was picked yet
     const delegate = draftValues?.[INPUT_IDS.DELEGATE] || savedDelegate;
     const clearDate = draftValues?.[INPUT_IDS.CLEAR_AFTER_DATE] ?? savedClearDate;
@@ -88,10 +96,10 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             return formErrors;
         }
 
-        // Both checks read the picked date and time in the Profile timezone, the same one clearAfter is built from, not the device's
-        if (isVacationDelegateClearDatePassed(values[INPUT_IDS.CLEAR_AFTER_DATE], timezone?.selected)) {
+        // Both checks read the picked date and time in the form's timezone, the same one clearAfter is built from, not the device's
+        if (isVacationDelegateClearDatePassed(values[INPUT_IDS.CLEAR_AFTER_DATE], timezone)) {
             formErrors[INPUT_IDS.CLEAR_AFTER_DATE] = translate('common.error.dateInvalid');
-        } else if (isVacationDelegateClearAfterTooSoon(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected))) {
+        } else if (isVacationDelegateClearAfterTooSoon(getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone))) {
             formErrors[INPUT_IDS.CLEAR_AFTER_TIME] = translate('common.error.invalidTimeShouldBeFuture');
         }
         return formErrors;
@@ -102,7 +110,7 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             return;
         }
 
-        onSubmit(delegate, getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone?.selected));
+        onSubmit(delegate, getVacationDelegateClearAfter(values[INPUT_IDS.CLEAR_AFTER_DATE], values[INPUT_IDS.CLEAR_AFTER_TIME], timezone));
     };
 
     return (
@@ -128,13 +136,13 @@ function VacationDelegateForm({vacationDelegate, description, onChangeDelegate,
             />
             <View style={styles.ph5}>
                 {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups.
-                    The earliest day is today in the Profile timezone, so it matches the validation even when the device is in another timezone. */}
+                    The earliest day is today in the form's timezone, so it matches the validation even when the device is in another timezone. */}
                 <InputWrapper
                     InputComponent={DatePicker}
                     inputID={INPUT_IDS.CLEAR_AFTER_DATE}
                     label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
                     defaultValue={savedClearDate}
-                    minDate={getLocalDateFromDatetime()}
+                    minDate={getLocalDateFromDatetime(undefined, timezone)}
                     icon={icons.CalendarSolid}
                     shouldForceActiveLabel={false}
                     shouldKeepCalendarIconWhenSelected
diff --git a/src/components/VacationDelegateMenuItem.tsx b/src/components/VacationDelegateMenuItem.tsx
index a4431eb6d574..f9a742fbf77e 100644
--- a/src/components/VacationDelegateMenuItem.tsx
+++ b/src/components/VacationDelegateMenuItem.tsx
@@ -6,12 +6,13 @@ import useVacationDelegatePersonalDetails from '@hooks/useVacationDelegatePerson
 
 import getVacationDelegateDisplayName from '@libs/getVacationDelegateDisplayName';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
-import {formatVacationDelegateClearDateTime, getVacationDelegateClearDateTime, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {formatVacationDelegateClearDateTime, getActiveVacationDelegate, getVacationDelegateClearDateTime} from '@libs/VacationDelegateUtils';
 
 import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import type CONST from '@src/CONST';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
 
 import type {ValueOf} from 'type-fest';
@@ -81,6 +82,9 @@ type VacationDelegateSectionProps = {
     /** Text above the delegate. Defaults to "Vacation delegate" */
     label?: string;
 
+    /** Timezone the clear date is shown in. Defaults to the current user's, so a domain admin can pass the member's instead */
+    timezone?: SelectedTimezone;
+
     /** Errors related to setting the vacation delegate */
     errors?: Errors;
 
@@ -99,18 +103,20 @@ type VacationDelegateSectionProps = {
     onPress: () => void;
 };
 
-function VacationDelegateMenuItemPreset({vacationDelegate, label, errors, pendingAction, onCloseError, onPress}: VacationDelegateSectionProps) {
+function VacationDelegateMenuItemPreset({vacationDelegate, label, timezone, errors, pendingAction, onCloseError, onPress}: VacationDelegateSectionProps) {
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
-    const {timezone} = useCurrentUserPersonalDetails();
+    const {timezone: currentUserTimezone} = useCurrentUserPersonalDetails();
 
     const rowLabel = label ?? translate('common.vacationDelegate');
-    const hasVacationDelegate = !!vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate?.clearAfter);
-    const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(vacationDelegate?.delegate);
+    const activeVacationDelegate = getActiveVacationDelegate(vacationDelegate);
+    const hasVacationDelegate = !!activeVacationDelegate;
+    // Only looks up a delegate the row shows, so an expired one doesn't trigger a personal details request
+    const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(activeVacationDelegate);
 
-    const rawDelegateLogin = vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '';
+    const rawDelegateLogin = vacationDelegatePersonalDetails?.login ?? activeVacationDelegate ?? '';
     const delegateDisplayName = getVacationDelegateDisplayName(rawDelegateLogin, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber);
-    const clearDate = formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone?.selected), dateFnsLocale);
+    const clearDate = formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone ?? currentUserTimezone?.selected), dateFnsLocale);
     const untilText = clearDate ? translate('statusPage.vacationDelegate.until', clearDate) : '';
 
     return (
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 4dd53a116a5e..6370ed2929b4 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -3955,7 +3955,7 @@ ${amount} για ${merchant} - ${date}`,
                 `Ο/Η <strong>${delegate}</strong> δεν είναι μέλος των παρακάτω χώρων εργασίας. Θα ζητηθεί από τους διαχειριστές των χώρων εργασίας που δεν διαχειρίζεστε να τον/την προσθέσουν. Θέλετε να τον/την προσκαλέσετε τώρα σε αυτούς που διαχειρίζεστε ως διαχειριστής;`,
             youAreAMemberOf: 'Είστε μέλος αυτών των χώρων εργασίας:',
             youAreAnAdminOf: 'Είστε διαχειριστής αυτών των χώρων εργασίας:',
-            chooseDelegate: 'Επιλέξτε αναπληρωτή',
+            chooseDelegate: 'Επιλέξτε εκπρόσωπο',
             clearAfterRecommended: 'Εκκαθάριση μετά από (συνιστάται)',
             willClearOn: (date: string) => `Ο εκπρόσωπος διακοπών θα καταργηθεί στις ${date}`,
             until: (date: string) => `Έως ${date}`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 8a061f5d9e27..a06a1ce22d63 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -3890,7 +3890,7 @@ ${amount} voor ${merchant} - ${date}`,
                 `<strong>${delegate}</strong> is geen lid van de onderstaande werkruimtes. Beheerders van de werkruimtes die je niet beheert, wordt gevraagd diegene toe te voegen. Wil je diegene nu uitnodigen voor de werkruimtes waar je beheerder van bent?`,
             youAreAMemberOf: 'Je bent lid van deze werkruimtes:',
             youAreAnAdminOf: 'Je bent beheerder van deze werkruimtes:',
-            chooseDelegate: 'Gedelegeerde kiezen',
+            chooseDelegate: 'Vertegenwoordiger kiezen',
             clearAfterRecommended: 'Wissen na (aanbevolen)',
             willClearOn: (date: string) => `De vertegenwoordiger tijdens vakantie wordt gewist op ${date}`,
             until: (date: string) => `Tot ${date}`,
diff --git a/src/libs/VacationDelegateUtils.ts b/src/libs/VacationDelegateUtils.ts
index f40271c4f9f5..1f7bf9b8ebc8 100644
--- a/src/libs/VacationDelegateUtils.ts
+++ b/src/libs/VacationDelegateUtils.ts
@@ -1,5 +1,6 @@
 import CONST from '@src/CONST';
 import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
+import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
 
 import type {Locale as DateFnsLocale} from 'date-fns';
 
@@ -79,6 +80,14 @@ function isVacationDelegateExpired(clearAfter: string | undefined): boolean {
     return !!clearAfter && clearAfter <= DateUtils.getDBTime();
 }
 
+/**
+ * The delegate still in effect, ignoring one whose clearAfter has passed. Every screen that shows or opens the delegate uses this,
+ * so they all apply the same expiry rule.
+ */
+function getActiveVacationDelegate(vacationDelegate: BaseVacationDelegate | undefined): string | undefined {
+    return vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate.clearAfter) ? vacationDelegate.delegate : undefined;
+}
+
 /**
  * Whether the picked clear date (yyyy-MM-dd) has already ended in the given timezone. The day is read in the user's Profile timezone,
  * not the device's, so a device in another timezone doesn't reject a day that hasn't ended yet for the user, or accept one that has.
@@ -107,6 +116,7 @@ export {
     getVacationDelegateLocalClearDateTime,
     formatVacationDelegateClearDateTime,
     isVacationDelegateExpired,
+    getActiveVacationDelegate,
     isVacationDelegateClearDatePassed,
     isVacationDelegateClearAfterTooSoon,
 };
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index f0fc6f31b7c5..e9e3970b0331 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1672,19 +1672,20 @@ function setDomainVacationDelegate(
     vacationDelegate?: BaseVacationDelegate,
     clearAfter?: string,
 ) {
+    const optimisticVacationDelegate: NullishDeep<BaseVacationDelegate> = {
+        delegate,
+        creator,
+        clearAfter: clearAfter ?? null,
+        previousDelegate: vacationDelegate?.delegate,
+        previousClearAfter: vacationDelegate?.clearAfter ?? null,
+    };
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
-                [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: {
-                    delegate,
-                    creator,
-                    clearAfter: clearAfter ?? null,
-                    previousDelegate: vacationDelegate?.delegate,
-                    previousClearAfter: vacationDelegate?.clearAfter ?? null,
-                },
-            } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>,
+                [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}` as const]: optimisticVacationDelegate,
+            },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
diff --git a/src/pages/domain/Members/DomainMemberDetailsPage.tsx b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
index 2a4d9e0d26e7..703c34871809 100644
--- a/src/pages/domain/Members/DomainMemberDetailsPage.tsx
+++ b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
@@ -25,7 +25,7 @@ import {
 import {clearDraftValues} from '@libs/actions/FormActions';
 import {requestUnlockAccount} from '@libs/actions/User';
 import {getLatestError} from '@libs/ErrorUtils';
-import {isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {getActiveVacationDelegate} from '@libs/VacationDelegateUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -167,11 +167,12 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
                 </OfflineWithFeedback>
                 <VacationDelegateMenuItem
                     vacationDelegate={vacationDelegate}
+                    timezone={personalDetails?.timezone?.selected}
                     onPress={() => {
                         clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
                         // With no delegate there is nothing to show on the form yet, so go straight to picking one.
                         Navigation.navigate(
-                            vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate.clearAfter)
+                            getActiveVacationDelegate(vacationDelegate)
                                 ? ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID)
                                 : ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID),
                         );
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
index fcf58dfd335a..e6d0e8eb3320 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegateFormPage.tsx
@@ -1,3 +1,4 @@
+import DelegatorList from '@components/DelegatorList';
 import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import VacationDelegateForm from '@components/VacationDelegateForm';
@@ -6,6 +7,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
+import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearDraftValues} from '@libs/actions/FormActions';
 import Navigation from '@libs/Navigation/Navigation';
@@ -23,12 +25,14 @@ import type SCREENS from '@src/SCREENS';
 
 import {vacationDelegateSelector} from '@selectors/Domain';
 import React from 'react';
+import {View} from 'react-native';
 
 type DomainMemberVacationDelegateFormPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
 
 function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDelegateFormPageProps) {
     const {domainAccountID, accountID} = route.params;
     const {translate} = useLocalize();
+    const styles = useThemeStyles();
 
     const {login: currentUserLogin} = useCurrentUserPersonalDetails();
 
@@ -79,12 +83,23 @@ function DomainMemberVacationDelegateFormPage({route}: DomainMemberVacationDeleg
                     title={translate('common.vacationDelegate')}
                     onBackButtonPress={goBack}
                 />
-                <VacationDelegateForm
-                    vacationDelegate={vacationDelegate}
-                    onChangeDelegate={() => Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID))}
-                    onSubmit={onSubmit}
-                    onRemove={onRemove}
-                />
+                {/* While the member is someone else's delegate, their own can't be changed, same as on the member picker */}
+                {vacationDelegate?.delegatorFor?.length ? (
+                    <View style={styles.mt6}>
+                        <DelegatorList
+                            delegators={vacationDelegate.delegatorFor}
+                            message={translate('domain.members.cannotSetVacationDelegateForMember', memberLogin ?? '')}
+                        />
+                    </View>
+                ) : (
+                    <VacationDelegateForm
+                        vacationDelegate={vacationDelegate}
+                        timezone={personalDetails?.timezone?.selected}
+                        onChangeDelegate={() => Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID))}
+                        onSubmit={onSubmit}
+                        onRemove={onRemove}
+                    />
+                )}
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
     );
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index d6a282e71c0d..63505fd81324 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -41,7 +41,7 @@ import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigat
 import type {SettingsSplitNavigatorParamList} from '@libs/Navigation/types';
 import {getFormattedAddress, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import {expensifyLoginsSelector, getContactMethodsOptions, getLoginListBrickRoadIndicator} from '@libs/UserUtils';
-import {formatVacationDelegateClearDateTime, getVacationDelegateClearDateTime, isVacationDelegateExpired} from '@libs/VacationDelegateUtils';
+import {formatVacationDelegateClearDateTime, getActiveVacationDelegate, getVacationDelegateClearDateTime} from '@libs/VacationDelegateUtils';
 
 import useTimeSensitiveHomeAddress from '@pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress';
 
@@ -104,11 +104,14 @@ function ProfilePage() {
     const [commuterExclusionsWorkspaceName] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: homeAndOfficeCommuterExclusionPolicyNameSelector});
 
     const [vacationDelegate] = useOnyx(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
-    const hasVacationDelegate = !!vacationDelegate?.delegate && !isVacationDelegateExpired(vacationDelegate?.clearAfter);
-    const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(hasVacationDelegate ? vacationDelegate?.delegate : undefined);
+    const activeVacationDelegate = getActiveVacationDelegate(vacationDelegate);
+    const hasVacationDelegate = !!activeVacationDelegate;
+    const vacationDelegatePersonalDetails = useVacationDelegatePersonalDetails(activeVacationDelegate);
     const vacationDelegateName = hasVacationDelegate
-        ? getVacationDelegateDisplayName(vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate ?? '', vacationDelegatePersonalDetails?.displayName, formatPhoneNumber)
+        ? getVacationDelegateDisplayName(vacationDelegatePersonalDetails?.login ?? activeVacationDelegate, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber)
         : '';
+    // With no delegate there is nothing to show on the form yet, so go straight to picking one.
+    const vacationDelegateRoute = hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT;
     const vacationDelegateClearDate = hasVacationDelegate
         ? formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
         : '';
@@ -165,17 +168,16 @@ function ProfilePage() {
                     displayName={vacationDelegateName}
                     avatar={vacationDelegatePersonalDetails?.avatar}
                     accountID={vacationDelegatePersonalDetails?.accountID}
-                    login={vacationDelegatePersonalDetails?.login ?? vacationDelegate?.delegate}
+                    login={vacationDelegatePersonalDetails?.login ?? activeVacationDelegate}
                     untilText={vacationDelegateUntilText}
                     brickRoadIndicator={vacationDelegateBrickRoadIndicator}
                 />
             ) : undefined,
             accessibilityLabel: hasVacationDelegate ? [translate('common.vacationDelegate'), vacationDelegateName, vacationDelegateUntilText].filter(Boolean).join(', ') : undefined,
-            // With no delegate there is nothing to show on the form yet, so go straight to picking one.
-            pageRoute: hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT,
+            pageRoute: vacationDelegateRoute,
             onPress: () => {
                 clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
-                Navigation.navigate(hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
+                Navigation.navigate(vacationDelegateRoute);
             },
             brickRoadIndicator: vacationDelegateBrickRoadIndicator,
             testID: 'vacation-delegate-menu-item',
diff --git a/tests/ui/DomainMemberVacationDelegateFormPageTest.tsx b/tests/ui/DomainMemberVacationDelegateFormPageTest.tsx
new file mode 100644
index 000000000000..c4b787870f61
--- /dev/null
+++ b/tests/ui/DomainMemberVacationDelegateFormPageTest.tsx
@@ -0,0 +1,98 @@
+import {render} from '@testing-library/react-native';
+
+import DelegatorList from '@components/DelegatorList';
+import VacationDelegateForm from '@components/VacationDelegateForm';
+
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+
+import DomainMemberVacationDelegateFormPage from '@pages/domain/Members/DomainMemberVacationDelegateFormPage';
+
+import SCREENS from '@src/SCREENS';
+import type {PersonalDetails} from '@src/types/onyx';
+import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+
+const DOMAIN_ACCOUNT_ID = 1;
+const MEMBER_ACCOUNT_ID = 2;
+const MEMBER_EMAIL = 'member@example.com';
+const MEMBER_TIMEZONE = 'Asia/Tokyo';
+
+let mockVacationDelegate: BaseVacationDelegate | undefined;
+let mockMemberPersonalDetails: PersonalDetails | undefined;
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+}));
+
+jest.mock('@components/ScreenWrapper', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/Header/composed/HeaderWithBackButtonAndTitle', () => jest.fn(() => null));
+jest.mock('@pages/domain/DomainNotFoundPageWrapper', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/VacationDelegateForm', () => jest.fn(() => null));
+jest.mock('@components/DelegatorList', () => jest.fn(() => null));
+
+jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({login: 'admin@example.com', timezone: {selected: 'America/Los_Angeles'}})));
+jest.mock('@hooks/useOnyx', () => jest.fn(() => [mockVacationDelegate]));
+jest.mock('@hooks/usePersonalDetails', () => ({usePersonalDetail: jest.fn(() => [mockMemberPersonalDetails])}));
+
+type DomainMemberVacationDelegateFormPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
+
+const route: DomainMemberVacationDelegateFormPageProps['route'] = {
+    key: 'domain-vacation-delegate',
+    name: SCREENS.DOMAIN.VACATION_DELEGATE,
+    params: {domainAccountID: DOMAIN_ACCOUNT_ID, accountID: MEMBER_ACCOUNT_ID},
+};
+// The screen does not read navigation; this inert test double only satisfies the navigator-provided prop.
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+const navigation = {} as DomainMemberVacationDelegateFormPageProps['navigation'];
+
+function renderPage() {
+    return render(
+        <DomainMemberVacationDelegateFormPage
+            route={route}
+            navigation={navigation}
+        />,
+    );
+}
+
+describe('DomainMemberVacationDelegateFormPage', () => {
+    const mockedVacationDelegateForm = jest.mocked(VacationDelegateForm);
+    const mockedDelegatorList = jest.mocked(DelegatorList);
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockVacationDelegate = {creator: 'admin@example.com', delegate: 'delegate@example.com'};
+        mockMemberPersonalDetails = {accountID: MEMBER_ACCOUNT_ID, login: MEMBER_EMAIL, timezone: {selected: MEMBER_TIMEZONE}};
+    });
+
+    it('picks the clear date in the member’s timezone, not the admin’s', () => {
+        // Given an admin in Los Angeles editing the delegate of a member whose Profile timezone is Tokyo
+        // When the form page opens
+        renderPage();
+
+        // Then the form reads and builds the clear date in the member's timezone, so the delegate clears at the end of the vacationer's day
+        expect(mockedVacationDelegateForm.mock.lastCall?.[0]).toEqual(expect.objectContaining({timezone: MEMBER_TIMEZONE}));
+        expect(mockedDelegatorList).not.toHaveBeenCalled();
+    });
+
+    it('shows the delegator list instead of the form while the member is someone else’s delegate', () => {
+        // Given a member with a saved delegate, who is also the vacation delegate for another member
+        mockVacationDelegate = {creator: 'admin@example.com', delegate: 'delegate@example.com', delegatorFor: ['other@example.com']};
+
+        // When the form page opens
+        renderPage();
+
+        // Then the admin can't change the date or remove the delegate, same as on the member picker
+        expect(mockedVacationDelegateForm).not.toHaveBeenCalled();
+        expect(mockedDelegatorList.mock.lastCall?.[0]).toEqual({
+            delegators: ['other@example.com'],
+            message: 'domain.members.cannotSetVacationDelegateForMember',
+        });
+    });
+});
diff --git a/tests/unit/components/VacationDelegateMenuItemTest.tsx b/tests/unit/components/VacationDelegateMenuItemTest.tsx
index eb4c118a4b86..baf0caa917f8 100644
--- a/tests/unit/components/VacationDelegateMenuItemTest.tsx
+++ b/tests/unit/components/VacationDelegateMenuItemTest.tsx
@@ -256,9 +256,10 @@ describe('VacationDelegateMenuItem', () => {
             />,
         );
 
-        // Then it is not shown as an active delegate, since approvals no longer go to them
+        // Then it is not shown as an active delegate, since approvals no longer go to them, and its personal details aren't looked up for a row that hides them
         expect(screen.queryByText('Jane Doe')).toBeNull();
         expect(screen.getByText('common.vacationDelegate')).toBeTruthy();
+        expect(mockUseVacationDelegatePersonalDetails).toHaveBeenLastCalledWith(undefined);
     });
 
     it('shows when the delegate clears', () => {
diff --git a/tests/unit/libs/VacationDelegateUtilsTest.ts b/tests/unit/libs/VacationDelegateUtilsTest.ts
index 0d82e21570ca..006e14e29da2 100644
--- a/tests/unit/libs/VacationDelegateUtilsTest.ts
+++ b/tests/unit/libs/VacationDelegateUtilsTest.ts
@@ -1,5 +1,6 @@
 import {
     formatVacationDelegateClearDateTime,
+    getActiveVacationDelegate,
     getVacationDelegateClearAfter,
     getVacationDelegateClearDate,
     getVacationDelegateClearDateTime,
@@ -99,6 +100,18 @@ describe('VacationDelegateUtils', () => {
         });
     });
 
+    describe('getActiveVacationDelegate', () => {
+        it('returns the delegate only while it is still in effect', () => {
+            // Given the current time is 2026-09-28 12:00 UTC
+            // When a delegate that clears later, one that never clears, one that already cleared, and no delegate are checked
+            // Then only the first two are still in effect, so every screen hides an expired delegate the same way
+            expect(getActiveVacationDelegate({delegate: 'jane@example.com', clearAfter: '2026-09-28 12:00:01'})).toBe('jane@example.com');
+            expect(getActiveVacationDelegate({delegate: 'jane@example.com'})).toBe('jane@example.com');
+            expect(getActiveVacationDelegate({delegate: 'jane@example.com', clearAfter: '2026-09-28 11:59:59'})).toBeUndefined();
+            expect(getActiveVacationDelegate(undefined)).toBeUndefined();
+        });
+    });
+
     describe('isVacationDelegateClearDatePassed', () => {
         it('reads the clear date in the Profile timezone, not the device timezone', () => {
             // Given it is 2026-10-08 03:00 UTC: still Oct 7 in Los Angeles, already Oct 8 in Tokyo, and Oct 8 on the UTC test device

From b4c2607c783078a4cac70255983b179eaf1e6480 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 21:46:53 +0000
Subject: [PATCH 405/781] Address review on vacation delegates: page-driven
 Save spinner, queued date-only saves, offline greying, and dropping
 superseded sets on removal

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/VacationDelegateForm.tsx       | 89 ++++++++++++-------
 src/libs/actions/RequestConflictUtils.ts      | 31 +++++++
 src/libs/actions/VacationDelegate.ts          | 10 ++-
 .../DomainMemberVacationDelegatePage.tsx      |  5 ++
 .../CustomStatus/VacationDelegateFormPage.tsx | 29 ++++--
 src/pages/settings/Profile/ProfilePage.tsx    | 48 ++++++----
 tests/ui/VacationDelegateFormPageTest.tsx     | 66 +++++++++++++-
 tests/unit/RequestConflictUtilsTest.ts        | 29 ++++++
 8 files changed, 249 insertions(+), 58 deletions(-)

diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 006c5595d8da..4ad6b8cbe6de 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -1,4 +1,5 @@
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useInitialSelection from '@hooks/useInitialSelection';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -31,6 +32,7 @@ import DatePicker from './DatePicker';
 import FormProvider from './Form/FormProvider';
 import InputWrapper from './Form/InputWrapper';
 import MenuItemAction from './MenuItem/presets/MenuItemAction';
+import OfflineWithFeedback from './OfflineWithFeedback';
 import Text from './Text';
 import TimeModalPicker from './TimeModalPicker';
 import VacationDelegateMenuItem from './VacationDelegateMenuItem';
@@ -69,9 +71,23 @@ type VacationDelegateFormProps = {
 
     /** Dismisses `errors` */
     onCloseError?: () => void;
+
+    /** Whether the save request is still running, which shows the spinner on the Save button */
+    isLoading?: boolean;
 };
 
-function VacationDelegateForm({vacationDelegate, description, timezone: timezoneProp, onChangeDelegate, onSubmit, onRemove, errors, pendingAction, onCloseError}: VacationDelegateFormProps) {
+function VacationDelegateForm({
+    vacationDelegate,
+    description,
+    timezone: timezoneProp,
+    onChangeDelegate,
+    onSubmit,
+    onRemove,
+    errors,
+    pendingAction,
+    onCloseError,
+    isLoading = false,
+}: VacationDelegateFormProps) {
     const styles = useThemeStyles();
     const {translate, dateFnsLocale, getLocalDateFromDatetime} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['CalendarSolid', 'Trashcan']);
@@ -80,6 +96,9 @@ function VacationDelegateForm({vacationDelegate, description, timezone: timezone
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM_DRAFT);
 
     const savedDelegate = getActiveVacationDelegate(vacationDelegate);
+    // Remove reflects the delegate saved when the form opened. Otherwise the optimistic write from this form's own Save
+    // would make the button appear while the request runs and the RHP closes.
+    const savedDelegateOnOpen = useInitialSelection(savedDelegate);
     const savedClearDateTime = savedDelegate ? getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, timezone) : '';
     const savedClearDate = savedDelegate ? getVacationDelegateClearDate(vacationDelegate?.clearAfter, timezone) : '';
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty draft means no member was picked yet
@@ -122,6 +141,10 @@ function VacationDelegateForm({vacationDelegate, description, timezone: timezone
             submitButtonText={translate('common.save')}
             submitButtonStyles={styles.ph5}
             isSubmitDisabled={!delegate}
+            isLoading={isLoading}
+            // The press spinner only resets when the screen regains focus, which the error modal never takes away, so it would stay on
+            // after a failed save. The page drives the spinner through isLoading instead.
+            shouldShowLoadingImmediatelyOnPress={false}
             enabledWhenOffline
             shouldHideFixErrorsAlert
         >
@@ -134,39 +157,45 @@ function VacationDelegateForm({vacationDelegate, description, timezone: timezone
                 onCloseError={onCloseError}
                 onPress={onChangeDelegate}
             />
-            <View style={styles.ph5}>
-                {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups.
-                    The earliest day is today in the form's timezone, so it matches the validation even when the device is in another timezone. */}
-                <InputWrapper
-                    InputComponent={DatePicker}
-                    inputID={INPUT_IDS.CLEAR_AFTER_DATE}
-                    label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
-                    defaultValue={savedClearDate}
-                    minDate={getLocalDateFromDatetime(undefined, timezone)}
-                    icon={icons.CalendarSolid}
-                    shouldForceActiveLabel={false}
-                    shouldKeepCalendarIconWhenSelected
-                    shouldHideClearButton
-                    shouldSaveDraft
-                />
-            </View>
-            {/* The time only means something once a day is picked. Until it is changed, the delegate clears at the end of that day. */}
-            {!!clearDate && (
-                <View style={styles.mt2}>
+            {/* The clear after date and time belong to the same pending save as the delegate, so they grey out with it */}
+            <OfflineWithFeedback
+                pendingAction={pendingAction}
+                shouldHideOnDelete={false}
+            >
+                <View style={styles.ph5}>
+                    {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups.
+                        The earliest day is today in the form's timezone, so it matches the validation even when the device is in another timezone. */}
                     <InputWrapper
-                        InputComponent={TimeModalPicker}
-                        inputID={INPUT_IDS.CLEAR_AFTER_TIME}
-                        label={translate('statusPage.time')}
-                        defaultValue={savedClearDateTime || DateUtils.getEndOfToday()}
+                        InputComponent={DatePicker}
+                        inputID={INPUT_IDS.CLEAR_AFTER_DATE}
+                        label={translate('statusPage.vacationDelegate.clearAfterRecommended')}
+                        defaultValue={savedClearDate}
+                        minDate={getLocalDateFromDatetime(undefined, timezone)}
+                        icon={icons.CalendarSolid}
+                        shouldForceActiveLabel={false}
+                        shouldKeepCalendarIconWhenSelected
+                        shouldHideClearButton
                         shouldSaveDraft
                     />
                 </View>
-            )}
-            {/* The bottom margin matches the date input's own, so the remove button below sits the same distance from whichever is last */}
-            {!!formattedClearDateTime && (
-                <Text style={[styles.mh5, styles.textLabelSupporting, styles.mt2, styles.mb2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDateTime)}</Text>
-            )}
-            {!!savedDelegate && (
+                {/* The time only means something once a day is picked. Until it is changed, the delegate clears at the end of that day. */}
+                {!!clearDate && (
+                    <View style={styles.mt2}>
+                        <InputWrapper
+                            InputComponent={TimeModalPicker}
+                            inputID={INPUT_IDS.CLEAR_AFTER_TIME}
+                            label={translate('statusPage.time')}
+                            defaultValue={savedClearDateTime || DateUtils.getEndOfToday()}
+                            shouldSaveDraft
+                        />
+                    </View>
+                )}
+                {/* The bottom margin matches the date input's own, so the remove button below sits the same distance from whichever is last */}
+                {!!formattedClearDateTime && (
+                    <Text style={[styles.mh5, styles.textLabelSupporting, styles.mt2, styles.mb2]}>{translate('statusPage.vacationDelegate.willClearOn', formattedClearDateTime)}</Text>
+                )}
+            </OfflineWithFeedback>
+            {!!savedDelegateOnOpen && !!savedDelegate && (
                 <View style={styles.mt4}>
                     <MenuItemAction
                         title={translate('statusPage.vacationDelegate.removeDelegate')}
diff --git a/src/libs/actions/RequestConflictUtils.ts b/src/libs/actions/RequestConflictUtils.ts
index 0510b5b5f999..ae7d43c3a0b2 100644
--- a/src/libs/actions/RequestConflictUtils.ts
+++ b/src/libs/actions/RequestConflictUtils.ts
@@ -410,6 +410,36 @@ function resolveDetachReceiptConflicts<TKey extends OnyxKey>(
     };
 }
 
+/**
+ * Removing the vacation delegate supersedes any change to it still waiting in the queue, e.g. a clear after date changed offline
+ * before the removal. Sending that change first would let its response bring the removed delegate back until the removal lands.
+ * Only the current user's own delegate is matched, so a domain admin's change for a member is left alone.
+ */
+function resolveVacationDelegateDeletionConflicts<TKey extends OnyxKey>(persistedRequests: Array<OnyxRequest<TKey>>): ConflictActionData {
+    const indicesToDelete = persistedRequests.reduce<number[]>((indices, request, index) => {
+        if (request.command === WRITE_COMMANDS.SET_VACATION_DELEGATE && !request.data?.domainAccountID) {
+            indices.push(index);
+        }
+        return indices;
+    }, []);
+
+    if (indicesToDelete.length === 0) {
+        return {
+            conflictAction: {
+                type: 'push',
+            },
+        };
+    }
+
+    return {
+        conflictAction: {
+            type: 'delete',
+            indices: indicesToDelete,
+            pushNewRequest: true,
+        },
+    };
+}
+
 export {
     resolveDuplicationConflictAction,
     resolveOpenAppDuplicationConflictAction,
@@ -425,6 +455,7 @@ export {
     resolveEnableFeatureConflicts,
     enablePolicyFeatureCommand,
     resolveDetachReceiptConflicts,
+    resolveVacationDelegateDeletionConflicts,
 };
 
 export type {EnablePolicyFeatureCommand, AnyRequestMatcher};
diff --git a/src/libs/actions/VacationDelegate.ts b/src/libs/actions/VacationDelegate.ts
index cb2c8eb38727..50caf49c90f6 100644
--- a/src/libs/actions/VacationDelegate.ts
+++ b/src/libs/actions/VacationDelegate.ts
@@ -23,6 +23,7 @@ import Onyx from 'react-native-onyx';
 import type {CurrentUser} from './Policy/Policy';
 
 import {addMembersToWorkspace} from './Policy/Member';
+import {resolveVacationDelegateDeletionConflicts} from './RequestConflictUtils';
 
 type SetVacationDelegateOptions = {
     creator: string;
@@ -181,7 +182,14 @@ function deleteVacationDelegate(vacationDelegate?: VacationDelegate) {
         },
     ];
 
-    API.write(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, null, {optimisticData, successData, failureData});
+    API.write(
+        WRITE_COMMANDS.DELETE_VACATION_DELEGATE,
+        null,
+        {optimisticData, successData, failureData},
+        {
+            checkAndFixConflictingRequest: (persistedRequests) => resolveVacationDelegateDeletionConflicts(persistedRequests),
+        },
+    );
 }
 
 function clearVacationDelegateError(previousDelegate?: string, previousClearAfter?: string) {
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
index 2177c2e531fc..d6f12b826966 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
@@ -1,6 +1,7 @@
 import BaseVacationDelegateSelectionComponent from '@components/BaseVacationDelegateSelectionComponent';
 import ScreenWrapper from '@components/ScreenWrapper';
 
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
@@ -33,6 +34,7 @@ const draftDelegateSelector = (draft: OnyxEntry<VacationDelegateForm>) => draft?
 function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegatePageProps) {
     const {domainAccountID, accountID} = route.params;
     const {translate} = useLocalize();
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
 
     const [vacationDelegate] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: vacationDelegateSelector(accountID),
@@ -75,6 +77,9 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
                     onBackButtonPress={() => Navigation.goBack()}
                     cannotSetDelegateMessage={translate('domain.members.cannotSetVacationDelegateForMember', memberLogin ?? '')}
                     additionalExcludeLogins={memberLogin ? {[memberLogin]: true} : undefined}
+                    // The member can't be their own delegate. The current user is included by default, and that would override the
+                    // member exclusion above when an admin opens their own member page.
+                    includeCurrentUser={memberLogin !== currentUserLogin}
                 />
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
index e1fb8b2de6d0..c0ffa0484964 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegateFormPage.tsx
@@ -20,7 +20,7 @@ import ROUTES from '@src/ROUTES';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useNavigation} from '@react-navigation/native';
-import React, {useRef} from 'react';
+import React, {useRef, useState} from 'react';
 import {View} from 'react-native';
 
 function goBackToProfile() {
@@ -45,6 +45,8 @@ function VacationDelegateFormPage() {
     const hasActiveDelegations = !!vacationDelegate?.delegatorFor?.length;
 
     const isSubmittingRef = useRef(false);
+    // Drives the Save spinner and stays on until the error modal is dismissed, so the modal is the only place a save error shows
+    const [isSaving, setIsSaving] = useState(false);
 
     const showErrorModal = async (delegateToRestore?: string, clearAfterToRestore?: string, message?: string) => {
         await showConfirmModal({
@@ -62,12 +64,22 @@ function VacationDelegateFormPage() {
             return;
         }
 
-        isSubmittingRef.current = true;
         const hasUnconfirmedChange = !!vacationDelegate?.pendingAction || !isEmptyObject(vacationDelegate?.errors) || !!vacationDelegate?.policyDiff;
         const currentDelegate = hasUnconfirmedChange ? vacationDelegate?.previousDelegate : vacationDelegate?.delegate;
         const currentClearAfter = hasUnconfirmedChange ? vacationDelegate?.previousClearAfter : vacationDelegate?.clearAfter;
+
+        // Only the clear after date or time changed. The delegate was already accepted, so there's no policy diff to read, and a queued
+        // write keeps the change optimistic offline instead of failing a one-off request.
+        if (delegate === vacationDelegate?.delegate) {
+            setVacationDelegate({creator: currentUserLogin, delegate, clearAfter, currentDelegate, currentClearAfter, shouldOverridePolicyDiffWarning: true});
+            goBackToProfile();
+            return;
+        }
+
+        isSubmittingRef.current = true;
+        setIsSaving(true);
         setVacationDelegate({creator: currentUserLogin, delegate, clearAfter, currentDelegate, currentClearAfter})
-            .then((response) => {
+            .then(async (response) => {
                 if (!navigation.isFocused()) {
                     if (response?.data?.policyDiff) {
                         clearVacationDelegateError(currentDelegate, currentClearAfter);
@@ -83,22 +95,24 @@ function VacationDelegateFormPage() {
                 // The action leaves the failure on the NVP for the profile page's red brick road, but the user is still on this screen,
                 // so report it where they are. Dismissing the modal restores the previous delegate, exactly as dismissing that error would.
                 if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                    showErrorModal(currentDelegate, currentClearAfter, response?.jsonCode === CONST.JSON_CODE.EXP_ERROR ? response.message : undefined);
+                    // Awaited so the spinner and the hidden inline error last until the modal is dismissed
+                    await showErrorModal(currentDelegate, currentClearAfter, response?.jsonCode === CONST.JSON_CODE.EXP_ERROR ? response.message : undefined);
                     return;
                 }
 
                 goBackToProfile();
             })
-            .catch(() => {
+            .catch(async () => {
                 if (!navigation.isFocused()) {
                     clearVacationDelegateError(currentDelegate, currentClearAfter);
                     return;
                 }
 
-                showErrorModal(currentDelegate, currentClearAfter);
+                await showErrorModal(currentDelegate, currentClearAfter);
             })
             .finally(() => {
                 isSubmittingRef.current = false;
+                setIsSaving(false);
             });
     };
 
@@ -132,8 +146,9 @@ function VacationDelegateFormPage() {
                     onChangeDelegate={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT)}
                     onSubmit={onSubmit}
                     onRemove={onRemove}
-                    errors={getVacationDelegateErrors(vacationDelegate)}
+                    errors={isSaving ? undefined : getVacationDelegateErrors(vacationDelegate)}
                     pendingAction={vacationDelegate?.pendingAction}
+                    isLoading={isSaving}
                     onCloseError={() => clearVacationDelegateError(vacationDelegate?.previousDelegate, vacationDelegate?.previousClearAfter)}
                 />
             )}
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index 63505fd81324..b612fdd7be8e 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -54,6 +54,7 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ComponentRef, ReactNode} from 'react';
@@ -133,6 +134,9 @@ function ProfilePage() {
 
         /** Accessibility label for a row whose `content` is not plain text */
         accessibilityLabel?: string;
+
+        /** Greys the row out while a change to its value is waiting for the network */
+        pendingAction?: PendingAction;
     }> = [
         {
             description: translate('displayNamePage.headerTitle'),
@@ -180,6 +184,7 @@ function ProfilePage() {
                 Navigation.navigate(vacationDelegateRoute);
             },
             brickRoadIndicator: vacationDelegateBrickRoadIndicator,
+            pendingAction: vacationDelegate?.pendingAction ?? undefined,
             testID: 'vacation-delegate-menu-item',
             sentryLabel: CONST.SENTRY_LABEL.SETTINGS_PROFILE.VACATION_DELEGATE,
         },
@@ -325,27 +330,32 @@ function ProfilePage() {
                             {publicOptions.map((detail) => {
                                 const {pageRoute} = detail;
                                 return (
-                                    <MenuItemSectionRoot
+                                    <OfflineWithFeedback
                                         key={detail.testID}
-                                        onPress={detail.onPress ?? (pageRoute ? () => Navigation.navigate(pageRoute) : undefined)}
-                                        testID={detail?.testID}
-                                        sentryLabel={detail.sentryLabel}
-                                        accessibilityLabel={detail.accessibilityLabel}
+                                        pendingAction={detail.pendingAction}
+                                        shouldHideOnDelete={false}
                                     >
-                                        {detail.content ?? (
-                                            <MenuItemField.Row
-                                                name={detail.description}
-                                                value={detail.title}
-                                            >
-                                                {(!!detail.brickRoadIndicator || !!pageRoute) && (
-                                                    <>
-                                                        {!!detail.brickRoadIndicator && <MenuItem.BrickRoadIndicator status={detail.brickRoadIndicator} />}
-                                                        {!!pageRoute && <MenuItem.Chevron />}
-                                                    </>
-                                                )}
-                                            </MenuItemField.Row>
-                                        )}
-                                    </MenuItemSectionRoot>
+                                        <MenuItemSectionRoot
+                                            onPress={detail.onPress ?? (pageRoute ? () => Navigation.navigate(pageRoute) : undefined)}
+                                            testID={detail?.testID}
+                                            sentryLabel={detail.sentryLabel}
+                                            accessibilityLabel={detail.accessibilityLabel}
+                                        >
+                                            {detail.content ?? (
+                                                <MenuItemField.Row
+                                                    name={detail.description}
+                                                    value={detail.title}
+                                                >
+                                                    {(!!detail.brickRoadIndicator || !!pageRoute) && (
+                                                        <>
+                                                            {!!detail.brickRoadIndicator && <MenuItem.BrickRoadIndicator status={detail.brickRoadIndicator} />}
+                                                            {!!pageRoute && <MenuItem.Chevron />}
+                                                        </>
+                                                    )}
+                                                </MenuItemField.Row>
+                                            )}
+                                        </MenuItemSectionRoot>
+                                    </OfflineWithFeedback>
                                 );
                             })}
                             <Button
diff --git a/tests/ui/VacationDelegateFormPageTest.tsx b/tests/ui/VacationDelegateFormPageTest.tsx
index 17b5a402ab6a..f21bbfcce368 100644
--- a/tests/ui/VacationDelegateFormPageTest.tsx
+++ b/tests/ui/VacationDelegateFormPageTest.tsx
@@ -71,10 +71,11 @@ jest.mock('@components/VacationDelegateForm', () => {
     const ReactMock = jest.requireActual<typeof React>('react');
     const {Pressable, Text} = jest.requireActual<{Pressable: typeof ReactNativePressable; Text: typeof ReactNativeText}>('react-native');
 
-    return ({onSubmit, onRemove}: {onSubmit: (delegate: string, clearAfter: string | undefined) => void; onRemove: () => void}) =>
+    return ({onSubmit, onRemove, isLoading}: {onSubmit: (delegate: string, clearAfter: string | undefined) => void; onRemove: () => void; isLoading?: boolean}) =>
         ReactMock.createElement(
             ReactMock.Fragment,
             null,
+            ReactMock.createElement(Text, {testID: 'save-loading'}, String(!!isLoading)),
             ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSubmit('delegateA@example.com', undefined)}, ReactMock.createElement(Text, null, 'select-a')),
             ReactMock.createElement(Pressable, {testID: 'select-delegate-b', onPress: () => onSubmit('delegateB@example.com', undefined)}, ReactMock.createElement(Text, null, 'select-b')),
             ReactMock.createElement(
@@ -301,6 +302,69 @@ describe('VacationDelegateFormPage', () => {
         expect(mockShowConfirmModal).toHaveBeenCalledWith(expect.objectContaining({prompt: TestHelper.translateLocal('statusPage.vacationDelegateError')}));
     });
 
+    it('keeps Save loading until the error modal is dismissed, then lets it submit again', async () => {
+        // Given a request that fails, and an error modal held open until the test dismisses it
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.BAD_REQUEST}));
+        let dismissModal: () => void = () => {};
+        mockShowConfirmModal.mockImplementation(
+            () =>
+                new Promise((resolve) => {
+                    dismissModal = () => resolve({action: 'CONFIRM'});
+                }),
+        );
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the save fails and the error modal shows
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then Save keeps spinning while the modal is open, so the modal is the only place the error shows
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+        expect(screen.getByTestId('save-loading')).toHaveTextContent('true');
+
+        // When the modal is dismissed
+        await act(async () => {
+            dismissModal();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then Save stops loading and a new save is sent instead of being ignored as still pending
+        expect(screen.getByTestId('save-loading')).toHaveTextContent('false');
+        fireEvent.press(screen.getByTestId('select-delegate-a'));
+        await waitForBatchedUpdatesWithAct();
+        expect(apiSideEffectSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it('queues the save when only the clear after date of the saved delegate changes', async () => {
+        // Given a saved delegate, and a queued write mocked so only what the page sends is under test
+        const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
+        apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS}));
+        // jest.mock's factory functions (unlike jest.spyOn) are not reset by jest.restoreAllMocks() in afterEach, so call counts otherwise leak across tests in this file.
+        jest.mocked(Navigation.goBack).mockClear();
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: DELEGATE_B_EMAIL});
+        });
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the same delegate is saved with a new clear after date
+        fireEvent.press(screen.getByTestId('select-delegate-b-with-date'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it goes through the queued write with the policy diff warning overridden, since the delegate was already accepted,
+        // so the change stays optimistic offline instead of failing a one-off request, and the page goes back to Profile
+        expect(apiWriteSpy).toHaveBeenCalledWith(
+            WRITE_COMMANDS.SET_VACATION_DELEGATE,
+            expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL, clearAfter: CLEAR_AFTER, overridePolicyDiffWarning: true}),
+            expect.anything(),
+        );
+        expect(apiSideEffectSpy).not.toHaveBeenCalled();
+        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
+    });
+
     it('ignores a second row selection while the first request is still pending', async () => {
         // Given a request that never resolves, so the first pick stays "in flight" for the duration of the test
         apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => new Promise(() => {}));
diff --git a/tests/unit/RequestConflictUtilsTest.ts b/tests/unit/RequestConflictUtilsTest.ts
index 530341487647..9f5247245abc 100644
--- a/tests/unit/RequestConflictUtilsTest.ts
+++ b/tests/unit/RequestConflictUtilsTest.ts
@@ -8,6 +8,7 @@ import {
     resolveOpenAppDuplicationConflictAction,
     resolveOpenReportDuplicationConflictAction,
     resolveReconnectDuplicationConflictAction,
+    resolveVacationDelegateDeletionConflicts,
 } from '@libs/actions/RequestConflictUtils';
 import {WRITE_COMMANDS} from '@libs/API/types';
 
@@ -238,6 +239,34 @@ describe('RequestConflictUtils', () => {
         });
     });
 
+    describe('resolveVacationDelegateDeletionConflicts', () => {
+        it('drops a queued self-service set and keeps a domain admin set for a member', () => {
+            // Given a self-service set queued offline (e.g. a changed clear after date) next to a domain admin's set for a member
+            const persistedRequests = [
+                {command: WRITE_COMMANDS.SET_VACATION_DELEGATE, data: {vacationDelegateEmail: 'delegate@example.com', clearAfter: '2026-10-02 06:59:59'}},
+                {command: 'OpenReport'},
+                {command: WRITE_COMMANDS.SET_VACATION_DELEGATE, data: {vacationDelegateEmail: 'delegate@example.com', domainAccountID: 123}},
+            ];
+
+            // When the user removes their own delegate
+            const result = resolveVacationDelegateDeletionConflicts<OnyxKey>(persistedRequests);
+
+            // Then only the self-service set is dropped, since its response would bring the removed delegate back, and the removal is still sent
+            expect(result).toEqual({conflictAction: {type: 'delete', indices: [0], pushNewRequest: true}});
+        });
+
+        it('pushes when no self-service set is queued', () => {
+            // Given a queue with only unrelated requests and a domain admin's set for a member
+            const persistedRequests = [{command: 'OpenReport'}, {command: WRITE_COMMANDS.SET_VACATION_DELEGATE, data: {domainAccountID: 123}}];
+
+            // When the user removes their own delegate
+            const result = resolveVacationDelegateDeletionConflicts<OnyxKey>(persistedRequests);
+
+            // Then nothing is dropped and the removal is pushed as usual
+            expect(result).toEqual({conflictAction: {type: 'push'}});
+        });
+    });
+
     describe('resolveDetachReceiptConflicts', () => {
         it('returns push when no replace-receipt requests match transactionID', () => {
             const persistedRequests = [{command: 'OpenReport'}, {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '2'}}, {command: 'CloseAccount'}];

From 4c176fca99f1ac1d58bfce9588e193ff7c57ba9c Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 9 Oct 2026 22:33:41 +0000
Subject: [PATCH 406/781] Apply a picked vacation delegate only after the
 backend saves it unless the policy diff warning is overridden, and keep the
 date input's default active label

Also fix the setDomainVacationDelegate optimistic merge type and the remove test's DeleteVacationDelegate assertion, which were failing typecheck and Jest on CI.

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/VacationDelegateForm.tsx   |   1 -
 src/libs/actions/Domain.ts                |   4 +-
 src/libs/actions/VacationDelegate.ts      |  10 +-
 tests/actions/VacationDelegateTest.ts     | 151 ++++++++++++++--------
 tests/ui/VacationDelegateFormPageTest.tsx |  13 +-
 5 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 4ad6b8cbe6de..00b1afebeb4f 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -172,7 +172,6 @@ function VacationDelegateForm({
                         defaultValue={savedClearDate}
                         minDate={getLocalDateFromDatetime(undefined, timezone)}
                         icon={icons.CalendarSolid}
-                        shouldForceActiveLabel={false}
                         shouldKeepCalendarIconWhenSelected
                         shouldHideClearButton
                         shouldSaveDraft
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index e9e3970b0331..e4c83f87a9d1 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1684,8 +1684,8 @@ function setDomainVacationDelegate(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
-                [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}` as const]: optimisticVacationDelegate,
-            },
+                [`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${domainMemberAccountID}`]: optimisticVacationDelegate,
+            } as PrefixedRecord<typeof CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX, NullishDeep<BaseVacationDelegate>>,
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
diff --git a/src/libs/actions/VacationDelegate.ts b/src/libs/actions/VacationDelegate.ts
index 50caf49c90f6..52a4a8dcfb48 100644
--- a/src/libs/actions/VacationDelegate.ts
+++ b/src/libs/actions/VacationDelegate.ts
@@ -37,15 +37,18 @@ type SetVacationDelegateOptions = {
 };
 
 async function setVacationDelegate({creator, delegate, clearAfter, currentDelegate, currentClearAfter, shouldOverridePolicyDiffWarning = false}: SetVacationDelegateOptions) {
+    // Without the override, the response can still be a 305 that leads to the missing workspaces step, so the pick is only applied once the
+    // backend saved it. Applying it optimistically would flash the new delegate on Profile, take it away on the 305, and show it again after that step.
+    const pickedDelegate = {creator, delegate, clearAfter: clearAfter ?? null};
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE,
             value: {
-                creator,
-                delegate,
-                clearAfter: clearAfter ?? null,
+                ...(shouldOverridePolicyDiffWarning ? pickedDelegate : {}),
                 errors: null,
+                // Set on both paths: the 305 ships an errors payload in its onyxData, and getVacationDelegateErrors only hides it while this is set
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 previousDelegate: currentDelegate ?? null,
                 previousClearAfter: currentClearAfter ?? null,
@@ -61,6 +64,7 @@ async function setVacationDelegate({creator, delegate, clearAfter, currentDelega
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE,
             value: {
+                ...(shouldOverridePolicyDiffWarning ? {} : pickedDelegate),
                 errors: null,
                 pendingAction: null,
                 previousDelegate: null,
diff --git a/tests/actions/VacationDelegateTest.ts b/tests/actions/VacationDelegateTest.ts
index fe5be969f750..58c1084c9dfd 100644
--- a/tests/actions/VacationDelegateTest.ts
+++ b/tests/actions/VacationDelegateTest.ts
@@ -1,4 +1,5 @@
 import {clearVacationDelegateError, deleteVacationDelegate, setVacationDelegate} from '@libs/actions/VacationDelegate';
+import * as API from '@libs/API';
 import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import getVacationDelegateErrors from '@libs/getVacationDelegateErrors';
 
@@ -6,8 +7,11 @@ import CONST from '@src/CONST';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type Response from '@src/types/onyx/Response';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
+import type {OnyxKey} from 'react-native-onyx';
+
 import Onyx from 'react-native-onyx';
 
 import getOnyxValue from '../utils/getOnyxValue';
@@ -29,9 +33,25 @@ describe('actions/VacationDelegate', () => {
     afterEach(() => jest.restoreAllMocks());
 
     describe('setVacationDelegate', () => {
+        /**
+         * Mocks the side effect request so it applies the optimistic data it is handed, then runs `respond` for the response. This is
+         * what the real request pipeline does, so the test sees what the action itself writes before the response arrives.
+         */
+        function mockSideEffectRequest(respond: () => Response<OnyxKey> | Promise<Response<OnyxKey>>) {
+            return jest.spyOn(API, 'makeRequestWithSideEffects').mockImplementation(async (_command, _parameters, onyxData) => {
+                await Onyx.update(onyxData?.optimisticData ?? []);
+                return respond();
+            });
+        }
+
+        /** Builds the 305 policy diff warning Auth sends when the picked delegate is missing from some of the vacationer's workspaces */
+        function getPolicyDiffWarningResponse(policyDiff = {adminPolicies: ['1'], nonAdminPolicies: [] as string[]}): Response<OnyxKey> {
+            return {jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff, phpCommandName: 'SetVacationDelegate', authWriteCommands: []}};
+        }
+
         it('sends SetVacationDelegate with the mapped params and clears policyDiff optimistically', async () => {
             // Given the API side-effect call is mocked, since only the shape of the outgoing request matters here
-            const apiSideEffectSpy = jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(() => Promise.resolve());
+            const apiSideEffectSpy = mockSideEffectRequest(() => ({jsonCode: CONST.JSON_CODE.SUCCESS}));
 
             // When a delegate is picked while another delegate is already saved
             await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', currentDelegate: 'old@test.com'});
@@ -64,6 +84,11 @@ describe('actions/VacationDelegate', () => {
             // failureData would make the request pipeline write an error we immediately have to clear, flashing a red
             // brick road. The action applies it from the response instead.
             expect(apiSideEffectSpy.mock.calls.at(0)?.at(2)).not.toHaveProperty('failureData');
+
+            // Then the pick is only in the success data, because the response can still be a 305 and applying it optimistically would flash it on Profile
+            const onyxData = apiSideEffectSpy.mock.calls.at(0)?.[2];
+            expect(onyxData?.optimisticData?.at(0)?.value).not.toHaveProperty('delegate');
+            expect(onyxData?.successData?.at(0)?.value).toEqual(expect.objectContaining({creator: 'admin@test.com', delegate: 'delegate@test.com'}));
         });
 
         it('sends a persisted write instead of a side effect request once the policy diff warning is overridden', async () => {
@@ -74,8 +99,13 @@ describe('actions/VacationDelegate', () => {
             // When the user confirms the missing-workspaces step, so the override flag is set
             await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', shouldOverridePolicyDiffWarning: true});
 
-            // Then only the persisted write fires, because the 305 can no longer come back and the request needs to survive offline
-            expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.SET_VACATION_DELEGATE, expect.objectContaining({overridePolicyDiffWarning: true}), expect.anything());
+            // Then only the persisted write fires, because the 305 can no longer come back and the request needs to survive offline,
+            // and the pick is applied optimistically, since there is no 305 left that could take it away
+            expect(apiWriteSpy).toHaveBeenCalledWith(
+                WRITE_COMMANDS.SET_VACATION_DELEGATE,
+                expect.objectContaining({overridePolicyDiffWarning: true}),
+                expect.objectContaining({optimisticData: [expect.objectContaining({value: expect.objectContaining({delegate: 'delegate@test.com'})})]}),
+            );
             expect(apiSideEffectSpy).not.toHaveBeenCalled();
         });
 
@@ -128,17 +158,7 @@ describe('actions/VacationDelegate', () => {
                 callback: (value) => errorStates.push(value?.errors),
             });
 
-            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => {
-                // The optimistic data is applied before the response resolves.
-                await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                    creator: 'admin@test.com',
-                    delegate: 'delegate@test.com',
-                    previousDelegate: 'old@test.com',
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    errors: null,
-                });
-                return {jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff}};
-            });
+            mockSideEffectRequest(() => getPolicyDiffWarningResponse(policyDiff));
 
             // When a delegate is picked
             await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', currentDelegate: 'old@test.com'});
@@ -161,14 +181,7 @@ describe('actions/VacationDelegate', () => {
             // Given a 305 whose onyxData carries an errors payload
             const policyDiff = {adminPolicies: [], nonAdminPolicies: ['79705898949FB240']};
 
-            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => {
-                await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                    creator: 'admin@test.com',
-                    delegate: 'delegate@test.com',
-                    previousDelegate: 'old@test.com',
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    errors: null,
-                });
+            mockSideEffectRequest(async () => {
                 // Auth returns 305 so the client can prompt, but the same response carries an errors payload in
                 // onyxData, which the API layer applies before the caller ever sees the response.
                 await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
@@ -176,7 +189,7 @@ describe('actions/VacationDelegate', () => {
                     // eslint-disable-next-line @typescript-eslint/naming-convention
                     errors: {1788970253939928: "Vacation delegate is not part of all of vacationer's policies."},
                 });
-                return {jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff}};
+                return getPolicyDiffWarningResponse(policyDiff);
             });
 
             // When a delegate is picked
@@ -192,18 +205,60 @@ describe('actions/VacationDelegate', () => {
             expect(vacationDelegate?.pendingDelegate).toBe('delegate@test.com');
         });
 
-        it('clears the delegate on a 305 when there was no delegate saved before the pick', async () => {
-            // Given no saved delegate and a mocked 305
-            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => {
+        it('never writes the picked delegate to delegate when the response is a 305', async () => {
+            // Given a saved delegate, an Onyx subscriber recording every delegate value the NVP takes on, and a mocked 305
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: 'admin@test.com', delegate: 'old@test.com'});
+            const delegateStates: Array<string | undefined> = [];
+            const connection = Onyx.connectWithoutView({
+                key: ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE,
+                callback: (value) => delegateStates.push(value?.delegate),
+            });
+            mockSideEffectRequest(() => getPolicyDiffWarningResponse());
+
+            // When a member who is missing from one of the workspaces is picked
+            await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', currentDelegate: 'old@test.com'});
+            await waitForBatchedUpdates();
+            Onyx.disconnect(connection);
+
+            // Then the pick never shows up as the delegate, because Profile would flash it, take it away on the 305, and show it again after the
+            // missing workspaces step. The saved delegate stays in place the whole time.
+            expect(delegateStates.length).toBeGreaterThan(0);
+            expect(delegateStates).not.toContain('delegate@test.com');
+            expect(delegateStates.every((delegate) => delegate === 'old@test.com')).toBe(true);
+        });
+
+        it('never surfaces the errors the 305 ships in its onyxData through getVacationDelegateErrors', async () => {
+            // Given an Onyx subscriber recording the errors getVacationDelegateErrors returns for every NVP value, and a mocked 305 whose
+            // onyxData carries an errors payload that the API layer applies before the caller sees the response
+            const visibleErrors: Array<OnyxCommon.Errors | undefined> = [];
+            const connection = Onyx.connectWithoutView({
+                key: ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE,
+                callback: (value) => visibleErrors.push(getVacationDelegateErrors(value)),
+            });
+            mockSideEffectRequest(async () => {
                 await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                    creator: 'admin@test.com',
-                    delegate: 'delegate@test.com',
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    errors: null,
+                    // an ID map key is not a name!
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    errors: {1788970253939928: "Vacation delegate is not part of all of vacationer's policies."},
                 });
-                return {jsonCode: CONST.JSON_CODE.POLICY_DIFF_WARNING, data: {policyDiff: {adminPolicies: ['1'], nonAdminPolicies: []}}};
+                return getPolicyDiffWarningResponse();
             });
 
+            // When a delegate is picked
+            await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com'});
+            await waitForBatchedUpdates();
+            Onyx.disconnect(connection);
+
+            // Then the payload is never visible, because the optimistic pendingAction hides it until the action clears it, so the Profile row
+            // never flashes a red brick road for what is really the next step of the flow
+            expect(visibleErrors.length).toBeGreaterThan(0);
+            expect(visibleErrors.every(isEmptyObject)).toBe(true);
+        });
+
+        it('clears the delegate on a 305 when there was no delegate saved before the pick', async () => {
+            // Given no saved delegate and a mocked 305
+            mockSideEffectRequest(() => getPolicyDiffWarningResponse());
+
             // When the first delegate is picked
             await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com'});
             await waitForBatchedUpdates();
@@ -241,20 +296,11 @@ describe('actions/VacationDelegate', () => {
         });
 
         it('applies the failureData it could not attach when the response fails, since the caller may have already navigated away', async () => {
-            // Given a mocked non-305 error response, with no failureData attached to the request (see the first test
-            // above), so the action has to apply it itself instead of relying on a caller that may no longer be mounted
+            // Given a saved delegate and a mocked non-305 error response, with no failureData attached to the request (see the first
+            // test above), so the action has to apply it itself instead of relying on a caller that may no longer be mounted
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: 'admin@test.com', delegate: 'old@test.com'});
             const response = {jsonCode: CONST.JSON_CODE.EXP_ERROR, message: 'Nope'};
-            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => {
-                // The optimistic data is applied before the response resolves.
-                await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                    creator: 'admin@test.com',
-                    delegate: 'delegate@test.com',
-                    previousDelegate: 'old@test.com',
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    errors: null,
-                });
-                return response;
-            });
+            mockSideEffectRequest(() => response);
 
             // When the pick fails
             await expect(setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', currentDelegate: 'old@test.com'})).resolves.toEqual(response);
@@ -265,23 +311,16 @@ describe('actions/VacationDelegate', () => {
             expect(vacationDelegate?.pendingAction).toBeFalsy();
             expect(vacationDelegate?.errors).toBeTruthy();
 
-            // Then both delegate fields survive, because rolling back belongs to whoever dismisses the error and needs something to roll back to
-            expect(vacationDelegate?.delegate).toBe('delegate@test.com');
+            // Then the saved delegate is still in place, since the pick was never applied, and previousDelegate survives,
+            // because rolling back belongs to whoever dismisses the error and needs something to roll back to
+            expect(vacationDelegate?.delegate).toBe('old@test.com');
             expect(vacationDelegate?.previousDelegate).toBe('old@test.com');
         });
 
         it('leaves a failed response in a state where dismissing the error restores the last confirmed delegate', async () => {
             // Given a pick that fails over a previously saved delegate
-            jest.spyOn(require('@libs/API'), 'makeRequestWithSideEffects').mockImplementation(async () => {
-                await Onyx.merge(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {
-                    creator: 'admin@test.com',
-                    delegate: 'delegate@test.com',
-                    previousDelegate: 'old@test.com',
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    errors: null,
-                });
-                return {jsonCode: CONST.JSON_CODE.EXP_ERROR, message: 'Nope'};
-            });
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: 'admin@test.com', delegate: 'old@test.com'});
+            mockSideEffectRequest(() => ({jsonCode: CONST.JSON_CODE.EXP_ERROR, message: 'Nope'}));
 
             await setVacationDelegate({creator: 'admin@test.com', delegate: 'delegate@test.com', currentDelegate: 'old@test.com'});
             await waitForBatchedUpdates();
diff --git a/tests/ui/VacationDelegateFormPageTest.tsx b/tests/ui/VacationDelegateFormPageTest.tsx
index f21bbfcce368..70a04ca134b6 100644
--- a/tests/ui/VacationDelegateFormPageTest.tsx
+++ b/tests/ui/VacationDelegateFormPageTest.tsx
@@ -185,7 +185,8 @@ describe('VacationDelegateFormPage', () => {
         fireEvent.press(screen.getByTestId('select-delegate-b-with-date'));
         await waitForBatchedUpdatesWithAct();
 
-        // Then the backend gets the datetime to clear the delegate at, and the confirmed datetime is kept so a failure can restore it
+        // Then the backend gets the datetime to clear the delegate at, the confirmed datetime is kept so a failure can restore it,
+        // and the pick is only applied once the backend saved it, since the response can still be a 305
         expect(apiSideEffectSpy).toHaveBeenLastCalledWith(
             SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
             expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL, clearAfter: CLEAR_AFTER}),
@@ -193,13 +194,12 @@ describe('VacationDelegateFormPage', () => {
                 optimisticData: [
                     expect.objectContaining({
                         value: expect.objectContaining({
-                            delegate: DELEGATE_B_EMAIL,
-                            clearAfter: CLEAR_AFTER,
                             previousDelegate: ORIGINAL_DELEGATE_EMAIL,
                             previousClearAfter: ORIGINAL_CLEAR_AFTER,
                         }),
                     }),
                 ],
+                successData: [expect.objectContaining({value: expect.objectContaining({delegate: DELEGATE_B_EMAIL, clearAfter: CLEAR_AFTER})})],
             }),
         );
     });
@@ -220,7 +220,7 @@ describe('VacationDelegateFormPage', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Then the delegate is deleted, since removal now lives on the form instead of re-picking the same member
-        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, null, expect.anything());
+        expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.DELETE_VACATION_DELEGATE, null, expect.anything(), expect.anything());
         expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_PROFILE.route);
     });
 
@@ -436,12 +436,13 @@ describe('VacationDelegateFormPage', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Then the rollback target is the original confirmed delegate, not the unconfirmed delegateA; the API call is
-        // mocked out, so the optimistic data it was handed is where that target is visible
+        // mocked out, so the optimistic and success data it was handed are where that target and the pick are visible
         expect(apiSideEffectSpy).toHaveBeenLastCalledWith(
             SIDE_EFFECT_REQUEST_COMMANDS.SET_VACATION_DELEGATE,
             expect.objectContaining({vacationDelegateEmail: DELEGATE_B_EMAIL}),
             expect.objectContaining({
-                optimisticData: [expect.objectContaining({value: expect.objectContaining({delegate: DELEGATE_B_EMAIL, previousDelegate: ORIGINAL_DELEGATE_EMAIL})})],
+                optimisticData: [expect.objectContaining({value: expect.objectContaining({previousDelegate: ORIGINAL_DELEGATE_EMAIL})})],
+                successData: [expect.objectContaining({value: expect.objectContaining({delegate: DELEGATE_B_EMAIL})})],
             }),
         );
     });

From 0f009fb93cbde261d1f394eb7d44991245dbd5a7 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Sat, 10 Oct 2026 10:48:03 +0530
Subject: [PATCH 407/781] restore the action bundles from main

---
 .../javascript/authorChecklist/index.js       | 901 ++++++++++++-----
 .../javascript/awaitStagingDeploys/index.js   | 901 ++++++++++++-----
 .../actions/javascript/bumpVersion/index.js   | 901 ++++++++++++-----
 .../javascript/checkAndroidStatus/index.js    | 903 +++++++++++++-----
 .../javascript/checkDeployBlockers/index.js   | 901 ++++++++++++-----
 .../javascript/checkSVGCompression/index.js   | 901 ++++++++++++-----
 .../javascript/failureNotifier/index.js       | 901 ++++++++++++-----
 .../javascript/formatCodeCovComment/index.js  | 901 ++++++++++++-----
 .../generateHelpPreviewComment/index.js       | 901 ++++++++++++-----
 .../getAndroidRolloutPercentage/index.js      | 903 +++++++++++++-----
 .../javascript/getArtifactInfo/index.js       | 901 ++++++++++++-----
 .../getDeployPullRequestList/index.js         | 901 ++++++++++++-----
 .../javascript/getPreviousVersion/index.js    | 901 ++++++++++++-----
 .../javascript/getPullRequestDetails/index.js | 901 ++++++++++++-----
 .../getPullRequestIncrementalChanges/index.js | 901 ++++++++++++-----
 .../isAuthorizedContributor/index.js          | 901 ++++++++++++-----
 .../isDeployChecklistLocked/index.js          | 903 +++++++++++++-----
 .../markPullRequestsAsDeployed/index.js       | 901 ++++++++++++-----
 .../javascript/postOrReplaceComment/index.js  | 901 ++++++++++++-----
 .../javascript/proposalPoliceComment/index.js | 903 +++++++++++++-----
 .../reopenIssueWithComment/index.js           | 901 ++++++++++++-----
 .../javascript/reviewerChecklist/index.js     | 901 ++++++++++++-----
 .../validateReassureOutput/index.js           | 901 ++++++++++++-----
 .../javascript/verifySignedCommits/index.js   | 901 ++++++++++++-----
 .../verifyStagingBuildsSucceeded/index.js     | 901 ++++++++++++-----
 25 files changed, 16829 insertions(+), 5704 deletions(-)

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index f76542955ddf..b06a43adc37e 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index 906a5fe20da8..00e2f735fcb4 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
index 479e50a322da..c2258fb0a82d 100644
--- a/.github/actions/javascript/bumpVersion/index.js
+++ b/.github/actions/javascript/bumpVersion/index.js
@@ -2312,10 +2312,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -2382,7 +2438,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -2394,6 +2454,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2503,13 +2566,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -6116,6 +6187,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -6162,6 +6234,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -6324,24 +6399,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -6361,6 +6467,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6404,7 +6514,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -6429,9 +6539,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6440,6 +6551,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6565,6 +6680,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6608,12 +6724,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6628,7 +6751,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6636,9 +6762,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6687,7 +6814,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6705,6 +6832,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6717,6 +6861,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6747,8 +6914,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6769,11 +6944,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -7129,6 +7311,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -7189,6 +7372,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -7352,16 +7539,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -7376,18 +7569,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7948,9 +8165,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8456,8 +8674,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8628,7 +8846,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8649,6 +8866,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8848,7 +9066,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8858,6 +9075,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -9298,6 +9516,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -9351,6 +9587,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -9360,6 +9597,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -9421,7 +9669,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9470,9 +9720,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9480,6 +9742,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9487,6 +9750,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9506,6 +9774,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9533,7 +9802,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -16332,14 +16601,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -16422,7 +16725,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16552,18 +16859,14 @@ var require_parse2 = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -17385,7 +17688,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17491,31 +17794,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17534,20 +17832,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17557,19 +17847,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17600,8 +17888,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17609,18 +17903,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17635,6 +17932,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17694,6 +17998,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17714,6 +18021,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17727,6 +18037,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17737,32 +18050,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17805,6 +18132,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -18016,8 +18363,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -18061,9 +18406,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -18247,7 +18589,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -18322,19 +18670,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -18413,6 +18748,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -18432,10 +18801,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18466,63 +18838,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18531,17 +18870,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18557,43 +18895,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18618,12 +18955,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkAndroidStatus/index.js b/.github/actions/javascript/checkAndroidStatus/index.js
index cf13138d08ce..de9e0e53ebc4 100644
--- a/.github/actions/javascript/checkAndroidStatus/index.js
+++ b/.github/actions/javascript/checkAndroidStatus/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 2ca391c52c00..c59c854097c1 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkSVGCompression/index.js b/.github/actions/javascript/checkSVGCompression/index.js
index 1bd2d9dfd701..cad1560febba 100644
--- a/.github/actions/javascript/checkSVGCompression/index.js
+++ b/.github/actions/javascript/checkSVGCompression/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/failureNotifier/index.js b/.github/actions/javascript/failureNotifier/index.js
index 7eedc830062e..208e6286e656 100644
--- a/.github/actions/javascript/failureNotifier/index.js
+++ b/.github/actions/javascript/failureNotifier/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/formatCodeCovComment/index.js b/.github/actions/javascript/formatCodeCovComment/index.js
index 133b8de4b0d2..9aac21e43b56 100644
--- a/.github/actions/javascript/formatCodeCovComment/index.js
+++ b/.github/actions/javascript/formatCodeCovComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/generateHelpPreviewComment/index.js b/.github/actions/javascript/generateHelpPreviewComment/index.js
index 4fffa145a897..222ea227535c 100644
--- a/.github/actions/javascript/generateHelpPreviewComment/index.js
+++ b/.github/actions/javascript/generateHelpPreviewComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request2, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request2, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getAndroidRolloutPercentage/index.js b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
index e970b3649819..1abd092e27ea 100644
--- a/.github/actions/javascript/getAndroidRolloutPercentage/index.js
+++ b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request.aborted) {
+          return;
+        }
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        util.errorRequest(client, request, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index 1d7315a4ae65..b511ee174521 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 86ebf2b747d2..c6a083ec32cf 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
index 0343158e5a02..dc48a205f79b 100644
--- a/.github/actions/javascript/getPreviousVersion/index.js
+++ b/.github/actions/javascript/getPreviousVersion/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index 78b36a004849..b7443787fc9b 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
index 21c54003dde2..e868a069ae7e 100644
--- a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
+++ b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error3) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error3 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error3) {
+          util.errorRequest(client, request2, error3);
+          util.destroy(socket, error3);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error3) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error3 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error3) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error3 || new RequestAbortedError());
+          }
+          return;
+        }
+        error3 = error3 || new RequestAbortedError();
+        util.errorRequest(client, request2, error3);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error3);
         }
-        util.destroy(body, err);
+        util.destroy(body, error3);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error3) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error3);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error3) {
+            stream.off("response", onResponse);
+            abort(error3);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error3, data) => {
-                  if (error3) {
-                    failWebsocketConnection(this.ws, error3.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error3, data) => {
+                    if (error3) {
+                      const code = error3 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error3.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isAuthorizedContributor/index.js b/.github/actions/javascript/isAuthorizedContributor/index.js
index fea991ad887f..d43a19fced4c 100644
--- a/.github/actions/javascript/isAuthorizedContributor/index.js
+++ b/.github/actions/javascript/isAuthorizedContributor/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isDeployChecklistLocked/index.js b/.github/actions/javascript/isDeployChecklistLocked/index.js
index ebdf2bf6961c..9321db05e6d7 100644
--- a/.github/actions/javascript/isDeployChecklistLocked/index.js
+++ b/.github/actions/javascript/isDeployChecklistLocked/index.js
@@ -28447,10 +28447,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -28517,7 +28573,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -28529,6 +28589,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -28638,13 +28701,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -32251,6 +32322,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -32297,6 +32369,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -32459,24 +32534,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -32496,6 +32602,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32539,7 +32649,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -32564,9 +32674,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -32575,6 +32686,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32700,6 +32815,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -32743,12 +32859,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -32763,7 +32886,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -32771,9 +32897,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -32822,7 +32949,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -32840,6 +32967,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -32852,6 +32996,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -32882,8 +33049,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -32904,11 +33079,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -33264,6 +33446,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -33324,6 +33507,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -33487,16 +33674,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -33511,18 +33704,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -34083,9 +34300,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -34591,8 +34809,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -34763,7 +34981,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -34784,6 +35001,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -34983,7 +35201,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -34993,6 +35210,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -35433,6 +35651,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -35486,6 +35722,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -35495,6 +35732,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -35556,7 +35804,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -35605,9 +35855,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -35615,6 +35877,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -35622,6 +35885,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -35641,6 +35909,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -35668,7 +35937,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -42467,14 +42736,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -42557,7 +42860,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -42687,18 +42994,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -43520,7 +43823,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -43626,31 +43929,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -43669,20 +43967,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -43692,19 +43982,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -43735,8 +44023,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -43744,18 +44038,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -43770,6 +44067,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -43829,6 +44133,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -43849,6 +44156,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -43862,6 +44172,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -43872,32 +44185,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -43940,6 +44267,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -44151,8 +44498,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -44196,9 +44541,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -44382,7 +44724,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -44457,19 +44805,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -44548,6 +44883,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -44567,10 +44936,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -44601,63 +44973,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -44666,17 +45005,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -44692,43 +45030,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -44753,12 +45090,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 62a50ec22616..5eca45f374da 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/postOrReplaceComment/index.js b/.github/actions/javascript/postOrReplaceComment/index.js
index fb9eb8df9e7b..195707dedc9f 100644
--- a/.github/actions/javascript/postOrReplaceComment/index.js
+++ b/.github/actions/javascript/postOrReplaceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
index 126b34462df4..beb367dd3ebd 100644
--- a/.github/actions/javascript/proposalPoliceComment/index.js
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str2 = `${val[i]}`;
+            if (!isValidHeaderValue(str2)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str2);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message2 = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message2, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message2 = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message2, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index f237f20694fd..2fe118ee3e64 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index a9419acf5a2e..8e220a2cf59e 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/validateReassureOutput/index.js b/.github/actions/javascript/validateReassureOutput/index.js
index b26522496b9c..e511f56ffd08 100644
--- a/.github/actions/javascript/validateReassureOutput/index.js
+++ b/.github/actions/javascript/validateReassureOutput/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index 087b5df387fd..d982728230d3 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
index 1e9b71a5c3e0..d5508591a07b 100644
--- a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
+++ b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {

From 160e55338d776b96888b36503c5272c2781dd8d2 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 10 Oct 2026 11:51:03 +0200
Subject: [PATCH 408/781] Fix copy selection handling across selectable views

---
 .../MoneyRequestReportTransactionList.tsx     |   4 +-
 .../Search/ExpenseFlatSearchView.tsx          |   6 +-
 .../Search/ExpenseReportSearchView.tsx        |   6 +-
 .../Tables/WorkspaceMembersTable/index.tsx    |   4 +-
 src/hooks/useCopySelectionEvent.ts            |  56 +++++
 .../report/ReportActionsSkeletonGuard.tsx     |   4 +-
 .../unit/hooks/useCopySelectionEvent.test.ts  | 227 ++++++++++++++++++
 7 files changed, 295 insertions(+), 12 deletions(-)
 create mode 100644 src/hooks/useCopySelectionEvent.ts
 create mode 100644 tests/unit/hooks/useCopySelectionEvent.test.ts

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index 39cfa7edcbef..928218180730 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -1,7 +1,7 @@
 import LinkButton from '@components/Button/composed/LinkButton';
 import type FlatListRefType from '@components/FlashList/types';
 
-import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNavigateToTransactionThread from '@hooks/useNavigateToTransactionThread';
@@ -198,7 +198,7 @@ function MoneyRequestReportTransactionList({
     isLoadingInitialActions,
     listFooterComponent,
 }: MoneyRequestReportTransactionListProps) {
-    useCopySelectionHelper();
+    useCopySelectionEvent();
     const styles = useThemeStyles();
     const theme = useTheme();
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Columns']);
diff --git a/src/components/Search/ExpenseFlatSearchView.tsx b/src/components/Search/ExpenseFlatSearchView.tsx
index aa4f67429ace..8e52ac89ee09 100644
--- a/src/components/Search/ExpenseFlatSearchView.tsx
+++ b/src/components/Search/ExpenseFlatSearchView.tsx
@@ -1,6 +1,6 @@
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
-import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
 
 import CONST from '@src/CONST';
 
@@ -62,8 +62,8 @@ function ExpenseFlatSearchView({
     containerStyle,
 }: ExpenseFlatSearchViewProps) {
     const {type} = queryJSON;
-    // Normalize keyboard-copied expense rows so their grid cells paste as one space-separated row.
-    useCopySelectionHelper();
+    // Normalize copied expense rows so their grid cells paste as one space-separated row.
+    useCopySelectionEvent();
 
     const {
         isOffline,
diff --git a/src/components/Search/ExpenseReportSearchView.tsx b/src/components/Search/ExpenseReportSearchView.tsx
index c2cfdf0b0850..8193913c1e93 100644
--- a/src/components/Search/ExpenseReportSearchView.tsx
+++ b/src/components/Search/ExpenseReportSearchView.tsx
@@ -1,6 +1,6 @@
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
 
-import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
 
 import {isTransactionReportGroupListItemType} from '@libs/SearchUIUtils';
 
@@ -61,8 +61,8 @@ function ExpenseReportSearchView({
     containerStyle,
 }: ExpenseReportSearchViewProps) {
     const {type} = queryJSON;
-    // Normalize keyboard-copied report rows so their grid cells paste as one space-separated row.
-    useCopySelectionHelper();
+    // Normalize copied report rows so their grid cells paste as one space-separated row.
+    useCopySelectionEvent();
 
     const {
         isOffline,
diff --git a/src/components/Tables/WorkspaceMembersTable/index.tsx b/src/components/Tables/WorkspaceMembersTable/index.tsx
index 37b1007003b8..d0228592771a 100644
--- a/src/components/Tables/WorkspaceMembersTable/index.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/index.tsx
@@ -2,7 +2,7 @@ import type {CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemI
 import Table, {composeTableListHeader} from '@components/Table';
 import compareOptionalValues from '@components/Table/compareOptionalValues';
 
-import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -85,7 +85,7 @@ export default function WorkspaceMembersTable({
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
-    useCopySelectionHelper();
+    useCopySelectionEvent();
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
     const workspaceMembersColumns: Array<TableColumn<WorkspaceMembersTableColumnKey, WorkspaceMemberRowData>> = [
diff --git a/src/hooks/useCopySelectionEvent.ts b/src/hooks/useCopySelectionEvent.ts
new file mode 100644
index 000000000000..68945915fbd4
--- /dev/null
+++ b/src/hooks/useCopySelectionEvent.ts
@@ -0,0 +1,56 @@
+import getClipboardText from '@libs/Clipboard/getClipboardText';
+import SelectionScraper from '@libs/SelectionScraper';
+
+import {useEffect} from 'react';
+
+function hasSelectionWithinEditableTarget(target: EventTarget | null) {
+    if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) {
+        return target.selectionStart !== null && target.selectionEnd !== null && target.selectionStart !== target.selectionEnd;
+    }
+
+    if (!(target instanceof HTMLElement) || !target.isContentEditable) {
+        return false;
+    }
+
+    const selection = window.getSelection();
+    return !!selection && (target.contains(selection.anchorNode) || target.contains(selection.focusNode));
+}
+
+function copySelectionToClipboard(event: ClipboardEvent) {
+    if (event.defaultPrevented || !event.clipboardData || hasSelectionWithinEditableTarget(event.target)) {
+        return;
+    }
+
+    const selection = SelectionScraper.getCurrentSelection();
+    if (!selection) {
+        return;
+    }
+
+    const clipboardText = getClipboardText(selection);
+    event.preventDefault();
+    event.clipboardData.clearData();
+    event.clipboardData.setData('text/html', selection);
+    event.clipboardData.setData('text/plain', clipboardText);
+}
+
+let copySelectionEventConsumerCount = 0;
+
+export default function useCopySelectionEvent() {
+    useEffect(() => {
+        if (typeof document === 'undefined') {
+            return;
+        }
+
+        if (copySelectionEventConsumerCount === 0) {
+            document.addEventListener('copy', copySelectionToClipboard);
+        }
+        copySelectionEventConsumerCount += 1;
+
+        return () => {
+            copySelectionEventConsumerCount -= 1;
+            if (copySelectionEventConsumerCount === 0) {
+                document.removeEventListener('copy', copySelectionToClipboard);
+            }
+        };
+    }, []);
+}
diff --git a/src/pages/inbox/report/ReportActionsSkeletonGuard.tsx b/src/pages/inbox/report/ReportActionsSkeletonGuard.tsx
index b65a2e66dcaa..f53fa5721a39 100644
--- a/src/pages/inbox/report/ReportActionsSkeletonGuard.tsx
+++ b/src/pages/inbox/report/ReportActionsSkeletonGuard.tsx
@@ -1,5 +1,5 @@
 import useBackfillWhenNoVisibleActions from '@hooks/useBackfillWhenNoVisibleActions';
-import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
 import {useIsReportLoadPending} from '@hooks/useInFlightRequests';
 import usePendingConciergeResponse from '@hooks/usePendingConciergeResponse';
 import useReportActionsListModel from '@hooks/useReportActionsListModel';
@@ -50,7 +50,7 @@ function ReportActionsSkeletonGuard({reportID, children}: ReportActionsSkeletonG
     } = readinessSignals;
 
     // Side effects that must run whenever the chat list is shown, including while the skeleton renders.
-    useCopySelectionHelper();
+    useCopySelectionEvent();
     usePendingConciergeResponse(reportID);
 
     useStartConciergeSession({
diff --git a/tests/unit/hooks/useCopySelectionEvent.test.ts b/tests/unit/hooks/useCopySelectionEvent.test.ts
new file mode 100644
index 000000000000..f81f1e34b5c2
--- /dev/null
+++ b/tests/unit/hooks/useCopySelectionEvent.test.ts
@@ -0,0 +1,227 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useCopySelectionEvent from '@hooks/useCopySelectionEvent';
+
+import getClipboardText from '@libs/Clipboard/getClipboardText';
+import SelectionScraper from '@libs/SelectionScraper';
+
+jest.mock('@libs/Clipboard/getClipboardText', () => ({
+    __esModule: true,
+    default: jest.fn(),
+}));
+
+jest.mock('@libs/SelectionScraper', () => ({
+    __esModule: true,
+    default: {
+        getCurrentSelection: jest.fn(),
+    },
+}));
+
+const mockGetClipboardText = jest.mocked(getClipboardText);
+const mockGetCurrentSelection = jest.mocked(SelectionScraper.getCurrentSelection);
+
+describe('useCopySelectionEvent', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        window.getSelection()?.removeAllRanges();
+    });
+
+    const dispatchCopyEvent = (target: Document | HTMLElement = document) => {
+        const clipboardData = {
+            clearData: jest.fn(),
+            setData: jest.fn(),
+        };
+        const event = new Event('copy', {bubbles: true, cancelable: true});
+        Object.defineProperty(event, 'clipboardData', {value: clipboardData});
+        target.dispatchEvent(event);
+        return {clipboardData, event};
+    };
+
+    it('removes the browser copy listener on unmount', () => {
+        // Given the copy helper is mounted and then unmounted
+        const {unmount} = renderHook(() => useCopySelectionEvent());
+        unmount();
+
+        // When the browser dispatches another copy event
+        dispatchCopyEvent();
+
+        // Then the unmounted helper does not process the selection
+        expect(mockGetCurrentSelection).not.toHaveBeenCalled();
+    });
+
+    it('keeps another consumer active when one copy listener unmounts', () => {
+        // Given two selectable views are mounted with independent copy listeners
+        const selection = 'Draft Expense Report TJS 10.00';
+        mockGetCurrentSelection.mockReturnValue(selection);
+        mockGetClipboardText.mockReturnValue(selection);
+        const firstConsumer = renderHook(() => useCopySelectionEvent());
+        const secondConsumer = renderHook(() => useCopySelectionEvent());
+
+        // When the first view unmounts and a copy event occurs in the remaining view
+        firstConsumer.unmount();
+        const {clipboardData, event} = dispatchCopyEvent();
+
+        // Then the remaining listener still normalizes the selected row exactly once
+        expect(event.defaultPrevented).toBe(true);
+        expect(mockGetCurrentSelection).toHaveBeenCalledTimes(1);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(1, 'text/html', selection);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(2, 'text/plain', selection);
+        secondConsumer.unmount();
+    });
+
+    it('writes the scraped selection as HTML and plain text', () => {
+        // Given the scraper returns a formatted selection
+        const selection = '<strong>Expense description</strong>';
+        mockGetCurrentSelection.mockReturnValue(selection);
+        mockGetClipboardText.mockReturnValue('Expense description');
+        renderHook(() => useCopySelectionEvent());
+
+        // When the browser dispatches a copy event
+        const {clipboardData, event} = dispatchCopyEvent();
+
+        // Then the scraper output is written once in both clipboard formats
+        expect(event.defaultPrevented).toBe(true);
+        expect(mockGetCurrentSelection).toHaveBeenCalledTimes(1);
+        expect(mockGetClipboardText).toHaveBeenCalledWith(selection);
+        expect(clipboardData.clearData).toHaveBeenCalledTimes(1);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(1, 'text/html', selection);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(2, 'text/plain', 'Expense description');
+    });
+
+    it('writes a plain non-Markdown selection without additional filtering', () => {
+        // Given the scraper returns a plain copyable field value
+        const selection = 'Merchant';
+        mockGetCurrentSelection.mockReturnValue(selection);
+        mockGetClipboardText.mockReturnValue(selection);
+        renderHook(() => useCopySelectionEvent());
+
+        // When the browser dispatches a copy event
+        const {clipboardData, event} = dispatchCopyEvent();
+
+        // Then the plain selection is written through the same clipboard path
+        expect(event.defaultPrevented).toBe(true);
+        expect(mockGetCurrentSelection).toHaveBeenCalledTimes(1);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(1, 'text/html', selection);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(2, 'text/plain', selection);
+    });
+
+    it('does not process an event that another copy handler already handled', () => {
+        // Given another copy handler has already handled the event
+        renderHook(() => useCopySelectionEvent());
+        const event = new Event('copy', {bubbles: true, cancelable: true});
+        event.preventDefault();
+        Object.defineProperty(event, 'clipboardData', {
+            value: {clearData: jest.fn(), setData: jest.fn()},
+        });
+
+        // When the event reaches this helper
+        document.dispatchEvent(event);
+
+        // Then the selection is not scraped a second time
+        expect(mockGetCurrentSelection).not.toHaveBeenCalled();
+    });
+
+    it('does nothing when there is no selected content', () => {
+        // Given there is no current browser selection
+        mockGetCurrentSelection.mockReturnValue('');
+        renderHook(() => useCopySelectionEvent());
+
+        // When the browser dispatches a copy event
+        const {clipboardData, event} = dispatchCopyEvent();
+
+        // Then native copy behavior is left unchanged
+        expect(event.defaultPrevented).toBe(false);
+        expect(mockGetClipboardText).not.toHaveBeenCalled();
+        expect(clipboardData.clearData).not.toHaveBeenCalled();
+        expect(clipboardData.setData).not.toHaveBeenCalled();
+    });
+
+    it('leaves copying from text inputs to the browser', () => {
+        // Given a text input is the source of the copy event
+        const input = document.createElement('input');
+        input.value = 'Expense description';
+        input.setSelectionRange(0, input.value.length);
+        document.body.appendChild(input);
+        renderHook(() => useCopySelectionEvent());
+
+        // When the input dispatches a copy event
+        const {clipboardData, event} = dispatchCopyEvent(input);
+
+        // Then the helper preserves the input's native copy behavior
+        expect(event.defaultPrevented).toBe(false);
+        expect(mockGetCurrentSelection).not.toHaveBeenCalled();
+        expect(clipboardData.setData).not.toHaveBeenCalled();
+        input.remove();
+    });
+
+    it('processes a row selection when a previously focused input remains the copy event target', () => {
+        // Given an input remains focused without selected input text while a copyable row is selected
+        const input = document.createElement('input');
+        document.body.appendChild(input);
+        input.focus();
+        input.setSelectionRange(0, 0);
+        const selection = 'Oct 6 Draft Expense Report TJS 10.00';
+        mockGetCurrentSelection.mockReturnValue(selection);
+        mockGetClipboardText.mockReturnValue(selection);
+        renderHook(() => useCopySelectionEvent());
+
+        // When the browser targets the stale focused input for the copy event
+        const {clipboardData, event} = dispatchCopyEvent(input);
+
+        // Then the selected row is normalized instead of falling back to native rich-text copying
+        expect(event.defaultPrevented).toBe(true);
+        expect(mockGetCurrentSelection).toHaveBeenCalledTimes(1);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(1, 'text/html', selection);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(2, 'text/plain', selection);
+        input.remove();
+    });
+
+    it('leaves copying a selection inside editable content to the browser', () => {
+        // Given text is selected inside an editable element
+        const editor = document.createElement('div');
+        Object.defineProperty(editor, 'isContentEditable', {value: true});
+        editor.textContent = 'Expense description';
+        document.body.appendChild(editor);
+        const range = document.createRange();
+        range.selectNodeContents(editor);
+        const browserSelection = window.getSelection();
+        browserSelection?.addRange(range);
+        renderHook(() => useCopySelectionEvent());
+
+        // When the editable element dispatches the copy event
+        const {clipboardData, event} = dispatchCopyEvent(editor);
+
+        // Then its native rich-text copy behavior remains unchanged
+        expect(event.defaultPrevented).toBe(false);
+        expect(mockGetCurrentSelection).not.toHaveBeenCalled();
+        expect(clipboardData.setData).not.toHaveBeenCalled();
+        editor.remove();
+    });
+
+    it('processes a row selection when a previously focused editable element remains the copy event target', () => {
+        // Given an editable element remains the event target while the browser selection is in a report row
+        const editor = document.createElement('div');
+        Object.defineProperty(editor, 'isContentEditable', {value: true});
+        const row = document.createElement('div');
+        row.textContent = 'Oct 6 Draft Expense Report TJS 10.00';
+        document.body.append(editor, row);
+        const range = document.createRange();
+        range.selectNodeContents(row);
+        const browserSelection = window.getSelection();
+        browserSelection?.addRange(range);
+        mockGetCurrentSelection.mockReturnValue(row.textContent);
+        mockGetClipboardText.mockReturnValue(row.textContent);
+        renderHook(() => useCopySelectionEvent());
+
+        // When the stale editable element dispatches the copy event
+        const {clipboardData, event} = dispatchCopyEvent(editor);
+
+        // Then the report row is normalized instead of using native rich-text copying
+        expect(event.defaultPrevented).toBe(true);
+        expect(mockGetCurrentSelection).toHaveBeenCalledTimes(1);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(1, 'text/html', row.textContent);
+        expect(clipboardData.setData).toHaveBeenNthCalledWith(2, 'text/plain', row.textContent);
+        editor.remove();
+        row.remove();
+    });
+});

From 5dce362a1e48457978ede368788fbf543975d29f Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Sat, 10 Oct 2026 11:26:39 +0000
Subject: [PATCH 409/781] Scroll a single-expense report to the user's new
 comment

Revert the useMoneyRequestReportScroll change, which only runs for multi-expense reports.
For single-expense reports, scroll straight to the bottom when the unread marker is set but the newest actions are already loaded, and flush a pending scroll-to-bottom on the next frame instead of waiting for a list layout event.

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 .../useMoneyRequestReportScroll.ts            | 24 +++++------
 src/hooks/useReportActionsScroll.ts           | 12 ++++++
 .../useReportActionsNewActionLiveTail.ts      |  6 ++-
 .../unit/useMoneyRequestReportScrollTest.tsx  | 40 -------------------
 .../useReportActionsNewActionLiveTailTest.ts  | 35 ++++++++++++++++
 tests/unit/useReportActionsScrollTest.tsx     | 15 +++++++
 6 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
index 52ba3c3ebc01..a8e996a9d037 100644
--- a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
@@ -154,17 +154,6 @@ function useMoneyRequestReportScroll({
     const stickToBottomRef = useRef(false);
     const stickToBottomTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-    // A single jump from far above can land short of the bottom while rows render, so keep re-pinning on every content size change for a while
-    const startStickToBottom = () => {
-        stickToBottomRef.current = true;
-        if (stickToBottomTimeoutRef.current) {
-            clearTimeout(stickToBottomTimeoutRef.current);
-        }
-        stickToBottomTimeoutRef.current = setTimeout(() => {
-            stickToBottomRef.current = false;
-        }, STICK_TO_BOTTOM_DURATION_MS);
-    };
-
     // Set when the user taps "Latest messages", cleared once the scroll reaches the bottom or the user scrolls away
     const pendingMarkAsReadRef = useRef(false);
 
@@ -250,7 +239,6 @@ function useMoneyRequestReportScroll({
                     }
                     ownActionScrollTimeoutRef.current = setTimeout(() => {
                         ownActionScrollTimeoutRef.current = null;
-                        startStickToBottom();
                         scrollToBottom();
                     }, DELAY_FOR_SCROLLING_TO_END);
                 } else {
@@ -291,14 +279,20 @@ function useMoneyRequestReportScroll({
         }
         pendingScrollTimeoutRef.current = setTimeout(() => {
             pendingScrollTimeoutRef.current = null;
-            startStickToBottom();
             scrollToBottom();
         }, DELAY_FOR_SCROLLING_TO_END);
-    }, [visibleReportActions, scrollToBottom, startStickToBottom]);
+    }, [visibleReportActions, scrollToBottom]);
 
     const scrollToLatestMessages = () => {
         setIsFloatingMessageCounterVisible(false);
-        startStickToBottom();
+
+        stickToBottomRef.current = true;
+        if (stickToBottomTimeoutRef.current) {
+            clearTimeout(stickToBottomTimeoutRef.current);
+        }
+        stickToBottomTimeoutRef.current = setTimeout(() => {
+            stickToBottomRef.current = false;
+        }, STICK_TO_BOTTOM_DURATION_MS);
 
         if (!hasNewestReportAction) {
             openReport({
diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index 09bf411c31b8..cc9d6bc988e0 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -412,6 +412,18 @@ function useReportActionsScroll({
         completeLiveTailPruneAfterScrollToBottom();
     };
 
+    const flushPendingScrollToBottomFromEffect = useEffectEvent(() => flushPendingScrollToBottom());
+
+    // The list's onLayout is not enough to flush a pending scroll: a new comment changes the content size, not the
+    // layout size, so onLayout may never fire. Flush on the next frame so this effect doesn't chain a synchronous setState.
+    useEffect(() => {
+        if (!isScrollToBottomEnabled) {
+            return;
+        }
+        const frame = requestAnimationFrame(() => flushPendingScrollToBottomFromEffect());
+        return () => cancelAnimationFrame(frame);
+    }, [isScrollToBottomEnabled]);
+
     // Data is ready at the moment FlashList finishes its first render.
     const onLoad = () => {
         if (shouldDisablePillTracking) {
diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 0c985a096315..10efdd623565 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -111,8 +111,12 @@ function useReportActionsNewActionLiveTail({
                     return;
                 }
 
+                // An unread marker only needs openReport when the newest actions are not loaded yet. When they are, they are
+                // just off-screen, so scroll to them directly instead of waiting on a network round trip.
                 const shouldJumpToLiveTail =
-                    !isOffline && action?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && (hasNewerActions || !!linkedReportActionID || unreadMarkerReportActionID);
+                    !isOffline &&
+                    action?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW &&
+                    (hasNewerActions || !!linkedReportActionID || (!!unreadMarkerReportActionID && !hasNewestReportAction));
 
                 if (shouldJumpToLiveTail) {
                     if (liveTailJumpRef.current.stage === 'idle') {
diff --git a/tests/unit/useMoneyRequestReportScrollTest.tsx b/tests/unit/useMoneyRequestReportScrollTest.tsx
index a5ed7453e5d6..8c2e0270e4e3 100644
--- a/tests/unit/useMoneyRequestReportScrollTest.tsx
+++ b/tests/unit/useMoneyRequestReportScrollTest.tsx
@@ -543,46 +543,6 @@ describe('useMoneyRequestReportScroll', () => {
             // Then the deferred jump fires for the action the first pass could not find
             expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
         });
-
-        it('should keep re-pinning the list to the bottom while content settles after the user sends a comment', async () => {
-            // Given a list scrolled to the top and a comment the user just sent
-            const {result} = await renderScroll();
-            applyLayoutAndScroll(result, BOTTOM_OFFSET_AT_TOP);
-            notifyNewAction(true, makeAction('1'));
-            act(() => {
-                jest.advanceTimersByTime(100);
-            });
-            mockScrollToIndex.mockClear();
-
-            // When rows between the top and the newest message render and grow the list
-            act(() => {
-                result.current.onListContentSizeChange(0, LIST_CONTENT_HEIGHT + 500);
-            });
-
-            // Then the list is pinned back to the last item, because a single jump from far above can land short of it
-            expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
-        });
-
-        it('should keep re-pinning the list after a deferred jump for a comment that landed late', async () => {
-            // Given a comment the user sent that only shows up in the rendered list after the event
-            const {result, rerender} = await renderScroll({visibleReportActions: [makeAction('1')]});
-            applyLayoutAndScroll(result, BOTTOM_OFFSET_AT_TOP);
-            notifyNewAction(true, makeAction('2'));
-            rerender(buildParams({visibleReportActions: [makeAction('1'), makeAction('2')], reportActionsLength: 2, lastAction: makeAction('2')}));
-            await waitForBatchedUpdatesWithAct();
-            act(() => {
-                jest.advanceTimersByTime(100);
-            });
-            mockScrollToIndex.mockClear();
-
-            // When the content height changes while the list settles
-            act(() => {
-                result.current.onListContentSizeChange(0, LIST_CONTENT_HEIGHT + 500);
-            });
-
-            // Then the deferred jump is also kept at the bottom
-            expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
-        });
     });
 
     describe('AgentZero thinking indicator', () => {
diff --git a/tests/unit/useReportActionsNewActionLiveTailTest.ts b/tests/unit/useReportActionsNewActionLiveTailTest.ts
index 84f426155b17..3b2f63e6df8b 100644
--- a/tests/unit/useReportActionsNewActionLiveTailTest.ts
+++ b/tests/unit/useReportActionsNewActionLiveTailTest.ts
@@ -209,6 +209,41 @@ describe('useReportActionsNewActionLiveTail', () => {
         expect(mockNavigationSetParams).not.toHaveBeenCalled();
         expect(setTreatAsNoPaginationAnchor).toHaveBeenCalledWith(true);
     });
+
+    it('scrolls straight to the bottom when an unread marker is set but the newest actions are already loaded', () => {
+        // Given a report scrolled up with an unread marker from another user's comment, and the newest actions already loaded
+        const setIsFloatingMessageCounterVisible = jest.fn();
+        const {result} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
+            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: true, setIsFloatingMessageCounterVisible}),
+        });
+
+        // When the current user sends a comment
+        act(() => {
+            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
+        });
+
+        // Then the list scrolls to the bottom directly, without an openReport round trip
+        expect(mockOpenReport).not.toHaveBeenCalled();
+        expect(setIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
+        expect(reportScrollManager.scrollToBottom).toHaveBeenCalledTimes(1);
+        expect(result.current.isScrollToBottomEnabled).toBe(true);
+    });
+
+    it('still loads the live tail when an unread marker is set and the newest actions are not loaded', () => {
+        // Given an unread marker and a report whose newest actions are not loaded yet
+        renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
+            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: false}),
+        });
+
+        // When the current user sends a comment
+        act(() => {
+            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
+        });
+
+        // Then openReport fetches the newest actions before the list scrolls
+        expect(mockOpenReport).toHaveBeenCalledTimes(1);
+        expect(reportScrollManager.scrollToBottom).not.toHaveBeenCalled();
+    });
 });
 
 describe('withNavigationFallback stub', () => {
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index c3e78bccf919..2b8ce520df9b 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -425,6 +425,8 @@ describe('useReportActionsScroll', () => {
             mockIsScrollToBottomEnabled = true;
 
             const {result} = await renderScroll();
+            // Ignore the flush the effect already made on mount, so only the layout-driven call is measured.
+            jest.clearAllMocks();
             act(() => {
                 result.current.flushPendingScrollToBottom();
             });
@@ -433,6 +435,19 @@ describe('useReportActionsScroll', () => {
             expect(mockSetIsScrollToBottomEnabled).toHaveBeenCalledWith(false);
             expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
         });
+
+        it('flushes a pending scroll-to-bottom without waiting for a list layout event', async () => {
+            // Given the live-tail hook asked for a scroll to bottom, as it does after the user sends a comment
+            mockIsScrollToBottomEnabled = true;
+
+            // When the hook renders and no list onLayout follows, because a new comment changes content size, not layout size
+            await renderScroll();
+
+            // Then the pending scroll is still flushed once, and the request is cleared
+            expect(mockScrollToBottom).toHaveBeenCalledTimes(1);
+            expect(mockSetIsScrollToBottomEnabled).toHaveBeenCalledWith(false);
+            expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
+        });
     });
 
     describe('onLoad', () => {

From 2f114cae217181f4de7ec5fd7153717871db3415 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Sat, 10 Oct 2026 15:24:48 +0200
Subject: [PATCH 410/781] Fix duplicate TableRow dataset prop after merge

---
 src/components/Table/TableRow.tsx |  3 +--
 tests/ui/TableTest.tsx            | 37 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 780eb1863214..57a54e7ddd40 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -141,7 +141,7 @@ export default function TableRow({
     // the static ones. They're only ever set on wide web layouts.
     const gridTemplateColumns = dynamicGridTemplateColumns ? [...dynamicGridTemplateColumns] : getGridTemplateColumns(columns);
     const isSelectionCheckboxVisible = selectionEnabled && (isMobileSelectionEnabled || !selectionUsesNarrowLayout);
-    const rowDataSet = shouldAllowTextSelection ? {...dataSet, ...COPYABLE_ROW_DATA_SET} : dataSet;
+    const rowDataSet = {...dataSet, ...TABLE_ROW_DATA_SET, ...(shouldAllowTextSelection ? COPYABLE_ROW_DATA_SET : {})};
 
     const isDisabled = !!disabled || isAccessibilityHidden;
     const isFirstRow = rowIndex === 0;
@@ -349,7 +349,6 @@ export default function TableRow({
                 onHoverIn={enableHoverStyle}
                 pressDimmingValue={!interactive ? undefined : 1}
                 role={interactive ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
-                dataSet={TABLE_ROW_DATA_SET}
                 {...getRowAccessibilityProps(isTableSemanticsEnabled, rowIndex, false, semanticTableHasHeader)}
                 onMouseDown={(e) => {
                     captureEditingOnMouseDown();
diff --git a/tests/ui/TableTest.tsx b/tests/ui/TableTest.tsx
index e297a5cd7ab2..323352d87f16 100644
--- a/tests/ui/TableTest.tsx
+++ b/tests/ui/TableTest.tsx
@@ -621,6 +621,43 @@ describe('Table', () => {
             expect(screen.getByTestId('row-5')).toBeTruthy();
         });
 
+        it('should preserve all datasets on rows that allow text selection', () => {
+            const props = createDefaultProps();
+            const renderItem = ({item, index}: ListRenderItemInfo<TestItem>) => (
+                <Table.Row
+                    rowIndex={index}
+                    interactive
+                    accessibilityLabel={item.name}
+                    shouldAllowTextSelection
+                    dataSet={{customMarker: true}}
+                >
+                    <Text>{item.name}</Text>
+                </Table.Row>
+            );
+
+            // Given a table row with a caller dataset that allows text selection
+            render(
+                <Table<TestItem, TestColumnKey>
+                    data={props.data.slice(0, 1)}
+                    columns={props.columns}
+                    renderItem={renderItem}
+                    keyExtractor={props.keyExtractor}
+                >
+                    <Table.Body />
+                </Table>,
+            );
+
+            // When the rendered host row is inspected
+            const row = getHostTableRows().find((candidate) => candidate.props.accessibilityLabel === mockData.at(0)?.name);
+
+            // Then the caller, table-row, and copyable-row datasets are all present
+            expect(row?.props.dataSet).toEqual({
+                customMarker: true,
+                tableRow: true,
+                [CONST.COPYABLE_ROW_ELEMENT]: true,
+            });
+        });
+
         it('should render column headers when Header component is used', () => {
             const props = createDefaultProps();
             render(

From 63778962f46e6c7b30f2d393bbe462b235728cb5 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 16:29:44 +0100
Subject: [PATCH 411/781] fix use of useDynamicBackPath

---
 src/pages/settings/Agents/DynamicAddAgentPage.tsx            | 3 ++-
 src/pages/settings/Agents/DynamicEditAgentPage.tsx           | 3 ++-
 src/pages/settings/Agents/DynamicNewAgentPage.tsx            | 3 ++-
 .../settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx    | 3 ++-
 src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx     | 5 +++--
 src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx   | 5 +++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/settings/Agents/DynamicAddAgentPage.tsx b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
index a5cd0a4b6460..fdb039489f35 100644
--- a/src/pages/settings/Agents/DynamicAddAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
@@ -82,6 +82,7 @@ function DynamicAddAgentPageContent({route, template}: DynamicAddAgentPageConten
     const hasSubmittedRef = useRef(false);
     const hasLeftPageRef = useRef(false);
     const formRef = useRef<FormRef>(null);
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_ADD.path);
 
     const submitFormOnModEnter = (event: TextInputKeyPressEvent | KeyboardEvent) => {
         if (!('key' in event)) {
@@ -208,7 +209,7 @@ function DynamicAddAgentPageContent({route, template}: DynamicAddAgentPageConten
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
                     title={translate('addAgentPage.title')}
-                    onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_ADD.path))}
+                    onBackButtonPress={() => Navigation.goBack(backPath)}
                 />
             </CollapsibleHeaderOnKeyboard>
             <FormProvider
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 2228965899f4..8282b977e326 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -57,9 +57,10 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
     const isOnyxLoaded = agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const shouldShowNotFoundPage = isLoadingApp === false && isOnyxLoaded && !agent && !personalDetails;
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT.path);
 
     const agentLogin = personalDetails?.login ?? '';
-    const handleBackPress = () => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT.path));
+    const handleBackPress = () => Navigation.goBack(backPath);
     const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
     const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
     const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
diff --git a/src/pages/settings/Agents/DynamicNewAgentPage.tsx b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
index 03f811ce3af5..313b5257d75e 100644
--- a/src/pages/settings/Agents/DynamicNewAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
@@ -89,6 +89,7 @@ function DynamicNewAgentPage({route}: DynamicNewAgentPageProps) {
     const hasTemplates = templates.length > 0;
     const shouldShowLoadingIndicator = isLoading && !hasTemplates && !isOffline;
     const shouldShowEmptyState = !hasTemplates && (!isLoading || isOffline);
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_NEW.path);
 
     useEffect(() => {
         if (isOffline) {
@@ -186,7 +187,7 @@ function DynamicNewAgentPage({route}: DynamicNewAgentPageProps) {
         >
             <HeaderWithBackButton
                 title={translate('newAgentPage.title')}
-                onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_NEW.path))}
+                onBackButtonPress={() => Navigation.goBack(backPath)}
             />
             {body}
         </ScreenWrapper>
diff --git a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
index aa05cc1305e7..982abdc7cb4a 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
@@ -235,10 +235,11 @@ EditAgentAvatarContent.displayName = 'EditAgentAvatarContent';
 
 function DynamicEditAgentAvatarPage({route}: DynamicEditAgentAvatarPageProps) {
     const {accountID} = route.params;
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.path);
     return (
         <EditAgentAvatarContent
             accountID={accountID}
-            fallbackRoute={useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.path)}
+            fallbackRoute={backPath}
         />
     );
 }
diff --git a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
index eb6970cfe6b9..162262c225f5 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
@@ -32,12 +32,13 @@ function DynamicEditNamePage({route}: DynamicEditNamePageProps) {
     const styles = useThemeStyles();
     const accountID = route.params.accountID;
     const [personalDetails] = usePersonalDetail(accountID);
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_NAME.path);
 
     const {inputCallbackRef} = useAutoFocusInput();
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
         updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
-        Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_NAME.path));
+        Navigation.goBack(backPath);
     };
 
     return (
@@ -49,7 +50,7 @@ function DynamicEditNamePage({route}: DynamicEditNamePageProps) {
         >
             <HeaderWithBackButton
                 title={translate('editAgentNamePage.title')}
-                onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_NAME.path))}
+                onBackButtonPress={() => Navigation.goBack(backPath)}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM}
diff --git a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
index f87211e02711..780852ff9cf8 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
@@ -53,6 +53,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
     const formRef = useRef<FormRef>(null);
     const promptTopOffsetRef = useRef(0);
     const scrollToInput = () => scrollToMultilineInput(formRef, shouldUseScrollableLayout, promptTopOffsetRef.current);
+    const backPath = useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path);
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM> => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM> = {};
@@ -64,7 +65,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>) => {
         updateAgentPrompt(accountID, values[INPUT_IDS.PROMPT].trim(), agentPrompt?.prompt ?? '');
-        Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path));
+        Navigation.goBack(backPath);
     };
 
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, (e) => {
@@ -96,7 +97,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
                     title={translate('editAgentPromptPage.title')}
-                    onBackButtonPress={() => Navigation.goBack(useDynamicBackPath(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.path))}
+                    onBackButtonPress={() => Navigation.goBack(backPath)}
                 />
             </CollapsibleHeaderOnKeyboard>
             <FormProvider

From 1d4beb4090766dae007d655ed9acbd701954955b Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 16:42:46 +0100
Subject: [PATCH 412/781] fix duplicates route params

---
 src/ROUTES.ts                                 | 20 +++++++++----------
 .../settings/Agents/DynamicEditAgentPage.tsx  |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 0acf59af642c..d54fb9c2b5a1 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2112,20 +2112,20 @@ const DYNAMIC_ROUTES = {
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
     AGENT_ADD: {
-        path: 'new-agent/custom',
+        path: 'custom',
         getRoute: ({policyID}: {policyID?: string} = {}) => {
             const params = new URLSearchParams();
             if (policyID) {
                 params.set('policyID', policyID);
             }
             const query = params.toString();
-            return `new-agent/custom${query ? `?${query}` : ''}` as const;
+            return `custom${query ? `?${query}` : ''}` as const;
         },
         entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW],
     },
     AGENT_ADD_AVATAR: {
-        path: 'new-agent/custom/avatar',
-        getRoute: () => `new-agent/custom/avatar` as const,
+        path: 'custom-avatar',
+        getRoute: () => `custom-avatar` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD],
     },
     AGENT_EDIT: {
@@ -2134,18 +2134,18 @@ const DYNAMIC_ROUTES = {
         entryScreens: [SCREENS.SETTINGS.AGENTS.ROOT, SCREENS.WORKSPACE.AGENTS],
     },
     AGENT_EDIT_NAME: {
-        path: ':accountID/edit/name',
-        getRoute: (accountID: number) => `${accountID}/edit/name` as const,
+        path: 'name',
+        getRoute: () => `name` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
     AGENT_EDIT_PROMPT: {
-        path: ':accountID/edit/prompt',
-        getRoute: (accountID: number) => `${accountID}/edit/prompt` as const,
+        path: 'prompt',
+        getRoute: () => `prompt` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
     AGENT_EDIT_AVATAR: {
-        path: ':accountID/edit/avatar',
-        getRoute: (accountID: number) => `${accountID}/edit/avatar` as const,
+        path: 'avatar',
+        getRoute: () => `avatar` as const,
         entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
     },
 } as const satisfies DynamicRoutes;
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 8282b977e326..bb7d4e00a120 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -61,9 +61,9 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack(backPath);
-    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
-    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
-    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute(accountID)), {skipMatchingFullScreenRoute: true});
+    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true});
+    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute()), {skipMatchingFullScreenRoute: true});
+    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute()), {skipMatchingFullScreenRoute: true});
     const handleDeletePress = async () => {
         const ruleBotEnforcedPolicy = getRuleBotEnforcedPolicy(accountID, allPolicies);
         if (ruleBotEnforcedPolicy) {

From 9482fe508a72b5de96126ef3a6f41f7401b32bb3 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 17:22:47 +0100
Subject: [PATCH 413/781] hide new agent button for workspace

---
 src/pages/workspace/WorkspaceAgentsPage.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index f47bbcfd3633..3321b077aaf2 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -54,7 +54,8 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
 
     useWorkspaceDocumentTitle(policy?.name, 'workspace.agents.title');
 
-    const newAgentButton = (
+    // The new agent functionality will be added after CreateCompanyAgent is exposed
+    const newAgentButton = true ? null : (
         <Button
             variant="success"
             onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()), {skipMatchingFullScreenRoute: true})}
@@ -128,7 +129,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
                 shouldUseHeadlineHeader={!selectionModeHeader}
                 headerContent={headerContent}
             >
-                {(policyID?: string) => (
+                {() => (
                     <AgentsTable
                         ref={tableRef}
                         agents={agents}

From d07a993a907a39e4a8a6287160c939c863b6067f Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 17:28:31 +0100
Subject: [PATCH 414/781] remove duplicated translations

---
 src/languages/en.ts                          | 4 ----
 src/pages/workspace/WorkspaceAgentsPage.tsx  | 6 +++---
 src/pages/workspace/getWorkspaceMenuItems.ts | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 8a3e98b32940..2f5134b89260 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5131,10 +5131,6 @@ const translations = {
             title: "You've created a workspace for your client!",
             description: 'Great news 🎉. Reach out to us if they need any help with the setup.',
         },
-        agents: {
-            title: 'Agents',
-            subtitle: `<muted-text>Agents handle your workflows for you, so you get hours back in your day. <a href="${CONST.CUSTOM_AGENTS_HELP_URL}">Learn more</a>.</muted-text>`,
-        },
         mcp: {
             connectors: 'Connectors',
             connectorsSubtitle: 'Connect an AI assistant to your Expensify account.',
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 3321b077aaf2..05242d0b086c 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -52,7 +52,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
 
-    useWorkspaceDocumentTitle(policy?.name, 'workspace.agents.title');
+    useWorkspaceDocumentTitle(policy?.name, 'agentsPage.title');
 
     // The new agent functionality will be added after CreateCompanyAgent is exposed
     const newAgentButton = true ? null : (
@@ -94,7 +94,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
             {shouldDisplayButtonsInSeparateLine && <View style={[pageGutter, styles.pb3]}>{headerButtons}</View>}
             {hasAgents && (
                 <View style={[styles.renderHTML, styles.flexRow, styles.w100, styles.ph5, styles.pb5, styles.pt3]}>
-                    <RenderHTML html={translate('workspace.agents.subtitle')} />
+                    <RenderHTML html={translate('agentsPage.subtitle')} />
                 </View>
             )}
         </>
@@ -120,7 +120,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
         >
             <WorkspacePageWithSections
                 shouldUseScrollView
-                headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.agents.title')}
+                headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('agentsPage.title')}
                 shouldShowOfflineIndicatorInWideScreen
                 route={route}
                 addBottomSafeAreaPadding
diff --git a/src/pages/workspace/getWorkspaceMenuItems.ts b/src/pages/workspace/getWorkspaceMenuItems.ts
index 186485792057..87d97c2975ba 100644
--- a/src/pages/workspace/getWorkspaceMenuItems.ts
+++ b/src/pages/workspace/getWorkspaceMenuItems.ts
@@ -237,7 +237,7 @@ function getWorkspaceMenuItems({
     if (isGroupPolicy(policy) && isCompanyAgentsBetaEnabled) {
         const membersItemIndex = items.findIndex((item) => item.screenName === SCREENS.WORKSPACE.MEMBERS);
         items.splice(membersItemIndex + 1, 0, {
-            translationKey: 'workspace.agents.title',
+            translationKey: 'agentsPage.title',
             icon: icons.Bot,
             getRoute: () => ROUTES.WORKSPACE_AGENTS.getRoute(policyID),
             screenName: SCREENS.WORKSPACE.AGENTS,

From cf6d3631bd125ecd052b9dda1ef1bc49f94d0de2 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 17:39:40 +0100
Subject: [PATCH 415/781] remove use of scrollview in workspaceagent page - the
 table is scrollable

---
 src/pages/workspace/WorkspaceAgentsPage.tsx | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 05242d0b086c..bfdcf2fcc9ad 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -119,7 +119,6 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
             shouldBeBlocked={!isCompanyAgentsBetaEnabled}
         >
             <WorkspacePageWithSections
-                shouldUseScrollView
                 headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('agentsPage.title')}
                 shouldShowOfflineIndicatorInWideScreen
                 route={route}
@@ -129,16 +128,14 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
                 shouldUseHeadlineHeader={!selectionModeHeader}
                 headerContent={headerContent}
             >
-                {() => (
-                    <AgentsTable
-                        ref={tableRef}
-                        agents={agents}
-                        headerComponent={agentsTableHeaderComponent}
-                        canSelectAgents
-                        selectedKeys={selectedAgentKeys}
-                        onRowSelectionChange={setSelectedAgents}
-                    />
-                )}
+                <AgentsTable
+                    ref={tableRef}
+                    agents={agents}
+                    headerComponent={agentsTableHeaderComponent}
+                    canSelectAgents
+                    selectedKeys={selectedAgentKeys}
+                    onRowSelectionChange={setSelectedAgents}
+                />
             </WorkspacePageWithSections>
         </AccessOrNotFoundWrapper>
     );

From 7c028cd7f16d0decd4ab45860f0eb835ea311937 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 18:07:52 +0100
Subject: [PATCH 416/781] fix opening prompt page from profile page

---
 src/ROUTES.ts             | 2 +-
 src/pages/ProfilePage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index d54fb9c2b5a1..00efc5f287c1 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -2141,7 +2141,7 @@ const DYNAMIC_ROUTES = {
     AGENT_EDIT_PROMPT: {
         path: 'prompt',
         getRoute: () => `prompt` as const,
-        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT],
+        entryScreens: [SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT, SCREENS.DYNAMIC_PROFILE],
     },
     AGENT_EDIT_AVATAR: {
         path: 'avatar',
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 47d906da812a..b10d414fb06f 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -317,7 +317,7 @@ function ProfilePage({route}: ProfilePageProps) {
                                     shouldTruncateTitle
                                     characterLimit={CONST.AGENT_PROMPT_LIMIT}
                                     shouldShowRightIcon
-                                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.getRoute(accountID))}
+                                    onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute()))}
                                 />
                             </OfflineWithFeedback>
                         )}

From 68f76772ba7b1c77e54f794508fc91ca550f80b6 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 18:13:16 +0100
Subject: [PATCH 417/781] fix some tests and ts

---
 tests/unit/pages/settings/AddAgentPageTest.tsx  | 11 ++++++-----
 .../unit/pages/settings/AgentsTableRowTest.tsx  |  9 +++++----
 tests/unit/pages/settings/NewAgentPageTest.tsx  | 17 +++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/unit/pages/settings/AddAgentPageTest.tsx b/tests/unit/pages/settings/AddAgentPageTest.tsx
index c4a0982ae8af..5bf4e0067b73 100644
--- a/tests/unit/pages/settings/AddAgentPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentPageTest.tsx
@@ -4,14 +4,15 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useOnyx from '@hooks/useOnyx';
 
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import AddAgentPage from '@pages/settings/Agents/AddAgentPage';
+import AddAgentPage from '@pages/settings/Agents/DynamicAddAgentPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type HybridAppModuleType from '@expensify/react-native-hybrid-app/src/types';
@@ -187,10 +188,10 @@ function getRevealAfterTransition(): () => void {
     return afterTransition;
 }
 
-type AddAgentRouteProp = PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.ADD>;
+type AddAgentRouteProp = PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD>;
 
 function makeRoute(params: AddAgentRouteProp['params'] = {}): AddAgentRouteProp {
-    return createMock<AddAgentRouteProp>({name: SCREENS.SETTINGS.AGENTS.ADD, key: '', params});
+    return createMock<AddAgentRouteProp>({name: SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD, key: '', params});
 }
 
 function renderAddAgentPage(routeParams: AddAgentRouteProp['params'] = {}) {
@@ -271,7 +272,7 @@ describe('AddAgentPage', () => {
         mockAvatarOnPress?.();
 
         expect(mockSetNewAgentAvatarPreset).not.toHaveBeenCalled();
-        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD_AVATAR);
+        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()));
     });
 
     it('does not seed a default while the draft is still loading (avoids clobbering a saved avatar on refresh)', () => {
diff --git a/tests/unit/pages/settings/AgentsTableRowTest.tsx b/tests/unit/pages/settings/AgentsTableRowTest.tsx
index b650bfae984d..2065732cd7e9 100644
--- a/tests/unit/pages/settings/AgentsTableRowTest.tsx
+++ b/tests/unit/pages/settings/AgentsTableRowTest.tsx
@@ -5,9 +5,10 @@ import AgentsTableRow from '@components/Tables/AgentsTable/AgentsTableRow';
 
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import type ReactNative from 'react-native';
 
@@ -195,7 +196,7 @@ const BASE_ITEM: AgentRowData = {
     accountID: TEST_ACCOUNT_ID,
     displayName: 'Test Agent',
     login: 'agent@example.com',
-    action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(TEST_ACCOUNT_ID)),
+    action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(TEST_ACCOUNT_ID))),
     onChatPress: mockOnChatPress,
     onCopilotPress: mockOnCopilotPress,
     dismissError: jest.fn(),
@@ -235,7 +236,7 @@ describe('AgentsTableRow', () => {
 
         fireEvent.press(screen.getByLabelText('Test Agent, agent@example.com'));
 
-        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(TEST_ACCOUNT_ID));
+        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(TEST_ACCOUNT_ID)));
     });
 
     it('shows action buttons on wide layout', () => {
@@ -277,7 +278,7 @@ describe('AgentsTableRow', () => {
 
         fireEvent.press(screen.getByText('common.edit'));
 
-        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(TEST_ACCOUNT_ID));
+        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(TEST_ACCOUNT_ID)));
     });
 
     it('pressing Chat button calls onChatPress', () => {
diff --git a/tests/unit/pages/settings/NewAgentPageTest.tsx b/tests/unit/pages/settings/NewAgentPageTest.tsx
index 792cafe25edf..6cbcf4b2d8dd 100644
--- a/tests/unit/pages/settings/NewAgentPageTest.tsx
+++ b/tests/unit/pages/settings/NewAgentPageTest.tsx
@@ -4,15 +4,16 @@ import useNetwork from '@hooks/useNetwork';
 import useSuggestedAgents from '@hooks/useSuggestedAgents';
 
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import NewAgentPage from '@pages/settings/Agents/NewAgentPage';
+import NewAgentPage from '@pages/settings/Agents/DynamicNewAgentPage';
 
 import {clearNewAgentAvatarDraft, clearNewAgentTemplate, setNewAgentTemplate} from '@userActions/Agent';
 
-import ROUTES from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type SuggestedAgent from '@src/types/onyx/SuggestedAgent';
 
@@ -106,11 +107,11 @@ const mockSetNewAgentTemplate = jest.mocked(setNewAgentTemplate);
 const mockClearNewAgentTemplate = jest.mocked(clearNewAgentTemplate);
 const mockClearNewAgentAvatarDraft = jest.mocked(clearNewAgentAvatarDraft);
 
-type NewAgentRouteProp = PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.NEW>;
-type NewAgentNavigationProp = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.NEW>['navigation'];
+type NewAgentRouteProp = PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW>;
+type NewAgentNavigationProp = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW>['navigation'];
 
 function makeRoute(params: NewAgentRouteProp['params'] = {}): NewAgentRouteProp {
-    return {key: 'Settings_Agents_New-test', name: SCREENS.SETTINGS.AGENTS.NEW, params};
+    return {key: 'Settings_Agents_New-test', name: SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW, params};
 }
 
 function renderNewAgentPage(routeParams: NewAgentRouteProp['params'] = {}) {
@@ -206,7 +207,7 @@ describe('NewAgentPage', () => {
         });
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute());
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
         });
     });
 
@@ -219,7 +220,7 @@ describe('NewAgentPage', () => {
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         expect(mockSetNewAgentTemplate).not.toHaveBeenCalled();
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute());
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
         });
     });
 
@@ -229,7 +230,7 @@ describe('NewAgentPage', () => {
         fireEvent.press(screen.getByText('newAgentPage.buildCustomAgent'));
 
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_AGENTS_ADD.getRoute({policyID: 'POL_42'}));
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute({policyID: 'POL_42'})));
         });
     });
 });

From 5ea26a49b0ee5db13185c74971c63cc4e74673fa Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 18:22:36 +0100
Subject: [PATCH 418/781] switch from COLLECTION.SHARED_NVP_AGENT_PROMPT to
 COLLECTION.AGENT

---
 src/ONYXKEYS.ts                               |  5 ++-
 src/hooks/useAgents.ts                        |  4 +-
 src/libs/actions/Agent.ts                     | 36 ++++++++--------
 .../replaceOptimisticAgentWithActualAgent.ts  |  2 +-
 src/pages/ProfilePage.tsx                     |  2 +-
 .../settings/Agents/DynamicEditAgentPage.tsx  |  2 +-
 .../Agents/Fields/DynamicEditPromptPage.tsx   |  2 +-
 .../settings/Profile/AgentAIPromptSection.tsx |  2 +-
 src/pages/settings/Profile/ProfilePage.tsx    |  2 +-
 .../useInitialSettingsPageMenuData.ts         |  2 +-
 src/types/onyx/{AgentPrompt.ts => Agent.ts}   |  6 +--
 src/types/onyx/PersonalDetails.ts             |  2 +-
 src/types/onyx/index.ts                       |  4 +-
 ...placeOptimisticAgentWithActualAgentTest.ts | 42 +++++++++----------
 tests/ui/InitialSettingsPageTest.tsx          |  2 +-
 tests/ui/ProfilePageTest.tsx                  | 18 ++++----
 tests/ui/PublicProfilePageTest.tsx            |  4 +-
 tests/unit/AgentActionTest.ts                 | 38 ++++++++---------
 .../ReplaceOptimisticAgentAccountIDTest.ts    | 24 +++++------
 tests/unit/pages/settings/AgentsPageTest.tsx  |  8 ++--
 .../unit/pages/settings/EditAgentPageTest.tsx |  8 ++--
 .../pages/settings/EditPromptPageTest.tsx     |  8 ++--
 22 files changed, 112 insertions(+), 111 deletions(-)
 rename src/types/onyx/{AgentPrompt.ts => Agent.ts} (78%)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index b03fd4aec992..fdbfdffaf1b9 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1039,6 +1039,7 @@ const ONYXKEYS = {
 
         // Shared NVPs
         /** Collection of agent prompts keyed by agent accountID, representing agents owned by the current user */
+        /** Deprecated. Use agent_ instead */
         SHARED_NVP_AGENT_PROMPT: 'sharedNVP_agentPrompt_',
 
         /** Collection of objects where each object represents the owner of the workspace that is past due billing AND the user is a member of. */
@@ -1577,7 +1578,7 @@ type OnyxFormDraftValuesMapping = {
 };
 
 type OnyxCollectionValuesMapping = {
-    [ONYXKEYS.COLLECTION.AGENT]: OnyxTypes.AgentPrompt;
+    [ONYXKEYS.COLLECTION.AGENT]: OnyxTypes.Agent;
     [ONYXKEYS.COLLECTION.ATTACHMENT]: OnyxTypes.Attachment;
     [ONYXKEYS.COLLECTION.DOMAIN]: OnyxTypes.Domain;
     [ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
@@ -1643,7 +1644,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_MERGE_ATS_INITIAL_SYNC_MODAL_SHOWN]: boolean;
     [ONYXKEYS.COLLECTION.SNAPSHOT]: OnyxTypes.SearchResults;
     [ONYXKEYS.COLLECTION.INSIGHTS]: OnyxTypes.InsightsDashboard;
-    [ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT]: OnyxTypes.AgentPrompt;
+    [ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT]: OnyxTypes.Agent;
     [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: OnyxTypes.BillingGraceEndPeriod;
     [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER]: OnyxTypes.CardFeeds;
     [ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS]: OnyxTypes.ExpensifyCardSettings;
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index 79a8f254c51f..dbe334677ff5 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -44,7 +44,7 @@ function useAgents() {
 
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
+    const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.AGENT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const personalDetailsList = usePersonalDetails();
     const chatWithAgent = useChatWithAgent();
@@ -54,7 +54,7 @@ function useAgents() {
     const [selectedAgents, setSelectedAgents] = useState<string[]>([]);
 
     const agents: AgentRowData[] = Object.entries(agentPrompts ?? {}).flatMap(([key, agentPrompt]) => {
-        const accountID = Number(key.slice(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT.length));
+        const accountID = Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length));
         const details = personalDetailsList?.[accountID];
         if (!details) {
             return [];
diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 5be435da4e24..78f23ea71849 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -86,7 +86,7 @@ function createAgent(
     const optimisticData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`,
             value: {prompt, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
         },
         {
@@ -125,7 +125,7 @@ function createAgent(
         buildPersonalDetailsUpdate({[optimisticAccountID]: optimisticPersonalDetail}),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`,
             value: {
                 prompt,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -173,23 +173,23 @@ function clearNewAgentTemplate() {
 
 function clearAgentError(optimisticAccountID: number) {
     Onyx.update([buildPersonalDetailsUpdate({[optimisticAccountID]: null})]);
-    Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, null);
+    Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, null);
 }
 
 function clearAgentUpdateError(accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {errors: null, nameErrors: null, promptErrors: null, avatarErrors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {errors: null, nameErrors: null, promptErrors: null, avatarErrors: null});
 }
 
 function clearAgentNameUpdateError(accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {nameErrors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {nameErrors: null});
 }
 
 function clearAgentPromptUpdateError(accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {promptErrors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {promptErrors: null});
 }
 
 function clearAgentDeleteError(accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {pendingAction: null, errors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {pendingAction: null, errors: null});
 }
 
 function updateAgentName(accountID: number, firstName: string, originalFirstName: string) {
@@ -199,7 +199,7 @@ function updateAgentName(accountID: number, firstName: string, originalFirstName
         buildPersonalDetailsUpdate({[agentAccountID]: {displayName: firstName}}),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null, nameErrors: null},
         },
     ];
@@ -207,7 +207,7 @@ function updateAgentName(accountID: number, firstName: string, originalFirstName
     const successData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: null, nameErrors: null},
         },
     ];
@@ -216,7 +216,7 @@ function updateAgentName(accountID: number, firstName: string, originalFirstName
         buildPersonalDetailsUpdate({[agentAccountID]: {displayName: originalFirstName}}),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: null, nameErrors: getMicroSecondOnyxErrorWithTranslationKey('agentsPage.error.updateName')},
         },
     ];
@@ -227,7 +227,7 @@ function updateAgentName(accountID: number, firstName: string, originalFirstName
 function updateAgentPrompt(accountID: number, prompt: string, originalPrompt: string) {
     // The caller may still hold an optimistic accountID that was already reconciled while its screen was open.
     const agentAccountID = resolveAgentAccountID(accountID);
-    const onyxKey = `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`;
+    const onyxKey = `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`;
     const optimisticData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -256,7 +256,7 @@ function updateAgentPrompt(accountID: number, prompt: string, originalPrompt: st
 }
 
 function clearAgentAvatarUpdateError(accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {avatarErrors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {avatarErrors: null});
 }
 
 function updateAgentAvatar(
@@ -279,7 +279,7 @@ function updateAgentAvatar(
         }),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null, avatarErrors: null},
         },
     ];
@@ -293,7 +293,7 @@ function updateAgentAvatar(
         }),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: null, avatarErrors: null},
         },
     ];
@@ -309,7 +309,7 @@ function updateAgentAvatar(
         }),
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: null, avatarErrors: getMicroSecondOnyxErrorWithTranslationKey('agentsPage.error.updateAvatar')},
         },
     ];
@@ -325,7 +325,7 @@ function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxC
     const optimisticData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
         },
     ];
@@ -333,7 +333,7 @@ function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxC
     const successData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: null,
         },
         buildPersonalDetailsUpdate({[agentAccountID]: null}),
@@ -342,7 +342,7 @@ function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxC
     const failureData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${agentAccountID}`,
+            key: `${ONYXKEYS.COLLECTION.AGENT}${agentAccountID}`,
             value: {
                 pendingAction: null,
                 errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
diff --git a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
index 7a73859b6269..35a9992dd4a2 100644
--- a/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
+++ b/src/libs/actions/replaceOptimisticAgentWithActualAgent.ts
@@ -124,7 +124,7 @@ function replaceOptimisticAgentWithActualAgent(optimisticAccountID: number, real
                 remapReportParticipants(optimisticAccountID, realAccountID);
 
                 Onyx.update([buildPersonalDetailsUpdate({[optimisticAccountID]: null})]);
-                Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, null);
+                Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, null);
                 Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[optimisticAccountID]: null});
             },
         });
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index b10d414fb06f..998f15b40a55 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -100,7 +100,7 @@ function ProfilePage({route}: ProfilePageProps) {
     const guideCalendarLink = account?.guideDetails?.calendarLink ?? '';
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Bug', 'History', 'Pencil', 'Phone', 'UserPlus']);
     const accountID = Number(route.params?.accountID ?? CONST.DEFAULT_NUMBER_ID);
-    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
     const isCurrentUser = currentUserAccountID === accountID;
     const reportID = isCurrentUser ? findSelfDMReportID() : getChatByParticipants(currentUserAccountID ? [accountID, currentUserAccountID] : [], reports)?.reportID;
     const reportKey = isAnonymousUserSession() || !reportID ? (`${ONYXKEYS.COLLECTION.REPORT}0` as const) : (`${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const);
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index bb7d4e00a120..970d0b099241 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -47,7 +47,7 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'MagnifyingGlass', 'Users']);
     const accountID = route.params.accountID;
-    const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = usePersonalDetail(accountID);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const {showConfirmModal} = useConfirmModal();
diff --git a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
index 780852ff9cf8..a172abaf1720 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
@@ -49,7 +49,7 @@ function DynamicEditPromptPage({route}: DynamicEditPromptPageProps) {
     const shouldUseScrollableLayout = shouldAutoGrowPromptInput || isInLandscapeMode;
     const shouldShrinkPromptInput = isInLandscapeMode && isKeyboardActive;
     const accountID = route.params.accountID;
-    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
     const formRef = useRef<FormRef>(null);
     const promptTopOffsetRef = useRef(0);
     const scrollToInput = () => scrollToMultilineInput(formRef, shouldUseScrollableLayout, promptTopOffsetRef.current);
diff --git a/src/pages/settings/Profile/AgentAIPromptSection.tsx b/src/pages/settings/Profile/AgentAIPromptSection.tsx
index 32336375e7d2..c71541fdc35c 100644
--- a/src/pages/settings/Profile/AgentAIPromptSection.tsx
+++ b/src/pages/settings/Profile/AgentAIPromptSection.tsx
@@ -59,7 +59,7 @@ function AgentAIPromptSection({accountID, parentScrollViewRef}: AgentAIPromptSec
     const {isOffline} = useNetwork();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Checkmark']);
-    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const [draftPrompt, setDraftPrompt] = useState('');
     const [showEmptyError, setShowEmptyError] = useState(false);
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index fbe2ff443f38..f5fc3e314d79 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -88,7 +88,7 @@ function ProfilePage() {
     const avatarURL = currentUserPersonalDetails?.avatar ?? '';
     const accountID = currentUserPersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID;
     const isAgentAccount = useIsAgentAccount();
-    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+    const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
     const icons = useMemoizedLazyExpensifyIcons(['QrCode']);
 
     const contactMethodBrickRoadIndicator = getLoginListBrickRoadIndicator(loginList, currentUserPersonalDetails?.email);
diff --git a/src/pages/settings/useInitialSettingsPageMenuData.ts b/src/pages/settings/useInitialSettingsPageMenuData.ts
index 65aae879d93f..d7d19f20d82a 100644
--- a/src/pages/settings/useInitialSettingsPageMenuData.ts
+++ b/src/pages/settings/useInitialSettingsPageMenuData.ts
@@ -86,7 +86,7 @@ function useInitialSettingsPageMenuData(currentUserPersonalDetails: CurrentUserP
     const [unsharedBankAccount] = useOnyx(ONYXKEYS.UNSHARE_BANK_ACCOUNT);
     const [stashedCredentials] = useOnyx(ONYXKEYS.STASHED_CREDENTIALS);
     const [stashedSession] = useOnyx(ONYXKEYS.STASHED_SESSION);
-    const [hasAgentErrors] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT, {
+    const [hasAgentErrors] = useOnyx(ONYXKEYS.COLLECTION.AGENT, {
         selector: (agents) => Object.values(agents ?? {}).some((agent) => !isEmptyObject(agent?.nameErrors) || !isEmptyObject(agent?.promptErrors) || !isEmptyObject(agent?.avatarErrors)),
     });
     const privateSubscription = usePrivateSubscription();
diff --git a/src/types/onyx/AgentPrompt.ts b/src/types/onyx/Agent.ts
similarity index 78%
rename from src/types/onyx/AgentPrompt.ts
rename to src/types/onyx/Agent.ts
index ea2e4cb2af2e..91845e485f25 100644
--- a/src/types/onyx/AgentPrompt.ts
+++ b/src/types/onyx/Agent.ts
@@ -1,7 +1,7 @@
 import type {Errors, OnyxValueWithOfflineFeedback} from './OnyxCommon';
 
-/** Model of an agent's prompt data stored as a shared NVP */
-type AgentPrompt = OnyxValueWithOfflineFeedback<{
+/** Agent model */
+type Agent = OnyxValueWithOfflineFeedback<{
     /** The system prompt defining the agent's behavior */
     prompt: string;
 
@@ -18,4 +18,4 @@ type AgentPrompt = OnyxValueWithOfflineFeedback<{
     avatarErrors?: Errors | null;
 }>;
 
-export default AgentPrompt;
+export default Agent;
diff --git a/src/types/onyx/PersonalDetails.ts b/src/types/onyx/PersonalDetails.ts
index 116903875937..74b1f5fb6fcb 100644
--- a/src/types/onyx/PersonalDetails.ts
+++ b/src/types/onyx/PersonalDetails.ts
@@ -90,7 +90,7 @@ type PersonalDetails = OnyxCommon.OnyxValueWithOfflineFeedback<{
      * NVP set). Stamped by Auth in `Account::formatNewDotPersonalDetails`, so it travels with
      * every personalDetails payload returned to the client (OpenReport, OpenApp, ReconnectApp,
      * GetPersonalDetailsForEmails, etc.). Lets chat surfaces detect custom-agent participants
-     * without subscribing to the wider `SHARED_NVP_AGENT_PROMPT` collection.
+     * without subscribing to the wider `AGENT` collection.
      */
     isCustomAgent?: boolean;
 
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 6cbcf8970d18..d91ced7469b2 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -4,8 +4,8 @@ import type {FileObject} from '@src/types/utils/Attachment';
 
 import type Account from './Account';
 import type AccountData from './AccountData';
+import type Agent from './Agent';
 import type AgentNewAvatarDraft from './AgentNewAvatarDraft';
-import type AgentPrompt from './AgentPrompt';
 import type AppReview from './AppReview';
 import type {ApprovalWorkflowOnyx} from './ApprovalWorkflow';
 import type {AssignCard, AssignCardData} from './AssignCard';
@@ -512,7 +512,7 @@ export type {
     LocallyProcessed3DSChallengeReviews,
     InitiatingBankAccountUnlock,
     AgentNewAvatarDraft,
-    AgentPrompt,
+    Agent,
     SuggestedAgentRule,
     SuggestedAgent,
 };
diff --git a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
index ea1e3093cc14..202709a5eeb0 100644
--- a/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
+++ b/tests/actions/ReplaceOptimisticAgentWithActualAgentTest.ts
@@ -150,7 +150,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
             [optimisticAccountID]: {displayName: 'Concierge Travel', isOptimisticPersonalDetail: true},
         });
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, {prompt: 'Book my flights'});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, {prompt: 'Book my flights'});
         await waitForBatchedUpdates();
 
         replaceOptimisticAgentWithActualAgent(optimisticAccountID, realAccountID);
@@ -158,14 +158,14 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
 
         const reportAfterFirstRun = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
         const personalDetailsAfterFirstRun = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
-        const promptAfterFirstRun = await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`);
+        const promptAfterFirstRun = await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`);
 
         replaceOptimisticAgentWithActualAgent(optimisticAccountID, realAccountID);
         await waitForBatchedUpdates();
 
         expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`)).toStrictEqual(reportAfterFirstRun);
         expect(await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST)).toStrictEqual(personalDetailsAfterFirstRun);
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`)).toStrictEqual(promptAfterFirstRun);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`)).toStrictEqual(promptAfterFirstRun);
     });
 
     it('clears the optimistic personal detail and prompt without carrying their stale state onto the real agent', async () => {
@@ -198,8 +198,8 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
                 errorFields: {avatar: {[errorTimestamp]: 'Unexpected error updating the avatar'}},
             },
         });
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`, realAgentPrompt);
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`, realAgentPrompt);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, {
             prompt: 'Book my flights and hotels',
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
             errors: {[errorTimestamp]: 'Unexpected error updating the prompt'},
@@ -214,8 +214,8 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         const personalDetails = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
         expect(personalDetails?.[realAccountID]).toStrictEqual(realPersonalDetail);
         expect(personalDetails?.[optimisticAccountID]).toBeUndefined();
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`)).toStrictEqual(realAgentPrompt);
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`)).toBeUndefined();
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`)).toStrictEqual(realAgentPrompt);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`)).toBeUndefined();
         const mapping = await getOnyxValue(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
         expect(mapping?.[optimisticAccountID]).toBeUndefined();
     });
@@ -229,7 +229,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
             [optimisticAccountID]: {accountID: optimisticAccountID, displayName: 'Concierge Travel', isOptimisticPersonalDetail: true},
         });
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, {
             prompt: 'Book my flights',
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
         });
@@ -242,8 +242,8 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         const personalDetails = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
         expect(personalDetails?.[realAccountID]).toBeUndefined();
         expect(personalDetails?.[optimisticAccountID]).toBeUndefined();
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`)).toBeUndefined();
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`)).toBeUndefined();
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`)).toBeUndefined();
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`)).toBeUndefined();
     });
 
     it('redirects every agent settings screen in the navigation stack to the real accountID, skipping unrelated screens', async () => {
@@ -294,7 +294,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         const optimisticPersonalDetail = {accountID: optimisticAccountID, displayName: 'Concierge Travel', isOptimisticPersonalDetail: true};
         const optimisticAgentPrompt = {prompt: 'Book my flights'};
         await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[optimisticAccountID]: optimisticPersonalDetail});
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, optimisticAgentPrompt);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, optimisticAgentPrompt);
         await waitForBatchedUpdates();
 
         // When the mapping is consumed before navigation is ready
@@ -306,7 +306,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         expect(resolveAgentAccountID(optimisticAccountID)).toBe(realAccountID);
         expect(mockSetParams).not.toHaveBeenCalled();
         expect((await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST))?.[optimisticAccountID]).toStrictEqual(optimisticPersonalDetail);
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`)).toStrictEqual(optimisticAgentPrompt);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`)).toStrictEqual(optimisticAgentPrompt);
         expect((await getOnyxValue(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING))?.[optimisticAccountID]).toBe(realAccountID);
 
         // When navigation becomes ready
@@ -318,7 +318,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         expect(mockSetParams).toHaveBeenCalledTimes(1);
         expect(mockSetParams).toHaveBeenCalledWith({accountID: realAccountID}, 'agents-edit-route-key', 'agent-settings-stack-key');
         expect((await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST))?.[optimisticAccountID]).toBeUndefined();
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`)).toBeUndefined();
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`)).toBeUndefined();
         expect((await getOnyxValue(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING))?.[optimisticAccountID]).toBeUndefined();
     });
 
@@ -356,7 +356,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
         const agentPrompt = {prompt: 'Book my flights'};
 
         await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[accountID]: personalDetail});
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, agentPrompt);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, agentPrompt);
         await waitForBatchedUpdates();
 
         await Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[accountID]: accountID});
@@ -364,7 +364,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
 
         const personalDetails = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
         expect(personalDetails?.[accountID]).toStrictEqual(personalDetail);
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`)).toStrictEqual(agentPrompt);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`)).toStrictEqual(agentPrompt);
         const mapping = await getOnyxValue(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
         expect(mapping?.[accountID]).toBeUndefined();
     });
@@ -381,8 +381,8 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
             [zeroMappedAccountID]: zeroMappedPersonalDetail,
             [negativeMappedAccountID]: negativeMappedPersonalDetail,
         });
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${zeroMappedAccountID}`, agentPrompt);
-        await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${negativeMappedAccountID}`, agentPrompt);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${zeroMappedAccountID}`, agentPrompt);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${negativeMappedAccountID}`, agentPrompt);
         await waitForBatchedUpdates();
 
         await Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[zeroMappedAccountID]: 0, [negativeMappedAccountID]: -1});
@@ -394,8 +394,8 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
             [zeroMappedAccountID]: zeroMappedPersonalDetail,
             [negativeMappedAccountID]: negativeMappedPersonalDetail,
         });
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${zeroMappedAccountID}`)).toStrictEqual(agentPrompt);
-        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${negativeMappedAccountID}`)).toStrictEqual(agentPrompt);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${zeroMappedAccountID}`)).toStrictEqual(agentPrompt);
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.AGENT}${negativeMappedAccountID}`)).toStrictEqual(agentPrompt);
         const mapping = await getOnyxValue(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
         expect(mapping?.[zeroMappedAccountID]).toBeUndefined();
         expect(mapping?.[negativeMappedAccountID]).toBeUndefined();
@@ -426,7 +426,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
             await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
                 [optimisticAccountID]: {accountID: optimisticAccountID, displayName: 'Concierge Travel', isOptimisticPersonalDetail: true},
             });
-            await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, {prompt: 'Book my flights', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
+            await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, {prompt: 'Book my flights', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
             await waitForBatchedUpdates();
 
             mockIsReady.mockReturnValue(true);
@@ -453,7 +453,7 @@ describe('replaceOptimisticAgentWithActualAgent', () => {
                 [realAccountID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN},
             });
             expect((await getColdStartOnyxValue(coldStartOnyxKeys.PERSONAL_DETAILS_LIST))?.[optimisticAccountID]).toBeUndefined();
-            expect(await getColdStartOnyxValue(`${coldStartOnyxKeys.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`)).toBeUndefined();
+            expect(await getColdStartOnyxValue(`${coldStartOnyxKeys.COLLECTION.AGENT}${optimisticAccountID}`)).toBeUndefined();
             expect((await getColdStartOnyxValue(coldStartOnyxKeys.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING))?.[optimisticAccountID]).toBeUndefined();
         });
     });
diff --git a/tests/ui/InitialSettingsPageTest.tsx b/tests/ui/InitialSettingsPageTest.tsx
index a5cef1a0dfff..be2a480cbb87 100644
--- a/tests/ui/InitialSettingsPageTest.tsx
+++ b/tests/ui/InitialSettingsPageTest.tsx
@@ -330,7 +330,7 @@ describe('InitialSettingsPage - agent account', () => {
                     errorFields: {revoke: {error: 'Unable to revoke device'}},
                 },
             });
-            await Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 nameErrors: {error: 'Agent name error'},
             });
             await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index e28481374bd9..dabde09c8400 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -330,7 +330,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: null,
             });
@@ -381,7 +381,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: null,
             });
@@ -404,7 +404,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: 'update',
             });
@@ -423,7 +423,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: null,
             });
@@ -437,7 +437,7 @@ describe('ProfilePage - agent account', () => {
         fireEvent.press(screen.getByTestId('save-prompt-button'));
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Updated prompt text',
                 pendingAction: 'update',
             });
@@ -456,7 +456,7 @@ describe('ProfilePage - agent account', () => {
         await act(async () => {
             // Simulate a first offline save that is queued but not yet replayed: pendingAction stays 'update',
             // so isSaving is true. The button is intentionally not disabled while offline.
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'First offline edit.',
                 pendingAction: 'update',
             });
@@ -479,7 +479,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: null,
             });
@@ -495,7 +495,7 @@ describe('ProfilePage - agent account', () => {
 
         // Optimistic write sets pendingAction='update' so the user-initiated save shows the loader.
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Updated prompt text',
                 pendingAction: 'update',
             });
@@ -521,7 +521,7 @@ describe('ProfilePage - agent account', () => {
         await setupUser('testbot_123@expensify.ai', true);
 
         await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`, {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${accountID}`, {
                 prompt: 'Reject gambling expenses.',
                 pendingAction: null,
             });
diff --git a/tests/ui/PublicProfilePageTest.tsx b/tests/ui/PublicProfilePageTest.tsx
index 1c1f6b09252e..0aaf32447ee0 100644
--- a/tests/ui/PublicProfilePageTest.tsx
+++ b/tests/ui/PublicProfilePageTest.tsx
@@ -82,7 +82,7 @@ describe('ProfilePage - agent custom instructions', () => {
 
         await act(async () => {
             await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${AGENT_ACCOUNT_ID}`, {prompt, pendingAction: null});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${AGENT_ACCOUNT_ID}`, {prompt, pendingAction: null});
             await Onyx.merge(ONYXKEYS.IS_LOADING_APP, false);
         });
         await waitForBatchedUpdatesWithAct();
@@ -126,7 +126,7 @@ describe('ProfilePage - agent custom instructions', () => {
 
         await act(async () => {
             await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${AGENT_ACCOUNT_ID}`, {prompt: 'Ignore #some-room mentions.', pendingAction: null});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.AGENT}${AGENT_ACCOUNT_ID}`, {prompt: 'Ignore #some-room mentions.', pendingAction: null});
             await Onyx.merge(ONYXKEYS.IS_LOADING_APP, false);
         });
         await waitForBatchedUpdatesWithAct();
diff --git a/tests/unit/AgentActionTest.ts b/tests/unit/AgentActionTest.ts
index 38ed33042097..a3236debd56f 100644
--- a/tests/unit/AgentActionTest.ts
+++ b/tests/unit/AgentActionTest.ts
@@ -152,7 +152,7 @@ describe('createAgent', () => {
 
         const {optimisticData} = getWriteOptions();
         const accountID = getOptimisticAccountID();
-        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
 
         expect(promptUpdate?.value).toEqual({
             prompt: 'My prompt',
@@ -351,7 +351,7 @@ describe('createAgent', () => {
         const accountID = getOptimisticAccountID();
 
         expect(findUpdate(successData, ONYXKEYS.PERSONAL_DETAILS_LIST)).toBeUndefined();
-        expect(findUpdate(successData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`)).toBeUndefined();
+        expect(findUpdate(successData, `${ONYXKEYS.COLLECTION.AGENT}${accountID}`)).toBeUndefined();
     });
 
     it('passes the optimistic accountID through to the server so it can echo a real-ID mapping', () => {
@@ -371,7 +371,7 @@ describe('createAgent', () => {
             displayName: 'Bot',
             isOptimisticPersonalDetail: true,
         });
-        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${accountID}`);
 
         expect(promptValue).toMatchObject({
             prompt: 'My prompt',
@@ -405,7 +405,7 @@ describe('updateAgentName', () => {
         updateAgentName(TEST_ACCOUNT_ID, 'New Name', 'Old Name');
 
         const {optimisticData} = getWriteOptions();
-        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.value).toMatchObject({pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null});
     });
@@ -414,7 +414,7 @@ describe('updateAgentName', () => {
         updateAgentName(TEST_ACCOUNT_ID, 'New Name', 'Old Name');
 
         const {successData} = getWriteOptions();
-        expect(getUpdateRecord(successData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`).pendingAction).toBeNull();
+        expect(getUpdateRecord(successData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`).pendingAction).toBeNull();
     });
 
     it('failure data reverts displayName to originalFirstName in PERSONAL_DETAILS_LIST', () => {
@@ -428,7 +428,7 @@ describe('updateAgentName', () => {
         updateAgentName(TEST_ACCOUNT_ID, 'New Name', 'Old Name');
 
         const {failureData} = getWriteOptions();
-        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptValue.nameErrors).toBeTruthy();
         expect(promptValue.pendingAction).toBeNull();
@@ -460,7 +460,7 @@ describe('updateAgentPrompt', () => {
         updateAgentPrompt(TEST_ACCOUNT_ID, 'New prompt', 'Old prompt');
 
         const {optimisticData} = getWriteOptions();
-        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.value).toMatchObject({prompt: 'New prompt', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null});
     });
@@ -469,21 +469,21 @@ describe('updateAgentPrompt', () => {
         updateAgentPrompt(TEST_ACCOUNT_ID, 'New prompt', 'Old prompt');
 
         const {successData} = getWriteOptions();
-        expect(getUpdateRecord(successData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`).pendingAction).toBeNull();
+        expect(getUpdateRecord(successData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`).pendingAction).toBeNull();
     });
 
     it('failure data reverts prompt to originalPrompt on the prompt key', () => {
         updateAgentPrompt(TEST_ACCOUNT_ID, 'New prompt', 'Old prompt');
 
         const {failureData} = getWriteOptions();
-        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`).prompt).toBe('Old prompt');
+        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`).prompt).toBe('Old prompt');
     });
 
     it('failure data sets promptErrors (truthy) and pendingAction null on the prompt key', () => {
         updateAgentPrompt(TEST_ACCOUNT_ID, 'New prompt', 'Old prompt');
 
         const {failureData} = getWriteOptions();
-        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptValue.promptErrors).toBeTruthy();
         expect(promptValue.pendingAction).toBeNull();
@@ -515,7 +515,7 @@ describe('deleteAgent', () => {
         deleteAgent(TEST_ACCOUNT_ID);
 
         const {optimisticData} = getWriteOptions();
-        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.onyxMethod).toBe('merge');
         expect(promptUpdate?.value).toMatchObject({pendingAction: 'delete'});
@@ -525,7 +525,7 @@ describe('deleteAgent', () => {
         deleteAgent(TEST_ACCOUNT_ID);
 
         const {successData} = getWriteOptions();
-        const promptUpdate = findUpdate(successData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(successData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.onyxMethod).toBe('set');
         expect(promptUpdate?.value).toBeNull();
@@ -542,11 +542,11 @@ describe('deleteAgent', () => {
         deleteAgent(TEST_ACCOUNT_ID);
 
         const {failureData} = getWriteOptions();
-        const promptUpdate = findUpdate(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.onyxMethod).toBe('merge');
         expect(promptUpdate?.value).toMatchObject({pendingAction: null});
-        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`).errors).toBeTruthy();
+        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`).errors).toBeTruthy();
     });
 
     it('calls Navigation.goBack after issuing the write', () => {
@@ -648,7 +648,7 @@ describe('clearAgentUpdateError', () => {
     it('calls Onyx.merge on the correct prompt key with errors null', () => {
         clearAgentUpdateError(TEST_ACCOUNT_ID);
 
-        expect(mergeSpy).toHaveBeenCalledWith(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`, {avatarErrors: null, errors: null, nameErrors: null, promptErrors: null});
+        expect(mergeSpy).toHaveBeenCalledWith(`${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`, {avatarErrors: null, errors: null, nameErrors: null, promptErrors: null});
     });
 });
 
@@ -684,7 +684,7 @@ describe('updateAgentAvatar (file upload)', () => {
         updateAgentAvatar(TEST_ACCOUNT_ID, {file: mockFile, uri: 'file://photo.jpg'}, currentAvatar);
 
         const {optimisticData} = getWriteOptions();
-        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptUpdate = findUpdate(optimisticData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.value).toMatchObject({pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null, avatarErrors: null});
     });
@@ -708,7 +708,7 @@ describe('updateAgentAvatar (file upload)', () => {
         const value = getPersonalDetailEntry(failureData, TEST_ACCOUNT_ID);
         expect(value.avatar).toBe(currentAvatar);
         expect(value.avatarThumbnail).toBe(currentAvatar);
-        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
+        const promptValue = getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`);
         expect(promptValue.avatarErrors).toBeTruthy();
         expect(promptValue.pendingAction).toBeNull();
     });
@@ -747,7 +747,7 @@ describe('updateAgentAvatar (bot avatar)', () => {
         const {failureData} = getWriteOptions();
         const value = getPersonalDetailEntry(failureData, TEST_ACCOUNT_ID);
         expect(value.avatar).toBe(currentAvatar);
-        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`).avatarErrors).toBeTruthy();
+        expect(getUpdateRecord(failureData, `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`).avatarErrors).toBeTruthy();
     });
 });
 
@@ -766,6 +766,6 @@ describe('clearAgentAvatarUpdateError', () => {
     it('calls Onyx.merge on the correct prompt key with avatarErrors null', () => {
         clearAgentAvatarUpdateError(TEST_ACCOUNT_ID);
 
-        expect(mergeSpy).toHaveBeenCalledWith(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`, {avatarErrors: null});
+        expect(mergeSpy).toHaveBeenCalledWith(`${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`, {avatarErrors: null});
     });
 });
diff --git a/tests/unit/ReplaceOptimisticAgentAccountIDTest.ts b/tests/unit/ReplaceOptimisticAgentAccountIDTest.ts
index 9bfd1a981955..dcbd410fe381 100644
--- a/tests/unit/ReplaceOptimisticAgentAccountIDTest.ts
+++ b/tests/unit/ReplaceOptimisticAgentAccountIDTest.ts
@@ -88,9 +88,9 @@ describe('ReplaceOptimisticAgentAccountID middleware', () => {
             data: {
                 firstName: 'Concierge',
                 optimisticAccountID: String(optimisticAccountID),
-                agentPromptKey: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`,
+                agentPromptKey: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`,
                 nvpUpdates: {
-                    [`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`]: {prompt: 'Book my flights'},
+                    [`${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`]: {prompt: 'Book my flights'},
                 },
             },
             requestIndex,
@@ -102,9 +102,9 @@ describe('ReplaceOptimisticAgentAccountID middleware', () => {
 
         const persistedData = getAll().at(0)?.data;
         expect(persistedData?.optimisticAccountID).toBe(String(realAccountID));
-        expect(persistedData?.agentPromptKey).toBe(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`);
+        expect(persistedData?.agentPromptKey).toBe(`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`);
         expect(persistedData?.nvpUpdates).toStrictEqual({
-            [`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`]: {prompt: 'Book my flights'},
+            [`${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`]: {prompt: 'Book my flights'},
         });
         expect(persistedData?.firstName).toBe('Concierge');
     });
@@ -115,11 +115,11 @@ describe('ReplaceOptimisticAgentAccountID middleware', () => {
             command: 'UpdateAgentPrompt',
             data: {agentAccountID: optimisticAccountID, prompt: 'Book my flights', apiRequestType: 'write'},
             successData: [
-                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, value: {pendingAction: null, promptErrors: null}},
-                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${otherAgentAccountID}`, value: {pendingAction: null}},
+                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, value: {pendingAction: null, promptErrors: null}},
+                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${otherAgentAccountID}`, value: {pendingAction: null}},
             ],
             failureData: [
-                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${optimisticAccountID}`, value: {prompt: 'Old prompt', pendingAction: null}},
+                {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`, value: {prompt: 'Old prompt', pendingAction: null}},
                 {onyxMethod: 'merge', key: ONYXKEYS.PERSONAL_DETAILS_LIST, value: {[optimisticAccountID]: {displayName: 'Concierge'}}},
             ],
             requestIndex,
@@ -132,11 +132,11 @@ describe('ReplaceOptimisticAgentAccountID middleware', () => {
         const persistedRequest = getAll().at(0);
         expect(persistedRequest?.data?.agentAccountID).toBe(realAccountID);
         expect(persistedRequest?.successData).toStrictEqual([
-            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`, value: {pendingAction: null, promptErrors: null}},
-            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${otherAgentAccountID}`, value: {pendingAction: null}},
+            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`, value: {pendingAction: null, promptErrors: null}},
+            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${otherAgentAccountID}`, value: {pendingAction: null}},
         ]);
         expect(persistedRequest?.failureData).toStrictEqual([
-            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${realAccountID}`, value: {prompt: 'Old prompt', pendingAction: null}},
+            {onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${realAccountID}`, value: {prompt: 'Old prompt', pendingAction: null}},
             {onyxMethod: 'merge', key: ONYXKEYS.PERSONAL_DETAILS_LIST, value: {[realAccountID]: {displayName: 'Concierge'}}},
         ]);
     });
@@ -247,10 +247,10 @@ describe('ReplaceOptimisticAgentAccountID middleware', () => {
                     page: 1,
                     offset: 0,
                     prompt: '',
-                    agentPromptKey: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${digitHeavyAccountID}`,
+                    agentPromptKey: `${ONYXKEYS.COLLECTION.AGENT}${digitHeavyAccountID}`,
                     apiRequestType: 'write',
                 },
-                successData: [{onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${digitHeavyAccountID}`, value: {pendingAction: null, prompt: ''}}],
+                successData: [{onyxMethod: 'merge', key: `${ONYXKEYS.COLLECTION.AGENT}${digitHeavyAccountID}`, value: {pendingAction: null, prompt: ''}}],
                 requestIndex,
             };
         }
diff --git a/tests/unit/pages/settings/AgentsPageTest.tsx b/tests/unit/pages/settings/AgentsPageTest.tsx
index 6a3b7c6a5a9c..65d5f81255b7 100644
--- a/tests/unit/pages/settings/AgentsPageTest.tsx
+++ b/tests/unit/pages/settings/AgentsPageTest.tsx
@@ -171,8 +171,8 @@ describe('AgentsPage', () => {
     it('shows agent list when agents exist in Onyx', () => {
         const TEST_ACCOUNT_ID = 12345;
         mockUseOnyx.mockImplementation((key) => {
-            if (key === ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT) {
-                return [{[`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`]: {prompt: 'Test prompt'}}, {status: 'loaded'}];
+            if (key === ONYXKEYS.COLLECTION.AGENT) {
+                return [{[`${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`]: {prompt: 'Test prompt'}}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
         });
@@ -194,8 +194,8 @@ describe('AgentsPage', () => {
     it('excludes agents whose personal details are missing from the list', () => {
         const TEST_ACCOUNT_ID = 12345;
         mockUseOnyx.mockImplementation((key) => {
-            if (key === ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT) {
-                return [{[`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`]: {prompt: 'Test prompt'}}, {status: 'loaded'}];
+            if (key === ONYXKEYS.COLLECTION.AGENT) {
+                return [{[`${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`]: {prompt: 'Test prompt'}}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
         });
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index c47f56fefb0f..ac68422811e3 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -161,7 +161,7 @@ describe('DynamicEditAgentPage', () => {
             if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
                 return [{displayName: 'Default Agent'}, {status: 'loaded'}];
             }
-            if (typeof key === 'string' && key.startsWith(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT)) {
+            if (typeof key === 'string' && key.startsWith(ONYXKEYS.COLLECTION.AGENT)) {
                 return [{prompt: 'Default prompt'}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
@@ -188,7 +188,7 @@ describe('DynamicEditAgentPage', () => {
 
     it('renders prompt from agent Onyx key', () => {
         mockUseOnyx.mockImplementation((key) => {
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
+            if (key === `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Reject all gambling expenses.'}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
@@ -241,7 +241,7 @@ describe('DynamicEditAgentPage', () => {
 
     it('shows error text when agent has nameErrors', () => {
         mockUseOnyx.mockImplementation((key) => {
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
+            if (key === `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Some prompt', nameErrors: {someKey: 'agentsPage.error.updateName'}}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
@@ -259,7 +259,7 @@ describe('DynamicEditAgentPage', () => {
 
     it('shows error text when agent has promptErrors', () => {
         mockUseOnyx.mockImplementation((key) => {
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
+            if (key === `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Some prompt', promptErrors: {someKey: 'agentsPage.error.updatePrompt'}}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];
diff --git a/tests/unit/pages/settings/EditPromptPageTest.tsx b/tests/unit/pages/settings/EditPromptPageTest.tsx
index 99329748bcfa..4797947201c6 100644
--- a/tests/unit/pages/settings/EditPromptPageTest.tsx
+++ b/tests/unit/pages/settings/EditPromptPageTest.tsx
@@ -5,7 +5,7 @@ import useOnyx from '@hooks/useOnyx';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import EditPromptPage from '@pages/settings/Agents/Fields/EditPromptPage';
+import EditPromptPage from '@pages/settings/Agents/Fields/DynamicEditPromptPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -86,8 +86,8 @@ const mockUseOnyx = jest.mocked(useOnyx);
 
 const TEST_ACCOUNT_ID = 12345;
 
-type EditPromptPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_PROMPT>['route'];
-type EditPromptPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_PROMPT>['navigation'];
+type EditPromptPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT>['route'];
+type EditPromptPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT>['navigation'];
 
 const mockRoute = createMock<EditPromptPageRoute>({params: {accountID: TEST_ACCOUNT_ID}});
 const mockNavigation = createMock<EditPromptPageNavigation>({});
@@ -111,7 +111,7 @@ describe('EditPromptPage', () => {
 
     it('renders prompt as default value in InputWrapper', () => {
         mockUseOnyx.mockImplementation((key) => {
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
+            if (key === `${ONYXKEYS.COLLECTION.AGENT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Old prompt'}, {status: 'loaded'}];
             }
             return [undefined, {status: 'loaded'}];

From b88ec5d51c273882a26852f74286958a139465c3 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 10 Oct 2026 18:52:59 +0100
Subject: [PATCH 419/781] add ownerAccountID and ownerType to Agent onyx type

---
 src/CONST/index.ts      |  5 +++++
 src/types/onyx/Agent.ts | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 1101f5bf726d..ebce6f74e2af 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -10440,6 +10440,11 @@ const CONST = {
     },
 
     AGENTS: {
+        OWNER_TYPE: {
+            PERSON: 'person',
+            WORKSPACE: 'workspace',
+            DOMAIN: 'domain',
+        },
         BULK_ACTION_TYPES: {
             DELETE: 'delete',
         },
diff --git a/src/types/onyx/Agent.ts b/src/types/onyx/Agent.ts
index 91845e485f25..314718e43bda 100644
--- a/src/types/onyx/Agent.ts
+++ b/src/types/onyx/Agent.ts
@@ -1,10 +1,22 @@
+import type CONST from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
 import type {Errors, OnyxValueWithOfflineFeedback} from './OnyxCommon';
 
+type AgentOwnerType = ValueOf<typeof CONST.AGENTS.OWNER_TYPE>;
+
 /** Agent model */
 type Agent = OnyxValueWithOfflineFeedback<{
     /** The system prompt defining the agent's behavior */
     prompt: string;
 
+    /** The agent owner account ID */
+    ownerAccountID: number;
+
+    /** The agent owner account type (person, workspace or domain) */
+    ownerType: AgentOwnerType;
+
     /** Errors from the last failed action */
     errors?: Errors | null;
 

From 1bfc4fdeff5ee926ed77f5232d555e7aabb4faf0 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 00:00:19 +0100
Subject: [PATCH 420/781] filter manageable agents by owner

---
 src/hooks/useAgents.ts                      | 27 ++++++++++++++++++---
 src/pages/settings/Agents/AgentsPage.tsx    |  2 +-
 src/pages/workspace/WorkspaceAgentsPage.tsx |  5 +++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index dbe334677ff5..0ce9c0264800 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -12,8 +12,11 @@ import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type {Agent} from '@src/types/onyx';
 import {PendingAction} from '@src/types/onyx/OnyxCommon';
 
+import type {OnyxCollection} from 'react-native-onyx';
+
 import {useEffect, useRef, useState} from 'react';
 import {usePrevious} from 'victory-native';
 
@@ -27,7 +30,7 @@ import useRuleBotGuardModal from './useRuleBotGuardModal';
 import useSearchBackPress from './useSearchBackPress';
 import useSwitchToDelegator from './useSwitchToDelegator';
 
-const handleErrorClose = (pendingAction: PendingAction | null | undefined, accountID: number) => {
+function handleErrorClose(pendingAction: PendingAction | null | undefined, accountID: number): void {
     if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         clearAgentError(accountID);
     } else if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
@@ -35,16 +38,32 @@ const handleErrorClose = (pendingAction: PendingAction | null | undefined, accou
     } else {
         clearAgentUpdateError(accountID);
     }
+}
+
+function ownedAgentsSelector(agents: OnyxCollection<Agent>, ownerAccountID?: number): OnyxCollection<Agent> {
+    if (!ownerAccountID) {
+        return agents;
+    }
+    return Object.fromEntries(
+        Object.entries(agents ?? {}).filter(([key, agent]) => {
+            return agent?.ownerAccountID === ownerAccountID;
+        }),
+    );
+}
+
+type UseAgentsParams = {
+    /** If provided, filter agents by owner account ID */
+    ownerAccountID?: number;
 };
 
-function useAgents() {
+function useAgents({ownerAccountID}: UseAgentsParams) {
     useEffect(() => {
         openAgentsPage();
     }, []);
 
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.AGENT);
+    const [allAgents] = useOnyx(ONYXKEYS.COLLECTION.AGENT, {selector: (data) => ownedAgentsSelector(data, ownerAccountID)});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const personalDetailsList = usePersonalDetails();
     const chatWithAgent = useChatWithAgent();
@@ -53,7 +72,7 @@ function useAgents() {
     const showRuleBotGuardModal = useRuleBotGuardModal();
     const [selectedAgents, setSelectedAgents] = useState<string[]>([]);
 
-    const agents: AgentRowData[] = Object.entries(agentPrompts ?? {}).flatMap(([key, agentPrompt]) => {
+    const agents: AgentRowData[] = Object.entries(allAgents ?? {}).flatMap(([key, agentPrompt]) => {
         const accountID = Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length));
         const details = personalDetailsList?.[accountID];
         if (!details) {
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 15b045bf944c..b05553bbbf75 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -36,7 +36,7 @@ function AgentsPage() {
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
     const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
     const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
-    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents();
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents({});
     const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index bfdcf2fcc9ad..096f29e14f48 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -14,6 +14,7 @@ import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
@@ -37,6 +38,8 @@ import {View} from 'react-native';
 type WorkspaceAgentsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.AGENTS>;
 function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
+    const policyID = policy?.id;
+    const workspaceAccountID = useWorkspaceAccountID(policyID);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
@@ -47,7 +50,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
     const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
     const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
-    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents();
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents({ownerAccountID: workspaceAccountID});
     const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;

From 7ccf4e23e6c6164d4916b52cc4af15fc4e21edad Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 00:14:06 +0100
Subject: [PATCH 421/781] add useWorkspaceMembers hook

---
 src/hooks/useWorkspaceMembers.ts             | 82 ++++++++++++++++++++
 src/pages/workspace/WorkspaceMembersPage.tsx | 55 +------------
 2 files changed, 85 insertions(+), 52 deletions(-)
 create mode 100644 src/hooks/useWorkspaceMembers.ts

diff --git a/src/hooks/useWorkspaceMembers.ts b/src/hooks/useWorkspaceMembers.ts
new file mode 100644
index 000000000000..12075ad388f8
--- /dev/null
+++ b/src/hooks/useWorkspaceMembers.ts
@@ -0,0 +1,82 @@
+import {openWorkspaceMembersPage} from '@libs/actions/Policy/Member';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
+import {shouldFilterExpensifyTeam, isDeletedPolicyEmployee, isExpensifyTeam, canMemberRead, getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
+import {generateAccountID} from '@libs/UserUtils';
+
+import CONST from '@src/CONST';
+import type {PersonalDetails, Policy, PolicyEmployee} from '@src/types/onyx';
+import {isEmptyValueObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {useEffectEvent, useEffect} from 'react';
+
+import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useNetwork from './useNetwork';
+import {usePersonalDetailsByLogins} from './usePersonalDetailByLogin';
+import {useAllPersonalDetails} from './usePersonalDetails';
+
+function useWorkspaceMembers(policy: OnyxEntry<Policy>) {
+    const policyID = policy?.id;
+    const policyOwner = policy?.owner;
+
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const currentUserLogin = currentUserPersonalDetails.login;
+    const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));
+    const policyMemberEmailsToAccountIDs = getMemberAccountIDsForWorkspace(policy?.employeeList, employeePersonalDetails, true);
+    const shouldFilter = shouldFilterExpensifyTeam(policyOwner, currentUserLogin);
+    const [personalDetails] = useAllPersonalDetails();
+
+    const getWorkspaceMembers = () => {
+        if (!policyID) {
+            return;
+        }
+        if (!canMemberRead(policy, currentUserPersonalDetails.login ?? '', CONST.POLICY.POLICY_FEATURE.MEMBERS)) {
+            return;
+        }
+        const clientMemberEmails = Object.keys(getMemberAccountIDsForWorkspace(policy?.employeeList, employeePersonalDetails));
+        openWorkspaceMembersPage(policyID, clientMemberEmails);
+    };
+    const {isOffline} = useNetwork({onReconnect: getWorkspaceMembers});
+    const getWorkspaceMembersEvent = useEffectEvent(() => getWorkspaceMembers());
+    useEffect(() => getWorkspaceMembersEvent(), []);
+
+    const result: Array<{email: string; policyEmployee: PolicyEmployee; accountID: number; details: PersonalDetails}> = [];
+    for (const [email, policyEmployee] of Object.entries(policy?.employeeList ?? {})) {
+        // Inviting a secondary login leaves an empty employeeList entry: the backend nulls that key, then
+        // successData merges {pendingAction: null} back onto it. Skip it so it doesn't render as a second
+        // member. A real member whose personal details haven't loaded still has a role and stays visible.
+        if (isEmptyValueObject(policyEmployee) || isDeletedPolicyEmployee(policyEmployee, isOffline)) {
+            continue;
+        }
+
+        // The accountID normally comes from the personal-details join. When a member's personal details
+        // haven't loaded (e.g. the backend under-returns them), that join is empty, so we fall back to a
+        // generated accountID. This keeps the rendered count in sync with employeeList and matches OldDot,
+        // which shows every member rather than silently dropping the ones without loaded details.
+        const accountID = policyMemberEmailsToAccountIDs[email] ? Number(policyMemberEmailsToAccountIDs[email]) : generateAccountID(email);
+
+        // Render a fallback identity (email as display name) when personal details are missing so the member
+        // is still shown instead of being dropped from the list.
+        const details =
+            personalDetails?.[accountID] ??
+            ({
+                accountID,
+                login: email,
+                displayName: formatPhoneNumber(email),
+            } as PersonalDetails);
+
+        // If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails
+        // We don't want to show guides as policy members unless the user is a guide. Some customers get confused when they
+        // see random people added to their policy, but guides having access to the policies help set them up.
+        if (shouldFilter && isExpensifyTeam(details?.login ?? details?.displayName)) {
+            continue;
+        }
+
+        result.push({email, policyEmployee, accountID, details});
+    }
+
+    return result;
+}
+
+export default useWorkspaceMembers;
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 503d07628eb1..8fca07c2f176 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -30,6 +30,7 @@ import useSearchBackPress from '@hooks/useSearchBackPress';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
+import useWorkspaceMembers from '@hooks/useWorkspaceMembers';
 
 import {isConnectionInProgress, syncConnection} from '@libs/actions/connections';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
@@ -130,14 +131,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
     const {pageGutter} = useLayoutSpacing();
     const {showConfirmModal} = useConfirmModal();
     const showRuleBotGuardModal = useRuleBotGuardModal();
-    const getWorkspaceMembers = () => {
-        if (!canMemberRead(policy, currentUserPersonalDetails.login ?? '', CONST.POLICY.POLICY_FEATURE.MEMBERS)) {
-            return;
-        }
-        const clientMemberEmails = Object.keys(getMemberAccountIDsForWorkspace(policy?.employeeList, employeePersonalDetails));
-        openWorkspaceMembersPage(route.params.policyID, clientMemberEmails);
-    };
-    const {isOffline} = useNetwork({onReconnect: getWorkspaceMembers});
+    const {isOffline} = useNetwork();
     const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false);
     const isOfflineAndNoMemberDataAvailable = isEmptyObject(policy?.employeeList) && isOffline;
     const {translate, formatPhoneNumber, localeCompare} = useLocalize();
@@ -221,11 +215,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         });
     }, [selectedEmployees, policyMemberEmailsToAccountIDs, translate, policy, formatPhoneNumber, personalDetails, outstandingReportsForPolicy, privateIsArchivedMap]);
 
-    const getWorkspaceMembersEvent = useEffectEvent(() => getWorkspaceMembers());
-    useEffect(() => {
-        getWorkspaceMembersEvent();
-    }, []);
-
     /**
      * Open the modal to invite a user
      */
@@ -376,45 +365,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
     const invitedPrimaryToSecondaryLogins = useMemo(() => invertObject(policy?.primaryLoginsInvited ?? {}), [policy?.primaryLoginsInvited]);
     const isControlPolicyWithWideLayout = !shouldUseNarrowLayout && isControlPolicy(policy);
 
-    const filteredMembers = useMemo(() => {
-        const shouldFilter = shouldFilterExpensifyTeam(policyOwner, currentUserLogin);
-        const result: Array<{email: string; policyEmployee: PolicyEmployee; accountID: number; details: PersonalDetails}> = [];
-
-        for (const [email, policyEmployee] of Object.entries(policy?.employeeList ?? {})) {
-            // Inviting a secondary login leaves an empty employeeList entry: the backend nulls that key, then
-            // successData merges {pendingAction: null} back onto it. Skip it so it doesn't render as a second
-            // member. A real member whose personal details haven't loaded still has a role and stays visible.
-            if (isEmptyValueObject(policyEmployee) || isDeletedPolicyEmployee(policyEmployee, isOffline)) {
-                continue;
-            }
-
-            // The accountID normally comes from the personal-details join. When a member's personal details
-            // haven't loaded (e.g. the backend under-returns them), that join is empty, so we fall back to a
-            // generated accountID. This keeps the rendered count in sync with employeeList and matches OldDot,
-            // which shows every member rather than silently dropping the ones without loaded details.
-            const accountID = policyMemberEmailsToAccountIDs[email] ? Number(policyMemberEmailsToAccountIDs[email]) : generateAccountID(email);
-
-            // Render a fallback identity (email as display name) when personal details are missing so the member
-            // is still shown instead of being dropped from the list.
-            const details =
-                personalDetails?.[accountID] ??
-                ({
-                    accountID,
-                    login: email,
-                    displayName: formatPhoneNumber(email),
-                } as PersonalDetails);
-
-            // If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails
-            // We don't want to show guides as policy members unless the user is a guide. Some customers get confused when they
-            // see random people added to their policy, but guides having access to the policies help set them up.
-            if (shouldFilter && isExpensifyTeam(details?.login ?? details?.displayName)) {
-                continue;
-            }
-
-            result.push({email, policyEmployee, accountID, details});
-        }
-        return result;
-    }, [policy?.employeeList, policyMemberEmailsToAccountIDs, isOffline, personalDetails, policyOwner, currentUserLogin, formatPhoneNumber]);
+    const filteredMembers = useWorkspaceMembers(policy);
 
     const hasAnyCustomField1 = useMemo(() => filteredMembers.some(({policyEmployee}) => !!policyEmployee.employeeUserID), [filteredMembers]);
     const hasAnyCustomField2 = useMemo(() => filteredMembers.some(({policyEmployee}) => !!policyEmployee.employeePayrollID), [filteredMembers]);

From 236e2d6fd7582feb25cf4d612122aae18d21f4f5 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 01:23:47 +0100
Subject: [PATCH 422/781] add useWorkspaceAgents hook

---
 src/components/Tables/AgentsTable/index.tsx |  3 +
 src/hooks/useAgents.ts                      | 37 +++++--------
 src/hooks/useWorkspaceAgents.ts             | 61 +++++++++++++++++++++
 src/pages/settings/Agents/AgentsPage.tsx    |  2 +-
 src/pages/workspace/WorkspaceAgentsPage.tsx |  8 +--
 src/types/onyx/Agent.ts                     |  1 +
 6 files changed, 82 insertions(+), 30 deletions(-)
 create mode 100644 src/hooks/useWorkspaceAgents.ts

diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index d23fa6926caf..33909eebc997 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -13,6 +13,7 @@ import tokenizedSearch from '@libs/tokenizedSearch';
 import variables from '@styles/variables';
 
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {AgentOwnerType} from '@src/types/onyx/Agent';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 
 import type {ListRenderItemInfo} from '@shopify/flash-list';
@@ -28,6 +29,8 @@ type AgentRowData = TableData & {
     accountID: number;
     displayName: string;
     login: string;
+    ownerAccountID?: number;
+    ownerType?: AgentOwnerType;
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
     action: () => void;
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index 0ce9c0264800..b23ca61b5738 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -40,30 +40,14 @@ function handleErrorClose(pendingAction: PendingAction | null | undefined, accou
     }
 }
 
-function ownedAgentsSelector(agents: OnyxCollection<Agent>, ownerAccountID?: number): OnyxCollection<Agent> {
-    if (!ownerAccountID) {
-        return agents;
-    }
-    return Object.fromEntries(
-        Object.entries(agents ?? {}).filter(([key, agent]) => {
-            return agent?.ownerAccountID === ownerAccountID;
-        }),
-    );
-}
-
-type UseAgentsParams = {
-    /** If provided, filter agents by owner account ID */
-    ownerAccountID?: number;
-};
-
-function useAgents({ownerAccountID}: UseAgentsParams) {
+function useAgents() {
     useEffect(() => {
         openAgentsPage();
     }, []);
 
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const [allAgents] = useOnyx(ONYXKEYS.COLLECTION.AGENT, {selector: (data) => ownedAgentsSelector(data, ownerAccountID)});
+    const [allAgents] = useOnyx(ONYXKEYS.COLLECTION.AGENT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const personalDetailsList = usePersonalDetails();
     const chatWithAgent = useChatWithAgent();
@@ -72,13 +56,16 @@ function useAgents({ownerAccountID}: UseAgentsParams) {
     const showRuleBotGuardModal = useRuleBotGuardModal();
     const [selectedAgents, setSelectedAgents] = useState<string[]>([]);
 
-    const agents: AgentRowData[] = Object.entries(allAgents ?? {}).flatMap(([key, agentPrompt]) => {
+    const agents: AgentRowData[] = Object.entries(allAgents ?? {}).flatMap(([key, agent]) => {
+        if (!agent) {
+            return [];
+        }
         const accountID = Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length));
         const details = personalDetailsList?.[accountID];
         if (!details) {
             return [];
         }
-        const pendingAction = agentPrompt?.pendingAction;
+        const pendingAction = agent.pendingAction;
         const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
         if (!isOffline && isPendingDeletion) {
@@ -86,10 +73,10 @@ function useAgents({ownerAccountID}: UseAgentsParams) {
         }
 
         const mergedErrors = {
-            ...getLatestError(agentPrompt?.errors ?? undefined),
-            ...getLatestError(agentPrompt?.nameErrors ?? undefined),
-            ...getLatestError(agentPrompt?.promptErrors ?? undefined),
-            ...getLatestError(agentPrompt?.avatarErrors ?? undefined),
+            ...getLatestError(agent.errors ?? undefined),
+            ...getLatestError(agent.nameErrors ?? undefined),
+            ...getLatestError(agent.promptErrors ?? undefined),
+            ...getLatestError(agent.avatarErrors ?? undefined),
         };
         const rowErrors = getLatestError(mergedErrors);
 
@@ -99,6 +86,8 @@ function useAgents({ownerAccountID}: UseAgentsParams) {
                 accountID,
                 displayName: details.displayName ?? details.login ?? '',
                 login: details.login ?? '',
+                ownerAccountID: agent.ownerAccountID,
+                ownerType: agent.ownerType,
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
                 disabled: isPendingDeletion,
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
new file mode 100644
index 000000000000..68443a5dad3f
--- /dev/null
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -0,0 +1,61 @@
+import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import useAgents from './useAgents';
+import useNetwork from './useNetwork';
+import useWorkspaceAccountID from './useWorkspaceAccountID';
+import useWorkspaceMembers from './useWorkspaceMembers';
+
+function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
+    const {isOffline} = useNetwork();
+    const policyID = policy?.id;
+    const workspaceAccountID = useWorkspaceAccountID(policyID);
+    const workspaceMembers = useWorkspaceMembers(policy);
+    const workspaceMemberAccountIDs = new Set(workspaceMembers.map(({accountID}) => accountID));
+
+    const agentsData = useAgents();
+    agentsData.agents = agentsData.agents.filter((agent) => {
+        if (agent.ownerAccountID === workspaceAccountID) {
+            return true;
+        }
+        if (workspaceMemberAccountIDs.has(agent.accountID)) {
+            return true;
+        }
+        return false;
+    });
+
+    // The useAgents hook only includes agents that the user can manage
+    // We need to include other agents in the workspace too
+    const manageableAgentAccountIDs = new Set(agentsData.agents.map(({accountID}) => accountID));
+    for (const workspaceMember of workspaceMembers) {
+        const {policyEmployee, accountID, details} = workspaceMember;
+        if (!details.isCustomAgent) {
+            continue;
+        }
+        if (manageableAgentAccountIDs.has(accountID)) {
+            continue;
+        }
+        const isPendingDeletion = policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+        if (!isOffline && isPendingDeletion) {
+            continue;
+        }
+        agentsData.agents.push({
+            keyForList: String(accountID),
+            accountID,
+            displayName: details.displayName ?? details.login ?? '',
+            login: details.login ?? '',
+            disabled: isPendingDeletion,
+            isSelectionDisabled: true,
+            action: () => null,
+            onChatPress: () => () => null,
+            onCopilotPress: () => () => null,
+            dismissError: () => () => null,
+        });
+    }
+
+    return agentsData;
+}
+
+export default useWorkspaceAgents;
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index b05553bbbf75..15b045bf944c 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -36,7 +36,7 @@ function AgentsPage() {
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
     const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
     const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
-    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents({});
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents();
     const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 096f29e14f48..576e16052218 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -4,7 +4,6 @@ import {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import RenderHTML from '@components/RenderHTML';
 import AgentsTable from '@components/Tables/AgentsTable';
 
-import useAgents from '@hooks/useAgents';
 import useLayoutSpacing from '@hooks/useLayoutSpacing';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -14,7 +13,7 @@ import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
+import useWorkspaceAgents from '@hooks/useWorkspaceAgents';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
@@ -28,7 +27,7 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 
 import CONST from '@src/CONST';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import DeepValueOf from '@src/types/utils/DeepValueOf';
 
@@ -39,7 +38,6 @@ type WorkspaceAgentsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigator
 function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
     const policyID = policy?.id;
-    const workspaceAccountID = useWorkspaceAccountID(policyID);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
@@ -50,7 +48,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
     const selectionModeHeader = isMobileSelectionModeEnabled && shouldUseNarrowLayout;
     const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
-    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useAgents({ownerAccountID: workspaceAccountID});
+    const {agents, selectedAgentKeys, setSelectedAgents, clearSelectedAgents, askForConfirmationToDelete, tableRef} = useWorkspaceAgents(policy);
     const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
diff --git a/src/types/onyx/Agent.ts b/src/types/onyx/Agent.ts
index 314718e43bda..bd0f7bf80259 100644
--- a/src/types/onyx/Agent.ts
+++ b/src/types/onyx/Agent.ts
@@ -30,4 +30,5 @@ type Agent = OnyxValueWithOfflineFeedback<{
     avatarErrors?: Errors | null;
 }>;
 
+export type {AgentOwnerType};
 export default Agent;

From bb42e4dc68b1525f082fd1095fb73e85f7a82579 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 02:25:25 +0100
Subject: [PATCH 423/781] add role colunm to agents table

---
 .../Tables/AgentsTable/AgentsTableRow.tsx     | 26 +++++++++++-
 src/components/Tables/AgentsTable/index.tsx   | 40 +++++++++++++++++--
 src/hooks/useWorkspaceAgents.ts               | 22 +++++-----
 src/pages/workspace/WorkspaceAgentsPage.tsx   |  4 +-
 4 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 4cbd4510aee0..3f7482ede056 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -14,21 +14,32 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 import {View} from 'react-native';
 
 import type {AgentRowData} from '.';
 
+import WorkspaceMemberRoleCell from '../WorkspaceMembersTable/WorkspaceMemberRoleCell';
+
 type AgentsTableRowProps = {
     /** Data about the agent (wrapped by the table, so it also carries row state such as `selected`) */
     item: TableRow<AgentRowData>;
 
     rowIndex: number;
     shouldUseNarrowTableLayout: boolean;
+
+    /** Whether to show the role column */
+    shouldShowRoleColumn?: boolean;
+
+    /** The policy to resolve the agent role against. Needed when shouldShowRoleColumn=true  */
+    policy?: OnyxEntry<Policy>;
 };
 
-export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout}: AgentsTableRowProps) {
+export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowRoleColumn, policy}: AgentsTableRowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -83,6 +94,19 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                         </View>
                     </View>
 
+                    {!shouldUseNarrowTableLayout && shouldShowRoleColumn && (
+                        <View
+                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.editableCellColumn]}
+                            {...getCellAccessibilityProps(isTableSemanticsEnabled)}
+                        >
+                            <WorkspaceMemberRoleCell
+                                role={item.role}
+                                policy={policy}
+                                memberLogin={item.login}
+                            />
+                        </View>
+                    )}
+
                     <View
                         style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd, styles.gap2]}
                         {...getCellAccessibilityProps(isTableSemanticsEnabled)}
diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index 33909eebc997..72e4b49380c0 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -10,25 +10,31 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import tokenizedSearch from '@libs/tokenizedSearch';
 
+import {fontScale} from '@styles/typography';
 import variables from '@styles/variables';
 
+import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
 import type {AgentOwnerType} from '@src/types/onyx/Agent';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 
 import type {ListRenderItemInfo} from '@shopify/flash-list';
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 
 import React from 'react';
 import {View} from 'react-native';
 
 import AgentsTableRow from './AgentsTableRow';
 
-type AgentsTableColumnKey = 'agent' | 'actions';
+type AgentsTableColumnKey = 'agent' | 'role' | 'actions';
 
 type AgentRowData = TableData & {
     accountID: number;
     displayName: string;
     login: string;
+    role?: ValueOf<typeof CONST.POLICY.ROLE>;
     ownerAccountID?: number;
     ownerType?: AgentOwnerType;
     errors?: OnyxCommon.Errors;
@@ -52,10 +58,16 @@ type AgentsTableProps = {
     /** Keys of the currently selected rows */
     selectedKeys: string[];
 
+    /** Whether to show the role column */
+    shouldShowRoleColumn?: boolean;
+
+    /** The policy to resolve the agents roles against. Needed when shouldShowRoleColumn=true  */
+    policy?: OnyxEntry<Policy>;
+
     onRowSelectionChange: (selectedRowKeys: string[]) => void;
 };
 
-export default function AgentsTable({ref, agents, headerComponent, canSelectAgents, selectedKeys, onRowSelectionChange}: AgentsTableProps) {
+export default function AgentsTable({ref, agents, headerComponent, canSelectAgents, selectedKeys, shouldShowRoleColumn, policy, onRowSelectionChange}: AgentsTableProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
@@ -65,12 +77,32 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
 
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
-    const agentsTableColumns: Array<TableColumn<AgentsTableColumnKey>> = [
+    const agentsTableColumns: Array<TableColumn<AgentsTableColumnKey, AgentRowData>> = [
         {
             key: 'agent',
             label: translate('agentsPage.title'),
             sortable: true,
         },
+        ...(shouldShowRoleColumn
+            ? [
+                  {
+                      key: 'role' as const,
+                      label: translate('common.role'),
+                      sortable: true,
+                      styling: {
+                          // editableCellHeader matches the padded role cell so the label and value share an edge.
+                          containerStyles: [styles.editableCellHeader],
+                      },
+                      dynamicSizing: {
+                          getContentToMeasure: (item: AgentRowData) => [{text: translate('workspace.common.roleName', item.role), fontSize: fontScale.text}],
+                          // A role is one of a short, known set of labels, so the column always shows them in full.
+                          shouldFitContent: true,
+                          // Padding and border sit inside the track. A role is pinned to its text, so that chrome has to be measured or the label clips.
+                          extraWidth: variables.editableCellChromeWidth,
+                      },
+                  },
+              ]
+            : []),
         {
             key: 'actions',
             label: '',
@@ -94,6 +126,8 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
             item={item}
             rowIndex={index}
             shouldUseNarrowTableLayout={shouldUseNarrowTableLayout}
+            shouldShowRoleColumn={shouldShowRoleColumn}
+            policy={policy}
         />
     );
 
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index 68443a5dad3f..b8255510e246 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -2,6 +2,7 @@ import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 
 import useAgents from './useAgents';
 import useNetwork from './useNetwork';
@@ -13,17 +14,17 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
     const policyID = policy?.id;
     const workspaceAccountID = useWorkspaceAccountID(policyID);
     const workspaceMembers = useWorkspaceMembers(policy);
-    const workspaceMemberAccountIDs = new Set(workspaceMembers.map(({accountID}) => accountID));
 
     const agentsData = useAgents();
-    agentsData.agents = agentsData.agents.filter((agent) => {
-        if (agent.ownerAccountID === workspaceAccountID) {
-            return true;
+    agentsData.agents = agentsData.agents.flatMap((agent) => {
+        const agentMembership = workspaceMembers.find((member) => member.accountID === agent.accountID);
+        const isAgentOwnedByWorkspace = agent.ownerAccountID === workspaceAccountID;
+        const isAgentMemberOfWorkspace = !!agentMembership;
+        if (!isAgentOwnedByWorkspace && !isAgentMemberOfWorkspace) {
+            return [];
         }
-        if (workspaceMemberAccountIDs.has(agent.accountID)) {
-            return true;
-        }
-        return false;
+        agent.role = agentMembership?.policyEmployee.role as ValueOf<typeof CONST.POLICY.ROLE>;
+        return [agent];
     });
 
     // The useAgents hook only includes agents that the user can manage
@@ -37,7 +38,8 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         if (manageableAgentAccountIDs.has(accountID)) {
             continue;
         }
-        const isPendingDeletion = policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+        const pendingAction = policyEmployee.pendingAction;
+        const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
         if (!isOffline && isPendingDeletion) {
             continue;
         }
@@ -46,6 +48,8 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
             accountID,
             displayName: details.displayName ?? details.login ?? '',
             login: details.login ?? '',
+            role: policyEmployee.role as ValueOf<typeof CONST.POLICY.ROLE>,
+            pendingAction,
             disabled: isPendingDeletion,
             isSelectionDisabled: true,
             action: () => null,
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 576e16052218..85720f455a48 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -115,7 +115,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.PAID]}
-            policyID={route.params.policyID}
+            policyID={policyID}
             policyFeature={CONST.POLICY.POLICY_FEATURE.AGENTS}
             shouldBeBlocked={!isCompanyAgentsBetaEnabled}
         >
@@ -136,6 +136,8 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
                     canSelectAgents
                     selectedKeys={selectedAgentKeys}
                     onRowSelectionChange={setSelectedAgents}
+                    policy={policy}
+                    shouldShowRoleColumn
                 />
             </WorkspacePageWithSections>
         </AccessOrNotFoundWrapper>

From ca15f2d4f2a92e92848fb3af75b9e510a8a0817c Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 02:47:39 +0100
Subject: [PATCH 424/781] remove unused policy param

---
 .../Tables/AgentsTable/AgentsTableRow.tsx     | 10 +---------
 src/components/Tables/AgentsTable/index.tsx   | 20 +------------------
 .../WorkspaceMemberRoleCell.tsx               |  2 +-
 src/pages/workspace/WorkspaceAgentsPage.tsx   |  1 -
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 3f7482ede056..250fe8fb7474 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -14,11 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
-import type {Policy} from '@src/types/onyx';
 
-import type {OnyxEntry} from 'react-native-onyx';
-
-import React from 'react';
 import {View} from 'react-native';
 
 import type {AgentRowData} from '.';
@@ -34,12 +30,9 @@ type AgentsTableRowProps = {
 
     /** Whether to show the role column */
     shouldShowRoleColumn?: boolean;
-
-    /** The policy to resolve the agent role against. Needed when shouldShowRoleColumn=true  */
-    policy?: OnyxEntry<Policy>;
 };
 
-export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowRoleColumn, policy}: AgentsTableRowProps) {
+export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowRoleColumn}: AgentsTableRowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -101,7 +94,6 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                         >
                             <WorkspaceMemberRoleCell
                                 role={item.role}
-                                policy={policy}
                                 memberLogin={item.login}
                             />
                         </View>
diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index 72e4b49380c0..05cd4808ac01 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -10,17 +10,14 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import tokenizedSearch from '@libs/tokenizedSearch';
 
-import {fontScale} from '@styles/typography';
 import variables from '@styles/variables';
 
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
 import type {AgentOwnerType} from '@src/types/onyx/Agent';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 
 import type {ListRenderItemInfo} from '@shopify/flash-list';
-import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import React from 'react';
@@ -61,13 +58,10 @@ type AgentsTableProps = {
     /** Whether to show the role column */
     shouldShowRoleColumn?: boolean;
 
-    /** The policy to resolve the agents roles against. Needed when shouldShowRoleColumn=true  */
-    policy?: OnyxEntry<Policy>;
-
     onRowSelectionChange: (selectedRowKeys: string[]) => void;
 };
 
-export default function AgentsTable({ref, agents, headerComponent, canSelectAgents, selectedKeys, shouldShowRoleColumn, policy, onRowSelectionChange}: AgentsTableProps) {
+export default function AgentsTable({ref, agents, headerComponent, canSelectAgents, selectedKeys, shouldShowRoleColumn, onRowSelectionChange}: AgentsTableProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
@@ -89,17 +83,6 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
                       key: 'role' as const,
                       label: translate('common.role'),
                       sortable: true,
-                      styling: {
-                          // editableCellHeader matches the padded role cell so the label and value share an edge.
-                          containerStyles: [styles.editableCellHeader],
-                      },
-                      dynamicSizing: {
-                          getContentToMeasure: (item: AgentRowData) => [{text: translate('workspace.common.roleName', item.role), fontSize: fontScale.text}],
-                          // A role is one of a short, known set of labels, so the column always shows them in full.
-                          shouldFitContent: true,
-                          // Padding and border sit inside the track. A role is pinned to its text, so that chrome has to be measured or the label clips.
-                          extraWidth: variables.editableCellChromeWidth,
-                      },
                   },
               ]
             : []),
@@ -127,7 +110,6 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
             rowIndex={index}
             shouldUseNarrowTableLayout={shouldUseNarrowTableLayout}
             shouldShowRoleColumn={shouldShowRoleColumn}
-            policy={policy}
         />
     );
 
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
index 08ccdd0ef3b7..c002d4ae30fa 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
@@ -16,7 +16,7 @@ import React from 'react';
 
 type WorkspaceMemberRoleCellProps = {
     role: ValueOf<typeof CONST.POLICY.ROLE> | undefined;
-    policy: OnyxEntry<Policy>;
+    policy?: OnyxEntry<Policy>;
     memberLogin: string;
     canEdit?: boolean;
     onSave?: (role: ValueOf<typeof CONST.POLICY.ROLE>) => void;
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 85720f455a48..ac7d214bb60f 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -136,7 +136,6 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
                     canSelectAgents
                     selectedKeys={selectedAgentKeys}
                     onRowSelectionChange={setSelectedAgents}
-                    policy={policy}
                     shouldShowRoleColumn
                 />
             </WorkspacePageWithSections>

From 36301ccbca400748ed2c2e63ee64ee8a70563cab Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:07:35 +0100
Subject: [PATCH 425/781] limit role column width

---
 src/components/Tables/AgentsTable/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index 05cd4808ac01..a5c797ad068f 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -83,6 +83,7 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
                       key: 'role' as const,
                       label: translate('common.role'),
                       sortable: true,
+                      width: variables.workspaceMembersRoleColumnWidth,
                   },
               ]
             : []),

From f076270031879c904be56b2f2467340d3e87eaf2 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:13:37 +0100
Subject: [PATCH 426/781] display role only if agent is indeed a member of
 workspace

---
 .../Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
index c002d4ae30fa..23d5d8fdeeec 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
@@ -24,7 +24,7 @@ type WorkspaceMemberRoleCellProps = {
 
 function WorkspaceMemberRoleCell({role, policy, memberLogin, canEdit, onSave}: WorkspaceMemberRoleCellProps) {
     const {translate} = useLocalize();
-    const roleLabel = translate('workspace.common.roleName', role);
+    const roleLabel = role ? translate('workspace.common.roleName', role) : undefined;
     const allowedRoles = getAllowedRolesForMember(policy, memberLogin);
     const {popoverHeight} = useWorkspaceMemberRolePickerPopover({policy, selectedRole: role, allowedRoles});
 

From 92db209ae49f8b1c24e8ace19aebcae20a50d106 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:34:19 +0100
Subject: [PATCH 427/781] make non-mangable agnets non-interactive

---
 src/components/Tables/AgentsTable/AgentsTableRow.tsx | 7 ++++---
 src/components/Tables/AgentsTable/index.tsx          | 1 +
 src/hooks/useAgents.ts                               | 1 +
 src/hooks/useWorkspaceAgents.ts                      | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 250fe8fb7474..e99b24a16a04 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -43,13 +43,14 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
     const avatarSize = shouldUseNarrowTableLayout ? CONST.AVATAR_SIZE.DEFAULT : CONST.AVATAR_SIZE.SMALL;
     const isPendingDeletion = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const isPendingAddOrDelete = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || isPendingDeletion;
-    const areActionsDisabled = isPendingAddOrDelete || item.accountID <= 0 || !item.login;
+    const areActionsDisabled = !item.canManage || isPendingAddOrDelete || item.accountID <= 0 || !item.login;
+    const isEditable = item.canManage && !isPendingDeletion;
     const accessibilityLabel = [item.displayName, item.login].filter(Boolean).join(', ');
     const selectedButtonInnerStyle = item.selected ? styles.buttonDefaultHovered : undefined;
 
     return (
         <Table.Row
-            interactive
+            interactive={item.canManage}
             rowIndex={rowIndex}
             disabled={item.disabled}
             accessibilityLabel={accessibilityLabel}
@@ -128,7 +129,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                                 <Button
                                     size={CONST.BUTTON_SIZE.SMALL}
                                     onPress={item.action}
-                                    isDisabled={isPendingDeletion}
+                                    isDisabled={!isEditable}
                                     innerStyles={selectedButtonInnerStyle}
                                     sentryLabel={CONST.SENTRY_LABEL.AGENTS.EDIT}
                                 >
diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index a5c797ad068f..47f17ebd5a6d 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -34,6 +34,7 @@ type AgentRowData = TableData & {
     role?: ValueOf<typeof CONST.POLICY.ROLE>;
     ownerAccountID?: number;
     ownerType?: AgentOwnerType;
+    canManage: boolean;
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
     action: () => void;
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index b23ca61b5738..d432c917fdc0 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -91,6 +91,7 @@ function useAgents() {
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
                 disabled: isPendingDeletion,
+                canManage: true,
                 action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)), {skipMatchingFullScreenRoute: true}),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index b8255510e246..de5245c9c390 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -52,6 +52,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
             pendingAction,
             disabled: isPendingDeletion,
             isSelectionDisabled: true,
+            canManage: false,
             action: () => null,
             onChatPress: () => () => null,
             onCopilotPress: () => () => null,

From 4331ba8a30a63eaf185c748bffe91a531099a642 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:58:15 +0100
Subject: [PATCH 428/781] fixed more tests

---
 src/hooks/useAgents.ts                               | 7 ++-----
 tests/unit/pages/settings/AddAgentAvatarPageTest.tsx | 4 ++--
 tests/unit/pages/settings/AddAgentPageTest.tsx       | 2 +-
 tests/unit/pages/settings/AgentsPageTest.tsx         | 1 +
 tests/unit/pages/settings/AgentsTableRowTest.tsx     | 1 +
 tests/unit/pages/settings/EditNamePageTest.tsx       | 6 +++---
 tests/unit/pages/settings/NewAgentPageTest.tsx       | 6 +++---
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index d432c917fdc0..788da4692298 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -11,14 +11,10 @@ import Navigation from '@libs/Navigation/Navigation';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {Agent} from '@src/types/onyx';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import {PendingAction} from '@src/types/onyx/OnyxCommon';
 
-import type {OnyxCollection} from 'react-native-onyx';
-
 import {useEffect, useRef, useState} from 'react';
-import {usePrevious} from 'victory-native';
 
 import useChatWithAgent from './useChatWithAgent';
 import useCleanupSelectedOptions from './useCleanupSelectedOptions';
@@ -26,6 +22,7 @@ import useConfirmModal from './useConfirmModal';
 import useLocalize from './useLocalize';
 import useNetwork from './useNetwork';
 import useOnyx from './useOnyx';
+import usePrevious from './usePrevious';
 import useRuleBotGuardModal from './useRuleBotGuardModal';
 import useSearchBackPress from './useSearchBackPress';
 import useSwitchToDelegator from './useSwitchToDelegator';
diff --git a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
index 4a553d0b1f15..d1f63af1cc6d 100644
--- a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
@@ -44,7 +44,7 @@ jest.mock('@hooks/useOnyx', () => ({
 
 let mockEditAgentAvatarOnSave: jest.Mock | undefined;
 
-jest.mock('@pages/settings/Agents/Fields/EditAgentAvatarPage', () => ({
+jest.mock('@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage', () => ({
     EditAgentAvatarContent: jest.fn((props: {onSave?: (params: OnSaveParams) => void; initialPresetID?: string}) => {
         mockEditAgentAvatarOnSave = props.onSave ? jest.fn(props.onSave) : undefined;
         return null;
@@ -71,7 +71,7 @@ describe('AddAgentAvatarPage', () => {
     });
 
     it('passes the persisted preset ID from the Onyx draft to EditAgentAvatarContent', () => {
-        const {EditAgentAvatarContent} = jest.requireMock<{EditAgentAvatarContent: jest.Mock}>('@pages/settings/Agents/Fields/EditAgentAvatarPage');
+        const {EditAgentAvatarContent} = jest.requireMock<{EditAgentAvatarContent: jest.Mock}>('@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage');
 
         render(<AddAgentAvatarPage />);
 
diff --git a/tests/unit/pages/settings/AddAgentPageTest.tsx b/tests/unit/pages/settings/AddAgentPageTest.tsx
index 5bf4e0067b73..597a4bb75e84 100644
--- a/tests/unit/pages/settings/AddAgentPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentPageTest.tsx
@@ -272,7 +272,7 @@ describe('AddAgentPage', () => {
         mockAvatarOnPress?.();
 
         expect(mockSetNewAgentAvatarPreset).not.toHaveBeenCalled();
-        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()));
+        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true});
     });
 
     it('does not seed a default while the draft is still loading (avoids clobbering a saved avatar on refresh)', () => {
diff --git a/tests/unit/pages/settings/AgentsPageTest.tsx b/tests/unit/pages/settings/AgentsPageTest.tsx
index 65d5f81255b7..c14c37a14639 100644
--- a/tests/unit/pages/settings/AgentsPageTest.tsx
+++ b/tests/unit/pages/settings/AgentsPageTest.tsx
@@ -70,6 +70,7 @@ jest.mock('@hooks/useLazyAsset', () => ({
 }));
 
 jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined, {status: 'loaded'}]));
+jest.mock('@hooks/usePrevious', () => jest.fn(() => []));
 
 jest.mock('@components/OnyxListItemProvider', () => ({
     usePersonalDetails: jest.fn(() => ({})),
diff --git a/tests/unit/pages/settings/AgentsTableRowTest.tsx b/tests/unit/pages/settings/AgentsTableRowTest.tsx
index 2065732cd7e9..a82bb51c5c7e 100644
--- a/tests/unit/pages/settings/AgentsTableRowTest.tsx
+++ b/tests/unit/pages/settings/AgentsTableRowTest.tsx
@@ -196,6 +196,7 @@ const BASE_ITEM: AgentRowData = {
     accountID: TEST_ACCOUNT_ID,
     displayName: 'Test Agent',
     login: 'agent@example.com',
+    canManage: true,
     action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(TEST_ACCOUNT_ID))),
     onChatPress: mockOnChatPress,
     onCopilotPress: mockOnCopilotPress,
diff --git a/tests/unit/pages/settings/EditNamePageTest.tsx b/tests/unit/pages/settings/EditNamePageTest.tsx
index 044048544d3e..a2683836d702 100644
--- a/tests/unit/pages/settings/EditNamePageTest.tsx
+++ b/tests/unit/pages/settings/EditNamePageTest.tsx
@@ -5,7 +5,7 @@ import useOnyx from '@hooks/useOnyx';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import EditNamePage from '@pages/settings/Agents/Fields/EditNamePage';
+import EditNamePage from '@pages/settings/Agents/Fields/DynamicEditNamePage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -88,8 +88,8 @@ const mockUseOnyx = jest.mocked(useOnyx);
 
 const TEST_ACCOUNT_ID = 12345;
 
-type EditNamePageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_NAME>['route'];
-type EditNamePageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT_NAME>['navigation'];
+type EditNamePageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME>['route'];
+type EditNamePageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME>['navigation'];
 
 const mockRoute = createMock<EditNamePageRoute>({params: {accountID: TEST_ACCOUNT_ID}});
 const mockNavigation = createMock<EditNamePageNavigation>({});
diff --git a/tests/unit/pages/settings/NewAgentPageTest.tsx b/tests/unit/pages/settings/NewAgentPageTest.tsx
index 6cbcf4b2d8dd..4435c293cc17 100644
--- a/tests/unit/pages/settings/NewAgentPageTest.tsx
+++ b/tests/unit/pages/settings/NewAgentPageTest.tsx
@@ -207,7 +207,7 @@ describe('NewAgentPage', () => {
         });
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()), {skipMatchingFullScreenRoute: true});
         });
     });
 
@@ -220,7 +220,7 @@ describe('NewAgentPage', () => {
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         expect(mockSetNewAgentTemplate).not.toHaveBeenCalled();
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()), {skipMatchingFullScreenRoute: true});
         });
     });
 
@@ -230,7 +230,7 @@ describe('NewAgentPage', () => {
         fireEvent.press(screen.getByText('newAgentPage.buildCustomAgent'));
 
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute({policyID: 'POL_42'})));
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute({policyID: 'POL_42'})), {skipMatchingFullScreenRoute: true});
         });
     });
 });

From 88d8b05c4029bf5adc5d8762741645168995dd61 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 04:10:26 +0100
Subject: [PATCH 429/781] fix react compiler + test

---
 src/hooks/useWorkspaceAgents.ts         | 10 +++++-----
 tests/unit/getWorkspaceMenuItemsTest.ts |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index de5245c9c390..272ccc36371a 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -15,8 +15,8 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
     const workspaceAccountID = useWorkspaceAccountID(policyID);
     const workspaceMembers = useWorkspaceMembers(policy);
 
-    const agentsData = useAgents();
-    agentsData.agents = agentsData.agents.flatMap((agent) => {
+    const {agents, ...rest} = useAgents();
+    const workspaceAgents = agents.flatMap((agent) => {
         const agentMembership = workspaceMembers.find((member) => member.accountID === agent.accountID);
         const isAgentOwnedByWorkspace = agent.ownerAccountID === workspaceAccountID;
         const isAgentMemberOfWorkspace = !!agentMembership;
@@ -29,7 +29,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
 
     // The useAgents hook only includes agents that the user can manage
     // We need to include other agents in the workspace too
-    const manageableAgentAccountIDs = new Set(agentsData.agents.map(({accountID}) => accountID));
+    const manageableAgentAccountIDs = new Set(workspaceAgents.map(({accountID}) => accountID));
     for (const workspaceMember of workspaceMembers) {
         const {policyEmployee, accountID, details} = workspaceMember;
         if (!details.isCustomAgent) {
@@ -43,7 +43,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         if (!isOffline && isPendingDeletion) {
             continue;
         }
-        agentsData.agents.push({
+        workspaceAgents.push({
             keyForList: String(accountID),
             accountID,
             displayName: details.displayName ?? details.login ?? '',
@@ -60,7 +60,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         });
     }
 
-    return agentsData;
+    return {agents: workspaceAgents, ...rest};
 }
 
 export default useWorkspaceAgents;
diff --git a/tests/unit/getWorkspaceMenuItemsTest.ts b/tests/unit/getWorkspaceMenuItemsTest.ts
index c78159487133..a4b061e9d80e 100644
--- a/tests/unit/getWorkspaceMenuItemsTest.ts
+++ b/tests/unit/getWorkspaceMenuItemsTest.ts
@@ -554,7 +554,6 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.map((item) => item.getRoute())).toEqual([
             ROUTES.WORKSPACE_OVERVIEW.getRoute(policy.id),
             ROUTES.WORKSPACE_MEMBERS.getRoute(policy.id),
-            ROUTES.WORKSPACE_AGENTS.getRoute(policy.id),
             ROUTES.WORKSPACE_ROOMS.getRoute(policy.id),
             ROUTES.WORKSPACE_REPORTS.getRoute(policy.id),
             ROUTES.POLICY_ACCOUNTING.getRoute(policy.id),
@@ -580,7 +579,6 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.map((item) => item.screenName)).toEqual([
             SCREENS.WORKSPACE.PROFILE,
             SCREENS.WORKSPACE.MEMBERS,
-            SCREENS.WORKSPACE.AGENTS,
             SCREENS.WORKSPACE.ROOMS,
             SCREENS.WORKSPACE.REPORTS,
             SCREENS.WORKSPACE.ACCOUNTING.ROOT,

From aa1cccebf14d14e9d25f780fabd32fd30c324366 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 04:23:48 +0100
Subject: [PATCH 430/781] fix AddAgentAvatarPageTest

---
 tests/unit/pages/settings/AddAgentAvatarPageTest.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
index d1f63af1cc6d..1721db1b21db 100644
--- a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
@@ -55,6 +55,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     goBack: jest.fn(),
 }));
+jest.mock('@hooks/useDynamicBackPath', () => jest.fn(() => 'custom'));
 
 const mockGoBack = jest.mocked(Navigation.goBack);
 const mockUseOnyx = jest.mocked(useOnyx);
@@ -130,8 +131,8 @@ describe('AddAgentAvatarPage', () => {
         mockEditAgentAvatarOnSave?.({file: MOCK_FILE, uri: 'file://photo.jpg'});
 
         await waitFor(() => expect(mockGoBack).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute())));
-        expect(mockLogWarn).toHaveBeenCalledTimes(1);
-        expect(mockLogWarn.mock.calls.at(0)?.at(0)).toBe('Failed to persist the new-agent avatar draft');
+        expect(mockLogWarn).toHaveBeenCalled();
+        expect(mockLogWarn.mock.calls.at(1)?.at(0)).toBe('Failed to persist the new-agent avatar draft');
     });
 
     it('skips navigation when the user already left the screen while the write was pending', async () => {

From d6bfcaad280a671a528e99bcb7fb99061177cbd1 Mon Sep 17 00:00:00 2001
From: "Nyoman Jyotisa (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Sun, 11 Oct 2026 03:41:50 +0000
Subject: [PATCH 431/781] Use a separate set for commands exempt from the full
 ReconnectApp recovery

DeleteMoneyRequest skips the OnyxUpdates flow but still moves lastUpdateID forward, so it needs the same recovery as other writes.

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>
---
 src/libs/Middleware/SaveResponseInOnyx.ts | 11 ++++++++++-
 tests/unit/MiddlewareTest.ts              | 10 ++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/libs/Middleware/SaveResponseInOnyx.ts b/src/libs/Middleware/SaveResponseInOnyx.ts
index 4f204258f62d..a226a6a564ba 100644
--- a/src/libs/Middleware/SaveResponseInOnyx.ts
+++ b/src/libs/Middleware/SaveResponseInOnyx.ts
@@ -23,6 +23,15 @@ const requestsToIgnoreLastUpdateID = new Set<string>([
     SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES,
 ]);
 
+// These requests already bring the client up to date (or end the session), so they never need a full ReconnectApp to cover a gap in update IDs.
+// This is separate from requestsToIgnoreLastUpdateID because requests like DeleteMoneyRequest skip the OnyxUpdates flow but still move lastUpdateID forward.
+const requestsExemptFromFullReconnect =new Set<string>([
+    WRITE_COMMANDS.OPEN_APP,
+    SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP,
+    SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES,
+    WRITE_COMMANDS.CLOSE_ACCOUNT,
+]);
+
 // A request belongs here when its successData/finallyData is what unblocks authentication, because parking that leaves the client unable to reauthenticate.
 const requestsToApplyWithoutAdvancingLastUpdateID = new Set<string>([READ_COMMANDS.SIGN_IN_WITH_SHORT_LIVED_AUTH_TOKEN, READ_COMMANDS.SIGN_IN_WITH_SUPPORT_AUTH_TOKEN]);
 
@@ -54,7 +63,7 @@ const SaveResponseInOnyx: Middleware = <TKey extends OnyxKey>(requestResponse: P
         const responseLastUpdateID = Number(response?.lastUpdateID ?? CONST.DEFAULT_NUMBER_ID);
         const shouldFullReconnectAfterApply =
             !shouldApplyWithoutAdvancingLastUpdateID &&
-            !requestsToIgnoreLastUpdateID.has(request.command) &&
+            !requestsExemptFromFullReconnect.has(request.command) &&
             !!clientLastUpdateID &&
             responseLastUpdateID > clientLastUpdateID &&
             !Number(response?.previousUpdateID ?? CONST.DEFAULT_NUMBER_ID);
diff --git a/tests/unit/MiddlewareTest.ts b/tests/unit/MiddlewareTest.ts
index 52cb3a33f084..772aea316f2d 100644
--- a/tests/unit/MiddlewareTest.ts
+++ b/tests/unit/MiddlewareTest.ts
@@ -131,7 +131,11 @@ describe('Middleware', () => {
                 jest.restoreAllMocks();
             });
 
-            test('applies the response and runs a full ReconnectApp to cover the gap', async () => {
+            test.each([
+                ['AddComment', 'AddComment'],
+                // DeleteMoneyRequest skips the OnyxUpdates flow but still moves lastUpdateID forward, so it can leave the same gap
+                ['DeleteMoneyRequest', WRITE_COMMANDS.DELETE_MONEY_REQUEST],
+            ])('applies the response and runs a full ReconnectApp to cover the gap for %s', async (_case, command) => {
                 // Given a device that was backgrounded for a long time, so the server no longer has its lastUpdateIDAppliedToClient
                 await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 100);
                 await waitForBatchedUpdates();
@@ -141,7 +145,7 @@ describe('Middleware', () => {
                 // When a write returns a lastUpdateID but no previousUpdateID
                 jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({jsonCode: 200, lastUpdateID: 5001});
                 const result = await Request.processWithMiddleware({
-                    command: 'AddComment',
+                    command,
                     data: {apiRequestType: CONST.API_REQUEST_TYPE.WRITE},
                     successData: [{onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_APP, value: false}],
                 });
@@ -162,6 +166,8 @@ describe('Middleware', () => {
                 ['the response is not newer than the client', 100, 'AddComment', {lastUpdateID: 100}],
                 ['the request is a ReconnectApp', 100, SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP, {lastUpdateID: 5001}],
                 ['the request is an OpenApp', 100, WRITE_COMMANDS.OPEN_APP, {lastUpdateID: 5001}],
+                ['the request is a GetMissingOnyxMessages', 100, SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES, {lastUpdateID: 5001}],
+                ['the request is a CloseAccount', 100, WRITE_COMMANDS.CLOSE_ACCOUNT, {lastUpdateID: 5001}],
             ])('does not run a full ReconnectApp when %s', async (_case, clientLastUpdateID, command, updateIDs) => {
                 // Given a client whose lastUpdateID is either still known to the server or has nothing to lose
                 if (clientLastUpdateID) {

From 440f045050e346d612d05f0b3030e5292e445a5f Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 04:58:58 +0100
Subject: [PATCH 432/781] lint

---
 .../SearchRouter/useNavigationSuggestions.tsx |  1 +
 .../Tables/AgentsTable/AgentsTableRow.tsx     |  5 ++---
 src/hooks/useAgents.ts                        |  4 ++--
 src/hooks/useWorkspaceAgents.ts               |  6 ++++--
 src/pages/settings/Agents/AgentsPage.tsx      |  2 +-
 .../settings/Agents/DynamicNewAgentPage.tsx   |  2 +-
 .../Fields/DynamicAddAgentAvatarPage.tsx      |  2 +-
 .../Fields/DynamicEditAgentAvatarPage.tsx     |  3 +--
 .../Agents/Fields/DynamicEditNamePage.tsx     |  3 +--
 .../Agents/Fields/DynamicEditPromptPage.tsx   |  1 -
 src/pages/workspace/WorkspaceAgentsPage.tsx   | 20 ++++++-------------
 src/pages/workspace/WorkspaceMembersPage.tsx  | 12 ++---------
 src/types/onyx/Agent.ts                       |  1 +
 .../pages/settings/AddAgentAvatarPageTest.tsx |  2 +-
 .../pages/settings/AgentsTableRowTest.tsx     |  2 +-
 .../unit/pages/settings/NewAgentPageTest.tsx  |  2 +-
 16 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/components/Search/SearchRouter/useNavigationSuggestions.tsx b/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
index fadb7cd287ba..1340807eab1f 100644
--- a/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
+++ b/src/components/Search/SearchRouter/useNavigationSuggestions.tsx
@@ -314,6 +314,7 @@ function buildWorkspaceNavigationItems({
                 policyCategories: policyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`],
                 isVendorMatchingBetaEnabled,
                 isRecruitingBetaEnabled,
+                isCompanyAgentsBetaEnabled,
                 convertToDisplayString,
             });
 
diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index e99b24a16a04..1c978e35c54c 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -4,6 +4,7 @@ import Icon from '@components/Icon';
 import type {TableRow} from '@components/Table';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
+import WorkspaceMemberRoleCell from '@components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell';
 import TextWithTooltip from '@components/TextWithTooltip';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -19,8 +20,6 @@ import {View} from 'react-native';
 
 import type {AgentRowData} from '.';
 
-import WorkspaceMemberRoleCell from '../WorkspaceMembersTable/WorkspaceMemberRoleCell';
-
 type AgentsTableRowProps = {
     /** Data about the agent (wrapped by the table, so it also carries row state such as `selected`) */
     item: TableRow<AgentRowData>;
@@ -32,7 +31,7 @@ type AgentsTableRowProps = {
     shouldShowRoleColumn?: boolean;
 };
 
-export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowRoleColumn}: AgentsTableRowProps) {
+export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowRoleColumn = false}: AgentsTableRowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index 788da4692298..d3389ec16484 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -1,7 +1,7 @@
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import {TableHandle} from '@components/Table';
-import {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable';
+import type {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable';
 
 import {clearAgentDeleteError, clearAgentError, clearAgentUpdateError, deleteAgent, openAgentsPage} from '@libs/actions/Agent';
 import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
@@ -12,7 +12,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import {PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 
 import {useEffect, useRef, useState} from 'react';
 
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index 272ccc36371a..8e84457e9ac8 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -14,6 +14,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
     const policyID = policy?.id;
     const workspaceAccountID = useWorkspaceAccountID(policyID);
     const workspaceMembers = useWorkspaceMembers(policy);
+    const policyRoles = Object.values(CONST.POLICY.ROLE);
 
     const {agents, ...rest} = useAgents();
     const workspaceAgents = agents.flatMap((agent) => {
@@ -23,7 +24,8 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         if (!isAgentOwnedByWorkspace && !isAgentMemberOfWorkspace) {
             return [];
         }
-        agent.role = agentMembership?.policyEmployee.role as ValueOf<typeof CONST.POLICY.ROLE>;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        agent.role = policyRoles.find((policyRole) => policyRole === agentMembership?.policyEmployee.role);
         return [agent];
     });
 
@@ -48,7 +50,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
             accountID,
             displayName: details.displayName ?? details.login ?? '',
             login: details.login ?? '',
-            role: policyEmployee.role as ValueOf<typeof CONST.POLICY.ROLE>,
+            role: policyRoles.find((policyRole) => policyRole === policyEmployee.role),
             pendingAction,
             disabled: isPendingDeletion,
             isSelectionDisabled: true,
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 15b045bf944c..62751be9ee93 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -22,7 +22,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import Navigation from '@libs/Navigation/Navigation';
 
 import CONST from '@src/CONST';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
 import {View} from 'react-native';
diff --git a/src/pages/settings/Agents/DynamicNewAgentPage.tsx b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
index 313b5257d75e..80b9565831f0 100644
--- a/src/pages/settings/Agents/DynamicNewAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
@@ -25,7 +25,7 @@ import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {clearNewAgentAvatarDraft, clearNewAgentTemplate, setNewAgentTemplate, getAgentTemplates} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type SuggestedAgent from '@src/types/onyx/SuggestedAgent';
 
diff --git a/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
index 5a54a3021b75..8e8e6c870505 100644
--- a/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicAddAgentAvatarPage.tsx
@@ -9,7 +9,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {setNewAgentAvatarPreset, setNewAgentUploadedAvatar} from '@userActions/Agent';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import {useNavigation} from '@react-navigation/native';
diff --git a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
index 982abdc7cb4a..e982f779ac2c 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx
@@ -22,7 +22,6 @@ import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
 import type {AgentAvatarID} from '@libs/Avatars/AgentAvatarCatalog';
 import {validateAvatarImage} from '@libs/AvatarUtils';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
-import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -32,7 +31,7 @@ import {updateAgentAvatar} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {FileObject} from '@src/types/utils/Attachment';
diff --git a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
index 162262c225f5..208db2aaaa82 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx
@@ -12,14 +12,13 @@ import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentName} from '@libs/actions/Agent';
-import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/EditAgentNameForm';
 
diff --git a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
index a172abaf1720..b9f5506a9d2b 100644
--- a/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx
@@ -17,7 +17,6 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentPrompt} from '@libs/actions/Agent';
-import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index ac7d214bb60f..5d9e70dea0b5 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
-import {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import RenderHTML from '@components/RenderHTML';
 import AgentsTable from '@components/Tables/AgentsTable';
 
@@ -23,17 +23,17 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
 
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-
 import CONST from '@src/CONST';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import DeepValueOf from '@src/types/utils/DeepValueOf';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
 import React from 'react';
 import {View} from 'react-native';
 
+import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
+import WorkspacePageWithSections from './WorkspacePageWithSections';
+
 type WorkspaceAgentsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.AGENTS>;
 function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
@@ -56,15 +56,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     useWorkspaceDocumentTitle(policy?.name, 'agentsPage.title');
 
     // The new agent functionality will be added after CreateCompanyAgent is exposed
-    const newAgentButton = true ? null : (
-        <Button
-            variant="success"
-            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()), {skipMatchingFullScreenRoute: true})}
-        >
-            <Button.Icon src={icons.Plus} />
-            <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
-        </Button>
-    );
+    const newAgentButton = null;
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 8fca07c2f176..1b664bfa8ad5 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -42,7 +42,6 @@ import {
     clearUpdateMemberRoleError,
     clearWorkspaceOwnerChangeFlow,
     downloadMembersCSV,
-    openWorkspaceMembersPage,
     removeMembers,
     updateWorkspaceMembersRole,
 } from '@libs/actions/Policy/Member';
@@ -62,7 +61,6 @@ import {
     canEditWorkspaceSettings as canEditWorkspaceSettingsUtil,
     canMemberAssignRole,
     canMemberManageMemberWithRole,
-    canMemberRead,
     canMemberWrite,
     canRolePay,
     getConnectionExporters,
@@ -70,18 +68,14 @@ import {
     getReimburserEmail,
     hasActiveExpensifyCard,
     isControlPolicy,
-    isDeletedPolicyEmployee,
-    isExpensifyTeam,
     isGroupPolicy,
     isPaidGroupPolicy,
     isPolicyApprover,
     isSubmitPolicy,
     PAYER_ROLES,
-    shouldFilterExpensifyTeam,
 } from '@libs/PolicyUtils';
 import {getDisplayNameForParticipant, isApproverOfOutstandingPolicyReports} from '@libs/ReportUtils';
 import getShouldPopoverUseScrollView from '@libs/shouldPopoverUseScrollView';
-import {generateAccountID} from '@libs/UserUtils';
 import {convertPolicyEmployeesToApprovalWorkflows, updateWorkflowDataOnApproverRemoval} from '@libs/WorkflowUtils';
 
 import {close} from '@userActions/Modal';
@@ -91,15 +85,14 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {PersonalDetails, PolicyEmployee} from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
-import {isEmptyObject, isEmptyValueObject} from '@src/types/utils/EmptyObject';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ValueOf} from 'type-fest';
 
 import {useIsFocused} from '@react-navigation/native';
 import {createOutstandingReportsForPolicySelector} from '@selectors/Report';
-import React, {useCallback, useEffect, useEffectEvent, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 
 import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
@@ -360,7 +353,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         updateMemberRoleInline(policy, login, accountID, currentRole, newRole);
     };
 
-    const policyOwner = policy?.owner;
     const canAssignElevatedRoles = canMemberWrite(policy, currentUserLogin ?? '', CONST.POLICY.POLICY_FEATURE.ASSIGN_ELEVATED_ROLES);
     const invitedPrimaryToSecondaryLogins = useMemo(() => invertObject(policy?.primaryLoginsInvited ?? {}), [policy?.primaryLoginsInvited]);
     const isControlPolicyWithWideLayout = !shouldUseNarrowLayout && isControlPolicy(policy);
diff --git a/src/types/onyx/Agent.ts b/src/types/onyx/Agent.ts
index bd0f7bf80259..c13225ad111f 100644
--- a/src/types/onyx/Agent.ts
+++ b/src/types/onyx/Agent.ts
@@ -4,6 +4,7 @@ import type {ValueOf} from 'type-fest';
 
 import type {Errors, OnyxValueWithOfflineFeedback} from './OnyxCommon';
 
+/** The agent owner account type */
 type AgentOwnerType = ValueOf<typeof CONST.AGENTS.OWNER_TYPE>;
 
 /** Agent model */
diff --git a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
index 1721db1b21db..57b6fe79c879 100644
--- a/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentAvatarPageTest.tsx
@@ -9,7 +9,7 @@ import AddAgentAvatarPage from '@pages/settings/Agents/Fields/DynamicAddAgentAva
 import type {OnSaveParams} from '@pages/settings/Agents/Fields/DynamicEditAgentAvatarPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import type * as ReactNavigationNative from '@react-navigation/native';
 
diff --git a/tests/unit/pages/settings/AgentsTableRowTest.tsx b/tests/unit/pages/settings/AgentsTableRowTest.tsx
index a82bb51c5c7e..01cabd64ec5e 100644
--- a/tests/unit/pages/settings/AgentsTableRowTest.tsx
+++ b/tests/unit/pages/settings/AgentsTableRowTest.tsx
@@ -8,7 +8,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import type ReactNative from 'react-native';
 
diff --git a/tests/unit/pages/settings/NewAgentPageTest.tsx b/tests/unit/pages/settings/NewAgentPageTest.tsx
index 4435c293cc17..d67a5f83e740 100644
--- a/tests/unit/pages/settings/NewAgentPageTest.tsx
+++ b/tests/unit/pages/settings/NewAgentPageTest.tsx
@@ -13,7 +13,7 @@ import NewAgentPage from '@pages/settings/Agents/DynamicNewAgentPage';
 
 import {clearNewAgentAvatarDraft, clearNewAgentTemplate, setNewAgentTemplate} from '@userActions/Agent';
 
-import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type SuggestedAgent from '@src/types/onyx/SuggestedAgent';
 

From 78ec091ade30adf4463dbba1a3b1e42938a08432 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 11 Oct 2026 05:23:31 +0100
Subject: [PATCH 433/781] lint

---
 src/hooks/useAgents.ts                      | 2 +-
 src/hooks/useWorkspaceAgents.ts             | 3 +--
 src/pages/settings/Agents/AgentsPage.tsx    | 1 +
 src/pages/workspace/WorkspaceAgentsPage.tsx | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index d3389ec16484..d830f06d7d35 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -1,6 +1,6 @@
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
-import {TableHandle} from '@components/Table';
+import type {TableHandle} from '@components/Table';
 import type {AgentRowData, AgentsTableColumnKey} from '@components/Tables/AgentsTable';
 
 import {clearAgentDeleteError, clearAgentError, clearAgentUpdateError, deleteAgent, openAgentsPage} from '@libs/actions/Agent';
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index 8e84457e9ac8..572053e2210f 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -2,7 +2,6 @@ import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
 
 import useAgents from './useAgents';
 import useNetwork from './useNetwork';
@@ -24,7 +23,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         if (!isAgentOwnedByWorkspace && !isAgentMemberOfWorkspace) {
             return [];
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        // eslint-disable-next-line no-param-reassign
         agent.role = policyRoles.find((policyRole) => policyRole === agentMembership?.policyEmployee.role);
         return [agent];
     });
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 62751be9ee93..900cc661ec4c 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -2,6 +2,7 @@ import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard';
+// eslint-disable-next-line no-restricted-imports
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import RenderHTML from '@components/RenderHTML';
 import ScreenWrapper from '@components/ScreenWrapper';
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 5d9e70dea0b5..4893cdc14555 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -1,4 +1,3 @@
-import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import RenderHTML from '@components/RenderHTML';
@@ -17,14 +16,12 @@ import useWorkspaceAgents from '@hooks/useWorkspaceAgents';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
-import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
 
 import CONST from '@src/CONST';
-import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 

From 1e9b7ccd8fb8243060375a1f2ec22e56fe77cda1 Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Sun, 11 Oct 2026 16:34:00 +0700
Subject: [PATCH 434/781] Remove getReportTransactions callers' reliance on the
 deprecated default in getPayMoneyRequestParams (Part 8)

getPayMoneyRequestParams now takes the report's transactions as an explicit
param instead of falling back to the deprecated Onyx.connect-backed global.
payMoneyRequest and payInvoice forward it; components and hooks pass the
transactions they already have, useHoldMenuSubmit adds useReportTransactions,
and bulk pay groups allTransactions by report once before its loop.
---
 config/eslint/eslint.seatbelt.tsv             |  1 -
 .../MoneyReportHeaderSecondaryActions.tsx     |  2 +
 .../PayPrimaryAction.tsx                      |  2 +
 .../PayActionButton.tsx                       |  2 +
 .../ListItem/ActionCell/PayActionCell.tsx     |  2 +
 src/hooks/useHoldMenuSubmit.ts                |  3 ++
 src/hooks/useSearchBulkActions.ts             | 16 ++++++
 src/hooks/useSelectionModePayment.ts          |  2 +
 src/libs/actions/IOU/PayMoneyRequest.ts       | 17 ++++--
 src/libs/actions/Search.ts                    |  5 ++
 tests/actions/IOUTest/PayMoneyRequestTest.ts  | 52 +++++++++++++++----
 11 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 5fec781e7e52..4a635fa86685 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -595,7 +595,6 @@
 "../../src/libs/actions/IOU/MoneyRequestBuilder.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	2
 "../../src/libs/actions/IOU/MoneyRequestBuilder.ts"	"@typescript-eslint/no-deprecated/translateLocal"	1
 "../../src/libs/actions/IOU/MoneyRequestBuilder.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/libs/actions/IOU/PayMoneyRequest.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	2
 "../../src/libs/actions/IOU/PayMoneyRequest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/actions/IOU/PayMoneyRequest.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/IOU/PayMoneyRequest.ts"	"no-restricted-syntax"	1
diff --git a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
index 941fbf534f52..feaae4fe94c3 100644
--- a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
+++ b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
@@ -209,6 +209,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
                 paymentMethodType: type,
                 chatReport,
                 invoiceReport: moneyRequestReport,
+                invoiceReportTransactions: allTransactions,
                 introSelected,
                 currentUserAccountIDParam: accountID,
                 currentUserEmailParam: email ?? '',
@@ -234,6 +235,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
                 paymentType: type,
                 chatReport,
                 iouReport: moneyRequestReport,
+                iouReportTransactions: allTransactions,
                 introSelected,
                 currentUserAccountID: accountID,
                 currentUserLogin: currentUserLogin ?? '',
diff --git a/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
index 8da49d2a3f78..d3486ca92b44 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
@@ -146,6 +146,7 @@ function PayPrimaryAction({reportID, chatReportID, isDisabled}: PayPrimaryAction
                 paymentMethodType: type,
                 chatReport,
                 invoiceReport: moneyRequestReport,
+                invoiceReportTransactions: transactions,
                 introSelected,
                 currentUserAccountIDParam: accountID,
                 currentUserEmailParam: email ?? '',
@@ -171,6 +172,7 @@ function PayPrimaryAction({reportID, chatReportID, isDisabled}: PayPrimaryAction
                 paymentType: type,
                 chatReport,
                 iouReport: moneyRequestReport,
+                iouReportTransactions: transactions,
                 introSelected,
                 currentUserAccountID: accountID,
                 currentUserLogin: currentUserLogin ?? '',
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx
index 07856fdb2e3b..fe87858db3e8 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx
@@ -91,6 +91,7 @@ function PayActionButton() {
                     paymentMethodType: type,
                     chatReport: currentChatReport,
                     invoiceReport: iouReport,
+                    invoiceReportTransactions: transactions,
                     introSelected,
                     currentUserAccountIDParam: currentUserAccountID,
                     currentUserEmailParam: currentUserEmail,
@@ -115,6 +116,7 @@ function PayActionButton() {
                     paymentType: type,
                     chatReport: currentChatReport,
                     iouReport,
+                    iouReportTransactions: transactions,
                     introSelected,
                     currentUserAccountID,
                     currentUserLogin: currentUserDetails.login ?? '',
diff --git a/src/components/Search/SearchList/ListItem/ActionCell/PayActionCell.tsx b/src/components/Search/SearchList/ListItem/ActionCell/PayActionCell.tsx
index 32c772abe7f4..94bfdaccaa8e 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/PayActionCell.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/PayActionCell.tsx
@@ -140,6 +140,7 @@ function PayActionCell({isLoading, policyID, reportID, hash, amount, shouldDisab
                 paymentMethodType: type,
                 chatReport,
                 invoiceReport: iouReport,
+                invoiceReportTransactions: transactions,
                 introSelected,
                 currentUserAccountIDParam: currentUserAccountID,
                 currentUserEmailParam: email ?? '',
@@ -178,6 +179,7 @@ function PayActionCell({isLoading, policyID, reportID, hash, amount, shouldDisab
             chatReport: chatReportForPayment,
             isFallbackChatReport,
             iouReport,
+            iouReportTransactions: transactions,
             introSelected,
             currentUserAccountID,
             currentUserLogin: currentUserLogin ?? '',
diff --git a/src/hooks/useHoldMenuSubmit.ts b/src/hooks/useHoldMenuSubmit.ts
index b21e8da14ec1..e9f51000950e 100644
--- a/src/hooks/useHoldMenuSubmit.ts
+++ b/src/hooks/useHoldMenuSubmit.ts
@@ -26,6 +26,7 @@ import usePayChatReportActions from './usePayChatReportActions';
 import usePermissions from './usePermissions';
 import {usePersonalDetail} from './usePersonalDetails';
 import usePolicy from './usePolicy';
+import useReportTransactions from './useReportTransactions';
 
 type ActionHandledType = DeepValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE.PAY | typeof CONST.IOU.REPORT_ACTION_TYPE.APPROVE>;
 
@@ -47,6 +48,7 @@ function useHoldMenuSubmit({moneyRequestReport, chatReport, requestType, payment
     const activePolicy = usePolicy(activePolicyID);
     const policy = usePolicy(moneyRequestReport?.policyID);
     const chatReportPolicy = usePolicy(chatReport?.policyID);
+    const moneyRequestReportTransactions = useReportTransactions(moneyRequestReport?.reportID);
     const getChatReportActions = usePayChatReportActions(chatReport, undefined);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [delegateEmail] = useOnyx(ONYXKEYS.ACCOUNT, {selector: delegateEmailSelector});
@@ -111,6 +113,7 @@ function useHoldMenuSubmit({moneyRequestReport, chatReport, requestType, payment
                 paymentType,
                 chatReport: currentChatReport,
                 iouReport: currentMoneyRequestReport,
+                iouReportTransactions: moneyRequestReportTransactions,
                 introSelected,
                 currentUserAccountID: currentUserDetails.accountID,
                 currentUserLogin: currentUserDetails.login ?? '',
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 1ed5db2350b5..cb98beae143e 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -1694,6 +1694,19 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                           };
                       });
 
+            const onyxTransactionsByReportID = new Map<string, Transaction[]>();
+            for (const transaction of Object.values(allTransactions ?? {})) {
+                if (!transaction?.reportID) {
+                    continue;
+                }
+                const reportTransactions = onyxTransactionsByReportID.get(transaction.reportID);
+                if (reportTransactions) {
+                    reportTransactions.push(transaction);
+                } else {
+                    onyxTransactionsByReportID.set(transaction.reportID, [transaction]);
+                }
+            }
+
             let paidReportCount = 0;
             for (const item of itemsToPay) {
                 if (!item.reportID) {
@@ -1708,6 +1721,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 }
 
                 const isItemInvoice = isInvoiceReport(iouReport);
+                const iouReportTransactions = onyxTransactionsByReportID.get(item.reportID) ?? [];
                 const fallbackChatReportID = item.chatReportID ?? iouReport.chatReportID ?? iouReport.parentReportID;
                 const fallbackPolicyID = iouReport.policyID ?? item.policyID;
                 const {chatReport, isFallbackChatReport} = getChatReportWithFallback(
@@ -1774,6 +1788,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         paymentMethodType: paymentItem.paymentType as PaymentMethodType,
                         chatReport,
                         invoiceReport: iouReport,
+                        invoiceReportTransactions: iouReportTransactions,
                         introSelected,
                         currentUserAccountIDParam: accountID,
                         currentUserEmailParam: email ?? '',
@@ -1803,6 +1818,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     paymentType: paymentItem.paymentType as PaymentMethodType,
                     chatReport,
                     iouReport,
+                    iouReportTransactions,
                     introSelected,
                     currentUserAccountID: accountID,
                     currentUserLogin: currentUserLogin ?? '',
diff --git a/src/hooks/useSelectionModePayment.ts b/src/hooks/useSelectionModePayment.ts
index 60aaa6b22843..6afa44b92463 100644
--- a/src/hooks/useSelectionModePayment.ts
+++ b/src/hooks/useSelectionModePayment.ts
@@ -193,6 +193,7 @@ function useSelectionModePayment({
                 paymentMethodType: type,
                 chatReport,
                 invoiceReport: moneyRequestReport,
+                invoiceReportTransactions: transactions,
                 introSelected,
                 currentUserAccountIDParam: accountID,
                 currentUserEmailParam: email ?? '',
@@ -217,6 +218,7 @@ function useSelectionModePayment({
                 paymentType: type,
                 chatReport,
                 iouReport: moneyRequestReport,
+                iouReportTransactions: transactions,
                 introSelected,
                 currentUserAccountID: accountID,
                 currentUserLogin: currentUserLogin ?? '',
diff --git a/src/libs/actions/IOU/PayMoneyRequest.ts b/src/libs/actions/IOU/PayMoneyRequest.ts
index 93ba0d50cf95..137b0a06b446 100644
--- a/src/libs/actions/IOU/PayMoneyRequest.ts
+++ b/src/libs/actions/IOU/PayMoneyRequest.ts
@@ -17,7 +17,6 @@ import {
     buildOptimisticCancelPaymentReportAction,
     buildOptimisticIOUReportAction,
     getReimbursableTotal,
-    getReportTransactions,
     getUnheldReimbursableTotal,
     hasHeldExpenses as hasHeldExpensesReportUtils,
     hasOutstandingChildRequest,
@@ -63,6 +62,8 @@ type PayInvoiceArgs = {
     paymentMethodType: PaymentMethodType;
     chatReport: OnyxTypes.Report;
     invoiceReport: OnyxEntry<OnyxTypes.Report>;
+    /** Expenses currently on invoiceReport, used to decide the amount to pay and to unhold them. */
+    invoiceReportTransactions: OnyxTypes.Transaction[];
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
     currentUserAccountIDParam: number;
     currentUserEmailParam: string;
@@ -102,6 +103,8 @@ type PayMoneyRequestFunctionParams = {
     paymentType: PaymentMethodType;
     chatReport: OnyxTypes.Report;
     iouReport: OnyxEntry<OnyxTypes.Report>;
+    /** Expenses currently on iouReport, used to decide the amount to pay and to unhold them. */
+    iouReportTransactions: OnyxTypes.Transaction[];
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
     currentUserAccountID: number;
     currentUserLogin: string;
@@ -131,6 +134,7 @@ type PayMoneyRequestFunctionParams = {
 function getPayMoneyRequestParams({
     initialChatReport,
     iouReport,
+    iouReportTransactions,
     recipient,
     paymentMethodType,
     full,
@@ -158,6 +162,7 @@ function getPayMoneyRequestParams({
 }: {
     initialChatReport: OnyxTypes.Report;
     iouReport: OnyxEntry<OnyxTypes.Report>;
+    iouReportTransactions: OnyxTypes.Transaction[];
     recipient: Participant;
     paymentMethodType: PaymentMethodType;
     full: boolean;
@@ -254,14 +259,13 @@ function getPayMoneyRequestParams({
         chatReport = existingB2BInvoiceReport;
     }
 
-    const reportTransactions = getReportTransactions(iouReport?.reportID);
     const unheldReimbursableTotal = getUnheldReimbursableTotal(iouReport);
     let total = getReimbursableTotal(iouReport);
-    if (hasHeldExpensesReportUtils(reportTransactions) && !full && !!unheldReimbursableTotal) {
+    if (hasHeldExpensesReportUtils(iouReportTransactions) && !full && !!unheldReimbursableTotal) {
         total = unheldReimbursableTotal;
     }
 
-    const shouldMoveScanFailedTransactions = !!full && isExpenseReport(iouReport) && shouldSplitScanFailedTransactions(reportTransactions, iouReport);
+    const shouldMoveScanFailedTransactions = !!full && isExpenseReport(iouReport) && shouldSplitScanFailedTransactions(iouReportTransactions, iouReport);
 
     const optimisticIOUReportAction = buildOptimisticIOUReportAction({
         type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
@@ -444,7 +448,6 @@ function getPayMoneyRequestParams({
 
     // Optimistically unhold all transactions if we pay all requests
     if (full) {
-        const iouReportTransactions = getReportTransactions(iouReport?.reportID);
         for (const transaction of iouReportTransactions) {
             onyxData.optimisticData?.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -873,6 +876,7 @@ function payMoneyRequest(params: PayMoneyRequestFunctionParams) {
         paymentType,
         chatReport,
         iouReport,
+        iouReportTransactions,
         introSelected,
         currentUserAccountID,
         currentUserLogin,
@@ -915,6 +919,7 @@ function payMoneyRequest(params: PayMoneyRequestFunctionParams) {
     const {params: payMoneyRequestParams, onyxData} = getPayMoneyRequestParams({
         initialChatReport: chatReport,
         iouReport,
+        iouReportTransactions,
         recipient,
         paymentMethodType: paymentType,
         full,
@@ -1121,6 +1126,7 @@ function payInvoice({
     paymentMethodType,
     chatReport,
     invoiceReport,
+    invoiceReportTransactions,
     introSelected,
     currentUserAccountIDParam,
     currentUserEmailParam,
@@ -1160,6 +1166,7 @@ function payInvoice({
     } = getPayMoneyRequestParams({
         initialChatReport: chatReport,
         iouReport: invoiceReport,
+        iouReportTransactions: invoiceReportTransactions,
         recipient,
         paymentMethodType,
         full: true,
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 6d329ab15fe8..b1d578817555 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -380,6 +380,7 @@ function handleActionButtonPress({
                 conciergeChat,
                 getCurrencyDecimals,
                 rules,
+                iouReportTransactions: allReportTransactions,
             });
             return;
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
@@ -622,6 +623,8 @@ type GetPayActionCallbackParams = {
     conciergeChat: OnyxEntry<Report>;
     getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
     rules: OnyxCollection<Rule>;
+    /** Expenses on the report being paid, as shown in the search results. */
+    iouReportTransactions: Transaction[];
 };
 
 function getPayActionCallback({
@@ -652,6 +655,7 @@ function getPayActionCallback({
     conciergeChat,
     getCurrencyDecimals,
     rules,
+    iouReportTransactions,
 }: GetPayActionCallbackParams) {
     if (!item.reportID) {
         Log.info('[SearchPay] Dropping row pay: item has no reportID');
@@ -684,6 +688,7 @@ function getPayActionCallback({
         paymentType: lastPolicyPaymentMethod,
         chatReport: chatReportForPayment,
         iouReport: snapshotReport,
+        iouReportTransactions,
         introSelected,
         currentUserAccountID: currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID,
         currentUserLogin: currentUserLogin ?? '',
diff --git a/tests/actions/IOUTest/PayMoneyRequestTest.ts b/tests/actions/IOUTest/PayMoneyRequestTest.ts
index fadb94342190..03666b907dfe 100644
--- a/tests/actions/IOUTest/PayMoneyRequestTest.ts
+++ b/tests/actions/IOUTest/PayMoneyRequestTest.ts
@@ -25,7 +25,7 @@ import type Transaction from '@src/types/onyx/Transaction';
 import type {TransactionCollectionDataSet} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import type {OnyxEntry, OnyxInputValue} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry, OnyxInputValue} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
@@ -93,6 +93,18 @@ const RORY_EMAIL = 'rory@expensifail.com';
 const RORY_ACCOUNT_ID = 3;
 
 OnyxUpdateManager();
+/** Reads the expenses currently in Onyx for a report, i.e. what a component would pass as the report's transactions. */
+async function getReportTransactionsFromOnyx(reportID: string | undefined): Promise<Transaction[]> {
+    let allTransactions: OnyxCollection<Transaction>;
+    await getOnyxData({
+        key: ONYXKEYS.COLLECTION.TRANSACTION,
+        callback: (transactions) => {
+            allTransactions = transactions;
+        },
+    });
+    return Object.values(allTransactions ?? {}).filter((transaction): transaction is Transaction => !!transaction && transaction.reportID === reportID);
+}
+
 describe('actions/IOU/PayMoneyRequest', () => {
     beforeAll(() => {
         Onyx.init({
@@ -237,17 +249,19 @@ describe('actions/IOU/PayMoneyRequest', () => {
                             });
                         }),
                 )
-                .then(() => {
+                .then(async () => {
                     mockFetch?.pause?.();
                     if (!chatReport || !iouReport) {
                         return waitForBatchedUpdates();
                     }
+                    const iouReportTransactions = await getReportTransactionsFromOnyx(iouReport.reportID);
                     payMoneyRequest({
                         isASAPSubmitBetaEnabled: false,
                         conciergeChat: undefined,
                         paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                         chatReport,
                         iouReport,
+                        iouReportTransactions,
                         introSelected: undefined,
                         currentUserAccountID,
                         currentUserLogin,
@@ -463,16 +477,18 @@ describe('actions/IOU/PayMoneyRequest', () => {
                             });
                         }),
                 )
-                .then(() => {
+                .then(async () => {
                     if (!chatReport || !expenseReport) {
                         return waitForBatchedUpdates();
                     }
+                    const iouReportTransactions = await getReportTransactionsFromOnyx(expenseReport.reportID);
                     payMoneyRequest({
                         isASAPSubmitBetaEnabled: false,
                         conciergeChat: undefined,
                         paymentType: CONST.IOU.PAYMENT_TYPE.VBBA,
                         chatReport,
                         iouReport: expenseReport,
+                        iouReportTransactions,
                         introSelected: undefined,
                         currentUserAccountID: CARLOS_ACCOUNT_ID,
                         currentUserLogin: CARLOS_EMAIL,
@@ -643,17 +659,19 @@ describe('actions/IOU/PayMoneyRequest', () => {
                             });
                         }),
                 )
-                .then(() => {
+                .then(async () => {
                     mockFetch?.fail?.();
                     if (!chatReport || !expenseReport) {
                         return waitForBatchedUpdates();
                     }
+                    const iouReportTransactions = await getReportTransactionsFromOnyx(expenseReport.reportID);
                     payMoneyRequest({
                         isASAPSubmitBetaEnabled: false,
                         conciergeChat: undefined,
                         paymentType: 'ACH',
                         chatReport,
                         iouReport: expenseReport,
+                        iouReportTransactions,
                         introSelected: undefined,
                         currentUserAccountID: CARLOS_ACCOUNT_ID,
                         currentUserLogin: CARLOS_EMAIL,
@@ -712,6 +730,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -813,6 +832,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -858,6 +878,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                     paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                     chatReport,
                     iouReport,
+                    iouReportTransactions: [],
                     introSelected: undefined,
                     currentUserAccountID: CARLOS_ACCOUNT_ID,
                     currentUserLogin: CARLOS_EMAIL,
@@ -971,6 +992,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                         paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                         chatReport: partialPayChatReport,
                         iouReport,
+                        iouReportTransactions: [transaction1, transaction2],
                         introSelected: undefined,
                         currentUserAccountID: CARLOS_ACCOUNT_ID,
                         currentUserLogin: CARLOS_EMAIL,
@@ -1071,6 +1093,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport: expenseReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1173,11 +1196,12 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 return expenseReport;
             };
 
-            const pay = (expenseReport: Report) =>
+            const pay = (expenseReport: Report, iouReportTransactions: Transaction[]) =>
                 payMoneyRequest({
                     paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                     chatReport,
                     iouReport: expenseReport,
+                    iouReportTransactions,
                     introSelected: undefined,
                     currentUserAccountID: RORY_ACCOUNT_ID,
                     currentUserLogin: RORY_EMAIL,
@@ -1201,7 +1225,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 const scanFailedTransaction = buildTransaction('scanFailed1', 0, true);
                 const expenseReport = await setUpReport([validTransaction, scanFailedTransaction]);
 
-                const newReportID = pay(expenseReport);
+                const newReportID = pay(expenseReport, [validTransaction, scanFailedTransaction]);
                 await waitForBatchedUpdates();
 
                 expect(newReportID).toBeDefined();
@@ -1219,7 +1243,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 const scanFailedTransaction = buildTransaction('scanFailed1', 0, true);
                 const expenseReport = await setUpReport([scanFailedTransaction]);
 
-                const newReportID = pay(expenseReport);
+                const newReportID = pay(expenseReport, [scanFailedTransaction]);
                 await waitForBatchedUpdates();
 
                 expect(newReportID).toBeUndefined();
@@ -1232,7 +1256,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 const scanFailedTransaction = buildTransaction('scanFailed1', -5000, true);
                 const expenseReport = await setUpReport([validTransaction, scanFailedTransaction]);
 
-                const newReportID = pay(expenseReport);
+                const newReportID = pay(expenseReport, [validTransaction, scanFailedTransaction]);
                 await waitForBatchedUpdates();
 
                 expect(newReportID).toBeUndefined();
@@ -1268,6 +1292,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1323,6 +1348,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1498,6 +1524,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1572,6 +1599,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1636,6 +1664,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -1679,6 +1708,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
                 paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                 chatReport,
                 iouReport,
+                iouReportTransactions: [],
                 introSelected: undefined,
                 currentUserAccountID: CARLOS_ACCOUNT_ID,
                 currentUserLogin: CARLOS_EMAIL,
@@ -2107,17 +2137,19 @@ describe('actions/IOU/PayMoneyRequest', () => {
                         },
                     }),
                 )
-                .then(() => {
+                .then(async () => {
                     // When the expense report is paid elsewhere (but really, any payment option would work)
                     if (!chatReport || !expenseReport) {
                         return waitForBatchedUpdates();
                     }
+                    const iouReportTransactions = await getReportTransactionsFromOnyx(expenseReport.reportID);
                     payMoneyRequest({
                         isASAPSubmitBetaEnabled: false,
                         conciergeChat: undefined,
                         paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                         chatReport,
                         iouReport: expenseReport,
+                        iouReportTransactions,
                         introSelected: undefined,
                         currentUserAccountID: CARLOS_ACCOUNT_ID,
                         currentUserLogin: CARLOS_EMAIL,
@@ -2623,12 +2655,14 @@ describe('actions/IOU/PayMoneyRequest', () => {
             // When the expense report is paid elsewhere (but really, any payment option would work)
             if (chatReport && expenseReport) {
                 mockFetch?.pause?.();
+                const iouReportTransactions = await getReportTransactionsFromOnyx(expenseReport.reportID);
                 payMoneyRequest({
                     isASAPSubmitBetaEnabled: false,
                     conciergeChat: undefined,
                     paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                     chatReport,
                     iouReport: expenseReport,
+                    iouReportTransactions,
                     introSelected: undefined,
                     currentUserAccountID: CARLOS_ACCOUNT_ID,
                     currentUserLogin: CARLOS_EMAIL,

From de6c5a8d613b9003476c92f494ac75a83d47c00d Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Sun, 11 Oct 2026 17:10:09 +0700
Subject: [PATCH 435/781] chore: remove comment

---
 src/libs/actions/IOU/PayMoneyRequest.ts | 2 --
 src/libs/actions/Search.ts              | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/libs/actions/IOU/PayMoneyRequest.ts b/src/libs/actions/IOU/PayMoneyRequest.ts
index 137b0a06b446..6b8be8316975 100644
--- a/src/libs/actions/IOU/PayMoneyRequest.ts
+++ b/src/libs/actions/IOU/PayMoneyRequest.ts
@@ -62,7 +62,6 @@ type PayInvoiceArgs = {
     paymentMethodType: PaymentMethodType;
     chatReport: OnyxTypes.Report;
     invoiceReport: OnyxEntry<OnyxTypes.Report>;
-    /** Expenses currently on invoiceReport, used to decide the amount to pay and to unhold them. */
     invoiceReportTransactions: OnyxTypes.Transaction[];
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
     currentUserAccountIDParam: number;
@@ -103,7 +102,6 @@ type PayMoneyRequestFunctionParams = {
     paymentType: PaymentMethodType;
     chatReport: OnyxTypes.Report;
     iouReport: OnyxEntry<OnyxTypes.Report>;
-    /** Expenses currently on iouReport, used to decide the amount to pay and to unhold them. */
     iouReportTransactions: OnyxTypes.Transaction[];
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
     currentUserAccountID: number;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index b1d578817555..9a88bedab095 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -623,7 +623,6 @@ type GetPayActionCallbackParams = {
     conciergeChat: OnyxEntry<Report>;
     getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
     rules: OnyxCollection<Rule>;
-    /** Expenses on the report being paid, as shown in the search results. */
     iouReportTransactions: Transaction[];
 };
 

From 04ef058ac1d358a4aeb1f8c86e22a5f90b684691 Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Sun, 11 Oct 2026 18:11:41 +0700
Subject: [PATCH 436/781] Use derived report transactions lookup for bulk pay
 instead of looping allTransactions

---
 src/hooks/useSearchBulkActions.ts | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index cb98beae143e..6fb2c69ffb42 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -1694,19 +1694,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                           };
                       });
 
-            const onyxTransactionsByReportID = new Map<string, Transaction[]>();
-            for (const transaction of Object.values(allTransactions ?? {})) {
-                if (!transaction?.reportID) {
-                    continue;
-                }
-                const reportTransactions = onyxTransactionsByReportID.get(transaction.reportID);
-                if (reportTransactions) {
-                    reportTransactions.push(transaction);
-                } else {
-                    onyxTransactionsByReportID.set(transaction.reportID, [transaction]);
-                }
-            }
-
             let paidReportCount = 0;
             for (const item of itemsToPay) {
                 if (!item.reportID) {
@@ -1721,7 +1708,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 }
 
                 const isItemInvoice = isInvoiceReport(iouReport);
-                const iouReportTransactions = onyxTransactionsByReportID.get(item.reportID) ?? [];
+                const iouReportTransactions = Object.values(allReportsTransactionsAndViolations?.[item.reportID]?.transactions ?? {});
                 const fallbackChatReportID = item.chatReportID ?? iouReport.chatReportID ?? iouReport.parentReportID;
                 const fallbackPolicyID = iouReport.policyID ?? item.policyID;
                 const {chatReport, isFallbackChatReport} = getChatReportWithFallback(
@@ -1875,6 +1862,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             personalPolicyID,
             lastPaymentMethods,
             allTransactions,
+            allReportsTransactionsAndViolations,
             policyIDsWithVBBA,
             clearSelectedTransactions,
             accountID,

From 86dfc510082d825ea46c0af120fc612079111e47 Mon Sep 17 00:00:00 2001
From: Sergei Sharabai <105950333+sharabai@users.noreply.github.com>
Date: Sun, 11 Oct 2026 17:15:42 +0200
Subject: [PATCH 437/781] refactor: size charts from the card width before they
 mount

---
 jest/setup.ts                                 |   2 +
 server/libs/bundleWithRnStubs.ts              |  33 ++++
 server/victory-chart-renderer/scripts/dev.ts  |  35 +---
 .../tests/plotBoundsDrift.test.ts             |  70 +++++++
 .../tests/probes/plotBoundsProbe.tsx          |   9 +
 .../tests/probes/plotBoundsProbeMain.tsx      |  70 +++++++
 .../Charts/BarChart/BarChartContent.tsx       |   4 +-
 .../BarChart/VerticalBarChartContent.tsx      | 185 +++++++++---------
 .../Charts/BarChart/index.native.tsx          |  13 +-
 src/components/Charts/BarChart/index.tsx      |  13 +-
 src/components/Charts/BarChart/types.ts       |   6 +
 .../Charts/LineChart/LineChartContent.tsx     | 178 ++++++++---------
 .../Charts/LineChart/index.native.tsx         |  13 +-
 src/components/Charts/LineChart/index.tsx     |  13 +-
 .../Charts/PieChart/PieChartContent.tsx       |  71 ++++---
 .../Charts/PieChart/index.native.tsx          |  13 +-
 src/components/Charts/PieChart/index.tsx      |  13 +-
 .../Charts/components/ChartWidthBox.tsx       |  28 +++
 src/components/Charts/hooks/index.ts          |   2 +
 .../Charts/hooks/useReadyCartesianCanvas.ts   |  21 ++
 src/components/Charts/utils/index.ts          |  11 ++
 .../Charts/chartWidthHandoff.test.tsx         |  94 +++++++++
 tests/unit/components/Charts/utils.test.ts    |  25 +++
 23 files changed, 663 insertions(+), 259 deletions(-)
 create mode 100644 server/libs/bundleWithRnStubs.ts
 create mode 100644 server/victory-chart-renderer/tests/plotBoundsDrift.test.ts
 create mode 100644 server/victory-chart-renderer/tests/probes/plotBoundsProbe.tsx
 create mode 100644 server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
 create mode 100644 src/components/Charts/components/ChartWidthBox.tsx
 create mode 100644 src/components/Charts/hooks/useReadyCartesianCanvas.ts
 create mode 100644 tests/unit/components/Charts/chartWidthHandoff.test.tsx

diff --git a/jest/setup.ts b/jest/setup.ts
index 9afaa8f219a1..762041ace642 100644
--- a/jest/setup.ts
+++ b/jest/setup.ts
@@ -370,6 +370,8 @@ jest.mock('victory-native', () => ({
     CartesianChart: jest.fn(
         ({children}: {children?: (args: Record<string, unknown>) => ReactNode}) => children?.({points: {y: []}, chartBounds: {left: 0, right: 0, top: 0, bottom: 0}}) ?? null,
     ),
+    Pie: {Chart: jest.fn(() => null)},
+    PolarChart: jest.fn(() => null),
 }));
 
 // Provide a default global fetch mock for tests that do not explicitly set it up
diff --git a/server/libs/bundleWithRnStubs.ts b/server/libs/bundleWithRnStubs.ts
new file mode 100644
index 000000000000..448daf25f504
--- /dev/null
+++ b/server/libs/bundleWithRnStubs.ts
@@ -0,0 +1,33 @@
+import assertBuildSuccess from '@server/libs/assertBuildSuccess';
+import createRnStubPlugin from '@server/plugins/rnStubPlugin';
+import {basename, dirname, join, resolve} from 'node:path';
+
+type BundleWithRnStubsOptions = {
+    packageRoot: string;
+    entrypoint: string;
+    outFile: string;
+};
+
+/** Every output is written beside outFile, because the bundle loads CanvasKit's wasm from beside itself. */
+async function bundleWithRnStubs({packageRoot, entrypoint, outFile}: BundleWithRnStubsOptions): Promise<void> {
+    const buildResult = await Bun.build({
+        entrypoints: [entrypoint],
+        target: 'bun',
+        packages: 'bundle',
+        conditions: ['react-native'],
+        tsconfig: join(packageRoot, 'tsconfig.json'),
+        plugins: [createRnStubPlugin(resolve(packageRoot, '../stubs'))],
+    });
+
+    assertBuildSuccess(buildResult, `Failed to bundle ${entrypoint}`);
+
+    if (buildResult.outputs.length === 0) {
+        throw new Error(`Bundled output of ${entrypoint} is missing`);
+    }
+
+    for (const output of buildResult.outputs) {
+        await Bun.write(output.kind === 'entry-point' ? outFile : join(dirname(outFile), basename(output.path)), output);
+    }
+}
+
+export default bundleWithRnStubs;
diff --git a/server/victory-chart-renderer/scripts/dev.ts b/server/victory-chart-renderer/scripts/dev.ts
index 28e91ab32ffd..f71b01ec13a8 100644
--- a/server/victory-chart-renderer/scripts/dev.ts
+++ b/server/victory-chart-renderer/scripts/dev.ts
@@ -2,52 +2,25 @@
  * Development runner for the victory-chart-renderer CLI.
  *
  * victory-native is hoisted to the App repo root, so a bare `bun run src/cli.tsx` would
- * resolve real react-native native sources that Bun cannot bundle. This script bundles
- * src/cli.tsx with rnStubPlugin (redirecting RN imports to server/stubs), writes the
- * bundle to .dev/cli.js, then executes it under the current Bun binary.
+ * resolve real react-native native sources that Bun cannot bundle.
  *
  * process.argv entries after this script are forwarded unchanged to the bundled CLI.
  * The child process cwd is the App repository root (two levels above this package).
  *
  * For a standalone executable instead of a Bun-run bundle, use build.ts.
  */
-import assertBuildSuccess from '@server/libs/assertBuildSuccess';
-import createRnStubPlugin from '@server/plugins/rnStubPlugin';
+import bundleWithRnStubs from '@server/libs/bundleWithRnStubs';
 import {spawnSync} from 'node:child_process';
 import {mkdirSync} from 'node:fs';
-import {basename, join, resolve} from 'node:path';
+import {join, resolve} from 'node:path';
 
 const packageRoot = resolve(import.meta.dir, '..');
 const repoRoot = resolve(packageRoot, '../..');
-const stubRoot = resolve(packageRoot, '../stubs');
-const tsconfigPath = join(packageRoot, 'tsconfig.json');
 const outFile = resolve(packageRoot, '.dev/cli.js');
 
 mkdirSync(join(packageRoot, '.dev'), {recursive: true});
 
-const buildResult = await Bun.build({
-    entrypoints: [resolve(packageRoot, 'src/bootstrap.tsx')],
-    target: 'bun',
-    packages: 'bundle',
-    conditions: ['react-native'],
-    tsconfig: tsconfigPath,
-    plugins: [createRnStubPlugin(stubRoot)],
-});
-
-assertBuildSuccess(buildResult, 'Failed to bundle victory-chart-renderer CLI');
-
-if (buildResult.outputs.length === 0) {
-    throw new Error('Bundled CLI output is missing');
-}
-
-const devDir = join(packageRoot, '.dev');
-
-for (const output of buildResult.outputs) {
-    const outputName = basename(output.path);
-    const destName = output.kind === 'entry-point' ? 'cli.js' : outputName;
-
-    await Bun.write(join(devDir, destName), output);
-}
+await bundleWithRnStubs({packageRoot, entrypoint: resolve(packageRoot, 'src/bootstrap.tsx'), outFile});
 
 const runResult = spawnSync(process.execPath, [outFile, ...process.argv.slice(2)], {
     cwd: repoRoot,
diff --git a/server/victory-chart-renderer/tests/plotBoundsDrift.test.ts b/server/victory-chart-renderer/tests/plotBoundsDrift.test.ts
new file mode 100644
index 000000000000..7a889732edd3
--- /dev/null
+++ b/server/victory-chart-renderer/tests/plotBoundsDrift.test.ts
@@ -0,0 +1,70 @@
+import {afterAll, beforeAll, describe, expect, test} from 'bun:test';
+
+import type {ChartBounds} from 'victory-native';
+
+import bundleWithRnStubs from '@server/libs/bundleWithRnStubs';
+import {spawnSync} from 'node:child_process';
+import {mkdtempSync, rmSync} from 'node:fs';
+import {tmpdir} from 'node:os';
+import {join, resolve} from 'node:path';
+import {fileURLToPath} from 'node:url';
+
+import {packageRoot} from './testUtils';
+
+type PlotBounds = Pick<ChartBounds, 'left' | 'right'>;
+
+type ProbeOutput = {
+    predicted: PlotBounds;
+    reported: PlotBounds;
+};
+
+const runDir = mkdtempSync(join(tmpdir(), 'vcr-plot-bounds-'));
+const bundlePath = join(runDir, 'plotBoundsProbe.js');
+
+function hasPlotBounds(value: unknown): value is PlotBounds {
+    return typeof value === 'object' && value !== null && 'left' in value && typeof value.left === 'number' && 'right' in value && typeof value.right === 'number';
+}
+
+function parseProbeOutput(raw: string): ProbeOutput {
+    const parsed: unknown = JSON.parse(raw);
+
+    if (typeof parsed !== 'object' || parsed === null || !('predicted' in parsed) || !('reported' in parsed) || !hasPlotBounds(parsed.predicted) || !hasPlotBounds(parsed.reported)) {
+        throw new Error(`Plot bounds probe printed unexpected output:\n${raw}`);
+    }
+
+    return {predicted: parsed.predicted, reported: parsed.reported};
+}
+
+let probeOutput: ProbeOutput;
+
+describe('cartesian plot bounds', () => {
+    beforeAll(async () => {
+        await bundleWithRnStubs({
+            packageRoot,
+            entrypoint: fileURLToPath(import.meta.resolve('./probes/plotBoundsProbe.tsx')),
+            outFile: bundlePath,
+        });
+
+        const runResult = spawnSync(process.execPath, [bundlePath], {
+            cwd: resolve(packageRoot, '../..'),
+            encoding: 'utf8',
+        });
+
+        if (runResult.status !== 0) {
+            throw new Error(`Plot bounds probe failed:\n${runResult.stderr}\n${runResult.stdout}`);
+        }
+
+        probeOutput = parseProbeOutput(runResult.stdout);
+    }, 120_000);
+
+    afterAll(() => {
+        rmSync(runDir, {recursive: true, force: true});
+    });
+
+    test('should predict the plot bounds victory-native reports', () => {
+        // Given a real chart laid out the way the vertical bar chart is, whose padding and axes the line chart shares, drawn headless by the probe
+        // When its reported plot bounds are compared with the ones predicted from its width
+        // Then they match, so a victory-native upgrade that moves the plot fails here instead of misplacing labels
+        expect(probeOutput.predicted).toEqual(probeOutput.reported);
+    });
+});
diff --git a/server/victory-chart-renderer/tests/probes/plotBoundsProbe.tsx b/server/victory-chart-renderer/tests/probes/plotBoundsProbe.tsx
new file mode 100644
index 000000000000..f4fd7087213d
--- /dev/null
+++ b/server/victory-chart-renderer/tests/probes/plotBoundsProbe.tsx
@@ -0,0 +1,9 @@
+/*
+ * Runs as a bundled child process rather than inside the test process, because victory-native resolves
+ * react-native, which only loads through the stubs rnStubPlugin substitutes at bundle time.
+ */
+import initSkiaForCli from '../../src/initSkiaForCli';
+
+// Skia must be initialized before the chart module and its transitive imports are evaluated.
+await initSkiaForCli();
+await import('./plotBoundsProbeMain');
diff --git a/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx b/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
new file mode 100644
index 000000000000..32b82d58e425
--- /dev/null
+++ b/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
@@ -0,0 +1,70 @@
+import {VERTICAL_BAR_DOMAIN_PADDING} from '@components/Charts/barChartConstants';
+import {getCartesianPlotBounds} from '@components/Charts/utils';
+import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
+
+import type {ChartBounds} from 'victory-native';
+
+import {drawOffscreen, makeOffscreenSurface} from '@shopify/react-native-skia/lib/module/headless';
+import {CartesianChart} from 'victory-native';
+
+const CHART_WIDTH = 400;
+
+const Y_AXIS_LABEL_WIDTH = 37;
+
+const CHART_PADDING_RIGHT = Y_AXIS_LABEL_WIDTH + GLYPH_PADDING;
+
+const DATA = [
+    {x: 0, y: 120},
+    {x: 1, y: 80},
+    {x: 2, y: 45},
+];
+
+const captured: {bounds: ChartBounds | null} = {bounds: null};
+
+const chartElement = (
+    <CartesianChart
+        explicitSize={{width: CHART_WIDTH, height: CHART_CONTENT_MIN_HEIGHT}}
+        headless
+        xKey="x"
+        yKeys={['y']}
+        padding={{...VictoryTheme.axis.padding, right: CHART_PADDING_RIGHT}}
+        domainPadding={VERTICAL_BAR_DOMAIN_PADDING}
+        xAxis={{
+            tickCount: DATA.length,
+            lineWidth: VictoryTheme.axis.xLineWidth,
+            labelPosition: 'inset',
+        }}
+        yAxis={[
+            {
+                tickCount: VictoryTheme.axis.tickCount,
+                axisSide: 'right',
+                lineWidth: 0,
+                labelOffset: VictoryTheme.axis.labelGap,
+            },
+        ]}
+        frame={{lineWidth: 0}}
+        data={DATA}
+    >
+        {({chartBounds}) => {
+            // The bounds reach onChartBoundsChange from an effect, which the offscreen draw never flushes, so they
+            // are read here instead. Both come from the same value the chart computes for its own layout.
+            captured.bounds = chartBounds;
+            return null;
+        }}
+    </CartesianChart>
+);
+
+using surface = makeOffscreenSurface(CHART_WIDTH, CHART_CONTENT_MIN_HEIGHT);
+using image = await drawOffscreen(surface, chartElement);
+
+if (!image) {
+    throw new Error('Skia failed to draw the probe chart');
+}
+
+if (!captured.bounds) {
+    throw new Error('CartesianChart never reported its bounds');
+}
+
+const {left, right} = getCartesianPlotBounds(CHART_WIDTH, CHART_PADDING_RIGHT);
+
+console.log(JSON.stringify({predicted: {left, right}, reported: {left: captured.bounds.left, right: captured.bounds.right}}));
diff --git a/src/components/Charts/BarChart/BarChartContent.tsx b/src/components/Charts/BarChart/BarChartContent.tsx
index 04112b6a66b5..bd489db5b24f 100644
--- a/src/components/Charts/BarChart/BarChartContent.tsx
+++ b/src/components/Charts/BarChart/BarChartContent.tsx
@@ -2,11 +2,11 @@ import {ChartFontsProvider} from '@components/Charts/hooks';
 
 import React from 'react';
 
-import type BarChartProps from './types';
+import type {BarChartContentProps} from './types';
 
 import VerticalBarChartContentBody from './VerticalBarChartContent';
 
-function BarChartContent(props: BarChartProps) {
+function BarChartContent(props: BarChartContentProps) {
     return (
         <ChartFontsProvider>
             <VerticalBarChartContentBody {...props} />
diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index 6daeefc70cc0..7eff40020f28 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -4,43 +4,41 @@ import ChartGridLines from '@components/Charts/components/ChartGridLines';
 import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
 import ChartXAxisLabels from '@components/Charts/components/ChartXAxisLabels';
 import ChartYAxisLabels from '@components/Charts/components/ChartYAxisLabels';
-import type {HitTestArgs} from '@components/Charts/hooks';
+import type {CartesianCanvasInputs, HitTestArgs} from '@components/Charts/hooks';
 import {
-    useChartFontManager,
     useChartInteractions,
     useChartLabelFormats,
     useChartLabelLayout,
     useChartLabelMeasurements,
     useDynamicYDomain,
     useLabelHitTesting,
+    useReadyCartesianCanvas,
 } from '@components/Charts/hooks';
-import {getBarLayout, getXAxisLabel, getYAxisLabelWidth} from '@components/Charts/utils';
+import {getBarLayout, getCartesianPlotBounds, getXAxisLabel, getYAxisLabelWidth} from '@components/Charts/utils';
 import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
 
+import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import variables from '@styles/variables';
 
-import type {LayoutChangeEvent} from 'react-native';
 import type {CartesianChartRenderArg, ChartBounds, PointsArray, Scale} from 'victory-native';
 
-import React, {useState} from 'react';
 import {View} from 'react-native';
 import {GestureDetector} from 'react-native-gesture-handler';
 import Animated, {useAnimatedStyle, useSharedValue} from 'react-native-reanimated';
 import {Bar, CartesianChart} from 'victory-native';
 
 import type BarChartProps from './types';
+import type {BarChartContentProps} from './types';
 
-function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = 'left', onBarPress, shouldShowLabels = true}: BarChartProps) {
+type VerticalBarChartCanvasProps = Omit<BarChartProps, 'isLoading'> & CartesianCanvasInputs;
+
+function VerticalBarChartCanvas({data, yAxisUnit, yAxisUnitPosition = 'left', onBarPress, shouldShowLabels = true, chartWidth, fontManager}: VerticalBarChartCanvasProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const fontManager = useChartFontManager();
-    const [chartWidth, setChartWidth] = useState(0);
-    const [barAreaWidth, setBarAreaWidth] = useState(0);
-    const [boundsLeft, setBoundsLeft] = useState(0);
-    const [boundsRight, setBoundsRight] = useState(0);
+    const StyleUtils = useStyleUtils();
 
     const chartData = data.map((point, index) => ({
         x: index,
@@ -59,16 +57,21 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         }
     };
 
-    const handleLayout = (event: LayoutChangeEvent) => {
-        setChartWidth(event.nativeEvent.layout.width);
-    };
-
-    const barLayout = getBarLayout(barAreaWidth, data.length);
-
     // Empty label data makes the measurement and layout hooks return early instead of laying out labels nobody sees.
     const labelData = shouldShowLabels ? data : [];
     const originalLabels = labelData.map(getXAxisLabel);
 
+    const {formatValue, formatCompactValue} = useChartLabelFormats({
+        data,
+        unit: yAxisUnit,
+        unitPosition: yAxisUnitPosition,
+    });
+
+    const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VERTICAL_BAR_DOMAIN_PADDING);
+    const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING;
+    const plotBounds = getCartesianPlotBounds(chartWidth, chartPaddingRight);
+    const barLayout = getBarLayout(plotBounds.width, data.length);
+
     const measurements = useChartLabelMeasurements(labelData, fontManager, variables.iconSizeExtraSmall);
 
     const {labelRotation, labelSkipInterval, truncatedLabelWidths, xAxisLabelHeight, regularLabelMaxWidth, firstLabelMaxWidth, lastLabelMaxWidth, ellipsisWidth} = useChartLabelLayout({
@@ -76,16 +79,10 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         fontManager,
         fontSize: variables.iconSizeExtraSmall,
         measurements,
-        tickSpacing: shouldShowLabels && barAreaWidth > 0 ? barLayout.barWidth + barLayout.gap : 0,
-        labelAreaWidth: barAreaWidth,
-        firstTickLeftSpace: boundsLeft + barLayout.edgeSpace,
-        lastTickRightSpace: chartWidth > 0 ? chartWidth - boundsRight + barLayout.edgeSpace : 0,
-    });
-
-    const {formatValue, formatCompactValue} = useChartLabelFormats({
-        data,
-        unit: yAxisUnit,
-        unitPosition: yAxisUnitPosition,
+        tickSpacing: shouldShowLabels && plotBounds.width > 0 ? barLayout.barWidth + barLayout.gap : 0,
+        labelAreaWidth: plotBounds.width,
+        firstTickLeftSpace: plotBounds.left + barLayout.edgeSpace,
+        lastTickRightSpace: chartWidth - plotBounds.right + barLayout.edgeSpace,
     });
 
     const barHitHalfWidth = useSharedValue(0);
@@ -110,9 +107,6 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         plotTop.set(bounds.top);
         plotBottom.set(bounds.bottom);
         yZero.set(0);
-        setBarAreaWidth(domainWidth);
-        setBoundsLeft(bounds.left);
-        setBoundsRight(bounds.right);
     };
 
     const checkIsOverBar = (args: HitTestArgs) => {
@@ -167,7 +161,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
     };
 
     const renderOutside = (args: CartesianChartRenderArg<{x: number; y: number}, 'y'>) => {
-        if (!fontManager || xAxisLabelHeight === undefined) {
+        if (xAxisLabelHeight === undefined) {
             return null;
         }
 
@@ -207,73 +201,56 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
     };
 
     const labelSpace = shouldShowLabels ? VictoryTheme.axis.xAxisLabelGap + (xAxisLabelHeight ?? 0) : 0;
-    const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
-    const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VERTICAL_BAR_DOMAIN_PADDING);
-    const chartPadding = {...VictoryTheme.axis.padding, bottom: labelSpace + VictoryTheme.axis.padding.bottom, right: yAxisLabelWidth + GLYPH_PADDING};
-
-    if (isLoading || !fontManager) {
-        return (
-            <View style={styles.chartActivityIndicator}>
-                <ActivityIndicator size="large" />
-            </View>
-        );
-    }
-
-    if (data.length === 0) {
-        return null;
-    }
+    const chartHeight = CHART_CONTENT_MIN_HEIGHT + labelSpace;
+    const chartPadding = {...VictoryTheme.axis.padding, bottom: labelSpace + VictoryTheme.axis.padding.bottom, right: chartPaddingRight};
 
     return (
         <GestureDetector
             gesture={customGestures}
             touchAction="pan-y"
         >
-            <Animated.View
-                style={[styles.chartContent, dynamicChartStyle, cursorStyle]}
-                onLayout={handleLayout}
-            >
-                {chartWidth > 0 && (
-                    <CartesianChart
-                        xKey="x"
-                        padding={chartPadding}
-                        yKeys={['y']}
-                        domain={{x: barLayout.xDomain}}
-                        domainPadding={VERTICAL_BAR_DOMAIN_PADDING}
-                        onChartBoundsChange={handleChartBoundsChange}
-                        onScaleChange={handleScaleChange}
-                        renderOutside={renderOutside}
-                        xAxis={{
-                            tickCount: data.length,
-                            lineWidth: VictoryTheme.axis.xLineWidth,
-                            // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
-                            // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
-                            labelPosition: 'inset',
-                        }}
-                        yAxis={[
-                            {
-                                tickCount: VictoryTheme.axis.tickCount,
-                                axisSide: 'right',
-                                lineWidth: 0,
-                                labelOffset: VictoryTheme.axis.labelGap,
-                                domain: yAxisDomain,
-                            },
-                        ]}
-                        frame={{lineWidth: 0}}
-                        data={chartData}
-                    >
-                        {({points, chartBounds, yScale, yTicks}) => (
-                            <>
-                                <ChartGridLines
-                                    yTicks={yTicks}
-                                    yScale={yScale}
-                                    chartBounds={chartBounds}
-                                    color={theme.border}
-                                />
-                                {points.y.map((point) => renderBar(point, chartBounds))}
-                            </>
-                        )}
-                    </CartesianChart>
-                )}
+            <Animated.View style={[styles.chartContent, StyleUtils.getHeight(chartHeight), cursorStyle]}>
+                <CartesianChart
+                    explicitSize={{width: chartWidth, height: chartHeight}}
+                    xKey="x"
+                    padding={chartPadding}
+                    yKeys={['y']}
+                    domain={{x: barLayout.xDomain}}
+                    domainPadding={VERTICAL_BAR_DOMAIN_PADDING}
+                    onChartBoundsChange={handleChartBoundsChange}
+                    onScaleChange={handleScaleChange}
+                    renderOutside={renderOutside}
+                    xAxis={{
+                        tickCount: data.length,
+                        lineWidth: VictoryTheme.axis.xLineWidth,
+                        // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
+                        // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
+                        labelPosition: 'inset',
+                    }}
+                    yAxis={[
+                        {
+                            tickCount: VictoryTheme.axis.tickCount,
+                            axisSide: 'right',
+                            lineWidth: 0,
+                            labelOffset: VictoryTheme.axis.labelGap,
+                            domain: yAxisDomain,
+                        },
+                    ]}
+                    frame={{lineWidth: 0}}
+                    data={chartData}
+                >
+                    {({points, chartBounds, yScale, yTicks}) => (
+                        <>
+                            <ChartGridLines
+                                yTicks={yTicks}
+                                yScale={yScale}
+                                chartBounds={chartBounds}
+                                color={theme.border}
+                            />
+                            {points.y.map((point) => renderBar(point, chartBounds))}
+                        </>
+                    )}
+                </CartesianChart>
                 <ChartTooltipLayer
                     matchedIndex={matchedIndex}
                     isTooltipActive={isTooltipActive}
@@ -288,4 +265,28 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
     );
 }
 
+function VerticalBarChartContentBody({isLoading = false, chartWidth, ...canvasProps}: BarChartContentProps) {
+    const styles = useThemeStyles();
+    const readyCanvas = useReadyCartesianCanvas(isLoading, chartWidth);
+
+    if (!isLoading && canvasProps.data.length === 0) {
+        return null;
+    }
+
+    if (!readyCanvas) {
+        return (
+            <View style={styles.chartActivityIndicator}>
+                <ActivityIndicator size="large" />
+            </View>
+        );
+    }
+
+    return (
+        <VerticalBarChartCanvas
+            {...canvasProps}
+            {...readyCanvas}
+        />
+    );
+}
+
 export default VerticalBarChartContentBody;
diff --git a/src/components/Charts/BarChart/index.native.tsx b/src/components/Charts/BarChart/index.native.tsx
index 63798b3dc21b..9aea26a2ab8a 100644
--- a/src/components/Charts/BarChart/index.native.tsx
+++ b/src/components/Charts/BarChart/index.native.tsx
@@ -1,3 +1,5 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
+
 import React from 'react';
 
 import type BarChartProps from './types';
@@ -5,7 +7,16 @@ import type BarChartProps from './types';
 import BarChartContent from './BarChartContent';
 
 function BarChart(props: BarChartProps) {
-    return <BarChartContent {...props} />;
+    return (
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <BarChartContent
+                    {...props}
+                    chartWidth={chartWidth}
+                />
+            )}
+        </ChartWidthBox>
+    );
 }
 
 export default BarChart;
diff --git a/src/components/Charts/BarChart/index.tsx b/src/components/Charts/BarChart/index.tsx
index 50d908c8083e..e3b165f0a3b5 100644
--- a/src/components/Charts/BarChart/index.tsx
+++ b/src/components/Charts/BarChart/index.tsx
@@ -1,3 +1,4 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
 import SkiaWebChart from '@components/Charts/SkiaWebChart';
 
 import React from 'react';
@@ -7,10 +8,14 @@ import type BarChartProps from './types';
 const getBarChartContent = () => import('./BarChartContent');
 function BarChart(props: BarChartProps) {
     return (
-        <SkiaWebChart
-            getComponent={getBarChartContent}
-            componentProps={props}
-        />
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <SkiaWebChart
+                    getComponent={getBarChartContent}
+                    componentProps={{...props, chartWidth}}
+                />
+            )}
+        </ChartWidthBox>
     );
 }
 
diff --git a/src/components/Charts/BarChart/types.ts b/src/components/Charts/BarChart/types.ts
index 064e1322dc25..88eee9d07669 100644
--- a/src/components/Charts/BarChart/types.ts
+++ b/src/components/Charts/BarChart/types.ts
@@ -7,4 +7,10 @@ type BarChartProps = CartesianChartProps & {
     shouldShowLabels?: boolean;
 };
 
+type BarChartContentProps = BarChartProps & {
+    /** Null until the card has been measured. */
+    chartWidth: number | null;
+};
+
 export default BarChartProps;
+export type {BarChartContentProps};
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index a2375540b752..c5bd5165a838 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -5,30 +5,29 @@ import ChartGridLines from '@components/Charts/components/ChartGridLines';
 import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
 import ChartXAxisLabels from '@components/Charts/components/ChartXAxisLabels';
 import ChartYAxisLabels from '@components/Charts/components/ChartYAxisLabels';
-import type {HitTestArgs} from '@components/Charts/hooks';
+import type {CartesianCanvasInputs, HitTestArgs} from '@components/Charts/hooks';
 import {
     ChartFontsProvider,
-    useChartFontManager,
     useChartInteractions,
     useChartLabelFormats,
     useChartLabelLayout,
     useChartLabelMeasurements,
     useDynamicYDomain,
     useLabelHitTesting,
+    useReadyCartesianCanvas,
 } from '@components/Charts/hooks';
-import {getDomainPaddingForEdgeSpace, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
+import {getCartesianPlotBounds, getDomainPaddingForEdgeSpace, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
 import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45} from '@components/Charts/VictoryTheme';
 
+import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import variables from '@styles/variables';
 
-import type {LayoutChangeEvent} from 'react-native';
 import type {CartesianChartRenderArg, ChartBounds, Scale} from 'victory-native';
 
 import {DashPathEffect} from '@shopify/react-native-skia';
-import React, {useState} from 'react';
 import {View} from 'react-native';
 import {GestureDetector} from 'react-native-gesture-handler';
 import Animated, {useAnimatedStyle, useDerivedValue, useSharedValue} from 'react-native-reanimated';
@@ -40,14 +39,17 @@ type LineChartProps = CartesianChartProps & {
     onPointPress?: (dataPoint: ChartDataPoint, index: number) => void;
 };
 
-function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = 'left', onPointPress}: LineChartProps) {
+type LineChartContentProps = LineChartProps & {
+    /** Null until the card has been measured. */
+    chartWidth: number | null;
+};
+
+type LineChartCanvasProps = Omit<LineChartProps, 'isLoading'> & CartesianCanvasInputs;
+
+function LineChartCanvas({data, yAxisUnit, yAxisUnitPosition = 'left', onPointPress, chartWidth, fontManager}: LineChartCanvasProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const fontManager = useChartFontManager();
-    const [chartWidth, setChartWidth] = useState(0);
-    const [plotAreaWidth, setPlotAreaWidth] = useState(0);
-    const [boundsLeft, setBoundsLeft] = useState(0);
-    const [boundsRight, setBoundsRight] = useState(0);
+    const StyleUtils = useStyleUtils();
 
     const yAxisDomain = useDynamicYDomain(data);
     const isLastPointInProgress = !!data.at(-1)?.isInProgress;
@@ -69,10 +71,6 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         }
     };
 
-    const handleLayout = (event: LayoutChangeEvent) => {
-        setChartWidth(event.nativeEvent.layout.width);
-    };
-
     const chartBottom = useSharedValue(0);
     const plotTop = useSharedValue(0);
     const plotLeft = useSharedValue(0);
@@ -90,8 +88,9 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
 
     const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VictoryTheme.line.domainPadding);
 
-    const tickSpacing = plotAreaWidth > 0 && data.length > 0 ? plotAreaWidth / data.length : 0;
     const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING;
+    const {left: boundsLeft, right: boundsRight, width: plotAreaWidth} = getCartesianPlotBounds(chartWidth, chartPaddingRight);
+    const tickSpacing = plotAreaWidth > 0 && data.length > 0 ? plotAreaWidth / data.length : 0;
 
     const domainPadding = (() => {
         if (!firstLabelWidth || !lastLabelWidth) {
@@ -124,7 +123,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         tickSpacing,
         labelAreaWidth: plotAreaWidth,
         firstTickLeftSpace: boundsLeft + domainPadding.left * paddingScale,
-        lastTickRightSpace: chartWidth > 0 ? chartWidth - boundsRight + domainPadding.right * paddingScale : 0,
+        lastTickRightSpace: chartWidth - boundsRight + domainPadding.right * paddingScale,
         measurements,
     });
 
@@ -143,9 +142,6 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         plotTop.set(bounds.top);
         plotLeft.set(bounds.left);
         plotRight.set(bounds.right);
-        setPlotAreaWidth(bounds.right - bounds.left);
-        setBoundsLeft(bounds.left);
-        setBoundsRight(bounds.right);
     };
 
     const labelSpace = VictoryTheme.axis.xAxisLabelGap + (xAxisLabelHeight ?? 0);
@@ -223,7 +219,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                         <DashPathEffect intervals={DASH_INTERVALS} />
                     </Line>
                 )}
-                {xAxisLabelHeight !== undefined && !!fontManager && (
+                {xAxisLabelHeight !== undefined && (
                     <ChartXAxisLabels
                         labels={originalLabels}
                         labelWidths={labelWidths}
@@ -240,17 +236,15 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                         chartBoundsBottom={chartBoundsBottom}
                     />
                 )}
-                {!!fontManager && (
-                    <ChartYAxisLabels
-                        yTicks={args.yTicks}
-                        yScale={args.yScale}
-                        canvasWidth={args.canvasSize.width}
-                        fontSize={variables.iconSizeExtraSmall}
-                        fontManager={fontManager}
-                        labelColor={theme.icon}
-                        formatValue={formatCompactValue}
-                    />
-                )}
+                <ChartYAxisLabels
+                    yTicks={args.yTicks}
+                    yScale={args.yScale}
+                    canvasWidth={args.canvasSize.width}
+                    fontSize={variables.iconSizeExtraSmall}
+                    fontManager={fontManager}
+                    labelColor={theme.icon}
+                    formatValue={formatCompactValue}
+                />
                 <ActivePointIndicator
                     position={activePointPosition}
                     isActive={isTooltipActive}
@@ -267,72 +261,56 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         );
     };
 
-    const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
+    const chartHeight = CHART_CONTENT_MIN_HEIGHT + labelSpace;
     const chartPadding = {
         ...VictoryTheme.axis.padding,
         bottom: labelSpace + VictoryTheme.axis.padding.bottom,
         right: chartPaddingRight,
     };
 
-    if (isLoading || !fontManager) {
-        return (
-            <View style={styles.chartActivityIndicator}>
-                <ActivityIndicator size="large" />
-            </View>
-        );
-    }
-
-    if (data.length === 0) {
-        return null;
-    }
-
     return (
         <GestureDetector
             gesture={customGestures}
             touchAction="pan-y"
         >
-            <Animated.View
-                style={[styles.chartContent, dynamicChartStyle, cursorStyle]}
-                onLayout={handleLayout}
-            >
-                {chartWidth > 0 && (
-                    <CartesianChart
-                        xKey="x"
-                        padding={chartPadding}
-                        yKeys={['y']}
-                        domainPadding={domainPadding}
-                        onChartBoundsChange={handleChartBoundsChange}
-                        onScaleChange={handleScaleChange}
-                        renderOutside={renderOutside}
-                        xAxis={{
-                            tickCount: data.length,
-                            lineWidth: VictoryTheme.axis.xLineWidth,
-                            // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
-                            // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
-                            labelPosition: 'inset',
-                        }}
-                        yAxis={[
-                            {
-                                tickCount: VictoryTheme.axis.tickCount,
-                                axisSide: 'right',
-                                lineWidth: 0,
-                                labelOffset: VictoryTheme.axis.labelGap,
-                                domain: yAxisDomain,
-                            },
-                        ]}
-                        frame={{lineWidth: 0}}
-                        data={chartData}
-                    >
-                        {({yScale, yTicks, chartBounds}) => (
-                            <ChartGridLines
-                                yTicks={yTicks}
-                                yScale={yScale}
-                                chartBounds={chartBounds}
-                                color={theme.border}
-                            />
-                        )}
-                    </CartesianChart>
-                )}
+            <Animated.View style={[styles.chartContent, StyleUtils.getHeight(chartHeight), cursorStyle]}>
+                <CartesianChart
+                    explicitSize={{width: chartWidth, height: chartHeight}}
+                    xKey="x"
+                    padding={chartPadding}
+                    yKeys={['y']}
+                    domainPadding={domainPadding}
+                    onChartBoundsChange={handleChartBoundsChange}
+                    onScaleChange={handleScaleChange}
+                    renderOutside={renderOutside}
+                    xAxis={{
+                        tickCount: data.length,
+                        lineWidth: VictoryTheme.axis.xLineWidth,
+                        // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
+                        // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
+                        labelPosition: 'inset',
+                    }}
+                    yAxis={[
+                        {
+                            tickCount: VictoryTheme.axis.tickCount,
+                            axisSide: 'right',
+                            lineWidth: 0,
+                            labelOffset: VictoryTheme.axis.labelGap,
+                            domain: yAxisDomain,
+                        },
+                    ]}
+                    frame={{lineWidth: 0}}
+                    data={chartData}
+                >
+                    {({yScale, yTicks, chartBounds}) => (
+                        <ChartGridLines
+                            yTicks={yTicks}
+                            yScale={yScale}
+                            chartBounds={chartBounds}
+                            color={theme.border}
+                        />
+                    )}
+                </CartesianChart>
                 <ChartTooltipLayer
                     matchedIndex={matchedIndex}
                     isTooltipActive={isTooltipActive}
@@ -347,7 +325,31 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
     );
 }
 
-function LineChartContent(props: LineChartProps) {
+function LineChartContentBody({isLoading = false, chartWidth, ...canvasProps}: LineChartContentProps) {
+    const styles = useThemeStyles();
+    const readyCanvas = useReadyCartesianCanvas(isLoading, chartWidth);
+
+    if (!isLoading && canvasProps.data.length === 0) {
+        return null;
+    }
+
+    if (!readyCanvas) {
+        return (
+            <View style={styles.chartActivityIndicator}>
+                <ActivityIndicator size="large" />
+            </View>
+        );
+    }
+
+    return (
+        <LineChartCanvas
+            {...canvasProps}
+            {...readyCanvas}
+        />
+    );
+}
+
+function LineChartContent(props: LineChartContentProps) {
     return (
         <ChartFontsProvider>
             <LineChartContentBody {...props} />
diff --git a/src/components/Charts/LineChart/index.native.tsx b/src/components/Charts/LineChart/index.native.tsx
index 2c6ac7c2941f..2fd8ea813de1 100644
--- a/src/components/Charts/LineChart/index.native.tsx
+++ b/src/components/Charts/LineChart/index.native.tsx
@@ -1,3 +1,5 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
+
 import React from 'react';
 
 import type {LineChartProps} from './LineChartContent';
@@ -5,7 +7,16 @@ import type {LineChartProps} from './LineChartContent';
 import LineChartContent from './LineChartContent';
 
 function LineChart(props: LineChartProps) {
-    return <LineChartContent {...props} />;
+    return (
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <LineChartContent
+                    {...props}
+                    chartWidth={chartWidth}
+                />
+            )}
+        </ChartWidthBox>
+    );
 }
 
 LineChart.displayName = 'LineChart';
diff --git a/src/components/Charts/LineChart/index.tsx b/src/components/Charts/LineChart/index.tsx
index 7de73f7fcf44..01d3da19af53 100644
--- a/src/components/Charts/LineChart/index.tsx
+++ b/src/components/Charts/LineChart/index.tsx
@@ -1,3 +1,4 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
 import SkiaWebChart from '@components/Charts/SkiaWebChart';
 
 import React from 'react';
@@ -7,10 +8,14 @@ import type {LineChartProps} from './LineChartContent';
 const getLineChartContent = () => import('./LineChartContent');
 function LineChart(props: LineChartProps) {
     return (
-        <SkiaWebChart
-            getComponent={getLineChartContent}
-            componentProps={props}
-        />
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <SkiaWebChart
+                    getComponent={getLineChartContent}
+                    componentProps={{...props, chartWidth}}
+                />
+            )}
+        </ChartWidthBox>
     );
 }
 
diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index efc9c2a6654f..001033ef9c6a 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -3,15 +3,13 @@ import ChartTooltip from '@components/Charts/components/ChartTooltip';
 import {TOOLTIP_BAR_GAP, useChartLabelFormats, useTooltipData} from '@components/Charts/hooks';
 import type {ChartDataPoint, ChartProps, PieSlice, UnitPosition} from '@components/Charts/types';
 import {findSliceAtPosition, processDataIntoSlices} from '@components/Charts/utils';
-import VictoryTheme from '@components/Charts/VictoryTheme';
+import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT} from '@components/Charts/VictoryTheme';
 import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import type {LayoutChangeEvent} from 'react-native';
-
 import React, {useState} from 'react';
 import {View} from 'react-native';
 import {Gesture, GestureDetector} from 'react-native-gesture-handler';
@@ -34,12 +32,19 @@ type PieChartProps = ChartProps & {
     shouldShowLegend?: boolean;
 };
 
-function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlicePress, shouldShowLegend = true}: PieChartProps) {
+type PieChartContentProps = PieChartProps & {
+    /** Null until the card has been measured. */
+    chartWidth: number | null;
+};
+
+type PieChartCanvasProps = Omit<PieChartProps, 'isLoading'> & {
+    chartWidth: number;
+};
+
+function PieChartCanvas({data, valueUnit, valueUnitPosition, onSlicePress, shouldShowLegend = true, chartWidth}: PieChartCanvasProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const [canvasWidth, setCanvasWidth] = useState(0);
-    const [canvasHeight, setCanvasHeight] = useState(0);
     const [activeSliceIndex, setActiveSliceIndex] = useState(-1);
     const [isHoveringOverPie, setIsHoveringOverPie] = useState(false);
 
@@ -49,15 +54,10 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     const cursorY = useSharedValue(0);
     const tooltipPosition = useSharedValue({x: 0, y: 0});
 
-    const handleLayout = (event: LayoutChangeEvent) => {
-        setCanvasWidth(event.nativeEvent.layout.width);
-        setCanvasHeight(event.nativeEvent.layout.height);
-    };
-
-    // Calculate pie geometry
-    const radius = Math.min(canvasWidth, canvasHeight) / 2;
+    const canvasHeight = CHART_CONTENT_MIN_HEIGHT;
+    const radius = Math.min(chartWidth, canvasHeight) / 2;
     const innerRadius = radius * VictoryTheme.pie.innerRadiusRatio;
-    const pieGeometry = {radius, innerRadius, centerX: canvasWidth / 2, centerY: canvasHeight / 2};
+    const pieGeometry = {radius, innerRadius, centerX: chartWidth / 2, centerY: canvasHeight / 2};
 
     // Slices are sorted by absolute value (largest first) for color assignment,
     // so slice indices don't match the original data array. We map back via
@@ -171,30 +171,16 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
         );
     };
 
-    if (isLoading) {
-        return (
-            <View style={styles.chartActivityIndicator}>
-                <ActivityIndicator size="large" />
-            </View>
-        );
-    }
-
-    if (data.length === 0) {
-        return null;
-    }
-
     return (
         <>
             <GestureDetector
                 gesture={combinedGesture}
                 touchAction="pan-y"
             >
-                <Animated.View
-                    style={[styles.chartContent, isHoveringOverPie && styles.cursorPointer]}
-                    onLayout={handleLayout}
-                >
+                <Animated.View style={[styles.chartContent, isHoveringOverPie && styles.cursorPointer]}>
                     {processedSlices.length > 0 && (
                         <PolarChart
+                            explicitSize={{width: chartWidth, height: canvasHeight}}
                             data={processedSlices}
                             labelKey="label"
                             valueKey="value"
@@ -237,7 +223,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                             amount={tooltipData.amount}
                             percentage={tooltipData.percentage}
                             expenseCount={tooltipData.expenseCount}
-                            chartWidth={canvasWidth}
+                            chartWidth={chartWidth}
                             initialTooltipPosition={tooltipPosition}
                             onChartMoved={onChartMoved}
                         />
@@ -249,5 +235,28 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     );
 }
 
+function PieChartContent({isLoading = false, chartWidth, ...canvasProps}: PieChartContentProps) {
+    const styles = useThemeStyles();
+
+    if (!isLoading && canvasProps.data.length === 0) {
+        return null;
+    }
+
+    if (isLoading || chartWidth === null) {
+        return (
+            <View style={styles.chartActivityIndicator}>
+                <ActivityIndicator size="large" />
+            </View>
+        );
+    }
+
+    return (
+        <PieChartCanvas
+            {...canvasProps}
+            chartWidth={chartWidth}
+        />
+    );
+}
+
 export default PieChartContent;
 export type {PieChartProps};
diff --git a/src/components/Charts/PieChart/index.native.tsx b/src/components/Charts/PieChart/index.native.tsx
index 961f5bdfb82c..97d224a27cbf 100644
--- a/src/components/Charts/PieChart/index.native.tsx
+++ b/src/components/Charts/PieChart/index.native.tsx
@@ -1,3 +1,5 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
+
 import React from 'react';
 
 import type {PieChartProps} from './PieChartContent';
@@ -5,7 +7,16 @@ import type {PieChartProps} from './PieChartContent';
 import PieChartContent from './PieChartContent';
 
 function PieChart(props: PieChartProps) {
-    return <PieChartContent {...props} />;
+    return (
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <PieChartContent
+                    {...props}
+                    chartWidth={chartWidth}
+                />
+            )}
+        </ChartWidthBox>
+    );
 }
 
 PieChart.displayName = 'PieChart';
diff --git a/src/components/Charts/PieChart/index.tsx b/src/components/Charts/PieChart/index.tsx
index 66999fee714f..1441e2cdc847 100644
--- a/src/components/Charts/PieChart/index.tsx
+++ b/src/components/Charts/PieChart/index.tsx
@@ -1,3 +1,4 @@
+import ChartWidthBox from '@components/Charts/components/ChartWidthBox';
 import SkiaWebChart from '@components/Charts/SkiaWebChart';
 
 import React from 'react';
@@ -8,10 +9,14 @@ const getPieChartContent = () => import('./PieChartContent');
 
 function PieChart(props: PieChartProps) {
     return (
-        <SkiaWebChart
-            getComponent={getPieChartContent}
-            componentProps={props}
-        />
+        <ChartWidthBox>
+            {(chartWidth) => (
+                <SkiaWebChart
+                    getComponent={getPieChartContent}
+                    componentProps={{...props, chartWidth}}
+                />
+            )}
+        </ChartWidthBox>
     );
 }
 
diff --git a/src/components/Charts/components/ChartWidthBox.tsx b/src/components/Charts/components/ChartWidthBox.tsx
new file mode 100644
index 000000000000..274aecd049f1
--- /dev/null
+++ b/src/components/Charts/components/ChartWidthBox.tsx
@@ -0,0 +1,28 @@
+import useContainerWidth from '@hooks/useContainerWidth';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {ReactNode} from 'react';
+
+import {View} from 'react-native';
+
+type ChartWidthBoxProps = {
+    /** Receives the card's width, or null until the card has been measured. */
+    children: (chartWidth: number | null) => ReactNode;
+};
+
+/** On web the chart component mounts only once the chart engine has downloaded, so measuring here keeps the width across that mount. */
+function ChartWidthBox({children}: ChartWidthBoxProps) {
+    const styles = useThemeStyles();
+    const {onLayout, containerWidth} = useContainerWidth();
+
+    return (
+        <View
+            style={styles.w100}
+            onLayout={onLayout}
+        >
+            {children(containerWidth > 0 ? containerWidth : null)}
+        </View>
+    );
+}
+
+export default ChartWidthBox;
diff --git a/src/components/Charts/hooks/index.ts b/src/components/Charts/hooks/index.ts
index 5fa23151604b..e7b098c98e74 100644
--- a/src/components/Charts/hooks/index.ts
+++ b/src/components/Charts/hooks/index.ts
@@ -9,3 +9,5 @@ export {default as useChartLabelFormats} from './useChartLabelFormats';
 export {default as useDynamicYDomain} from './useDynamicYDomain';
 export {default as useTooltipData} from './useTooltipData';
 export {default as useLabelHitTesting} from './useLabelHitTesting';
+export {default as useReadyCartesianCanvas} from './useReadyCartesianCanvas';
+export type {CartesianCanvasInputs} from './useReadyCartesianCanvas';
diff --git a/src/components/Charts/hooks/useReadyCartesianCanvas.ts b/src/components/Charts/hooks/useReadyCartesianCanvas.ts
new file mode 100644
index 000000000000..13e7d3288bfa
--- /dev/null
+++ b/src/components/Charts/hooks/useReadyCartesianCanvas.ts
@@ -0,0 +1,21 @@
+import {useChartFontManager} from '@components/Charts/context/ChartFontsContext';
+
+import type {SkTypefaceFontProvider} from '@shopify/react-native-skia';
+
+type CartesianCanvasInputs = {
+    chartWidth: number;
+    fontManager: SkTypefaceFontProvider;
+};
+
+function useReadyCartesianCanvas(isLoading: boolean, chartWidth: number | null): CartesianCanvasInputs | null {
+    const fontManager = useChartFontManager();
+
+    if (isLoading || !fontManager || chartWidth === null) {
+        return null;
+    }
+
+    return {chartWidth, fontManager};
+}
+
+export default useReadyCartesianCanvas;
+export type {CartesianCanvasInputs};
diff --git a/src/components/Charts/utils/index.ts b/src/components/Charts/utils/index.ts
index eb3592f32242..64af6dbac027 100644
--- a/src/components/Charts/utils/index.ts
+++ b/src/components/Charts/utils/index.ts
@@ -445,6 +445,16 @@ function getBarLayout(plotWidth: number, barCount: number): {barWidth: number; g
     return {barWidth, gap, edgeSpace, xDomain: [-edgeSpaceInXUnits, barCount - 1 + edgeSpaceInXUnits]};
 }
 
+/**
+ * Horizontal plot bounds of a cartesian chart with its y axis on the right, mirroring victory-native's layout,
+ * so labels can be laid out from the width before the chart mounts.
+ */
+function getCartesianPlotBounds(chartWidth: number, paddingRight: number): {left: number; right: number; width: number} {
+    const left = VictoryTheme.axis.padding.left;
+    const right = Math.max(left, chartWidth - paddingRight - VictoryTheme.axis.labelGap);
+    return {left, right, width: right - left};
+}
+
 /**
  * Domain padding that leaves `edgeSpace` px between the plot edges and the first and last points.
  * victory-native fits the padded domain back into the plot width, so the space on screen is smaller than the padding.
@@ -503,6 +513,7 @@ export {
     isCursorOverChartLabel,
     getNiceYAxisTicks,
     getYAxisLabelWidth,
+    getCartesianPlotBounds,
     getBarLayout,
     getDomainPaddingForEdgeSpace,
 };
diff --git a/tests/unit/components/Charts/chartWidthHandoff.test.tsx b/tests/unit/components/Charts/chartWidthHandoff.test.tsx
new file mode 100644
index 000000000000..cd4bc4c76dd0
--- /dev/null
+++ b/tests/unit/components/Charts/chartWidthHandoff.test.tsx
@@ -0,0 +1,94 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ActivityIndicator from '@components/ActivityIndicator';
+import BarChart from '@components/Charts/BarChart';
+import LineChart from '@components/Charts/LineChart';
+import PieChart from '@components/Charts/PieChart';
+import type {ChartDataPoint} from '@components/Charts/types';
+import {CHART_CONTENT_MIN_HEIGHT} from '@components/Charts/VictoryTheme';
+
+import React from 'react';
+import {PolarChart} from 'victory-native';
+
+const CONTAINER_WIDTH = 320;
+
+const data: ChartDataPoint[] = [
+    {label: 'Amazon', total: 120},
+    {label: 'Uber', total: 80},
+];
+
+function getMeasuredBox() {
+    let node = screen.UNSAFE_getByType(ActivityIndicator).parent;
+
+    while (node) {
+        if (typeof node.props.onLayout === 'function') {
+            return node;
+        }
+        node = node.parent;
+    }
+
+    throw new Error('the loading spinner has no ancestor reporting its layout');
+}
+
+describe('chart width handoff', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it.each([
+        ['bar', BarChart],
+        ['line', LineChart],
+    ])('should measure the %s chart width while the chart is still loading', (_name, Chart) => {
+        // Given a chart whose data has not arrived yet
+        const loadingChart = (
+            <Chart
+                data={data}
+                isLoading
+            />
+        );
+
+        // When it renders its loading state
+        render(loadingChart);
+
+        // Then the spinner already sits inside the box that measures the width,
+        // so the width is known by the time the data arrives and the chart can be sized in the pass it mounts in
+        expect(getMeasuredBox()).toBeTruthy();
+    });
+
+    it('should hand the pie chart the width measured while it was loading', () => {
+        // Given a loading pie chart whose box has been measured
+        const {rerender} = render(
+            <PieChart
+                data={data}
+                isLoading
+            />,
+        );
+        fireEvent(getMeasuredBox(), 'layout', {nativeEvent: {layout: {width: CONTAINER_WIDTH, height: CHART_CONTENT_MIN_HEIGHT}}});
+
+        // When the data arrives
+        rerender(
+            <PieChart
+                data={data}
+                isLoading={false}
+            />,
+        );
+
+        // Then the chart mounts with that size instead of measuring itself, which would cost it a render with no content
+        expect(PolarChart).toHaveBeenCalledWith(expect.objectContaining({explicitSize: {width: CONTAINER_WIDTH, height: CHART_CONTENT_MIN_HEIGHT}}), undefined);
+    });
+
+    it('should keep the pie chart under the spinner until a width has been measured', () => {
+        // Given a pie chart whose box has not reported a layout yet
+        // When it renders with its data
+        render(
+            <PieChart
+                data={data}
+                isLoading={false}
+            />,
+        );
+
+        // Then the spinner stays and the chart does not mount, because it can only be sized once the width is known
+        expect(PolarChart).not.toHaveBeenCalled();
+        expect(screen.UNSAFE_queryByType(ActivityIndicator)).not.toBeNull();
+    });
+});
diff --git a/tests/unit/components/Charts/utils.test.ts b/tests/unit/components/Charts/utils.test.ts
index f11eb3b8e99b..4e4af99d3133 100644
--- a/tests/unit/components/Charts/utils.test.ts
+++ b/tests/unit/components/Charts/utils.test.ts
@@ -10,6 +10,7 @@ import {
     getAdditionalOffset,
     getDomainPaddingForEdgeSpace,
     getNiceYAxisTicks,
+    getCartesianPlotBounds,
     isAngleInSlice,
     isCursorInSkewedLabel,
     isCursorOverChartLabel,
@@ -751,6 +752,30 @@ describe('getBarLayout', () => {
     });
 });
 
+describe('getCartesianPlotBounds', () => {
+    const LABEL_GAP = VictoryTheme.axis.labelGap;
+    const PADDING_LEFT = VictoryTheme.axis.padding.left;
+
+    it('reserves the right gutter for labels and the left base padding', () => {
+        // Given a 300px container with a 30px right gutter
+        // When computing the plot bounds
+        // Then the plot spans from the left padding to the label gap before the gutter, where victory-native puts it,
+        // so labels laid out before the chart mounts line up with the plot it draws
+        expect(getCartesianPlotBounds(300, 30)).toEqual({left: PADDING_LEFT, right: 300 - 30 - LABEL_GAP, width: 300 - 30 - LABEL_GAP - PADDING_LEFT});
+    });
+
+    it('clamps to a zero-width plot when the container is too small for the gutters', () => {
+        // Given a container narrower than the right gutter itself
+        // When computing the plot bounds
+        // Then the plot collapses to zero width at the left padding, because a negative width would break the bar and
+        // label layouts that are sized from it
+        const bounds = getCartesianPlotBounds(10, 30);
+        expect(bounds.left).toBe(PADDING_LEFT);
+        expect(bounds.right).toBe(PADDING_LEFT);
+        expect(bounds.width).toBe(0);
+    });
+});
+
 describe('getDomainPaddingForEdgeSpace', () => {
     it('returns the padding victory-native shrinks back to the requested edge space', () => {
         // Given a 200px plot and the space wanted before the first and after the last point

From 654e67a28494ed4d76e72e5667fa9a2b618e2203 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Sun, 11 Oct 2026 21:14:49 +0000
Subject: [PATCH 438/781] Mark the report as read after scrolling to the user's
 own comment

Without this, the New divider stayed visible and the unread marker turned the New messages pill back on after the scroll.

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 src/hooks/useReportActionsScroll.ts           |  1 +
 .../useReportActionsNewActionLiveTail.ts      | 10 +++++++
 .../useReportActionsNewActionLiveTailTest.ts  | 29 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index cc9d6bc988e0..d8942cb0dac9 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -242,6 +242,7 @@ function useReportActionsScroll({
         reportScrollManager,
         setIsFloatingMessageCounterVisible,
         setActionIdToHighlight,
+        markNewestActionAsRead,
         unreadMarkerReportActionID,
         hasNewerActions,
         linkedReportActionID,
diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 10efdd623565..86a76484bbe0 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -44,6 +44,7 @@ type UseReportActionsNewActionLiveTailParams = {
     reportScrollManager: ReportScrollManager;
     setIsFloatingMessageCounterVisible: (visible: boolean) => void;
     setActionIdToHighlight: (actionID: string) => void;
+    markNewestActionAsRead: () => void;
     unreadMarkerReportActionID: string | null;
     hasNewerActions: boolean;
     linkedReportActionID: string | undefined;
@@ -75,6 +76,7 @@ function useReportActionsNewActionLiveTail({
     reportScrollManager,
     setIsFloatingMessageCounterVisible,
     setActionIdToHighlight,
+    markNewestActionAsRead,
     unreadMarkerReportActionID,
     hasNewerActions,
     linkedReportActionID,
@@ -93,6 +95,12 @@ function useReportActionsNewActionLiveTail({
     const liveTailJumpRef = useRef<{stage: LiveTailJumpStage}>({stage: 'idle'});
     const [isScrollToBottomEnabled, setIsScrollToBottomEnabled] = useState(false);
 
+    // Scrolling to the user's own comment must also mark the report as read. Otherwise the "New" divider stays, and the
+    // unread marker it leaves behind turns the "New messages" pill back on. An effect event keeps it out of effect deps.
+    const markAsReadAfterScroll = useEffectEvent(() => {
+        markNewestActionAsRead();
+    });
+
     const scrollToBottomForCurrentUserAction = useEffectEvent((isFromCurrentUser: boolean, action?: OnyxTypes.ReportAction) => {
         TransitionTracker.runAfterTransitions({
             callback: () => {
@@ -150,6 +158,7 @@ function useReportActionsNewActionLiveTail({
                 } else {
                     setIsFloatingMessageCounterVisible(false);
                     reportScrollManager.scrollToBottom();
+                    markAsReadAfterScroll();
                 }
 
                 setIsScrollToBottomEnabled(true);
@@ -207,6 +216,7 @@ function useReportActionsNewActionLiveTail({
 
         liveTailJumpRef.current = {stage: 'await_prune'};
         setIsFloatingMessageCounterVisible(false);
+        markAsReadAfterScroll();
         // Defer so this effect does not synchronously chain a second render from setState (eslint react-hooks/set-state-in-effect).
         queueMicrotask(() => {
             setIsScrollToBottomEnabled(true);
diff --git a/tests/unit/useReportActionsNewActionLiveTailTest.ts b/tests/unit/useReportActionsNewActionLiveTailTest.ts
index 3b2f63e6df8b..faeaff36742e 100644
--- a/tests/unit/useReportActionsNewActionLiveTailTest.ts
+++ b/tests/unit/useReportActionsNewActionLiveTailTest.ts
@@ -99,6 +99,7 @@ function buildParams(overrides: Partial<HookParams> = {}): HookParams {
         reportScrollManager,
         setIsFloatingMessageCounterVisible: jest.fn(),
         setActionIdToHighlight: jest.fn(),
+        markNewestActionAsRead: jest.fn(),
         unreadMarkerReportActionID: null,
         hasNewerActions: true,
         linkedReportActionID: undefined,
@@ -213,8 +214,9 @@ describe('useReportActionsNewActionLiveTail', () => {
     it('scrolls straight to the bottom when an unread marker is set but the newest actions are already loaded', () => {
         // Given a report scrolled up with an unread marker from another user's comment, and the newest actions already loaded
         const setIsFloatingMessageCounterVisible = jest.fn();
+        const markNewestActionAsRead = jest.fn();
         const {result} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
-            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: true, setIsFloatingMessageCounterVisible}),
+            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: true, setIsFloatingMessageCounterVisible, markNewestActionAsRead}),
         });
 
         // When the current user sends a comment
@@ -227,6 +229,31 @@ describe('useReportActionsNewActionLiveTail', () => {
         expect(setIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
         expect(reportScrollManager.scrollToBottom).toHaveBeenCalledTimes(1);
         expect(result.current.isScrollToBottomEnabled).toBe(true);
+
+        // And the report is marked as read, so the "New" divider clears and the pill doesn't come back
+        expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
+    });
+
+    it('marks the report as read once openReport has loaded the newest actions after the user sends a comment', () => {
+        // Given a report whose newest actions are not loaded yet
+        const markNewestActionAsRead = jest.fn();
+        const {rerender} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {initialProps: buildParams({markNewestActionAsRead})});
+
+        // When the current user sends a comment, which starts the live-tail jump through openReport
+        act(() => {
+            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
+        });
+
+        // Then nothing is marked as read while the newest actions are still loading
+        expect(mockOpenReport).toHaveBeenCalledTimes(1);
+        expect(markNewestActionAsRead).not.toHaveBeenCalled();
+
+        // When openReport finishes and the newest actions arrive
+        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}));
+        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: false, reportLoadingState: {isLoadingInitialReportActions: false}, hasNewestReportAction: true}));
+
+        // Then the report is marked as read once, alongside hiding the pill
+        expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
     });
 
     it('still loads the live tail when an unread marker is set and the newest actions are not loaded', () => {

From 5bf4aafe36b0fdabd5f3cdcd1b5037270a6832f5 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Sun, 11 Oct 2026 22:01:18 +0000
Subject: [PATCH 439/781] Regenerate GitHub Actions compiled files after clean
 install

---
 .../javascript/authorChecklist/index.js       |  901 ++++++++++----
 .../javascript/awaitStagingDeploys/index.js   |  901 ++++++++++----
 .../actions/javascript/bumpVersion/index.js   |  901 ++++++++++----
 .../javascript/checkAndroidStatus/index.js    |  903 ++++++++++----
 .../javascript/checkDeployBlockers/index.js   |  901 ++++++++++----
 .../javascript/checkSVGCompression/index.js   |  901 ++++++++++----
 .../javascript/failureNotifier/index.js       |  901 ++++++++++----
 .../javascript/formatCodeCovComment/index.js  |  901 ++++++++++----
 .../generateHelpPreviewComment/index.js       |  901 ++++++++++----
 .../getAndroidRolloutPercentage/index.js      |  903 ++++++++++----
 .../javascript/getArtifactInfo/index.js       |  901 ++++++++++----
 .../getDeployPullRequestList/index.js         |  901 ++++++++++----
 .../javascript/getPreviousVersion/index.js    |  901 ++++++++++----
 .../javascript/getPullRequestDetails/index.js |  901 ++++++++++----
 .../getPullRequestIncrementalChanges/index.js |  901 ++++++++++----
 .../isAuthorizedContributor/index.js          |  901 ++++++++++----
 .../isDeployChecklistLocked/index.js          | 1054 +++++++++++++----
 .../markPullRequestsAsDeployed/index.js       |  901 ++++++++++----
 .../javascript/postOrReplaceComment/index.js  |  901 ++++++++++----
 .../javascript/proposalPoliceComment/index.js | 1054 +++++++++++++----
 .../reopenIssueWithComment/index.js           |  901 ++++++++++----
 .../javascript/reviewerChecklist/index.js     |  901 ++++++++++----
 .../validateReassureOutput/index.js           |  901 ++++++++++----
 .../javascript/verifySignedCommits/index.js   |  901 ++++++++++----
 .../verifyStagingBuildsSucceeded/index.js     |  901 ++++++++++----
 25 files changed, 17075 insertions(+), 5760 deletions(-)

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index f76542955ddf..b06a43adc37e 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index 906a5fe20da8..00e2f735fcb4 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
index 479e50a322da..c2258fb0a82d 100644
--- a/.github/actions/javascript/bumpVersion/index.js
+++ b/.github/actions/javascript/bumpVersion/index.js
@@ -2312,10 +2312,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -2382,7 +2438,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -2394,6 +2454,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2503,13 +2566,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -6116,6 +6187,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -6162,6 +6234,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -6324,24 +6399,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -6361,6 +6467,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6404,7 +6514,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -6429,9 +6539,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6440,6 +6551,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6565,6 +6680,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6608,12 +6724,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6628,7 +6751,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6636,9 +6762,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6687,7 +6814,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6705,6 +6832,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6717,6 +6861,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6747,8 +6914,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6769,11 +6944,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -7129,6 +7311,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -7189,6 +7372,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -7352,16 +7539,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -7376,18 +7569,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7948,9 +8165,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8456,8 +8674,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8628,7 +8846,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8649,6 +8866,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8848,7 +9066,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8858,6 +9075,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -9298,6 +9516,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -9351,6 +9587,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -9360,6 +9597,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -9421,7 +9669,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9470,9 +9720,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9480,6 +9742,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9487,6 +9750,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9506,6 +9774,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9533,7 +9802,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -16332,14 +16601,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -16422,7 +16725,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16552,18 +16859,14 @@ var require_parse2 = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -17385,7 +17688,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17491,31 +17794,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17534,20 +17832,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17557,19 +17847,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17600,8 +17888,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17609,18 +17903,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17635,6 +17932,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17694,6 +17998,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17714,6 +18021,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17727,6 +18037,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17737,32 +18050,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17805,6 +18132,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -18016,8 +18363,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -18061,9 +18406,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -18247,7 +18589,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -18322,19 +18670,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -18413,6 +18748,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -18432,10 +18801,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18466,63 +18838,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18531,17 +18870,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18557,43 +18895,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18618,12 +18955,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkAndroidStatus/index.js b/.github/actions/javascript/checkAndroidStatus/index.js
index cf13138d08ce..de9e0e53ebc4 100644
--- a/.github/actions/javascript/checkAndroidStatus/index.js
+++ b/.github/actions/javascript/checkAndroidStatus/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 2ca391c52c00..c59c854097c1 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/checkSVGCompression/index.js b/.github/actions/javascript/checkSVGCompression/index.js
index 1bd2d9dfd701..cad1560febba 100644
--- a/.github/actions/javascript/checkSVGCompression/index.js
+++ b/.github/actions/javascript/checkSVGCompression/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/failureNotifier/index.js b/.github/actions/javascript/failureNotifier/index.js
index 7eedc830062e..208e6286e656 100644
--- a/.github/actions/javascript/failureNotifier/index.js
+++ b/.github/actions/javascript/failureNotifier/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/formatCodeCovComment/index.js b/.github/actions/javascript/formatCodeCovComment/index.js
index 133b8de4b0d2..9aac21e43b56 100644
--- a/.github/actions/javascript/formatCodeCovComment/index.js
+++ b/.github/actions/javascript/formatCodeCovComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/generateHelpPreviewComment/index.js b/.github/actions/javascript/generateHelpPreviewComment/index.js
index 4fffa145a897..222ea227535c 100644
--- a/.github/actions/javascript/generateHelpPreviewComment/index.js
+++ b/.github/actions/javascript/generateHelpPreviewComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request2, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request2, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getAndroidRolloutPercentage/index.js b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
index e970b3649819..1abd092e27ea 100644
--- a/.github/actions/javascript/getAndroidRolloutPercentage/index.js
+++ b/.github/actions/javascript/getAndroidRolloutPercentage/index.js
@@ -1875,10 +1875,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1945,7 +2001,11 @@ var require_request = __commonJS({
           } else if (typeof val[i2] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i2]}`);
+            const str = `${val[i2]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1957,6 +2017,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2066,13 +2129,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5679,6 +5750,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5725,6 +5797,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5887,24 +5962,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5924,6 +6030,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5967,7 +6077,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5992,9 +6102,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error) {
+          util.errorRequest(client, request, error);
+          util.destroy(socket, error);
         }
         client[kResume]();
       }
@@ -6003,6 +6114,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6128,6 +6243,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6171,12 +6287,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6191,7 +6314,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6199,9 +6325,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6250,7 +6377,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6268,6 +6395,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6280,6 +6424,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6310,8 +6477,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6332,11 +6507,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error) => {
+        if (request.aborted) {
+          return;
+        }
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        util.errorRequest(client, request, error || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6692,6 +6874,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline: pipeline2 } = __require("node:stream");
     var util = require_util();
     var {
@@ -6752,6 +6935,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6915,16 +7102,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error || new RequestAbortedError());
+          }
+          return;
+        }
+        error = error || new RequestAbortedError();
+        util.errorRequest(client, request, error);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error);
         }
-        util.destroy(body, err);
+        util.destroy(body, error);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6939,18 +7132,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error) {
+            stream.off("response", onResponse);
+            abort(error);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7511,9 +7728,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8019,8 +8237,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8191,7 +8409,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8212,6 +8429,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8411,7 +8629,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8421,6 +8638,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8861,6 +9079,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8914,6 +9150,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8923,6 +9160,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8984,7 +9232,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9033,9 +9283,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9043,6 +9305,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9050,6 +9313,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9069,6 +9337,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9096,7 +9365,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15895,14 +16164,48 @@ var require_util6 = __commonJS({
       for (let i2 = 0; i2 < path.length; ++i2) {
         const code = path.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i2 = 0; i2 < domain.length; ++i2) {
+        const code = domain.charCodeAt(i2);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i2 - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15985,7 +16288,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16115,18 +16422,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16948,7 +17251,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17054,31 +17357,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17097,20 +17395,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17120,19 +17410,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17163,8 +17451,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17172,18 +17466,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17198,6 +17495,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17257,6 +17561,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17277,6 +17584,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17290,6 +17600,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower2;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17300,32 +17613,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error, data) => {
-                  if (error) {
-                    failWebsocketConnection(this.ws, error.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error, data) => {
+                    if (error) {
+                      const code = error instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17368,6 +17695,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17579,8 +17926,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17624,9 +17969,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17810,7 +18152,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17885,19 +18233,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17976,6 +18311,40 @@ var require_eventsource_stream = __commonJS({
     var CR2 = 13;
     var COLON2 = 58;
     var SPACE2 = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] < 48 || buffer[i2] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i2 = start; i2 < buffer.length; i2++) {
+        if (buffer[i2] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i2 = 0; i2 < length; i2++) {
+        if (line[i2] !== field[i2]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17995,10 +18364,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18029,63 +18401,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF2) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF2) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-              if (this.buffer[this.pos] === CR2) {
+            if (byte === LF2 || byte === CR2) {
+              if (byte === CR2) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18094,17 +18433,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF2 || this.buffer[this.pos] === CR2) {
-            if (this.buffer[this.pos] === CR2) {
+          if (byte === LF2 || byte === CR2) {
+            if (byte === CR2) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18120,43 +18458,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE2) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18181,12 +18518,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i2 = this.lineChunkIndex; i2 <= this.chunkIndex; i2++) {
+          const chunk = this.chunks[i2];
+          const start = i2 === this.lineChunkIndex ? this.linePos : 0;
+          const end = i2 === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index 1d7315a4ae65..b511ee174521 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 86ebf2b747d2..c6a083ec32cf 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
index 0343158e5a02..dc48a205f79b 100644
--- a/.github/actions/javascript/getPreviousVersion/index.js
+++ b/.github/actions/javascript/getPreviousVersion/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index 78b36a004849..b7443787fc9b 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
index 21c54003dde2..e868a069ae7e 100644
--- a/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
+++ b/.github/actions/javascript/getPullRequestIncrementalChanges/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error3) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error3 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error3) {
+          util.errorRequest(client, request2, error3);
+          util.destroy(socket, error3);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error3) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error3 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error3) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error3 || new RequestAbortedError());
+          }
+          return;
+        }
+        error3 = error3 || new RequestAbortedError();
+        util.errorRequest(client, request2, error3);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error3);
         }
-        util.destroy(body, err);
+        util.destroy(body, error3);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error3) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error3);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error3) {
+            stream.off("response", onResponse);
+            abort(error3);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error3, data) => {
-                  if (error3) {
-                    failWebsocketConnection(this.ws, error3.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error3, data) => {
+                    if (error3) {
+                      const code = error3 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error3.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isAuthorizedContributor/index.js b/.github/actions/javascript/isAuthorizedContributor/index.js
index fea991ad887f..d43a19fced4c 100644
--- a/.github/actions/javascript/isAuthorizedContributor/index.js
+++ b/.github/actions/javascript/isAuthorizedContributor/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/isDeployChecklistLocked/index.js b/.github/actions/javascript/isDeployChecklistLocked/index.js
index b1e68e9965bf..9321db05e6d7 100644
--- a/.github/actions/javascript/isDeployChecklistLocked/index.js
+++ b/.github/actions/javascript/isDeployChecklistLocked/index.js
@@ -23112,6 +23112,7 @@ var require_ExpensiMark = __commonJS({
     var Constants = __importStar(require_CONST());
     var UrlPatterns = __importStar(require_Url());
     var Logger_1 = __importDefault(require_Logger());
+    var tlds_1 = __importDefault(require_tlds());
     var Utils = __importStar(require_utils());
     var EXTRAS_DEFAULT = {};
     var ASCII_DIGIT_START = "0".charCodeAt(0);
@@ -23124,6 +23125,9 @@ var require_ExpensiMark = __commonJS({
     var NON_BREAKING_SPACE_CODE = 160;
     var URL_PROTOCOLS = ["https://", "http://", "ftps://", "ftp://"];
     var URL_CANDIDATE_PREFIX_CHARACTERS = "@_*~";
+    var URL_TLD_LIST = tlds_1.default.toLowerCase().split("|");
+    var URL_TLDS = new Set(URL_TLD_LIST);
+    var MAX_URL_TLD_LENGTH = Math.max(...URL_TLD_LIST.map((tld) => tld.length));
     var PROTECTED_TAG_NAMES = /* @__PURE__ */ new Set(["a", "code", "pre", "video"]);
     var MARKDOWN_LINK_REGEX = new RegExp(`\\[((?:[^\\[\\]\\r\\n]*(?:\\[[^\\[\\]\\r\\n]*][^\\[\\]\\r\\n]*)*))]\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, "gi");
     var MARKDOWN_IMAGE_REGEX = new RegExp(`\\!(?:\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)])?\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, "gi");
@@ -23169,6 +23173,9 @@ var require_ExpensiMark = __commonJS({
       }
       return text.replace(regexp, replacement);
     }
+    function canUseCandidateScanning(text, shouldEscapeText) {
+      return shouldEscapeText || !text.includes("<") && !text.includes(">");
+    }
     function isAsciiAlphaNumeric(character) {
       if (!character) {
         return false;
@@ -23240,15 +23247,59 @@ var require_ExpensiMark = __commonJS({
       }
       return URL_PROTOCOLS.find((protocol) => text.slice(position, position + protocol.length).toLowerCase() === protocol);
     }
-    function findHostnameEnd(text, hostnameStart, dotPosition) {
-      let hostnameEnd = dotPosition + 1;
-      while (hostnameEnd < text.length && (isAsciiAlphaNumeric(text[hostnameEnd]) || text[hostnameEnd] === "-")) {
-        hostnameEnd++;
+    function isValidHostnameLabel(text, start, end) {
+      if (start >= end || !isAsciiAlphaNumeric(text[start]) || !isAsciiAlphaNumeric(text[end - 1])) {
+        return false;
       }
-      if (hostnameStart === dotPosition || hostnameEnd === dotPosition + 1) {
-        return void 0;
+      for (let index = start + 1; index < end - 1; index++) {
+        if (!isAsciiAlphaNumeric(text[index]) && text[index] !== "-") {
+          return false;
+        }
+      }
+      return true;
+    }
+    function findHostnameStart(text, dotPosition) {
+      let hostnameStart = dotPosition;
+      let labelEnd = dotPosition;
+      while (labelEnd > 0) {
+        let rawLabelStart = labelEnd - 1;
+        while (rawLabelStart >= 0 && text[rawLabelStart] !== "." && isHostnameCharacter(text[rawLabelStart])) {
+          rawLabelStart--;
+        }
+        rawLabelStart++;
+        let labelStart = rawLabelStart;
+        while (labelStart < labelEnd && text[labelStart] === "-") {
+          labelStart++;
+        }
+        if (!isValidHostnameLabel(text, labelStart, labelEnd)) {
+          break;
+        }
+        hostnameStart = labelStart;
+        if (labelStart !== rawLabelStart) {
+          break;
+        }
+        const separatorPosition = labelStart - 1;
+        if (separatorPosition < 0 || text[separatorPosition] !== ".") {
+          break;
+        }
+        labelEnd = separatorPosition;
       }
-      return hostnameEnd;
+      return hostnameStart === dotPosition ? void 0 : hostnameStart;
+    }
+    function findKnownTldEnd(text, dotPosition) {
+      const maximumEnd = Math.min(text.length, dotPosition + 1 + MAX_URL_TLD_LENGTH);
+      for (let end = dotPosition + 2; end <= maximumEnd; end++) {
+        const currentCharacter = text[end - 1];
+        if (!isAsciiAlphaNumeric(currentCharacter) && currentCharacter !== "-") {
+          break;
+        }
+        const nextCharacter = text[end];
+        const hasValidBoundary = !nextCharacter || nextCharacter === ":" || nextCharacter === "_" || !isWordCharacter(nextCharacter);
+        if (hasValidBoundary && URL_TLDS.has(text.slice(dotPosition + 1, end).toLowerCase())) {
+          return end;
+        }
+      }
+      return void 0;
     }
     function extendUrlCandidateBoundaries(text, start, end) {
       let candidateStart = start;
@@ -23261,24 +23312,65 @@ var require_ExpensiMark = __commonJS({
       }
       return { start: candidateStart, end: candidateEnd };
     }
+    function startsWithIgnoreCase(text, expected, position) {
+      return text.slice(position, position + expected.length).toLowerCase() === expected;
+    }
+    function filterUrlCandidatesBlockedByFollowingHtml(text, candidates) {
+      var _a;
+      if (candidates.length === 0 || !text.includes("<") && !text.includes(">")) {
+        return candidates;
+      }
+      const validCandidates = [];
+      let candidateIndex = candidates.length - 1;
+      let nextLessThan = text.length;
+      let nextGreaterThan = text.length;
+      let nextOpeningAnchor = text.length;
+      let nextClosingAnchor = text.length;
+      for (let index = text.length; index >= 0 && candidateIndex >= 0; index--) {
+        if (text[index] === "<") {
+          nextLessThan = index;
+          if (((_a = text[index + 1]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "a") {
+            nextOpeningAnchor = index;
+          } else if (startsWithIgnoreCase(text, "</a>", index)) {
+            nextClosingAnchor = index;
+          }
+        } else if (text[index] === ">") {
+          nextGreaterThan = index;
+        }
+        while (candidateIndex >= 0 && candidates[candidateIndex].end === index) {
+          const firstHtmlBoundaryIsClosingTag = nextLessThan < nextGreaterThan && text.startsWith("</", nextLessThan) && !startsWithIgnoreCase(text, "</h1>", nextLessThan);
+          const firstTagIsProtectedClosingTag = startsWithIgnoreCase(text, "</pre>", nextLessThan) || startsWithIgnoreCase(text, "</code>", nextLessThan);
+          const isBlockedByFollowingHtml = (
+            // Mirrors `(?![^<]*>)`: reject when `>` appears before the next `<`.
+            nextGreaterThan < nextLessThan || // Mirrors `[^<>]*<\/(?!h1>)`: reject a later closing tag other than `</h1>`.
+            firstHtmlBoundaryIsClosingTag || // Mirrors `((?:(?!<a).)+)?<\/a>`: reject `</a>` unless another `<a>` appears first.
+            nextClosingAnchor < nextOpeningAnchor || // Mirrors `[^<]*(<\/pre>|<\/code>)`: reject a later protected closing tag.
+            firstTagIsProtectedClosingTag
+          );
+          if (!isBlockedByFollowingHtml) {
+            validCandidates.push(candidates[candidateIndex]);
+          }
+          candidateIndex--;
+        }
+      }
+      return validCandidates.reverse();
+    }
     function findUrlCandidates(text) {
       const candidates = [];
       const protectedTags = [];
       let index = 0;
-      let hostnameRunStart = 0;
       while (index < text.length) {
         if (text[index] === "<") {
           const nextIndex = updateProtectedTagStack(text, index, protectedTags);
           if (nextIndex === void 0) {
-            break;
+            index++;
+            continue;
           }
           index = nextIndex;
-          hostnameRunStart = index;
           continue;
         }
         if (protectedTags.length > 0) {
           index++;
-          hostnameRunStart = index;
           continue;
         }
         const matchedProtocol = getProtocolAt(text, index);
@@ -23286,29 +23378,23 @@ var require_ExpensiMark = __commonJS({
           const candidate2 = extendUrlCandidateBoundaries(text, index, index + matchedProtocol.length);
           candidates.push(candidate2);
           index = candidate2.end;
-          hostnameRunStart = candidate2.end;
-          continue;
-        }
-        if (!isHostnameCharacter(text[index])) {
-          hostnameRunStart = index + 1;
-          index++;
           continue;
         }
         if (text[index] !== ".") {
           index++;
           continue;
         }
-        const hostnameEnd = findHostnameEnd(text, hostnameRunStart, index);
-        if (hostnameEnd === void 0) {
+        const tldEnd = findKnownTldEnd(text, index);
+        const hostnameStart = tldEnd === void 0 ? void 0 : findHostnameStart(text, index);
+        if (tldEnd === void 0 || hostnameStart === void 0) {
           index++;
           continue;
         }
-        const candidate = extendUrlCandidateBoundaries(text, hostnameRunStart, hostnameEnd);
+        const candidate = extendUrlCandidateBoundaries(text, hostnameStart, tldEnd);
         candidates.push(candidate);
         index = candidate.end;
-        hostnameRunStart = candidate.end;
       }
-      return candidates;
+      return filterUrlCandidatesBlockedByFollowingHtml(text, candidates);
     }
     function replaceMarkdownCandidates(text, regexp, replacement, marker, canOpen) {
       if (!text.includes(marker)) {
@@ -23381,6 +23467,14 @@ var require_ExpensiMark = __commonJS({
       output.push(text.slice(outputStart));
       return output.join("");
     }
+    function processMarkdownRule(regex2, marker, canOpen) {
+      return (textToProcess, replacement, _shouldKeepRawInput, shouldEscapeText) => {
+        if (canUseCandidateScanning(textToProcess, shouldEscapeText)) {
+          return replaceMarkdownCandidates(textToProcess, regex2, replacement, marker, canOpen);
+        }
+        return replaceTextWithExtras(textToProcess, regex2, EXTRAS_DEFAULT, replacement);
+      };
+    }
     function replaceBlockElementWithNewLine(htmlString) {
       let splitText = htmlString.replaceAll(/<blockquote>> (<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>)/gi, "<blockquote>> ").split(/<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>|<blockquote>|<\/blockquote>/);
       const stripHTML = (text) => str_1.default.stripHTML(text);
@@ -23799,9 +23893,9 @@ var require_ExpensiMark = __commonJS({
            */
           {
             name: "autolink",
-            process: (textToProcess, replacement) => {
+            process: (textToProcess, replacement, _shouldKeepRawInput, shouldEscapeText) => {
               const regex2 = new RegExp(`(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${UrlPatterns.MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, "gi");
-              return this.modifyTextForUrlLinks(regex2, textToProcess, replacement, true);
+              return this.modifyTextForUrlLinks(regex2, textToProcess, replacement, canUseCandidateScanning(textToProcess, shouldEscapeText));
             },
             replacement: (_extras, _match, g1, g2) => {
               const href = str_1.default.sanitizeURL(g2);
@@ -23870,7 +23964,8 @@ ${"<blockquote>".repeat(i)}`, "\n");
             name: "autoEmail",
             regex: new RegExp(`([^\\w'#%+-]|^)${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}(?!((?:(?!<a).)+)?<\\/a>|[^<>]*<\\/(?!em|h1|blockquote))`, "gim"),
             replacement: '$1<a href="mailto:$2">$2</a>',
-            rawInputReplacement: '$1<a href="mailto:$2" data-raw-href="$2" data-link-variant="auto">$2</a>'
+            rawInputReplacement: '$1<a href="mailto:$2" data-raw-href="$2" data-link-variant="auto">$2</a>',
+            shouldSkipProcessing: (textToCheck) => !textToCheck.includes("@")
           },
           /**
            * This regex matches a short user mention in a string.
@@ -23906,7 +24001,7 @@ ${"<blockquote>".repeat(i)}`, "\n");
             // \B will match everything that \b doesn't, so it works
             // for * and ~: https://www.rexegg.com/regex-boundaries.html#notb
             name: "bold",
-            process: (textToProcess, replacement) => replaceMarkdownCandidates(textToProcess, BOLD_MARKDOWN_REGEX, replacement, "*", canOpenBoldMarkdown),
+            process: processMarkdownRule(BOLD_MARKDOWN_REGEX, "*", canOpenBoldMarkdown),
             replacement: (_extras, match, g1, g2) => {
               if (g1.includes("_")) {
                 return `${g1}<strong>${g2}</strong>`;
@@ -23916,7 +24011,7 @@ ${"<blockquote>".repeat(i)}`, "\n");
           },
           {
             name: "strikethrough",
-            process: (textToProcess, replacement) => replaceMarkdownCandidates(textToProcess, STRIKETHROUGH_MARKDOWN_REGEX, replacement, "~", canOpenStrikethroughMarkdown),
+            process: processMarkdownRule(STRIKETHROUGH_MARKDOWN_REGEX, "~", canOpenStrikethroughMarkdown),
             replacement: (_extras, match, g1) => g1.includes("</pre>") || containsNonPairTag(g1) ? match : `<del>${g1}</del>`
           },
           {
@@ -24285,7 +24380,7 @@ ${g2}
           }
           const replacement = shouldKeepRawInput && rule.rawInputReplacement ? rule.rawInputReplacement : rule.replacement;
           if ("process" in rule) {
-            replacedText = rule.process(replacedText, replacement, shouldKeepRawInput);
+            replacedText = rule.process(replacedText, replacement, shouldKeepRawInput, shouldEscapeText);
           } else {
             replacedText = replaceTextWithExtras(replacedText, rule.regex, extras, replacement);
           }
@@ -28352,10 +28447,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -28422,7 +28573,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -28434,6 +28589,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -28543,13 +28701,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -32156,6 +32322,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -32202,6 +32369,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -32364,24 +32534,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -32401,6 +32602,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32444,7 +32649,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -32469,9 +32674,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -32480,6 +32686,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -32605,6 +32815,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -32648,12 +32859,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -32668,7 +32886,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -32676,9 +32897,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -32727,7 +32949,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -32745,6 +32967,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -32757,6 +32996,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -32787,8 +33049,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -32809,11 +33079,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -33169,6 +33446,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -33229,6 +33507,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -33392,16 +33674,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -33416,18 +33704,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -33988,9 +34300,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -34496,8 +34809,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -34668,7 +34981,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -34689,6 +35001,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -34888,7 +35201,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -34898,6 +35210,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -35338,6 +35651,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -35391,6 +35722,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -35400,6 +35732,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -35461,7 +35804,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -35510,9 +35855,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -35520,6 +35877,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -35527,6 +35885,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -35546,6 +35909,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -35573,7 +35937,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -42372,14 +42736,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -42462,7 +42860,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -42592,18 +42994,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
-        }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -43425,7 +43823,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -43531,31 +43929,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -43574,20 +43967,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -43597,19 +43982,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -43640,8 +44023,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -43649,18 +44038,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -43675,6 +44067,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -43734,6 +44133,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -43754,6 +44156,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -43767,6 +44172,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -43777,32 +44185,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -43845,6 +44267,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -44056,8 +44498,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -44101,9 +44541,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -44287,7 +44724,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -44362,19 +44805,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -44453,6 +44883,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -44472,10 +44936,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -44506,63 +44973,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -44571,17 +45005,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -44597,43 +45030,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -44658,12 +45090,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 62a50ec22616..5eca45f374da 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/postOrReplaceComment/index.js b/.github/actions/javascript/postOrReplaceComment/index.js
index fb9eb8df9e7b..195707dedc9f 100644
--- a/.github/actions/javascript/postOrReplaceComment/index.js
+++ b/.github/actions/javascript/postOrReplaceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
index 6c66aba05ee9..beb367dd3ebd 100644
--- a/.github/actions/javascript/proposalPoliceComment/index.js
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str2 = `${val[i]}`;
+            if (!isValidHeaderValue(str2)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str2);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message2 = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
-            }
-            throw new HTTPParserError(message2, constants3.ERROR[ret], data.slice(offset));
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
+            }
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message2 = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message2 = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message2, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path2.length; ++i) {
         const code = path2.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
@@ -43926,6 +44371,7 @@ var require_ExpensiMark = __commonJS({
     var Constants = __importStar(require_CONST());
     var UrlPatterns = __importStar(require_Url());
     var Logger_1 = __importDefault(require_Logger());
+    var tlds_1 = __importDefault(require_tlds());
     var Utils = __importStar(require_utils2());
     var EXTRAS_DEFAULT = {};
     var ASCII_DIGIT_START = "0".charCodeAt(0);
@@ -43938,6 +44384,9 @@ var require_ExpensiMark = __commonJS({
     var NON_BREAKING_SPACE_CODE = 160;
     var URL_PROTOCOLS = ["https://", "http://", "ftps://", "ftp://"];
     var URL_CANDIDATE_PREFIX_CHARACTERS = "@_*~";
+    var URL_TLD_LIST = tlds_1.default.toLowerCase().split("|");
+    var URL_TLDS = new Set(URL_TLD_LIST);
+    var MAX_URL_TLD_LENGTH = Math.max(...URL_TLD_LIST.map((tld) => tld.length));
     var PROTECTED_TAG_NAMES = /* @__PURE__ */ new Set(["a", "code", "pre", "video"]);
     var MARKDOWN_LINK_REGEX = new RegExp(`\\[((?:[^\\[\\]\\r\\n]*(?:\\[[^\\[\\]\\r\\n]*][^\\[\\]\\r\\n]*)*))]\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, "gi");
     var MARKDOWN_IMAGE_REGEX = new RegExp(`\\!(?:\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)])?\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, "gi");
@@ -43983,6 +44432,9 @@ var require_ExpensiMark = __commonJS({
       }
       return text.replace(regexp, replacement);
     }
+    function canUseCandidateScanning(text, shouldEscapeText) {
+      return shouldEscapeText || !text.includes("<") && !text.includes(">");
+    }
     function isAsciiAlphaNumeric(character) {
       if (!character) {
         return false;
@@ -44054,15 +44506,59 @@ var require_ExpensiMark = __commonJS({
       }
       return URL_PROTOCOLS.find((protocol) => text.slice(position, position + protocol.length).toLowerCase() === protocol);
     }
-    function findHostnameEnd(text, hostnameStart, dotPosition) {
-      let hostnameEnd = dotPosition + 1;
-      while (hostnameEnd < text.length && (isAsciiAlphaNumeric(text[hostnameEnd]) || text[hostnameEnd] === "-")) {
-        hostnameEnd++;
+    function isValidHostnameLabel(text, start, end) {
+      if (start >= end || !isAsciiAlphaNumeric(text[start]) || !isAsciiAlphaNumeric(text[end - 1])) {
+        return false;
       }
-      if (hostnameStart === dotPosition || hostnameEnd === dotPosition + 1) {
-        return void 0;
+      for (let index = start + 1; index < end - 1; index++) {
+        if (!isAsciiAlphaNumeric(text[index]) && text[index] !== "-") {
+          return false;
+        }
+      }
+      return true;
+    }
+    function findHostnameStart(text, dotPosition) {
+      let hostnameStart = dotPosition;
+      let labelEnd = dotPosition;
+      while (labelEnd > 0) {
+        let rawLabelStart = labelEnd - 1;
+        while (rawLabelStart >= 0 && text[rawLabelStart] !== "." && isHostnameCharacter(text[rawLabelStart])) {
+          rawLabelStart--;
+        }
+        rawLabelStart++;
+        let labelStart = rawLabelStart;
+        while (labelStart < labelEnd && text[labelStart] === "-") {
+          labelStart++;
+        }
+        if (!isValidHostnameLabel(text, labelStart, labelEnd)) {
+          break;
+        }
+        hostnameStart = labelStart;
+        if (labelStart !== rawLabelStart) {
+          break;
+        }
+        const separatorPosition = labelStart - 1;
+        if (separatorPosition < 0 || text[separatorPosition] !== ".") {
+          break;
+        }
+        labelEnd = separatorPosition;
+      }
+      return hostnameStart === dotPosition ? void 0 : hostnameStart;
+    }
+    function findKnownTldEnd(text, dotPosition) {
+      const maximumEnd = Math.min(text.length, dotPosition + 1 + MAX_URL_TLD_LENGTH);
+      for (let end = dotPosition + 2; end <= maximumEnd; end++) {
+        const currentCharacter = text[end - 1];
+        if (!isAsciiAlphaNumeric(currentCharacter) && currentCharacter !== "-") {
+          break;
+        }
+        const nextCharacter = text[end];
+        const hasValidBoundary = !nextCharacter || nextCharacter === ":" || nextCharacter === "_" || !isWordCharacter(nextCharacter);
+        if (hasValidBoundary && URL_TLDS.has(text.slice(dotPosition + 1, end).toLowerCase())) {
+          return end;
+        }
       }
-      return hostnameEnd;
+      return void 0;
     }
     function extendUrlCandidateBoundaries(text, start, end) {
       let candidateStart = start;
@@ -44075,24 +44571,65 @@ var require_ExpensiMark = __commonJS({
       }
       return { start: candidateStart, end: candidateEnd };
     }
+    function startsWithIgnoreCase(text, expected, position) {
+      return text.slice(position, position + expected.length).toLowerCase() === expected;
+    }
+    function filterUrlCandidatesBlockedByFollowingHtml(text, candidates) {
+      var _a3;
+      if (candidates.length === 0 || !text.includes("<") && !text.includes(">")) {
+        return candidates;
+      }
+      const validCandidates = [];
+      let candidateIndex = candidates.length - 1;
+      let nextLessThan = text.length;
+      let nextGreaterThan = text.length;
+      let nextOpeningAnchor = text.length;
+      let nextClosingAnchor = text.length;
+      for (let index = text.length; index >= 0 && candidateIndex >= 0; index--) {
+        if (text[index] === "<") {
+          nextLessThan = index;
+          if (((_a3 = text[index + 1]) === null || _a3 === void 0 ? void 0 : _a3.toLowerCase()) === "a") {
+            nextOpeningAnchor = index;
+          } else if (startsWithIgnoreCase(text, "</a>", index)) {
+            nextClosingAnchor = index;
+          }
+        } else if (text[index] === ">") {
+          nextGreaterThan = index;
+        }
+        while (candidateIndex >= 0 && candidates[candidateIndex].end === index) {
+          const firstHtmlBoundaryIsClosingTag = nextLessThan < nextGreaterThan && text.startsWith("</", nextLessThan) && !startsWithIgnoreCase(text, "</h1>", nextLessThan);
+          const firstTagIsProtectedClosingTag = startsWithIgnoreCase(text, "</pre>", nextLessThan) || startsWithIgnoreCase(text, "</code>", nextLessThan);
+          const isBlockedByFollowingHtml = (
+            // Mirrors `(?![^<]*>)`: reject when `>` appears before the next `<`.
+            nextGreaterThan < nextLessThan || // Mirrors `[^<>]*<\/(?!h1>)`: reject a later closing tag other than `</h1>`.
+            firstHtmlBoundaryIsClosingTag || // Mirrors `((?:(?!<a).)+)?<\/a>`: reject `</a>` unless another `<a>` appears first.
+            nextClosingAnchor < nextOpeningAnchor || // Mirrors `[^<]*(<\/pre>|<\/code>)`: reject a later protected closing tag.
+            firstTagIsProtectedClosingTag
+          );
+          if (!isBlockedByFollowingHtml) {
+            validCandidates.push(candidates[candidateIndex]);
+          }
+          candidateIndex--;
+        }
+      }
+      return validCandidates.reverse();
+    }
     function findUrlCandidates(text) {
       const candidates = [];
       const protectedTags = [];
       let index = 0;
-      let hostnameRunStart = 0;
       while (index < text.length) {
         if (text[index] === "<") {
           const nextIndex = updateProtectedTagStack(text, index, protectedTags);
           if (nextIndex === void 0) {
-            break;
+            index++;
+            continue;
           }
           index = nextIndex;
-          hostnameRunStart = index;
           continue;
         }
         if (protectedTags.length > 0) {
           index++;
-          hostnameRunStart = index;
           continue;
         }
         const matchedProtocol = getProtocolAt(text, index);
@@ -44100,29 +44637,23 @@ var require_ExpensiMark = __commonJS({
           const candidate2 = extendUrlCandidateBoundaries(text, index, index + matchedProtocol.length);
           candidates.push(candidate2);
           index = candidate2.end;
-          hostnameRunStart = candidate2.end;
-          continue;
-        }
-        if (!isHostnameCharacter(text[index])) {
-          hostnameRunStart = index + 1;
-          index++;
           continue;
         }
         if (text[index] !== ".") {
           index++;
           continue;
         }
-        const hostnameEnd = findHostnameEnd(text, hostnameRunStart, index);
-        if (hostnameEnd === void 0) {
+        const tldEnd = findKnownTldEnd(text, index);
+        const hostnameStart = tldEnd === void 0 ? void 0 : findHostnameStart(text, index);
+        if (tldEnd === void 0 || hostnameStart === void 0) {
           index++;
           continue;
         }
-        const candidate = extendUrlCandidateBoundaries(text, hostnameRunStart, hostnameEnd);
+        const candidate = extendUrlCandidateBoundaries(text, hostnameStart, tldEnd);
         candidates.push(candidate);
         index = candidate.end;
-        hostnameRunStart = candidate.end;
       }
-      return candidates;
+      return filterUrlCandidatesBlockedByFollowingHtml(text, candidates);
     }
     function replaceMarkdownCandidates(text, regexp, replacement, marker, canOpen) {
       if (!text.includes(marker)) {
@@ -44195,6 +44726,14 @@ var require_ExpensiMark = __commonJS({
       output.push(text.slice(outputStart));
       return output.join("");
     }
+    function processMarkdownRule(regex2, marker, canOpen) {
+      return (textToProcess, replacement, _shouldKeepRawInput, shouldEscapeText) => {
+        if (canUseCandidateScanning(textToProcess, shouldEscapeText)) {
+          return replaceMarkdownCandidates(textToProcess, regex2, replacement, marker, canOpen);
+        }
+        return replaceTextWithExtras(textToProcess, regex2, EXTRAS_DEFAULT, replacement);
+      };
+    }
     function replaceBlockElementWithNewLine(htmlString) {
       let splitText = htmlString.replaceAll(/<blockquote>> (<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>)/gi, "<blockquote>> ").split(/<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>|<blockquote>|<\/blockquote>/);
       const stripHTML = (text) => str_1.default.stripHTML(text);
@@ -44613,9 +45152,9 @@ var require_ExpensiMark = __commonJS({
            */
           {
             name: "autolink",
-            process: (textToProcess, replacement) => {
+            process: (textToProcess, replacement, _shouldKeepRawInput, shouldEscapeText) => {
               const regex2 = new RegExp(`(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${UrlPatterns.MARKDOWN_URL_REGEX}\\1(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, "gi");
-              return this.modifyTextForUrlLinks(regex2, textToProcess, replacement, true);
+              return this.modifyTextForUrlLinks(regex2, textToProcess, replacement, canUseCandidateScanning(textToProcess, shouldEscapeText));
             },
             replacement: (_extras, _match, g1, g2) => {
               const href = str_1.default.sanitizeURL(g2);
@@ -44684,7 +45223,8 @@ ${"<blockquote>".repeat(i)}`, "\n");
             name: "autoEmail",
             regex: new RegExp(`([^\\w'#%+-]|^)${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}(?!((?:(?!<a).)+)?<\\/a>|[^<>]*<\\/(?!em|h1|blockquote))`, "gim"),
             replacement: '$1<a href="mailto:$2">$2</a>',
-            rawInputReplacement: '$1<a href="mailto:$2" data-raw-href="$2" data-link-variant="auto">$2</a>'
+            rawInputReplacement: '$1<a href="mailto:$2" data-raw-href="$2" data-link-variant="auto">$2</a>',
+            shouldSkipProcessing: (textToCheck) => !textToCheck.includes("@")
           },
           /**
            * This regex matches a short user mention in a string.
@@ -44720,7 +45260,7 @@ ${"<blockquote>".repeat(i)}`, "\n");
             // \B will match everything that \b doesn't, so it works
             // for * and ~: https://www.rexegg.com/regex-boundaries.html#notb
             name: "bold",
-            process: (textToProcess, replacement) => replaceMarkdownCandidates(textToProcess, BOLD_MARKDOWN_REGEX, replacement, "*", canOpenBoldMarkdown),
+            process: processMarkdownRule(BOLD_MARKDOWN_REGEX, "*", canOpenBoldMarkdown),
             replacement: (_extras, match2, g1, g2) => {
               if (g1.includes("_")) {
                 return `${g1}<strong>${g2}</strong>`;
@@ -44730,7 +45270,7 @@ ${"<blockquote>".repeat(i)}`, "\n");
           },
           {
             name: "strikethrough",
-            process: (textToProcess, replacement) => replaceMarkdownCandidates(textToProcess, STRIKETHROUGH_MARKDOWN_REGEX, replacement, "~", canOpenStrikethroughMarkdown),
+            process: processMarkdownRule(STRIKETHROUGH_MARKDOWN_REGEX, "~", canOpenStrikethroughMarkdown),
             replacement: (_extras, match2, g1) => g1.includes("</pre>") || containsNonPairTag(g1) ? match2 : `<del>${g1}</del>`
           },
           {
@@ -45099,7 +45639,7 @@ ${g2}
           }
           const replacement = shouldKeepRawInput && rule.rawInputReplacement ? rule.rawInputReplacement : rule.replacement;
           if ("process" in rule) {
-            replacedText = rule.process(replacedText, replacement, shouldKeepRawInput);
+            replacedText = rule.process(replacedText, replacement, shouldKeepRawInput, shouldEscapeText);
           } else {
             replacedText = replaceTextWithExtras(replacedText, rule.regex, extras, replacement);
           }
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index f237f20694fd..2fe118ee3e64 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index a9419acf5a2e..8e220a2cf59e 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/validateReassureOutput/index.js b/.github/actions/javascript/validateReassureOutput/index.js
index b26522496b9c..e511f56ffd08 100644
--- a/.github/actions/javascript/validateReassureOutput/index.js
+++ b/.github/actions/javascript/validateReassureOutput/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request = client[kQueue][client[kRunningIdx]];
         if (!request) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        util.errorRequest(client, request, err || new RequestAbortedError());
+        if (request.completed) {
+          if (request.upgrade || request.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
+          return;
+        }
+        util.errorRequest(client, request, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request.aborted || request.completed) {
+      const abort = (error2) => {
+        if (request.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request, err);
+        if (request.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index 087b5df387fd..d982728230d3 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {
diff --git a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
index 1e9b71a5c3e0..d5508591a07b 100644
--- a/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
+++ b/.github/actions/javascript/verifyStagingBuildsSucceeded/index.js
@@ -1863,10 +1863,66 @@ var require_request = __commonJS({
           return false;
         }
       }
-      onUpgrade(statusCode, headers, socket) {
+      /**
+       * @param {number|null} statusCode
+       * @param {Buffer[]|null} headers
+       * @param {import('node:stream').Duplex} socket
+       * @param {string} [statusText]
+       */
+      onUpgrade(statusCode, headers, socket, statusText = "") {
+        this.onFinally();
         assert(!this.aborted);
         assert(!this.completed);
-        return this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (statusCode !== null) {
+          this.#publishUpgradeHeaders(statusCode, headers, statusText);
+        }
+        const result = this[kHandler].onUpgrade(statusCode, headers, socket);
+        if (!this.aborted) {
+          this.completed = true;
+          if (statusCode !== null) {
+            this.#publishUpgradeTrailers();
+          }
+        }
+        return result;
+      }
+      /**
+       * @param {number} statusCode
+       * @param {import('node:http2').IncomingHttpHeaders} headers
+       * @param {(headers: import('node:http2').IncomingHttpHeaders) => Buffer[]} parseHeaders
+       * @param {string} [statusText]
+       */
+      onUpgradeResponse(statusCode, headers, parseHeaders, statusText = "") {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.headers.hasSubscribers) {
+          this.#publishUpgradeHeaders(statusCode, parseHeaders(headers), statusText);
+        }
+        this.#publishUpgradeTrailers();
+      }
+      /**
+       * @param {Error} error
+       */
+      onUpgradeError(error2) {
+        assert(!this.aborted);
+        assert(this.completed);
+        if (channels.error.hasSubscribers) {
+          channels.error.publish({ request: this, error: error2 });
+        }
+      }
+      /**
+       * @param {number} statusCode
+       * @param {Buffer[]} headers
+       * @param {string} statusText
+       */
+      #publishUpgradeHeaders(statusCode, headers, statusText) {
+        if (channels.headers.hasSubscribers) {
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+        }
+      }
+      #publishUpgradeTrailers() {
+        if (channels.trailers.hasSubscribers) {
+          channels.trailers.publish({ request: this, trailers: [] });
+        }
       }
       onComplete(trailers) {
         this.onFinally();
@@ -1933,7 +1989,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -1945,6 +2005,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request2.host !== null) {
@@ -2054,13 +2117,21 @@ var require_dispatcher_base = __commonJS({
     var kOnDestroyed = /* @__PURE__ */ Symbol("onDestroyed");
     var kOnClosed = /* @__PURE__ */ Symbol("onClosed");
     var kInterceptedDispatch = /* @__PURE__ */ Symbol("Intercepted Dispatch");
+    var kWebSocketOptions = /* @__PURE__ */ Symbol("webSocketOptions");
     var DispatcherBase = class extends Dispatcher {
-      constructor() {
+      constructor(opts) {
         super();
         this[kDestroyed] = false;
         this[kOnDestroyed] = null;
         this[kClosed] = false;
         this[kOnClosed] = [];
+        this[kWebSocketOptions] = opts?.webSocket ?? {};
+      }
+      get webSocketOptions() {
+        return {
+          maxFragments: this[kWebSocketOptions].maxFragments ?? 131072,
+          maxPayloadSize: this[kWebSocketOptions].maxPayloadSize ?? 128 * 1024 * 1024
+        };
       }
       get destroyed() {
         return this[kDestroyed];
@@ -5667,6 +5738,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -5713,6 +5785,9 @@ var require_client_h1 = __commonJS({
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
     var removeAllListeners = util.removeAllListeners;
+    var kIdleSocketValidation = /* @__PURE__ */ Symbol("kIdleSocketValidation");
+    var kIdleSocketValidationTimeout = /* @__PURE__ */ Symbol("kIdleSocketValidationTimeout");
+    var kSocketUsed = /* @__PURE__ */ Symbol("kSocketUsed");
     var extractBody;
     async function lazyllhttp() {
       const llhttpWasmData = process.env.JEST_WORKER_ID ? require_llhttp_wasm() : void 0;
@@ -5875,24 +5950,55 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret === constants3.ERROR.PAUSED_UPGRADE) {
-            this.onUpgrade(data.slice(offset));
-          } else if (ret === constants3.ERROR.PAUSED) {
-            this.paused = true;
-            socket.unshift(data.slice(offset));
-          } else if (ret !== constants3.ERROR.OK) {
-            const ptr = llhttp.llhttp_get_error_reason(this.ptr);
-            let message = "";
-            if (ptr) {
-              const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
-              message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+          if (ret !== constants3.ERROR.OK) {
+            const body = data.subarray(offset);
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
+              this.onUpgrade(body);
+            } else if (ret === constants3.ERROR.PAUSED) {
+              this.paused = true;
+              socket.unshift(body);
+            } else {
+              throw this.createError(ret, body);
             }
-            throw new HTTPParserError(message, constants3.ERROR[ret], data.slice(offset));
           }
         } catch (err) {
           util.destroy(socket, err);
         }
       }
+      finish() {
+        assert(currentParser === null);
+        assert(this.ptr != null);
+        assert(!this.paused);
+        const { llhttp } = this;
+        let ret;
+        try {
+          currentParser = this;
+          ret = llhttp.llhttp_finish(this.ptr);
+        } finally {
+          currentParser = null;
+        }
+        if (ret === constants3.ERROR.OK) {
+          return null;
+        }
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
+          this.paused = true;
+          return null;
+        }
+        return this.createError(ret, EMPTY_BUF);
+      }
+      createError(ret, data) {
+        const { llhttp, contentLength, bytesRead } = this;
+        if (contentLength && bytesRead !== parseInt(contentLength, 10)) {
+          return new ResponseContentLengthMismatchError();
+        }
+        const ptr = llhttp.llhttp_get_error_reason(this.ptr);
+        let message = "";
+        if (ptr) {
+          const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
+          message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
+        }
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
+      }
       destroy() {
         assert(this.ptr != null);
         assert(currentParser == null);
@@ -5912,6 +6018,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -5955,7 +6065,7 @@ var require_client_h1 = __commonJS({
         }
       }
       onUpgrade(head) {
-        const { upgrade, client, socket, headers, statusCode } = this;
+        const { upgrade, client, socket, headers, statusCode, statusText } = this;
         assert(upgrade);
         assert(client[kSocket] === socket);
         assert(!socket.destroyed);
@@ -5980,9 +6090,10 @@ var require_client_h1 = __commonJS({
         client[kQueue][client[kRunningIdx]++] = null;
         client.emit("disconnect", client[kUrl], [client], new InformationalError("upgrade"));
         try {
-          request2.onUpgrade(statusCode, headers, socket);
-        } catch (err) {
-          util.destroy(socket, err);
+          request2.onUpgrade(statusCode, headers, socket, statusText);
+        } catch (error2) {
+          util.errorRequest(client, request2, error2);
+          util.destroy(socket, error2);
         }
         client[kResume]();
       }
@@ -5991,6 +6102,10 @@ var require_client_h1 = __commonJS({
         if (socket.destroyed) {
           return -1;
         }
+        if (client[kRunning] === 0) {
+          util.destroy(socket, new SocketError("bad response", util.getSocketInfo(socket)));
+          return -1;
+        }
         const request2 = client[kQueue][client[kRunningIdx]];
         if (!request2) {
           return -1;
@@ -6116,6 +6231,7 @@ var require_client_h1 = __commonJS({
         }
         request2.onComplete(headers);
         client[kQueue][client[kRunningIdx]++] = null;
+        socket[kSocketUsed] = true;
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
@@ -6159,12 +6275,19 @@ var require_client_h1 = __commonJS({
       socket[kWriting] = false;
       socket[kReset] = false;
       socket[kBlocking] = false;
+      socket[kIdleSocketValidation] = 0;
+      socket[kIdleSocketValidationTimeout] = null;
+      socket[kSocketUsed] = false;
       socket[kParser] = new Parser(client, socket, llhttpInstance);
       addListener(socket, "error", function(err) {
         assert(err.code !== "ERR_TLS_CERT_ALTNAME_INVALID");
         const parser = this[kParser];
         if (err.code === "ECONNRESET" && parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            this[kError] = parserErr;
+            this[kClient][kOnError](parserErr);
+          }
           return;
         }
         this[kError] = err;
@@ -6179,7 +6302,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "end", function() {
         const parser = this[kParser];
         if (parser.statusCode && !parser.shouldKeepAlive) {
-          parser.onMessageComplete();
+          const parserErr = parser.finish();
+          if (parserErr) {
+            util.destroy(this, parserErr);
+          }
           return;
         }
         util.destroy(this, new SocketError("other side closed", util.getSocketInfo(this)));
@@ -6187,9 +6313,10 @@ var require_client_h1 = __commonJS({
       addListener(socket, "close", function() {
         const client2 = this[kClient];
         const parser = this[kParser];
+        clearIdleSocketValidation(this);
         if (parser) {
           if (!this[kError] && parser.statusCode && !parser.shouldKeepAlive) {
-            parser.onMessageComplete();
+            this[kError] = parser.finish() || this[kError];
           }
           this[kParser].destroy();
           this[kParser] = null;
@@ -6238,7 +6365,7 @@ var require_client_h1 = __commonJS({
           return socket.destroyed;
         },
         busy(request2) {
-          if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
+          if (socket[kWriting] || socket[kReset] || socket[kBlocking] || socket[kIdleSocketValidation] === 1) {
             return true;
           }
           if (request2) {
@@ -6256,6 +6383,23 @@ var require_client_h1 = __commonJS({
         }
       };
     }
+    function clearIdleSocketValidation(socket) {
+      if (socket[kIdleSocketValidationTimeout]) {
+        clearImmediate(socket[kIdleSocketValidationTimeout]);
+        socket[kIdleSocketValidationTimeout] = null;
+      }
+      socket[kIdleSocketValidation] = 0;
+    }
+    function scheduleIdleSocketValidation(client, socket) {
+      socket[kIdleSocketValidation] = 1;
+      socket[kIdleSocketValidationTimeout] = setImmediate(() => {
+        socket[kIdleSocketValidationTimeout] = null;
+        socket[kIdleSocketValidation] = 2;
+        if (client[kSocket] === socket && !socket.destroyed) {
+          client[kResume]();
+        }
+      });
+    }
     function resumeH1(client) {
       const socket = client[kSocket];
       if (socket && !socket.destroyed) {
@@ -6268,6 +6412,29 @@ var require_client_h1 = __commonJS({
           socket.ref();
           socket[kNoRef] = false;
         }
+        if (client[kRunning] === 0 && client[kPending] > 0 && socket[kSocketUsed]) {
+          if (socket[kIdleSocketValidation] === 0) {
+            scheduleIdleSocketValidation(client, socket);
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+          if (socket[kIdleSocketValidation] === 1) {
+            socket[kParser].readMore();
+            if (socket.destroyed) {
+              return;
+            }
+            return;
+          }
+        }
+        if (client[kRunning] === 0) {
+          socket[kParser].readMore();
+          if (socket.destroyed) {
+            return;
+          }
+        }
         if (client[kSize] === 0) {
           if (socket[kParser].timeoutType !== TIMEOUT_KEEP_ALIVE) {
             socket[kParser].setTimeout(client[kKeepAliveTimeoutValue], TIMEOUT_KEEP_ALIVE);
@@ -6298,8 +6465,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request2.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request2.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request2, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
@@ -6320,11 +6495,18 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      clearIdleSocketValidation(socket);
+      const abort = (error2) => {
+        if (request2.aborted) {
+          return;
+        }
+        if (request2.completed) {
+          if (request2.upgrade || request2.method === "CONNECT") {
+            util.destroy(socket, new InformationalError("aborted"));
+          }
           return;
         }
-        util.errorRequest(client, request2, err || new RequestAbortedError());
+        util.errorRequest(client, request2, error2 || new RequestAbortedError());
         util.destroy(body);
         util.destroy(socket, new InformationalError("aborted"));
       };
@@ -6680,6 +6862,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
+    var { errorMonitor } = __require("node:events");
     var { pipeline } = __require("node:stream");
     var util = require_util();
     var {
@@ -6740,6 +6923,10 @@ var require_client_h2 = __commonJS({
       }
       return result;
     }
+    function parseH2ResponseHeaders(headers) {
+      const { [HTTP2_HEADER_STATUS]: _statusCode, ...realHeaders } = headers;
+      return parseH2Headers(realHeaders);
+    }
     async function connectH2(client, socket) {
       client[kSocket] = socket;
       if (!h2ExperimentalWarned) {
@@ -6903,16 +7090,22 @@ var require_client_h2 = __commonJS({
       const { hostname, port } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
-        if (request2.aborted || request2.completed) {
+      const abort = (error2) => {
+        if (request2.aborted) {
           return;
         }
-        err = err || new RequestAbortedError();
-        util.errorRequest(client, request2, err);
+        if (request2.completed) {
+          if (method === "CONNECT" && stream != null) {
+            util.destroy(stream, error2 || new RequestAbortedError());
+          }
+          return;
+        }
+        error2 = error2 || new RequestAbortedError();
+        util.errorRequest(client, request2, error2);
         if (stream != null) {
-          util.destroy(stream, err);
+          util.destroy(stream, error2);
         }
-        util.destroy(body, err);
+        util.destroy(body, error2);
         client[kQueue][client[kRunningIdx]++] = null;
         client[kResume]();
       };
@@ -6927,18 +7120,42 @@ var require_client_h2 = __commonJS({
       if (method === "CONNECT") {
         session.ref();
         stream = session.request(headers, { endStream: false, signal });
-        if (stream.id && !stream.pending) {
-          request2.onUpgrade(null, null, stream);
-          ++session[kOpenStreams];
-          client[kQueue][client[kRunningIdx]++] = null;
-        } else {
-          stream.once("ready", () => {
+        let upgradeResponseFinished = false;
+        const onResponse = (headers2) => {
+          upgradeResponseFinished = true;
+          stream.off(errorMonitor, onUpgradeError);
+          request2.onUpgradeResponse(Number(headers2[HTTP2_HEADER_STATUS]), headers2, parseH2ResponseHeaders);
+        };
+        const onUpgradeError = (error2) => {
+          upgradeResponseFinished = true;
+          stream.off("response", onResponse);
+          request2.onUpgradeError(error2);
+        };
+        const onReady = () => {
+          try {
             request2.onUpgrade(null, null, stream);
-            ++session[kOpenStreams];
-            client[kQueue][client[kRunningIdx]++] = null;
-          });
-        }
+          } catch (error2) {
+            stream.off("response", onResponse);
+            abort(error2);
+            return;
+          }
+          if (request2.aborted) {
+            return;
+          }
+          stream.off("error", abort);
+          stream.once(errorMonitor, onUpgradeError);
+          client[kQueue][client[kRunningIdx]++] = null;
+        };
+        stream.once("response", onResponse);
+        stream.once("error", abort);
+        ++session[kOpenStreams];
+        onReady();
         stream.once("close", () => {
+          if (!upgradeResponseFinished && request2.completed) {
+            stream.off("response", onResponse);
+            stream.off(errorMonitor, onUpgradeError);
+            request2.onUpgradeError(new InformationalError(`HTTP/2: "stream error" received - code ${stream.rstCode}`));
+          }
           session[kOpenStreams] -= 1;
           if (session[kOpenStreams] === 0) session.unref();
         });
@@ -7499,9 +7716,10 @@ var require_client = __commonJS({
         autoSelectFamilyAttemptTimeout,
         // h2
         maxConcurrentStreams,
-        allowH2
+        allowH2,
+        webSocket
       } = {}) {
-        super();
+        super({ webSocket });
         if (keepAlive !== void 0) {
           throw new InvalidArgumentError("unsupported keepAlive, use pipelining=0 instead");
         }
@@ -8007,8 +8225,8 @@ var require_pool_base = __commonJS({
     var kRemoveClient = /* @__PURE__ */ Symbol("remove client");
     var kStats = /* @__PURE__ */ Symbol("stats");
     var PoolBase = class extends DispatcherBase {
-      constructor() {
-        super();
+      constructor(opts) {
+        super(opts);
         this[kQueue] = new FixedQueue();
         this[kClients] = [];
         this[kQueued] = 0;
@@ -8179,7 +8397,6 @@ var require_pool = __commonJS({
         allowH2,
         ...options
       } = {}) {
-        super();
         if (connections != null && (!Number.isFinite(connections) || connections < 0)) {
           throw new InvalidArgumentError("invalid connections");
         }
@@ -8200,6 +8417,7 @@ var require_pool = __commonJS({
             ...connect
           });
         }
+        super(options);
         this[kInterceptors] = options.interceptors?.Pool && Array.isArray(options.interceptors.Pool) ? options.interceptors.Pool : [];
         this[kConnections] = connections || null;
         this[kUrl] = util.parseOrigin(origin);
@@ -8399,7 +8617,6 @@ var require_agent = __commonJS({
     }
     var Agent = class extends DispatcherBase {
       constructor({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
-        super();
         if (typeof factory !== "function") {
           throw new InvalidArgumentError("factory must be a function.");
         }
@@ -8409,6 +8626,7 @@ var require_agent = __commonJS({
         if (!Number.isInteger(maxRedirections) || maxRedirections < 0) {
           throw new InvalidArgumentError("maxRedirections must be a positive number");
         }
+        super(options);
         if (connect && typeof connect !== "function") {
           connect = { ...connect };
         }
@@ -8849,6 +9067,24 @@ var require_retry_handler = __commonJS({
       const current = Date.now();
       return new Date(retryAfter).getTime() - current;
     }
+    function validatePartialResponseContentLength(headers, range, statusCode, retryCount) {
+      const contentLength = headers["content-length"];
+      if (contentLength == null) {
+        return null;
+      }
+      if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+        return null;
+      }
+      const length = Number(contentLength);
+      const expectedLength = range.end - range.start + 1;
+      if (!Number.isFinite(length) || length !== expectedLength) {
+        return new RequestRetryError("Content-Length mismatch", statusCode, {
+          headers,
+          data: { count: retryCount }
+        });
+      }
+      return null;
+    }
     var RetryHandler = class _RetryHandler {
       constructor(opts, handlers) {
         const { retryOptions, ...dispatchOpts } = opts;
@@ -8902,6 +9138,7 @@ var require_retry_handler = __commonJS({
         this.end = null;
         this.etag = null;
         this.resume = null;
+        this.headersSent = false;
         this.handler.onConnect((reason) => {
           this.aborted = true;
           if (this.abort) {
@@ -8911,6 +9148,17 @@ var require_retry_handler = __commonJS({
           }
         });
       }
+      checkpointResponseEnd(headers, resume) {
+        if (this.end == null && this.opts.method !== "HEAD") {
+          const contentLength = headers["content-length"];
+          this.end = contentLength != null ? Number(contentLength) - 1 : null;
+          assert(
+            this.end == null || Number.isFinite(this.end),
+            "invalid content-length"
+          );
+        }
+        this.resume = this.end != null ? resume : null;
+      }
       onRequestSent() {
         if (this.handler.onRequestSent) {
           this.handler.onRequestSent();
@@ -8972,7 +9220,9 @@ var require_retry_handler = __commonJS({
         const headers = parseHeaders(rawHeaders);
         this.retryCount += 1;
         if (statusCode >= 300) {
-          if (this.retryOpts.statusCodes.includes(statusCode) === false) {
+          if (!this.headersSent && this.retryOpts.statusCodes.includes(statusCode) === false) {
+            this.headersSent = true;
+            this.checkpointResponseEnd(headers, resume);
             return this.handler.onHeaders(
               statusCode,
               rawHeaders,
@@ -9021,9 +9271,21 @@ var require_retry_handler = __commonJS({
             );
             return false;
           }
+          const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount);
+          if (contentLengthError != null) {
+            this.abort(contentLengthError);
+            return false;
+          }
           const { start, size, end = size - 1 } = contentRange;
-          assert(this.start === start, "content-range mismatch");
-          assert(this.end == null || this.end === end, "content-range mismatch");
+          if (this.start !== start || this.end != null && this.end !== end) {
+            this.abort(
+              new RequestRetryError("Content-Range mismatch", statusCode, {
+                headers,
+                data: { count: this.retryCount }
+              })
+            );
+            return false;
+          }
           this.resume = resume;
           return true;
         }
@@ -9031,6 +9293,7 @@ var require_retry_handler = __commonJS({
           if (statusCode === 206) {
             const range = parseRangeHeader(headers["content-range"]);
             if (range == null) {
+              this.headersSent = true;
               return this.handler.onHeaders(
                 statusCode,
                 rawHeaders,
@@ -9038,6 +9301,11 @@ var require_retry_handler = __commonJS({
                 statusMessage
               );
             }
+            const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount);
+            if (contentLengthError != null) {
+              this.abort(contentLengthError);
+              return false;
+            }
             const { start, size, end = size - 1 } = range;
             assert(
               start != null && Number.isFinite(start),
@@ -9057,6 +9325,7 @@ var require_retry_handler = __commonJS({
             "invalid content-length"
           );
           this.resume = resume;
+          this.headersSent = true;
           this.etag = headers.etag != null ? headers.etag : null;
           if (this.etag != null && this.etag.startsWith("W/")) {
             this.etag = null;
@@ -9084,7 +9353,7 @@ var require_retry_handler = __commonJS({
         return this.handler.onComplete(rawTrailers);
       }
       onError(err) {
-        if (this.aborted || isDisturbed(this.opts.body)) {
+        if (this.aborted || isDisturbed(this.opts.body) || this.headersSent && this.resume == null) {
           return this.handler.onError(err);
         }
         if (this.retryCount - this.retryCountCheckpoint > 0) {
@@ -15883,14 +16152,48 @@ var require_util6 = __commonJS({
       for (let i = 0; i < path.length; ++i) {
         const code = path.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
-        code === 127 || // DEL
+        code > 126 || // exclude DEL and non-ascii
         code === 59) {
           throw new Error("Invalid cookie path");
         }
       }
     }
+    function isLetterOrDigit(code) {
+      return code >= 48 && code <= 57 || // 0-9
+      code >= 65 && code <= 90 || // A-Z
+      code >= 97 && code <= 122;
+    }
     function validateCookieDomain(domain) {
-      if (domain.startsWith("-") || domain.endsWith(".") || domain.endsWith("-")) {
+      if (domain === " ") {
+        return;
+      }
+      if (domain.length > 255) {
+        throw new Error("Invalid cookie domain");
+      }
+      let labelLength = 0;
+      for (let i = 0; i < domain.length; ++i) {
+        const code = domain.charCodeAt(i);
+        if (code === 46) {
+          if (labelLength === 0) {
+            throw new Error("Invalid cookie domain");
+          }
+          if (domain.charCodeAt(i - 1) === 45) {
+            throw new Error("Invalid cookie domain");
+          }
+          labelLength = 0;
+          continue;
+        }
+        if (labelLength === 0 && !isLetterOrDigit(code)) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (!isLetterOrDigit(code) && code !== 45) {
+          throw new Error("Invalid cookie domain");
+        }
+        if (++labelLength > 63) {
+          throw new Error("Invalid cookie domain");
+        }
+      }
+      if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 45) {
         throw new Error("Invalid cookie domain");
       }
     }
@@ -15973,7 +16276,11 @@ var require_util6 = __commonJS({
           throw new Error("Invalid unparsed");
         }
         const [key, ...value] = part.split("=");
-        out.push(`${key.trim()}=${value.join("=")}`);
+        const trimmedKey = key.trim();
+        const joinedValue = value.join("=");
+        validateCookieName(trimmedKey);
+        validateCookieValue(joinedValue);
+        out.push(`${trimmedKey}=${joinedValue}`);
       }
       return out.join("; ");
     }
@@ -16103,18 +16410,14 @@ var require_parse = __commonJS({
       } else if (attributeNameLowercase === "httponly") {
         cookieAttributeList.httpOnly = true;
       } else if (attributeNameLowercase === "samesite") {
-        let enforcement = "Default";
         const attributeValueLowercase = attributeValue.toLowerCase();
-        if (attributeValueLowercase.includes("none")) {
-          enforcement = "None";
-        }
-        if (attributeValueLowercase.includes("strict")) {
-          enforcement = "Strict";
-        }
-        if (attributeValueLowercase.includes("lax")) {
-          enforcement = "Lax";
+        if (attributeValueLowercase === "none") {
+          cookieAttributeList.sameSite = "None";
+        } else if (attributeValueLowercase === "strict") {
+          cookieAttributeList.sameSite = "Strict";
+        } else if (attributeValueLowercase === "lax") {
+          cookieAttributeList.sameSite = "Lax";
         }
-        cookieAttributeList.sameSite = enforcement;
       } else {
         cookieAttributeList.unparsed ??= [];
         cookieAttributeList.unparsed.push(`${attributeName}=${attributeValue}`);
@@ -16936,7 +17239,7 @@ var require_connection = __commonJS({
           const secProtocol = response.headersList.get("Sec-WebSocket-Protocol");
           if (secProtocol !== null) {
             const requestProtocols = getDecodeSplit("sec-websocket-protocol", request2.headersList);
-            if (!requestProtocols.includes(secProtocol)) {
+            if (requestProtocols === null || !requestProtocols.includes(secProtocol)) {
               failWebsocketConnection(ws, "Protocol was not set in the opening handshake.");
               return;
             }
@@ -17042,31 +17345,26 @@ var require_permessage_deflate = __commonJS({
     var tail = Buffer.from([0, 0, 255, 255]);
     var kBuffer = /* @__PURE__ */ Symbol("kBuffer");
     var kLength = /* @__PURE__ */ Symbol("kLength");
-    var kDefaultMaxDecompressedSize = 4 * 1024 * 1024;
     var PerMessageDeflate = class {
       /** @type {import('node:zlib').InflateRaw} */
       #inflate;
       #options = {};
-      /** @type {number} */
-      #maxDecompressedSize;
-      /** @type {boolean} */
-      #aborted = false;
-      /** @type {Function|null} */
-      #currentCallback = null;
+      #maxPayloadSize = 0;
       /**
        * @param {Map<string, string>} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
        */
-      constructor(extensions, options = {}) {
+      constructor(extensions, options) {
         this.#options.serverNoContextTakeover = extensions.has("server_no_context_takeover");
         this.#options.serverMaxWindowBits = extensions.get("server_max_window_bits");
-        this.#maxDecompressedSize = options.maxDecompressedMessageSize ?? kDefaultMaxDecompressedSize;
+        this.#maxPayloadSize = options.maxPayloadSize;
       }
+      /**
+       * Decompress a compressed payload.
+       * @param {Buffer} chunk Compressed data
+       * @param {boolean} fin Final fragment flag
+       * @param {Function} callback Callback function
+       */
       decompress(chunk, fin, callback) {
-        if (this.#aborted) {
-          callback(new MessageSizeExceededError());
-          return;
-        }
         if (!this.#inflate) {
           let windowBits = Z_DEFAULT_WINDOWBITS;
           if (this.#options.serverMaxWindowBits) {
@@ -17085,20 +17383,12 @@ var require_permessage_deflate = __commonJS({
           this.#inflate[kBuffer] = [];
           this.#inflate[kLength] = 0;
           this.#inflate.on("data", (data) => {
-            if (this.#aborted) {
-              return;
-            }
             this.#inflate[kLength] += data.length;
-            if (this.#inflate[kLength] > this.#maxDecompressedSize) {
-              this.#aborted = true;
+            if (this.#maxPayloadSize > 0 && this.#inflate[kLength] > this.#maxPayloadSize) {
+              callback(new MessageSizeExceededError());
               this.#inflate.removeAllListeners();
               this.#inflate.destroy();
               this.#inflate = null;
-              if (this.#currentCallback) {
-                const cb = this.#currentCallback;
-                this.#currentCallback = null;
-                cb(new MessageSizeExceededError());
-              }
               return;
             }
             this.#inflate[kBuffer].push(data);
@@ -17108,19 +17398,17 @@ var require_permessage_deflate = __commonJS({
             callback(err);
           });
         }
-        this.#currentCallback = callback;
         this.#inflate.write(chunk);
         if (fin) {
           this.#inflate.write(tail);
         }
         this.#inflate.flush(() => {
-          if (this.#aborted || !this.#inflate) {
+          if (!this.#inflate) {
             return;
           }
           const full = Buffer.concat(this.#inflate[kBuffer], this.#inflate[kLength]);
           this.#inflate[kBuffer].length = 0;
           this.#inflate[kLength] = 0;
-          this.#currentCallback = null;
           callback(null, full);
         });
       }
@@ -17151,8 +17439,14 @@ var require_receiver = __commonJS({
     var { WebsocketFrameSend } = require_frame();
     var { closeWebSocketConnection } = require_connection();
     var { PerMessageDeflate } = require_permessage_deflate();
+    var { MessageSizeExceededError } = require_errors();
+    function failWebsocketConnectionWithCode(ws, code, reason) {
+      closeWebSocketConnection(ws, code, reason, Buffer.byteLength(reason));
+      failWebsocketConnection(ws, reason);
+    }
     var ByteParser = class extends Writable {
       #buffers = [];
+      #fragmentsBytes = 0;
       #byteOffset = 0;
       #loop = false;
       #state = parserStates.INFO;
@@ -17160,18 +17454,21 @@ var require_receiver = __commonJS({
       #fragments = [];
       /** @type {Map<string, PerMessageDeflate>} */
       #extensions;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
+      /** @type {number} */
+      #maxFragments;
+      /** @type {number} */
+      #maxPayloadSize;
       /**
        * @param {import('./websocket').WebSocket} ws
        * @param {Map<string, string>|null} extensions
-       * @param {{ maxDecompressedMessageSize?: number }} [options]
+       * @param {{ maxFragments?: number, maxPayloadSize?: number }} [options]
        */
       constructor(ws, extensions, options = {}) {
         super();
         this.ws = ws;
         this.#extensions = extensions == null ? /* @__PURE__ */ new Map() : extensions;
-        this.#options = options;
+        this.#maxFragments = options.maxFragments ?? 0;
+        this.#maxPayloadSize = options.maxPayloadSize ?? 0;
         if (this.#extensions.has("permessage-deflate")) {
           this.#extensions.set("permessage-deflate", new PerMessageDeflate(extensions, options));
         }
@@ -17186,6 +17483,13 @@ var require_receiver = __commonJS({
         this.#loop = true;
         this.run(callback);
       }
+      #validatePayloadLength() {
+        if (this.#maxPayloadSize > 0 && !isControlFrame(this.#info.opcode) && this.#info.payloadLength + this.#fragmentsBytes > this.#maxPayloadSize) {
+          failWebsocketConnectionWithCode(this.ws, 1009, "Payload size exceeds maximum allowed size");
+          return false;
+        }
+        return true;
+      }
       /**
        * Runs whenever a new chunk is received.
        * Callback is called whenever there are no more chunks buffering,
@@ -17245,6 +17549,9 @@ var require_receiver = __commonJS({
             if (payloadLength <= 125) {
               this.#info.payloadLength = payloadLength;
               this.#state = parserStates.READ_DATA;
+              if (!this.#validatePayloadLength()) {
+                return;
+              }
             } else if (payloadLength === 126) {
               this.#state = parserStates.PAYLOADLENGTH_16;
             } else if (payloadLength === 127) {
@@ -17265,6 +17572,9 @@ var require_receiver = __commonJS({
             const buffer = this.consume(2);
             this.#info.payloadLength = buffer.readUInt16BE(0);
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.PAYLOADLENGTH_64) {
             if (this.#byteOffset < 8) {
               return callback();
@@ -17278,6 +17588,9 @@ var require_receiver = __commonJS({
             }
             this.#info.payloadLength = lower;
             this.#state = parserStates.READ_DATA;
+            if (!this.#validatePayloadLength()) {
+              return;
+            }
           } else if (this.#state === parserStates.READ_DATA) {
             if (this.#byteOffset < this.#info.payloadLength) {
               return callback();
@@ -17288,32 +17601,46 @@ var require_receiver = __commonJS({
               this.#state = parserStates.INFO;
             } else {
               if (!this.#info.compressed) {
-                this.#fragments.push(body);
+                if (!this.writeFragments(body)) {
+                  return;
+                }
+                if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                  failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                  return;
+                }
                 if (!this.#info.fragmented && this.#info.fin) {
-                  const fullMessage = Buffer.concat(this.#fragments);
-                  websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage);
-                  this.#fragments.length = 0;
+                  websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                 }
                 this.#state = parserStates.INFO;
               } else {
-                this.#extensions.get("permessage-deflate").decompress(body, this.#info.fin, (error2, data) => {
-                  if (error2) {
-                    failWebsocketConnection(this.ws, error2.message);
-                    return;
-                  }
-                  this.#fragments.push(data);
-                  if (!this.#info.fin) {
-                    this.#state = parserStates.INFO;
+                this.#extensions.get("permessage-deflate").decompress(
+                  body,
+                  this.#info.fin,
+                  (error2, data) => {
+                    if (error2) {
+                      const code = error2 instanceof MessageSizeExceededError ? 1009 : 1007;
+                      failWebsocketConnectionWithCode(this.ws, code, error2.message);
+                      return;
+                    }
+                    if (!this.writeFragments(data)) {
+                      return;
+                    }
+                    if (this.#maxPayloadSize > 0 && this.#fragmentsBytes > this.#maxPayloadSize) {
+                      failWebsocketConnectionWithCode(this.ws, 1009, new MessageSizeExceededError().message);
+                      return;
+                    }
+                    if (!this.#info.fin) {
+                      this.#state = parserStates.INFO;
+                      this.#loop = true;
+                      this.run(callback);
+                      return;
+                    }
+                    websocketMessageReceived(this.ws, this.#info.binaryType, this.consumeFragments());
                     this.#loop = true;
+                    this.#state = parserStates.INFO;
                     this.run(callback);
-                    return;
                   }
-                  websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments));
-                  this.#loop = true;
-                  this.#state = parserStates.INFO;
-                  this.#fragments.length = 0;
-                  this.run(callback);
-                });
+                );
                 this.#loop = false;
                 break;
               }
@@ -17356,6 +17683,26 @@ var require_receiver = __commonJS({
         this.#byteOffset -= n;
         return buffer;
       }
+      writeFragments(fragment) {
+        if (this.#maxFragments > 0 && this.#fragments.length === this.#maxFragments) {
+          failWebsocketConnectionWithCode(this.ws, 1008, "Too many message fragments");
+          return false;
+        }
+        this.#fragmentsBytes += fragment.length;
+        this.#fragments.push(fragment);
+        return true;
+      }
+      consumeFragments() {
+        const fragments = this.#fragments;
+        if (fragments.length === 1) {
+          this.#fragmentsBytes = 0;
+          return fragments.shift();
+        }
+        const output = Buffer.concat(fragments, this.#fragmentsBytes);
+        this.#fragments = [];
+        this.#fragmentsBytes = 0;
+        return output;
+      }
       parseCloseBody(data) {
         assert(data.length !== 1);
         let code;
@@ -17567,8 +17914,6 @@ var require_websocket = __commonJS({
       #extensions = "";
       /** @type {SendQueue} */
       #sendQueue;
-      /** @type {{ maxDecompressedMessageSize?: number }} */
-      #options;
       /**
        * @param {string} url
        * @param {string|string[]} protocols
@@ -17612,9 +17957,6 @@ var require_websocket = __commonJS({
           throw new DOMException("Invalid Sec-WebSocket-Protocol value", "SyntaxError");
         }
         this[kWebSocketURL] = new URL(urlRecord.href);
-        this.#options = {
-          maxDecompressedMessageSize: options.maxDecompressedMessageSize
-        };
         const client = environmentSettingsObject.settingsObject;
         this[kController] = establishWebSocketConnection(
           urlRecord,
@@ -17798,7 +18140,13 @@ var require_websocket = __commonJS({
        */
       #onConnectionEstablished(response, parsedExtensions) {
         this[kResponse] = response;
-        const parser = new ByteParser(this, parsedExtensions, this.#options);
+        const webSocketOptions = this[kController]?.dispatcher?.webSocketOptions;
+        const maxFragments = webSocketOptions?.maxFragments;
+        const maxPayloadSize = webSocketOptions?.maxPayloadSize;
+        const parser = new ByteParser(this, parsedExtensions, {
+          maxFragments,
+          maxPayloadSize
+        });
         parser.on("drain", onParserDrain);
         parser.on("error", onParserError.bind(this));
         response.socket.ws = this;
@@ -17873,19 +18221,6 @@ var require_websocket = __commonJS({
       {
         key: "headers",
         converter: webidl.nullableConverter(webidl.converters.HeadersInit)
-      },
-      {
-        key: "maxDecompressedMessageSize",
-        converter: webidl.nullableConverter((V) => {
-          V = webidl.converters["unsigned long long"](V);
-          if (V <= 0) {
-            throw webidl.errors.exception({
-              header: "WebSocket constructor",
-              message: "maxDecompressedMessageSize must be greater than 0"
-            });
-          }
-          return V;
-        })
       }
     ]);
     webidl.converters["DOMString or sequence<DOMString> or WebSocketInit"] = function(V) {
@@ -17964,6 +18299,40 @@ var require_eventsource_stream = __commonJS({
     var CR = 13;
     var COLON = 58;
     var SPACE = 32;
+    var DATA = Buffer.from("data");
+    var EVENT = Buffer.from("event");
+    var ID = Buffer.from("id");
+    var RETRY = Buffer.from("retry");
+    function isASCIINumberBytes(buffer, start) {
+      if (start >= buffer.length) {
+        return false;
+      }
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] < 48 || buffer[i] > 57) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isValidLastEventIdBytes(buffer, start) {
+      for (let i = start; i < buffer.length; i++) {
+        if (buffer[i] === 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function isFieldName(line, length, field) {
+      if (length !== field.length) {
+        return false;
+      }
+      for (let i = 0; i < length; i++) {
+        if (line[i] !== field[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
     var EventSourceStream = class extends Transform {
       /**
        * @type {eventSourceSettings}
@@ -17983,10 +18352,13 @@ var require_eventsource_stream = __commonJS({
        */
       eventEndCheck = false;
       /**
-       * @type {Buffer}
+       * @type {Buffer[]}
        */
-      buffer = null;
+      chunks = [];
+      chunkIndex = 0;
       pos = 0;
+      lineChunkIndex = 0;
+      linePos = 0;
       event = {
         data: void 0,
         event: void 0,
@@ -18017,63 +18389,30 @@ var require_eventsource_stream = __commonJS({
           callback();
           return;
         }
-        if (this.buffer) {
-          this.buffer = Buffer.concat([this.buffer, chunk]);
-        } else {
-          this.buffer = chunk;
-        }
+        this.chunks.push(chunk);
         if (this.checkBOM) {
-          switch (this.buffer.length) {
-            case 1:
-              if (this.buffer[0] === BOM[0]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              callback();
-              return;
-            case 2:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1]) {
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            case 3:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = Buffer.alloc(0);
-                this.checkBOM = false;
-                callback();
-                return;
-              }
-              this.checkBOM = false;
-              break;
-            default:
-              if (this.buffer[0] === BOM[0] && this.buffer[1] === BOM[1] && this.buffer[2] === BOM[2]) {
-                this.buffer = this.buffer.subarray(3);
-              }
-              this.checkBOM = false;
-              break;
+          if (this.handleBOM()) {
+            callback();
+            return;
           }
         }
-        while (this.pos < this.buffer.length) {
+        while (this.hasCurrentByte()) {
+          const byte = this.currentByte();
           if (this.eventEndCheck) {
             if (this.crlfCheck) {
-              if (this.buffer[this.pos] === LF) {
-                this.buffer = this.buffer.subarray(this.pos + 1);
-                this.pos = 0;
+              if (byte === LF) {
                 this.crlfCheck = false;
+                this.consumeCurrentByte();
                 continue;
               }
               this.crlfCheck = false;
             }
-            if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-              if (this.buffer[this.pos] === CR) {
+            if (byte === LF || byte === CR) {
+              if (byte === CR) {
                 this.crlfCheck = true;
               }
-              this.buffer = this.buffer.subarray(this.pos + 1);
-              this.pos = 0;
-              if (this.event.data !== void 0 || this.event.event || this.event.id || this.event.retry) {
+              this.consumeCurrentByte();
+              if (this.hasPendingEvent()) {
                 this.processEvent(this.event);
               }
               this.clearEvent();
@@ -18082,17 +18421,16 @@ var require_eventsource_stream = __commonJS({
             this.eventEndCheck = false;
             continue;
           }
-          if (this.buffer[this.pos] === LF || this.buffer[this.pos] === CR) {
-            if (this.buffer[this.pos] === CR) {
+          if (byte === LF || byte === CR) {
+            if (byte === CR) {
               this.crlfCheck = true;
             }
-            this.parseLine(this.buffer.subarray(0, this.pos), this.event);
-            this.buffer = this.buffer.subarray(this.pos + 1);
-            this.pos = 0;
+            this.parseLine(this.readLine(), this.event);
+            this.consumeCurrentByte();
             this.eventEndCheck = true;
             continue;
           }
-          this.pos++;
+          this.advanceCursor();
         }
         callback();
       }
@@ -18108,43 +18446,42 @@ var require_eventsource_stream = __commonJS({
         if (colonPosition === 0) {
           return;
         }
-        let field = "";
-        let value = "";
+        let fieldLength = line.length;
+        let valueStart = line.length;
         if (colonPosition !== -1) {
-          field = line.subarray(0, colonPosition).toString("utf8");
-          let valueStart = colonPosition + 1;
+          fieldLength = colonPosition;
+          valueStart = colonPosition + 1;
           if (line[valueStart] === SPACE) {
             ++valueStart;
           }
-          value = line.subarray(valueStart).toString("utf8");
-        } else {
-          field = line.toString("utf8");
-          value = "";
         }
-        switch (field) {
-          case "data":
-            if (event[field] === void 0) {
-              event[field] = value;
-            } else {
-              event[field] += `
+        if (isFieldName(line, fieldLength, DATA)) {
+          const value = line.toString("utf8", valueStart);
+          if (event.data === void 0) {
+            event.data = value;
+          } else {
+            event.data += `
 ${value}`;
-            }
-            break;
-          case "retry":
-            if (isASCIINumber(value)) {
-              event[field] = value;
-            }
-            break;
-          case "id":
-            if (isValidLastEventId(value)) {
-              event[field] = value;
-            }
-            break;
-          case "event":
-            if (value.length > 0) {
-              event[field] = value;
-            }
-            break;
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, RETRY)) {
+          if (isASCIINumberBytes(line, valueStart)) {
+            event.retry = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, ID)) {
+          if (isValidLastEventIdBytes(line, valueStart)) {
+            event.id = line.toString("utf8", valueStart);
+          }
+          return;
+        }
+        if (isFieldName(line, fieldLength, EVENT)) {
+          const value = line.toString("utf8", valueStart);
+          if (value.length > 0) {
+            event.event = value;
+          }
         }
       }
       /**
@@ -18169,12 +18506,120 @@ ${value}`;
         }
       }
       clearEvent() {
-        this.event = {
-          data: void 0,
-          event: void 0,
-          id: void 0,
-          retry: void 0
-        };
+        this.event.data = void 0;
+        this.event.event = void 0;
+        this.event.id = void 0;
+        this.event.retry = void 0;
+      }
+      hasPendingEvent() {
+        return this.event.data !== void 0 || this.event.event !== void 0 || this.event.id !== void 0 || this.event.retry !== void 0;
+      }
+      hasCurrentByte() {
+        return this.chunkIndex < this.chunks.length && this.pos < this.chunks[this.chunkIndex].length;
+      }
+      currentByte() {
+        return this.chunks[this.chunkIndex][this.pos];
+      }
+      consumeCurrentByte() {
+        this.advanceCursor();
+        this.syncLineStartToCursor();
+      }
+      advanceCursor() {
+        this.pos++;
+        while (this.chunkIndex < this.chunks.length && this.pos >= this.chunks[this.chunkIndex].length) {
+          this.chunkIndex++;
+          this.pos = 0;
+        }
+      }
+      syncLineStartToCursor() {
+        this.lineChunkIndex = this.chunkIndex;
+        this.linePos = this.pos;
+        this.dropConsumedChunks();
+      }
+      dropConsumedChunks() {
+        while (this.lineChunkIndex > 0) {
+          this.chunks.shift();
+          this.lineChunkIndex--;
+          this.chunkIndex--;
+        }
+        if (this.chunkIndex === this.chunks.length) {
+          this.chunks.length = 0;
+          this.chunkIndex = 0;
+          this.pos = 0;
+          this.lineChunkIndex = 0;
+          this.linePos = 0;
+        }
+      }
+      readLine() {
+        if (this.lineChunkIndex === this.chunkIndex) {
+          return this.chunks[this.chunkIndex].subarray(this.linePos, this.pos);
+        }
+        const chunks = [];
+        let length = 0;
+        for (let i = this.lineChunkIndex; i <= this.chunkIndex; i++) {
+          const chunk = this.chunks[i];
+          const start = i === this.lineChunkIndex ? this.linePos : 0;
+          const end = i === this.chunkIndex ? this.pos : chunk.length;
+          const slice = chunk.subarray(start, end);
+          length += slice.length;
+          chunks.push(slice);
+        }
+        return Buffer.concat(chunks, length);
+      }
+      peekBufferedByte(offset) {
+        let chunkIndex = this.lineChunkIndex;
+        let pos = this.linePos;
+        while (chunkIndex < this.chunks.length) {
+          const chunk = this.chunks[chunkIndex];
+          const remaining = chunk.length - pos;
+          if (offset < remaining) {
+            return chunk[pos + offset];
+          }
+          offset -= remaining;
+          chunkIndex++;
+          pos = 0;
+        }
+      }
+      discardLeadingBytes(count) {
+        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+          const chunk = this.chunks[this.lineChunkIndex];
+          const remaining = chunk.length - this.linePos;
+          if (count < remaining) {
+            this.linePos += count;
+            count = 0;
+          } else {
+            count -= remaining;
+            this.lineChunkIndex++;
+            this.linePos = 0;
+          }
+        }
+        this.chunkIndex = this.lineChunkIndex;
+        this.pos = this.linePos;
+        this.dropConsumedChunks();
+      }
+      handleBOM() {
+        const first = this.peekBufferedByte(0);
+        const second = this.peekBufferedByte(1);
+        const third = this.peekBufferedByte(2);
+        if (second === void 0) {
+          if (first === BOM[0]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return true;
+        }
+        if (third === void 0) {
+          if (first === BOM[0] && second === BOM[1]) {
+            return true;
+          }
+          this.checkBOM = false;
+          return false;
+        }
+        if (first === BOM[0] && second === BOM[1] && third === BOM[2]) {
+          this.discardLeadingBytes(3);
+        }
+        this.checkBOM = false;
+        return !this.hasCurrentByte();
       }
     };
     module.exports = {

From 3f53b8f63bd3b6a416293ab3a7b75f3b3c230dd9 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 05:54:17 +0000
Subject: [PATCH 440/781] Remove review-flagged comments

Co-authored-by: huult <huult@users.noreply.github.com>
---
 src/hooks/usePolicyForMovingExpenses.ts | 3 ---
 src/pages/Search/EmptySearchView.tsx    | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/hooks/usePolicyForMovingExpenses.ts b/src/hooks/usePolicyForMovingExpenses.ts
index 732502112d89..7cc5f96cd51b 100644
--- a/src/hooks/usePolicyForMovingExpenses.ts
+++ b/src/hooks/usePolicyForMovingExpenses.ts
@@ -22,7 +22,6 @@ function checkForUserPendingDelete(login: string, policy: OnyxEntry<Policy>) {
     return isPolicyMemberWithoutPendingDelete(login, policy);
 }
 
-// `policy.role` is only set on the active policy, so fall back to `getPolicyRole` (matches `getGroupPoliciesWhereReportCanBeCreated`).
 function isPolicyMemberByRole(policy: OnyxEntry<Policy>, login: string) {
     const role = getPolicyRole(policy, login);
     return !!role && (Object.values(CONST.POLICY.ROLE) as string[]).includes(role);
@@ -130,9 +129,7 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
         return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
     }
 
-    // User has no eligible policy
     if (!resolvedPolicyID) {
-        // The active workspace may still be valid when qualification finds nothing, so check it before the upgrade path.
         if (isPolicyValidForMovingExpenses(activePolicy, login, isPerDiemRequest, isTimeRequest)) {
             return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false, shouldNavigateToUpgradePath: false, arePoliciesLoaded};
         }
diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx
index 39fbdeae163c..3392b5e910b2 100644
--- a/src/pages/Search/EmptySearchView.tsx
+++ b/src/pages/Search/EmptySearchView.tsx
@@ -87,8 +87,6 @@ function EmptySearchView({similarSearchHash, type, hasResults, queryJSON, violat
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);
 
-    // The login is required for the `employeeList` role fallback in `getPolicyRole`. Without it, every policy
-    // that only carries the member's role in `employeeList` is filtered out and the user looks workspace-less.
     const groupPoliciesWithChatEnabled = getGroupPoliciesWhereReportCanBeCreated(allPolicies, currentUserPersonalDetails?.login);
 
     const [hasSeenTour = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {

From 84df4765b56987471550c9f262c06466bb90c8fe Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 12 Oct 2026 08:28:37 +0200
Subject: [PATCH 441/781] Fix blank-space long press on selectable expense rows

---
 .../MoneyRequestReportTransactionItem.tsx     | 31 ++++++--------
 ...stReportTransactionItemRejectErrorTest.tsx | 42 +++++++++++++++++--
 .../hooks/useCopyableTextRowPress.test.ts     | 34 ++++++++++++++-
 3 files changed, 85 insertions(+), 22 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index be7def652d03..7b1845a2d003 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -5,7 +5,7 @@ import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
 import TransactionItemRow from '@components/TransactionItemRow';
 
-import useCopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+import useCopyableTextRowPress, {isPressStartOnCopyableText} from '@hooks/useCopyableTextRowPress';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP';
@@ -101,14 +101,6 @@ type MoneyRequestReportTransactionItemBodyProps = Omit<MoneyRequestReportTransac
     shouldSkipDeferRBR?: boolean;
 };
 
-function getPressEventTarget(target: unknown): EventTarget | null {
-    if (typeof EventTarget === 'undefined' || !(target instanceof EventTarget)) {
-        return null;
-    }
-
-    return target;
-}
-
 function MoneyRequestReportTransactionItemBody({
     transaction,
     violations,
@@ -179,8 +171,8 @@ function MoneyRequestReportTransactionItemBody({
     // Keep this ref local so React Compiler can prove the after-render event mutations are safe.
     const wasEditingOnMouseDownRef = useRef(false);
     const wasEditingOnPressInRef = useRef(false);
-    const wasPressInOnCopyableTextRef = useRef(false);
-    const {markMouseDownOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
+    const wasTouchStartOnCopyableTextRef = useRef(false);
+    const {markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowPress} = useCopyableTextRowPress();
 
     useEffect(() => {
         if (!wasRecentlyEditingCell) {
@@ -220,18 +212,20 @@ function MoneyRequestReportTransactionItemBody({
         handleOnPress(transaction.transactionID);
     };
 
-    const handlePressIn: React.ComponentProps<typeof PressableWithFeedback>['onPressIn'] = (event) => {
+    const handleTouchStart: React.ComponentProps<typeof PressableWithFeedback>['onTouchStart'] = (event) => {
+        const isCopyableTextTouchStart = isPressStartOnCopyableText(event);
+        wasTouchStartOnCopyableTextRef.current = markTouchStartOnCopyableText(event, isCopyableTextTouchStart);
+    };
+
+    const handlePressIn: React.ComponentProps<typeof PressableWithFeedback>['onPressIn'] = () => {
         wasEditingOnPressInRef.current = isEditingCell;
-        wasPressInOnCopyableTextRef.current = false;
         // Selection only needs to be blocked for touch interactions; desktop mouse selection is handled by onMouseDown.
         if (!canUseTouchScreen()) {
             return;
         }
 
         // Let copyable values use native long-press/drag selection instead of applying the global selection blocker.
-        const isCopyableTarget = markMouseDownOnCopyableText(getPressEventTarget(event?.target));
-        wasPressInOnCopyableTextRef.current = isCopyableTarget;
-        if (isCopyableTarget) {
+        if (wasTouchStartOnCopyableTextRef.current) {
             return;
         }
 
@@ -241,14 +235,14 @@ function MoneyRequestReportTransactionItemBody({
 
     const handlePressableLongPress = () => {
         // Let touch-web long presses on copyable values complete native text selection without opening row actions.
-        if (wasPressInOnCopyableTextRef.current) {
+        if (wasTouchStartOnCopyableTextRef.current) {
             return;
         }
         handleLongPress(transaction.transactionID);
     };
 
     const handlePressOut = () => {
-        wasPressInOnCopyableTextRef.current = false;
+        wasTouchStartOnCopyableTextRef.current = false;
         ControlSelection.unblock();
     };
 
@@ -281,6 +275,7 @@ function MoneyRequestReportTransactionItemBody({
                 hoverStyle={[isSelectable && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
                 dataSet={COPYABLE_ROW_DATA_SET}
                 onMouseDown={handleMouseDown}
+                onTouchStart={handleTouchStart}
                 onHoverIn={handleHoverIn}
                 onPressIn={handlePressIn}
                 onPressOut={handlePressOut}
diff --git a/tests/ui/MoneyRequestReportTransactionItemRejectErrorTest.tsx b/tests/ui/MoneyRequestReportTransactionItemRejectErrorTest.tsx
index a8de9d6ddda3..bd507d4ea0b7 100644
--- a/tests/ui/MoneyRequestReportTransactionItemRejectErrorTest.tsx
+++ b/tests/ui/MoneyRequestReportTransactionItemRejectErrorTest.tsx
@@ -6,6 +6,10 @@ import MoneyRequestReportTransactionItem from '@components/MoneyRequestReportVie
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 
+import type * as CopyableTextRowPress from '@hooks/useCopyableTextRowPress';
+
+import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
+
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,6 +26,15 @@ import {translateLocal} from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
 jest.mock('@react-navigation/native');
+jest.mock('@libs/DeviceCapabilities/canUseTouchScreen', () => jest.fn());
+
+const mockIsPressStartOnCopyableText = jest.fn<boolean, [unknown]>();
+jest.mock('@hooks/useCopyableTextRowPress', () => {
+    const actual = jest.requireActual<typeof CopyableTextRowPress>('@hooks/useCopyableTextRowPress');
+    return {...actual, __esModule: true, default: actual.default, isPressStartOnCopyableText: (event: unknown) => mockIsPressStartOnCopyableText(event)};
+});
+
+const mockedCanUseTouchScreen = jest.mocked(canUseTouchScreen);
 
 const REPORT_ID = '12345';
 const TRANSACTION_ID = '67890';
@@ -62,6 +75,11 @@ describe('MoneyRequestReportTransactionItem - reject errors', () => {
         return waitForBatchedUpdatesWithAct();
     });
 
+    beforeEach(() => {
+        mockedCanUseTouchScreen.mockReturnValue(false);
+        mockIsPressStartOnCopyableText.mockReturnValue(false);
+    });
+
     afterEach(async () => {
         await act(async () => {
             await Onyx.clear();
@@ -70,7 +88,7 @@ describe('MoneyRequestReportTransactionItem - reject errors', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
-    async function renderTransactionItem(transaction: Transaction, handleOnPress = jest.fn()) {
+    async function renderTransactionItem(transaction: Transaction, handleOnPress = jest.fn(), handleLongPress = jest.fn()) {
         await act(async () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
             await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction);
@@ -89,7 +107,7 @@ describe('MoneyRequestReportTransactionItem - reject errors', () => {
                             isSelectionModeEnabled={false}
                             toggleTransaction={jest.fn()}
                             handleOnPress={handleOnPress}
-                            handleLongPress={jest.fn()}
+                            handleLongPress={handleLongPress}
                             isSelected={false}
                             dateColumnSize={CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL}
                             postedColumnSize={CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL}
@@ -105,7 +123,7 @@ describe('MoneyRequestReportTransactionItem - reject errors', () => {
         );
         await waitForBatchedUpdatesWithAct();
 
-        return {handleOnPress};
+        return {handleLongPress, handleOnPress};
     }
 
     it('should show the translated copy instead of the English message the server sent', async () => {
@@ -147,6 +165,24 @@ describe('MoneyRequestReportTransactionItem - reject errors', () => {
         expect(handleOnPress).toHaveBeenCalledWith(TRANSACTION_ID);
     });
 
+    it('should open row actions when a long press starts in blank space inside a copyable cell', async () => {
+        // Given a touch device and a copyable cell whose element extends beyond its text
+        mockedCanUseTouchScreen.mockReturnValue(true);
+        mockIsPressStartOnCopyableText.mockReturnValue(false);
+        const copyableCell = document.createElement('span');
+        copyableCell.setAttribute(`data-${CONST.COPYABLE_TEXT_ELEMENT}`, 'true');
+        const {handleLongPress} = await renderTransactionItem(buildTransaction());
+        const row = screen.getByLabelText('View details');
+
+        // When the user long-presses the cell element outside the text glyphs
+        fireEvent(row, 'touchStart', {target: copyableCell});
+        fireEvent(row, 'pressIn', {target: copyableCell});
+        fireEvent(row, 'longPress');
+
+        // Then the row action remains available instead of treating the blank area as selectable text
+        expect(handleLongPress).toHaveBeenCalledWith(TRANSACTION_ID);
+    });
+
     it('should clear the reject error when it is dismissed', async () => {
         // Given: An expense left behind by a reject the server refused
         await renderTransactionItem(buildTransactionWithRejectError());
diff --git a/tests/unit/hooks/useCopyableTextRowPress.test.ts b/tests/unit/hooks/useCopyableTextRowPress.test.ts
index 4d2295185c19..4ba68ed38366 100644
--- a/tests/unit/hooks/useCopyableTextRowPress.test.ts
+++ b/tests/unit/hooks/useCopyableTextRowPress.test.ts
@@ -1,8 +1,13 @@
 import {renderHook} from '@testing-library/react-native';
 
 import type useCopyableTextRowPressModule from '../../../src/hooks/useCopyableTextRowPress/index';
+import type {isPressStartOnCopyableText as isPressStartOnCopyableTextModule} from '../../../src/hooks/useCopyableTextRowPress/index';
 
-const useCopyableTextRowPress = jest.requireActual<{default: typeof useCopyableTextRowPressModule}>('../../../src/hooks/useCopyableTextRowPress/index.ts').default;
+const copyableTextRowPressModule = jest.requireActual<{
+    default: typeof useCopyableTextRowPressModule;
+    isPressStartOnCopyableText: typeof isPressStartOnCopyableTextModule;
+}>('../../../src/hooks/useCopyableTextRowPress/index.ts');
+const {default: useCopyableTextRowPress, isPressStartOnCopyableText} = copyableTextRowPressModule;
 const originalGetClientRectsDescriptor = Object.getOwnPropertyDescriptor(Range.prototype, 'getClientRects');
 
 function getCopyableTextElement(): HTMLElement {
@@ -103,4 +108,31 @@ describe('useCopyableTextRowPress', () => {
         expect(result.current.isPressStartOnCopyableText(pressEvent)).toBe(true);
         expect(getClientRectsMock).toHaveBeenCalledTimes(1);
     });
+
+    it('does not treat blank space inside a copyable element as copyable text', () => {
+        // Given a copyable element whose layout extends beyond its rendered text
+        const copyableTextElement = getCopyableTextElement();
+        Object.defineProperty(Range.prototype, 'getClientRects', {
+            configurable: true,
+            value: () => [
+                {
+                    bottom: 20,
+                    height: 20,
+                    left: 0,
+                    right: 100,
+                    top: 0,
+                    width: 100,
+                    x: 0,
+                    y: 0,
+                    toJSON: () => ({}),
+                },
+            ],
+        });
+
+        // When the touch starts within the element but outside the text glyph bounds
+        const isCopyableText = isPressStartOnCopyableText({clientX: 150, clientY: 10, target: copyableTextElement});
+
+        // Then the blank area remains available for the row long-press action
+        expect(isCopyableText).toBe(false);
+    });
 });

From a43db490c97095f14f1f4e08b25199f203a1ae62 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 09:33:57 +0200
Subject: [PATCH 442/781] Read the chat last actor by ID for report preview
 avatars

---
 .../useReportPreviewSenderID.ts               | 26 ++++++-
 src/selectors/Report.ts                       |  5 ++
 tests/unit/getReportPreviewSenderIDTest.ts    |  2 +-
 tests/unit/useReportPreviewSenderIDTest.tsx   | 72 ++++++++++++++++++-
 4 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionAvatars/useReportPreviewSenderID.ts b/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
index 04b32bd0d0ea..dda689a5c839 100644
--- a/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
+++ b/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
@@ -13,6 +13,7 @@ import {isDM, isIOUReport} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {getReportLastActorAccountID} from '@src/selectors/Report';
 import {hasOnceLoadedReportActionsSelector, isLoadingInitialReportActionsSelector} from '@src/selectors/ReportMetaData';
 import type {OriginalMessageIOU, Policy, Report, ReportAction, ReportActions, Transaction} from '@src/types/onyx';
 
@@ -76,12 +77,17 @@ function hasPendingScanStateAndUnknownDirection(transaction: Transaction): boole
     return true;
 }
 
-function getPendingScanActorAccountID(transaction: Transaction, action: OnyxEntry<ReportAction>, iouReport: OnyxEntry<Report>, chatReport: OnyxEntry<Report>): number | undefined {
+function getPendingScanActorAccountID(
+    transaction: Transaction,
+    action: OnyxEntry<ReportAction>,
+    iouReport: OnyxEntry<Report>,
+    chatReportLastActorAccountID: number | undefined,
+): number | undefined {
     if (!hasPendingScanStateAndUnknownDirection(transaction)) {
         return undefined;
     }
 
-    const chatLastActorAccountID = Number(chatReport?.lastActorAccountID);
+    const chatLastActorAccountID = Number(chatReportLastActorAccountID);
     const validPendingScanActorAccountIDs = new Set([action?.childOwnerAccountID, action?.childManagerAccountID, iouReport?.ownerAccountID, iouReport?.managerID].filter(Boolean));
 
     if (
@@ -138,6 +144,9 @@ type GetReportPreviewSenderIDParams = {
     iouReport: OnyxEntry<Report>;
     action: OnyxEntry<ReportAction>;
     chatReport: OnyxEntry<Report>;
+
+    /** Last actor of the chat report, passed on its own because `chatReport` can be a projection without the `last*` fields */
+    chatReportLastActorAccountID?: number;
     iouActions: ReportAction[] | undefined;
     transactions: Transaction[] | undefined;
     attendeesPersonalDetails: PersonalDetailsByLogin;
@@ -151,6 +160,7 @@ function getReportPreviewSenderID({
     iouReport,
     action,
     chatReport,
+    chatReportLastActorAccountID,
     iouActions,
     transactions,
     attendeesPersonalDetails,
@@ -192,7 +202,10 @@ function getReportPreviewSenderID({
     }
 
     const transactionActorAccountIDs = transactions?.map((transaction) => {
-        return getIOUActionForTransactionID(activeIOUActions, transaction.transactionID)?.actorAccountID ?? getPendingScanActorAccountID(transaction, action, iouReport, chatReport);
+        return (
+            getIOUActionForTransactionID(activeIOUActions, transaction.transactionID)?.actorAccountID ??
+            getPendingScanActorAccountID(transaction, action, iouReport, chatReportLastActorAccountID)
+        );
     });
     const transactionSigns = transactions?.map((transaction) => getTransactionDirectionSign(transaction)) ?? [];
 
@@ -315,6 +328,12 @@ function useReportPreviewSenderID({iouReport, action, chatReport}: {action: Onyx
         return filteredTransactions;
     }, [reportTransactions, iouActions, shouldFetchData, iouReport?.transactionCount, action?.childMoneyRequestCount]);
 
+    // Read by ID rather than from `chatReport`, which can be a projection without the `last*` fields. This re-renders only
+    // when the last actor changes, not on every message.
+    const [chatReportLastActorAccountID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(shouldFetchData ? chatReport?.reportID : undefined)}`, {
+        selector: getReportLastActorAccountID,
+    });
+
     const [splits] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(shouldFetchData ? chatReport?.reportID : undefined)}`, {
         selector: getSplitsSelector,
     });
@@ -328,6 +347,7 @@ function useReportPreviewSenderID({iouReport, action, chatReport}: {action: Onyx
         iouReport,
         action,
         chatReport,
+        chatReportLastActorAccountID,
         iouActions,
         transactions,
         attendeesPersonalDetails,
diff --git a/src/selectors/Report.ts b/src/selectors/Report.ts
index 59d0e24a1f81..420af8121b15 100644
--- a/src/selectors/Report.ts
+++ b/src/selectors/Report.ts
@@ -39,6 +39,10 @@ function getReportPolicyID(report: OnyxEntry<Report>) {
     return report?.policyID;
 }
 
+function getReportLastActorAccountID(report: OnyxEntry<Report>) {
+    return report?.lastActorAccountID;
+}
+
 function getReportOwnerAccountID(report: OnyxEntry<Report>) {
     return report?.ownerAccountID;
 }
@@ -387,6 +391,7 @@ export {
     getReportOwnerAccountID,
     getReportParentReportID,
     getReportPolicyID,
+    getReportLastActorAccountID,
     policyIDsWithEmptyReportsSelector,
     canShowReportRecipientLocalTimeSelector,
     policyChatRoomsSelector,
diff --git a/tests/unit/getReportPreviewSenderIDTest.ts b/tests/unit/getReportPreviewSenderIDTest.ts
index daf99da8b6e2..f38f92499a04 100644
--- a/tests/unit/getReportPreviewSenderIDTest.ts
+++ b/tests/unit/getReportPreviewSenderIDTest.ts
@@ -336,7 +336,6 @@ describe('getReportPreviewSenderID', () => {
         const dmChat = createMock<Report>({
             reportID: 'dm-1',
             type: CONST.REPORT.TYPE.CHAT,
-            lastActorAccountID: MANAGER_ACCOUNT_ID,
             participants: {
                 [OWNER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
                 [MANAGER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
@@ -346,6 +345,7 @@ describe('getReportPreviewSenderID', () => {
         const result = getReportPreviewSenderID({
             ...baseParams,
             chatReport: dmChat,
+            chatReportLastActorAccountID: MANAGER_ACCOUNT_ID,
             iouReport: makeIOUReport({transactionCount: 2, ownerAccountID: OWNER_ACCOUNT_ID, managerID: MANAGER_ACCOUNT_ID}),
             action: makeAction({childMoneyRequestCount: 2, childLastActorAccountID: OWNER_ACCOUNT_ID}),
             iouActions: [
diff --git a/tests/unit/useReportPreviewSenderIDTest.tsx b/tests/unit/useReportPreviewSenderIDTest.tsx
index e43c96dadb0a..9706a6203209 100644
--- a/tests/unit/useReportPreviewSenderIDTest.tsx
+++ b/tests/unit/useReportPreviewSenderIDTest.tsx
@@ -9,7 +9,8 @@ import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
+import {getStableReportSelector} from '@src/selectors/Report';
+import type {Report, ReportAction, Transaction} from '@src/types/onyx';
 import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
 
 import React from 'react';
@@ -200,4 +201,73 @@ describe('useReportPreviewSenderID', () => {
         await waitForBatchedUpdatesWithAct();
         expect(result.current).toBe(CURRENT_USER_ACCOUNT_ID);
     });
+
+    it('reads the chat last actor by ID when the chat report is a projection without the last* fields', async () => {
+        // Given a DM where the manager just scanned a receipt: one request from the owner, one scan still pending with no
+        // amount yet, and the chat's last actor being the manager
+        const OWNER_ACCOUNT_ID = 200;
+        const MANAGER_ACCOUNT_ID = 300;
+        const dmChat: Report = {
+            reportID: '9001',
+            type: CONST.REPORT.TYPE.CHAT,
+            lastActorAccountID: MANAGER_ACCOUNT_ID,
+            participants: {
+                [OWNER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                [MANAGER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+            },
+        };
+        const iouReport: Report = {
+            reportID: '9002',
+            chatReportID: dmChat.reportID,
+            type: CONST.REPORT.TYPE.IOU,
+            transactionCount: 2,
+            ownerAccountID: OWNER_ACCOUNT_ID,
+            managerID: MANAGER_ACCOUNT_ID,
+        };
+        const ownerRequest: Transaction = {...transactionR14932, transactionID: '9101', reportID: iouReport.reportID, amount: 1200};
+        const pendingScan: Transaction = {
+            ...transactionR14932,
+            transactionID: '9102',
+            reportID: iouReport.reportID,
+            amount: 0,
+            receipt: {source: 'receipt.jpg', state: CONST.IOU.RECEIPT_STATE.SCANNING},
+        };
+        const ownerRequestAction = {
+            ...actionR14932,
+            reportActionID: '9201',
+            actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+            actorAccountID: OWNER_ACCOUNT_ID,
+            originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, IOUTransactionID: ownerRequest.transactionID, amount: 1200, currency: 'USD'},
+        } as ReportAction;
+        await act(async () => {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${dmChat.reportID}`, dmChat);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`, {[ownerRequestAction.reportActionID]: ownerRequestAction});
+            await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${ownerRequest.transactionID}`, ownerRequest);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${pendingScan.transactionID}`, pendingScan);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${iouReport.reportID}`, {hasOnceLoadedReportActions: true});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the avatars get the chat report as the stable projection, which drops `lastActorAccountID`
+        const {result} = renderHook(
+            () =>
+                useReportPreviewSenderID({
+                    action: {
+                        ...validAction,
+                        childReportID: iouReport.reportID,
+                        childMoneyRequestCount: 2,
+                        childOwnerAccountID: OWNER_ACCOUNT_ID,
+                        childManagerAccountID: MANAGER_ACCOUNT_ID,
+                        childLastActorAccountID: OWNER_ACCOUNT_ID,
+                    },
+                    iouReport,
+                    chatReport: getStableReportSelector(dmChat),
+                }),
+            {wrapper},
+        );
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the pending scan is still attributed to the manager, so the preview keeps both avatars instead of collapsing to the owner
+        expect(result.current).toBeUndefined();
+    });
 });

From ff40d0cf592cb3a2979c9099efaf0a0744659135 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 10:28:21 +0200
Subject: [PATCH 443/781] Revert stable report projections in action avatars
 for now

---
 src/components/ReportActionAvatars/index.tsx  |  3 +-
 .../useReportActionAvatars.ts                 |  7 +-
 .../useReportPreviewSenderID.ts               | 26 +------
 src/selectors/Report.ts                       |  5 --
 tests/unit/getReportPreviewSenderIDTest.ts    |  2 +-
 tests/unit/useReportPreviewSenderIDTest.tsx   | 72 +------------------
 6 files changed, 9 insertions(+), 106 deletions(-)

diff --git a/src/components/ReportActionAvatars/index.tsx b/src/components/ReportActionAvatars/index.tsx
index a90d735c6bff..3970c3121711 100644
--- a/src/components/ReportActionAvatars/index.tsx
+++ b/src/components/ReportActionAvatars/index.tsx
@@ -17,7 +17,6 @@ import {sortIconsByName} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {getStableReportSelector} from '@src/selectors/Report';
 import type {InvitedEmailsToAccountIDs, Policy, Report, ReportAction} from '@src/types/onyx';
 import type {CardFeed} from '@src/types/onyx/CardFeeds';
 import type {Icon as IconType} from '@src/types/onyx/OnyxCommon';
@@ -126,7 +125,7 @@ function ReportActionAvatars({
 
     // reportID can be an empty string causing Onyx to fetch the whole collection
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const [reportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || undefined}`, {selector: getStableReportSelector});
+    const [reportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || undefined}`);
     // When the search hash changes, report from the snapshot will be undefined if it hasn't been fetched yet.
     // Therefore, we will fall back to reportProp while the data is being fetched.
     const report = reportFromOnyx ?? reportProp;
diff --git a/src/components/ReportActionAvatars/useReportActionAvatars.ts b/src/components/ReportActionAvatars/useReportActionAvatars.ts
index a4320ee71678..05fecf1a87c8 100644
--- a/src/components/ReportActionAvatars/useReportActionAvatars.ts
+++ b/src/components/ReportActionAvatars/useReportActionAvatars.ts
@@ -33,7 +33,6 @@ import {buildUserIcon} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {getReportPolicyID, getStableReportSelector} from '@src/selectors/Report';
 import {getReportActionByIDSelector} from '@src/selectors/ReportAction';
 import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData';
 import type {InvitedEmailsToAccountIDs, OnyxInputOrEntry, Policy, Report, ReportAction} from '@src/types/onyx';
@@ -83,7 +82,7 @@ function useReportActionAvatars({
     const isReportAChatReport = report?.type === CONST.REPORT.TYPE.CHAT && report?.chatType !== CONST.REPORT.CHAT_TYPE.TRIP_ROOM;
 
     const chatReportID = report?.chatReportID ?? passedChatReportID;
-    const [reportChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, {selector: getStableReportSelector});
+    const [reportChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);
 
     const chatReport = isReportAChatReport ? report : reportChatReport;
     const iouReport = isReportAChatReport ? undefined : report;
@@ -101,7 +100,7 @@ function useReportActionAvatars({
     // Support tickets use the assigned rep's avatar, not the parent message's author.
     const action = passedAction ?? (isSupportTicket(report) ? undefined : derivedAction);
 
-    const [actionChildReportPolicyID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${action?.childReportID}`, {selector: getReportPolicyID});
+    const [actionChildReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${action?.childReportID}`);
 
     const isAReportPreviewAction = action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
 
@@ -115,7 +114,7 @@ function useReportActionAvatars({
 
     const reportPolicyID = iouReport?.policyID ?? chatReport?.policyID;
     const chatReportPolicyIDExists = chatReport?.policyID === CONST.POLICY.ID_FAKE || !chatReport?.policyID;
-    const changedPolicyID = actionChildReportPolicyID ?? iouReport?.policyID;
+    const changedPolicyID = actionChildReport?.policyID ?? iouReport?.policyID;
     const shouldUseChangedPolicyID = !!changedPolicyID && changedPolicyID !== (reportPolicyID ?? iouReport?.policyID);
     const retrievedPolicyID = chatReportPolicyIDExists ? reportPolicyID : chatReport?.policyID;
 
diff --git a/src/components/ReportActionAvatars/useReportPreviewSenderID.ts b/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
index dda689a5c839..04b32bd0d0ea 100644
--- a/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
+++ b/src/components/ReportActionAvatars/useReportPreviewSenderID.ts
@@ -13,7 +13,6 @@ import {isDM, isIOUReport} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {getReportLastActorAccountID} from '@src/selectors/Report';
 import {hasOnceLoadedReportActionsSelector, isLoadingInitialReportActionsSelector} from '@src/selectors/ReportMetaData';
 import type {OriginalMessageIOU, Policy, Report, ReportAction, ReportActions, Transaction} from '@src/types/onyx';
 
@@ -77,17 +76,12 @@ function hasPendingScanStateAndUnknownDirection(transaction: Transaction): boole
     return true;
 }
 
-function getPendingScanActorAccountID(
-    transaction: Transaction,
-    action: OnyxEntry<ReportAction>,
-    iouReport: OnyxEntry<Report>,
-    chatReportLastActorAccountID: number | undefined,
-): number | undefined {
+function getPendingScanActorAccountID(transaction: Transaction, action: OnyxEntry<ReportAction>, iouReport: OnyxEntry<Report>, chatReport: OnyxEntry<Report>): number | undefined {
     if (!hasPendingScanStateAndUnknownDirection(transaction)) {
         return undefined;
     }
 
-    const chatLastActorAccountID = Number(chatReportLastActorAccountID);
+    const chatLastActorAccountID = Number(chatReport?.lastActorAccountID);
     const validPendingScanActorAccountIDs = new Set([action?.childOwnerAccountID, action?.childManagerAccountID, iouReport?.ownerAccountID, iouReport?.managerID].filter(Boolean));
 
     if (
@@ -144,9 +138,6 @@ type GetReportPreviewSenderIDParams = {
     iouReport: OnyxEntry<Report>;
     action: OnyxEntry<ReportAction>;
     chatReport: OnyxEntry<Report>;
-
-    /** Last actor of the chat report, passed on its own because `chatReport` can be a projection without the `last*` fields */
-    chatReportLastActorAccountID?: number;
     iouActions: ReportAction[] | undefined;
     transactions: Transaction[] | undefined;
     attendeesPersonalDetails: PersonalDetailsByLogin;
@@ -160,7 +151,6 @@ function getReportPreviewSenderID({
     iouReport,
     action,
     chatReport,
-    chatReportLastActorAccountID,
     iouActions,
     transactions,
     attendeesPersonalDetails,
@@ -202,10 +192,7 @@ function getReportPreviewSenderID({
     }
 
     const transactionActorAccountIDs = transactions?.map((transaction) => {
-        return (
-            getIOUActionForTransactionID(activeIOUActions, transaction.transactionID)?.actorAccountID ??
-            getPendingScanActorAccountID(transaction, action, iouReport, chatReportLastActorAccountID)
-        );
+        return getIOUActionForTransactionID(activeIOUActions, transaction.transactionID)?.actorAccountID ?? getPendingScanActorAccountID(transaction, action, iouReport, chatReport);
     });
     const transactionSigns = transactions?.map((transaction) => getTransactionDirectionSign(transaction)) ?? [];
 
@@ -328,12 +315,6 @@ function useReportPreviewSenderID({iouReport, action, chatReport}: {action: Onyx
         return filteredTransactions;
     }, [reportTransactions, iouActions, shouldFetchData, iouReport?.transactionCount, action?.childMoneyRequestCount]);
 
-    // Read by ID rather than from `chatReport`, which can be a projection without the `last*` fields. This re-renders only
-    // when the last actor changes, not on every message.
-    const [chatReportLastActorAccountID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(shouldFetchData ? chatReport?.reportID : undefined)}`, {
-        selector: getReportLastActorAccountID,
-    });
-
     const [splits] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(shouldFetchData ? chatReport?.reportID : undefined)}`, {
         selector: getSplitsSelector,
     });
@@ -347,7 +328,6 @@ function useReportPreviewSenderID({iouReport, action, chatReport}: {action: Onyx
         iouReport,
         action,
         chatReport,
-        chatReportLastActorAccountID,
         iouActions,
         transactions,
         attendeesPersonalDetails,
diff --git a/src/selectors/Report.ts b/src/selectors/Report.ts
index 613b3d67639e..79c50694ed48 100644
--- a/src/selectors/Report.ts
+++ b/src/selectors/Report.ts
@@ -41,10 +41,6 @@ function getReportPolicyID(report: OnyxEntry<Report>) {
     return report?.policyID;
 }
 
-function getReportLastActorAccountID(report: OnyxEntry<Report>) {
-    return report?.lastActorAccountID;
-}
-
 function getReportOwnerAccountID(report: OnyxEntry<Report>) {
     return report?.ownerAccountID;
 }
@@ -405,7 +401,6 @@ export {
     getReportOwnerAccountID,
     getReportParentReportID,
     getReportPolicyID,
-    getReportLastActorAccountID,
     policyIDsWithEmptyReportsSelector,
     canShowReportRecipientLocalTimeSelector,
     policyChatRoomsSelector,
diff --git a/tests/unit/getReportPreviewSenderIDTest.ts b/tests/unit/getReportPreviewSenderIDTest.ts
index f38f92499a04..daf99da8b6e2 100644
--- a/tests/unit/getReportPreviewSenderIDTest.ts
+++ b/tests/unit/getReportPreviewSenderIDTest.ts
@@ -336,6 +336,7 @@ describe('getReportPreviewSenderID', () => {
         const dmChat = createMock<Report>({
             reportID: 'dm-1',
             type: CONST.REPORT.TYPE.CHAT,
+            lastActorAccountID: MANAGER_ACCOUNT_ID,
             participants: {
                 [OWNER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
                 [MANAGER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
@@ -345,7 +346,6 @@ describe('getReportPreviewSenderID', () => {
         const result = getReportPreviewSenderID({
             ...baseParams,
             chatReport: dmChat,
-            chatReportLastActorAccountID: MANAGER_ACCOUNT_ID,
             iouReport: makeIOUReport({transactionCount: 2, ownerAccountID: OWNER_ACCOUNT_ID, managerID: MANAGER_ACCOUNT_ID}),
             action: makeAction({childMoneyRequestCount: 2, childLastActorAccountID: OWNER_ACCOUNT_ID}),
             iouActions: [
diff --git a/tests/unit/useReportPreviewSenderIDTest.tsx b/tests/unit/useReportPreviewSenderIDTest.tsx
index 9706a6203209..e43c96dadb0a 100644
--- a/tests/unit/useReportPreviewSenderIDTest.tsx
+++ b/tests/unit/useReportPreviewSenderIDTest.tsx
@@ -9,8 +9,7 @@ import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {getStableReportSelector} from '@src/selectors/Report';
-import type {Report, ReportAction, Transaction} from '@src/types/onyx';
+import type {Report} from '@src/types/onyx';
 import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
 
 import React from 'react';
@@ -201,73 +200,4 @@ describe('useReportPreviewSenderID', () => {
         await waitForBatchedUpdatesWithAct();
         expect(result.current).toBe(CURRENT_USER_ACCOUNT_ID);
     });
-
-    it('reads the chat last actor by ID when the chat report is a projection without the last* fields', async () => {
-        // Given a DM where the manager just scanned a receipt: one request from the owner, one scan still pending with no
-        // amount yet, and the chat's last actor being the manager
-        const OWNER_ACCOUNT_ID = 200;
-        const MANAGER_ACCOUNT_ID = 300;
-        const dmChat: Report = {
-            reportID: '9001',
-            type: CONST.REPORT.TYPE.CHAT,
-            lastActorAccountID: MANAGER_ACCOUNT_ID,
-            participants: {
-                [OWNER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
-                [MANAGER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
-            },
-        };
-        const iouReport: Report = {
-            reportID: '9002',
-            chatReportID: dmChat.reportID,
-            type: CONST.REPORT.TYPE.IOU,
-            transactionCount: 2,
-            ownerAccountID: OWNER_ACCOUNT_ID,
-            managerID: MANAGER_ACCOUNT_ID,
-        };
-        const ownerRequest: Transaction = {...transactionR14932, transactionID: '9101', reportID: iouReport.reportID, amount: 1200};
-        const pendingScan: Transaction = {
-            ...transactionR14932,
-            transactionID: '9102',
-            reportID: iouReport.reportID,
-            amount: 0,
-            receipt: {source: 'receipt.jpg', state: CONST.IOU.RECEIPT_STATE.SCANNING},
-        };
-        const ownerRequestAction = {
-            ...actionR14932,
-            reportActionID: '9201',
-            actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
-            actorAccountID: OWNER_ACCOUNT_ID,
-            originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, IOUTransactionID: ownerRequest.transactionID, amount: 1200, currency: 'USD'},
-        } as ReportAction;
-        await act(async () => {
-            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${dmChat.reportID}`, dmChat);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`, {[ownerRequestAction.reportActionID]: ownerRequestAction});
-            await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${ownerRequest.transactionID}`, ownerRequest);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${pendingScan.transactionID}`, pendingScan);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${iouReport.reportID}`, {hasOnceLoadedReportActions: true});
-            await waitForBatchedUpdatesWithAct();
-        });
-
-        // When the avatars get the chat report as the stable projection, which drops `lastActorAccountID`
-        const {result} = renderHook(
-            () =>
-                useReportPreviewSenderID({
-                    action: {
-                        ...validAction,
-                        childReportID: iouReport.reportID,
-                        childMoneyRequestCount: 2,
-                        childOwnerAccountID: OWNER_ACCOUNT_ID,
-                        childManagerAccountID: MANAGER_ACCOUNT_ID,
-                        childLastActorAccountID: OWNER_ACCOUNT_ID,
-                    },
-                    iouReport,
-                    chatReport: getStableReportSelector(dmChat),
-                }),
-            {wrapper},
-        );
-        await waitForBatchedUpdatesWithAct();
-
-        // Then the pending scan is still attributed to the manager, so the preview keeps both avatars instead of collapsing to the owner
-        expect(result.current).toBeUndefined();
-    });
 });

From 4d329246b7eb0400284247f1e024dbbb6e1846d6 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 12 Oct 2026 15:39:32 +0700
Subject: [PATCH 444/781] fix ts error

---
 src/pages/settings/EmailIssue/index.tsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/EmailIssue/index.tsx b/src/pages/settings/EmailIssue/index.tsx
index fc65099fe46a..363fc8aa439b 100644
--- a/src/pages/settings/EmailIssue/index.tsx
+++ b/src/pages/settings/EmailIssue/index.tsx
@@ -26,7 +26,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import {useIsFocused} from '@react-navigation/native';
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
 
@@ -42,7 +42,9 @@ function EmailIssuePage() {
 
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
+    const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
+    const hasCompletedGuidedSetupFlow = guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow;
     const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
 
     const hasEmailDeliveryFailure = !!account?.hasEmailDeliveryFailure;
@@ -122,7 +124,15 @@ function EmailIssuePage() {
                 <Button
                     size={CONST.BUTTON_SIZE.LARGE}
                     onPress={() => {
-                        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
+                        navigateToConciergeChat({
+                            conciergeReportID,
+                            introSelected,
+                            currentUserAccountID,
+                            isSelfTourViewed,
+                            hasCompletedGuidedSetupFlow,
+                            conciergePersonalDetails,
+                            shouldDismissModal: false,
+                        });
                     }}
                 >
                     <Button.Text>{translate('emailIssuePage.getHelpFromConcierge')}</Button.Text>

From c82e5915e6c98a4709ba592b06698129177c5ec4 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 09:51:57 +0100
Subject: [PATCH 445/781] add label gap padding

---
 src/components/Charts/BarChart/VerticalBarChartContent.tsx | 2 +-
 src/components/Charts/LineChart/LineChartContent.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index af52581431e4..b12a99cb4ae3 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -209,7 +209,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
     const labelSpace = shouldShowLabels ? VictoryTheme.axis.xAxisLabelGap + (xAxisLabelHeight ?? 0) : 0;
     const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
     const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VERTICAL_BAR_DOMAIN_PADDING);
-    const chartPadding = {...VictoryTheme.axis.padding, bottom: labelSpace + VictoryTheme.axis.padding.bottom, right: yAxisLabelWidth + GLYPH_PADDING};
+    const chartPadding = {...VictoryTheme.axis.padding, bottom: labelSpace + VictoryTheme.axis.padding.bottom, right: yAxisLabelWidth + GLYPH_PADDING + VictoryTheme.axis.labelGap};
 
     if (isLoading || !fontManager) {
         return (
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index a2375540b752..1827b39358ec 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -91,7 +91,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
     const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VictoryTheme.line.domainPadding);
 
     const tickSpacing = plotAreaWidth > 0 && data.length > 0 ? plotAreaWidth / data.length : 0;
-    const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING;
+    const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING + VictoryTheme.axis.labelGap;
 
     const domainPadding = (() => {
         if (!firstLabelWidth || !lastLabelWidth) {

From 965fd354df98f9e84b82b6396bdfcaf6bc77b19c Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 12 Oct 2026 15:52:58 +0700
Subject: [PATCH 446/781] refactor: remove unavailableTranslation from
 onyx.connect in ReportUtils.ts

---
 src/libs/ReportUtils.ts       | 49 ++++++++++++++-----
 tests/unit/ReportUtilsTest.ts | 92 +++++++++++++++++++++++++++++++----
 2 files changed, 119 insertions(+), 22 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 1ad33c915d77..b919b62a79e1 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1025,8 +1025,7 @@ type GetPolicyNameBaseParams = {
     reports?: Report[];
 };
 
-// TODO: We'll remove the optional (?) modifier from the unavailableTranslation parameter once https://github.com/Expensify/App/issues/66430 is completed.
-type GetPolicyNameParams = GetPolicyNameBaseParams & ({returnEmptyIfNotFound: true} | {returnEmptyIfNotFound?: false; unavailableTranslation?: string});
+type GetPolicyNameParams = GetPolicyNameBaseParams & ({returnEmptyIfNotFound: true} | {returnEmptyIfNotFound?: false; unavailableTranslation: string});
 
 type GetReportStatusParams = {
     stateNum?: number;
@@ -1247,7 +1246,6 @@ Onyx.connect({
 });
 
 let hiddenTranslation = '';
-let unavailableTranslation = '';
 
 Onyx.connect({
     key: ONYXKEYS.RAM_ONLY_ARE_TRANSLATIONS_LOADING,
@@ -1256,7 +1254,6 @@ Onyx.connect({
             return;
         }
         hiddenTranslation = translateLocal('common.hidden');
-        unavailableTranslation = translateLocal('workspace.common.unavailable');
     },
 });
 
@@ -1414,10 +1411,13 @@ function getPolicyType(report: OnyxInputOrEntry<Report>, policies: OnyxCollectio
 
 /**
  * Get the policy name from a given report
+ *
+ * Callers pass their own `unavailableTranslation` (the "Unavailable workspace" copy) for the case where no policy resolves, unless they
+ * pass `returnEmptyIfNotFound`. Builders that persist their output pass the English literal, everything else passes `translate('workspace.common.unavailable')`.
  */
 function getPolicyName(params: GetPolicyNameParams): string {
     const {report, policy, policies, reports} = params;
-    const noPolicyFound = params.returnEmptyIfNotFound ? '' : (params.unavailableTranslation ?? unavailableTranslation);
+    const noPolicyFound = params.returnEmptyIfNotFound ? '' : params.unavailableTranslation;
     const parentReport = report ? getRootParentReport({report, reports}) : undefined;
 
     // A caller that explicitly passes `policy` (e.g. a draft workspace's policy from getReportOption) can resolve a name
@@ -6810,10 +6810,18 @@ function getReportPreviewReportActionMessage(
     const {totalDisplaySpend: totalAmount} = getMoneyRequestSpendBreakdown(report);
 
     const parentReport = getParentReport(report);
-    const policyName = getPolicyName({report: parentReport ?? report, policy});
+    // Like the rest of this function, the workspace and participant fallbacks below are the raw English copy: this message is stored on a
+    // report action and read back by every viewer, so it must not follow the locale of whoever happened to build it. These mirror
+    // `workspace.common.unavailable` and `common.hidden` in `src/languages/en.ts`, and ReportUtilsTest asserts they do not drift from them.
+    const policyName = getPolicyName({report: parentReport ?? report, policy, unavailableTranslation: 'Unavailable workspace'});
     const payerName = isExpenseReport(report)
         ? policyName
-        : getDisplayNameForParticipant({accountID: report.managerID, shouldUseShortForm: !isPreviewMessageForParentChatReport, formatPhoneNumber: formatPhoneNumberPhoneUtils});
+        : getDisplayNameForParticipant({
+              accountID: report.managerID,
+              shouldUseShortForm: !isPreviewMessageForParentChatReport,
+              formatPhoneNumber: formatPhoneNumberPhoneUtils,
+              hiddenTranslation: 'Hidden',
+          });
 
     const formattedAmount = convertToDisplayStringEnLocale(totalAmount, report.currency, getCurrencyDecimals);
 
@@ -6870,7 +6878,12 @@ function getReportPreviewReportActionMessage(
         let actualPayerName =
             report.managerID === deprecatedCurrentUserAccountID && !isForListPreview
                 ? ''
-                : getDisplayNameForParticipant({accountID: payerAccountID, shouldUseShortForm: true, formatPhoneNumber: formatPhoneNumberPhoneUtils});
+                : getDisplayNameForParticipant({
+                      accountID: payerAccountID,
+                      shouldUseShortForm: true,
+                      formatPhoneNumber: formatPhoneNumberPhoneUtils,
+                      hiddenTranslation: 'Hidden',
+                  });
 
         actualPayerName = actualPayerName && isForListPreview && !isPreviewMessageForParentChatReport ? `${actualPayerName}:` : actualPayerName;
         const payerDisplayName = isPreviewMessageForParentChatReport ? payerName : actualPayerName;
@@ -6903,7 +6916,13 @@ function getReportPreviewReportActionMessage(
     }
 
     if (report.isWaitingOnBankAccount) {
-        const submitterDisplayName = getDisplayNameForParticipant({accountID: report.ownerAccountID, shouldUseShortForm: true, formatPhoneNumber: formatPhoneNumberPhoneUtils}) ?? '';
+        const submitterDisplayName =
+            getDisplayNameForParticipant({
+                accountID: report.ownerAccountID,
+                shouldUseShortForm: true,
+                formatPhoneNumber: formatPhoneNumberPhoneUtils,
+                hiddenTranslation: 'Hidden',
+            }) ?? '';
         return `started payment, but is waiting for ${submitterDisplayName} to add a personal bank account.`;
     }
 
@@ -6932,13 +6951,18 @@ function getReportPreviewReportActionMessage(
         // We only want to show the actor name in the preview if it's not the current user who took the action
         const requestorName =
             lastActorID && lastActorID !== deprecatedCurrentUserAccountID
-                ? getDisplayNameForParticipant({accountID: lastActorID, shouldUseShortForm: !isPreviewMessageForParentChatReport, formatPhoneNumber: formatPhoneNumberPhoneUtils})
+                ? getDisplayNameForParticipant({
+                      accountID: lastActorID,
+                      shouldUseShortForm: !isPreviewMessageForParentChatReport,
+                      formatPhoneNumber: formatPhoneNumberPhoneUtils,
+                      hiddenTranslation: 'Hidden',
+                  })
                 : '';
         return `${requestorName ? `${requestorName}: ` : ''}${amountToDisplay}${comment ? ` for ${comment}` : ''}`;
     }
 
     if (containsNonReimbursable) {
-        const ownerName = getDisplayNameForParticipant({accountID: report.ownerAccountID, formatPhoneNumber: formatPhoneNumberPhoneUtils}) ?? '';
+        const ownerName = getDisplayNameForParticipant({accountID: report.ownerAccountID, formatPhoneNumber: formatPhoneNumberPhoneUtils, hiddenTranslation: 'Hidden'}) ?? '';
         return `${ownerName} spent ${formattedAmount}`;
     }
     return `${payerName ?? ''} owes ${formattedAmount}${comment ? ` for ${comment}` : ''}`;
@@ -8013,7 +8037,8 @@ function buildOptimisticExpenseReport({
     const storedTotal = total * -1;
     const storedNonReimbursableTotal = nonReimbursableTotal * -1;
     const report = chatReportID ? getReportOrDraftReport(chatReportID) : undefined;
-    const policyName = getPolicyName({report});
+    // The report name below is stored in English (see the `reportName` comment), so its workspace fallback is the raw English copy too.
+    const policyName = getPolicyName({report, unavailableTranslation: 'Unavailable workspace'});
     const formattedTotal = convertToDisplayStringEnLocale(storedTotal, currency, getCurrencyDecimals);
     // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
     const policyReal = getPolicy(policyID);
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index b0009b7421cf..ce83fa0a72cb 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -18157,6 +18157,29 @@ describe('ReportUtils', () => {
             expect(expenseReport.reportName).toBe(`${fakePolicy.name} owes ${convertToDisplayString(-total, currency)}`);
         });
 
+        it('should keep the English workspace fallback in the report name when another locale is loaded', async () => {
+            // Given a chat report that cannot be resolved, so the report name falls back to the "unavailable workspace" copy
+            const chatReportID = '9999';
+            const total = 100;
+
+            // When the report is built while Spanish is the loaded locale
+            await IntlStore.load(CONST.LOCALES.ES).then(waitForBatchedUpdates);
+            const expenseReport = buildOptimisticExpenseReport({
+                rules: undefined,
+                chatReportID,
+                policyID: undefined,
+                payeeAccountID: 1,
+                total,
+                currency: CONST.CURRENCY.USD,
+                isASAPSubmitBetaEnabled: true,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+            });
+
+            // Then the name stays English, because it is persisted on the report and read back by every viewer regardless of their locale
+            expect(expenseReport.reportName).toContain(`${translate(CONST.LOCALES.EN, 'workspace.common.unavailable')} owes `);
+            expect(expenseReport.reportName).not.toContain(translate(CONST.LOCALES.ES, 'workspace.common.unavailable'));
+        });
+
         it('should set reportName to "New Report" when policy field list is empty', async () => {
             // Given a policy with an empty field list
             const policyID = '200';
@@ -20819,11 +20842,7 @@ describe('ReportUtils', () => {
                 // The localized preview differs between English and Spanish...
                 expect(getReportPreviewMessage(spanishTranslate, convertToDisplayString, params)).not.toBe(getReportPreviewMessage(englishTranslate, convertToDisplayString, params));
                 // ...but the report-action-message variant is always the English text, regardless of the loaded locale
-
-                // TODO: Re-enable this assertion once getReportPreviewReportActionMessage is refactored
-                // This will be done in the next PR https://github.com/Expensify/App/issues/66430.
-
-                // expect(getReportPreviewReportActionMessage(params, getCurrencyDecimalsLocal)).toBe(getReportPreviewMessage(englishTranslate, convertToDisplayString, params));
+                expect(getReportPreviewReportActionMessage(params, getCurrencyDecimalsLocal)).toBe(getReportPreviewMessage(englishTranslate, convertToDisplayString, params));
             });
 
             it('routes the participant display name through the injected translate function', async () => {
@@ -20874,6 +20893,30 @@ describe('ReportUtils', () => {
                 expect(result).toContain('owes');
             });
 
+            it('names a participant with no display name using the English "Hidden" copy when another locale is loaded', async () => {
+                // Given an IOU report whose payer has no name, so the payer resolves to the "hidden" copy
+                const hiddenManagerAccountID = 5544332;
+                const report: Report = {
+                    ...LHNTestUtils.getFakeReport(),
+                    reportID: 'preview-en-hidden-report',
+                    type: CONST.REPORT.TYPE.IOU,
+                    currency: CONST.CURRENCY.USD,
+                    managerID: hiddenManagerAccountID,
+                    stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                };
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+                await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[hiddenManagerAccountID]: {accountID: hiddenManagerAccountID, login: '', displayName: ''}});
+
+                // When the message is built while Spanish is the loaded locale, which the cached module-level translation used to follow
+                await IntlStore.load(CONST.LOCALES.ES).then(waitForBatchedUpdates);
+                const result = getReportPreviewReportActionMessage({reportOrID: report}, getCurrencyDecimalsLocal);
+
+                // Then the message stored on the report action names the participant in English, like the rest of its copy
+                expect(result).toContain(translate(CONST.LOCALES.EN, 'common.hidden'));
+                expect(result).not.toContain(translate(CONST.LOCALES.ES, 'common.hidden'));
+            });
+
             it('returns the English "spent" message when the report contains a non-reimbursable transaction, and matches en.ts', async () => {
                 const report: Report = {
                     ...LHNTestUtils.getFakeReport(),
@@ -23171,6 +23214,10 @@ describe('ReportUtils', () => {
     });
 
     describe('getPolicyName', () => {
+        // `unavailableTranslation` is required. The cases below all resolve a real policy name, so this is only the copy that
+        // must not surface in their assertions.
+        const unavailableTranslation = 'Unavailable workspace';
+
         const testPolicy: Policy = {
             ...createRandomPolicy(1),
             id: 'policy123',
@@ -23203,6 +23250,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: testReport,
                 policy: testPolicy,
+                unavailableTranslation,
             });
             expect(result).toBe('Test Policy Name');
         });
@@ -23217,6 +23265,7 @@ describe('ReportUtils', () => {
                 report: testReport,
                 policy: testPolicy,
                 policies: [otherPolicy],
+                unavailableTranslation,
             });
             expect(result).toBe('Test Policy Name');
         });
@@ -23233,6 +23282,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: reportWithoutPolicyName,
                 policy: testPolicy,
+                unavailableTranslation,
             });
             expect(result).toBe('Test Policy Name');
         });
@@ -23246,6 +23296,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: testReport,
                 policies,
+                unavailableTranslation,
             });
             expect(result).toBe('Found In Array');
         });
@@ -23258,6 +23309,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: testReport,
                 policies,
+                unavailableTranslation,
             });
             expect(result).toBe('Report Policy Name');
         });
@@ -23268,7 +23320,7 @@ describe('ReportUtils', () => {
                 policyID: 'nonexistent',
                 policyName: 'Fallback Policy Name',
             };
-            const result = getPolicyName({report});
+            const result = getPolicyName({report, unavailableTranslation});
             expect(result).toBe('Fallback Policy Name');
         });
 
@@ -23279,7 +23331,7 @@ describe('ReportUtils', () => {
                 policyName: undefined,
                 oldPolicyName: 'Old Fallback Name',
             };
-            const result = getPolicyName({report});
+            const result = getPolicyName({report, unavailableTranslation});
             expect(result).toBe('Old Fallback Name');
         });
 
@@ -23299,6 +23351,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: childReport,
                 reports: [parentReport, childReport],
+                unavailableTranslation,
             });
             expect(result).toBe('Parent Policy Name');
         });
@@ -23307,6 +23360,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: testReport,
                 policies: [],
+                unavailableTranslation,
             });
             expect(result).toBe('Report Policy Name');
         });
@@ -23315,6 +23369,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report: testReport,
                 policy: testPolicy,
+                unavailableTranslation,
             });
             expect(result).toBe('Test Policy Name');
         });
@@ -23334,7 +23389,7 @@ describe('ReportUtils', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${onyxPolicy.id}`, onyxPolicy);
             await waitForBatchedUpdates();
 
-            const result = getPolicyName({report});
+            const result = getPolicyName({report, unavailableTranslation});
             expect(result).toBe('Policy From Onyx');
 
             // Cleanup
@@ -23351,6 +23406,7 @@ describe('ReportUtils', () => {
             const result = getPolicyName({
                 report,
                 policies: [],
+                unavailableTranslation,
             });
             expect(result).toBe('Report Fallback Name');
         });
@@ -23387,7 +23443,7 @@ describe('ReportUtils', () => {
             };
 
             // No policy or policies passed, but allPolicies has the policy via Onyx
-            const result = getPolicyName({report});
+            const result = getPolicyName({report, unavailableTranslation});
             expect(result).toBe('Guard Test Policy');
 
             // Cleanup
@@ -23405,11 +23461,27 @@ describe('ReportUtils', () => {
             expect(result).toBe('Custom Unavailable');
         });
 
-        it('should prefer unavailableTranslation param over cached module-level translation', () => {
+        it('should use unavailableTranslation param when the report is missing entirely', () => {
             const result = getPolicyName({report: null, unavailableTranslation: 'Passed In'});
             expect(result).toBe('Passed In');
         });
 
+        it('should return the passed copy rather than the loaded locale, now that the module-level cache is gone', async () => {
+            // Given a report whose policy cannot be resolved, so the fallback copy is what gets returned
+            const report: Report = {
+                ...createRandomReport(1, undefined),
+                policyID: 'nonexistent',
+                policyName: undefined,
+                oldPolicyName: undefined,
+            };
+
+            // When Spanish is the loaded locale, which used to drive the cached module-level translation
+            await IntlStore.load(CONST.LOCALES.ES).then(waitForBatchedUpdates);
+
+            // Then the caller's string is returned untouched: the fallback no longer reads translations behind the caller's back
+            expect(getPolicyName({report, unavailableTranslation: translate(CONST.LOCALES.EN, 'workspace.common.unavailable')})).toBe('Unavailable workspace');
+        });
+
         it('should not use unavailableTranslation when returnEmptyIfNotFound is true', () => {
             const report: Report = {
                 ...createRandomReport(1, undefined),

From d816b8bffeb57aba4b8d3238c288a0f403fd7965 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:13:29 +0100
Subject: [PATCH 447/781] remove no-longer used labelOffset

---
 src/components/Charts/BarChart/VerticalBarChartContent.tsx | 1 -
 src/components/Charts/LineChart/LineChartContent.tsx       | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index b12a99cb4ae3..ee6c875606b4 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -254,7 +254,6 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
                                 tickCount: VictoryTheme.axis.tickCount,
                                 axisSide: 'right',
                                 lineWidth: 0,
-                                labelOffset: VictoryTheme.axis.labelGap,
                                 domain: yAxisDomain,
                             },
                         ]}
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index 1827b39358ec..ca99799b41ac 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -109,7 +109,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
 
         const edgeSpace = {
             left: Math.max(0, leftOverhang - VictoryTheme.axis.padding.left),
-            right: Math.max(0, rightOverhang - chartPaddingRight - VictoryTheme.axis.labelGap),
+            right: Math.max(0, rightOverhang - chartPaddingRight),
         };
         return {...VictoryTheme.line.domainPadding, ...getDomainPaddingForEdgeSpace(edgeSpace, plotAreaWidth)};
     })();
@@ -316,7 +316,6 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                                 tickCount: VictoryTheme.axis.tickCount,
                                 axisSide: 'right',
                                 lineWidth: 0,
-                                labelOffset: VictoryTheme.axis.labelGap,
                                 domain: yAxisDomain,
                             },
                         ]}

From f9f5c3a0555e2d54d1e9449bec740ab67229ac7a Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:19:27 +0100
Subject: [PATCH 448/781] fix no-op callbacks to do nothing

---
 src/hooks/useWorkspaceAgents.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index 572053e2210f..e74a23406859 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -54,10 +54,10 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
             disabled: isPendingDeletion,
             isSelectionDisabled: true,
             canManage: false,
-            action: () => null,
-            onChatPress: () => () => null,
-            onCopilotPress: () => () => null,
-            dismissError: () => () => null,
+            action: () => {},
+            onChatPress: () => {},
+            onCopilotPress: () => {},
+            dismissError: () => {},
         });
     }
 

From 68c6dd9a03279a5e396ee36ecc1acb2ccb9e5949 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:21:59 +0100
Subject: [PATCH 449/781] proper fallback

---
 src/hooks/useWorkspaceMembers.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/hooks/useWorkspaceMembers.ts b/src/hooks/useWorkspaceMembers.ts
index 12075ad388f8..b1bba0c4241a 100644
--- a/src/hooks/useWorkspaceMembers.ts
+++ b/src/hooks/useWorkspaceMembers.ts
@@ -58,13 +58,8 @@ function useWorkspaceMembers(policy: OnyxEntry<Policy>) {
 
         // Render a fallback identity (email as display name) when personal details are missing so the member
         // is still shown instead of being dropped from the list.
-        const details =
-            personalDetails?.[accountID] ??
-            ({
-                accountID,
-                login: email,
-                displayName: formatPhoneNumber(email),
-            } as PersonalDetails);
+        const fallbackDetails: PersonalDetails = {accountID, login: email, displayName: formatPhoneNumber(email)};
+        const details = personalDetails?.[accountID] ?? fallbackDetails;
 
         // If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails
         // We don't want to show guides as policy members unless the user is a guide. Some customers get confused when they

From ad37c144a20d0405b445450a3089ae82439fb652 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:22:53 +0100
Subject: [PATCH 450/781] resolve formatPhoneNumber from useLocalize hook

---
 src/hooks/useWorkspaceMembers.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useWorkspaceMembers.ts b/src/hooks/useWorkspaceMembers.ts
index b1bba0c4241a..3e7e1d5a7147 100644
--- a/src/hooks/useWorkspaceMembers.ts
+++ b/src/hooks/useWorkspaceMembers.ts
@@ -1,5 +1,4 @@
 import {openWorkspaceMembersPage} from '@libs/actions/Policy/Member';
-import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import {shouldFilterExpensifyTeam, isDeletedPolicyEmployee, isExpensifyTeam, canMemberRead, getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
 import {generateAccountID} from '@libs/UserUtils';
 
@@ -12,6 +11,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {useEffectEvent, useEffect} from 'react';
 
 import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useLocalize from './useLocalize';
 import useNetwork from './useNetwork';
 import {usePersonalDetailsByLogins} from './usePersonalDetailByLogin';
 import {useAllPersonalDetails} from './usePersonalDetails';
@@ -20,6 +20,7 @@ function useWorkspaceMembers(policy: OnyxEntry<Policy>) {
     const policyID = policy?.id;
     const policyOwner = policy?.owner;
 
+    const {formatPhoneNumber} = useLocalize();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const currentUserLogin = currentUserPersonalDetails.login;
     const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));

From 30b28f5f8a320adcf2148bdf37e8cbe4946bbb67 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:24:29 +0100
Subject: [PATCH 451/781] fix lint and seatbelt link

---
 config/eslint/eslint.seatbelt.tsv        | 2 +-
 src/pages/settings/Agents/AgentsPage.tsx | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 83de66f76551..ea150a2f1c90 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -1186,7 +1186,7 @@
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"react-hooks/refs"	1
 "../../src/pages/settings/Agents/DynamicAddAgentPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/DynamicAgentsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/AgentsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/DynamicEditAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx"	"no-restricted-imports"	1
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 900cc661ec4c..62751be9ee93 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -2,7 +2,6 @@ import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard';
-// eslint-disable-next-line no-restricted-imports
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import RenderHTML from '@components/RenderHTML';
 import ScreenWrapper from '@components/ScreenWrapper';

From a4dd799bb4ea24b7d7e82c91271a72aa720e7c1e Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:32:06 +0100
Subject: [PATCH 452/781] add comment

---
 src/hooks/useWorkspaceAgents.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index e74a23406859..289eef0f75c2 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -23,6 +23,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
         if (!isAgentOwnedByWorkspace && !isAgentMemberOfWorkspace) {
             return [];
         }
+        // Attach the workspace role to the agent row; the agent object is local to this flatMap and not shared
         // eslint-disable-next-line no-param-reassign
         agent.role = policyRoles.find((policyRole) => policyRole === agentMembership?.policyEmployee.role);
         return [agent];

From 3a68040499544fc2823bbd83c74a103dd1ae3c31 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:34:02 +0100
Subject: [PATCH 453/781] add comment explain why useAgents

---
 src/hooks/useAgents.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index d830f06d7d35..c6f0d4df9960 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -37,6 +37,9 @@ function handleErrorClose(pendingAction: PendingAction | null | undefined, accou
     }
 }
 
+/**
+ * Hook that derives the current user's manageable agent rows from Onyx and exposes selection and bulk-delete helpers for the Agents table.
+ */
 function useAgents() {
     useEffect(() => {
         openAgentsPage();

From 75518d8e1269d0107706a5d5c2228b8aee053ce8 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:34:41 +0100
Subject: [PATCH 454/781] add comment explain why useWorkspaceAgents

---
 src/hooks/useWorkspaceAgents.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index 289eef0f75c2..d247008981a1 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -8,6 +8,9 @@ import useNetwork from './useNetwork';
 import useWorkspaceAccountID from './useWorkspaceAccountID';
 import useWorkspaceMembers from './useWorkspaceMembers';
 
+/**
+ * Hook that returns the agent rows for a workspace: agents the user can manage joined with their workspace role, plus read-only rows for custom-agent members the user cannot manage.
+ */
 function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
     const {isOffline} = useNetwork();
     const policyID = policy?.id;

From aba706be3a201b387c94c7b5c3edaf6238fd2d72 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Mon, 12 Oct 2026 11:37:51 +0200
Subject: [PATCH 455/781] fix: iOS tab label font size comes from the
 typography scale token

---
 .../NativeTabNavigator/useNativeTabBarOptions/index.ios.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index f6142f252a13..fc210e7c1ed5 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -6,6 +6,7 @@ import getTabBarIcon from '@libs/Navigation/AppNavigator/Navigators/NativeTabNav
 import type {TabIconLayout} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer';
 import useTabAvatarImage from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useTabAvatarImage';
 
+import {fontScale} from '@styles/typography';
 import variables from '@styles/variables';
 
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -59,7 +60,7 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
                 text: tabLabels[name],
                 color: isSelected ? theme.text : theme.textSupporting,
                 isBold: isSelected,
-                fontSize: variables.fontSizeSmall,
+                fontSize: fontScale.micro,
                 gap: variables.nativeTabIconLabelGap,
                 maxWidth: labelMaxWidth,
             },

From 5b7eb603eb24e3cb75c1edac2ea898a900437b46 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:38:43 +0100
Subject: [PATCH 456/781] use policyID from route

---
 src/pages/workspace/WorkspaceAgentsPage.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 4893cdc14555..1e8e483a68f2 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -34,7 +34,6 @@ import WorkspacePageWithSections from './WorkspacePageWithSections';
 type WorkspaceAgentsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.AGENTS>;
 function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
-    const policyID = policy?.id;
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
@@ -104,7 +103,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.PAID]}
-            policyID={policyID}
+            policyID={route.params.policyID}
             policyFeature={CONST.POLICY.POLICY_FEATURE.AGENTS}
             shouldBeBlocked={!isCompanyAgentsBetaEnabled}
         >

From 6def6ff2164120a54042267d8379582ca5808089 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Mon, 12 Oct 2026 11:42:32 +0200
Subject: [PATCH 457/781] Persist user's selected group-by and normalize only
 when reading

---
 .../Insights/charts/InsightsChartWidget.tsx   |  2 +-
 src/pages/Insights/insightsGroupByUtils.ts    |  7 +++--
 src/pages/Insights/insightsQueries.ts         |  5 ++--
 src/pages/Insights/useInsightsFilters.ts      |  9 ++----
 tests/unit/hooks/useInsightsFilters.test.ts   | 28 ++++---------------
 tests/unit/insightsGroupByUtilsTest.ts        | 26 ++++++++++++++++-
 tests/unit/insightsQueriesTest.ts             | 23 ++++++++++++---
 7 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 261c7c6d7b31..36fbdf6108b0 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -70,7 +70,7 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const groupByControl =
         onGroupByChange && groupByOptions.length > 0 ? (
             <InsightsGroupByDropdown
-                groupBy={filters.groupBy}
+                groupBy={getQueryGroupBy(filters)}
                 options={groupByOptions}
                 onChange={onGroupByChange}
             />
diff --git a/src/pages/Insights/insightsGroupByUtils.ts b/src/pages/Insights/insightsGroupByUtils.ts
index bdfaa4638b17..35d42886df50 100644
--- a/src/pages/Insights/insightsGroupByUtils.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -59,9 +59,12 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
     return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
-/** Returns the Group by the charts are queried with. A single date has no options to pick from, so its one point is grouped by day. */
+/** Returns the Group by the charts are queried with, fitted to the date range. A single date has no options to pick from, so its one point is grouped by day. */
 function getQueryGroupBy(filters: InsightsFilters): InsightsGroupBy {
-    return 'on' in filters.date ? CONST.SEARCH.GROUP_BY.DAY : filters.groupBy;
+    if ('on' in filters.date) {
+        return CONST.SEARCH.GROUP_BY.DAY;
+    }
+    return getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date));
 }
 
 export {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy};
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index 49b03b98ff4f..5711c937ff1a 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -95,8 +95,9 @@ type InsightsQuery = {
 
 /** Builds one request for the whole dashboard, naming each graph's snapshots by its chart's query hashes, and returns those chart queries to read the snapshots back with. */
 function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsQuery | undefined {
-    const inputQuery = buildInsightsQueryString({...filters, groupBy: getQueryGroupBy(filters), compare: undefined});
-    const queryJSON = buildSearchQueryJSON(inputQuery);
+    // The backend saves inputQuery as the dashboard's filters, so it keeps the Group by the user picked, not the one fitted to the date range
+    const inputQuery = buildInsightsQueryString({...filters, compare: undefined});
+    const queryJSON = buildSearchQueryJSON(buildInsightsQueryString({...filters, groupBy: getQueryGroupBy(filters), compare: undefined}));
     if (!queryJSON) {
         return undefined;
     }
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index 376d4fbb7bb3..78498aa3f8a0 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -13,7 +13,6 @@ import type {InsightsFilters} from './insightsFilters';
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 import {parseInsightsFilters} from './insightsFilterParsing';
 import DEFAULT_INSIGHTS_FILTERS from './insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByUtils';
 import {buildInsightsQueryString} from './insightsQueries';
 
 type UseInsightsFiltersResult = {
@@ -30,10 +29,6 @@ type UseInsightsFiltersResult = {
     setFilters: (update: Partial<InsightsFilters>) => void;
 };
 
-function normalizeInsightsFilters(filters: InsightsFilters): InsightsFilters {
-    return {...filters, groupBy: getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date))};
-}
-
 function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersResult {
     const {searchKey} = INSIGHTS_DASHBOARD_SPECS[dashboard];
     const [activePolicyID, activePolicyIDMetadata] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
@@ -45,10 +40,10 @@ function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersR
         ...DEFAULT_INSIGHTS_FILTERS,
         groupCurrency: activePolicy?.outputCurrency ?? CONST.CURRENCY.USD,
     };
-    const filters = normalizeInsightsFilters({...defaultFilters, ...parseInsightsFilters(storedQuery)});
+    const filters: InsightsFilters = {...defaultFilters, ...parseInsightsFilters(storedQuery)};
 
     const setFilters = (update: Partial<InsightsFilters>) => {
-        setInsightsFilters(searchKey, buildInsightsQueryString(normalizeInsightsFilters({...filters, ...update})));
+        setInsightsFilters(searchKey, buildInsightsQueryString({...filters, ...update}));
     };
 
     return {
diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index c0a61f845fef..0c7ec810aef2 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -155,40 +155,22 @@ describe('useInsightsFilters', () => {
         expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD policyID:A1 date:last-12-months');
     });
 
-    it('opens on the nearest fitting grouping when the stored one no longer fits the date range', async () => {
-        // Given a dashboard stored as this month grouped by quarter, which plots a single point
-        await setUpActivePolicy('PLN');
-        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
-
-        // When the dashboard resolves its filters
-        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
-        await waitFor(() => expect(result.current.isResolved).toBe(true));
-
-        // Then it groups by week, the closest grouping to quarter that this month offers
-        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
-    });
-
-    it('saves the nearest fitting grouping when a new date range rules out the selected one, and keeps it after', async () => {
+    it('keeps the selected grouping saved when a new date range rules it out', async () => {
         // Given a dashboard over the last 12 months grouped by quarter
         await setUpActivePolicy('PLN');
         await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
         const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
         await waitFor(() => expect(result.current.isResolved).toBe(true));
 
-        // When the date is changed to this month, then back to the last 12 months
+        // When the date is changed to this month, which only offers Day and Week
         await act(async () => {
             result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}});
             await waitForBatchedUpdates();
         });
-        const groupByOnThisMonth = (await getStoredQuery())?.split(' ').at(0);
-        await act(async () => {
-            result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}});
-            await waitForBatchedUpdates();
-        });
 
-        // Then week is saved as the new selection, so going back to a range that offers quarter doesn't restore it
-        expect(groupByOnThisMonth).toBe('groupBy:week');
-        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+        // Then quarter stays saved, so it comes back once a range that offers it is picked
+        expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD date:this-month');
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
     });
 
     it('keeps the saved grouping on a single day, which has no grouping to pick', async () => {
diff --git a/tests/unit/insightsGroupByUtilsTest.ts b/tests/unit/insightsGroupByUtilsTest.ts
index 991369dd50cf..04d4786046f2 100644
--- a/tests/unit/insightsGroupByUtilsTest.ts
+++ b/tests/unit/insightsGroupByUtilsTest.ts
@@ -1,5 +1,5 @@
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByUtils';
+import {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 
@@ -93,4 +93,28 @@ describe('insightsGroupByUtils', () => {
             expect(groupBy).toBe(QUARTER);
         });
     });
+
+    describe('getQueryGroupBy', () => {
+        it('queries the nearest offered option when the date range rules the selection out', () => {
+            // Given a quarterly dashboard moved to this month, which only offers Day and Week
+            const filters: InsightsFilters = {date: {preset: THIS_MONTH}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
+
+            // When the Group by to query with is picked
+            const groupBy = getQueryGroupBy(filters);
+
+            // Then Week is queried, the closest grouping to Quarter that the month offers
+            expect(groupBy).toBe(WEEK);
+        });
+
+        it('queries a single date by day, whatever grouping is selected', () => {
+            // Given a quarterly dashboard moved to a single date
+            const filters: InsightsFilters = {date: {on: '2026-03-04'}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
+
+            // When the Group by to query with is picked
+            const groupBy = getQueryGroupBy(filters);
+
+            // Then its one point is grouped by day
+            expect(groupBy).toBe(DAY);
+        });
+    });
 });
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index 8fe5a163086d..ae1bc3ead359 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -20,6 +20,7 @@ const SPEND_SPEC = INSIGHTS_DASHBOARD_SPECS[CONST.INSIGHTS.DASHBOARD.SPEND];
 
 type InsightsPayload = {
     hash: number;
+    groupBy: string;
     inputQuery: string;
 };
 
@@ -144,10 +145,24 @@ describe('insightsQueries', () => {
             // When its request is built
             const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
-            // Then the query names that day the same way it names a preset, grouped by day since a single date offers no grouping to pick
-            expect(parsePayload(request)?.inputQuery).toBe('groupBy:day groupCurrency:USD date:2026-03-04');
+            // Then the query names that day the same way it names a preset, and its one point is grouped by day since a single date offers no grouping to pick
+            expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
+            expect(parsePayload(request)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
             expect(parsePayload(request)).toEqual(expect.objectContaining({insightsHashes: buildExpectedHashes(filters)}));
         });
+
+        it('saves the selected grouping while querying the one fitted to the date range', () => {
+            // Given a quarterly dashboard narrowed to a month, which only offers Day and Week
+            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.QUARTER};
+
+            // When its request is built
+            const payload = parsePayload(buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true));
+
+            // Then the backend saves quarter, so a longer range brings it back, while the charts are grouped by week
+            expect(payload?.inputQuery).toBe('groupBy:quarter groupCurrency:USD date>=2026-03-01 date<=2026-03-31');
+            expect(payload?.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+        });
+
         it('leaves the workspaces out of the query until some are selected', () => {
             // Given a dashboard requested with no workspace selected
             const allWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
@@ -219,8 +234,8 @@ describe('insightsQueries', () => {
         });
 
         it('groups the headline chart by day while supporting charts keep their own group-by', () => {
-            // Given the page filters grouped by day
-            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.DAY};
+            // Given the page filters over a month, grouped by day
+            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.DAY};
 
             // When the filters are applied to the headline chart and to every supporting chart
             const headlineQuery = applyInsightsFilters(SPEND_SPEC.headlineChart, filters);

From b8a4b0ad98037d5beda2c4338e0c318f68e06b0d Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:48:19 +0100
Subject: [PATCH 458/781] fix permissions

---
 src/libs/PolicyUtils/permissions.ts          | 4 ++++
 src/pages/workspace/getWorkspaceMenuItems.ts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/PolicyUtils/permissions.ts b/src/libs/PolicyUtils/permissions.ts
index 92465cc8b71a..1a27d68b6f83 100644
--- a/src/libs/PolicyUtils/permissions.ts
+++ b/src/libs/PolicyUtils/permissions.ts
@@ -96,6 +96,7 @@ const ROLE_PERMISSION_BUNDLES: Record<string, Partial<Record<PolicyFeature, Poli
     [CONST.POLICY.ROLE.USER]: {
         [CONST.POLICY.POLICY_FEATURE.OVERVIEW]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.MEMBERS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
+        [CONST.POLICY.POLICY_FEATURE.AGENTS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.ROOMS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
     },
     [CONST.POLICY.ROLE.GUEST]: {
@@ -104,6 +105,7 @@ const ROLE_PERMISSION_BUNDLES: Record<string, Partial<Record<PolicyFeature, Poli
     [CONST.POLICY.ROLE.CARD_ADMIN]: {
         [CONST.POLICY.POLICY_FEATURE.OVERVIEW]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.MEMBERS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
+        [CONST.POLICY.POLICY_FEATURE.AGENTS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.EXPENSIFY_CARD]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
         [CONST.POLICY.POLICY_FEATURE.COMPANY_CARDS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
         [CONST.POLICY.POLICY_FEATURE.ROOMS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
@@ -111,6 +113,7 @@ const ROLE_PERMISSION_BUNDLES: Record<string, Partial<Record<PolicyFeature, Poli
     [CONST.POLICY.ROLE.PEOPLE_ADMIN]: {
         [CONST.POLICY.POLICY_FEATURE.OVERVIEW]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.MEMBERS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
+        [CONST.POLICY.POLICY_FEATURE.AGENTS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
         [CONST.POLICY.POLICY_FEATURE.WORKFLOWS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.WORKFLOWS_APPROVALS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
         [CONST.POLICY.POLICY_FEATURE.ROOMS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
@@ -118,6 +121,7 @@ const ROLE_PERMISSION_BUNDLES: Record<string, Partial<Record<PolicyFeature, Poli
     [CONST.POLICY.ROLE.PAYMENTS_ADMIN]: {
         [CONST.POLICY.POLICY_FEATURE.OVERVIEW]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.MEMBERS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
+        [CONST.POLICY.POLICY_FEATURE.AGENTS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.WORKFLOWS]: CONST.POLICY.POLICY_FEATURE_ACCESS.READ,
         [CONST.POLICY.POLICY_FEATURE.WORKFLOWS_PAYMENTS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
         [CONST.POLICY.POLICY_FEATURE.ROOMS]: CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE,
diff --git a/src/pages/workspace/getWorkspaceMenuItems.ts b/src/pages/workspace/getWorkspaceMenuItems.ts
index 87d97c2975ba..a27db44ba08d 100644
--- a/src/pages/workspace/getWorkspaceMenuItems.ts
+++ b/src/pages/workspace/getWorkspaceMenuItems.ts
@@ -234,7 +234,7 @@ function getWorkspaceMenuItems({
         return canReadPolicyFeature(CONST.POLICY.POLICY_FEATURE.MEMBERS);
     });
 
-    if (isGroupPolicy(policy) && isCompanyAgentsBetaEnabled) {
+    if (isGroupPolicy(policy) && canReadPolicyFeature(CONST.POLICY.POLICY_FEATURE.AGENTS) && isCompanyAgentsBetaEnabled) {
         const membersItemIndex = items.findIndex((item) => item.screenName === SCREENS.WORKSPACE.MEMBERS);
         items.splice(membersItemIndex + 1, 0, {
             translationKey: 'agentsPage.title',

From e103bc217a9afc98fe40451d8a1501c70844cf6b Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:56:15 +0100
Subject: [PATCH 459/781] fix shared routes navigation and avoid
 skipMatchingFullScreenRoute

---
 src/hooks/useAgents.ts                                |  2 +-
 .../linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts        | 11 +----------
 src/pages/settings/Agents/AgentsPage.tsx              |  2 +-
 src/pages/settings/Agents/DynamicAddAgentPage.tsx     |  2 +-
 src/pages/settings/Agents/DynamicEditAgentPage.tsx    |  6 +++---
 src/pages/settings/Agents/DynamicNewAgentPage.tsx     |  4 ++--
 tests/unit/pages/settings/AddAgentPageTest.tsx        |  2 +-
 tests/unit/pages/settings/NewAgentPageTest.tsx        |  6 +++---
 8 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index c6f0d4df9960..ee322551ddf7 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -92,7 +92,7 @@ function useAgents() {
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
                 disabled: isPendingDeletion,
                 canManage: true,
-                action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID)), {skipMatchingFullScreenRoute: true}),
+                action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT.getRoute(accountID))),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
                 dismissError: () => handleErrorClose(pendingAction, accountID),
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
index 02ff4e857ff6..16972c32c181 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
@@ -72,16 +72,7 @@ const SETTINGS_TO_RHP: Partial<Record<keyof SettingsSplitNavigatorParamList, str
         SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN,
         SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN_ATM,
     ],
-    [SCREENS.SETTINGS.AGENTS.ROOT]: [
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_NEW,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_ADD_AVATAR,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_NAME,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_PROMPT,
-        SCREENS.SETTINGS.AGENTS.DYNAMIC_EDIT_AVATAR,
-        SCREENS.RIGHT_MODAL.AGENT_REPORT,
-    ],
+    [SCREENS.SETTINGS.AGENTS.ROOT]: [SCREENS.RIGHT_MODAL.AGENT_REPORT],
     [SCREENS.SETTINGS.RULES.ROOT]: [
         SCREENS.SETTINGS.RULES.ADD,
         SCREENS.SETTINGS.RULES.ADD_MERCHANT,
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 62751be9ee93..71d8257240c9 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -46,7 +46,7 @@ function AgentsPage() {
     const newAgentButton = (
         <Button
             variant="success"
-            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()), {skipMatchingFullScreenRoute: true})}
+            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
diff --git a/src/pages/settings/Agents/DynamicAddAgentPage.tsx b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
index fdb039489f35..fd5495ba6906 100644
--- a/src/pages/settings/Agents/DynamicAddAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicAddAgentPage.tsx
@@ -231,7 +231,7 @@ function DynamicAddAgentPageContent({route, template}: DynamicAddAgentPageConten
                         <AvatarButtonWithIcon
                             text={translate('addAgentPage.editAvatar')}
                             avatar={agentAvatar}
-                            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true})}
+                            onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()))}
                             editIcon={expensifyIcons.Pencil}
                             editIconStyle={styles.smallEditIconAccount}
                             sentryLabel={CONST.SENTRY_LABEL.ADD_AGENT_PAGE.AVATAR}
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 970d0b099241..9e33930538bf 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -61,9 +61,9 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack(backPath);
-    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true});
-    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute()), {skipMatchingFullScreenRoute: true});
-    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute()), {skipMatchingFullScreenRoute: true});
+    const handleEditAvatarPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_AVATAR.getRoute()));
+    const handleEditNamePress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_NAME.getRoute()));
+    const handleEditPromptPress = () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_EDIT_PROMPT.getRoute()));
     const handleDeletePress = async () => {
         const ruleBotEnforcedPolicy = getRuleBotEnforcedPolicy(accountID, allPolicies);
         if (ruleBotEnforcedPolicy) {
diff --git a/src/pages/settings/Agents/DynamicNewAgentPage.tsx b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
index 80b9565831f0..e71419de5e6b 100644
--- a/src/pages/settings/Agents/DynamicNewAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicNewAgentPage.tsx
@@ -101,14 +101,14 @@ function DynamicNewAgentPage({route}: DynamicNewAgentPageProps) {
     const handleBuildCustomAgent = () => {
         // Start from scratch — drop any previously stashed template and avatar draft.
         Promise.all([clearNewAgentTemplate(), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)), {skipMatchingFullScreenRoute: true});
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
         });
     };
 
     const handleAddTemplate = (template: SuggestedAgent, avatarID: AgentAvatarID) => {
         // Stash the template in Onyx (persists across refresh) and drop any stale avatar draft.
         Promise.all([setNewAgentTemplate({name: template.name, prompt: template.prompt, avatarID}), clearNewAgentAvatarDraft()]).then(() => {
-            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)), {skipMatchingFullScreenRoute: true});
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute(policyID ? {policyID} : undefined)));
         });
     };
 
diff --git a/tests/unit/pages/settings/AddAgentPageTest.tsx b/tests/unit/pages/settings/AddAgentPageTest.tsx
index 597a4bb75e84..5bf4e0067b73 100644
--- a/tests/unit/pages/settings/AddAgentPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentPageTest.tsx
@@ -272,7 +272,7 @@ describe('AddAgentPage', () => {
         mockAvatarOnPress?.();
 
         expect(mockSetNewAgentAvatarPreset).not.toHaveBeenCalled();
-        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()), {skipMatchingFullScreenRoute: true});
+        expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD_AVATAR.getRoute()));
     });
 
     it('does not seed a default while the draft is still loading (avoids clobbering a saved avatar on refresh)', () => {
diff --git a/tests/unit/pages/settings/NewAgentPageTest.tsx b/tests/unit/pages/settings/NewAgentPageTest.tsx
index d67a5f83e740..8c8af4ccde3d 100644
--- a/tests/unit/pages/settings/NewAgentPageTest.tsx
+++ b/tests/unit/pages/settings/NewAgentPageTest.tsx
@@ -207,7 +207,7 @@ describe('NewAgentPage', () => {
         });
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()), {skipMatchingFullScreenRoute: true});
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
         });
     });
 
@@ -220,7 +220,7 @@ describe('NewAgentPage', () => {
         expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
         expect(mockSetNewAgentTemplate).not.toHaveBeenCalled();
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()), {skipMatchingFullScreenRoute: true});
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute()));
         });
     });
 
@@ -230,7 +230,7 @@ describe('NewAgentPage', () => {
         fireEvent.press(screen.getByText('newAgentPage.buildCustomAgent'));
 
         await waitFor(() => {
-            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute({policyID: 'POL_42'})), {skipMatchingFullScreenRoute: true});
+            expect(mockNavigate).toHaveBeenCalledWith(createDynamicRoute(DYNAMIC_ROUTES.AGENT_ADD.getRoute({policyID: 'POL_42'})));
         });
     });
 });

From 8e3eadf02f77dbf2316e600359e441339ab0f19f Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 11:58:50 +0200
Subject: [PATCH 460/781] Improve comments and code structure

---
 src/components/Charts/PieChart/PieChartContent.tsx     | 2 +-
 src/components/Charts/components/ChartTooltip.tsx      | 5 ++---
 src/components/Charts/components/ChartTooltipLayer.tsx | 5 ++---
 src/components/Charts/hooks/useChartInteractions.ts    | 5 -----
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index de5e1c677f38..cd76f231f1d8 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -173,7 +173,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                 scheduleOnRN(setIsHoveringOverPie, false);
             });
 
-    // Tap gesture: touch toggles the tooltip, other pointers navigate on click
+    // Tap gesture for click/tap navigation
     const tapGesture = () =>
         Gesture.Tap()
             .onFinalize((e, success) => {
diff --git a/src/components/Charts/components/ChartTooltip.tsx b/src/components/Charts/components/ChartTooltip.tsx
index 7a30cf2d96f0..cc623f09d983 100644
--- a/src/components/Charts/components/ChartTooltip.tsx
+++ b/src/components/Charts/components/ChartTooltip.tsx
@@ -49,7 +49,7 @@ type ChartTooltipProps = {
     /** Updates the hovered point after the chart is moved in the window (e.g. via scroll) by the given offset */
     onChartMoved?: (deltaX: number, deltaY: number) => void;
 
-    /** Hides a tooltip pinned by a touch tap, passed only while it is pinned; called on any touch on the screen or when the screen loses focus */
+    /** Hides a tooltip pinned by a touch tap, passed only while it is pinned */
     onDismiss?: () => void;
 };
 
@@ -119,13 +119,12 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
 
     const isFocused = useIsFocused();
 
-    // A pinned tooltip has no hover to end it, so it is registered for the screen's touch start to hide it
+    // A pinned tooltip is registered for the screen's touch start to hide it
     useEffect(() => {
         if (!isShown || !onDismiss) {
             return;
         }
 
-        // The tooltip is drawn in a root portal, so it would stay on top of the next screen after navigating away
         if (!isFocused) {
             onDismiss();
             return;
diff --git a/src/components/Charts/components/ChartTooltipLayer.tsx b/src/components/Charts/components/ChartTooltipLayer.tsx
index 33c6c44f11e5..9804c73b3347 100644
--- a/src/components/Charts/components/ChartTooltipLayer.tsx
+++ b/src/components/Charts/components/ChartTooltipLayer.tsx
@@ -40,6 +40,7 @@ type ChartTooltipLayerProps = {
  */
 function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, chartWidth, initialTooltipPosition, onChartMoved, onDismiss}: ChartTooltipLayerProps) {
     const [activeDataIndex, setActiveDataIndex] = useState(-1);
+    const renderedIndex = useSharedValue(-1);
 
     useAnimatedReaction(
         () => matchedIndex.get(),
@@ -48,13 +49,11 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
         },
     );
 
-    // The target changes on the UI thread a frame before its content renders, so the tooltip stays hidden until both match
-    const renderedIndex = useSharedValue(-1);
     useLayoutEffect(() => {
         renderedIndex.set(activeDataIndex);
     }, [activeDataIndex, renderedIndex]);
-    const isContentCurrent = useDerivedValue(() => matchedIndex.get() === renderedIndex.get());
 
+    const isContentCurrent = useDerivedValue(() => matchedIndex.get() === renderedIndex.get());
     const tooltipData = useTooltipData(activeDataIndex, data, formatValue);
 
     if (!tooltipData) {
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 8414f5be83de..7faaff7ba22d 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -398,15 +398,10 @@ function useChartInteractions({
 
     const dismissTouchTooltip = () => {
         hideTooltip();
-        // Clearing the target unmounts the tooltip, so the next tap mounts a fresh one instead of revealing the old content for a frame
         applyTargetIndex(-1);
         setIsTouchPinned(false);
     };
 
-    /**
-     * Touch taps show the tooltip instead of drilling in, since touch devices have no hover.
-     * While it is shown, a tap on this chart switches it and a touch anywhere else hides it.
-     */
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';
 

From b45f408b75388f90de3604be3e81289195009560 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 11:02:30 +0100
Subject: [PATCH 461/781] add custom back path

---
 src/libs/actions/Agent.ts                          | 5 +++--
 src/pages/settings/Agents/DynamicEditAgentPage.tsx | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 78f23ea71849..012fbde98e98 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -14,6 +14,7 @@ import type {AvatarSource} from '@libs/UserAvatarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import type {Policy} from '@src/types/onyx';
 import type NewAgentTemplate from '@src/types/onyx/NewAgentTemplate';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
@@ -319,7 +320,7 @@ function updateAgentAvatar(
     write(WRITE_COMMANDS.UPDATE_AGENT_AVATAR, params, {optimisticData, successData, failureData});
 }
 
-function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxCollection<Policy>, shouldNavigateBack = true) {
+function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxCollection<Policy>, shouldNavigateBack = true, backPath?: Route) {
     // The caller may still hold an optimistic accountID that was already reconciled while its screen was open.
     const agentAccountID = resolveAgentAccountID(accountID);
     const optimisticData: AnyOnyxUpdate[] = [
@@ -380,7 +381,7 @@ function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxC
     // Callers that end the copilot session right after deleting (e.g. deleting the agent you're copiloting into)
     // don't want the extra navigation, since the delegate transition resets navigation on its own.
     if (shouldNavigateBack) {
-        Navigation.goBack(ROUTES.SETTINGS_AGENTS);
+        Navigation.goBack(backPath ?? ROUTES.SETTINGS_AGENTS);
     }
 }
 
diff --git a/src/pages/settings/Agents/DynamicEditAgentPage.tsx b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
index 9e33930538bf..1084def7e73e 100644
--- a/src/pages/settings/Agents/DynamicEditAgentPage.tsx
+++ b/src/pages/settings/Agents/DynamicEditAgentPage.tsx
@@ -81,7 +81,7 @@ function DynamicEditAgentPage({route}: DynamicEditAgentPageProps) {
         if (result.action !== ModalActions.CONFIRM) {
             return;
         }
-        deleteAgent(accountID, agentLogin, allPolicies);
+        deleteAgent(accountID, agentLogin, allPolicies, true, backPath);
     };
     const isPendingAddOrDelete = agent?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || agent?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const areActionsDisabled = isPendingAddOrDelete || accountID <= 0 || !agentLogin;

From bda44698ca432ae184d55b02af009d2b4221c380 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 11:10:41 +0100
Subject: [PATCH 462/781] fix sorting by agent member role

---
 src/components/Tables/AgentsTable/index.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index 47f17ebd5a6d..47b9996163be 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -1,6 +1,7 @@
 import RenderHTML from '@components/RenderHTML';
 import type {CompareItemsCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
+import compareOptionalValues from '@components/Table/compareOptionalValues';
 
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -98,7 +99,14 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
 
     const compareTableItems: CompareItemsCallback<AgentRowData> = (item1, item2, activeSorting) => {
         const orderMultiplier = activeSorting.order === 'asc' ? 1 : -1;
-        return localeCompare(item1.displayName, item2.displayName) * orderMultiplier;
+        const displayNameComparison = localeCompare(item1.displayName, item2.displayName) * orderMultiplier;
+
+        if (activeSorting.columnKey === 'role') {
+            const compareRoleNames = (role1: string, role2: string) => localeCompare(translate('workspace.common.roleName', role1), translate('workspace.common.roleName', role2));
+            return compareOptionalValues(item1.role, item2.role, compareRoleNames, orderMultiplier, displayNameComparison);
+        }
+
+        return displayNameComparison;
     };
 
     const isTableItemInSearch: IsItemInSearchCallback<AgentRowData> = (item, searchValue) => {

From 442da7f2871ad4a91b3413bd85f9c98282340e66 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 12 Oct 2026 11:25:07 +0100
Subject: [PATCH 463/781] display agent role in narrow layout

---
 src/components/Tables/AgentsTable/AgentsTableRow.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 1c978e35c54c..5f0c7a4b02fb 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -47,6 +47,9 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
     const accessibilityLabel = [item.displayName, item.login].filter(Boolean).join(', ');
     const selectedButtonInnerStyle = item.selected ? styles.buttonDefaultHovered : undefined;
 
+    const agentRoleLabel = item.role ? translate('workspace.common.roleName', item.role) : undefined;
+    const agentSubtitle = shouldShowRoleColumn && shouldUseNarrowTableLayout && agentRoleLabel ? `${agentRoleLabel} • ${item.login}` : item.login;
+
     return (
         <Table.Row
             interactive={item.canManage}
@@ -81,7 +84,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                             />
                             <TextWithTooltip
                                 shouldShowTooltip
-                                text={item.login}
+                                text={agentSubtitle}
                                 style={[styles.textLabelSupporting, styles.lh16, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted]}
                             />
                         </View>

From 5815d076350e17fd772dff3640bf7a1850b86dd4 Mon Sep 17 00:00:00 2001
From: "Garrett Knight (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 10:30:33 +0000
Subject: [PATCH 464/781] Update help articles: any Workspace Admin can change
 the workspace plan

Co-authored-by: Garrett Knight <garrettmknight@users.noreply.github.com>
---
 .../Change-Your-Workspace-Plan.md                    | 10 ++++++++--
 .../Learn-About-Plan-and-Subscription-Management.md  | 12 ++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
index 89d5a075c53c..08d240f88ae7 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
@@ -2,7 +2,7 @@
 title: Change Your Workspace Plan
 description: Change your Workspace's Plan type to Collect or Control. 
 keywords: [New Expensify, change workspace plan, switch plan, Collect plan, Control plan, Submit plan, plan type, upgrade, downgrade, upgrade to Control, downgrade to Collect, upgrade Submit workspace, workspace admin]
-internalScope: Audience is Workspace owners. Covers how to switch a Workspace between the Collect and Control plans, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
+internalScope: Audience is Workspace admins. Covers how to switch a Workspace between the Collect and Control plans, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
 retrievalIntent: How to switch a Workspace plan between Collect and Control.
 contentType: task
 platform: new
@@ -19,7 +19,9 @@ To learn which plan is right for your organization, see [Compare Collect and Con
 
 ## Who can change the workspace plan
 
-Only the Workspace owner can change a workspace's plan. 
+Any Workspace Admin can change a workspace's plan, including upgrading from Collect to Control and downgrading from Control to Collect. 
+
+The Workspace owner pays for the workspace, so plan changes made by any Workspace Admin affect the Workspace owner's bill.
 
 If you have an Annual subscription, changes to your plan may be restricted. To learn more, see [When You Can Change Your Plan](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management#when-you-can-change-your-plan).
 
@@ -52,6 +54,10 @@ A free Submit workspace can be upgraded to Collect or Control. Once upgraded, it
 
 # FAQ
 
+## Can a Workspace Admin change the workspace plan?
+
+Yes. Any Workspace Admin can upgrade or downgrade the workspace plan. Subscription settings, such as the subscription type and payment card, are still managed by the Workspace owner.
+
 ## Can I switch back to Control after downgrading to Collect?
 
 Yes. You can upgrade a workspace to Control at any time by returning to the **Plan type** setting.
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
index 390ec0b500d1..9b0f75355d71 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
@@ -1,8 +1,8 @@
 ---
 title: Learn About Plan and Subscription Management
 description: Learn who can change a Workspace's plan or subscription in New Expensify and the conditions that apply, including when you can and can't downgrade.
-keywords: [New Expensify, plan management, subscription management, change plan, change subscription, downgrade plan, workspace Owner, Collect, Control, Annual, Pay-per-use]
-internalScope: Audience is Workspace owners. Covers who can change a Workspace's plan or subscription and the conditions that apply. Does not cover plan features or how to change a subscription.
+keywords: [New Expensify, plan management, subscription management, change plan, change subscription, downgrade plan, workspace Owner, workspace admin, Collect, Control, Annual, Pay-per-use]
+internalScope: Audience is Workspace owners and Workspace admins. Covers who can change a Workspace's plan or subscription and the conditions that apply. Does not cover plan features or how to change a subscription.
 retrievalIntent: When are Workspace plan or subscription changes allowed.
 contentType: topic
 platform: new
@@ -11,7 +11,7 @@ order: 1
 
 # Learn About Plan and Subscription Management
 
-Every paid Workspace has a plan and a subscription, and together they determine how billing is calculated. The Workspace owner can manage them, but changes may be restricted depending on your current subscription type. 
+Every paid Workspace has a plan and a subscription, and together they determine how billing is calculated. Any Workspace Admin can change the plan, and the Workspace owner manages the subscription. Changes may be restricted depending on your current subscription type. 
 
 If you're new to Expensify billing, start with [Learn How Billing and Subscriptions Work](/articles/new-expensify/billing-and-subscriptions/Learn-How-Billing-and-Subscriptions-Work).
 
@@ -19,9 +19,9 @@ If you're new to Expensify billing, start with [Learn How Billing and Subscripti
 
 ## Who can manage a plan or subscription
 
-Only the Workspace owner can manage the Workspace's plan or subscription. Each workspace has exactly one owner, whose payment card is charged for the subscription.
+Any Workspace Admin can change the Workspace's plan, including upgrading from Collect to Control and downgrading from Control to Collect.
 
-Being a Workspace Admin doesn't include plan and subscription management permissions. Admins can manage members and workspace settings, but they can't change the Workspace's plan or subscription unless they first take over ownership.
+Only the Workspace owner can manage the Workspace's subscription. Each workspace has exactly one owner, whose payment card is charged for the subscription. Plan changes made by any Workspace Admin affect the Workspace owner's bill.
 
 To learn more, see [Learn About Billing Permissions](/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions).
 
@@ -57,7 +57,7 @@ Use these articles to complete common plan and subscription tasks:
 
 ## Can a Workspace Admin change the plan or subscription?
 
-No. Only the Workspace owner can manage the Workspace's plan or subscription. If an admin needs to make these changes, they must first become the Workspace owner. [Learn how to transfer workspace ownership](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-billing/Transfer-Workspace-Ownership).
+A Workspace Admin can change the plan, but not the subscription. Only the Workspace owner can manage the Workspace's subscription. If an admin needs to change the subscription, they must first become the Workspace owner. [Learn how to transfer workspace ownership](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-billing/Transfer-Workspace-Ownership).
 
 ## Why can't I switch from Control to Collect?
 

From cb138361f4dc665b40a06c0da58b304e2ed8a72e Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Mon, 12 Oct 2026 12:32:50 +0200
Subject: [PATCH 465/781] Persist corrected group-by after switching date
 filter

---
 .../Insights/charts/InsightsChartWidget.tsx   |  2 +-
 src/pages/Insights/insightsGroupByUtils.ts    |  7 ++---
 src/pages/Insights/insightsQueries.ts         |  2 +-
 src/pages/Insights/useInsightsFilters.ts      |  9 ++++--
 tests/unit/hooks/useInsightsFilters.test.ts   | 28 +++++++++++++++----
 tests/unit/insightsGroupByUtilsTest.ts        | 26 +----------------
 tests/unit/insightsQueriesTest.ts             | 18 ++----------
 7 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 36fbdf6108b0..261c7c6d7b31 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -70,7 +70,7 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const groupByControl =
         onGroupByChange && groupByOptions.length > 0 ? (
             <InsightsGroupByDropdown
-                groupBy={getQueryGroupBy(filters)}
+                groupBy={filters.groupBy}
                 options={groupByOptions}
                 onChange={onGroupByChange}
             />
diff --git a/src/pages/Insights/insightsGroupByUtils.ts b/src/pages/Insights/insightsGroupByUtils.ts
index 35d42886df50..bdfaa4638b17 100644
--- a/src/pages/Insights/insightsGroupByUtils.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -59,12 +59,9 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
     return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
-/** Returns the Group by the charts are queried with, fitted to the date range. A single date has no options to pick from, so its one point is grouped by day. */
+/** Returns the Group by the charts are queried with. A single date has no options to pick from, so its one point is grouped by day. */
 function getQueryGroupBy(filters: InsightsFilters): InsightsGroupBy {
-    if ('on' in filters.date) {
-        return CONST.SEARCH.GROUP_BY.DAY;
-    }
-    return getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date));
+    return 'on' in filters.date ? CONST.SEARCH.GROUP_BY.DAY : filters.groupBy;
 }
 
 export {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy};
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index 5711c937ff1a..e0815ef95e23 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -95,7 +95,7 @@ type InsightsQuery = {
 
 /** Builds one request for the whole dashboard, naming each graph's snapshots by its chart's query hashes, and returns those chart queries to read the snapshots back with. */
 function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsQuery | undefined {
-    // The backend saves inputQuery as the dashboard's filters, so it keeps the Group by the user picked, not the one fitted to the date range
+    // The backend saves inputQuery as the dashboard's filters, so a single date keeps the saved Group by instead of the day it's queried by
     const inputQuery = buildInsightsQueryString({...filters, compare: undefined});
     const queryJSON = buildSearchQueryJSON(buildInsightsQueryString({...filters, groupBy: getQueryGroupBy(filters), compare: undefined}));
     if (!queryJSON) {
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index 78498aa3f8a0..376d4fbb7bb3 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -13,6 +13,7 @@ import type {InsightsFilters} from './insightsFilters';
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 import {parseInsightsFilters} from './insightsFilterParsing';
 import DEFAULT_INSIGHTS_FILTERS from './insightsFilters';
+import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByUtils';
 import {buildInsightsQueryString} from './insightsQueries';
 
 type UseInsightsFiltersResult = {
@@ -29,6 +30,10 @@ type UseInsightsFiltersResult = {
     setFilters: (update: Partial<InsightsFilters>) => void;
 };
 
+function normalizeInsightsFilters(filters: InsightsFilters): InsightsFilters {
+    return {...filters, groupBy: getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date))};
+}
+
 function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersResult {
     const {searchKey} = INSIGHTS_DASHBOARD_SPECS[dashboard];
     const [activePolicyID, activePolicyIDMetadata] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
@@ -40,10 +45,10 @@ function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersR
         ...DEFAULT_INSIGHTS_FILTERS,
         groupCurrency: activePolicy?.outputCurrency ?? CONST.CURRENCY.USD,
     };
-    const filters: InsightsFilters = {...defaultFilters, ...parseInsightsFilters(storedQuery)};
+    const filters = normalizeInsightsFilters({...defaultFilters, ...parseInsightsFilters(storedQuery)});
 
     const setFilters = (update: Partial<InsightsFilters>) => {
-        setInsightsFilters(searchKey, buildInsightsQueryString({...filters, ...update}));
+        setInsightsFilters(searchKey, buildInsightsQueryString(normalizeInsightsFilters({...filters, ...update})));
     };
 
     return {
diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index 0c7ec810aef2..c0a61f845fef 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -155,22 +155,40 @@ describe('useInsightsFilters', () => {
         expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD policyID:A1 date:last-12-months');
     });
 
-    it('keeps the selected grouping saved when a new date range rules it out', async () => {
+    it('opens on the nearest fitting grouping when the stored one no longer fits the date range', async () => {
+        // Given a dashboard stored as this month grouped by quarter, which plots a single point
+        await setUpActivePolicy('PLN');
+        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
+
+        // When the dashboard resolves its filters
+        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
+        await waitFor(() => expect(result.current.isResolved).toBe(true));
+
+        // Then it groups by week, the closest grouping to quarter that this month offers
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+    });
+
+    it('saves the nearest fitting grouping when a new date range rules out the selected one, and keeps it after', async () => {
         // Given a dashboard over the last 12 months grouped by quarter
         await setUpActivePolicy('PLN');
         await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
         const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
         await waitFor(() => expect(result.current.isResolved).toBe(true));
 
-        // When the date is changed to this month, which only offers Day and Week
+        // When the date is changed to this month, then back to the last 12 months
         await act(async () => {
             result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}});
             await waitForBatchedUpdates();
         });
+        const groupByOnThisMonth = (await getStoredQuery())?.split(' ').at(0);
+        await act(async () => {
+            result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}});
+            await waitForBatchedUpdates();
+        });
 
-        // Then quarter stays saved, so it comes back once a range that offers it is picked
-        expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD date:this-month');
-        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
+        // Then week is saved as the new selection, so going back to a range that offers quarter doesn't restore it
+        expect(groupByOnThisMonth).toBe('groupBy:week');
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
     });
 
     it('keeps the saved grouping on a single day, which has no grouping to pick', async () => {
diff --git a/tests/unit/insightsGroupByUtilsTest.ts b/tests/unit/insightsGroupByUtilsTest.ts
index 04d4786046f2..991369dd50cf 100644
--- a/tests/unit/insightsGroupByUtilsTest.ts
+++ b/tests/unit/insightsGroupByUtilsTest.ts
@@ -1,5 +1,5 @@
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByUtils';
+import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 
@@ -93,28 +93,4 @@ describe('insightsGroupByUtils', () => {
             expect(groupBy).toBe(QUARTER);
         });
     });
-
-    describe('getQueryGroupBy', () => {
-        it('queries the nearest offered option when the date range rules the selection out', () => {
-            // Given a quarterly dashboard moved to this month, which only offers Day and Week
-            const filters: InsightsFilters = {date: {preset: THIS_MONTH}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
-
-            // When the Group by to query with is picked
-            const groupBy = getQueryGroupBy(filters);
-
-            // Then Week is queried, the closest grouping to Quarter that the month offers
-            expect(groupBy).toBe(WEEK);
-        });
-
-        it('queries a single date by day, whatever grouping is selected', () => {
-            // Given a quarterly dashboard moved to a single date
-            const filters: InsightsFilters = {date: {on: '2026-03-04'}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
-
-            // When the Group by to query with is picked
-            const groupBy = getQueryGroupBy(filters);
-
-            // Then its one point is grouped by day
-            expect(groupBy).toBe(DAY);
-        });
-    });
 });
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index ae1bc3ead359..747c57788c53 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -145,24 +145,12 @@ describe('insightsQueries', () => {
             // When its request is built
             const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
-            // Then the query names that day the same way it names a preset, and its one point is grouped by day since a single date offers no grouping to pick
+            // Then the query names that day the same way it names a preset and keeps the saved grouping, while its one point is grouped by day
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
             expect(parsePayload(request)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
             expect(parsePayload(request)).toEqual(expect.objectContaining({insightsHashes: buildExpectedHashes(filters)}));
         });
 
-        it('saves the selected grouping while querying the one fitted to the date range', () => {
-            // Given a quarterly dashboard narrowed to a month, which only offers Day and Week
-            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.QUARTER};
-
-            // When its request is built
-            const payload = parsePayload(buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true));
-
-            // Then the backend saves quarter, so a longer range brings it back, while the charts are grouped by week
-            expect(payload?.inputQuery).toBe('groupBy:quarter groupCurrency:USD date>=2026-03-01 date<=2026-03-31');
-            expect(payload?.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
-        });
-
         it('leaves the workspaces out of the query until some are selected', () => {
             // Given a dashboard requested with no workspace selected
             const allWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
@@ -234,8 +222,8 @@ describe('insightsQueries', () => {
         });
 
         it('groups the headline chart by day while supporting charts keep their own group-by', () => {
-            // Given the page filters over a month, grouped by day
-            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.DAY};
+            // Given the page filters grouped by day
+            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.DAY};
 
             // When the filters are applied to the headline chart and to every supporting chart
             const headlineQuery = applyInsightsFilters(SPEND_SPEC.headlineChart, filters);

From b230154f16f2697fa40767db460f3ef679516290 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 12:43:29 +0200
Subject: [PATCH 466/781] Scope ParentNavigationSubtitle visible actions
 subscription to the parent report

---
 src/components/ParentNavigationSubtitle.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 530d9d639627..98d91fc40d39 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -20,6 +20,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import {reportVisibleActionsSelector} from '@src/selectors/ReportAction';
 
 import type {ColorValue, StyleProp, TextStyle, ViewStyle} from 'react-native';
 
@@ -100,7 +101,7 @@ function ParentNavigationSubtitle({
     const {translate} = useLocalize();
     const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
-    const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
+    const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {selector: reportVisibleActionsSelector(parentReportID)});
     const isReportArchived = useReportIsArchived(report?.reportID);
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
     const hasAccessToParentReport = currentReport?.hasParentAccess !== false;

From e115959933688087e2ec44faa8cf3d4c5ed25d7b Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Mon, 12 Oct 2026 10:46:11 +0000
Subject: [PATCH 467/781] Remove useCallback from policies selector and include
 total in reports selector

---
 .../MergeTransactionsListContent.tsx          | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
index 6e1a992d249e..d09e9ac9a327 100644
--- a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
@@ -28,7 +28,7 @@ import type {Errors} from '@src/types/onyx/OnyxCommon';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
-import React, {useCallback, useEffect} from 'react';
+import React, {useEffect} from 'react';
 import {View} from 'react-native';
 
 import type {MergeTransactionListItemType} from './MergeTransactionItem';
@@ -52,6 +52,7 @@ const reportsSelector = (reports: OnyxCollection<Report>): OnyxCollection<Report
                 managerID: report.managerID,
                 stateNum: report.stateNum,
                 statusNum: report.statusNum,
+                total: report.total,
             },
         ]),
     ) as OnyxCollection<Report>;
@@ -67,20 +68,28 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
     const currentUserLogin = session?.email;
     const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
-    const policiesSelector = useCallback(
-        (policies: OnyxCollection<Policy>): OnyxCollection<Policy> =>
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only the fields used by the admin check are kept
-            Object.fromEntries(
-                Object.entries(policies ?? {}).map(([key, policy]) => {
-                    const login = currentUserLogin ?? '';
-                    const employee = policy?.employeeList?.[login] ?? policy?.employeeList?.[login.toLowerCase()];
-                    return [key, policy && {id: policy.id, role: policy.role, employeeList: employee ? {[login]: employee} : undefined}];
-                }),
-            ) as OnyxCollection<Policy>,
-        [currentUserLogin],
-    );
-    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policiesSelector});
-    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: reportsSelector});
+    const policiesSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> =>
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only the fields used by the admin check are kept
+        Object.fromEntries(
+            Object.entries(policies ?? {}).map(([key, policy]) => {
+                const login = currentUserLogin ?? '';
+                const employee = policy?.employeeList?.[login] ?? policy?.employeeList?.[login.toLowerCase()];
+                return [
+                    key,
+                    policy && {
+                        id: policy.id,
+                        role: policy.role,
+                        employeeList: employee ? {[login]: employee} : undefined,
+                    },
+                ];
+            }),
+        ) as OnyxCollection<Policy>;
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {
+        selector: policiesSelector,
+    });
+    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {
+        selector: reportsSelector,
+    });
     const {isOffline} = useNetwork();
     const {convertToDisplayString, getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
 

From 56d6080f9bb7c5b141ab2b17081c546dfc8ab5df Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Mon, 12 Oct 2026 12:54:53 +0200
Subject: [PATCH 468/781] Update comment

---
 src/pages/Insights/insightsGroupByUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Insights/insightsGroupByUtils.ts b/src/pages/Insights/insightsGroupByUtils.ts
index bdfaa4638b17..cddfda666565 100644
--- a/src/pages/Insights/insightsGroupByUtils.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -20,7 +20,7 @@ const MIN_MONTHS_BY_GROUP_BY = {
 
 /** Returns the Group by options that fit the date range, in the dropdown's order */
 function getInsightsGroupByOptions(date: InsightsFilters['date']): InsightsGroupBy[] {
-    // Custom date -> no group by
+    // We don't show the group-by filter for "Custom date" date option
     if ('on' in date) {
         return [];
     }

From fda1cbcb65939d90a9e04838b64eafd9b2217db0 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Mon, 12 Oct 2026 12:16:44 +0100
Subject: [PATCH 469/781] Settle the scan location read inside the test that
 submits an untouched scan

The untouched-scan test pressed Create, which started a live location read, and ended without waiting for it. getCurrentPosition is automocked and never answers, so the 3s SUBMIT_WAIT_TIMEOUT fallback added in #102191 fired during whichever test was running three seconds later and recorded a stray requestMoney call with no report. The "Report selection guard" tests read mock.calls.at(0), so when the fallback landed between their clearAllMocks and their assertion they saw report undefined (#103613, #103714, #103569).

Answer the position read in that test and wait for its write so nothing outlives the test.
---
 tests/ui/components/IOURequestStepConfirmationPageTest.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
index 1bee9556c075..39a1cd191cdf 100644
--- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
+++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
@@ -528,9 +528,16 @@ describe('IOURequestStepConfirmationPageTest', () => {
             await waitForBatchedUpdatesWithAct();
             expect(screen.queryByText(translateLocal('common.error.fieldRequired'))).not.toBeOnTheScreen();
 
+            jest.mocked(getCurrentPosition).mockImplementationOnce(async (success) => {
+                success({
+                    coords: {latitude: 40.7128, longitude: -74.006, altitude: null, accuracy: null, altitudeAccuracy: null, heading: null, speed: null},
+                    timestamp: 0,
+                });
+            });
             fireEvent.press(screen.getByText(translateLocal('iou.createExpense')));
             await waitForBatchedUpdatesWithAct();
             expect(screen.queryByText(translateLocal('common.error.fieldRequired'))).not.toBeOnTheScreen();
+            await waitFor(() => expect(TrackExpense.requestMoney).toHaveBeenCalledTimes(1));
         });
 
         it('drops the "Automatic" label from all three fields as soon as any one of them is entered', async () => {

From abcc10690bcdcddd167305ff16f029a6e928bd80 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 13:17:15 +0200
Subject: [PATCH 470/781] Stop thread avatar, header and parent subtitle
 re-rendering on Concierge activity and thread replies

---
 .../Avatar/connected/ChatThreadAvatar.tsx     |  4 +-
 src/components/ParentNavigationSubtitle.tsx   |  3 +-
 src/components/TaskHeaderActionButton.tsx     |  3 -
 src/hooks/useParentReportAction.ts            |  1 -
 src/pages/inbox/HeaderView.tsx                | 10 +-
 src/selectors/ReportAction.ts                 |  5 -
 src/selectors/ReportNameValuePairs.ts         |  6 +-
 tests/ui/ParentNavigationSubtitleTest.tsx     | 92 +++++++++++++++++++
 tests/unit/useParentReportActionTest.tsx      |  1 -
 9 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/src/components/Avatar/connected/ChatThreadAvatar.tsx b/src/components/Avatar/connected/ChatThreadAvatar.tsx
index 8782125c547d..7949114889a3 100644
--- a/src/components/Avatar/connected/ChatThreadAvatar.tsx
+++ b/src/components/Avatar/connected/ChatThreadAvatar.tsx
@@ -28,7 +28,7 @@ import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 import {reportAvatarFieldsSelector, reportAvatarKindSelector} from '@selectors/Report';
-import {getParentReportActionSelector} from '@selectors/ReportAction';
+import {getParentReportActionWithoutThreadRepliesSelector} from '@selectors/ReportAction';
 import React from 'react';
 
 import useAccountIcons, {seedFallbackIcons} from './useAccountIcons';
@@ -74,7 +74,7 @@ function ChatThreadAvatar({reportID, size, backdropColor, containerStyle, subscr
     const parentReportID = getNonEmptyStringOnyxID(thread?.parentReportID);
     const [parentKind] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, {selector: reportAvatarKindSelector});
     const [parentAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
-        selector: (actions) => getParentReportActionSelector(actions, thread?.parentReportActionID),
+        selector: (actions) => getParentReportActionWithoutThreadRepliesSelector(actions, thread?.parentReportActionID),
     });
 
     // A transaction thread points `chatReportID` at its parent, a comment thread leaves it unset. Only a linked thread shows the copilot, the revealed agent and the expense subscript.
diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 98d91fc40d39..b5623e8be0a6 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -20,6 +20,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import {getStableReportSelector} from '@src/selectors/Report';
 import {reportVisibleActionsSelector} from '@src/selectors/ReportAction';
 
 import type {ColorValue, StyleProp, TextStyle, ViewStyle} from 'react-native';
@@ -100,7 +101,7 @@ function ParentNavigationSubtitle({
     const {workspaceName, reportName} = parentNavigationSubtitleData;
     const {translate} = useLocalize();
     const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, {selector: getStableReportSelector});
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {selector: reportVisibleActionsSelector(parentReportID)});
     const isReportArchived = useReportIsArchived(report?.reportID);
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index e79b635d5a08..c9588952f614 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -23,7 +23,6 @@ import {View} from 'react-native';
 import Button from './Button';
 
 type TaskHeaderActionButtonProps = {
-    /** ID of the task report */
     reportID: string;
 };
 
@@ -31,8 +30,6 @@ function TaskHeaderActionButton({reportID}: TaskHeaderActionButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    // Subscribes to the full report because completing a task builds failure data from `lastReadTime`, which the header's
-    // stable projection drops.
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const parentReport = useParentReport(reportID);
     const isParentReportArchived = useReportIsArchived(parentReport?.reportID);
diff --git a/src/hooks/useParentReportAction.ts b/src/hooks/useParentReportAction.ts
index 3b23a1788004..58fef79104ae 100644
--- a/src/hooks/useParentReportAction.ts
+++ b/src/hooks/useParentReportAction.ts
@@ -12,7 +12,6 @@ import {useCallback} from 'react';
 import useOnyx from './useOnyx';
 
 type UseParentReportActionOptions = {
-    /** Drop the parent action's thread reply counters (`childVisibleActionCount`, ...), so replies in the thread don't re-render the caller. */
     shouldIgnoreThreadReplies?: boolean;
 };
 
diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx
index aaa29962bef8..e3282554d633 100644
--- a/src/pages/inbox/HeaderView.tsx
+++ b/src/pages/inbox/HeaderView.tsx
@@ -59,7 +59,6 @@ import {
     getReportStatusTranslation,
     hasReportNameError,
     isAdminRoom,
-    isArchivedReport,
     isChatRoom as isChatRoomReportUtils,
     isChatThread as isChatThreadReportUtils,
     isChatUsedForOnboarding as isChatUsedForOnboardingReportUtils,
@@ -99,6 +98,7 @@ import {useRoute} from '@react-navigation/native';
 import {accountGuideDetailsSelector} from '@selectors/Account';
 import {accountIDSelector, isPersonalDetailOptimistic} from '@selectors/PersonalDetails';
 import {pendingChatMembersSelector} from '@selectors/ReportMetaData';
+import {latestCalendlyCallSelector} from '@selectors/ReportNameValuePairs';
 import {isPast} from 'date-fns';
 import React, {useMemo} from 'react';
 import {Keyboard, View} from 'react-native';
@@ -111,9 +111,7 @@ type HeaderViewProps = {
 };
 
 function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps) {
-    // The header does not read the chat heartbeat fields (`last*`), so it must not re-render on every message.
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getStableReportSelector});
-    // The header renders the parent message, not its reply counters, which change on every reply in this thread.
     const parentReportAction = useParentReportAction(report, {shouldIgnoreThreadReplies: true});
 
     const icons = useMemoizedLazyExpensifyIcons(['BackArrow', 'Close', 'DotIndicator']);
@@ -122,7 +120,6 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
     const isInSidePanel = useIsInSidePanel();
     const route = useRoute();
     const openParentReportInCurrentTab = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT;
-    // Falls back to the report itself when there is no parent, so it needs the same stable projection.
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID) ?? getNonEmptyStringOnyxID(report?.reportID)}`, {
         selector: getStableReportSelector,
     });
@@ -143,9 +140,9 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
             partnerManagerCalendarLink: account?.partnerManagerCalendarLink,
         }),
     });
-    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`);
+    const [latestScheduledCall] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`, {selector: latestCalendlyCallSelector});
     const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report?.reportID}`, {selector: pendingChatMembersSelector});
-    const isReportArchived = isArchivedReport(reportNameValuePairs);
+    const isReportArchived = useReportIsArchived(report?.reportID);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
@@ -347,7 +344,6 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
         !shouldMirrorSidePanelHeader;
     const shouldShowOnBoardingHelpDropdownButton = (shouldShowRegisterForWebinar || shouldShowGuideBooking) && !isReportArchived && !shouldMirrorSidePanelHeader;
     const shouldShowEarlyDiscountBanner = shouldShowDiscount && isChatUsedForOnboarding && !shouldMirrorSidePanelHeader;
-    const latestScheduledCall = reportNameValuePairs?.calendlyCalls?.at(-1);
     const hasActiveScheduledCall = latestScheduledCall && !isPast(latestScheduledCall.eventTime) && latestScheduledCall.status !== CONST.SCHEDULE_CALL_STATUS.CANCELLED;
     // Not gated on !shouldUseNarrowLayout like the side-panel case: isInNarrowPaneModal makes
     // shouldUseNarrowLayout true for any RHP regardless of actual screen width.
diff --git a/src/selectors/ReportAction.ts b/src/selectors/ReportAction.ts
index 40e8eefa82cb..022eddec8ba6 100644
--- a/src/selectors/ReportAction.ts
+++ b/src/selectors/ReportAction.ts
@@ -142,15 +142,10 @@ function getReceiptScanFailedIOUActionDataSelector(
 const transactionThreadReportIDSelector = (transactionID: string | undefined) => (reportActions: OnyxEntry<ReportActions>) =>
     transactionID ? getIOUActionForTransactionID(Object.values(reportActions ?? {}), transactionID)?.childReportID : undefined;
 
-/** Reply counters on a parent action. They change on every reply in its thread, while the parent message itself does not. */
 type ThreadReplyCounterFields = 'childVisibleActionCount' | 'childCommenterCount' | 'childLastVisibleActionCreated' | 'childOldestFourAccountIDs';
 
 type ReportActionWithoutThreadReplyCounters = Omit<ReportAction, ThreadReplyCounterFields>;
 
-/**
- * Like `getParentReportActionSelector`, but drops the thread reply counters so a thread's own screen (e.g. its header) does
- * not re-render on every reply it receives. Only use it where none of the counters are read.
- */
 function getParentReportActionWithoutThreadRepliesSelector(parentReportActions: OnyxEntry<ReportActions>, parentReportActionID?: string): ReportActionWithoutThreadReplyCounters | undefined {
     const parentReportAction = getParentReportActionSelector(parentReportActions, parentReportActionID);
     if (!parentReportAction) {
diff --git a/src/selectors/ReportNameValuePairs.ts b/src/selectors/ReportNameValuePairs.ts
index 01660b09e8ac..4af7b328483e 100644
--- a/src/selectors/ReportNameValuePairs.ts
+++ b/src/selectors/ReportNameValuePairs.ts
@@ -74,5 +74,9 @@ function getConciergeFeedbackForReportActionID(reportNameValuePairs: OnyxEntry<R
     return reportNameValuePairs?.conciergeFeedbackForReportActionID;
 }
 
-export {getAgentZeroProcessingLabel, agentZeroProcessingAgentIDsSelector, getConciergeFeedbackForReportActionID, reportNameValuePairsArchivedSelector};
+function latestCalendlyCallSelector(reportNameValuePairs: OnyxEntry<ReportNameValuePairs>) {
+    return reportNameValuePairs?.calendlyCalls?.at(-1);
+}
+
+export {getAgentZeroProcessingLabel, agentZeroProcessingAgentIDsSelector, getConciergeFeedbackForReportActionID, latestCalendlyCallSelector, reportNameValuePairsArchivedSelector};
 export type {ReportNameValuePairsArchivedState};
diff --git a/tests/ui/ParentNavigationSubtitleTest.tsx b/tests/ui/ParentNavigationSubtitleTest.tsx
index 9c7fbff7370e..8f1f3ab435d3 100644
--- a/tests/ui/ParentNavigationSubtitleTest.tsx
+++ b/tests/ui/ParentNavigationSubtitleTest.tsx
@@ -6,11 +6,14 @@ import {isReportActionVisible} from '@libs/ReportActionsUtils';
 import type {RouteProp} from '@react-navigation/native';
 
 import React from 'react';
+import Onyx from 'react-native-onyx';
 
 import ParentNavigationSubtitle from '../../src/components/ParentNavigationSubtitle';
 import NAVIGATORS from '../../src/NAVIGATORS';
+import ONYXKEYS from '../../src/ONYXKEYS';
 import SCREENS from '../../src/SCREENS';
 import createMock from '../utils/createMock';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     __esModule: true,
@@ -301,4 +304,93 @@ describe('ParentNavigationSubtitle', () => {
         expect(Navigation.goBack).not.toHaveBeenCalled();
         expect(Navigation.navigate).toHaveBeenCalled();
     });
+
+    describe('visible report actions subscription', () => {
+        const parentReportID = 'parent-report';
+        const otherReportID = 'other-report';
+        const expenseReportID = 'expense-report';
+        const parentReportActionID = 'parent-action';
+        const otherReportActionID = 'other-action';
+        const subtitleData = {reportName: 'Parent chat', workspaceName: 'Workspace'};
+
+        function pressSubtitleLink() {
+            fireEvent(screen.getByTestId('parent-navigation-subtitle-link'), 'press', {
+                preventDefault: jest.fn(),
+                stopPropagation: jest.fn(),
+                nativeEvent: {},
+            });
+        }
+
+        beforeAll(() => {
+            Onyx.init({keys: ONYXKEYS});
+        });
+
+        beforeEach(async () => {
+            await Onyx.clear();
+            mockUseRoute.mockReturnValue(createMock<AnyRoute>({name: SCREENS.REPORT}));
+            mockUseRootNavigationState.mockImplementation((selector?: (state: unknown) => unknown) => {
+                const mockState = getMockRootStateWithReportsSplitStack(otherReportID, expenseReportID);
+                if (selector) {
+                    return selector(mockState);
+                }
+                return undefined;
+            });
+        });
+
+        it('passes only the parent report visibility to isReportActionVisible', async () => {
+            // Given visibility data for the parent report and for an unrelated report
+            await Onyx.set(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {
+                [parentReportID]: {[parentReportActionID]: true},
+                [otherReportID]: {[otherReportActionID]: true},
+            });
+            render(
+                <ParentNavigationSubtitle
+                    parentNavigationSubtitleData={subtitleData}
+                    parentReportID={parentReportID}
+                    parentReportActionID={parentReportActionID}
+                    reportID={expenseReportID}
+                />,
+            );
+            await waitForBatchedUpdates();
+
+            // When the parent link is pressed
+            pressSubtitleLink();
+
+            // Then the visibility check receives only the parent report slice, because the component subscribes through
+            // reportVisibleActionsSelector instead of the whole derived map
+            expect(jest.mocked(isReportActionVisible).mock.calls.at(0)?.at(3)).toEqual({[parentReportID]: {[parentReportActionID]: true}});
+        });
+
+        it('reads the new parent report visibility when parentReportID changes', async () => {
+            // Given visibility data for two reports and a subtitle pointing at the first one
+            await Onyx.set(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {
+                [parentReportID]: {[parentReportActionID]: true},
+                [otherReportID]: {[parentReportActionID]: false},
+            });
+            const {rerender} = render(
+                <ParentNavigationSubtitle
+                    parentNavigationSubtitleData={subtitleData}
+                    parentReportID={parentReportID}
+                    parentReportActionID={parentReportActionID}
+                    reportID={expenseReportID}
+                />,
+            );
+            await waitForBatchedUpdates();
+
+            // When the subtitle is re-rendered for a different parent report
+            rerender(
+                <ParentNavigationSubtitle
+                    parentNavigationSubtitleData={subtitleData}
+                    parentReportID={otherReportID}
+                    parentReportActionID={parentReportActionID}
+                    reportID={expenseReportID}
+                />,
+            );
+            await waitForBatchedUpdates();
+            pressSubtitleLink();
+
+            // Then the visibility check uses the new parent's slice, because the selector is rebuilt for the new parentReportID
+            expect(jest.mocked(isReportActionVisible).mock.calls.at(0)?.at(3)).toEqual({[otherReportID]: {[parentReportActionID]: false}});
+        });
+    });
 });
diff --git a/tests/unit/useParentReportActionTest.tsx b/tests/unit/useParentReportActionTest.tsx
index 46a413567cfd..05a39fbd80d6 100644
--- a/tests/unit/useParentReportActionTest.tsx
+++ b/tests/unit/useParentReportActionTest.tsx
@@ -36,7 +36,6 @@ describe('useParentReportAction', () => {
     });
 
     const replyInThread = async () => {
-        // A reply in the thread bumps the reply counters on the parent action (see getOptimisticDataForAncestors)
         await act(async () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`, {
                 [PARENT_REPORT_ACTION_ID]: {childVisibleActionCount: 2, childLastVisibleActionCreated: '2026-10-08 11:00:00.000'},

From 5de4f052918cd61da182e6750cf7bb902d15c58b Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 13:21:06 +0200
Subject: [PATCH 471/781] Improve chart tooltip close operation

---
 src/components/Search/index.tsx             |  2 +
 src/pages/Insights/InsightsDashboard.tsx    | 41 ++++++++++++---------
 src/pages/Search/SearchPageNarrow/index.tsx |  6 ++-
 src/pages/home/HomePage.tsx                 |  2 +-
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index b439cae7cbf0..b220e7db37b9 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,5 +1,6 @@
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
@@ -1427,6 +1428,7 @@ function Search({
                     contentContainerStyle={styles.flexGrow1}
                     onScroll={onSearchListScroll}
                     onLayout={onLayoutChart}
+                    onTouchStart={dismissPinnedChartTooltip}
                     scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
                 >
                     <View style={[listContainerStyle, styles.mh4, styles.mb4, styles.flex1]}>
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index ab73d3e3f910..f424f8edd8c0 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -128,7 +128,6 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
         <ScrollView
             style={styles.insightsDashboardScrollView}
             onScroll={triggerScrollEvent}
-            onTouchStart={dismissPinnedChartTooltip}
             contentContainerStyle={[styles.flexGrow1, pageGutter, styles.pb5]}
             addBottomSafeAreaPadding
         >
@@ -167,6 +166,7 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
 }
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
+    const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
@@ -219,25 +219,30 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
             bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
             testID="InsightsPage"
         >
-            <TopBar
-                breadcrumbLabel={translate('common.insights')}
-                shouldDisplayHelpButton
-            />
-            {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
-                <InsightsPageControls
+            <View
+                style={styles.flex1}
+                onTouchStart={dismissPinnedChartTooltip}
+            >
+                <TopBar
+                    breadcrumbLabel={translate('common.insights')}
+                    shouldDisplayHelpButton
+                />
+                {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
+                    <InsightsPageControls
+                        filters={filters}
+                        defaultFilters={defaultFilters}
+                        onChange={setFilters}
+                    />
+                )}
+                <InsightsDashboardContent
+                    state={state}
+                    headlineChart={headlineChart}
+                    supportingCharts={supportingCharts}
                     filters={filters}
-                    defaultFilters={defaultFilters}
-                    onChange={setFilters}
+                    onRetry={requestDashboard}
+                    onGroupByChange={(groupBy) => setFilters({groupBy})}
                 />
-            )}
-            <InsightsDashboardContent
-                state={state}
-                headlineChart={headlineChart}
-                supportingCharts={supportingCharts}
-                filters={filters}
-                onRetry={requestDashboard}
-                onGroupByChange={(groupBy) => setFilters({groupBy})}
-            />
+            </View>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 5d12dda25a3d..0a49277ff7f8 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -1,4 +1,5 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
@@ -271,7 +272,10 @@ function SearchPageNarrow({
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
-                            <View style={[StyleUtils.getSearchPageNarrowHeaderStyles(), styles.mh100]}>
+                            <View
+                                style={[StyleUtils.getSearchPageNarrowHeaderStyles(), styles.mh100]}
+                                onTouchStart={dismissPinnedChartTooltip}
+                            >
                                 <View style={[styles.zIndex10, styles.appBG]}>
                                     <SearchPageHeaderNarrow
                                         queryJSON={queryJSON}
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 8a21ceaad301..95f638112a7a 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -137,6 +137,7 @@ function HomePage() {
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
+            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
@@ -157,7 +158,6 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
-                        onTouchStart={dismissPinnedChartTooltip}
                         contentContainerStyle={[styles.homePageContentContainer, pageGutter]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"

From 673c1e7a4135881fe7887690fd9a49e1b21bf94c Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 12 Oct 2026 18:26:32 +0700
Subject: [PATCH 472/781] fix: conflicts

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 7fe6e6a7ab28..c3baeb0b7b5c 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 7fe6e6a7ab289420fc949e1d499f5f3610ec22a1
+Subproject commit c3baeb0b7b5c1b7d870d42d80d5f37ef81dfa180

From 2da42f092074212379b8d335df39c037ed4ae479 Mon Sep 17 00:00:00 2001
From: "Krishna (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 11:27:52 +0000
Subject: [PATCH 473/781] Keep split navigator state when navigating to the
 only sidebar screen on narrow layout

Co-authored-by: Krishna <Krishna2323@users.noreply.github.com>
---
 .../createSplitNavigator/SplitRouter.ts       |  3 +-
 tests/unit/Navigation/SplitRouterTest.ts      | 68 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/Navigation/SplitRouterTest.ts

diff --git a/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts b/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
index 3af6e3f40087..0d16deacbb82 100644
--- a/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter.ts
@@ -170,7 +170,8 @@ function SplitRouter(options: SplitNavigatorRouterOptions) {
             if (isPushingSidebarOnCentralPane(state, action, options)) {
                 if (getIsNarrowLayout()) {
                     const newAction = StackActions.popToTop();
-                    return stackRouter.getStateForAction(state, newAction, configOptions);
+                    // popToTop returns null when the sidebar is already the only screen, so there is nothing to do.
+                    return stackRouter.getStateForAction(state, newAction, configOptions) ?? state;
                 }
                 // On wide screen do nothing as we want to keep the central pane screen and the sidebar is visible.
                 return state;
diff --git a/tests/unit/Navigation/SplitRouterTest.ts b/tests/unit/Navigation/SplitRouterTest.ts
new file mode 100644
index 000000000000..652f018ee737
--- /dev/null
+++ b/tests/unit/Navigation/SplitRouterTest.ts
@@ -0,0 +1,68 @@
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import SplitRouter from '@libs/Navigation/AppNavigator/createSplitNavigator/SplitRouter';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type {ParamListBase, RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
+
+import {CommonActions} from '@react-navigation/native';
+
+jest.mock('@libs/getIsNarrowLayout', () => jest.fn(() => true));
+
+const mockGetIsNarrowLayout = jest.mocked(getIsNarrowLayout);
+
+const CONFIG_OPTIONS: RouterConfigOptions = {
+    routeNames: [SCREENS.INBOX, SCREENS.REPORT],
+    routeParamList: {},
+    routeGetIdList: {},
+};
+
+const router = SplitRouter({
+    sidebarScreen: SCREENS.INBOX,
+    defaultCentralScreen: SCREENS.REPORT,
+    parentRoute: {key: 'reports-split-key', name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR},
+});
+
+function makeState(routeNames: string[]): StackNavigationState<ParamListBase> {
+    return {
+        key: 'split-test',
+        index: routeNames.length - 1,
+        routeNames: [SCREENS.INBOX, SCREENS.REPORT],
+        routes: routeNames.map((name, index) => ({key: `${name}-${index}`, name})),
+        type: 'stack',
+        stale: false,
+        preloadedRoutes: [],
+    };
+}
+
+describe('SplitRouter', () => {
+    describe('navigating to the sidebar screen on narrow layout', () => {
+        beforeEach(() => {
+            mockGetIsNarrowLayout.mockReturnValue(true);
+        });
+
+        it('returns the current state when the sidebar is the only screen', () => {
+            // Given a split navigator that only shows the sidebar, as it does after the Reports tab is preloaded
+            const state = makeState([SCREENS.INBOX]);
+
+            // When something navigates to the sidebar screen again, for example tapping the Inbox tab
+            const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX), CONFIG_OPTIONS);
+
+            // Then the router reports the action as handled with no change, instead of returning null, which React Navigation reports as params it couldn't apply
+            expect(result).toBe(state);
+        });
+
+        it('pops back to the sidebar when a central screen is on top', () => {
+            // Given a split navigator with a report opened on top of the sidebar
+            const state = makeState([SCREENS.INBOX, SCREENS.REPORT]);
+
+            // When something navigates to the sidebar screen
+            const result = router.getStateForAction(state, CommonActions.navigate(SCREENS.INBOX), CONFIG_OPTIONS);
+
+            // Then the router still pops to the sidebar, so the fallback only applies when there is nothing to pop
+            expect(result?.index).toBe(0);
+            expect(result?.routes.map((route) => route.name)).toEqual([SCREENS.INBOX]);
+        });
+    });
+});

From 8a6306927f7e25819eb24058e362ffd666112fe4 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Mon, 12 Oct 2026 13:29:43 +0200
Subject: [PATCH 474/781] fix: format

---
 tests/unit/components/Table/useColumnResizeTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/components/Table/useColumnResizeTest.ts b/tests/unit/components/Table/useColumnResizeTest.ts
index 9b4f45fe01ca..9c97e13f6cb2 100644
--- a/tests/unit/components/Table/useColumnResizeTest.ts
+++ b/tests/unit/components/Table/useColumnResizeTest.ts
@@ -317,7 +317,7 @@ describe('useColumnResize', () => {
         expect(readGripHover()).toBe('1');
     });
 
-        it('keeps a dragged width above its floor', () => {
+    it('keeps a dragged width above its floor', () => {
         // Given a 200px column that may not shrink below 180px
         const {handleElement, getHandleProps, readWidth} = renderColumnResize({dragMinWidths: {[NAME_COLUMN_KEY]: 180}});
 

From 98013571893650d2d8ac342054ed46392ddd1293 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 13:34:02 +0200
Subject: [PATCH 475/781] Empty commit


From 1c457be617a1fa711b6159d76704342b68ae46e3 Mon Sep 17 00:00:00 2001
From: aimane-chnaif <aiman.chnaif@gmail.com>
Date: Mon, 12 Oct 2026 12:39:19 +0100
Subject: [PATCH 476/781] Dismiss action badge pill when composer is expanded

---
 src/hooks/useReportActionsScroll.ts           | 44 ++++++++----
 .../useReportUnreadMessageScrollTracking.ts   |  1 +
 tests/unit/useReportActionsScrollTest.tsx     | 72 +++++++++++++++++--
 3 files changed, 95 insertions(+), 22 deletions(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index e381496e3d88..1de828ee8150 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -176,6 +176,7 @@ function useReportActionsScroll({
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const [reportLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${reportID}`);
     const [reportActionPages] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES}${getNonEmptyStringOnyxID(reportID)}`);
+    const [isComposerFullSize = false] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${reportID}`);
     const prevIsLoadingInitialReportActions = usePrevious(reportLoadingState?.isLoadingInitialReportActions);
 
     const [actionIdToHighlight, setActionIdToHighlight] = useState('');
@@ -221,21 +222,29 @@ function useReportActionsScroll({
         ...(shouldFocusToTopOnMount ? {autoscrollToBottomThreshold: shouldAutoscrollToBottom ? CONST.REPORT.ACTIONS.ACTION_VISIBLE_THRESHOLD : 0, animateAutoScrollToBottom: false} : {}),
     };
 
-    const {isFloatingMessageCounterVisible, setIsFloatingMessageCounterVisible, isActionBadgeAboveViewport, trackVerticalScrolling, onViewableItemsChanged, updatePillVisibility} =
-        useReportUnreadMessageScrollTracking({
-            reportID,
-            currentVerticalScrollingOffsetRef: scrollOffsetRef,
-            onUnreadActionVisible: completeSkippedMarkAsRead,
-            hasNewerActions,
-            unreadMarkerReportActionIndex,
-            isInverted: true,
-            shouldDisablePillTracking,
-            onTrackScrolling: (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-                scrollOffsetRef.current = event.nativeEvent.contentOffset.y;
-            },
-            actionBadgeTargetIndex,
-            shouldBeAlignedToTop,
-        });
+    const {
+        isFloatingMessageCounterVisible,
+        setIsFloatingMessageCounterVisible,
+        isActionBadgeAboveViewport,
+        setIsActionBadgeAboveViewport,
+        trackVerticalScrolling,
+        onViewableItemsChanged,
+        updatePillVisibility,
+    } = useReportUnreadMessageScrollTracking({
+        reportID,
+        currentVerticalScrollingOffsetRef: scrollOffsetRef,
+        onUnreadActionVisible: completeSkippedMarkAsRead,
+        hasNewerActions,
+        unreadMarkerReportActionIndex,
+        isInverted: true,
+        // The list is hidden behind the expanded composer, so scrolling it must not bring the Latest messages pill back
+        shouldDisablePillTracking: shouldDisablePillTracking || isComposerFullSize,
+        onTrackScrolling: (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+            scrollOffsetRef.current = event.nativeEvent.contentOffset.y;
+        },
+        actionBadgeTargetIndex,
+        shouldBeAlignedToTop,
+    });
 
     const {isScrollToBottomEnabled, setIsScrollToBottomEnabled, completeLiveTailPruneAfterScrollToBottom} = useReportActionsNewActionLiveTail({
         conciergeChat,
@@ -405,6 +414,11 @@ function useReportActionsScroll({
         if (actionBadgeTargetIndex < 0) {
             return;
         }
+        // The expanded composer covers the list, so the target never becomes viewable to hide the pill
+        if (isComposerFullSize) {
+            setIsActionBadgeAboveViewport(false);
+            setIsFloatingMessageCounterVisible(false);
+        }
         // `animated` is explicit because native defaults to an instant jump, which would teleport the list and lose the user's place.
         reportScrollManager.scrollToIndex(actionBadgeTargetIndex, {animated: true, viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
     };
diff --git a/src/pages/inbox/report/useReportUnreadMessageScrollTracking.ts b/src/pages/inbox/report/useReportUnreadMessageScrollTracking.ts
index c02909053c2f..0b6451b97d23 100644
--- a/src/pages/inbox/report/useReportUnreadMessageScrollTracking.ts
+++ b/src/pages/inbox/report/useReportUnreadMessageScrollTracking.ts
@@ -194,6 +194,7 @@ export default function useReportUnreadMessageScrollTracking({
         isFloatingMessageCounterVisible,
         setIsFloatingMessageCounterVisible,
         isActionBadgeAboveViewport,
+        setIsActionBadgeAboveViewport,
         trackVerticalScrolling,
         onViewableItemsChanged,
         updatePillVisibility,
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index 4f2f52f69d91..da14845ace5a 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -46,19 +46,25 @@ jest.mock('@hooks/useReportScrollManager', () => ({
 
 // --- useReportUnreadMessageScrollTracking ---
 const mockSetIsFloatingMessageCounterVisible = jest.fn();
+const mockSetIsActionBadgeAboveViewport = jest.fn();
 const mockTrackVerticalScrolling = jest.fn();
 const mockOnViewableItemsChanged = jest.fn();
 let mockIsFloatingMessageCounterVisible = false;
 let mockIsActionBadgeAboveViewport = false;
+let mockShouldDisablePillTracking: boolean | undefined;
 jest.mock('@pages/inbox/report/useReportUnreadMessageScrollTracking', () => ({
     __esModule: true,
-    default: () => ({
-        isFloatingMessageCounterVisible: mockIsFloatingMessageCounterVisible,
-        setIsFloatingMessageCounterVisible: mockSetIsFloatingMessageCounterVisible,
-        isActionBadgeAboveViewport: mockIsActionBadgeAboveViewport,
-        trackVerticalScrolling: mockTrackVerticalScrolling,
-        onViewableItemsChanged: mockOnViewableItemsChanged,
-    }),
+    default: ({shouldDisablePillTracking}: {shouldDisablePillTracking?: boolean}) => {
+        mockShouldDisablePillTracking = shouldDisablePillTracking;
+        return {
+            isFloatingMessageCounterVisible: mockIsFloatingMessageCounterVisible,
+            setIsFloatingMessageCounterVisible: mockSetIsFloatingMessageCounterVisible,
+            isActionBadgeAboveViewport: mockIsActionBadgeAboveViewport,
+            setIsActionBadgeAboveViewport: mockSetIsActionBadgeAboveViewport,
+            trackVerticalScrolling: mockTrackVerticalScrolling,
+            onViewableItemsChanged: mockOnViewableItemsChanged,
+        };
+    },
 }));
 
 // --- useReportActionsNewActionLiveTail ---
@@ -241,6 +247,7 @@ describe('useReportActionsScroll', () => {
         mockReportRHPActiveRoute = undefined;
         mockIsFloatingMessageCounterVisible = false;
         mockIsActionBadgeAboveViewport = false;
+        mockShouldDisablePillTracking = undefined;
         mockIsScrollToBottomEnabled = false;
         mockIsTransactionThread = false;
         mockIsSentMoneyReportAction = false;
@@ -419,6 +426,57 @@ describe('useReportActionsScroll', () => {
 
             expect(mockScrollToIndex).toHaveBeenCalledWith(5, {animated: true, viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
         });
+
+        it('leaves the pills to viewability tracking when the composer is not expanded', async () => {
+            // Given a valid action badge target with the composer at its normal size
+            const {result} = await renderScroll({actionBadgeTargetIndex: 5});
+
+            // When the action badge pill is pressed
+            act(() => {
+                result.current.scrollToActionBadgeTarget();
+            });
+
+            // Then the pills are not hidden directly because the target scrolls into view and viewability tracking hides the pill
+            expect(mockSetIsActionBadgeAboveViewport).not.toHaveBeenCalled();
+            expect(mockSetIsFloatingMessageCounterVisible).not.toHaveBeenCalled();
+        });
+
+        it('hides both pills on press when the composer is expanded', async () => {
+            // Given a valid action badge target while the expanded composer covers the list
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${REPORT_ID}`, true);
+            const {result} = await renderScroll({actionBadgeTargetIndex: 5});
+
+            // When the action badge pill is pressed
+            act(() => {
+                result.current.scrollToActionBadgeTarget();
+            });
+
+            // Then both pills are hidden directly because the target can never become viewable to hide them, and the list still scrolls
+            expect(mockSetIsActionBadgeAboveViewport).toHaveBeenCalledWith(false);
+            expect(mockSetIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
+            expect(mockScrollToIndex).toHaveBeenCalledWith(5, {animated: true, viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
+        });
+    });
+
+    describe('pill tracking', () => {
+        it('keeps scroll-based pill tracking enabled when the composer is not expanded', async () => {
+            // Given the composer at its normal size and no linked message to position
+            await renderScroll();
+
+            // Then scroll-based pill tracking stays enabled so the Latest messages pill follows scrolling
+            expect(mockShouldDisablePillTracking).toBe(false);
+        });
+
+        it('disables scroll-based pill tracking while the composer is expanded', async () => {
+            // Given the expanded composer covers the list
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${REPORT_ID}`, true);
+
+            // When the hook renders
+            await renderScroll();
+
+            // Then scroll-based pill tracking is disabled so scrolling the hidden list cannot bring the Latest messages pill back
+            expect(mockShouldDisablePillTracking).toBe(true);
+        });
     });
 
     describe('flushPendingScrollToBottom', () => {

From 23f8feb1a41e8a9ad2d7b144d338ae4445a862eb Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 12 Oct 2026 18:53:33 +0700
Subject: [PATCH 477/781] fix: refactor deleteReportComment

---
 src/libs/actions/Report/index.ts              |  44 ++--
 .../PopoverReportActionContextMenu.tsx        |  10 +-
 tests/actions/AttachmentTest.ts               |  26 +-
 tests/actions/ReportTest.ts                   | 234 ++++++++++++++++--
 tests/ui/UnreadIndicatorsTest.tsx             |  26 +-
 5 files changed, 297 insertions(+), 43 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index a4ef9fefcffe..0b18b537920d 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -3371,22 +3371,34 @@ function broadcastUserIsLeavingRoom(reportID: string, currentUserAccountID: numb
     Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, leavingStatus);
 }
 
+type DeleteReportCommentParams = {
+    report: OnyxEntry<Report>;
+    reportAction: ReportAction;
+    originalReportActions: OnyxEntry<ReportActions>;
+    reportActions: OnyxEntry<ReportActions>;
+    ancestors: Ancestor[];
+    isReportArchived: boolean | undefined;
+    isOriginalReportArchived: boolean | undefined;
+    currentEmail: string;
+    isOffline: boolean;
+    currentUserAccountID: number;
+    visibleReportActionsData?: VisibleReportActionsDerivedValue;
+};
+
 /** Deletes a comment from the report, basically sets it as empty string */
-// TODO: Convert these positional params into a single object param, like the sibling actions in this file already use. That also removes the need for the suppression below. Refactor issue: https://github.com/Expensify/App/issues/66408
-// eslint-disable-next-line @typescript-eslint/max-params
-function deleteReportComment(
-    report: OnyxEntry<Report>,
-    reportAction: ReportAction,
-    originalReportActions: OnyxEntry<ReportActions>,
-    reportActions: OnyxEntry<ReportActions>,
-    ancestors: Ancestor[],
-    isReportArchived: boolean | undefined,
-    isOriginalReportArchived: boolean | undefined,
-    currentEmail: string,
-    isOffline: boolean,
-    currentUserAccountID: number,
-    visibleReportActionsDataParam?: VisibleReportActionsDerivedValue,
-) {
+function deleteReportComment({
+    report,
+    reportAction,
+    originalReportActions,
+    reportActions,
+    ancestors,
+    isReportArchived,
+    isOriginalReportArchived,
+    currentEmail,
+    isOffline,
+    currentUserAccountID,
+    visibleReportActionsData,
+}: DeleteReportCommentParams) {
     const reportID = report?.reportID;
     const originalReportID = getOriginalReportID(reportID, reportAction, reportActions, isOffline);
     const reportActionID = reportAction.reportActionID;
@@ -3506,7 +3518,7 @@ function deleteReportComment(
             (action) =>
                 action.reportActionID !== reportAction.reportActionID &&
                 ReportActionsUtils.didMessageMentionCurrentUser(action, currentEmail) &&
-                ReportActionsUtils.isReportActionVisible(action, reportID, undefined, visibleReportActionsDataParam),
+                ReportActionsUtils.isReportActionVisible(action, reportID, undefined, visibleReportActionsData),
         );
         optimisticReport.lastMentionedTime = latestMentionedReportAction?.created ?? null;
     }
diff --git a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 847b0fdaa48b..e6e1d50bfbeb 100644
--- a/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -430,19 +430,19 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro
             });
         } else if (reportAction) {
             callbackWhenDeleteModalHide.current = () => {
-                deleteReportComment(
+                deleteReportComment({
                     report,
                     reportAction,
                     originalReportActions,
                     reportActions,
-                    ancestorsRef.current,
+                    ancestors: ancestorsRef.current,
                     isReportArchived,
                     isOriginalReportArchived,
-                    email ?? '',
+                    currentEmail: email ?? '',
                     isOffline,
                     currentUserAccountID,
-                    visibleReportActionsData ?? undefined,
-                );
+                    visibleReportActionsData: visibleReportActionsData ?? undefined,
+                });
             };
         }
 
diff --git a/tests/actions/AttachmentTest.ts b/tests/actions/AttachmentTest.ts
index 0e29cf9c7bb8..0a9f813e3470 100644
--- a/tests/actions/AttachmentTest.ts
+++ b/tests/actions/AttachmentTest.ts
@@ -300,7 +300,18 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
+        deleteReportComment({
+            report: {reportID},
+            reportAction: attachmentAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: false,
+            isOriginalReportArchived: false,
+            currentEmail: 'test@user.com',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         // Then the attachment should be removed
@@ -363,7 +374,18 @@ describe('AttachmentStorage', () => {
         }
 
         // Delete attachment
-        deleteReportComment({reportID}, attachmentAction, undefined, undefined, [], false, false, 'test@user.com', false, 1);
+        deleteReportComment({
+            report: {reportID},
+            reportAction: attachmentAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: false,
+            isOriginalReportArchived: false,
+            currentEmail: 'test@user.com',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         const removedAttachment = attachments?.[`${ONYXKEYS.COLLECTION.ATTACHMENT}${attachmentID}`];
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index ca9595eeafd9..d5730b98cff1 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -919,7 +919,18 @@ describe('actions/Report', () => {
             .then(() => {
                 rerender(report);
                 // If the user deletes a comment that is before the last read
-                Report.deleteReportComment(report, {...reportActions[200]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
+                Report.deleteReportComment({
+                    report,
+                    reportAction: {...reportActions[200]},
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: ancestors.current,
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: USER_1_LOGIN,
+                    isOffline: false,
+                    currentUserAccountID: 1,
+                });
                 return waitForBatchedUpdates();
             })
             .then(() => {
@@ -938,7 +949,18 @@ describe('actions/Report', () => {
 
                 rerender(report);
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
-                Report.deleteReportComment(report, {...reportActions[400]}, undefined, undefined, ancestors.current, undefined, undefined, USER_1_LOGIN, false, 1);
+                Report.deleteReportComment({
+                    report,
+                    reportAction: {...reportActions[400]},
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: ancestors.current,
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: USER_1_LOGIN,
+                    isOffline: false,
+                    currentUserAccountID: 1,
+                });
                 return waitForBatchedUpdates();
             })
             .then(() => getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))
@@ -1694,7 +1716,18 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1751,7 +1784,18 @@ describe('actions/Report', () => {
         expect(persistedRequests?.at(0)?.command).toBe(WRITE_COMMANDS.ADD_COMMENT);
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, newReportAction, undefined, undefined, ancestors.current, undefined, undefined, currentUserEmail, false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: currentUserEmail,
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -1821,7 +1865,18 @@ describe('actions/Report', () => {
         });
 
         rerender(originalReport);
-        Report.deleteReportComment(originalReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: originalReport,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -1880,7 +1935,18 @@ describe('actions/Report', () => {
                 }),
             );
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         jest.runOnlyPendingTimers();
         await waitForBatchedUpdates();
@@ -1956,7 +2022,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2040,7 +2117,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2257,7 +2345,18 @@ describe('actions/Report', () => {
             }),
         };
 
-        Report.deleteReportComment(REPORT, commentAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: commentAction,
+            originalReportActions: reportActionsForReport,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2343,7 +2442,18 @@ describe('actions/Report', () => {
         };
 
         // Delete comment B — only whisper B (at commentB + 1) should be marked deleted
-        Report.deleteReportComment(REPORT, commentBAction, reportActionsForReport, undefined, [], undefined, undefined, '', false, 1, undefined);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: commentBAction,
+            originalReportActions: reportActionsForReport,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
         await waitForBatchedUpdates();
 
         const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}` as const);
@@ -2442,7 +2552,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, newReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction: newReportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(0);
@@ -2544,7 +2665,18 @@ describe('actions/Report', () => {
             });
         });
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: [],
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
         expect(PersistedRequests.getAll().length).toBe(1);
@@ -2607,7 +2739,18 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors({reportID: REPORT_ID}));
 
-        Report.deleteReportComment(REPORT, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report: REPORT,
+            reportAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         expect(PersistedRequests.getAll().length).toBe(3);
 
@@ -2854,8 +2997,30 @@ describe('actions/Report', () => {
 
         const {result: ancestors} = renderHook(() => useAncestors(report));
 
-        Report.deleteReportComment(report, mentionAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
-        Report.deleteReportComment(report, mentionAction2, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+        Report.deleteReportComment({
+            report,
+            reportAction: mentionAction,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
+        Report.deleteReportComment({
+            report,
+            reportAction: mentionAction2,
+            originalReportActions: undefined,
+            reportActions: undefined,
+            ancestors: ancestors.current,
+            isReportArchived: undefined,
+            isOriginalReportArchived: undefined,
+            currentEmail: '',
+            isOffline: false,
+            currentUserAccountID: 1,
+        });
 
         await waitForBatchedUpdates();
 
@@ -2892,7 +3057,18 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+            Report.deleteReportComment({
+                report: parentReport,
+                reportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: ancestors.current,
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -2910,7 +3086,18 @@ describe('actions/Report', () => {
             mockNavigation.getTopmostSearchReportRouteParams.mockReturnValue({reportID: CHILD_REPORT_ID, reportActionID: 'action-999'});
 
             const {result: ancestors} = renderHook(() => useAncestors(parentReport));
-            Report.deleteReportComment(parentReport, reportAction, undefined, undefined, ancestors.current, undefined, undefined, '', false, 1);
+            Report.deleteReportComment({
+                report: parentReport,
+                reportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: ancestors.current,
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -11944,7 +12131,18 @@ describe('actions/Report', () => {
                 });
                 await waitForBatchedUpdates();
 
-                Report.deleteReportComment({reportID: REPORT_ID}, deletedComment, undefined, undefined, [], undefined, undefined, '', false, currentUserAccountID);
+                Report.deleteReportComment({
+                    report: {reportID: REPORT_ID},
+                    reportAction: deletedComment,
+                    originalReportActions: undefined,
+                    reportActions: undefined,
+                    ancestors: [],
+                    isReportArchived: undefined,
+                    isOriginalReportArchived: undefined,
+                    currentEmail: '',
+                    isOffline: false,
+                    currentUserAccountID,
+                });
                 await waitForBatchedUpdates();
 
                 return (await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}` as const))?.lastVisibleActionCreated;
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index 042bd8b6d706..3c662449d2c5 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -708,7 +708,18 @@ describe('Unread Indicators', () => {
 
                     const report = await OnyxUtils.get(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`);
                     if (lastReportAction) {
-                        deleteReportComment(report, lastReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+                        deleteReportComment({
+                            report,
+                            reportAction: lastReportAction,
+                            originalReportActions: undefined,
+                            reportActions: undefined,
+                            ancestors: [],
+                            isReportArchived: undefined,
+                            isOriginalReportArchived: undefined,
+                            currentEmail: '',
+                            isOffline: false,
+                            currentUserAccountID: 1,
+                        });
                     }
                     return waitForBatchedUpdates();
                 })
@@ -764,7 +775,18 @@ describe('Unread Indicators', () => {
 
             await waitForBatchedUpdates();
 
-            deleteReportComment(report, firstNewReportAction, undefined, undefined, [], undefined, undefined, '', false, 1);
+            deleteReportComment({
+                report,
+                reportAction: firstNewReportAction,
+                originalReportActions: undefined,
+                reportActions: undefined,
+                ancestors: [],
+                isReportArchived: undefined,
+                isOriginalReportArchived: undefined,
+                currentEmail: '',
+                isOffline: false,
+                currentUserAccountID: 1,
+            });
 
             await waitForBatchedUpdates();
         }

From 80c87c02aa41cf3bc42f949f9126b9690bde1a78 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 14:15:44 +0200
Subject: [PATCH 478/781] Preserve the embedded Victory bar interaction and
 dismiss tooltips from the wide Search controls

---
 src/components/Charts/hooks/useChartInteractions.ts         | 6 +++++-
 .../VictoryChartRenderer/hooks/useVictoryBarInteractions.ts | 1 +
 src/components/Search/index.tsx                             | 2 --
 src/pages/Search/SearchPageNarrow/index.tsx                 | 6 ++----
 src/pages/Search/SearchPageWide.tsx                         | 2 ++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 7faaff7ba22d..4e9b29f8ac8b 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -102,6 +102,9 @@ type UseChartInteractionsProps = {
 
     /** Scale applied to the rendered chart container */
     coordinateScale?: number;
+
+    /** Whether a touch tap pins the tooltip instead of calling handlePress */
+    shouldPinTooltipOnTouch?: boolean;
 };
 
 function normalizeChartCoordinate(coordinate: number, coordinateScale: number): number {
@@ -174,6 +177,7 @@ function useChartInteractions({
     chartBottom,
     yZero,
     coordinateScale = 1,
+    shouldPinTooltipOnTouch = true,
 }: UseChartInteractionsProps) {
     /** Interaction state compatible with Victory Native's internal logic */
     const {state: chartInteractionState} = useChartInteractionState();
@@ -440,7 +444,7 @@ function useChartInteractions({
                 const cursorY = normalizeChartCoordinate(e.y, coordinateScale);
                 chartInteractionState.cursor.x.set(cursorX);
                 chartInteractionState.cursor.y.set(cursorY);
-                if (e.pointerType === PointerType.TOUCH) {
+                if (e.pointerType === PointerType.TOUCH && shouldPinTooltipOnTouch) {
                     handleTouchTap(cursorX, cursorY);
                     return;
                 }
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/hooks/useVictoryBarInteractions.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/hooks/useVictoryBarInteractions.ts
index ef4ccb363cab..108142cbb336 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/hooks/useVictoryBarInteractions.ts
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/hooks/useVictoryBarInteractions.ts
@@ -226,6 +226,7 @@ function useVictoryBarInteractions() {
         chartBottom,
         yZero,
         coordinateScale,
+        shouldPinTooltipOnTouch: false,
     });
 
     const [activeBarIndex, setActiveBarIndex] = useState(-1);
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index b220e7db37b9..b439cae7cbf0 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,6 +1,5 @@
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
@@ -1428,7 +1427,6 @@ function Search({
                     contentContainerStyle={styles.flexGrow1}
                     onScroll={onSearchListScroll}
                     onLayout={onLayoutChart}
-                    onTouchStart={dismissPinnedChartTooltip}
                     scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
                 >
                     <View style={[listContainerStyle, styles.mh4, styles.mb4, styles.flex1]}>
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 0a49277ff7f8..f32249207da3 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -256,6 +256,7 @@ function SearchPageNarrow({
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
+            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
@@ -272,10 +273,7 @@ function SearchPageNarrow({
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
-                            <View
-                                style={[StyleUtils.getSearchPageNarrowHeaderStyles(), styles.mh100]}
-                                onTouchStart={dismissPinnedChartTooltip}
-                            >
+                            <View style={[StyleUtils.getSearchPageNarrowHeaderStyles(), styles.mh100]}>
                                 <View style={[styles.zIndex10, styles.appBG]}>
                                     <SearchPageHeaderNarrow
                                         queryJSON={queryJSON}
diff --git a/src/pages/Search/SearchPageWide.tsx b/src/pages/Search/SearchPageWide.tsx
index b4ed227e6c5e..098ecfc8945b 100644
--- a/src/pages/Search/SearchPageWide.tsx
+++ b/src/pages/Search/SearchPageWide.tsx
@@ -1,4 +1,5 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import {useSearchSidebarContentOffsetStyle} from '@components/Navigation/SearchSidebarCollapseStore';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -117,6 +118,7 @@ function SearchPageWide({
         <Animated.View
             ref={receiptDropTargetRef}
             style={[styles.searchSplitContainer, splitContainerAnimatedStyle]}
+            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}

From c29962360a97090469a826b4b04d7ecc751ffc8d Mon Sep 17 00:00:00 2001
From: aimane-chnaif <aiman.chnaif@gmail.com>
Date: Mon, 12 Oct 2026 13:39:58 +0100
Subject: [PATCH 479/781] Skip onLoad pill update while composer is expanded

---
 src/hooks/useReportActionsScroll.ts       | 5 ++++-
 tests/unit/useReportActionsScrollTest.tsx | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index 1de828ee8150..b6eb7c4e7855 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -438,7 +438,10 @@ function useReportActionsScroll({
             // Wait one frame so the initial positioning can settle, then disable it.
             requestAnimationFrame(() => {
                 setShouldDisablePillTracking(false);
-                updatePillVisibility();
+                // The list is hidden behind the expanded composer, so its offset must not show the Latest messages pill
+                if (!isComposerFullSize) {
+                    updatePillVisibility();
+                }
             });
         }
         if (!shouldFocusToTopOnMount) {
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index da14845ace5a..19bc1d0bc33b 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -461,6 +461,8 @@ describe('useReportActionsScroll', () => {
     describe('pill tracking', () => {
         it('keeps scroll-based pill tracking enabled when the composer is not expanded', async () => {
             // Given the composer at its normal size and no linked message to position
+
+            // When the hook renders
             await renderScroll();
 
             // Then scroll-based pill tracking stays enabled so the Latest messages pill follows scrolling

From 9773cdd2e6a331e8a4a3fca3d0b35fd40a120d22 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 14:56:25 +0200
Subject: [PATCH 480/781] Read the full parent report in
 ParentNavigationSubtitle to avoid an extra mount render

---
 src/components/ParentNavigationSubtitle.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index b5623e8be0a6..98d91fc40d39 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -20,7 +20,6 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
-import {getStableReportSelector} from '@src/selectors/Report';
 import {reportVisibleActionsSelector} from '@src/selectors/ReportAction';
 
 import type {ColorValue, StyleProp, TextStyle, ViewStyle} from 'react-native';
@@ -101,7 +100,7 @@ function ParentNavigationSubtitle({
     const {workspaceName, reportName} = parentNavigationSubtitleData;
     const {translate} = useLocalize();
     const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, {selector: getStableReportSelector});
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {selector: reportVisibleActionsSelector(parentReportID)});
     const isReportArchived = useReportIsArchived(report?.reportID);
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);

From cf02ea4c63b18874ba04b89e9003e55fcb3dd8ab Mon Sep 17 00:00:00 2001
From: aimane-chnaif <aiman.chnaif@gmail.com>
Date: Mon, 12 Oct 2026 13:59:24 +0100
Subject: [PATCH 481/781] Revert onLoad pill guard

---
 src/hooks/useReportActionsScroll.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index b6eb7c4e7855..1de828ee8150 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -438,10 +438,7 @@ function useReportActionsScroll({
             // Wait one frame so the initial positioning can settle, then disable it.
             requestAnimationFrame(() => {
                 setShouldDisablePillTracking(false);
-                // The list is hidden behind the expanded composer, so its offset must not show the Latest messages pill
-                if (!isComposerFullSize) {
-                    updatePillVisibility();
-                }
+                updatePillVisibility();
             });
         }
         if (!shouldFocusToTopOnMount) {

From 0f1cf29aef5e5dc330a57f4ba3e25767535ecac3 Mon Sep 17 00:00:00 2001
From: Jakub Korytko <jakub@korytko.me>
Date: Wed, 7 Oct 2026 15:33:27 +0200
Subject: [PATCH 482/781] perf: reveal wide pre-mount through the root router

---
 .../GetStateForActionHandlers.ts              | 130 ++++++++-
 .../RootStackRouter.ts                        |   5 +-
 .../createRootStackNavigator/types.ts         |   4 +-
 ...apDescriptorsWithNonTopScreensBehavior.tsx |   1 +
 .../helpers/wideTabPreMountRouteKey.ts        |  33 ++-
 .../handleReplaceFullscreenUnderRHP.test.ts   | 276 +++++++++++++++++-
 .../getTabStateWithFocusedTargetTest.ts       |  36 ++-
 7 files changed, 473 insertions(+), 12 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
index 30a79116a813..2def01b17ac4 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
@@ -1,3 +1,4 @@
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
 import TAB_SCREENS from '@libs/Navigation/AppNavigator/Navigators/TAB_SCREENS';
@@ -5,6 +6,7 @@ import buildTabNavigatorNestedState from '@libs/Navigation/helpers/buildTabNavig
 import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
 import hasNativeSwipeBackGesture from '@libs/Navigation/helpers/hasNativeSwipeBackGesture';
 import {isFullScreenName, isPreMountBufferHostName} from '@libs/Navigation/helpers/isNavigatorName';
+import {isStaleWideTabPreMountPreloadedRouteKey, isStaleWideTabPreMountRouteKey} from '@libs/Navigation/helpers/wideTabPreMountRouteKey';
 import {SIDEBAR_TO_SPLIT, SPLIT_TO_SIDEBAR} from '@libs/Navigation/linkingConfig/RELATIONS';
 import type {NavigationPartialRoute, ReportsSplitNavigatorParamList} from '@libs/Navigation/types';
 import {isRecord} from '@libs/ObjectUtils';
@@ -23,6 +25,7 @@ import type {
     RemoveFullscreenUnderRHPActionType,
     ReplaceActionType,
     ReplaceFullscreenUnderRHPActionType,
+    RootStackNavigatorAction,
     ToggleMfaModalNavigatorWithHistoryActionType,
     ToggleModalWithHistoryActionType,
     ToggleSidePanelWithHistoryActionType,
@@ -122,7 +125,7 @@ type TabRouteForReplacement = NavigationState['routes'][number] | NavigationPart
 type TabStateForReplacement = Omit<NavigationState, 'routes' | 'stale'> & {routes: TabRouteForReplacement[]; stale?: true | false};
 type StaleTabStateOverrides = {routes: TabRouteForReplacement[]; index: number; routeNames?: string[]};
 
-function toStaleTabState(existingTabState: NavigationState | undefined, overrides: StaleTabStateOverrides): TabStateForReplacement {
+function toStaleTabState(existingTabState: NavigationState | PartialState<NavigationState> | undefined, overrides: StaleTabStateOverrides): TabStateForReplacement {
     return {
         type: existingTabState?.type ?? 'tab',
         key: existingTabState?.key ?? '',
@@ -208,6 +211,10 @@ function isNavigationPartialRoute(route: unknown): route is NavigationPartialRou
     return typeof route === 'object' && route !== null && 'name' in route && typeof route.name === 'string';
 }
 
+function isRealizedNavigationState(state: unknown): state is NavigationState {
+    return isRecord(state) && state.stale === false && typeof state.key === 'string' && Array.isArray(state.routes);
+}
+
 function isNavigationStateWithRoutes(state: unknown): state is PartialState<NavigationState> {
     return typeof state === 'object' && state !== null && 'routes' in state && Array.isArray(state.routes);
 }
@@ -353,6 +360,14 @@ function getTabStateWithFocusedTarget(existingTabState: NavigationState | undefi
         }
     }
 
+    return getTabStateWithFreshTarget(existingTabState, focusedTargetTab);
+}
+
+/** Builds the target tab with fresh keys, keeping the other tabs and tab history from `existingTabState`. */
+function getTabStateWithFreshTarget(
+    existingTabState: NavigationState | PartialState<NavigationState> | undefined,
+    focusedTargetTab: NavigationPartialRoute,
+): TabStateForReplacement | undefined {
     const completeTabState = buildTabNavigatorNestedState(focusedTargetTab);
     const completeTargetTabIndex = completeTabState.routes.findIndex((route) => route.name === focusedTargetTab.name);
     if (completeTargetTabIndex < 0) {
@@ -363,6 +378,7 @@ function getTabStateWithFocusedTarget(existingTabState: NavigationState | undefi
         if (route.name === focusedTargetTab.name) {
             return getTargetTabRoute(undefined, focusedTargetTab);
         }
+        // Keys are kept on purpose: tab history references them, so fresh keys would drop it after the reveal.
         return existingTabState?.routes.find((r) => r.name === route.name) ?? route;
     });
 
@@ -464,6 +480,22 @@ function markFocusedTabRouteForRemount(tabState: TabStateForReplacement, existin
     });
 }
 
+/**
+ * Adds the focused tab to the end of the tab history the way the tab router does when switching tabs (fullHistory).
+ * A realized state is not rehydrated, so without this the history would still end on the tab the user came from.
+ */
+function withFocusedTabInHistory(tabState: TabStateForReplacement): TabStateForReplacement {
+    const focusedRoute = tabState.routes[tabState.index];
+    if (tabState.stale === true || !tabState.history || !focusedRoute || !('key' in focusedRoute) || typeof focusedRoute.key !== 'string') {
+        return tabState;
+    }
+    const lastRouteEntry = tabState.history.findLast((entry) => isRecord(entry) && entry.type === 'route');
+    if (isRecord(lastRouteEntry) && lastRouteEntry.key === focusedRoute.key) {
+        return tabState;
+    }
+    return {...tabState, history: [...tabState.history, {type: 'route', key: focusedRoute.key, params: focusedRoute.params}]};
+}
+
 /**
  * Handles the REPLACE_FULLSCREEN_UNDER_RHP action.
  *
@@ -530,11 +562,21 @@ function handleReplaceFullscreenUnderRHP(
         if (!focusedTargetTab) {
             return null;
         }
-        const updatedTabState = getTabStateWithFocusedTarget(existingTabState, focusedTargetTab);
-        if (!updatedTabState) {
+
+        const builtTabState = getTabStateWithFocusedTarget(existingTabState, focusedTargetTab);
+        if (!builtTabState) {
             return null;
         }
-        const staleTabState = existingTabState ? markFocusedTabRouteForRemount(updatedTabState, existingTabState) : updatedTabState;
+        const {preMountedRouteKey} = action.payload;
+        const updatedTabState = preMountedRouteKey ? withPreMountedDestination(builtTabState, existingTabState, preMountedRouteKey) : builtTabState;
+        // The remount guards against a push-transition flash on narrow layout (#90985). A wide pre-mount reveal keeps the key,
+        // because a remount would drop the pre-mounted screen. Wide renders split screens without a push animation.
+        let staleTabState = updatedTabState;
+        if (preMountedRouteKey && !getIsNarrowLayout()) {
+            staleTabState = withFocusedTabInHistory(updatedTabState);
+        } else if (existingTabState) {
+            staleTabState = markFocusedTabRouteForRemount(updatedTabState, existingTabState);
+        }
 
         // Drop consumed deep-link hints before remounting, or React Navigation can replay the old target over the new state.
         const updatedTabRoute = {...withSanitizedDeepLinkParams(existingTabRoute, undefined), state: staleTabState} as StackNavigationState<ParamListBase>['routes'][number];
@@ -755,12 +797,91 @@ function handleToggleModalWithHistoryAction(state: StackNavigationState<ParamLis
     return {...state, history: [...state.history.slice(0, indexToRemove), ...state.history.slice(indexToRemove + 1)]};
 }
 
+type ResetPayloadState = {routes: Array<{key?: string; state?: unknown}>; index?: number; preloadedRouteKeys?: string[]};
+
+function isResetPayloadState(state: unknown): state is ResetPayloadState {
+    return isRecord(state) && Array.isArray(state.routes);
+}
+
+/** Drops stale wide pre-mounts from a (nested) state, returning the same object when there is none. */
+function removeStalePreMountsFromState<S extends ResetPayloadState>(state: S): S {
+    let hasChangedNestedState = false;
+    const routes = state.routes.map((route) => {
+        if (!isResetPayloadState(route.state)) {
+            return route;
+        }
+        const nestedState = removeStalePreMountsFromState(route.state);
+        if (nestedState === route.state) {
+            return route;
+        }
+        hasChangedNestedState = true;
+        // A never-visited tab can hold only the pre-mount. Without a state, the navigator builds its initial route again.
+        return {...route, state: nestedState.routes.length ? nestedState : undefined};
+    });
+    const hasStalePreload = !!state.preloadedRouteKeys?.some(isStaleWideTabPreMountPreloadedRouteKey);
+    const preloads = hasStalePreload ? {preloadedRouteKeys: state.preloadedRouteKeys?.filter((key) => !isStaleWideTabPreMountPreloadedRouteKey(key))} : {};
+    const isStale = (route: {key?: string}) => isStaleWideTabPreMountRouteKey(route.key);
+    if (!routes.some(isStale)) {
+        return hasChangedNestedState || hasStalePreload ? {...state, routes, ...preloads} : state;
+    }
+    const keptRoutes = routes.filter((route) => !isStale(route));
+    const focusedIndex = state.index ?? routes.length - 1;
+    // A stale pre-mount on top of a covered stack was its focused route, so focus falls back to the route under it.
+    const index = Math.max(0, Math.min(focusedIndex - routes.slice(0, focusedIndex).filter(isStale).length, keptRoutes.length - 1));
+    return {...state, routes: keptRoutes, index, ...preloads};
+}
+
+/** Drops pre-mounts nobody owns from a RESET, e.g. restored by browser back/forward from a saved history entry. */
+function removeStalePreMountsFromResetAction(action: RootStackNavigatorAction): RootStackNavigatorAction {
+    if (action.type !== CONST.NAVIGATION.ACTION_TYPE.RESET || !action.payload || !isResetPayloadState(action.payload)) {
+        return action;
+    }
+    const payload = removeStalePreMountsFromState(action.payload);
+    return payload === action.payload ? action : ({...action, payload} as RootStackNavigatorAction);
+}
+
+/**
+ * Puts the wide pre-mounted destination screen in place of the freshly built one, so the reveal shows the mounted instance.
+ * Everything else comes from the regular replace, so the stack, tab history and back navigation end up the same as without it.
+ */
+function withPreMountedDestination(builtTabState: TabStateForReplacement, existingTabState: NavigationState | undefined, preMountedRouteKey: string): TabStateForReplacement {
+    const targetTabRoute = builtTabState.routes[builtTabState.index];
+    const existingTargetTabRoute = existingTabState?.routes.find((route) => route.name === targetTabRoute?.name);
+    const existingNestedState = isNavigationStateWithRoutes(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
+    const preMountedRoute = existingNestedState?.routes.find((route) => route.key === preMountedRouteKey);
+    const builtNestedState = isNavigationStateWithRoutes(targetTabRoute?.state) ? targetTabRoute.state : undefined;
+    const builtDestination = builtNestedState?.routes.at(-1);
+    if (!targetTabRoute || !preMountedRoute || !builtNestedState || builtDestination?.name !== preMountedRoute.name) {
+        Log.hmmm('[Navigation] Wide pre-mount does not match the revealed destination, replacing without it', {preMountedRouteKey});
+        return builtTabState;
+    }
+
+    const nestedRoutes = [...builtNestedState.routes.slice(0, -1), {...builtDestination, key: preMountedRouteKey}];
+    // When every screen of the built stack is already mounted, the mounted stack state is kept with only its routes changed.
+    // A partial state would be rehydrated under a new key, which makes the navigator re-render all of its screens.
+    const mountedNestedState = isRealizedNavigationState(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
+    const mountedRoutes = mountedNestedState
+        ? nestedRoutes.map((route) => mountedNestedState.routes.find((existing) => 'key' in route && existing.key === route.key)).filter((route) => route !== undefined)
+        : [];
+    const routes = [...builtTabState.routes];
+    if (mountedNestedState && mountedRoutes.length === nestedRoutes.length && 'key' in targetTabRoute && typeof targetTabRoute.key === 'string') {
+        routes[builtTabState.index] = {...targetTabRoute, key: targetTabRoute.key, state: {...mountedNestedState, routes: mountedRoutes, index: mountedRoutes.length - 1}};
+    } else {
+        routes[builtTabState.index] = {...targetTabRoute, state: {...builtNestedState, routes: nestedRoutes, index: nestedRoutes.length - 1}};
+    }
+    // The pre-mount kept a covered tab unfrozen. It is focused from here, so it no longer needs that.
+    const {preloadedRouteKeys} = builtTabState as TabStateForReplacement & {preloadedRouteKeys?: string[]};
+    const targetTabRouteKey = 'key' in targetTabRoute ? targetTabRoute.key : undefined;
+    return {...builtTabState, routes, ...(preloadedRouteKeys ? {preloadedRouteKeys: preloadedRouteKeys.filter((key) => key !== targetTabRouteKey)} : {})};
+}
+
 export {
     handleDismissModalAction,
     handleNavigatingToModalFromModal,
     handlePushFullscreenAction,
     handleReplaceFullscreenUnderRHP,
     handleRemoveFullscreenUnderRHP,
+    removeStalePreMountsFromResetAction,
     handleReplaceReportsSplitNavigatorAction,
     screensWithEnteringAnimation,
     handleToggleSidePanelWithHistoryAction,
@@ -769,6 +890,7 @@ export {
     getPreInsertedOriginalTabRoute,
     clearPreInsertedOriginalTabRoute,
     MODAL_ROUTES_TO_DISMISS,
+    getTabStateWithFreshTarget,
     // Exported for unit-test access; not used outside of testing.
     withSanitizedDeepLinkParams,
     getTabStateWithFocusedTarget,
diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/RootStackRouter.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/RootStackRouter.ts
index b59a0154e6e9..2d70b852def2 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/RootStackRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/RootStackRouter.ts
@@ -38,6 +38,7 @@ import {
     handleToggleModalWithHistoryAction,
     handleToggleSidePanelWithHistoryAction,
     MODAL_ROUTES_TO_DISMISS,
+    removeStalePreMountsFromResetAction,
 } from './GetStateForActionHandlers';
 import syncBrowserHistory from './syncBrowserHistory';
 
@@ -189,7 +190,9 @@ function RootStackRouter(options: RootStackNavigatorRouterOptions) {
 
     return {
         ...stackRouter,
-        getStateForAction(state: StackNavigationState<ParamListBase>, action: RootStackNavigatorAction, configOptions: RouterConfigOptions) {
+        getStateForAction(state: StackNavigationState<ParamListBase>, rawAction: RootStackNavigatorAction, configOptions: RouterConfigOptions) {
+            const action = removeStalePreMountsFromResetAction(rawAction);
+
             // Evaluate navigation guards FIRST
             const guardState = handleNavigationGuards(state, action, configOptions, stackRouter);
             if (guardState) {
diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/types.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/types.ts
index 2371a29b3680..a40348629bfd 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/types.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/types.ts
@@ -28,7 +28,7 @@ type RootStackNavigatorActionType =
       }
     | {
           type: typeof CONST.NAVIGATION.ACTION_TYPE.REPLACE_FULLSCREEN_UNDER_RHP;
-          payload: {route: Route; shouldInsertPreMountBuffer?: boolean};
+          payload: {route: Route; shouldInsertPreMountBuffer?: boolean; preMountedRouteKey?: string};
       }
     | {
           type: typeof CONST.NAVIGATION.ACTION_TYPE.REMOVE_FULLSCREEN_UNDER_RHP;
@@ -69,7 +69,7 @@ type DismissModalActionType = RootStackNavigatorActionType & {
 
 type ReplaceFullscreenUnderRHPActionType = RootStackNavigatorActionType & {
     type: typeof CONST.NAVIGATION.ACTION_TYPE.REPLACE_FULLSCREEN_UNDER_RHP;
-    payload: {route: Route; shouldInsertPreMountBuffer?: boolean};
+    payload: {route: Route; shouldInsertPreMountBuffer?: boolean; preMountedRouteKey?: string};
 };
 
 type RemoveFullscreenUnderRHPActionType = RootStackNavigatorActionType & {
diff --git a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/wrapDescriptorsWithNonTopScreensBehavior.tsx b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/wrapDescriptorsWithNonTopScreensBehavior.tsx
index 386d78d00c47..74bb12405f96 100644
--- a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/wrapDescriptorsWithNonTopScreensBehavior.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/wrapDescriptorsWithNonTopScreensBehavior.tsx
@@ -51,6 +51,7 @@ function wrapDescriptorsWithNonTopScreensBehavior<T extends Descriptor>(
         const NonTopScreenWrapper = WRAPPER_FOR_BEHAVIOR[behavior];
         // The state always carries a top route, but a missing key must leave every screen visible instead of blurring the whole stack.
         const isCovered = topRouteKey !== undefined && key !== topRouteKey;
+
         // A wide submit pre-mount keeps its wrapper, so the reveal does not remount it, but must render while covered.
         const isLivePreMount = isLiveWideTabPreMountRouteKey(key);
         const isScreenBlurred = isCovered && !isLivePreMount;
diff --git a/src/libs/Navigation/helpers/wideTabPreMountRouteKey.ts b/src/libs/Navigation/helpers/wideTabPreMountRouteKey.ts
index a9fde0861e07..2a72c3cf1553 100644
--- a/src/libs/Navigation/helpers/wideTabPreMountRouteKey.ts
+++ b/src/libs/Navigation/helpers/wideTabPreMountRouteKey.ts
@@ -5,6 +5,15 @@ let liveRouteKey: string | undefined;
 // Tab route holding the live pre-mount. Background tabs are frozen on web, so this one must stay rendered to mount the screen.
 let liveTabRouteKey: string | undefined;
 
+const ROUTE_KEY_INFIX = '-wide-pre-mount-';
+
+// A revealed pre-mount becomes a regular screen but keeps its key, so it must never count as stale.
+const revealedRouteKeys = new Set<string>();
+
+// Tab route keys a pre-mount marked preloaded, so a saved browser history entry cannot keep a covered tab unfrozen forever.
+const preloadedRouteKeysAddedByPreMount = new Set<string>();
+let livePreloadedRouteKey: string | undefined;
+
 function setLiveWideTabPreMountRouteKey(key: string | undefined) {
     liveRouteKey = key;
 }
@@ -21,4 +30,26 @@ function isLiveWideTabPreMountTabRouteKey(key: string | undefined): boolean {
     return !!key && key === liveTabRouteKey;
 }
 
-export {setLiveWideTabPreMountRouteKey, isLiveWideTabPreMountRouteKey, setLiveWideTabPreMountTabRouteKey, isLiveWideTabPreMountTabRouteKey};
+function markWideTabPreMountRouteKeyRevealed(key: string) {
+    revealedRouteKeys.add(key);
+}
+
+/** True for a pre-mount that was neither revealed nor still live, e.g. restored from a saved browser history entry. */
+function isStaleWideTabPreMountRouteKey(key: string | undefined): boolean {
+    return !!key && key.includes(ROUTE_KEY_INFIX) && key !== liveRouteKey && !revealedRouteKeys.has(key);
+}
+
+/** True for a tab preload that an earlier pre-mount added and the live one does not own. */
+function isStaleWideTabPreMountPreloadedRouteKey(key: string): boolean {
+    return preloadedRouteKeysAddedByPreMount.has(key) && key !== livePreloadedRouteKey;
+}
+
+export {
+    setLiveWideTabPreMountRouteKey,
+    isLiveWideTabPreMountRouteKey,
+    setLiveWideTabPreMountTabRouteKey,
+    isLiveWideTabPreMountTabRouteKey,
+    markWideTabPreMountRouteKeyRevealed,
+    isStaleWideTabPreMountRouteKey,
+    isStaleWideTabPreMountPreloadedRouteKey,
+};
diff --git a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
index 154020e06abe..03f964e1a5bd 100644
--- a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
+++ b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
@@ -1,10 +1,12 @@
 import getPlatform from '@libs/getPlatform';
 import {
     clearPreInsertedOriginalTabRoute,
+    removeStalePreMountsFromResetAction,
     handleRemoveFullscreenUnderRHP,
     handleReplaceFullscreenUnderRHP,
 } from '@libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers';
 import type {RemoveFullscreenUnderRHPActionType, ReplaceFullscreenUnderRHPActionType} from '@libs/Navigation/AppNavigator/createRootStackNavigator/types';
+import {markWideTabPreMountRouteKeyRevealed, setLiveWideTabPreMountRouteKey} from '@libs/Navigation/helpers/wideTabPreMountRouteKey';
 import type {NavigationPartialRoute, NavigationStateRoute, ReportsSplitNavigatorParamList} from '@libs/Navigation/types';
 
 import CONST from '@src/CONST';
@@ -12,9 +14,9 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
-import type {CommonActions, NavigationState, ParamListBase, PartialState, Router, RouterConfigOptions, StackActionType, StackNavigationState} from '@react-navigation/native';
+import type {NavigationState, ParamListBase, PartialState, Router, RouterConfigOptions, StackActionType, StackNavigationState} from '@react-navigation/native';
 
-import {StackRouter} from '@react-navigation/native';
+import {CommonActions, StackRouter} from '@react-navigation/native';
 
 import createMock from '../../../utils/createMock';
 
@@ -26,6 +28,8 @@ jest.mock('@libs/Navigation/helpers/getStateFromPath', () => ({
     default: jest.fn(() => mockStubbedParsedState),
 }));
 jest.mock('@libs/getPlatform', () => jest.fn());
+const mockGetIsNarrowLayout = jest.fn(() => false);
+jest.mock('@libs/getIsNarrowLayout', () => () => mockGetIsNarrowLayout());
 
 const mockGetPlatform = jest.mocked(getPlatform);
 
@@ -168,6 +172,11 @@ function getReportsSplitState(result: StackNavigationState<ParamListBase> | null
     return reportsSplitRoute?.state;
 }
 
+function getReportsSplitRouteKey(result: StackNavigationState<ParamListBase> | null) {
+    const tabRoute = result?.routes.findLast((route) => route.name === NAVIGATORS.TAB_NAVIGATOR);
+    return tabRoute?.state?.routes.find((route) => route.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)?.key;
+}
+
 function hasReportParams(params: unknown): params is ReportsSplitNavigatorParamList[typeof SCREENS.REPORT] {
     return typeof params === 'object' && params !== null && 'reportID' in params && typeof params.reportID === 'string';
 }
@@ -214,6 +223,7 @@ const staleLongFormDeepLinkParams = {
 beforeEach(() => {
     clearPreInsertedOriginalTabRoute();
     mockGetPlatform.mockReturnValue(CONST.PLATFORM.IOS);
+    mockGetIsNarrowLayout.mockReturnValue(false);
 });
 
 describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation', () => {
@@ -328,6 +338,164 @@ describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation
         expect(getReportIDs(result)).toEqual([undefined, 'B']);
     });
 
+    it('drops the focused tab route key on wide layout when no pre-mount is revealed', () => {
+        // Given a wide layout with the Reports tab focused on report A and no wide pre-mount
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        mockStubbedParsedState = makeReportsParsedState('B');
+
+        // When report B is put under the RHP
+        const result = handleReplaceFullscreenUnderRHP(
+            makeExistingReportsState([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key')], 1),
+            makeReportsAction('B'),
+            CONFIG_OPTIONS,
+            stackRouter,
+        );
+
+        // Then the Reports split route is keyless and remounts, so reveals that do not use a pre-mount behave as before
+        expect(getReportsSplitRouteKey(result)).toBeUndefined();
+        expect(getReportIDs(result)).toEqual([undefined, 'B']);
+    });
+
+    it('drops the focused tab route key on narrow layout so the destination mounts fresh behind the RHP (#90985)', () => {
+        // Given a narrow layout with the Reports tab focused on report A
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockStubbedParsedState = makeReportsParsedState('B');
+
+        // When report B is pre-inserted under the RHP
+        const result = handleReplaceFullscreenUnderRHP(
+            makeExistingReportsState([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key')], 1),
+            makeReportsAction('B'),
+            CONFIG_OPTIONS,
+            stackRouter,
+        );
+
+        // Then the Reports split route is keyless, which forces a remount and avoids the previous page flashing
+        expect(getReportsSplitRouteKey(result)).toBeUndefined();
+    });
+
+    it('reveals the wide pre-mounted report by giving the built destination its key, with the rest built as without it', () => {
+        // Given a wide layout with report B pre-mounted under the focused report A
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const state = makeExistingReportsState(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, 'Report-wide-pre-mount-1'),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key'),
+            ],
+            2,
+        );
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-1'}};
+
+        // When report B is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(state, action, CONFIG_OPTIONS, stackRouter);
+
+        // Then the stack is the one the replace builds without a pre-mount, and only the destination reuses the mounted screen
+        expect(getReportIDs(result)).toEqual([undefined, 'B']);
+        expect(getReportsSplitState(result)?.routes.map((route) => route.key)).toEqual(['inbox-key', 'Report-wide-pre-mount-1']);
+        expect(getReportsSplitRouteKey(result)).toBe('reports-split-key');
+    });
+
+    it('reveals a report pre-mounted in a covered tab and stops keeping that tab preloaded', () => {
+        // Given the Search tab focused and report B pre-mounted on top of the covered Reports tab, which is marked preloaded
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const existing = makeExistingReportsState(
+            [makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, 'Report-wide-pre-mount-2')],
+            1,
+            false,
+        );
+        const tabNavigatorState = existing.routes.at(0)?.state;
+        if (tabNavigatorState) {
+            Object.assign(tabNavigatorState, {preloadedRouteKeys: ['reports-split-key']});
+        }
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-2'}};
+
+        // When report B is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(existing, action, CONFIG_OPTIONS, stackRouter);
+        const resultTabState: {index?: number; preloadedRouteKeys?: string[]} | undefined = result?.routes.at(0)?.state;
+
+        // Then the Reports tab is focused on the mounted report, and it may freeze again once the user leaves it
+        expect(resultTabState?.index).toBe(0);
+        expect(getReportsSplitState(result)?.routes.at(-1)?.key).toBe('Report-wide-pre-mount-2');
+        expect(resultTabState?.preloadedRouteKeys).toEqual([]);
+    });
+
+    it('adds the destination tab to the tab history on wide layout, like a tab switch', () => {
+        // Given a wide layout with the Search tab focused and in the tab history, and report B pre-mounted in the covered Reports tab
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const existing = makeExistingReportsState(
+            [makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, 'Report-wide-pre-mount-3')],
+            1,
+            false,
+        );
+        const tabNavigatorState = existing.routes.at(0)?.state;
+        if (tabNavigatorState) {
+            Object.assign(tabNavigatorState, {history: [{type: 'route', key: 'search-tab-key'}]});
+        }
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-3'}};
+
+        // When report B in the Reports tab is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(existing, action, CONFIG_OPTIONS, stackRouter);
+        const resultHistory: unknown[] = result?.routes.at(0)?.state?.history ?? [];
+
+        // Then the history ends on the Reports tab, so tab back goes to Search instead of treating Reports as never visited
+        expect(resultHistory).toEqual([expect.objectContaining({key: 'search-tab-key'}), expect.objectContaining({key: 'reports-split-key'})]);
+    });
+
+    it('keeps the tab history as it is on wide layout when the destination is in the focused tab', () => {
+        // Given a wide layout with the Reports tab focused on report A, last in the tab history, and report B pre-mounted under A
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const existing = makeExistingReportsState(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, 'Report-wide-pre-mount-4'),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key'),
+            ],
+            2,
+        );
+        const tabNavigatorState = existing.routes.at(0)?.state;
+        if (tabNavigatorState) {
+            Object.assign(tabNavigatorState, {
+                history: [
+                    {type: 'route', key: 'search-tab-key'},
+                    {type: 'route', key: 'reports-split-key'},
+                ],
+            });
+        }
+
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-4'}};
+
+        // When report B in the same tab is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(existing, action, CONFIG_OPTIONS, stackRouter);
+        const resultHistory: unknown[] = result?.routes.at(0)?.state?.history ?? [];
+
+        // Then no duplicate entry is added, since the user did not switch tabs
+        expect(resultHistory).toEqual([expect.objectContaining({key: 'search-tab-key'}), expect.objectContaining({key: 'reports-split-key'})]);
+    });
+
+    it('replaces without the pre-mount when its screen is no longer in the destination tab', () => {
+        // Given a wide layout where the pre-mounted report was dropped before the reveal
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const existing = makeExistingReportsState([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key')], 1);
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-gone'}};
+
+        // When the destination is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(existing, action, CONFIG_OPTIONS, stackRouter);
+
+        // Then the regular in-place tab update runs, with a fresh destination route
+        expect(getReportsSplitRouteKey(result)).toBe('reports-split-key');
+        expect(getReportIDs(result)).toEqual([undefined, 'B']);
+        expect(getReportsSplitState(result)?.routes.at(-1)?.key).toBeUndefined();
+    });
+
     it('restores the untouched original Reports stack when the user cancels', () => {
         mockStubbedParsedState = makeReportsParsedState('B');
         const originalState = makeExistingReportsState(
@@ -384,12 +552,16 @@ describe('handleReplaceFullscreenUnderRHP — WORKSPACE_NAVIGATOR seeding', () =
     });
 
     it('remounts the WORKSPACE_NAVIGATOR by dropping its key so it mounts the [list, split] cleanly instead of an incremental update that flashes (#90985)', () => {
+        // Given a narrow layout, where the push transition would flash on an in-place update
+        mockGetIsNarrowLayout.mockReturnValue(true);
         mockStubbedParsedState = makeParsedState(INCOMING_SPLIT_ONLY);
         // makeExistingState gives the workspace navigator route the key 'workspace-nav-key'.
         const existing = makeExistingState([makeRoute(SCREENS.WORKSPACES_LIST, undefined, undefined, 'list-key')], 0);
+
+        // When the workspace split is revealed under the RHP
         const result = handleReplaceFullscreenUnderRHP(existing, makeAction(), CONFIG_OPTIONS, stackRouter);
 
-        // The focused tab route is marked for remount by dropping its key; TabRouter.getRehydratedState()
+        // Then the focused tab route is marked for remount by dropping its key; TabRouter.getRehydratedState()
         // then assigns a fresh key, so react-native-screens remounts the navigator instead of doing an
         // incremental update that flashes. The stale key must not survive.
         const {navigatorKey} = getWorkspaceNavInnerRoutes(result);
@@ -485,6 +657,104 @@ describe('handleReplaceFullscreenUnderRHP — WORKSPACE_NAVIGATOR seeding', () =
     });
 });
 
+describe('removeStalePreMountsFromResetAction', () => {
+    const staleKey = 'Report-wide-pre-mount-1';
+    const liveKey = 'Report-wide-pre-mount-2';
+
+    function makeResetWithReportsStack(reportRoutes: TestRoute[], reportIndex: number) {
+        const reportsTabRoute = makeRoute(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, undefined, {index: reportIndex, routes: reportRoutes}, 'reports-split-key');
+        return CommonActions.reset({index: 1, routes: [makeRoute(NAVIGATORS.TAB_NAVIGATOR, undefined, {index: 0, routes: [reportsTabRoute]}, 'tab-nav-key'), makeRHPRoute()]});
+    }
+
+    type ResetStackState = {routes: Array<{key?: string; state?: unknown}>; index?: number};
+
+    function isResetStackState(state: unknown): state is ResetStackState {
+        return typeof state === 'object' && state !== null && 'routes' in state && Array.isArray(state.routes);
+    }
+
+    function getResetReportsStack(action: ReturnType<typeof removeStalePreMountsFromResetAction>) {
+        const payload = action.type === CONST.NAVIGATION.ACTION_TYPE.RESET ? action.payload : undefined;
+        const tabRoute = payload?.routes.at(0);
+        const tabState = tabRoute && 'state' in tabRoute ? tabRoute.state : undefined;
+        const reportsStack = isResetStackState(tabState) ? tabState.routes.at(0)?.state : undefined;
+        return isResetStackState(reportsStack) ? reportsStack : undefined;
+    }
+
+    afterEach(() => {
+        setLiveWideTabPreMountRouteKey(undefined);
+    });
+
+    it('drops a pre-mount restored from a saved browser history entry and keeps focus on the same screen', () => {
+        // Given browser forward resetting to a saved state that still holds an old pre-mount under the focused report
+        const action = makeResetWithReportsStack(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, staleKey),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'a-key'),
+            ],
+            2,
+        );
+
+        // When the root router sanitizes the RESET
+        const reportsStack = getResetReportsStack(removeStalePreMountsFromResetAction(action));
+
+        // Then the stale pre-mount is gone, so it cannot stay mounted and hidden with nothing left to remove it
+        expect(reportsStack?.routes.map((route) => route.key)).toEqual(['inbox-key', 'a-key']);
+        expect(reportsStack?.index).toBe(1);
+    });
+
+    it('drops the state of a tab that held only a stale pre-mount, so the tab builds its initial route again', () => {
+        // Given a saved state where a never-visited tab was built only for an old pre-mount
+        const action = makeResetWithReportsStack([makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, staleKey)], 0);
+
+        // When the root router sanitizes the RESET
+        const result = removeStalePreMountsFromResetAction(action);
+
+        // Then the tab has no state instead of an empty routes list, which no navigator can render
+        const payload = result.type === CONST.NAVIGATION.ACTION_TYPE.RESET ? result.payload : undefined;
+        const tabRoute = payload?.routes.at(0);
+        const tabState = tabRoute && 'state' in tabRoute ? tabRoute.state : undefined;
+        const reportsTabRoute = isResetStackState(tabState) ? tabState.routes.at(0) : undefined;
+        expect(reportsTabRoute?.key).toBe('reports-split-key');
+        expect(reportsTabRoute?.state).toBeUndefined();
+    });
+
+    it('drops a stale pre-mount from the top of a covered tab and focuses the screen under it', () => {
+        // Given a saved state where an old pre-mount sits on top of a tab that was covered when it was saved
+        const action = makeResetWithReportsStack([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, staleKey)], 1);
+
+        // When the root router sanitizes the RESET
+        const reportsStack = getResetReportsStack(removeStalePreMountsFromResetAction(action));
+
+        // Then the tab is back to the stack it had before the pre-mount
+        expect(reportsStack?.routes.map((route) => route.key)).toEqual(['inbox-key']);
+        expect(reportsStack?.index).toBe(0);
+    });
+
+    it('keeps the live pre-mount and leaves other actions untouched', () => {
+        // Given a RESET that holds the pre-mount the current flow still owns
+        setLiveWideTabPreMountRouteKey(liveKey);
+        const action = makeResetWithReportsStack([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, liveKey)], 1);
+        const goBack = CommonActions.goBack();
+
+        // When both go through the sanitizer
+        // Then neither changes, because only pre-mounts nobody owns anymore are dropped
+        expect(removeStalePreMountsFromResetAction(action)).toBe(action);
+        expect(removeStalePreMountsFromResetAction(goBack)).toBe(goBack);
+    });
+
+    it('keeps a revealed pre-mount, which is a regular screen after submit', () => {
+        // Given a pre-mount that a submit revealed, so browser forward can restore it as the visible report
+        const revealedKey = 'Report-wide-pre-mount-3';
+        markWideTabPreMountRouteKeyRevealed(revealedKey);
+        const action = makeResetWithReportsStack([makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, revealedKey)], 1);
+
+        // When the root router sanitizes the RESET
+        // Then the route survives, or the restored page would lose the report it shows
+        expect(removeStalePreMountsFromResetAction(action)).toBe(action);
+    });
+});
+
 describe('handleRemoveFullscreenUnderRHP — Share modal host', () => {
     it('restores the original tab route when the Share modal, not the RHP, is on top', () => {
         // Given a tab-switch pre-insert performed under the Share modal (#100767)
diff --git a/tests/unit/Navigation/getTabStateWithFocusedTargetTest.ts b/tests/unit/Navigation/getTabStateWithFocusedTargetTest.ts
index 24cc6c336edc..67a70e8d2bb2 100644
--- a/tests/unit/Navigation/getTabStateWithFocusedTargetTest.ts
+++ b/tests/unit/Navigation/getTabStateWithFocusedTargetTest.ts
@@ -1,4 +1,4 @@
-import {getTabStateWithFocusedTarget, markFocusedTabRouteForRemount} from '@libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers';
+import {getTabStateWithFocusedTarget, getTabStateWithFreshTarget, markFocusedTabRouteForRemount} from '@libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers';
 import TAB_SCREENS from '@libs/Navigation/AppNavigator/Navigators/TAB_SCREENS';
 
 import NAVIGATORS from '@src/NAVIGATORS';
@@ -126,6 +126,40 @@ describe('getTabStateWithFocusedTarget', () => {
     });
 });
 
+describe('getTabStateWithFreshTarget', () => {
+    it('carries over the other tabs and the tab history from the existing state', () => {
+        // Given a tab state where Settings sits on a sub-page and was visited before Spend
+        const settingsState = {routes: [{name: SCREENS.SETTINGS.PREFERENCES.ROOT}], index: 0};
+        const existingState = {
+            ...makeTabState([{name: SCREENS.HOME}, {name: NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, state: settingsState}, {name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}], 1),
+            history: [{type: 'route', key: `${NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}-key-1`}],
+        };
+
+        // When the Spend tab is built fresh on top of it, e.g. for a target tab that is not mounted yet
+        const result = getTabStateWithFreshTarget(existingState, {name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR});
+
+        // Then Settings keeps its key and sub-page, and the history still points at it, so the reveal does not reset the tab
+        const settingsRoute = result?.routes.find((r) => r.name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR);
+        expect(settingsRoute?.key).toBe(`${NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR}-key-1`);
+        expect(settingsRoute?.state).toBe(settingsState);
+        expect(result?.history).toEqual(existingState.history);
+    });
+
+    it('builds the target tab without reusing its existing key', () => {
+        // Given a tab state where the Spend tab is already mounted under a key
+        const existingState = makeTabState([{name: SCREENS.HOME}, {name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}], 1);
+
+        // When the Spend tab is built fresh
+        const result = getTabStateWithFreshTarget(existingState, {name: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR});
+
+        // Then it has no key yet, so rehydration gives it a fresh one instead of reusing the old tab's key
+        const searchRoute = result?.routes.find((r) => r.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+        expect(searchRoute).toBeDefined();
+        expect(searchRoute?.key).toBeUndefined();
+        expect(result?.stale).toBe(true);
+    });
+});
+
 describe('markFocusedTabRouteForRemount', () => {
     it('preserves existing tab history while forcing the focused route to remount', () => {
         const existingState = {

From 4a9a97e929d5549321107b869aac3863e8a64934 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 16:07:16 +0200
Subject: [PATCH 483/781] Move dismissPinnedChartTooltip to the App View

---
 src/App.tsx                                 |  2 +
 src/pages/Insights/InsightsDashboard.tsx    | 41 +++++++++------------
 src/pages/Search/SearchPageNarrow/index.tsx |  2 -
 src/pages/Search/SearchPageWide.tsx         |  2 -
 src/pages/home/HomePage.tsx                 |  2 -
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 8a1ed222ff7b..5bf33e75d410 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,6 +12,7 @@ import '../wdyr';
 import {ActionSheetAwareScrollViewProvider} from './components/ActionSheetAwareScrollView';
 import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
 import {AvatarTooltipsProvider} from './components/Avatar/tooltips/AvatarTooltipContext';
+import {dismissPinnedChartTooltip} from './components/Charts/utils/pinnedChartTooltip';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
 import {CurrencyListContextProvider} from './components/CurrencyListContextProvider';
@@ -97,6 +98,7 @@ function App() {
                             <View
                                 style={fill}
                                 fsClass={CONST.FULLSTORY.CLASS.UNMASK}
+                                onTouchStart={dismissPinnedChartTooltip}
                             >
                                 <ComposeProviders
                                     components={[
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index f424f8edd8c0..d161d3f98493 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -1,6 +1,5 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
-import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBar from '@components/Navigation/TopBar';
@@ -166,7 +165,6 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
 }
 
 function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
-    const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
@@ -219,30 +217,25 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
             bottomContent={<TabBarBottomContent selectedTab={NAVIGATION_TABS.INSIGHTS} />}
             testID="InsightsPage"
         >
-            <View
-                style={styles.flex1}
-                onTouchStart={dismissPinnedChartTooltip}
-            >
-                <TopBar
-                    breadcrumbLabel={translate('common.insights')}
-                    shouldDisplayHelpButton
-                />
-                {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
-                    <InsightsPageControls
-                        filters={filters}
-                        defaultFilters={defaultFilters}
-                        onChange={setFilters}
-                    />
-                )}
-                <InsightsDashboardContent
-                    state={state}
-                    headlineChart={headlineChart}
-                    supportingCharts={supportingCharts}
+            <TopBar
+                breadcrumbLabel={translate('common.insights')}
+                shouldDisplayHelpButton
+            />
+            {state !== INSIGHTS_DASHBOARD_STATE.NO_EXPENSES && (
+                <InsightsPageControls
                     filters={filters}
-                    onRetry={requestDashboard}
-                    onGroupByChange={(groupBy) => setFilters({groupBy})}
+                    defaultFilters={defaultFilters}
+                    onChange={setFilters}
                 />
-            </View>
+            )}
+            <InsightsDashboardContent
+                state={state}
+                headlineChart={headlineChart}
+                supportingCharts={supportingCharts}
+                filters={filters}
+                onRetry={requestDashboard}
+                onGroupByChange={(groupBy) => setFilters({groupBy})}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index f32249207da3..5d12dda25a3d 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -1,5 +1,4 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
@@ -256,7 +255,6 @@ function SearchPageNarrow({
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
-            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
diff --git a/src/pages/Search/SearchPageWide.tsx b/src/pages/Search/SearchPageWide.tsx
index 098ecfc8945b..b4ed227e6c5e 100644
--- a/src/pages/Search/SearchPageWide.tsx
+++ b/src/pages/Search/SearchPageWide.tsx
@@ -1,5 +1,4 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import {useSearchSidebarContentOffsetStyle} from '@components/Navigation/SearchSidebarCollapseStore';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -118,7 +117,6 @@ function SearchPageWide({
         <Animated.View
             ref={receiptDropTargetRef}
             style={[styles.searchSplitContainer, splitContainerAnimatedStyle]}
-            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 95f638112a7a..a09a8bb0a4f1 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,4 +1,3 @@
-import {dismissPinnedChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
@@ -137,7 +136,6 @@ function HomePage() {
         <View
             ref={receiptDropTargetRef}
             style={styles.flex1}
-            onTouchStart={dismissPinnedChartTooltip}
         >
             <ReceiptScanDropZone
                 dropZoneRef={receiptDropTargetRef}

From f40bc5f9c35afea19813374899146dca200a78d6 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 15:35:12 +0200
Subject: [PATCH 484/781] Use the @selectors alias for the new selector imports

---
 src/components/ParentNavigationSubtitle.tsx       | 2 +-
 src/pages/inbox/HeaderView.tsx                    | 2 +-
 src/pages/inbox/report/ReportActionItemThread.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 98d91fc40d39..802a83438fcd 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -20,11 +20,11 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
-import {reportVisibleActionsSelector} from '@src/selectors/ReportAction';
 
 import type {ColorValue, StyleProp, TextStyle, ViewStyle} from 'react-native';
 
 import {useRoute} from '@react-navigation/native';
+import {reportVisibleActionsSelector} from '@selectors/ReportAction';
 import React from 'react';
 import {View} from 'react-native';
 
diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx
index e3282554d633..6bdcfd3be823 100644
--- a/src/pages/inbox/HeaderView.tsx
+++ b/src/pages/inbox/HeaderView.tsx
@@ -91,12 +91,12 @@ import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
-import {getStableReportSelector} from '@src/selectors/Report';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useRoute} from '@react-navigation/native';
 import {accountGuideDetailsSelector} from '@selectors/Account';
 import {accountIDSelector, isPersonalDetailOptimistic} from '@selectors/PersonalDetails';
+import {getStableReportSelector} from '@selectors/Report';
 import {pendingChatMembersSelector} from '@selectors/ReportMetaData';
 import {latestCalendlyCallSelector} from '@selectors/ReportNameValuePairs';
 import {isPast} from 'date-fns';
diff --git a/src/pages/inbox/report/ReportActionItemThread.tsx b/src/pages/inbox/report/ReportActionItemThread.tsx
index 133986df2a73..def74274345b 100644
--- a/src/pages/inbox/report/ReportActionItemThread.tsx
+++ b/src/pages/inbox/report/ReportActionItemThread.tsx
@@ -13,13 +13,13 @@ import {getParticipantsPersonalDetails} from '@libs/PersonalDetailsUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {getStableReportSelector} from '@src/selectors/Report';
 import type {Report, ReportAction} from '@src/types/onyx';
 
 import type {GestureResponderEvent} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {getStableReportSelector} from '@selectors/Report';
 import React from 'react';
 import {View} from 'react-native';
 

From a6fadeaf352d7941b5c34b4c2887935b13c2aba8 Mon Sep 17 00:00:00 2001
From: "TaduJR (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 14:31:57 +0000
Subject: [PATCH 485/781] Stop the onboarding back button message from blocking
 Add work email

The back button message no longer goes into the work email form's errors, so it shows once and no longer blocks the submit. Pressing Add work email clears it, so a failed validation shows only the field error.

Co-authored-by: TaduJR <TaduJR@users.noreply.github.com>
---
 .../BaseOnboardingWorkEmail.tsx               |  19 +-
 tests/ui/WorkEmailOnboarding.tsx              | 191 +++++++++++++++++-
 tests/ui/WorkEmailOnboardingNativeBack.tsx    |  48 ++++-
 3 files changed, 251 insertions(+), 7 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 6775d535eee3..4d062b09bdcf 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -134,14 +134,19 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         AddWorkEmail(submittedWorkEmail);
     };
 
+    const isBackButtonMessage = onboardingErrorMessageTranslationKey === 'onboarding.purpose.errorBackButton';
+
+    // The back button message is about leaving onboarding, not about the email, so it never becomes a field error and never blocks the submit
+    const workEmailErrorTranslationKey = onboardingErrorMessageTranslationKey && !isBackButtonMessage ? onboardingErrorMessageTranslationKey : undefined;
+
     useEffect(() => {
-        if (!onboardingErrorMessageTranslationKey) {
+        if (!workEmailErrorTranslationKey) {
             clearWorkEmailFormErrors();
             return;
         }
 
-        addWorkEmailFormError(translate(onboardingErrorMessageTranslationKey));
-    }, [onboardingErrorMessageTranslationKey, translate]);
+        addWorkEmailFormError(translate(workEmailErrorTranslationKey));
+    }, [workEmailErrorTranslationKey, translate]);
 
     const clearOnboardingErrorMessage = useCallback(() => {
         if (!onboardingErrorMessageTranslationKey) {
@@ -150,6 +155,13 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         setOnboardingErrorMessage(null);
     }, [onboardingErrorMessageTranslationKey]);
 
+    const clearBackButtonMessage = () => {
+        if (!isBackButtonMessage) {
+            return;
+        }
+        setOnboardingErrorMessage(null);
+    };
+
     const shouldRenderOfflineFeedback = useCallback((errorTranslation: string) => {
         if (
             errorTranslation !== 'onboarding.workEmail2FAError' &&
@@ -229,6 +241,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                     style={[styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}
                     formID={ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM}
                     validate={validate}
+                    onBeforeSubmit={clearBackButtonMessage}
                     onSubmit={submitWorkEmail}
                     submitButtonText={translate('onboarding.workEmail.addWorkEmail')}
                     enabledWhenOffline
diff --git a/tests/ui/WorkEmailOnboarding.tsx b/tests/ui/WorkEmailOnboarding.tsx
index 4628f9e34eea..91a1337aad50 100644
--- a/tests/ui/WorkEmailOnboarding.tsx
+++ b/tests/ui/WorkEmailOnboarding.tsx
@@ -11,6 +11,7 @@ import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
 
 import {openOldDotLink} from '@libs/actions/Link';
 import {AddWorkEmail} from '@libs/actions/Session';
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
 import HttpUtils from '@libs/HttpUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
@@ -34,6 +35,7 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 
 import createMock from '../utils/createMock';
+import getOnyxValue from '../utils/getOnyxValue';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
@@ -290,6 +292,67 @@ function AddWorkEmailWithDomainControlledError() {
     return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
 }
 
+async function renderWorkEmailPageWithTypedEmail(email: string) {
+    await TestHelper.signInWithTestUser();
+    await act(async () => {
+        await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+        await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+    });
+    const result = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, undefined);
+    await waitForBatchedUpdatesWithAct();
+    fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), email);
+    await waitForBatchedUpdatesWithAct();
+    return result;
+}
+
+// The device back button, the browser back button and a deep link opened during onboarding all only set this message
+async function pressBackButton() {
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.purpose.errorBackButton');
+    });
+    await waitForBatchedUpdatesWithAct();
+}
+
+async function pressAddWorkEmail() {
+    fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')}));
+    await waitForBatchedUpdatesWithAct();
+}
+
+async function waitForMilliseconds(milliseconds: number) {
+    await act(async () => {
+        await new Promise((resolve) => {
+            setTimeout(resolve, milliseconds);
+        });
+    });
+}
+
+// FormProvider ignores presses that come within a second of the previous one, so a second press must wait it out to reach the submit at all
+async function waitForSubmitDebounce() {
+    await waitForMilliseconds(1100);
+}
+
+// A press reaches onSubmit only after a timeout and the keyboard dismissal, so a check that nothing was sent must wait for both
+async function waitForSubmitToSettle() {
+    await waitForMilliseconds(300);
+}
+
+function getAddWorkEmailRequestCount(xhrSpy: jest.SpyInstance) {
+    return xhrSpy.mock.calls.filter(([command]) => command === SIDE_EFFECT_REQUEST_COMMANDS.ADD_WORK_EMAIL).length;
+}
+
+function mockPendingAddWorkEmail() {
+    let resolveAddWorkEmail: (response: OnyxResponse<typeof ONYXKEYS.NVP_ONBOARDING>) => void = () => {};
+    const xhrSpy = jest.spyOn(HttpUtils, 'xhr').mockImplementation((command) => {
+        if (command !== SIDE_EFFECT_REQUEST_COMMANDS.ADD_WORK_EMAIL) {
+            return Promise.resolve({jsonCode: 200});
+        }
+        return new Promise((resolve) => {
+            resolveAddWorkEmail = resolve;
+        });
+    });
+    return {xhrSpy, answerAddWorkEmail: () => resolveAddWorkEmail({jsonCode: 200})};
+}
+
 describe('OnboardingWorkEmail Page', () => {
     beforeAll(() => {
         Onyx.init({
@@ -722,7 +785,7 @@ describe('OnboardingWorkEmail Page', () => {
             expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(), {forceReplace: true});
         });
         expect(screen.queryByText(TestHelper.translateLocal('onboarding.workEmailValidationError.sameAsSignupEmail'))).not.toBeOnTheScreen();
-        expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(0);
+        expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(0);
 
         xhrSpy.mockRestore();
         unmount();
@@ -757,7 +820,7 @@ describe('OnboardingWorkEmail Page', () => {
 
         // Then the new email is sent to the backend, because only the email that is already the account's login skips the request
         await waitFor(() => {
-            expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(1);
+            expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
         });
         await waitFor(() => {
             expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(), {forceReplace: true});
@@ -802,12 +865,134 @@ describe('OnboardingWorkEmail Page', () => {
         await waitFor(() => {
             expect(screen.getByText(TestHelper.translateLocal('onboarding.workEmailValidationError.publicEmail'))).toBeOnTheScreen();
         });
-        expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(0);
+        expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(0);
 
         xhrSpy.mockRestore();
         unmount();
         await waitForBatchedUpdatesWithAct();
     });
+
+    it('should show the back button message once and still let the user submit a work email', async () => {
+        // Given an unvalidated user who typed a work email and then pressed the device or browser back button
+        const {unmount} = await renderWorkEmailPageWithTypedEmail(workEmail);
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => {
+            const mockedResponse: OnyxResponse<typeof ONYXKEYS.NVP_ONBOARDING> = {
+                jsonCode: 200,
+                onyxData: [{onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.NVP_ONBOARDING, value: {shouldValidate: false}}],
+            };
+            return Promise.resolve(mockedResponse);
+        });
+        try {
+            await pressBackButton();
+
+            // Then the message shows once, and never as an error on the form, which is what would block the submit
+            expect(screen.getAllByText(TestHelper.translateLocal('onboarding.purpose.errorBackButton'))).toHaveLength(1);
+            expect((await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM))?.errors).toBeFalsy();
+
+            // When the user presses "Add work email" without editing the email
+            await pressAddWorkEmail();
+
+            // Then the email is sent, because the back button message doesn't count as an error on the form
+            await waitFor(() => {
+                expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
+            });
+        } finally {
+            xhrSpy.mockRestore();
+            unmount();
+            await waitForBatchedUpdatesWithAct();
+        }
+    });
+
+    it('should keep the work email form loading while its request is pending after the back button message was shown', async () => {
+        // Given the back button message is showing and the AddWorkEmail request doesn't answer until the end of the test
+        const {unmount} = await renderWorkEmailPageWithTypedEmail(workEmail);
+        const {xhrSpy, answerAddWorkEmail} = mockPendingAddWorkEmail();
+        try {
+            await pressBackButton();
+
+            // When the user submits
+            await pressAddWorkEmail();
+
+            // Then the back button message is gone, and clearing it doesn't stop the loading while the request is still pending
+            await waitFor(() => {
+                expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
+            });
+            expect(screen.queryByText(TestHelper.translateLocal('onboarding.purpose.errorBackButton'))).not.toBeOnTheScreen();
+            expect((await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM))?.isLoading).toBe(true);
+
+            // When the user presses "Add work email" again before the request answers
+            await waitForSubmitDebounce();
+            await pressAddWorkEmail();
+            await waitForSubmitToSettle();
+
+            // Then the same email isn't sent a second time
+            expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
+        } finally {
+            answerAddWorkEmail();
+            await waitForBatchedUpdatesWithAct();
+            xhrSpy.mockRestore();
+            unmount();
+            await waitForBatchedUpdatesWithAct();
+        }
+    });
+
+    it('should keep the work email form loading when the back button is pressed while its request is pending', async () => {
+        // Given an unvalidated user who submitted a work email whose AddWorkEmail request doesn't answer until the end of the test
+        const {unmount} = await renderWorkEmailPageWithTypedEmail(workEmail);
+        const {xhrSpy, answerAddWorkEmail} = mockPendingAddWorkEmail();
+        try {
+            await pressAddWorkEmail();
+            await waitFor(() => {
+                expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
+            });
+
+            // When the user presses the device or browser back button before the request answers
+            await pressBackButton();
+
+            // Then the message shows once, the form gets no error, and the form stays loading
+            expect(screen.getAllByText(TestHelper.translateLocal('onboarding.purpose.errorBackButton'))).toHaveLength(1);
+            const form = await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM);
+            expect(form?.errors).toBeFalsy();
+            expect(form?.isLoading).toBe(true);
+
+            // When the user presses "Add work email" again before the request answers
+            await waitForSubmitDebounce();
+            await pressAddWorkEmail();
+            await waitForSubmitToSettle();
+
+            // Then the same email isn't sent a second time
+            expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(1);
+        } finally {
+            answerAddWorkEmail();
+            await waitForBatchedUpdatesWithAct();
+            xhrSpy.mockRestore();
+            unmount();
+            await waitForBatchedUpdatesWithAct();
+        }
+    });
+
+    it('should clear the back button message when the user submits an email that fails validation', async () => {
+        // Given an unvalidated user with an invalid email typed and the back button message showing
+        const {unmount} = await renderWorkEmailPageWithTypedEmail('not-an-email');
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr');
+        try {
+            await pressBackButton();
+
+            // When the user presses "Add work email"
+            await pressAddWorkEmail();
+
+            // Then only the validation error shows, because pressing the button replaces the back button message, and nothing is sent
+            await waitFor(() => {
+                expect(screen.getByText(TestHelper.translateLocal('onboarding.workEmailValidationError.publicEmail'))).toBeOnTheScreen();
+            });
+            expect(screen.queryByText(TestHelper.translateLocal('onboarding.purpose.errorBackButton'))).not.toBeOnTheScreen();
+            expect(getAddWorkEmailRequestCount(xhrSpy)).toBe(0);
+        } finally {
+            xhrSpy.mockRestore();
+            unmount();
+            await waitForBatchedUpdatesWithAct();
+        }
+    });
 });
 
 describe('OnboardingWorkEmailValidation Page', () => {
diff --git a/tests/ui/WorkEmailOnboardingNativeBack.tsx b/tests/ui/WorkEmailOnboardingNativeBack.tsx
index 68464ebcdc7a..222c747f7f88 100644
--- a/tests/ui/WorkEmailOnboardingNativeBack.tsx
+++ b/tests/ui/WorkEmailOnboardingNativeBack.tsx
@@ -1,4 +1,4 @@
-import {act, render, waitFor} from '@testing-library/react-native';
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import HTMLEngineProvider from '@components/HTMLEngineProvider';
@@ -9,6 +9,8 @@ import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
 import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
 import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
 
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
+import HttpUtils from '@libs/HttpUtils';
 import navigationRef from '@libs/Navigation/navigationRef';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
@@ -34,6 +36,7 @@ import {BackHandler, View} from 'react-native';
 import Onyx from 'react-native-onyx';
 
 import createMock from '../utils/createMock';
+import getOnyxValue from '../utils/getOnyxValue';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
@@ -322,4 +325,47 @@ describe('Onboarding work email validation (Android system back)', () => {
             expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
         });
     });
+
+    it('should show the back button message once and still send the work email after a system back press on the work email screen', async () => {
+        // Given an unvalidated public-domain user on the work email screen with a work email typed
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), workEmail);
+
+        await waitForBatchedUpdatesWithAct();
+
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => Promise.resolve({jsonCode: 200}));
+        try {
+            // When Android's system back button is pressed
+            const consumed = pressHardwareBack();
+
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the screen keeps the press, and the message it sets shows once without becoming an error on the form
+            expect(consumed).toBe(true);
+            expect(screen.getAllByText(TestHelper.translateLocal('onboarding.purpose.errorBackButton'))).toHaveLength(1);
+            expect((await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM))?.errors).toBeFalsy();
+
+            // When the user presses "Add work email" without editing the email
+            fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')}));
+
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the work email is sent, because the back button message doesn't block the submit
+            await waitFor(() => {
+                expect(xhrSpy.mock.calls.filter(([command]) => command === SIDE_EFFECT_REQUEST_COMMANDS.ADD_WORK_EMAIL)).toHaveLength(1);
+            });
+        } finally {
+            xhrSpy.mockRestore();
+        }
+    });
 });

From 9a3de2963646366a1fcb5b1254008d956b31384b Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 16:58:53 +0200
Subject: [PATCH 486/781] Show fewer, horizontal x-axis labels on line charts

---
 .../Charts/LineChart/LineChartContent.tsx     | 38 ++++++++++++--
 src/components/Charts/VictoryTheme.ts         |  4 ++
 .../Charts/components/ChartXAxisLabels.tsx    |  6 ++-
 .../Charts/hooks/useLabelHitTesting.ts        | 12 +++--
 src/components/Charts/utils/index.ts          | 49 +++++++++++++++++++
 src/components/Search/SearchChartView.tsx     |  5 +-
 .../Search/SearchList/ListItem/types.ts       |  6 +++
 src/components/Search/chartGroupByConfig.ts   | 13 +++++
 src/libs/DateUtils.ts                         |  7 +++
 src/libs/SearchUIUtils.ts                     |  2 +
 tests/unit/Search/SearchUIUtilsTest.ts        |  4 ++
 11 files changed, 135 insertions(+), 11 deletions(-)

diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index a2375540b752..4a54b6e9783c 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -16,8 +16,8 @@ import {
     useDynamicYDomain,
     useLabelHitTesting,
 } from '@components/Charts/hooks';
-import {getDomainPaddingForEdgeSpace, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
-import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45} from '@components/Charts/VictoryTheme';
+import {getAxisLabelStepLayout, getDomainPaddingForEdgeSpace, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
+import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45, X_AXIS_LABEL_MIN_GAP} from '@components/Charts/VictoryTheme';
 
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -38,9 +38,12 @@ import type {CartesianChartProps, ChartDataPoint} from '..';
 
 type LineChartProps = CartesianChartProps & {
     onPointPress?: (dataPoint: ChartDataPoint, index: number) => void;
+
+    /** Steps the x-axis may label points at, ascending. When set, labels stay horizontal and only every Nth point is labeled. */
+    labelSteps?: readonly number[];
 };
 
-function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = 'left', onPointPress}: LineChartProps) {
+function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = 'left', onPointPress, labelSteps}: LineChartProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const fontManager = useChartFontManager();
@@ -94,7 +97,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
     const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING;
 
     const domainPadding = (() => {
-        if (!firstLabelWidth || !lastLabelWidth) {
+        if (labelSteps || !firstLabelWidth || !lastLabelWidth) {
             return VictoryTheme.line.domainPadding;
         }
         const labelsExceedTickSpacing = tickSpacing > 0 && maxLabelWidth + LABEL_PADDING > tickSpacing;
@@ -117,7 +120,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
     const totalDomainPadding = domainPadding.left + domainPadding.right;
     const paddingScale = plotAreaWidth > 0 ? plotAreaWidth / (plotAreaWidth + totalDomainPadding) : 0;
 
-    const {labelRotation, labelSkipInterval, truncatedLabelWidths, xAxisLabelHeight, regularLabelMaxWidth, firstLabelMaxWidth, lastLabelMaxWidth, ellipsisWidth} = useChartLabelLayout({
+    const rotatingLabelLayout = useChartLabelLayout({
         data,
         fontManager,
         fontSize: variables.iconSizeExtraSmall,
@@ -128,6 +131,29 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         measurements,
     });
 
+    const steppedLabelLayout = (() => {
+        if (!labelSteps || chartWidth <= 0 || plotAreaWidth <= 0) {
+            return undefined;
+        }
+        const pointXs = data.map((_, index) => (data.length > 1 ? boundsLeft + (index * plotAreaWidth) / (data.length - 1) : boundsLeft + plotAreaWidth / 2));
+        const {step, labelXOffsets} = getAxisLabelStepLayout({labelWidths, pointXs, canvasWidth: chartWidth, steps: labelSteps, minGap: X_AXIS_LABEL_MIN_GAP});
+        return {
+            ...rotatingLabelLayout,
+            labelRotation: LABEL_ROTATIONS.HORIZONTAL,
+            labelSkipInterval: step,
+            truncatedLabelWidths: labelWidths,
+            xAxisLabelHeight: lineHeight,
+            regularLabelMaxWidth: Infinity,
+            firstLabelMaxWidth: Infinity,
+            lastLabelMaxWidth: Infinity,
+            labelXOffsets,
+        };
+    })();
+
+    const {labelRotation, labelSkipInterval, truncatedLabelWidths, xAxisLabelHeight, regularLabelMaxWidth, firstLabelMaxWidth, lastLabelMaxWidth, ellipsisWidth} =
+        steppedLabelLayout ?? rotatingLabelLayout;
+    const labelXOffsets = steppedLabelLayout?.labelXOffsets;
+
     const originalLabels = data.map(getXAxisLabel);
 
     const {isCursorOverLabel, findLabelCursorX, updateTickPositions} = useLabelHitTesting({
@@ -136,6 +162,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
         truncatedLabelWidths,
         labelRotation,
         labelSkipInterval,
+        labelXOffsets,
         chartBottom,
     });
 
@@ -233,6 +260,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                         ellipsisWidth={ellipsisWidth}
                         labelRotation={labelRotation}
                         labelSkipInterval={labelSkipInterval}
+                        labelXOffsets={labelXOffsets}
                         fontSize={variables.iconSizeExtraSmall}
                         fontManager={fontManager}
                         labelColor={theme.icon}
diff --git a/src/components/Charts/VictoryTheme.ts b/src/components/Charts/VictoryTheme.ts
index ae1366c61bf7..4adb3259df3f 100644
--- a/src/components/Charts/VictoryTheme.ts
+++ b/src/components/Charts/VictoryTheme.ts
@@ -109,6 +109,9 @@ const SIN_45 = Math.sin(Math.PI / 4);
 /** Minimum gap between adjacent labels (px) */
 const LABEL_PADDING = 4;
 
+/** Minimum clear space between adjacent horizontal x-axis labels on stepped axes (px) */
+const X_AXIS_LABEL_MIN_GAP = 24;
+
 const ELLIPSIS = '...';
 
 /** Minimum visible characters (excluding ellipsis) for truncation to be worthwhile */
@@ -132,6 +135,7 @@ const GLYPH_PADDING = 4;
 
 export {
     CHART_CONTENT_MIN_HEIGHT,
+    X_AXIS_LABEL_MIN_GAP,
     CHART_Y_SCALE_HEIGHT,
     LABEL_ROTATIONS,
     SIN_45,
diff --git a/src/components/Charts/components/ChartXAxisLabels.tsx b/src/components/Charts/components/ChartXAxisLabels.tsx
index e3a8a62dab02..5f843a817f06 100644
--- a/src/components/Charts/components/ChartXAxisLabels.tsx
+++ b/src/components/Charts/components/ChartXAxisLabels.tsx
@@ -33,6 +33,9 @@ type ChartXAxisLabelsProps = {
     /** Show every Nth label (1 = all, 2 = every other, etc.). */
     labelSkipInterval: number;
 
+    /** Per-label horizontal shift (px) applied to horizontal labels */
+    labelXOffsets?: number[];
+
     /** Font size used for rendering labels. */
     fontSize: number;
 
@@ -58,6 +61,7 @@ function ChartXAxisLabels({
     ellipsisWidth,
     labelRotation,
     labelSkipInterval,
+    labelXOffsets,
     fontSize,
     fontManager,
     labelColor,
@@ -104,7 +108,7 @@ function ChartXAxisLabels({
                 <Paragraph
                     key={`x-label-${label}-${tickX}`}
                     paragraph={paraData.para}
-                    x={tickX - renderWidth / 2}
+                    x={tickX - renderWidth / 2 + (labelXOffsets?.at(i) ?? 0)}
                     y={labelY - ascent}
                     width={renderWidth + GLYPH_PADDING}
                 />
diff --git a/src/components/Charts/hooks/useLabelHitTesting.ts b/src/components/Charts/hooks/useLabelHitTesting.ts
index 2517f3b66b5b..19fec5153e44 100644
--- a/src/components/Charts/hooks/useLabelHitTesting.ts
+++ b/src/components/Charts/hooks/useLabelHitTesting.ts
@@ -25,6 +25,9 @@ type LabelHitGeometry = {
     /** Per-label: labelWidth / 2 — half-extent for 0° and 90° hit bounds */
     halfWidths: number[];
 
+    /** Per-label horizontal shift of 0° labels from their tick */
+    xOffsets: number[];
+
     /** rightUpperCorner.x = targetX + cornerAnchorDX */
     cornerAnchorDX: number;
 
@@ -45,6 +48,8 @@ type UseLabelHitTestingParams = {
     truncatedLabelWidths: number[];
     labelRotation: LabelRotation;
     labelSkipInterval: number;
+    /** Per-label horizontal shift (px) of 0° labels from their tick, matching ChartXAxisLabels. */
+    labelXOffsets?: number[];
     chartBottom: SharedValue<number>;
 };
 
@@ -61,7 +66,7 @@ type UseLabelHitTestingParams = {
  * Labels are right-aligned at the tick: the 45° parallelogram's upper-right corner is
  * offset by (iconSize/3 * sinA) left and down, placing the box just below the axis line.
  */
-function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelRotation, labelSkipInterval, chartBottom}: UseLabelHitTestingParams) {
+function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelRotation, labelSkipInterval, labelXOffsets, chartBottom}: UseLabelHitTestingParams) {
     const tickXPositions = useSharedValue<number[]>([]);
 
     const angleRad = (Math.abs(labelRotation) * Math.PI) / 180;
@@ -80,6 +85,7 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
             iconSin: variables.iconSizeExtraSmall * sinA,
             labelSins: truncatedLabelWidths.map((w) => w * sinA),
             halfWidths: truncatedLabelWidths.map((w) => w / 2),
+            xOffsets: truncatedLabelWidths.map((_, i) => (angleRad === 0 ? (labelXOffsets?.at(i) ?? 0) : 0)),
             cornerAnchorDX: -iconThirdSin,
             cornerAnchorDY: iconThirdSin,
             yMin90Offset: padding,
@@ -98,7 +104,7 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
             return false;
         }
 
-        const {labelYOffset, iconSin, labelSins, halfWidths, cornerAnchorDX, cornerAnchorDY, yMin90Offset, yMax90Offsets} = labelHitGeometry;
+        const {labelYOffset, iconSin, labelSins, halfWidths, xOffsets, cornerAnchorDX, cornerAnchorDY, yMin90Offset, yMax90Offsets} = labelHitGeometry;
         const padding = variables.iconSizeExtraSmall / 2;
         const halfWidth = halfWidths.at(activeIndex) ?? 0;
         const labelY = args.chartBottom + labelYOffset;
@@ -116,7 +122,7 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
         return isCursorOverChartLabel({
             cursorX: args.cursorX,
             cursorY: args.cursorY,
-            targetX: args.targetX,
+            targetX: args.targetX + (xOffsets.at(activeIndex) ?? 0),
             labelY,
             angleRad,
             halfWidth,
diff --git a/src/components/Charts/utils/index.ts b/src/components/Charts/utils/index.ts
index eb3592f32242..a22283f4a75f 100644
--- a/src/components/Charts/utils/index.ts
+++ b/src/components/Charts/utils/index.ts
@@ -457,6 +457,54 @@ function getDomainPaddingForEdgeSpace(edgeSpace: {left: number; right: number},
     return {left: (edgeSpace.left * plotWidth) / pointsSpan, right: (edgeSpace.right * plotWidth) / pointsSpan};
 }
 
+type AxisLabelStepLayoutParams = {
+    /** Pixel width of each point's label */
+    labelWidths: number[];
+
+    /** Canvas x position of each point */
+    pointXs: number[];
+
+    /** Canvas width the labels must stay within */
+    canvasWidth: number;
+
+    /** Allowed steps between labeled points, ascending */
+    steps: readonly number[];
+
+    /** Minimum clear space between adjacent labels (px) */
+    minGap: number;
+};
+
+/**
+ * Picks the smallest step whose labels (points 0, step, 2 * step, ...) don't overlap. Labels are centered under their points
+ * and shifted inward at the canvas edges. When no step fits, multiples of the last step are tried, down to labeling only the first point.
+ */
+function getAxisLabelStepLayout({labelWidths, pointXs, canvasWidth, steps, minGap}: AxisLabelStepLayoutParams): {step: number; labelXOffsets: number[]} {
+    const labelXOffsets = pointXs.map((x, i) => {
+        const width = labelWidths.at(i) ?? 0;
+        const centeredLeft = x - width / 2;
+        const left = Math.min(Math.max(centeredLeft, 0), Math.max(0, canvasWidth - width));
+        return left - centeredLeft;
+    });
+    const getLeft = (i: number) => (pointXs.at(i) ?? 0) + (labelXOffsets.at(i) ?? 0) - (labelWidths.at(i) ?? 0) / 2;
+    const fits = (step: number) => {
+        for (let i = step; i < pointXs.length; i += step) {
+            const previousRight = getLeft(i - step) + (labelWidths.at(i - step) ?? 0);
+            if (getLeft(i) - previousRight < minGap) {
+                return false;
+            }
+        }
+        return true;
+    };
+
+    const candidates = [...steps];
+    const lastStep = steps.at(-1) ?? 1;
+    for (let step = lastStep * 2; step < pointXs.length; step += lastStep) {
+        candidates.push(step);
+    }
+    const step = candidates.find(fits) ?? Math.max(1, pointXs.length);
+    return {step, labelXOffsets};
+}
+
 /** Returns the pixel width needed for Y-axis labels given the chart data. */
 function getYAxisLabelWidth(
     data: ChartDataPoint[],
@@ -505,6 +553,7 @@ export {
     getYAxisLabelWidth,
     getBarLayout,
     getDomainPaddingForEdgeSpace,
+    getAxisLabelStepLayout,
 };
 
 export type {ChartLabelHitTestParams};
diff --git a/src/components/Search/SearchChartView.tsx b/src/components/Search/SearchChartView.tsx
index 8335a4433721..372b3d3cbe24 100644
--- a/src/components/Search/SearchChartView.tsx
+++ b/src/components/Search/SearchChartView.tsx
@@ -72,7 +72,7 @@ function SearchChartView({
     const {getCurrencySymbol, getCurrencyDecimals} = useCurrencyListActions();
     const {currentSearchKey} = useSearchQueryContext();
 
-    const {getLabel, getShortLabel, getFilterQuery} = CHART_GROUP_BY_CONFIG[groupBy];
+    const {getLabel, getShortLabel, getCompactLabel, getFilterQuery, axisLabelSteps} = CHART_GROUP_BY_CONFIG[groupBy];
 
     const today = format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
     const dateFilterRange = queryJSON ? getDateFilterRange(queryJSON) : {};
@@ -80,7 +80,7 @@ function SearchChartView({
         data,
         view,
         getLabel,
-        getShortLabel,
+        getShortLabel: view === CONST.SEARCH.VIEW.LINE ? (getCompactLabel ?? getShortLabel) : getShortLabel,
         getCurrencyDecimals,
         getInProgressLabel: (item) => getInProgressBucketLabel({groupBy, item, today, dateFnsLocale, dateFilterRange, translate}),
     });
@@ -135,6 +135,7 @@ function SearchChartView({
                     data={points}
                     isLoading={isLoading}
                     onPointPress={(dataPoint, index) => handleItemPress(index)}
+                    labelSteps={axisLabelSteps}
                     yAxisUnit={unit}
                     yAxisUnitPosition={unitPosition}
                 />
diff --git a/src/components/Search/SearchList/ListItem/types.ts b/src/components/Search/SearchList/ListItem/types.ts
index 8debb6e1bfcf..25bedb44c94b 100644
--- a/src/components/Search/SearchList/ListItem/types.ts
+++ b/src/components/Search/SearchList/ListItem/types.ts
@@ -430,6 +430,9 @@ type TransactionDayGroupListItemType = TransactionGroupListItemType & {groupedBy
 
         /** Compact "day" value used where space is tight, e.g. chart axis labels */
         shortFormattedDay: string;
+
+        /** Day label for line chart axes, e.g. "Aug 15", adding the year only outside the current year */
+        compactFormattedDay: string;
     };
 
 type TransactionMonthGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.MONTH} & SearchMonthGroup & {
@@ -472,6 +475,9 @@ type TransactionWeekGroupListItemType = TransactionGroupListItemType & {groupedB
 
         /** Compact "week" value used where space is tight, e.g. chart axis labels */
         shortFormattedWeek: string;
+
+        /** Week start label for line chart axes, e.g. "Sep 6", adding the year only outside the current year */
+        compactFormattedWeek: string;
     };
 
 type TransactionYearGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.YEAR} & SearchYearGroup & {
diff --git a/src/components/Search/chartGroupByConfig.ts b/src/components/Search/chartGroupByConfig.ts
index 5fa25d24f51f..235c958b4c14 100644
--- a/src/components/Search/chartGroupByConfig.ts
+++ b/src/components/Search/chartGroupByConfig.ts
@@ -26,6 +26,12 @@ type ChartGroupByConfig = {
     /** Returns the compact label for chart axes, or undefined to fall back to `getLabel` */
     getShortLabel?: (item: GroupedItem) => string | undefined;
 
+    /** Returns the line chart axis label, or undefined to fall back to `getShortLabel` */
+    getCompactLabel?: (item: GroupedItem) => string | undefined;
+
+    /** Intervals, in groups, the line chart may label its x-axis at; the smallest one that fits is used */
+    axisLabelSteps?: readonly number[];
+
     /** Builds the query fragment appended to the current query to drill into a group's transactions */
     getFilterQuery: (item: GroupedItem) => string;
 
@@ -73,6 +79,8 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.formattedDay : ''),
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.shortFormattedDay : undefined),
+        getCompactLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.compactFormattedDay : undefined),
+        axisLabelSteps: [1, 2, 7, 14],
         getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? `date>=${item.day} date<=${item.day}` : ''),
         getDateRange: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? {start: item.day, end: item.day} : undefined),
     },
@@ -80,6 +88,7 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item as TransactionMonthGroupListItemType).formattedMonth ?? '',
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.MONTH ? item.shortFormattedMonth : undefined),
+        axisLabelSteps: [1, 2, 3, 6],
         getFilterQuery: (item: GroupedItem) => {
             const monthItem = item as TransactionMonthGroupListItemType;
             const {start, end} = DateUtils.getMonthDateRange(monthItem.year, monthItem.month);
@@ -91,6 +100,8 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item as TransactionWeekGroupListItemType).formattedWeek ?? '',
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WEEK ? item.shortFormattedWeek : undefined),
+        getCompactLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WEEK ? item.compactFormattedWeek : undefined),
+        axisLabelSteps: [1, 2, 4],
         getFilterQuery: (item: GroupedItem) => {
             const weekItem = item as TransactionWeekGroupListItemType;
             const {start, end} = DateUtils.getWeekDateRange(weekItem.week);
@@ -101,6 +112,7 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
     [CONST.SEARCH.GROUP_BY.YEAR]: {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item as TransactionYearGroupListItemType).formattedYear ?? '',
+        axisLabelSteps: [1, 2, 5],
         getFilterQuery: (item: GroupedItem) => {
             const yearItem = item as TransactionYearGroupListItemType;
             const {start, end} = DateUtils.getYearDateRange(yearItem.year);
@@ -112,6 +124,7 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item as TransactionQuarterGroupListItemType).formattedQuarter ?? '',
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.QUARTER ? item.shortFormattedQuarter : undefined),
+        axisLabelSteps: [1, 2, 4],
         getFilterQuery: (item: GroupedItem) => {
             const quarterItem = item as TransactionQuarterGroupListItemType;
             const {start, end} = DateUtils.getQuarterDateRange(quarterItem.year, quarterItem.quarter);
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index d2f877fe8ff0..c26684a88d1f 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -1186,6 +1186,12 @@ function getShortFormattedDayForSearch(day: string, dateFnsLocale: DateFnsLocale
     return format(parse(day, 'yyyy-MM-dd', new Date()), shouldShowYear ? 'MMM d, ’yy' : 'MMM d', {locale: dateFnsLocale});
 }
 
+/** Returns a compact date label that adds the year only outside the current year, e.g. "Sep 15" or "Dec 28, ’25". */
+function getCompactFormattedDateForSearch(date: string, dateFnsLocale: DateFnsLocale | undefined): string {
+    const parsedDate = parse(date, 'yyyy-MM-dd', new Date());
+    return format(parsedDate, isThisYear(parsedDate) ? 'MMM d' : 'MMM d, ’yy', {locale: dateFnsLocale});
+}
+
 /** Returns a month label, e.g. "September 2025". */
 function getFormattedMonthForSearch(year: number, month: number, dateFnsLocale: DateFnsLocale | undefined): string {
     return format(new Date(year, month - 1, 1), 'LLLL yyyy', {locale: dateFnsLocale});
@@ -1355,6 +1361,7 @@ const DateUtils = {
     getWeekDateRange,
     isDateStringInMonth,
     getShortFormattedDayForSearch,
+    getCompactFormattedDateForSearch,
     getFormattedMonthForSearch,
     getShortFormattedMonthForSearch,
     getFormattedDateRangeForSearch,
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index a2bec325a21a..3b30c00ae59e 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -3538,6 +3538,7 @@ function getDaySections(
             ...dayGroup,
             formattedDay: DateUtils.formatToReadableString(dayGroup.day, dateFnsLocale),
             shortFormattedDay: DateUtils.getShortFormattedDayForSearch(dayGroup.day, dateFnsLocale, shouldShowShortLabelYear),
+            compactFormattedDay: DateUtils.getCompactFormattedDateForSearch(dayGroup.day, dateFnsLocale),
             keyForList: key,
         };
     }
@@ -3627,6 +3628,7 @@ function getWeekSections(
             ...weekGroup,
             formattedWeek,
             shortFormattedWeek,
+            compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch(weekStart, dateFnsLocale),
             keyForList: key,
         };
     }
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 605892308cc2..6309c171885d 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -4015,6 +4015,7 @@ describe('SearchUIUtils', () => {
                 groupedBy: CONST.SEARCH.GROUP_BY.DAY,
                 formattedDay: 'September 15, 2026',
                 shortFormattedDay: 'Sep 15, ’26',
+                compactFormattedDay: 'Sep 15',
                 transactions: [],
                 transactionsQueryJSON: undefined,
                 keyForList: 'group_2026-09-15',
@@ -4276,6 +4277,7 @@ describe('SearchUIUtils', () => {
                 groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                 formattedWeek: 'Jan 25 - Jan 31, 2026',
                 shortFormattedWeek: 'Jan 25 - 31, ’26',
+                compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2026-01-25', undefined),
                 transactions: [],
                 transactionsQueryJSON: undefined,
                 keyForList: '2026-01-25-01-25',
@@ -4876,6 +4878,7 @@ describe('SearchUIUtils', () => {
                     groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                     formattedWeek: 'Jan 25 - Jan 31, 2026',
                     shortFormattedWeek: 'Jan 25 - 31, ’26',
+                    compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2026-01-25', undefined),
                     transactions: [],
                     transactionsQueryJSON: undefined,
                     keyForList: 'group_2026-01-25',
@@ -4888,6 +4891,7 @@ describe('SearchUIUtils', () => {
                     groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                     formattedWeek: 'Dec 21 - Dec 27, 2025',
                     shortFormattedWeek: 'Dec 21 - 27, ’25',
+                    compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2025-12-21', undefined),
                     transactions: [],
                     transactionsQueryJSON: undefined,
                     keyForList: 'group_2025-12-21',

From 4feaec522fa96a6edc060c38ca0e45186fdc9ba9 Mon Sep 17 00:00:00 2001
From: "Garrett Knight (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 15:04:15 +0000
Subject: [PATCH 487/781] Docs: explain #admins notifications when the
 workspace plan changes

Co-authored-by: Garrett Knight <garrettmknight@users.noreply.github.com>
---
 .../Change-Your-Workspace-Plan.md                 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
index 08d240f88ae7..14549eb251e6 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
@@ -2,7 +2,7 @@
 title: Change Your Workspace Plan
 description: Change your Workspace's Plan type to Collect or Control. 
 keywords: [New Expensify, change workspace plan, switch plan, Collect plan, Control plan, Submit plan, plan type, upgrade, downgrade, upgrade to Control, downgrade to Collect, upgrade Submit workspace, workspace admin]
-internalScope: Audience is Workspace admins. Covers how to switch a Workspace between the Collect and Control plans, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
+internalScope: Audience is Workspace admins. Covers how to switch a Workspace between the Collect and Control plans, who's notified in the #admins room when the plan changes, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
 retrievalIntent: How to switch a Workspace plan between Collect and Control.
 contentType: task
 platform: new
@@ -27,6 +27,15 @@ If you have an Annual subscription, changes to your plan may be restricted. To l
 
 ---
 
+## Who's notified when the workspace plan changes
+
+When a Workspace Admin changes the plan, Expensify posts a message in the workspace's **#admins** room. The Workspace owner and all Workspace Admins can see it. The message shows which admin made the change.
+
+- **Upgrade to Control:** The #admins room shows "[Admin name] upgraded this workspace to the Control plan." The admin who upgraded also gets a private message in #admins with Control plan pricing and a link to **Settings > Subscription**. Only that admin can see it.
+- **Downgrade to Collect:** The #admins room shows "[Admin name] downgraded this workspace to the Collect plan."
+
+---
+
 ## How to switch to the Collect or Control plans
 
 1. In the navigation tabs (on the left on web, at the bottom on mobile), go to **Workspaces > [workspace name]**.
@@ -58,6 +67,10 @@ A free Submit workspace can be upgraded to Collect or Control. Once upgraded, it
 
 Yes. Any Workspace Admin can upgrade or downgrade the workspace plan. Subscription settings, such as the subscription type and payment card, are still managed by the Workspace owner.
 
+## How will the Workspace owner know if an admin changed the plan?
+
+Expensify posts every plan change in the workspace's **#admins** room, which the Workspace owner and all Workspace Admins can see. The message shows which admin upgraded or downgraded the workspace.
+
 ## Can I switch back to Control after downgrading to Collect?
 
 Yes. You can upgrade a workspace to Control at any time by returning to the **Plan type** setting.

From 1f37fab1b8db301d2c6de41c08c994746a35c32b Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Mon, 12 Oct 2026 17:38:23 +0200
Subject: [PATCH 488/781] Fix pinned chart tooltip flashing

---
 .../Charts/PieChart/PieChartContent.tsx       | 109 ++++++++----------
 .../Charts/components/ChartTooltip.tsx        |  49 ++++----
 .../Charts/components/ChartTooltipLayer.tsx   |  14 +--
 3 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index cd76f231f1d8..7e777230b1a3 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -1,6 +1,6 @@
 import ActivityIndicator from '@components/ActivityIndicator';
-import ChartTooltip from '@components/Charts/components/ChartTooltip';
-import {TOOLTIP_BAR_GAP, useChartLabelFormats, useTooltipData} from '@components/Charts/hooks';
+import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
+import {TOOLTIP_BAR_GAP, useChartLabelFormats} from '@components/Charts/hooks';
 import type {ChartDataPoint, ChartProps, PieSlice, UnitPosition} from '@components/Charts/types';
 import {findSliceAtPosition, processDataIntoSlices} from '@components/Charts/utils';
 import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
@@ -13,10 +13,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {LayoutChangeEvent} from 'react-native';
 
-import React, {useLayoutEffect, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import {Gesture, GestureDetector, PointerType} from 'react-native-gesture-handler';
-import Animated, {useSharedValue} from 'react-native-reanimated';
+import Animated, {useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN, scheduleOnUI} from 'react-native-worklets';
 import {Pie, PolarChart} from 'victory-native';
 
@@ -41,12 +41,9 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     const {translate} = useLocalize();
     const [canvasWidth, setCanvasWidth] = useState(0);
     const [canvasHeight, setCanvasHeight] = useState(0);
-    const [activeSliceIndex, setActiveSliceIndex] = useState(-1);
 
     /** True while a slice tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
     const [isTouchPinned, setIsTouchPinned] = useState(false);
-    /** Point of the last touch tap */
-    const [touchedPoint, setTouchedPoint] = useState<{x: number; y: number}>();
     const [isHoveringOverPie, setIsHoveringOverPie] = useState(false);
 
     // Shared values for hover state
@@ -55,6 +52,10 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     const cursorY = useSharedValue(0);
     const tooltipPosition = useSharedValue({x: 0, y: 0});
 
+    /** Data index of the slice under the cursor or the last touch tap, resolved on the UI thread together with the tooltip position */
+    const matchedIndex = useSharedValue(-1);
+    const isTooltipActive = useDerivedValue(() => matchedIndex.get() >= 0);
+
     const handleLayout = (event: LayoutChangeEvent) => {
         setCanvasWidth(event.nativeEvent.layout.width);
         setCanvasHeight(event.nativeEvent.layout.height);
@@ -69,17 +70,30 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     // so slice indices don't match the original data array. We map back via
     // originalIndex so the tooltip can display the original (possibly negative) value.
     const processedSlices = processDataIntoSlices(data, pieGeometry);
-    const activeOriginalDataIndex = activeSliceIndex >= 0 ? (processedSlices.at(activeSliceIndex)?.originalIndex ?? -1) : -1;
 
     const {formatValue} = useChartLabelFormats({data, unit: valueUnit, unitPosition: valueUnitPosition});
-    const tooltipData = useTooltipData(activeOriginalDataIndex, data, formatValue);
 
-    // Handle hover state updates
-    const updateActiveSlice = (x: number, y: number) => {
+    /** Data index of the slice at the given point, or -1 when the point is outside the slices */
+    const findDataIndexAt = (x: number, y: number) => {
+        'worklet';
+
         const {centerX, centerY} = pieGeometry;
         const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
-        setActiveSliceIndex(sliceIndex);
-        setIsHoveringOverPie(sliceIndex >= 0);
+        return sliceIndex >= 0 ? (processedSlices.at(sliceIndex)?.originalIndex ?? -1) : -1;
+    };
+
+    const hoverAt = (x: number, y: number) => {
+        'worklet';
+
+        cursorX.set(x);
+        cursorY.set(y);
+        tooltipPosition.set({x, y: y - TOOLTIP_BAR_GAP});
+        const dataIndex = findDataIndexAt(x, y);
+        const wasOverPie = matchedIndex.get() >= 0;
+        matchedIndex.set(dataIndex);
+        if (wasOverPie !== dataIndex >= 0) {
+            scheduleOnRN(setIsHoveringOverPie, dataIndex >= 0);
+        }
     };
 
     // Handle slice press callback
@@ -104,34 +118,13 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
         if (!isHovering.get()) {
             return;
         }
-        const x = cursorX.get() - deltaX;
-        const y = cursorY.get() - deltaY;
-        cursorX.set(x);
-        cursorY.set(y);
-        tooltipPosition.set({x, y: y - TOOLTIP_BAR_GAP});
-        scheduleOnRN(updateActiveSlice, x, y);
+        hoverAt(cursorX.get() - deltaX, cursorY.get() - deltaY);
     };
 
     const onChartMoved = (deltaX: number, deltaY: number) => scheduleOnUI(handleChartMoved, deltaX, deltaY);
 
-    // Touch taps show the slice tooltip instead of drilling in, and the next touch anywhere on the screen hides it
-    const showTouchedSlice = (x: number, y: number) => {
-        const {centerX, centerY} = pieGeometry;
-        const sliceIndex = findSliceAtPosition(x, y, centerX, centerY, radius, innerRadius, processedSlices);
-        setActiveSliceIndex(sliceIndex);
-        setIsTouchPinned(sliceIndex >= 0);
-        setTouchedPoint({x, y});
-    };
-
-    useLayoutEffect(() => {
-        if (!touchedPoint) {
-            return;
-        }
-        tooltipPosition.set({x: touchedPoint.x, y: touchedPoint.y - TOOLTIP_BAR_GAP});
-    }, [touchedPoint, tooltipPosition]);
-
     const dismissTouchedSlice = () => {
-        setActiveSliceIndex(-1);
+        matchedIndex.set(-1);
         setIsTouchPinned(false);
     };
 
@@ -146,10 +139,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                 }
                 isHovering.set(true);
                 scheduleOnRN(setIsTouchPinned, false);
-                cursorX.set(e.x);
-                cursorY.set(e.y);
-                tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
-                scheduleOnRN(updateActiveSlice, e.x, e.y);
+                hoverAt(e.x, e.y);
             })
             .onUpdate((e) => {
                 'worklet';
@@ -157,10 +147,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                 if (e.pointerType === PointerType.TOUCH) {
                     return;
                 }
-                cursorX.set(e.x);
-                cursorY.set(e.y);
-                tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
-                scheduleOnRN(updateActiveSlice, e.x, e.y);
+                hoverAt(e.x, e.y);
             })
             .onEnd((e) => {
                 'worklet';
@@ -169,7 +156,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                     return;
                 }
                 isHovering.set(false);
-                scheduleOnRN(setActiveSliceIndex, -1);
+                matchedIndex.set(-1);
                 scheduleOnRN(setIsHoveringOverPie, false);
             });
 
@@ -187,8 +174,12 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
             .onEnd((e) => {
                 'worklet';
 
+                // Touch taps show the slice tooltip instead of drilling in, and the next touch anywhere on the screen hides it
                 if (e.pointerType === PointerType.TOUCH) {
-                    scheduleOnRN(showTouchedSlice, e.x, e.y);
+                    const dataIndex = findDataIndexAt(e.x, e.y);
+                    tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
+                    matchedIndex.set(dataIndex);
+                    scheduleOnRN(setIsTouchPinned, dataIndex >= 0);
                     return;
                 }
 
@@ -210,10 +201,10 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                 style={[styles.flexRow, styles.alignItemsCenter]}
                 onMouseEnter={() => {
                     tooltipPosition.set(slice.tooltipPosition);
-                    setActiveSliceIndex(slice.ordinalIndex);
+                    matchedIndex.set(slice.originalIndex);
                 }}
                 onMouseLeave={() => {
-                    setActiveSliceIndex(-1);
+                    matchedIndex.set(-1);
                 }}
             >
                 <View style={[styles.pieChartLegendDot, StyleUtils.getBackgroundColorStyle(slice.color)]} />
@@ -283,18 +274,16 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
                     )}
 
                     {/* Tooltip */}
-                    {activeSliceIndex >= 0 && !!tooltipData && (
-                        <ChartTooltip
-                            label={tooltipData.label}
-                            amount={tooltipData.amount}
-                            percentage={tooltipData.percentage}
-                            expenseCount={tooltipData.expenseCount}
-                            chartWidth={canvasWidth}
-                            initialTooltipPosition={tooltipPosition}
-                            onChartMoved={onChartMoved}
-                            onDismiss={isTouchPinned ? dismissTouchedSlice : undefined}
-                        />
-                    )}
+                    <ChartTooltipLayer
+                        matchedIndex={matchedIndex}
+                        isTooltipActive={isTooltipActive}
+                        data={data}
+                        formatValue={formatValue}
+                        chartWidth={canvasWidth}
+                        initialTooltipPosition={tooltipPosition}
+                        onChartMoved={onChartMoved}
+                        onDismiss={isTouchPinned ? dismissTouchedSlice : undefined}
+                    />
                 </Animated.View>
             </GestureDetector>
             {shouldShowLegend && <View style={styles.pieChartLegendContainer}>{processedSlices.map((slice) => renderLegendItem(slice))}</View>}
diff --git a/src/components/Charts/components/ChartTooltip.tsx b/src/components/Charts/components/ChartTooltip.tsx
index cc623f09d983..07a5ce168780 100644
--- a/src/components/Charts/components/ChartTooltip.tsx
+++ b/src/components/Charts/components/ChartTooltip.tsx
@@ -9,12 +9,11 @@ import PopoverWithMeasuredContentUtils from '@libs/PopoverWithMeasuredContentUti
 
 import variables from '@styles/variables';
 
-import type {ComponentRef} from 'react';
 import type {LayoutChangeEvent} from 'react-native';
 import type {DerivedValue, SharedValue} from 'react-native-reanimated';
 
 import {useIsFocused} from '@react-navigation/native';
-import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import Animated, {useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
@@ -51,6 +50,12 @@ type ChartTooltipProps = {
 
     /** Hides a tooltip pinned by a touch tap, passed only while it is pinned */
     onDismiss?: () => void;
+
+    /** Identifies the item the content belongs to, so the content is mounted again and laid out on each change of the item */
+    contentKey?: number;
+
+    /** Called once the content is laid out, which is the first moment it is on screen on native */
+    onContentLayout?: () => void;
 };
 
 function getAmountContent(amount: string, percentage?: string): string {
@@ -61,7 +66,20 @@ function getAmountContent(amount: string, percentage?: string): string {
     return `${amount} (${percentage})`;
 }
 
-function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, initialTooltipPosition, isVisible, isContentCurrent, onChartMoved, onDismiss}: ChartTooltipProps) {
+function ChartTooltip({
+    label,
+    amount,
+    percentage,
+    expenseCount,
+    chartWidth,
+    initialTooltipPosition,
+    isVisible,
+    isContentCurrent,
+    onChartMoved,
+    onDismiss,
+    contentKey,
+    onContentLayout,
+}: ChartTooltipProps) {
     const styles = useThemeStyles();
     const {windowWidth, windowHeight} = useWindowDimensions();
 
@@ -81,27 +99,16 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
     const [isShown, setIsShown] = useState(false);
 
     const amountContent = getAmountContent(amount, percentage);
-    const content = [label, amountContent, expenseCount].join('|');
-
-    const tooltipWrapperRef = useRef<ComponentRef<typeof View>>(null);
-
-    useLayoutEffect(() => {
-        tooltipWrapperRef.current?.measure((x: number, y: number, width: number, height: number) => {
-            if (width <= 0) {
-                return;
-            }
-            tooltipMeasuredWidth.set(width);
-            tooltipMeasuredHeight.set(height);
-        });
-    }, [content, chartWidth, tooltipMeasuredWidth, tooltipMeasuredHeight]);
 
-    const updateMeasuredSize = (event: LayoutChangeEvent) => {
+    // The size is set before the content is reported as laid out, so the tooltip is never revealed with the previous content's size
+    const handleContentLayout = (event: LayoutChangeEvent) => {
         const {width, height} = event.nativeEvent.layout;
         if (width <= 0) {
             return;
         }
         tooltipMeasuredWidth.set(width);
         tooltipMeasuredHeight.set(height);
+        onContentLayout?.();
     };
 
     useAnimatedReaction(
@@ -185,10 +192,12 @@ function ChartTooltip({label, amount, percentage, expenseCount, chartWidth, init
                 <Animated.View
                     style={[styles.chartTooltipLayer, tooltipStyle]}
                     pointerEvents="none"
-                    ref={tooltipWrapperRef}
-                    onLayout={updateMeasuredSize}
                 >
-                    <View style={[styles.chartTooltipBox, {minWidth: Math.min(variables.chartTooltipMinWidth, chartWidth), maxWidth: chartWidth}]}>
+                    <View
+                        key={contentKey}
+                        style={[styles.chartTooltipBox, {minWidth: Math.min(variables.chartTooltipMinWidth, chartWidth), maxWidth: chartWidth}]}
+                        onLayout={handleContentLayout}
+                    >
                         <Text style={styles.chartTooltipTitle}>{label}</Text>
                         {!!amountContent && <Text style={styles.chartTooltipText}>{amountContent}</Text>}
                         {!!expenseCount && <Text style={styles.chartTooltipText}>{expenseCount}</Text>}
diff --git a/src/components/Charts/components/ChartTooltipLayer.tsx b/src/components/Charts/components/ChartTooltipLayer.tsx
index 9804c73b3347..f1fce637e00e 100644
--- a/src/components/Charts/components/ChartTooltipLayer.tsx
+++ b/src/components/Charts/components/ChartTooltipLayer.tsx
@@ -3,7 +3,7 @@ import type {ChartDataPoint} from '@components/Charts/types';
 
 import type {DerivedValue, SharedValue} from 'react-native-reanimated';
 
-import React, {useLayoutEffect, useState} from 'react';
+import React, {useState} from 'react';
 import {useAnimatedReaction, useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
@@ -40,7 +40,9 @@ type ChartTooltipLayerProps = {
  */
 function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, chartWidth, initialTooltipPosition, onChartMoved, onDismiss}: ChartTooltipLayerProps) {
     const [activeDataIndex, setActiveDataIndex] = useState(-1);
-    const renderedIndex = useSharedValue(-1);
+
+    // Set from the content's layout, since on native a value set during render can reach the UI thread before the new content is mounted
+    const laidOutIndex = useSharedValue(-1);
 
     useAnimatedReaction(
         () => matchedIndex.get(),
@@ -49,11 +51,7 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
         },
     );
 
-    useLayoutEffect(() => {
-        renderedIndex.set(activeDataIndex);
-    }, [activeDataIndex, renderedIndex]);
-
-    const isContentCurrent = useDerivedValue(() => matchedIndex.get() === renderedIndex.get());
+    const isContentCurrent = useDerivedValue(() => matchedIndex.get() === laidOutIndex.get());
     const tooltipData = useTooltipData(activeDataIndex, data, formatValue);
 
     if (!tooltipData) {
@@ -72,6 +70,8 @@ function ChartTooltipLayer({matchedIndex, isTooltipActive, data, formatValue, ch
             isContentCurrent={isContentCurrent}
             onChartMoved={onChartMoved}
             onDismiss={onDismiss}
+            contentKey={activeDataIndex}
+            onContentLayout={() => laidOutIndex.set(activeDataIndex)}
         />
     );
 }

From e2f36d0aeaf3e599a7dc6a3d34fde1f13a780cba Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 12 Oct 2026 22:54:15 +0700
Subject: [PATCH 489/781] fix: type

---
 tests/actions/PolicyTest.ts         | 1 +
 tests/unit/OptionsListUtilsTest.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index 15e9d1b81654..c880fce31f3b 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -761,6 +761,7 @@ describe('actions/Policy', () => {
                 policyID: fakePolicy.id,
                 targetPolicyID: policyID,
                 welcomeNote: 'Join my policy',
+                personalDetailsByLogins: {},
                 parts: {
                     people: false,
                     reports: false,
diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx
index 5f8c305245f9..a6a07c504016 100644
--- a/tests/unit/OptionsListUtilsTest.tsx
+++ b/tests/unit/OptionsListUtilsTest.tsx
@@ -6273,7 +6273,7 @@ describe('OptionsListUtils', () => {
             await waitForBatchedUpdates();
 
             const option: OptionData = {reportID, keyForList: '', isMoneyRequestReport: true};
-            return getAlternateText(option, {showChatPreviewLine: true}, buildConfig(reimbursed, reportID, {currentUserAccountID}));
+            return getAlternateText(option, {showChatPreviewLine: true}, buildConfig({currentUserAccountID}));
         };
 
         it('should address the current user directly when they own the reimbursed report', async () => {

From cd4adbcf96933d75e09e01762e93be6c5fbffbb9 Mon Sep 17 00:00:00 2001
From: Issa Nimaga <inimaga@expensify.com>
Date: Mon, 12 Oct 2026 17:12:35 +0100
Subject: [PATCH 490/781] Receive ephemeral Agent Zero processing status events

---
 src/libs/Pusher/EventType.ts                  |   1 +
 src/libs/Pusher/types.ts                      |  12 ++
 src/libs/PusherUtils.ts                       |  10 +-
 src/libs/actions/User.ts                      |  17 ++
 .../AgentZeroProcessingStatusPusherTest.ts    | 157 ++++++++++++++++++
 5 files changed, 193 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/AgentZeroProcessingStatusPusherTest.ts

diff --git a/src/libs/Pusher/EventType.ts b/src/libs/Pusher/EventType.ts
index 50dad3dffcd0..e744f89eeb98 100644
--- a/src/libs/Pusher/EventType.ts
+++ b/src/libs/Pusher/EventType.ts
@@ -8,6 +8,7 @@ export default {
     USER_IS_LEAVING_ROOM: 'client-userIsLeavingRoom',
     USER_IS_TYPING: 'client-userIsTyping',
     MULTIPLE_EVENTS: 'multipleEvents',
+    AGENT_ZERO_PROCESSING_STATUS: 'agentZeroProcessingStatus',
     CONCIERGE_REASONING: 'conciergeReasoning',
     CONCIERGE_DRAFT_EVENTS: 'conciergeDraftEvents',
     CONCIERGE_DRAFT_STARTED: 'conciergeDraftStarted',
diff --git a/src/libs/Pusher/types.ts b/src/libs/Pusher/types.ts
index 028fbe3b4d9a..fb9fabde86dc 100644
--- a/src/libs/Pusher/types.ts
+++ b/src/libs/Pusher/types.ts
@@ -1,4 +1,5 @@
 import type CONST from '@src/CONST';
+import type ONYXKEYS from '@src/ONYXKEYS';
 import type {AnyOnyxUpdatesFromServer, ReportUserIsTyping} from '@src/types/onyx';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
@@ -29,6 +30,16 @@ type UserIsLeavingRoomEvent = Record<string, boolean> & {
     userLogin?: string;
 };
 
+type AgentZeroProcessingStatusEvent = {
+    updates: Array<{
+        onyxMethod: 'merge';
+        key: `${typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${string}`;
+        value: {
+            agentZeroProcessingRequestIndicator: Record<string, string | null>;
+        };
+    }>;
+};
+
 type ConciergeReasoningEvent = {
     reasoning: string;
     agentZeroRequestID: string;
@@ -68,6 +79,7 @@ type ConciergeDraftEventsEvent = {
 type PusherEventMap = {
     [TYPE.USER_IS_TYPING]: UserIsTypingEvent;
     [TYPE.USER_IS_LEAVING_ROOM]: UserIsLeavingRoomEvent;
+    [TYPE.AGENT_ZERO_PROCESSING_STATUS]: AgentZeroProcessingStatusEvent;
     [TYPE.CONCIERGE_REASONING]: ConciergeReasoningEvent;
     [TYPE.CONCIERGE_DRAFT_EVENTS]: ConciergeDraftEventsEvent;
     [TYPE.CONCIERGE_DRAFT_STARTED]: ConciergeDraftEvent;
diff --git a/src/libs/PusherUtils.ts b/src/libs/PusherUtils.ts
index d311abf03649..e89daaf488b3 100644
--- a/src/libs/PusherUtils.ts
+++ b/src/libs/PusherUtils.ts
@@ -1,9 +1,11 @@
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
-import type {AnyOnyxUpdatesFromServer, OnyxServerUpdate} from '@src/types/onyx/OnyxUpdatesFromServer';
+import type {OnyxServerUpdate} from '@src/types/onyx/OnyxUpdatesFromServer';
 
 import type {OnyxKey} from 'react-native-onyx';
 
+import type {EventData, PusherEventName} from './Pusher/types';
+
 import {reconnect} from './actions/Reconnect';
 import Log from './Log';
 import Pusher from './Pusher';
@@ -35,14 +37,14 @@ function triggerMultiEventHandler<TKey extends OnyxKey>(eventType: string, data:
 /**
  * Abstraction around subscribing to private user channel events. Handles all logs and errors automatically.
  */
-function subscribeToPrivateUserChannelEvent(eventName: string, accountID: string, onEvent: (pushJSON: AnyOnyxUpdatesFromServer) => void) {
+function subscribeToPrivateUserChannelEvent<EventName extends PusherEventName>(eventName: EventName, accountID: string, onEvent: (pushJSON: EventData<EventName>) => void) {
     const pusherChannelName = getUserChannelName(accountID);
 
-    function logPusherEvent(pushJSON: AnyOnyxUpdatesFromServer) {
+    function logPusherEvent(pushJSON: EventData<EventName>) {
         Log.info(`[Report] Handled ${eventName} event sent by Pusher`, false, pushJSON);
     }
 
-    function onEventPush(pushJSON: AnyOnyxUpdatesFromServer) {
+    function onEventPush(pushJSON: EventData<EventName>) {
         logPusherEvent(pushJSON);
         onEvent(pushJSON);
     }
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 596613f79440..3f0110d76fcf 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -877,6 +877,23 @@ function subscribeToUserEvents(
 
     PusherUtils.onPrivateUserChannelResubscribe(currentUserAccountID.toString());
 
+    // Temporary labels bypass the reliable update stream, but wait for the current API response so an older snapshot cannot overwrite them.
+    PusherUtils.subscribeToPrivateUserChannelEvent(Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, currentUserAccountID.toString(), (pushJSON) => {
+        SequentialQueue.getCurrentRequest()
+            .then(() => {
+                if (sessionAccountID !== currentUserAccountID || !ActiveClientManager.isClientTheLeader()) {
+                    return;
+                }
+
+                return Onyx.update(pushJSON.updates);
+            })
+            .catch((error: unknown) => {
+                Log.alert('[subscribeToUserEvents] Applying Agent Zero processing status failed', {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            });
+    });
+
     // Handles the mega multipleEvents from Pusher which contains an array of single events.
     // Each single event is passed to PusherUtils in order to trigger the callbacks for that event
     PusherUtils.subscribeToPrivateUserChannelEvent(Pusher.TYPE.MULTIPLE_EVENTS, currentUserAccountID.toString(), (pushJSON) => {
diff --git a/tests/unit/AgentZeroProcessingStatusPusherTest.ts b/tests/unit/AgentZeroProcessingStatusPusherTest.ts
new file mode 100644
index 000000000000..132a6a06bf90
--- /dev/null
+++ b/tests/unit/AgentZeroProcessingStatusPusherTest.ts
@@ -0,0 +1,157 @@
+import applyOnyxUpdatesReliably from '@libs/actions/applyOnyxUpdatesReliably';
+import * as ActiveClientManager from '@libs/ActiveClientManager';
+import * as API from '@libs/API';
+import Log from '@libs/Log';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
+import Pusher from '@libs/Pusher';
+import type {EventData} from '@libs/Pusher/types';
+
+import {subscribeToUserEvents} from '@userActions/User';
+
+import CONFIG from '@src/CONFIG';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import PusherHelper from '../utils/PusherHelper';
+import {formatPhoneNumber} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/API');
+jest.mock('@libs/actions/applyOnyxUpdatesReliably');
+jest.mock('@libs/ActiveClientManager', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@libs/ActiveClientManager'),
+    isClientTheLeader: jest.fn(() => true),
+}));
+
+const CHANNEL_NAME = `${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`;
+const ACTOR_ACCOUNT_ID = 123;
+const REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1001` as const;
+const PARENT_REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1002` as const;
+const processingStatusEvent: EventData<typeof Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS> = {
+    updates: [REPORT_NVP_KEY, PARENT_REPORT_NVP_KEY].map((key) => ({
+        onyxMethod: 'merge',
+        key,
+        value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}},
+    })),
+};
+
+describe('Agent Zero processing status Pusher events', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(true);
+        await Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, {accountID: 1, email: 'test@example.com'});
+        await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 42);
+        await waitForBatchedUpdates();
+        PusherHelper.setup();
+        subscribeToUserEvents(1, 'test@example.com', () => undefined, formatPhoneNumber, undefined);
+        await waitForBatchedUpdates();
+    });
+
+    afterEach(() => {
+        PusherHelper.teardown();
+        jest.restoreAllMocks();
+    });
+
+    it('sets and clears processing labels without advancing or recovering the reliable update stream', async () => {
+        // Given a subscribed client with a synchronization watermark
+        expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
+
+        // When temporary status updates arrive for a report and its parent
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        await waitForBatchedUpdates();
+
+        // Then both reports show the processing label
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+        expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+
+        // When the agent finishes and clears its processing labels
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
+            updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
+        });
+        await waitForBatchedUpdates();
+
+        // Then the labels clear without affecting the synchronization watermark or fetching catch-up updates
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+        expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+        expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
+        expect(applyOnyxUpdatesReliably).not.toHaveBeenCalled();
+        expect(API.makeRequestWithSideEffects).not.toHaveBeenCalled();
+    });
+
+    it('applies new processing status after an older OpenApp response clears the indicator', async () => {
+        // Given an earlier OpenApp request is still applying its response
+        let finishRequest = () => {};
+        const currentRequest = new Promise<void>((resolve) => {
+            finishRequest = resolve;
+        });
+        jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
+
+        // When a new processing status arrives before that response completes
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        await waitForBatchedUpdates();
+
+        // Then the status waits for the earlier request
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+
+        // When the older snapshot clears the indicator and finishes
+        await Onyx.merge(REPORT_NVP_KEY, {agentZeroProcessingRequestIndicator: null});
+        finishRequest();
+        await waitForBatchedUpdates();
+
+        // Then the new label survives the older response
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+    });
+
+    it('ignores processing status events on a non-leader client', async () => {
+        // Given another client is responsible for updating shared Onyx data
+        jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(false);
+
+        // When a temporary processing status arrives
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        await waitForBatchedUpdates();
+
+        // Then this client leaves the report unchanged
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+    });
+
+    it.each([undefined, 2])('ignores processing status from an earlier session after the account changes to %s', async (accountID) => {
+        // Given a status listener is waiting for the current account's API request
+        let finishRequest = () => {};
+        const currentRequest = new Promise<void>((resolve) => {
+            finishRequest = resolve;
+        });
+        jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
+
+        // When a status arrives and the account signs out or changes before the request finishes
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        await Onyx.set(ONYXKEYS.SESSION, accountID ? {accountID} : null);
+        await waitForBatchedUpdates();
+        finishRequest();
+        await waitForBatchedUpdates();
+
+        // Then it cannot populate the new session's report data
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+    });
+
+    it('reports a failed local status update', async () => {
+        // Given Onyx cannot apply the temporary status update
+        jest.spyOn(Onyx, 'update').mockRejectedValueOnce(new Error('apply failed'));
+        const alertSpy = jest.spyOn(Log, 'alert');
+
+        // When a processing status arrives
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        await waitForBatchedUpdates();
+
+        // Then the failure is logged without an unhandled rejection or a synchronization recovery
+        expect(alertSpy).toHaveBeenCalledWith('[subscribeToUserEvents] Applying Agent Zero processing status failed', expect.objectContaining({error: 'apply failed'}));
+        expect(applyOnyxUpdatesReliably).not.toHaveBeenCalled();
+    });
+});

From fd10853a526629221fed28c4a7afdb211c5e840f Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 12 Oct 2026 23:14:30 +0700
Subject: [PATCH 491/781] fix: test

---
 tests/actions/IOUTest/DeleteMoneyRequestTest.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
index 80f150652f70..53b3eba88273 100644
--- a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
+++ b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts
@@ -2416,13 +2416,16 @@ describe('actions/IOU/DeleteMoneyRequest', () => {
                 originalMessage: {type: CONST.IOU.REPORT_ACTION_TYPE.CREATE, IOUTransactionID: '70003', amount: 100, currency: 'USD', IOUReportID: IOU_REPORT_ID},
             };
 
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${CHAT_REPORT_ID}`, {...createRandomReport(70001, undefined), reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT});
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${IOU_REPORT_ID}`, {
+            const chatReport: Report = {...createRandomReport(70001, undefined), reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT};
+            const iouReport: Report = {
                 ...createRandomReport(70002, undefined),
                 reportID: IOU_REPORT_ID,
                 type: CONST.REPORT.TYPE.EXPENSE,
                 chatReportID: CHAT_REPORT_ID,
-            });
+            };
+
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${CHAT_REPORT_ID}`, chatReport);
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${IOU_REPORT_ID}`, iouReport);
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHAT_REPORT_ID}`, {[previewAction.reportActionID]: previewAction});
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`, {
                 [olderIOUAction.reportActionID]: olderIOUAction,
@@ -2435,6 +2438,8 @@ describe('actions/IOU/DeleteMoneyRequest', () => {
                 const result = getCleanUpTransactionThreadReportOnyxData({
                     shouldDeleteTransactionThread: false,
                     reportAction: deletedIOUAction,
+                    iouReport,
+                    chatReport,
                     currentUserAccountID,
                 });
                 const entry = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHAT_REPORT_ID}`);

From e3380e4938641bc0669ae411a8bccd553cea3108 Mon Sep 17 00:00:00 2001
From: "ahmedGaber93 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 16:32:04 +0000
Subject: [PATCH 492/781] Format the GPS distance counter with
 Intl.NumberFormat so each locale controls number, spacing and unit

Co-authored-by: ahmedGaber93 <ahmedGaber93@users.noreply.github.com>
---
 src/libs/NumberFormatUtils/index.ts           | 17 +++++++-
 .../Waypoints/DistanceCounter.tsx             | 21 +++++++---
 tests/unit/NumberFormatUtilsTest.ts           | 42 +++++++++++++++++++
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/libs/NumberFormatUtils/index.ts b/src/libs/NumberFormatUtils/index.ts
index 989f267bd9d1..ddedab49a798 100644
--- a/src/libs/NumberFormatUtils/index.ts
+++ b/src/libs/NumberFormatUtils/index.ts
@@ -4,6 +4,7 @@ import memoize from '@libs/memoize';
 
 import CONST from '@src/CONST';
 import type Locale from '@src/types/onyx/Locale';
+import type {Unit} from '@src/types/onyx/Policy';
 
 // Polyfill the Intl API if locale data is not as expected
 intlPolyfill();
@@ -44,6 +45,20 @@ function formatToParts(locale: Locale | undefined, number: number, options?: Int
     return createFormatter(locale, options).formatToParts(number);
 }
 
+/**
+ * Formats a distance that is already expressed in the given unit (mi/km) into localized parts, so the caller can
+ * render the number and the unit in the order, spacing, and spelling the locale uses (e.g. "12.50 mi", "12,50 km", "12.50英里").
+ */
+function formatDistanceToParts(locale: Locale | undefined, distanceInUnits: number, unit: Unit): Intl.NumberFormatPart[] {
+    return formatToParts(locale, distanceInUnits, {
+        style: 'unit',
+        unit: unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? 'mile' : 'kilometer',
+        unitDisplay: 'short',
+        minimumFractionDigits: CONST.DISTANCE_DECIMAL_PLACES,
+        maximumFractionDigits: CONST.DISTANCE_DECIMAL_PLACES,
+    });
+}
+
 /**
  * Test-only: clears the malformed-currency deduplication so warn-assertion tests don't pollute each other.
  */
@@ -51,4 +66,4 @@ function resetMalformedCurrenciesForTesting() {
     warnedMalformedCurrencies.clear();
 }
 
-export {format, formatToParts, resetMalformedCurrenciesForTesting};
+export {format, formatToParts, formatDistanceToParts, resetMalformedCurrenciesForTesting};
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
index babdfae8ca5a..3c433e4a3c7d 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
@@ -9,6 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import {getEffectiveDistance} from '@libs/GPSDraftDetailsUtils';
+import {formatDistanceToParts} from '@libs/NumberFormatUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Unit} from '@src/types/onyx/Policy';
@@ -20,12 +21,12 @@ type DistanceCounterProps = {
 
 function DistanceCounter({unit}: DistanceCounterProps) {
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
+    const {translate, preferredLocale} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['Crosshair']);
 
     const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
 
-    const distance = DistanceRequestUtils.getRoundedDistanceInUnits(getEffectiveDistance(gpsDraftDetails), unit);
+    const distanceParts = formatDistanceToParts(preferredLocale, DistanceRequestUtils.convertDistanceUnit(getEffectiveDistance(gpsDraftDetails), unit), unit);
 
     return (
         <MenuItem.Root>
@@ -34,9 +35,19 @@ function DistanceCounter({unit}: DistanceCounterProps) {
                     <MenuItem.IconNarrow src={icons.Crosshair} />
                 </MenuItem.Leading>
                 <MenuItemField.Content name={translate('common.distance')}>
-                    <Text style={[styles.iouAmountTextInput, styles.textXLarge, styles.colorMuted]}>
-                        <Text style={[styles.iouAmountTextInput, styles.textXLarge]}>{distance}</Text>
-                        {` ${unit}`}
+                    <Text style={[styles.iouAmountTextInput, styles.textXLarge]}>
+                        {distanceParts.map((part) =>
+                            part.type === 'unit' ? (
+                                <Text
+                                    key="unit"
+                                    style={styles.colorMuted}
+                                >
+                                    {part.value}
+                                </Text>
+                            ) : (
+                                part.value
+                            ),
+                        )}
                     </Text>
                 </MenuItemField.Content>
             </MenuItem.Row>
diff --git a/tests/unit/NumberFormatUtilsTest.ts b/tests/unit/NumberFormatUtilsTest.ts
index bb115b91287b..e293e22a0f48 100644
--- a/tests/unit/NumberFormatUtilsTest.ts
+++ b/tests/unit/NumberFormatUtilsTest.ts
@@ -84,6 +84,48 @@ describe('NumberFormatUtils', () => {
         });
     });
 
+    describe('formatDistanceToParts', () => {
+        const joinParts = (parts: Intl.NumberFormatPart[]) => parts.map((part) => part.value).join('');
+
+        test('formats miles in English with the number first and a short unit part', () => {
+            // Given a distance in miles and the English locale
+            // When the distance is formatted into parts
+            const parts = NumberFormatUtils.formatDistanceToParts(CONST.LOCALES.EN, 1234.5, CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES);
+
+            // Then the locale grouping and two decimals are used, and the unit comes back as its own part so it can be styled separately
+            expect(joinParts(parts)).toBe('1,234.50 mi');
+            expect(parts.find((part) => part.type === 'unit')?.value).toBe('mi');
+        });
+
+        test('uses the locale decimal separator for kilometers', () => {
+            // Given a distance in kilometers and the Spanish locale, which uses a decimal comma
+            // When the distance is formatted into parts
+            const parts = NumberFormatUtils.formatDistanceToParts(CONST.LOCALES.ES, 12.5, CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS);
+
+            // Then the number uses a comma and the unit is still a separate part
+            expect(joinParts(parts)).toBe('12,50 km');
+            expect(parts.find((part) => part.type === 'unit')?.value).toBe('km');
+        });
+
+        test('lets the locale decide spacing and unit spelling', () => {
+            // Given a locale that writes the unit without a space after the number
+            // When the distance is formatted into parts
+            const parts = NumberFormatUtils.formatDistanceToParts(CONST.LOCALES.ZH_HANS, 12.5, CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES);
+
+            // Then no space is inserted before the translated unit
+            expect(joinParts(parts)).toBe('12.50英里');
+            expect(parts.find((part) => part.type === 'unit')?.value).toBe('英里');
+        });
+
+        test('always shows two decimal places', () => {
+            // Given distances that would otherwise drop trailing zeros or show more than two decimals
+            // When they are formatted into parts
+            // Then they are rounded and padded to two decimals, matching how distances are stored
+            expect(joinParts(NumberFormatUtils.formatDistanceToParts(CONST.LOCALES.EN, 0, CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES))).toBe('0.00 mi');
+            expect(joinParts(NumberFormatUtils.formatDistanceToParts(CONST.LOCALES.EN, 3.14159, CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS))).toBe('3.14 km');
+        });
+    });
+
     describe('malformed-currency warn deduplication', () => {
         test('warns at most once per unique malformed currency across repeated format calls', () => {
             NumberFormatUtils.format(CONST.LOCALES.EN, 25, {style: 'currency', currency: 'XX'});

From bf571f23066fda4bfeae8205ee22846be4a5cd29 Mon Sep 17 00:00:00 2001
From: Issa Nimaga <inimaga@expensify.com>
Date: Mon, 12 Oct 2026 18:20:27 +0100
Subject: [PATCH 493/781] Preserve Agent Zero processing status event order

---
 src/libs/actions/User.ts                      |  5 ++-
 .../AgentZeroProcessingStatusPusherTest.ts    | 38 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 3f0110d76fcf..d27b324509d8 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -878,8 +878,11 @@ function subscribeToUserEvents(
     PusherUtils.onPrivateUserChannelResubscribe(currentUserAccountID.toString());
 
     // Temporary labels bypass the reliable update stream, but wait for the current API response so an older snapshot cannot overwrite them.
+    // Keep events in arrival order even when they wait on different queued requests.
+    let processingStatusEventsPromise = Promise.resolve();
     PusherUtils.subscribeToPrivateUserChannelEvent(Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, currentUserAccountID.toString(), (pushJSON) => {
-        SequentialQueue.getCurrentRequest()
+        processingStatusEventsPromise = processingStatusEventsPromise
+            .then(() => SequentialQueue.getCurrentRequest())
             .then(() => {
                 if (sessionAccountID !== currentUserAccountID || !ActiveClientManager.isClientTheLeader()) {
                     return;
diff --git a/tests/unit/AgentZeroProcessingStatusPusherTest.ts b/tests/unit/AgentZeroProcessingStatusPusherTest.ts
index 132a6a06bf90..ba2046db4ef8 100644
--- a/tests/unit/AgentZeroProcessingStatusPusherTest.ts
+++ b/tests/unit/AgentZeroProcessingStatusPusherTest.ts
@@ -5,6 +5,7 @@ import Log from '@libs/Log';
 import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import Pusher from '@libs/Pusher';
 import type {EventData} from '@libs/Pusher/types';
+import * as RequestModule from '@libs/Request';
 
 import {subscribeToUserEvents} from '@userActions/User';
 
@@ -110,6 +111,43 @@ describe('Agent Zero processing status Pusher events', () => {
         expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
     });
 
+    it('keeps a newer clear after status events arrive during different queued requests', async () => {
+        // Given two requests waiting in the real sequential queue
+        SequentialQueue.resetQueue();
+        let finishFirstRequest = () => {};
+        let finishSecondRequest = () => {};
+        const firstRequest = new Promise<void>((resolve) => {
+            finishFirstRequest = resolve;
+        });
+        const secondRequest = new Promise<void>((resolve) => {
+            finishSecondRequest = resolve;
+        });
+        const processSpy = jest.spyOn(RequestModule, 'processWithMiddleware').mockReturnValueOnce(firstRequest).mockReturnValueOnce(secondRequest);
+        await SequentialQueue.push({command: 'OpenApp'});
+        await waitForBatchedUpdates();
+        await SequentialQueue.push({command: 'ReadNewestAction'});
+        expect(processSpy).toHaveBeenCalledTimes(1);
+
+        // When a thinking label arrives during the first request and that request finishes
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+        finishFirstRequest();
+        await waitForBatchedUpdates();
+
+        // Then the next request starts while the label is still waiting
+        expect(processSpy).toHaveBeenCalledTimes(2);
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+
+        // When the clear arrives during the second request and the queue drains
+        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
+            updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
+        });
+        finishSecondRequest();
+        await waitForBatchedUpdates();
+
+        // Then the newer clear wins over the earlier thinking label
+        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+    });
+
     it('ignores processing status events on a non-leader client', async () => {
         // Given another client is responsible for updating shared Onyx data
         jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(false);

From 8a4830d0e7f63316de64024053c9128b0a94568d Mon Sep 17 00:00:00 2001
From: Issa Nimaga <inimaga@expensify.com>
Date: Mon, 12 Oct 2026 18:27:59 +0100
Subject: [PATCH 494/781] Move Agent Zero status tests into UserTest

---
 tests/actions/UserTest.ts                     | 171 +++++++++++++++
 .../AgentZeroProcessingStatusPusherTest.ts    | 195 ------------------
 2 files changed, 171 insertions(+), 195 deletions(-)
 delete mode 100644 tests/unit/AgentZeroProcessingStatusPusherTest.ts

diff --git a/tests/actions/UserTest.ts b/tests/actions/UserTest.ts
index 79190046810d..e6745ba61089 100644
--- a/tests/actions/UserTest.ts
+++ b/tests/actions/UserTest.ts
@@ -1,8 +1,14 @@
+import * as ActiveClientManager from '@libs/ActiveClientManager';
 import * as API from '@libs/API';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import Log from '@libs/Log';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import Pusher from '@libs/Pusher';
+import type {EventData} from '@libs/Pusher/types';
 import PusherUtils from '@libs/PusherUtils';
+import * as RequestModule from '@libs/Request';
 
+import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {NewLogin} from '@src/types/onyx';
@@ -11,10 +17,13 @@ import {CONST as COMMON_CONST} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 
 import * as App from '../../src/libs/actions/App';
+import * as OnyxUpdatesReliably from '../../src/libs/actions/applyOnyxUpdatesReliably';
 import * as DeviceActions from '../../src/libs/actions/Device';
 import redirectToSignIn from '../../src/libs/actions/SignInRedirect';
 import * as UserActions from '../../src/libs/actions/User';
 import createMock from '../utils/createMock';
+import getOnyxValue from '../utils/getOnyxValue';
+import PusherHelper from '../utils/PusherHelper';
 import {anyArray, anyObject, anyString, formatPhoneNumber} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
@@ -1102,6 +1111,168 @@ describe('actions/User', () => {
         });
     });
 
+    describe('subscribeToUserEvents AGENT_ZERO_PROCESSING_STATUS', () => {
+        const CHANNEL_NAME = `${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`;
+        const ACTOR_ACCOUNT_ID = 123;
+        const REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1001` as const;
+        const PARENT_REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1002` as const;
+        const processingStatusEvent: EventData<typeof Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS> = {
+            updates: [REPORT_NVP_KEY, PARENT_REPORT_NVP_KEY].map((key) => ({
+                onyxMethod: 'merge',
+                key,
+                value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}},
+            })),
+        };
+
+        beforeEach(async () => {
+            jest.spyOn(ActiveClientManager, 'isClientTheLeader').mockReturnValue(true);
+            jest.spyOn(OnyxUpdatesReliably, 'default').mockResolvedValue(undefined);
+            await Onyx.merge(ONYXKEYS.SESSION, {accountID: 1, email: 'test@example.com'});
+            await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 42);
+            await waitForBatchedUpdates();
+            PusherHelper.setup();
+            UserActions.subscribeToUserEvents(1, 'test@example.com', () => undefined, formatPhoneNumber, undefined);
+            await waitForBatchedUpdates();
+        });
+
+        afterEach(() => {
+            PusherHelper.teardown();
+            jest.restoreAllMocks();
+        });
+
+        it('sets and clears processing labels without advancing or recovering the reliable update stream', async () => {
+            // Given a subscribed client with a synchronization watermark
+            expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
+
+            // When temporary status updates arrive for a report and its parent
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            await waitForBatchedUpdates();
+
+            // Then both reports show the processing label
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+            expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+
+            // When the agent finishes and clears its processing labels
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
+                updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
+            });
+            await waitForBatchedUpdates();
+
+            // Then the labels clear without affecting the synchronization watermark or fetching catch-up updates
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+            expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+            expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
+            expect(OnyxUpdatesReliably.default).not.toHaveBeenCalled();
+            expect(API.makeRequestWithSideEffects).not.toHaveBeenCalled();
+        });
+
+        it('applies new processing status after an older OpenApp response clears the indicator', async () => {
+            // Given an earlier OpenApp request is still applying its response
+            let finishRequest = () => {};
+            const currentRequest = new Promise<void>((resolve) => {
+                finishRequest = resolve;
+            });
+            jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
+
+            // When a new processing status arrives before that response completes
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            await waitForBatchedUpdates();
+
+            // Then the status waits for the earlier request
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+
+            // When the older snapshot clears the indicator and finishes
+            await Onyx.merge(REPORT_NVP_KEY, {agentZeroProcessingRequestIndicator: null});
+            finishRequest();
+            await waitForBatchedUpdates();
+
+            // Then the new label survives the older response
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
+        });
+
+        it('keeps a newer clear after status events arrive during different queued requests', async () => {
+            // Given two requests waiting in the real sequential queue
+            SequentialQueue.resetQueue();
+            let finishFirstRequest = () => {};
+            let finishSecondRequest = () => {};
+            const firstRequest = new Promise<void>((resolve) => {
+                finishFirstRequest = resolve;
+            });
+            const secondRequest = new Promise<void>((resolve) => {
+                finishSecondRequest = resolve;
+            });
+            const processSpy = jest.spyOn(RequestModule, 'processWithMiddleware').mockReturnValueOnce(firstRequest).mockReturnValueOnce(secondRequest);
+            await SequentialQueue.push({command: 'OpenApp'});
+            await waitForBatchedUpdates();
+            await SequentialQueue.push({command: 'ReadNewestAction'});
+            expect(processSpy).toHaveBeenCalledTimes(1);
+
+            // When a thinking label arrives during the first request and that request finishes
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            finishFirstRequest();
+            await waitForBatchedUpdates();
+
+            // Then the next request starts while the label is still waiting
+            expect(processSpy).toHaveBeenCalledTimes(2);
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+
+            // When the clear arrives during the second request and the queue drains
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
+                updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
+            });
+            finishSecondRequest();
+            await waitForBatchedUpdates();
+
+            // Then the newer clear wins over the earlier thinking label
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
+        });
+
+        it('ignores processing status events on a non-leader client', async () => {
+            // Given another client is responsible for updating shared Onyx data
+            jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(false);
+
+            // When a temporary processing status arrives
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            await waitForBatchedUpdates();
+
+            // Then this client leaves the report unchanged
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+        });
+
+        it.each([undefined, 2])('ignores processing status from an earlier session after the account changes to %s', async (accountID) => {
+            // Given a status listener is waiting for the current account's API request
+            let finishRequest = () => {};
+            const currentRequest = new Promise<void>((resolve) => {
+                finishRequest = resolve;
+            });
+            jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
+
+            // When a status arrives and the account signs out or changes before the request finishes
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            await Onyx.set(ONYXKEYS.SESSION, accountID ? {accountID} : null);
+            await waitForBatchedUpdates();
+            finishRequest();
+            await waitForBatchedUpdates();
+
+            // Then it cannot populate the new session's report data
+            expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
+        });
+
+        it('reports a failed local status update', async () => {
+            // Given Onyx cannot apply the temporary status update
+            jest.spyOn(Onyx, 'update').mockRejectedValueOnce(new Error('apply failed'));
+            const alertSpy = jest.spyOn(Log, 'alert');
+
+            // When a processing status arrives
+            Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
+            await waitForBatchedUpdates();
+
+            // Then the failure is logged without an unhandled rejection or a synchronization recovery
+            expect(alertSpy).toHaveBeenCalledWith('[subscribeToUserEvents] Applying Agent Zero processing status failed', expect.objectContaining({error: 'apply failed'}));
+            expect(OnyxUpdatesReliably.default).not.toHaveBeenCalled();
+        });
+    });
+
     describe('subscribeToUserEvents RECONNECT_APP', () => {
         const reconnectAppMock = jest.fn();
 
diff --git a/tests/unit/AgentZeroProcessingStatusPusherTest.ts b/tests/unit/AgentZeroProcessingStatusPusherTest.ts
deleted file mode 100644
index ba2046db4ef8..000000000000
--- a/tests/unit/AgentZeroProcessingStatusPusherTest.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import applyOnyxUpdatesReliably from '@libs/actions/applyOnyxUpdatesReliably';
-import * as ActiveClientManager from '@libs/ActiveClientManager';
-import * as API from '@libs/API';
-import Log from '@libs/Log';
-import * as SequentialQueue from '@libs/Network/SequentialQueue';
-import Pusher from '@libs/Pusher';
-import type {EventData} from '@libs/Pusher/types';
-import * as RequestModule from '@libs/Request';
-
-import {subscribeToUserEvents} from '@userActions/User';
-
-import CONFIG from '@src/CONFIG';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-import Onyx from 'react-native-onyx';
-
-import getOnyxValue from '../utils/getOnyxValue';
-import PusherHelper from '../utils/PusherHelper';
-import {formatPhoneNumber} from '../utils/TestHelper';
-import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
-
-jest.mock('@libs/API');
-jest.mock('@libs/actions/applyOnyxUpdatesReliably');
-jest.mock('@libs/ActiveClientManager', () => ({
-    ...jest.requireActual<Record<string, unknown>>('@libs/ActiveClientManager'),
-    isClientTheLeader: jest.fn(() => true),
-}));
-
-const CHANNEL_NAME = `${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`;
-const ACTOR_ACCOUNT_ID = 123;
-const REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1001` as const;
-const PARENT_REPORT_NVP_KEY = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}1002` as const;
-const processingStatusEvent: EventData<typeof Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS> = {
-    updates: [REPORT_NVP_KEY, PARENT_REPORT_NVP_KEY].map((key) => ({
-        onyxMethod: 'merge',
-        key,
-        value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}},
-    })),
-};
-
-describe('Agent Zero processing status Pusher events', () => {
-    beforeAll(() => {
-        Onyx.init({keys: ONYXKEYS});
-    });
-
-    beforeEach(async () => {
-        jest.clearAllMocks();
-        jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(true);
-        await Onyx.clear();
-        await Onyx.merge(ONYXKEYS.SESSION, {accountID: 1, email: 'test@example.com'});
-        await Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, 42);
-        await waitForBatchedUpdates();
-        PusherHelper.setup();
-        subscribeToUserEvents(1, 'test@example.com', () => undefined, formatPhoneNumber, undefined);
-        await waitForBatchedUpdates();
-    });
-
-    afterEach(() => {
-        PusherHelper.teardown();
-        jest.restoreAllMocks();
-    });
-
-    it('sets and clears processing labels without advancing or recovering the reliable update stream', async () => {
-        // Given a subscribed client with a synchronization watermark
-        expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
-
-        // When temporary status updates arrive for a report and its parent
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        await waitForBatchedUpdates();
-
-        // Then both reports show the processing label
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
-        expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
-
-        // When the agent finishes and clears its processing labels
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
-            updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
-        });
-        await waitForBatchedUpdates();
-
-        // Then the labels clear without affecting the synchronization watermark or fetching catch-up updates
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
-        expect(await getOnyxValue(PARENT_REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
-        expect(await getOnyxValue(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT)).toBe(42);
-        expect(applyOnyxUpdatesReliably).not.toHaveBeenCalled();
-        expect(API.makeRequestWithSideEffects).not.toHaveBeenCalled();
-    });
-
-    it('applies new processing status after an older OpenApp response clears the indicator', async () => {
-        // Given an earlier OpenApp request is still applying its response
-        let finishRequest = () => {};
-        const currentRequest = new Promise<void>((resolve) => {
-            finishRequest = resolve;
-        });
-        jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
-
-        // When a new processing status arrives before that response completes
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        await waitForBatchedUpdates();
-
-        // Then the status waits for the earlier request
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
-
-        // When the older snapshot clears the indicator and finishes
-        await Onyx.merge(REPORT_NVP_KEY, {agentZeroProcessingRequestIndicator: null});
-        finishRequest();
-        await waitForBatchedUpdates();
-
-        // Then the new label survives the older response
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: 'Thinking...'}});
-    });
-
-    it('keeps a newer clear after status events arrive during different queued requests', async () => {
-        // Given two requests waiting in the real sequential queue
-        SequentialQueue.resetQueue();
-        let finishFirstRequest = () => {};
-        let finishSecondRequest = () => {};
-        const firstRequest = new Promise<void>((resolve) => {
-            finishFirstRequest = resolve;
-        });
-        const secondRequest = new Promise<void>((resolve) => {
-            finishSecondRequest = resolve;
-        });
-        const processSpy = jest.spyOn(RequestModule, 'processWithMiddleware').mockReturnValueOnce(firstRequest).mockReturnValueOnce(secondRequest);
-        await SequentialQueue.push({command: 'OpenApp'});
-        await waitForBatchedUpdates();
-        await SequentialQueue.push({command: 'ReadNewestAction'});
-        expect(processSpy).toHaveBeenCalledTimes(1);
-
-        // When a thinking label arrives during the first request and that request finishes
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        finishFirstRequest();
-        await waitForBatchedUpdates();
-
-        // Then the next request starts while the label is still waiting
-        expect(processSpy).toHaveBeenCalledTimes(2);
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
-
-        // When the clear arrives during the second request and the queue drains
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, {
-            updates: processingStatusEvent.updates.map((update) => ({...update, value: {agentZeroProcessingRequestIndicator: {[ACTOR_ACCOUNT_ID]: null}}})),
-        });
-        finishSecondRequest();
-        await waitForBatchedUpdates();
-
-        // Then the newer clear wins over the earlier thinking label
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toEqual({agentZeroProcessingRequestIndicator: {}});
-    });
-
-    it('ignores processing status events on a non-leader client', async () => {
-        // Given another client is responsible for updating shared Onyx data
-        jest.mocked(ActiveClientManager.isClientTheLeader).mockReturnValue(false);
-
-        // When a temporary processing status arrives
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        await waitForBatchedUpdates();
-
-        // Then this client leaves the report unchanged
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
-    });
-
-    it.each([undefined, 2])('ignores processing status from an earlier session after the account changes to %s', async (accountID) => {
-        // Given a status listener is waiting for the current account's API request
-        let finishRequest = () => {};
-        const currentRequest = new Promise<void>((resolve) => {
-            finishRequest = resolve;
-        });
-        jest.spyOn(SequentialQueue, 'getCurrentRequest').mockReturnValue(currentRequest);
-
-        // When a status arrives and the account signs out or changes before the request finishes
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        await Onyx.set(ONYXKEYS.SESSION, accountID ? {accountID} : null);
-        await waitForBatchedUpdates();
-        finishRequest();
-        await waitForBatchedUpdates();
-
-        // Then it cannot populate the new session's report data
-        expect(await getOnyxValue(REPORT_NVP_KEY)).toBeUndefined();
-    });
-
-    it('reports a failed local status update', async () => {
-        // Given Onyx cannot apply the temporary status update
-        jest.spyOn(Onyx, 'update').mockRejectedValueOnce(new Error('apply failed'));
-        const alertSpy = jest.spyOn(Log, 'alert');
-
-        // When a processing status arrives
-        Pusher.sendEvent(CHANNEL_NAME, Pusher.TYPE.AGENT_ZERO_PROCESSING_STATUS, processingStatusEvent);
-        await waitForBatchedUpdates();
-
-        // Then the failure is logged without an unhandled rejection or a synchronization recovery
-        expect(alertSpy).toHaveBeenCalledWith('[subscribeToUserEvents] Applying Agent Zero processing status failed', expect.objectContaining({error: 'apply failed'}));
-        expect(applyOnyxUpdatesReliably).not.toHaveBeenCalled();
-    });
-});

From fd6a6b3a202d091edc48c215ea6e1e08aeb72c9e Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Mon, 12 Oct 2026 19:31:53 +0200
Subject: [PATCH 495/781] Document why the parent action selector strips the
 reply counters

---
 src/selectors/ReportAction.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/selectors/ReportAction.ts b/src/selectors/ReportAction.ts
index 022eddec8ba6..e435076eecd5 100644
--- a/src/selectors/ReportAction.ts
+++ b/src/selectors/ReportAction.ts
@@ -146,6 +146,7 @@ type ThreadReplyCounterFields = 'childVisibleActionCount' | 'childCommenterCount
 
 type ReportActionWithoutThreadReplyCounters = Omit<ReportAction, ThreadReplyCounterFields>;
 
+/** Strips the reply counters, which change on every reply in the thread, so components that only show the parent message don't re-render for each reply. */
 function getParentReportActionWithoutThreadRepliesSelector(parentReportActions: OnyxEntry<ReportActions>, parentReportActionID?: string): ReportActionWithoutThreadReplyCounters | undefined {
     const parentReportAction = getParentReportActionSelector(parentReportActions, parentReportActionID);
     if (!parentReportAction) {

From c88657ba6b0b10c83c79c16aa414638dd484ea3c Mon Sep 17 00:00:00 2001
From: Sergei Sharabai <105950333+sharabai@users.noreply.github.com>
Date: Mon, 12 Oct 2026 20:07:26 +0200
Subject: [PATCH 496/781] Share the cartesian y axis and drop an unused barrel
 export

---
 .../tests/probes/plotBoundsProbeMain.tsx             | 11 ++---------
 .../Charts/BarChart/VerticalBarChartContent.tsx      | 12 ++----------
 src/components/Charts/LineChart/LineChartContent.tsx | 12 ++----------
 src/components/Charts/VictoryTheme.ts                |  8 ++++++++
 src/components/Charts/hooks/index.ts                 |  1 -
 src/components/Charts/utils/index.ts                 |  2 +-
 6 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx b/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
index 32b82d58e425..7fc9af2e003c 100644
--- a/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
+++ b/server/victory-chart-renderer/tests/probes/plotBoundsProbeMain.tsx
@@ -1,6 +1,6 @@
 import {VERTICAL_BAR_DOMAIN_PADDING} from '@components/Charts/barChartConstants';
 import {getCartesianPlotBounds} from '@components/Charts/utils';
-import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
+import VictoryTheme, {CARTESIAN_Y_AXIS, CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
 
 import type {ChartBounds} from 'victory-native';
 
@@ -34,14 +34,7 @@ const chartElement = (
             lineWidth: VictoryTheme.axis.xLineWidth,
             labelPosition: 'inset',
         }}
-        yAxis={[
-            {
-                tickCount: VictoryTheme.axis.tickCount,
-                axisSide: 'right',
-                lineWidth: 0,
-                labelOffset: VictoryTheme.axis.labelGap,
-            },
-        ]}
+        yAxis={[CARTESIAN_Y_AXIS]}
         frame={{lineWidth: 0}}
         data={DATA}
     >
diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index 713a72b22171..3abe5bbc735d 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -15,7 +15,7 @@ import {
     useReadyCartesianCanvas,
 } from '@components/Charts/hooks';
 import {getBarLayout, getCartesianPlotBounds, getXAxisLabel, getYAxisLabelWidth} from '@components/Charts/utils';
-import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
+import VictoryTheme, {CARTESIAN_Y_AXIS, CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
 
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -227,15 +227,7 @@ function VerticalBarChartCanvas({data, yAxisUnit, yAxisUnitPosition = 'left', on
                         // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
                         labelPosition: 'inset',
                     }}
-                    yAxis={[
-                        {
-                            tickCount: VictoryTheme.axis.tickCount,
-                            axisSide: 'right',
-                            lineWidth: 0,
-                            labelOffset: VictoryTheme.axis.labelGap,
-                            domain: yAxisDomain,
-                        },
-                    ]}
+                    yAxis={[{...CARTESIAN_Y_AXIS, domain: yAxisDomain}]}
                     frame={{lineWidth: 0}}
                     data={chartData}
                 >
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index c5bd5165a838..90b64309f566 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -17,7 +17,7 @@ import {
     useReadyCartesianCanvas,
 } from '@components/Charts/hooks';
 import {getCartesianPlotBounds, getDomainPaddingForEdgeSpace, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
-import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45} from '@components/Charts/VictoryTheme';
+import VictoryTheme, {CARTESIAN_Y_AXIS, CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45} from '@components/Charts/VictoryTheme';
 
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -290,15 +290,7 @@ function LineChartCanvas({data, yAxisUnit, yAxisUnitPosition = 'left', onPointPr
                         // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
                         labelPosition: 'inset',
                     }}
-                    yAxis={[
-                        {
-                            tickCount: VictoryTheme.axis.tickCount,
-                            axisSide: 'right',
-                            lineWidth: 0,
-                            labelOffset: VictoryTheme.axis.labelGap,
-                            domain: yAxisDomain,
-                        },
-                    ]}
+                    yAxis={[{...CARTESIAN_Y_AXIS, domain: yAxisDomain}]}
                     frame={{lineWidth: 0}}
                     data={chartData}
                 >
diff --git a/src/components/Charts/VictoryTheme.ts b/src/components/Charts/VictoryTheme.ts
index ae1366c61bf7..c0a0b93a1960 100644
--- a/src/components/Charts/VictoryTheme.ts
+++ b/src/components/Charts/VictoryTheme.ts
@@ -91,6 +91,13 @@ const VictoryTheme = {
     },
 } as const;
 
+const CARTESIAN_Y_AXIS = {
+    tickCount: VictoryTheme.axis.tickCount,
+    axisSide: 'right',
+    lineWidth: 0,
+    labelOffset: VictoryTheme.axis.labelGap,
+} as const;
+
 /** Minimum height for the chart content area (bars, Y-axis, grid lines) */
 const CHART_CONTENT_MIN_HEIGHT = 250;
 
@@ -131,6 +138,7 @@ const DASH_INTERVALS = [4, 8];
 const GLYPH_PADDING = 4;
 
 export {
+    CARTESIAN_Y_AXIS,
     CHART_CONTENT_MIN_HEIGHT,
     CHART_Y_SCALE_HEIGHT,
     LABEL_ROTATIONS,
diff --git a/src/components/Charts/hooks/index.ts b/src/components/Charts/hooks/index.ts
index e7b098c98e74..8643968bcabd 100644
--- a/src/components/Charts/hooks/index.ts
+++ b/src/components/Charts/hooks/index.ts
@@ -1,7 +1,6 @@
 export {default as useChartLabelLayout} from './useChartLabelLayout';
 export {default as useChartLabelMeasurements} from './useChartLabelMeasurements';
 export {default as useChartParagraphs} from './useChartParagraphs';
-export {useChartFontManager} from '@components/Charts/context/ChartFontsContext';
 export {default as ChartFontsProvider} from '@components/Charts/context/ChartFontsProvider';
 export {useChartInteractions, TOOLTIP_BAR_GAP} from './useChartInteractions';
 export type {HitTestArgs, ResolveTargetIndexArgs} from './useChartInteractions';
diff --git a/src/components/Charts/utils/index.ts b/src/components/Charts/utils/index.ts
index 64af6dbac027..453071bb35e1 100644
--- a/src/components/Charts/utils/index.ts
+++ b/src/components/Charts/utils/index.ts
@@ -446,7 +446,7 @@ function getBarLayout(plotWidth: number, barCount: number): {barWidth: number; g
 }
 
 /**
- * Horizontal plot bounds of a cartesian chart with its y axis on the right, mirroring victory-native's layout,
+ * Horizontal plot bounds of a cartesian chart whose y axis is `CARTESIAN_Y_AXIS`, mirroring victory-native's layout,
  * so labels can be laid out from the width before the chart mounts.
  */
 function getCartesianPlotBounds(chartWidth: number, paddingRight: number): {left: number; right: number; width: number} {

From 0ed3866870101c95a3d29ddab5337cabed14129b Mon Sep 17 00:00:00 2001
From: Issa Nimaga <inimaga@expensify.com>
Date: Mon, 12 Oct 2026 19:23:26 +0100
Subject: [PATCH 497/781] Mock API requests in picker autofocus tests

---
 tests/unit/CategoryTagPickerAutoFocusTest.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/CategoryTagPickerAutoFocusTest.tsx b/tests/unit/CategoryTagPickerAutoFocusTest.tsx
index 9f9e7631abe5..f7f1a8e8dbb9 100644
--- a/tests/unit/CategoryTagPickerAutoFocusTest.tsx
+++ b/tests/unit/CategoryTagPickerAutoFocusTest.tsx
@@ -22,6 +22,8 @@ import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'
  * runs through `useFocusEffect` + a `setTimeout` racing the popover animation, which is verified on device.
  */
 
+jest.mock('@libs/API');
+
 // Capture the props the pickers pass down to SelectionList so we can assert on `textInputOptions.disableAutoFocus`.
 // Prefix `mock` so jest allows the variable inside the factory below.
 const mockSelectionList = jest.fn<null, [SelectionListWithSectionsProps<ListItem>]>(() => null);

From ad9c97fc0d7ffe8bb8a07d5dcc2ad6620df0f8dc Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Mon, 12 Oct 2026 23:49:33 +0200
Subject: [PATCH 498/781] Restore native selection for report field inputs

---
 src/components/DatePicker/index.tsx           |  2 -
 .../MoneyRequestViewReportFields.tsx          | 12 +----
 .../ReportFieldInlineInput.tsx                |  9 +---
 src/libs/SelectionScraper/index.ts            | 22 +++------
 tests/ui/MoneyReportViewTest.tsx              | 28 +++--------
 tests/unit/SelectionScraperTest.ts            | 47 -------------------
 6 files changed, 16 insertions(+), 104 deletions(-)

diff --git a/src/components/DatePicker/index.tsx b/src/components/DatePicker/index.tsx
index 35b65d81d5a7..be80fde9d11f 100644
--- a/src/components/DatePicker/index.tsx
+++ b/src/components/DatePicker/index.tsx
@@ -56,7 +56,6 @@ function DatePicker({
     shouldHideCalendarIcon = false,
     shouldEnableMonthYearBackdropInNarrowPane = false,
     textInputContainerStyles,
-    dataSet,
 }: DateInputWithPickerProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Calendar']);
     const styles = useThemeStyles();
@@ -248,7 +247,6 @@ function DatePicker({
                     role={CONST.ROLE.COMBOBOX}
                     accessibilityState={{expanded: isModalVisible}}
                     value={selectedDate}
-                    dataSet={dataSet}
                     placeholder={placeholder ?? translate('common.dateFormat')}
                     errorText={errorText}
                     inputStyle={styles.pointerEventsNone}
diff --git a/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx b/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
index 852c09980a15..ca56c843825d 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx
@@ -13,7 +13,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {clearReportFieldKeyErrors, deleteReportField} from '@libs/actions/Report';
 import {resolveReportFieldValue} from '@libs/Formula';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import getPlatform from '@libs/getPlatform';
 import {
     getFieldViolation,
     getFieldViolationTranslation,
@@ -24,7 +23,6 @@ import {
     shouldDisplayReportFields as shouldDisplayReportFieldsUtils,
     shouldHideSingleReportField,
 } from '@libs/ReportUtils';
-import {COPYABLE_ROW_CONTINUATION_DATA_SET} from '@libs/SelectionScraper';
 
 import type {ThemeStyles} from '@styles/index';
 
@@ -79,7 +77,6 @@ function ReportFieldView(
     styles: ThemeStyles,
     onSaveValue: (reportField: PolicyReportField, value: string) => void,
     onDelete: (reportField: EnrichedPolicyReportField) => Promise<void>,
-    shouldMarkValueAsCopyable: boolean,
     pendingAction?: PendingAction,
 ) {
     return (
@@ -101,7 +98,6 @@ function ReportFieldView(
                     value={reportField.fieldValue}
                     isDisabled={reportField.isFieldDisabled}
                     errorText={reportField.violationTranslation}
-                    isCopyable={shouldMarkValueAsCopyable && !!reportField.fieldValue}
                     fieldList={policy?.fieldList}
                     onSaveValue={(value) => onSaveValue(reportField, value)}
                     onDelete={
@@ -125,7 +121,6 @@ function MoneyRequestViewReportFields({report, policy, pendingAction, style, sho
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(report?.reportID)}`);
     const {getCurrencyDecimals} = useCurrencyListActions();
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
-    const shouldUseCopyableRowContinuation = getPlatform(true) === CONST.PLATFORM.WEB;
     const {translate} = useLocalize();
     const {showConfirmModal} = useConfirmModal();
 
@@ -195,10 +190,7 @@ function MoneyRequestViewReportFields({report, policy, pendingAction, style, sho
     }
 
     return (
-        <View
-            style={[styles.ph5, styles.mb3, styles.gap3, style]}
-            dataSet={shouldUseCopyableRowContinuation ? COPYABLE_ROW_CONTINUATION_DATA_SET : undefined}
-        >
+        <View style={[styles.ph5, styles.mb3, styles.gap3, style]}>
             {fieldRows.map((fieldRow) => {
                 const rowKey = `reportFieldRow-${fieldRow.at(0)?.fieldKey}`;
 
@@ -210,7 +202,7 @@ function MoneyRequestViewReportFields({report, policy, pendingAction, style, sho
                         // message grows downwards instead of stretching the cells beside it and shifting their inputs.
                         style={[styles.flexRow, styles.gap3, styles.alignItemsStart]}
                     >
-                        {fieldRow.map((reportField) => ReportFieldView(reportField, report, policy, styles, saveReportField, deleteField, shouldUseCopyableRowContinuation, pendingAction))}
+                        {fieldRow.map((reportField) => ReportFieldView(reportField, report, policy, styles, saveReportField, deleteField, pendingAction))}
                         {/* A partly filled last row is padded out so its fields stay the same width as the rows above it. */}
                         {Array.from({length: columnCount - fieldRow.length}, (_unused, index) => (
                             <View
diff --git a/src/components/MoneyRequestReportView/ReportFieldInlineInput.tsx b/src/components/MoneyRequestReportView/ReportFieldInlineInput.tsx
index 0cd56a53f1d9..fdfbe35818c8 100644
--- a/src/components/MoneyRequestReportView/ReportFieldInlineInput.tsx
+++ b/src/components/MoneyRequestReportView/ReportFieldInlineInput.tsx
@@ -22,7 +22,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {hasCircularReferences} from '@libs/Formula';
 import type {FieldList} from '@libs/Formula';
-import {COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
 import StringUtils from '@libs/StringUtils';
 
 import EditReportFieldDropdown from '@pages/EditReportFieldDropdown';
@@ -48,9 +47,6 @@ type ReportFieldInlineInputProps = {
     /** Whether the current user is allowed to change the value */
     isDisabled: boolean;
 
-    /** Whether the displayed value should be included when scraping a browser selection */
-    isCopyable?: boolean;
-
     /** Message shown under the input, for example a field violation */
     errorText?: string;
 
@@ -66,7 +62,7 @@ type ReportFieldInlineInputProps = {
     onDelete?: () => void;
 };
 
-function ReportFieldInlineInput({reportField, fieldKey, value, isDisabled, isCopyable, errorText, fieldList, onSaveValue, onDelete}: ReportFieldInlineInputProps) {
+function ReportFieldInlineInput({reportField, fieldKey, value, isDisabled, errorText, fieldList, onSaveValue, onDelete}: ReportFieldInlineInputProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -179,7 +175,6 @@ function ReportFieldInlineInput({reportField, fieldKey, value, isDisabled, isCop
                 label={label}
                 accessibilityLabel={label}
                 value={value}
-                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
                 errorText={errorText}
                 minDate={CONST.CALENDAR_PICKER.MIN_DATE}
                 maxDate={CONST.CALENDAR_PICKER.MAX_DATE}
@@ -266,7 +261,6 @@ function ReportFieldInlineInput({reportField, fieldKey, value, isDisabled, isCop
                                 role={CONST.ROLE.COMBOBOX}
                                 accessibilityState={{expanded: isExpanded}}
                                 value={value}
-                                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
                                 errorText={errorText}
                                 inputStyle={styles.pointerEventsNone}
                                 icon={icons.DownArrow}
@@ -296,7 +290,6 @@ function ReportFieldInlineInput({reportField, fieldKey, value, isDisabled, isCop
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
             value={isReadOnly ? value : draftValue}
-            dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
             errorText={validationError || errorText}
             disabled={isReadOnly}
             onChangeText={setDraftValue}
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 34fdb495cada..01d7ec6c5c29 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -22,20 +22,7 @@ const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 const copyableRowContinuationAttribute = `data-${CONST.COPYABLE_ROW_CONTINUATION_ELEMENT}`;
 const COPYABLE_ROW_CONTINUATION_DATA_SET = {...COPYABLE_ROW_DATA_SET, [CONST.COPYABLE_ROW_CONTINUATION_ELEMENT]: true} as const;
 
-function normalizeCopyableText(text: string): string {
-    return text.trim().replaceAll(/[\t\n\r ]+/g, ' ');
-}
-
-function isTextValueElement(element: globalThis.Element): element is HTMLInputElement | HTMLTextAreaElement {
-    return element instanceof globalThis.HTMLInputElement || element instanceof globalThis.HTMLTextAreaElement;
-}
-
 function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
-    // Form control values are properties rather than text nodes, so Range#toString cannot read them.
-    if (isTextValueElement(element)) {
-        return normalizeCopyableText(element.value);
-    }
-
     const elementRange = document.createRange();
     elementRange.selectNodeContents(element);
     const selectedText: string[] = [];
@@ -55,7 +42,10 @@ function getCopyableElementText(element: globalThis.Element, selection: Selectio
         selectedText.push(intersectionRange.toString());
     }
 
-    return normalizeCopyableText(selectedText.join(' '));
+    return selectedText
+        .join(' ')
+        .trim()
+        .replaceAll(/[\t\n\r ]+/g, ' ');
 }
 
 function replaceElementContentWithLines(element: globalThis.Element, lines: Array<{row: globalThis.Element; text: string}>) {
@@ -174,8 +164,8 @@ function getHTMLOfSelectedCopyableRows(selection: Selection): string {
         }
     }
 
-    const selectedCopyableElements = Array.from(selectedCopyableElementsByRow.values()).flatMap((copyableElements) => Array.from(copyableElements));
-    if (selectedCopyableElements.length <= 1 && !selectedCopyableElements.some(isTextValueElement)) {
+    const selectedCopyableElementCount = Array.from(selectedCopyableElementsByRow.values()).reduce((count, copyableElements) => count + copyableElements.size, 0);
+    if (selectedCopyableElementCount <= 1) {
         // Single-cell selections should preserve the browser's exact selected text instead of forcing full-cell output.
         return '';
     }
diff --git a/tests/ui/MoneyReportViewTest.tsx b/tests/ui/MoneyReportViewTest.tsx
index fcd18ed1cdda..a083c77c75fa 100644
--- a/tests/ui/MoneyReportViewTest.tsx
+++ b/tests/ui/MoneyReportViewTest.tsx
@@ -4,9 +4,6 @@ import ComposeProviders from '@components/ComposeProviders';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
 
-import getPlatform from '@libs/getPlatform';
-import {COPYABLE_ROW_CONTINUATION_DATA_SET, COPYABLE_TEXT_DATA_SET} from '@libs/SelectionScraper';
-
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
 
 import CONST from '@src/CONST';
@@ -51,8 +48,6 @@ jest.mock('@hooks/useScreenWrapperTransitionStatus', () => ({
     }),
 }));
 
-jest.mock('@libs/getPlatform', () => jest.fn());
-
 jest.mock('@react-navigation/native', () => ({
     ...((): typeof NativeNavigation => jest.requireActual('@react-navigation/native'))(),
     useNavigation: jest.fn(() => ({navigate: jest.fn(), addListener: jest.fn(() => jest.fn())})),
@@ -67,8 +62,6 @@ jest.mock('@pages/inbox/report/AnimatedEmptyStateBackground', () => {
 
 TestHelper.setupGlobalFetchMock();
 
-const mockedGetPlatform = jest.mocked(getPlatform);
-
 const policyID = 'policy_mrv_breakdown';
 const reportID = 'report_mrv_breakdown';
 
@@ -324,7 +317,7 @@ describe('MoneyReportView report fields visibility', () => {
         orderWeight: 2,
         deletable: true,
         defaultValue: '',
-        value: 'Copyable field value',
+        value: '1',
         values: [],
         keys: [],
         externalIDs: [],
@@ -356,20 +349,15 @@ describe('MoneyReportView report fields visibility', () => {
         initOnyxDerivedValues();
     });
 
-    beforeEach(() => {
-        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.MOBILE_WEB);
-    });
-
     afterEach(async () => {
         await act(async () => {
             await Onyx.clear();
         });
     });
 
-    it('keeps a custom report field visible and copyable for a non-admin submitter after approval (single-expense combined view)', async () => {
+    it('keeps a custom report field visible for a non-admin submitter after the report is approved (single-expense combined view)', async () => {
         // Given an approved report with a custom field, viewed by its non-admin submitter, who cannot edit a field
         // once the report has been approved
-        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
         const fieldList = {
             [CONST.REPORT_FIELD_TITLE_FIELD_ID]: buildTitleField(),
             [customFieldKey]: buildCustomTextField(),
@@ -382,17 +370,15 @@ describe('MoneyReportView report fields visibility', () => {
         });
         await seedReportFieldsPolicy(policy, approvedReport);
 
-        // When the report is rendered in the single-expense combined view
+        // When the combined view is rendered
         renderMoneyReportView(approvedReport, policy, true);
         await waitForBatchedUpdatesWithAct();
 
-        // Then the read-only inline field stays visible and its value is marked for desktop-web selection scraping
+        // Then the field is still on the screen, because a submitter who can no longer change a value still needs to
+        // read it. It is looked up by its label since it is a read-only inline input now rather than a row that opens
+        // the report field editor
         await waitFor(() => {
-            const fieldInput = screen.getByLabelText('Test');
-            expect(fieldInput).toBeOnTheScreen();
-            expect(fieldInput).toHaveProp('value', 'Copyable field value');
-            expect(fieldInput).toHaveProp('dataSet', expect.objectContaining(COPYABLE_TEXT_DATA_SET));
-            expect(screen.UNSAFE_getAllByProps({dataSet: COPYABLE_ROW_CONTINUATION_DATA_SET}).length).toBeGreaterThan(0);
+            expect(screen.getByLabelText('Test')).toBeOnTheScreen();
         });
     });
 
diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
index 61e760475d9e..d77e1a728cda 100644
--- a/tests/unit/SelectionScraperTest.ts
+++ b/tests/unit/SelectionScraperTest.ts
@@ -117,53 +117,6 @@ describe('SelectionScraper', () => {
         expect(SelectionScraper.getCurrentSelection()).toBe('123');
     });
 
-    it('copies the current values of selected form controls', () => {
-        // Given marked inputs whose values are properties rather than DOM text nodes
-        const fixture = createFixture(`
-            <div ${copyableRowAttribute}="true">
-                <input id="text-field" ${copyableTextAttribute}="true">
-                <textarea id="multiline-field" ${copyableTextAttribute}="true"></textarea>
-            </div>
-        `);
-        const textField = fixture.querySelector<HTMLInputElement>('#text-field');
-        const multilineField = fixture.querySelector<HTMLTextAreaElement>('#multiline-field');
-        if (!textField || !multilineField) {
-            throw new Error('Missing form controls');
-        }
-        textField.value = 'Copyable field value';
-        multilineField.value = 'Second\n field value';
-
-        // When the selection includes both controls
-        const range = document.createRange();
-        range.selectNodeContents(fixture);
-        const selection = window.getSelection();
-        selection?.removeAllRanges();
-        selection?.addRange(range);
-
-        // Then the scraper uses their current values and normalizes whitespace
-        expect(SelectionScraper.getCurrentSelection()).toBe('Copyable field value Second field value');
-    });
-
-    it('copies a single selected form control value', () => {
-        // Given one marked input with no text node
-        const fixture = createFixture(`<div ${copyableRowAttribute}="true"><input id="single-field" ${copyableTextAttribute}="true"></div>`);
-        const input = fixture.querySelector<HTMLInputElement>('#single-field');
-        if (!input) {
-            throw new Error('Missing form control');
-        }
-        input.value = 'Only field value';
-
-        // When the input itself is selected as part of a page selection
-        const range = document.createRange();
-        range.selectNode(input);
-        const selection = window.getSelection();
-        selection?.removeAllRanges();
-        selection?.addRange(range);
-
-        // Then it does not fall back to generic scraping, which cannot read input values
-        expect(SelectionScraper.getCurrentSelection()).toBe('Only field value');
-    });
-
     it.each([
         {startOffset: 0, endOffset: 11, expectedText: 'Ann Manager'},
         {startOffset: 0, endOffset: 3, expectedText: 'Ann'},

From 5254375e5ab738b9327cae13e0489a87edcb608e Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Mon, 12 Oct 2026 14:54:55 -0700
Subject: [PATCH 499/781] docs(ai-agents): lowercase agent terms and drop
 Bill.com per review

---
 .../ai-agents/AI-Agent-Capabilities.md        | 24 ++++++++++---------
 .../ai-agents/AI-Agent-Triggers.md            | 12 ++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
index ac5be2673f59..4bb9b13535a7 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
@@ -1,11 +1,13 @@
 ---
 title: Agent Capability Reference
-description: Every action your Agent can take, with ready-to-copy instruction phrases and disambiguation notes to avoid common mis-routings.
+description: Every action your agent can take, with ready-to-copy instruction phrases and disambiguation notes to avoid common mis-routings.
 keywords: [Custom Agent, Agent, agent capabilities, agent actions, submit report, approve report, reject report, add comment, analyze expenses, agent instructions, workspace automation, Expensify automation, Rulebot, rule bot]
-internalScope: Audience is all members configuring Agents. Covers all supported ManageReport sub-actions, AddComment, and AnalyzeExpenses. Does not cover read-only report context or NoResponse behavior.
+internalScope: Audience is all members configuring agents. Covers all supported ManageReport sub-actions, AddComment, and AnalyzeExpenses. Does not cover read-only report context or NoResponse behavior.
+contentType: topic
+order: 8
 ---
 
-An Agent acts on expense reports using the actions described below. This reference helps you phrase your instructions so your agent reliably does what you intend — and doesn't accidentally take the wrong action.
+An agent acts on expense reports using the actions described below. This reference helps you phrase your instructions so your agent reliably does what you intend — and doesn't accidentally take the wrong action.
 
 # Agent Capability Reference
 
@@ -52,7 +54,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that unapprove expense reports
 
-**Goal:** Undoes the approval of an Approved expense report so it can be reviewed and approved again. The report returns to Outstanding (submitted), or to Draft if the submitter approved it themselves or the workspace uses Bill.com. Requires Workspace Admin role, unless the agent is the approver who gave the final approval. On a workspace that uses Dynamic External Workflow approvals, only a Workspace Admin can unapprove. A report that has already been paid through Expensify cannot be unapproved.
+**Goal:** Undoes the approval of an Approved expense report so it can be reviewed and approved again. The report returns to Outstanding (submitted), or to Draft if the submitter approved it themselves. Requires workspace admin role, unless the agent is the approver who gave the final approval. On a workspace that uses Dynamic External Workflow approvals, only a workspace admin can unapprove. A report that has already been paid through Expensify cannot be unapproved.
 
 To accomplish this, include phrases like:
 - Unapprove reports over $10,000
@@ -102,7 +104,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that take over a report as approver
 
-**Goal:** Reassigns the agent as the current approver on a report that was routed to someone else, giving the agent the authority to approve or reject it. Requires Workspace Admin role.
+**Goal:** Reassigns the agent as the current approver on a report that was routed to someone else, giving the agent the authority to approve or reject it. Requires workspace admin role.
 
 To accomplish this, include phrases like:
 - Take over reports over $10,000 regardless of who they were submitted to
@@ -114,7 +116,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that route reports to a specific approver
 
-**Goal:** Routes a submitted report to a specific approver by email, replacing the current approver in the workflow. Requires Workspace Admin role.
+**Goal:** Routes a submitted report to a specific approver by email, replacing the current approver in the workflow. Requires workspace admin role.
 
 To accomplish this, include phrases like:
 - Route reports over $5,000 to the finance manager
@@ -150,7 +152,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that export reports to accounting
 
-**Goal:** Exports a report to the workspace's connected accounting integration (QuickBooks, Xero, NetSuite, Sage Intacct, etc.), or marks it as manually exported. Works for expense reports, invoices, and bills. Requires Workspace Admin role, except that the report's current approver (its manager) can export a report submitted to them, and an invoice's owner can export their own invoice.
+**Goal:** Exports a report to the workspace's connected accounting integration (QuickBooks, Xero, NetSuite, Sage Intacct, etc.), or marks it as manually exported. Works for expense reports, invoices, and bills. Requires workspace admin role, except that the report's current approver (its manager) can export a report submitted to them, and an invoice's owner can export their own invoice.
 
 To accomplish this, include phrases like:
 - Export this report to QuickBooks
@@ -187,7 +189,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that delete expense reports
 
-**Goal:** Deletes an unsubmitted expense report the requester owns, after they confirm the deletion. Only OPEN or draft reports can be deleted — a report that has been submitted, approved, reimbursed, or closed cannot be. Deleting an expense rather than a whole report is handled by EditExpense.
+**Goal:** Deletes an unsubmitted expense report the requester owns, after they confirm the deletion. Only draft reports can be deleted — a report that has been submitted, approved, reimbursed, or closed cannot be. Deleting an individual expense rather than a whole report is covered by the edit-expenses capability.
 
 To accomplish this, include phrases like:
 - Delete this report
@@ -246,7 +248,7 @@ To accomplish this, include phrases like:
 To accomplish this, include phrases like:
 - Send each employee a reminder to submit their expenses at the end of the month
 - Message the submitter directly when their report is rejected
-- Notify individual workspace members of a policy change
+- Notify individual workspace members of an expense policy change
 - DM each person with outstanding reports a personalized nudge
 - Send a private message to the submitter when a receipt is missing
 - Reach out to each team member individually with their spending summary
@@ -292,7 +294,7 @@ To accomplish this, include phrases like:
 
 ## How to write instructions that manage workspace settings and members
 
-**Goal:** Inspects Workspace configuration, answers membership questions, reads the Expensify Card limit and remaining spend for anyone allowed to see the Expensify Card, and — for Workspace Admins — adds or removes members, lists and assigns company cards from a connected card feed, and modifies workspace settings such as categories and approval rules.
+**Goal:** Inspects workspace configuration, answers membership questions, reads the Expensify Card limit and remaining spend for anyone allowed to see the Expensify Card, and — for workspace admins — adds or removes members, lists and assigns company cards from a connected card feed, and modifies workspace settings such as categories and approval rules.
 
 To accomplish this, include phrases like:
 - Add new employees to the workspace when they join
@@ -320,4 +322,4 @@ To accomplish this, include phrases like:
 
 ---
 
-*This reference covers all 24 AI Agent capabilities.*
+*This reference covers all 24 AI agent capabilities.*
diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
index 3957bb92277c..4481d01a8a34 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
@@ -1,11 +1,13 @@
 ---
 title: Agent Trigger Reference
-description: Every event your Agent can react to, with ready-to-copy instruction phrases for your agent's prompt.
+description: Every event your agent can react to, with ready-to-copy instruction phrases for your agent's prompt.
 keywords: [Custom Agent, Agent, agent triggers, report_activity, agent instructions, expense report events, workspace automation, when to trigger agent, report submitted, report approved, Expensify automation]
-internalScope: Audience is workspace admins configuring Agents. Covers all expose-level report_activity events. Does not cover chat message triggers or report-received triggers.
+internalScope: Audience is workspace admins configuring agents. Covers all expose-level report_activity events. Does not cover chat message triggers or report-received triggers.
+contentType: topic
+order: 9
 ---
 
-An Agent reacts to expense report events when its instructions match what happened. This reference lists every event your agent can respond to, along with example phrases you can paste directly into your prompt.
+An agent reacts to expense report events when its instructions match what happened. This reference lists every event your agent can respond to, along with example phrases you can paste directly into your prompt.
 
 # Agent Trigger Reference
 
@@ -348,7 +350,7 @@ To react to this event, include phrases like:
 To react to this event, include phrases like:
 - When someone leaves a comment or message in a report
 - When a user asks a question or leaves a note in the conversation
-- When someone @mentions an Agent in a report
+- When someone @mentions an agent in a report
 
 **An approver at an intermediate step in a multi-level approval chain approved the expense report and forwarded it to the next approver.**
 
@@ -924,4 +926,4 @@ To react to this event, include phrases like:
 
 ---
 
-*This reference covers all 127 events AI Agents can react to.*
+*This reference covers all 127 events AI agents can react to.*

From bcb9f88fcad580cf874f6fef6a4d1bbc58445406 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 22:19:43 +0000
Subject: [PATCH 500/781] Always open the vacation delegate form from the row,
 show a clear button on the date input, and align it with the calendar icon

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/components/DatePicker/index.tsx                | 12 ++++++++----
 src/components/DatePicker/types.ts                 | 14 --------------
 src/components/VacationDelegateForm.tsx            |  4 +---
 .../domain/Members/DomainMemberDetailsPage.tsx     |  8 +-------
 .../Members/DomainMemberVacationDelegatePage.tsx   |  4 +++-
 .../Profile/CustomStatus/VacationDelegatePage.tsx  |  4 +++-
 src/pages/settings/Profile/ProfilePage.tsx         |  6 ++----
 tests/ui/ProfilePageTest.tsx                       |  7 ++++---
 8 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/components/DatePicker/index.tsx b/src/components/DatePicker/index.tsx
index c4ea4f0acaa9..ae326cf81c2d 100644
--- a/src/components/DatePicker/index.tsx
+++ b/src/components/DatePicker/index.tsx
@@ -5,6 +5,7 @@ import useAccessibilityAnnouncement from '@hooks/useAccessibilityAnnouncement';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
@@ -52,12 +53,14 @@ function DatePicker({
     rightHandSideComponent,
     onPickerVisibilityChange,
     shouldHideCalendarIcon = false,
-    shouldKeepCalendarIconWhenSelected = false,
-    shouldForceActiveLabel = true,
     icon,
 }: DateInputWithPickerProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Calendar']);
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    // The clear button takes the calendar icon's place once a date is picked, so it gets the same horizontal padding as the icon's
+    // container instead of its own margins. Otherwise the X sits in a different spot than the icon it replaces.
+    const {paddingHorizontal: iconPaddingHorizontal} = StyleUtils.getTextInputIconContainerStyles(true);
     const {windowHeight, windowWidth} = useWindowDimensions();
     const {translate} = useLocalize();
 
@@ -236,8 +239,8 @@ function DatePicker({
                 <TextInput
                     ref={combinedTextInputRef}
                     inputID={inputID}
-                    forceActiveLabel={shouldForceActiveLabel}
-                    icon={(selectedDate && !shouldKeepCalendarIconWhenSelected) || shouldHideCalendarIcon ? null : (icon ?? icons.Calendar)}
+                    forceActiveLabel
+                    icon={selectedDate || shouldHideCalendarIcon ? null : (icon ?? icons.Calendar)}
                     iconContainerStyle={styles.pr0}
                     label={label}
                     accessibilityLabel={label}
@@ -255,6 +258,7 @@ function DatePicker({
                     textInputContainerStyles={isModalVisible ? styles.borderColorFocus : {}}
                     shouldHideClearButton={shouldHideClearButton}
                     onClearInput={handleClear}
+                    clearButtonStyle={[styles.mh0, {paddingHorizontal: iconPaddingHorizontal}]}
                     forwardedFSClass={forwardedFSClass}
                     autoComplete={autoComplete}
                     disableKeyboard
diff --git a/src/components/DatePicker/types.ts b/src/components/DatePicker/types.ts
index 992ab8e202ef..8f54da70932f 100644
--- a/src/components/DatePicker/types.ts
+++ b/src/components/DatePicker/types.ts
@@ -82,20 +82,6 @@ type DateInputWithPickerProps = DatePickerBaseProps &
          * @default false
          */
         shouldHideCalendarIcon?: boolean;
-
-        /**
-         * Keeps the trailing calendar icon once a date is picked, instead of leaving that space to the clear button.
-         * Pair it with `shouldHideClearButton` when the date should only be changed through the picker.
-         * @default false
-         */
-        shouldKeepCalendarIconWhenSelected?: boolean;
-
-        /**
-         * Keeps the label above the input even when it is empty and not focused, so the date format placeholder always shows.
-         * Pass `false` to let the empty label sit inside the input, like a regular text input.
-         * @default true
-         */
-        shouldForceActiveLabel?: boolean;
     };
 
 type DatePickerProps = {
diff --git a/src/components/VacationDelegateForm.tsx b/src/components/VacationDelegateForm.tsx
index 00b1afebeb4f..177712b6ec22 100644
--- a/src/components/VacationDelegateForm.tsx
+++ b/src/components/VacationDelegateForm.tsx
@@ -163,7 +163,7 @@ function VacationDelegateForm({
                 shouldHideOnDelete={false}
             >
                 <View style={styles.ph5}>
-                    {/* The date can only be changed through the picker, so it keeps its icon and has no clear button, as in the mockups.
+                    {/* Shows the calendar icon while empty and the clear button once a date is picked, so the delegate can go back to never clearing.
                         The earliest day is today in the form's timezone, so it matches the validation even when the device is in another timezone. */}
                     <InputWrapper
                         InputComponent={DatePicker}
@@ -172,8 +172,6 @@ function VacationDelegateForm({
                         defaultValue={savedClearDate}
                         minDate={getLocalDateFromDatetime(undefined, timezone)}
                         icon={icons.CalendarSolid}
-                        shouldKeepCalendarIconWhenSelected
-                        shouldHideClearButton
                         shouldSaveDraft
                     />
                 </View>
diff --git a/src/pages/domain/Members/DomainMemberDetailsPage.tsx b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
index 703c34871809..b012ff301f7b 100644
--- a/src/pages/domain/Members/DomainMemberDetailsPage.tsx
+++ b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
@@ -25,7 +25,6 @@ import {
 import {clearDraftValues} from '@libs/actions/FormActions';
 import {requestUnlockAccount} from '@libs/actions/User';
 import {getLatestError} from '@libs/ErrorUtils';
-import {getActiveVacationDelegate} from '@libs/VacationDelegateUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -170,12 +169,7 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
                     timezone={personalDetails?.timezone?.selected}
                     onPress={() => {
                         clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
-                        // With no delegate there is nothing to show on the form yet, so go straight to picking one.
-                        Navigation.navigate(
-                            getActiveVacationDelegate(vacationDelegate)
-                                ? ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID)
-                                : ROUTES.DOMAIN_VACATION_DELEGATE_SELECT.getRoute(domainAccountID, accountID),
-                        );
+                        Navigation.navigate(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(domainAccountID, accountID));
                     }}
                     pendingAction={domainPendingActions?.member?.[memberLogin]?.vacationDelegate}
                     errors={getLatestError(domainErrors?.memberErrors?.[memberLogin]?.vacationDelegateErrors)}
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
index d6f12b826966..90e2ec7c8b05 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
@@ -8,6 +8,7 @@ import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import {setDraftValues} from '@libs/actions/FormActions';
 import Navigation from '@libs/Navigation/Navigation';
+import {getActiveVacationDelegate} from '@libs/VacationDelegateUtils';
 
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -71,7 +72,8 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
                 testID="DomainMemberVacationDelegate"
             >
                 <BaseVacationDelegateSelectionComponent
-                    vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
+                    // An expired delegate reads as no delegate everywhere else, so it must not show up preselected here either
+                    vacationDelegate={{...vacationDelegate, delegate: draftDelegate ?? getActiveVacationDelegate(vacationDelegate)}}
                     headerTitle={translate('statusPage.vacationDelegate.chooseDelegate')}
                     onSelectRow={onSelectRow}
                     onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
index 73e269f378ed..305c1e8d1f46 100644
--- a/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx
@@ -6,6 +6,7 @@ import useOnyx from '@hooks/useOnyx';
 
 import {setDraftValues} from '@libs/actions/FormActions';
 import Navigation from '@libs/Navigation/Navigation';
+import {getActiveVacationDelegate} from '@libs/VacationDelegateUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -52,7 +53,8 @@ function VacationDelegatePage() {
             shouldShowOfflineIndicator={false}
         >
             <BaseVacationDelegateSelectionComponent
-                vacationDelegate={draftDelegate ? {...vacationDelegate, delegate: draftDelegate} : vacationDelegate}
+                // An expired delegate reads as no delegate everywhere else, so it must not show up preselected here either
+                vacationDelegate={{...vacationDelegate, delegate: draftDelegate ?? getActiveVacationDelegate(vacationDelegate)}}
                 onSelectRow={onSelectRow}
                 headerTitle={translate('statusPage.vacationDelegate.chooseDelegate')}
                 onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index b612fdd7be8e..8d3b57b34d93 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -111,8 +111,6 @@ function ProfilePage() {
     const vacationDelegateName = hasVacationDelegate
         ? getVacationDelegateDisplayName(vacationDelegatePersonalDetails?.login ?? activeVacationDelegate, vacationDelegatePersonalDetails?.displayName, formatPhoneNumber)
         : '';
-    // With no delegate there is nothing to show on the form yet, so go straight to picking one.
-    const vacationDelegateRoute = hasVacationDelegate ? ROUTES.SETTINGS_VACATION_DELEGATE : ROUTES.SETTINGS_VACATION_DELEGATE_SELECT;
     const vacationDelegateClearDate = hasVacationDelegate
         ? formatVacationDelegateClearDateTime(getVacationDelegateClearDateTime(vacationDelegate?.clearAfter, currentUserPersonalDetails?.timezone?.selected), dateFnsLocale)
         : '';
@@ -178,10 +176,10 @@ function ProfilePage() {
                 />
             ) : undefined,
             accessibilityLabel: hasVacationDelegate ? [translate('common.vacationDelegate'), vacationDelegateName, vacationDelegateUntilText].filter(Boolean).join(', ') : undefined,
-            pageRoute: vacationDelegateRoute,
+            pageRoute: ROUTES.SETTINGS_VACATION_DELEGATE,
             onPress: () => {
                 clearDraftValues(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
-                Navigation.navigate(vacationDelegateRoute);
+                Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE);
             },
             brickRoadIndicator: vacationDelegateBrickRoadIndicator,
             pendingAction: vacationDelegate?.pendingAction ?? undefined,
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index 69cf339125b7..dd98024af40a 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -325,7 +325,7 @@ describe('ProfilePage - agent account', () => {
         expect(screen.getByText('Private')).toBeDefined();
     });
 
-    it('opens the member picker from the vacation delegate row when no delegate is set', async () => {
+    it('opens the vacation delegate form from the row when no delegate is set', async () => {
         // Given a user with no vacation delegate
         await setupUser('user@expensify.com');
 
@@ -337,8 +337,9 @@ describe('ProfilePage - agent account', () => {
         fireEvent.press(screen.getByTestId('vacation-delegate-menu-item'), {nativeEvent: {}});
         await waitForBatchedUpdatesWithAct();
 
-        // Then the member picker opens directly, since the form has nothing to show until a member is picked
-        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
+        // Then the form opens with Choose delegate unselected, so the member and the clear after date are picked on one screen
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE);
+        expect(Navigation.navigate).not.toHaveBeenCalledWith(ROUTES.SETTINGS_VACATION_DELEGATE_SELECT);
     });
 
     it('shows the vacation delegate and when it clears, and opens the form from the row', async () => {

From a7372691d2e4fa97641aabfd0760f541bae70ae1 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 23:17:11 +0000
Subject: [PATCH 501/781] Skip null employeeList entries when building
 workflows for the Workspaces tab red dot

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/libs/WorkflowUtils.ts       | 13 ++++++++++++-
 tests/unit/WorkflowUtilsTest.ts | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/libs/WorkflowUtils.ts b/src/libs/WorkflowUtils.ts
index 3ff72bf38f01..aadd928b376d 100644
--- a/src/libs/WorkflowUtils.ts
+++ b/src/libs/WorkflowUtils.ts
@@ -233,6 +233,11 @@ function convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, fir
     const hrAdvancedModeFinalApproverEmail = getHRAdvancedModeFinalApprover(policy);
 
     for (const employee of Object.values(employees)) {
+        // The type doesn't allow it, but `employeeList` can hold a null entry at runtime, so skip it rather than crash
+        if (!employee) {
+            continue;
+        }
+
         const {email, submitsTo, pendingAction} = employee;
         if (!email) {
             continue;
@@ -1662,6 +1667,11 @@ function convertApprovalWorkflowRulesToWorkflows({
     const availableMembers: Member[] = [];
 
     for (const employee of Object.values(employees)) {
+        // The type doesn't allow it, but `employeeList` can hold a null entry at runtime, so skip it rather than crash
+        if (!employee) {
+            continue;
+        }
+
         const {email, submitsTo, pendingAction} = employee;
         if (!email) {
             continue;
@@ -1845,8 +1855,9 @@ function hasApprovalWorkflowWithNonMemberApprover({policy, currentUserLogin, rul
         const hasNonMemberRoute =
             isNonMemberApprover(policy, getHRFinalApprover(policy) ?? getDefaultApprover(policy)) ||
             Object.values(policy?.employeeList ?? {}).some(
+                // `employeeList` can hold a null entry at runtime, so read it optionally
                 (employee) =>
-                    isNonMemberApprover(policy, employee.submitsTo) || isNonMemberApprover(policy, employee.forwardsTo) || isNonMemberApprover(policy, employee.overLimitForwardsTo),
+                    isNonMemberApprover(policy, employee?.submitsTo) || isNonMemberApprover(policy, employee?.forwardsTo) || isNonMemberApprover(policy, employee?.overLimitForwardsTo),
             );
         if (!hasNonMemberRoute) {
             return false;
diff --git a/tests/unit/WorkflowUtilsTest.ts b/tests/unit/WorkflowUtilsTest.ts
index 9c7fe114808f..cb851ed09efa 100644
--- a/tests/unit/WorkflowUtilsTest.ts
+++ b/tests/unit/WorkflowUtilsTest.ts
@@ -3416,6 +3416,24 @@ describe('WorkflowUtils', () => {
             expect(hasApprovalWorkflowWithNonMemberApprover({policy: approvalsOffPolicy, currentUserLogin: ownerEmail, isMultipleApproversBetaEnabled: false})).toBe(false);
             expect(hasApprovalWorkflowWithNonMemberApprover({policy: lockedPolicy, currentUserLogin: ownerEmail, isMultipleApproversBetaEnabled: false})).toBe(false);
         });
+
+        it.each([false, true])('skips a null employeeList entry instead of crashing when the multiple approvers beta is %s', (isMultipleApproversBetaEnabled) => {
+            // Given a workspace whose employeeList holds a null entry, which the type rules out but happens at runtime,
+            // next to member 1 who still submits to someone no longer on the workspace
+            // The null entry comes first, so every pass over employeeList reaches it before finding member 1
+            const policy = buildPolicy({
+                employeeList: {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the null entry is the runtime data this test guards against
+                    'stale@example.com': null as unknown as PolicyEmployee,
+                    [ownerEmail]: {email: ownerEmail, role: CONST.POLICY.ROLE.ADMIN, submitsTo: ownerEmail},
+                    '1@example.com': {email: '1@example.com', role: CONST.POLICY.ROLE.USER, submitsTo: removedEmail},
+                },
+            });
+
+            // When the owner checks whether a workflow needs fixing, as the Workspaces tab does on every page
+            // Then the null entry is skipped rather than crashing the tab bar, and member 1's workflow is still flagged
+            expect(hasApprovalWorkflowWithNonMemberApprover({policy, currentUserLogin: ownerEmail, rules: {}, isMultipleApproversBetaEnabled})).toBe(true);
+        });
     });
 
     describe('getNonMemberApproverError', () => {

From 17d469136de4f1df5ad86323700de5e6fce137b3 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 12 Oct 2026 23:46:52 +0000
Subject: [PATCH 502/781] Add tests for expired delegates in the picker and the
 member details vacation delegate row

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 tests/ui/DomainMemberDetailsPageTest.tsx | 104 +++++++++++++++++++++++
 tests/ui/VacationDelegatePageTest.tsx    |  40 ++++++++-
 2 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 tests/ui/DomainMemberDetailsPageTest.tsx

diff --git a/tests/ui/DomainMemberDetailsPageTest.tsx b/tests/ui/DomainMemberDetailsPageTest.tsx
new file mode 100644
index 000000000000..ed9c0b76d1ab
--- /dev/null
+++ b/tests/ui/DomainMemberDetailsPageTest.tsx
@@ -0,0 +1,104 @@
+import {render} from '@testing-library/react-native';
+
+import VacationDelegateMenuItem from '@components/VacationDelegateMenuItem';
+
+import {clearDraftValues} from '@libs/actions/FormActions';
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+
+import DomainMemberDetailsPage from '@pages/domain/Members/DomainMemberDetailsPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+
+const DOMAIN_ACCOUNT_ID = 1;
+const MEMBER_ACCOUNT_ID = 2;
+
+let mockDomain: Record<string, BaseVacationDelegate> | undefined;
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+    dismissModal: jest.fn(),
+}));
+
+jest.mock('@libs/actions/FormActions', () => ({
+    clearDraftValues: jest.fn(),
+}));
+
+// Renders only the page's own rows, so the test can reach the vacation delegate row without the member header and its data
+jest.mock('@pages/domain/BaseDomainMemberDetailsComponent', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/OfflineWithFeedback', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/VacationDelegateMenuItem', () => jest.fn(() => null));
+jest.mock('@components/MenuItem/presets/MenuItemField', () => jest.fn(() => null));
+jest.mock('@components/MenuItem/presets/MenuItemAction', () => jest.fn(() => null));
+jest.mock('@components/DecisionModal', () => jest.fn(() => null));
+jest.mock('@components/MenuItem', () => ({__esModule: true, default: new Proxy({}, {get: () => () => null})}));
+jest.mock('@components/Button', () => ({__esModule: true, default: new Proxy({}, {get: () => () => null})}));
+
+jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useLazyAsset', () => ({useMemoizedLazyExpensifyIcons: jest.fn(() => ({}))}));
+jest.mock('@hooks/useConfirmModal', () => jest.fn(() => ({showConfirmModal: jest.fn()})));
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({isSmallScreenWidth: false})));
+jest.mock('@hooks/usePersonalDetails', () => ({usePersonalDetail: jest.fn(() => [{accountID: 2, login: 'member@example.com'}])}));
+// Every domain read goes through a selector, so each one is applied to the same mock domain record
+jest.mock('@hooks/useOnyx', () => jest.fn((key: string, options?: {selector?: (value: unknown) => unknown}) => [options?.selector ? options.selector(mockDomain) : undefined]));
+
+type DomainMemberDetailsPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.MEMBER_DETAILS>;
+
+const route: DomainMemberDetailsPageProps['route'] = {
+    key: 'domain-member-details',
+    name: SCREENS.DOMAIN.MEMBER_DETAILS,
+    params: {domainAccountID: DOMAIN_ACCOUNT_ID, accountID: MEMBER_ACCOUNT_ID},
+};
+// The screen does not read navigation; this inert test double only satisfies the navigator-provided prop.
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+const navigation = {} as DomainMemberDetailsPageProps['navigation'];
+
+function pressVacationDelegateRow() {
+    render(
+        <DomainMemberDetailsPage
+            route={route}
+            navigation={navigation}
+        />,
+    );
+    jest.mocked(VacationDelegateMenuItem).mock.lastCall?.[0].onPress?.();
+}
+
+describe('DomainMemberDetailsPage', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockDomain = undefined;
+    });
+
+    it('opens the vacation delegate form when the member has no delegate', () => {
+        // Given a member with no vacation delegate
+        // When the admin presses the member's vacation delegate row
+        pressVacationDelegateRow();
+
+        // Then the form opens, not the member picker, so the clear after date is set in the same place as the delegate
+        expect(clearDraftValues).toHaveBeenCalledWith(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(DOMAIN_ACCOUNT_ID, MEMBER_ACCOUNT_ID));
+    });
+
+    it('opens the vacation delegate form when the member already has a delegate', () => {
+        // Given a member with a saved vacation delegate
+        mockDomain = {[`${CONST.DOMAIN.PRIVATE_VACATION_DELEGATE_PREFIX}${MEMBER_ACCOUNT_ID}`]: {creator: 'admin@example.com', delegate: 'delegate@example.com'}};
+
+        // When the admin presses the member's vacation delegate row
+        pressVacationDelegateRow();
+
+        // Then the same form opens with a fresh draft, so the saved delegate, date and time are shown rather than a stale pick
+        expect(clearDraftValues).toHaveBeenCalledWith(ONYXKEYS.FORMS.VACATION_DELEGATE_FORM);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.DOMAIN_VACATION_DELEGATE.getRoute(DOMAIN_ACCOUNT_ID, MEMBER_ACCOUNT_ID));
+    });
+});
diff --git a/tests/ui/VacationDelegatePageTest.tsx b/tests/ui/VacationDelegatePageTest.tsx
index 6a77c4f48523..41ca723c0dd3 100644
--- a/tests/ui/VacationDelegatePageTest.tsx
+++ b/tests/ui/VacationDelegatePageTest.tsx
@@ -42,13 +42,19 @@ jest.mock('@libs/Navigation/Navigation', () => ({
 }));
 
 // Replaces the real, personal-details-backed selection list with a plain pressable row so tests can
-// simulate a row tap on VacationDelegatePage's onSelectRow without driving the full list UI.
+// simulate a row tap on VacationDelegatePage's onSelectRow without driving the full list UI. The preselected
+// delegate is rendered as text so tests can check which member the picker would show as selected.
 jest.mock('@components/BaseVacationDelegateSelectionComponent', () => {
     const ReactMock = jest.requireActual<typeof React>('react');
     const {Pressable, Text} = jest.requireActual<{Pressable: typeof ReactNativePressable; Text: typeof ReactNativeText}>('react-native');
 
-    return ({onSelectRow}: {onSelectRow: (option: {login: string}) => void}) =>
-        ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSelectRow({login: 'delegateA@example.com'})}, ReactMock.createElement(Text, null, 'select-a'));
+    return ({onSelectRow, vacationDelegate}: {onSelectRow: (option: {login: string}) => void; vacationDelegate?: {delegate?: string}}) =>
+        ReactMock.createElement(
+            ReactMock.Fragment,
+            null,
+            ReactMock.createElement(Pressable, {testID: 'select-delegate-a', onPress: () => onSelectRow({login: 'delegateA@example.com'})}, ReactMock.createElement(Text, null, 'select-a')),
+            ReactMock.createElement(Text, {testID: 'preselected-delegate'}, vacationDelegate?.delegate ?? 'none'),
+        );
 });
 
 /**
@@ -157,4 +163,32 @@ describe('VacationDelegatePage', () => {
         const vacationDelegate = await getOnyxValue(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE);
         expect(vacationDelegate?.delegate).toBe(DELEGATE_A_EMAIL);
     });
+
+    it('does not preselect a saved delegate whose clear after date has passed', async () => {
+        // Given a saved delegate whose clear after date has passed, but whose clearing hasn't reached the client yet
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: DELEGATE_A_EMAIL, clearAfter: '2020-01-01 00:00:00'});
+        });
+
+        // When the picker opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then no member is preselected, since an expired delegate reads as no delegate everywhere else, including Profile
+        expect(screen.getByTestId('preselected-delegate')).toHaveTextContent('none');
+    });
+
+    it('preselects a saved delegate whose clear after date is still ahead', async () => {
+        // Given a saved delegate that clears in the future
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PRIVATE_VACATION_DELEGATE, {creator: CREATOR_EMAIL, delegate: DELEGATE_A_EMAIL, clearAfter: '2999-01-01 00:00:00'});
+        });
+
+        // When the picker opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then that delegate is preselected, so only expired delegates are hidden
+        expect(screen.getByTestId('preselected-delegate')).toHaveTextContent(DELEGATE_A_EMAIL);
+    });
 });

From 02e7064daa8cc92e3bd6e396aa3980589bcd41f2 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 00:22:45 +0000
Subject: [PATCH 503/781] Skip null employeeList entries in
 includesEveryWorkspaceMember and set the test's null entry without a cast

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 src/libs/WorkflowUtils.ts       |  3 ++-
 tests/unit/WorkflowUtilsTest.ts | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/libs/WorkflowUtils.ts b/src/libs/WorkflowUtils.ts
index aadd928b376d..9fe17c1fe3da 100644
--- a/src/libs/WorkflowUtils.ts
+++ b/src/libs/WorkflowUtils.ts
@@ -829,7 +829,8 @@ function mergeWorkflowMembersWithAvailableMembers(workflowMembers: Member[], all
  */
 function includesEveryWorkspaceMember(memberEmails: Array<string | null | undefined>, employeeList: PolicyEmployeeList | undefined): boolean {
     const memberEmailSet = new Set(memberEmails);
-    const workspaceMembers = Object.values(employeeList ?? {}).filter((employee) => !!employee.email && employee.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    // `employeeList` can hold a null entry at runtime, so read it optionally
+    const workspaceMembers = Object.values(employeeList ?? {}).filter((employee) => !!employee?.email && employee.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
     return workspaceMembers.length > 0 && workspaceMembers.every((employee) => memberEmailSet.has(employee.email));
 }
 
diff --git a/tests/unit/WorkflowUtilsTest.ts b/tests/unit/WorkflowUtilsTest.ts
index cb851ed09efa..677ad8e2f41a 100644
--- a/tests/unit/WorkflowUtilsTest.ts
+++ b/tests/unit/WorkflowUtilsTest.ts
@@ -1237,6 +1237,16 @@ describe('WorkflowUtils', () => {
             // Then it doesn't have everyone, so no workflow is made the default by mistake
             expect(includesEveryWorkspaceMember(['1@example.com'], {})).toBe(false);
         });
+
+        it('skips a null employeeList entry instead of crashing', () => {
+            // Given a workspace whose employeeList holds a null entry, which the type rules out but happens at runtime
+            const employeeListWithNull: PolicyEmployeeList = {...employeeList};
+            Reflect.set(employeeListWithNull, 'stale@example.com', null);
+
+            // When checking a workflow with every member, as creating or saving a workflow does
+            // Then the null entry is skipped rather than crashing, and the workflow still has everyone
+            expect(includesEveryWorkspaceMember(['1@example.com', '2@example.com'], employeeListWithNull)).toBe(true);
+        });
     });
 
     describe('convertApprovalWorkflowToPolicyEmployees', () => {
@@ -3420,15 +3430,12 @@ describe('WorkflowUtils', () => {
         it.each([false, true])('skips a null employeeList entry instead of crashing when the multiple approvers beta is %s', (isMultipleApproversBetaEnabled) => {
             // Given a workspace whose employeeList holds a null entry, which the type rules out but happens at runtime,
             // next to member 1 who still submits to someone no longer on the workspace
-            // The null entry comes first, so every pass over employeeList reaches it before finding member 1
-            const policy = buildPolicy({
-                employeeList: {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the null entry is the runtime data this test guards against
-                    'stale@example.com': null as unknown as PolicyEmployee,
-                    [ownerEmail]: {email: ownerEmail, role: CONST.POLICY.ROLE.ADMIN, submitsTo: ownerEmail},
-                    '1@example.com': {email: '1@example.com', role: CONST.POLICY.ROLE.USER, submitsTo: removedEmail},
-                },
-            });
+            // The type rules out a null entry, so set it without a cast. It goes in first so every pass over employeeList reaches it before member 1
+            const employeeList: PolicyEmployeeList = {};
+            Reflect.set(employeeList, 'stale@example.com', null);
+            employeeList[ownerEmail] = {email: ownerEmail, role: CONST.POLICY.ROLE.ADMIN, submitsTo: ownerEmail};
+            employeeList['1@example.com'] = {email: '1@example.com', role: CONST.POLICY.ROLE.USER, submitsTo: removedEmail};
+            const policy = buildPolicy({employeeList});
 
             // When the owner checks whether a workflow needs fixing, as the Workspaces tab does on every page
             // Then the null entry is skipped rather than crashing the tab bar, and member 1's workflow is still flagged

From ec2f52fde9889f5535996b449fa31b43e05af750 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 02:06:37 +0000
Subject: [PATCH 504/781] Restore last visited path on cold start for public
 domain accounts

Co-authored-by: huult <huult@users.noreply.github.com>
---
 src/libs/Navigation/NavigationRoot.tsx        |  5 -
 tests/unit/NavigationRootInitialStateTest.tsx | 93 +++++++++++++++++++
 2 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 tests/unit/NavigationRootInitialStateTest.tsx

diff --git a/src/libs/Navigation/NavigationRoot.tsx b/src/libs/Navigation/NavigationRoot.tsx
index 5dbe47f47e7c..a732dd4773d7 100644
--- a/src/libs/Navigation/NavigationRoot.tsx
+++ b/src/libs/Navigation/NavigationRoot.tsx
@@ -143,7 +143,6 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
     const {updateCurrentReportID} = useCurrentReportIDActions();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
-    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [isOnboardingCompleted = true] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
         selector: hasCompletedGuidedSetupFlowSelector,
     });
@@ -160,10 +159,6 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
             return getAdaptedStateFromPath(lastVisitedPath);
         }
 
-        if (!account || account.isFromPublicDomain) {
-            return;
-        }
-
         const isTransitioning = path?.includes(ROUTES.TRANSITION_BETWEEN_APPS);
 
         // If we have a transition URL, don't restore last visited path - let React Navigation handle it
diff --git a/tests/unit/NavigationRootInitialStateTest.tsx b/tests/unit/NavigationRootInitialStateTest.tsx
new file mode 100644
index 000000000000..58136a74f434
--- /dev/null
+++ b/tests/unit/NavigationRootInitialStateTest.tsx
@@ -0,0 +1,93 @@
+import {render} from '@testing-library/react-native';
+
+import getAdaptedStateFromPath from '@libs/Navigation/helpers/getAdaptedStateFromPath';
+import getPathFromState from '@libs/Navigation/helpers/getPathFromState';
+import NavigationRoot from '@libs/Navigation/NavigationRoot';
+import type {State} from '@libs/Navigation/types';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+// The `mock` prefix lets the hoisted jest.mock factory capture the initial state NavigationRoot computes.
+let mockCapturedInitialState: State | undefined;
+
+jest.mock('@react-navigation/native', () => {
+    const actualNav = jest.requireActual<typeof ReactNavigation>('@react-navigation/native');
+    return {
+        ...actualNav,
+        NavigationContainer: ({initialState}: {initialState?: State}) => {
+            mockCapturedInitialState = initialState;
+            return null;
+        },
+    };
+});
+jest.mock('@libs/Navigation/AppNavigator', () => () => null);
+jest.mock('@libs/NavigationFocusReturn', () => ({setupNavigationFocusReturn: jest.fn(), teardownNavigationFocusReturn: jest.fn()}));
+jest.mock('@src/libs/telemetry/useStartSpansOnRender', () => jest.fn());
+jest.mock('@hooks/useThemePreference', () => () => 'dark');
+jest.mock('@hooks/useTheme', () => () => ({appBG: '#000000'}));
+jest.mock('@hooks/useResponsiveLayout', () => () => ({shouldUseNarrowLayout: true}));
+
+const DISTANCE_EDIT_ROUTE = ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.SUBMIT, '1', '2');
+
+describe('NavigationRoot initial state', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        mockCapturedInitialState = undefined;
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('restores the last visited path on a cold start for a public domain account', async () => {
+        // Given a signed-in user with a public domain email (e.g. gmail.com) who had the distance editor open
+        await Onyx.set(ONYXKEYS.ACCOUNT, {isFromPublicDomain: true});
+        await waitForBatchedUpdates();
+
+        // When the native app cold starts without a deep link, so there is no initial URL
+        render(
+            <NavigationRoot
+                authenticated
+                lastVisitedPath={DISTANCE_EDIT_ROUTE as Route}
+                initialUrl={null}
+                onReady={() => {}}
+            />,
+        );
+
+        // Then the saved page is restored, because the email domain must not change which screen the user returns to
+        if (!mockCapturedInitialState) {
+            throw new Error('NavigationRoot did not restore an initial state');
+        }
+        expect(getPathFromState(mockCapturedInitialState)).toBe(getPathFromState(getAdaptedStateFromPath(DISTANCE_EDIT_ROUTE as Route)));
+    });
+
+    it('does not restore the last visited path when the user is signed out', async () => {
+        // Given a public domain account whose session is no longer authenticated
+        await Onyx.set(ONYXKEYS.ACCOUNT, {isFromPublicDomain: true});
+        await waitForBatchedUpdates();
+
+        // When the native app cold starts without a deep link
+        render(
+            <NavigationRoot
+                authenticated={false}
+                lastVisitedPath={DISTANCE_EDIT_ROUTE as Route}
+                initialUrl={null}
+                onReady={() => {}}
+            />,
+        );
+
+        // Then React Navigation picks the initial state, so a signed-out user can't land on a protected page
+        expect(mockCapturedInitialState).toBeUndefined();
+    });
+});

From 012eb979c97f9e31e4f1b4bbac134685646d1be9 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 08:16:01 +0530
Subject: [PATCH 505/781] add the report shared copy

---
 src/languages/en.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4d271fa0877e..df36036b31a1 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -348,6 +348,7 @@ const translations = {
         with: 'with',
         shareCode: 'Share code',
         shareReport: 'Share report',
+        reportShared: 'Report shared',
         share: 'Share',
         per: 'per',
         // @context Unit label for “mile.” Should be treated as a measurement unit and may require capitalization depending on locale conventions.

From 93a387f96d436b7382ee503662c6d4140a9a1b38 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 08:16:02 +0530
Subject: [PATCH 506/781] translate the report shared copy

---
 src/languages/de.ts      | 1 +
 src/languages/el.ts      | 1 +
 src/languages/es.ts      | 1 +
 src/languages/fr.ts      | 1 +
 src/languages/it.ts      | 1 +
 src/languages/ja.ts      | 1 +
 src/languages/nl.ts      | 1 +
 src/languages/pl.ts      | 1 +
 src/languages/pt-BR.ts   | 1 +
 src/languages/zh-hans.ts | 1 +
 10 files changed, 10 insertions(+)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 7a11d07fc0aa..f5fc2e852054 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -529,6 +529,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API-Schlüssel',
         exportsTo: 'Exportiert nach',
         shareReport: 'Bericht teilen',
+        reportShared: 'Bericht freigegeben',
     },
     socials: {
         podcast: 'Folgen Sie uns auf Podcast',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 7217d6105ac8..4ae8648aed47 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -529,6 +529,7 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         commuter: 'επιβάτης καθημερινών μετακινήσεων',
         shareReport: 'Κοινοποιήστε την αναφορά',
+        reportShared: 'Η αναφορά κοινοποιήθηκε',
     },
     socials: {
         podcast: 'Ακολουθήστε μας στο Podcast',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 41e43544c213..9dc47874f0fd 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -516,6 +516,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Sin resultados. Intenta ajustar tus filtros o la búsqueda.',
         exportsTo: 'Exporta a',
         shareReport: 'Compartir informe',
+        reportShared: 'Informe compartido',
     },
     socials: {
         podcast: 'Síguenos en Podcast',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bc5952f96861..a2248cb03ee5 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -528,6 +528,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'Clé API',
         exportsTo: 'Exports vers',
         shareReport: 'Partager la note de frais',
+        reportShared: 'Note de frais partagée',
     },
     socials: {
         podcast: 'Suivez-nous sur Podcast',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index a191531a7d6f..e208cedd849b 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -528,6 +528,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'Chiave API',
         exportsTo: 'Esporta in',
         shareReport: 'Condividi report',
+        reportShared: 'Report condiviso',
     },
     socials: {
         podcast: 'Seguici su Podcast',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 8cb79d3f0ce1..45e9b9f67933 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -527,6 +527,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API キー',
         exportsTo: 'エクスポート先',
         shareReport: 'レポートを共有',
+        reportShared: 'レポートを共有しました',
     },
     socials: {
         podcast: 'ポッドキャストでフォロー',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 5ce40333dbca..45f1f707240c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -528,6 +528,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API-sleutel',
         exportsTo: 'Exporteert naar',
         shareReport: 'Rapport delen',
+        reportShared: 'Rapport gedeeld',
     },
     socials: {
         podcast: 'Volg ons op Podcast',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 1c13d29fa2c7..8054281cafe1 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -531,6 +531,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'Klucz API',
         exportsTo: 'Eksporty do',
         shareReport: 'Udostępnij raport',
+        reportShared: 'Udostępniono raport',
     },
     socials: {
         podcast: 'Śledź nas na Podcast',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 3c0deed22b8b..408d296336d5 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -527,6 +527,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'Chave de API',
         exportsTo: 'Exportações para',
         shareReport: 'Compartilhar relatório',
+        reportShared: 'Relatório compartilhado',
     },
     socials: {
         podcast: 'Siga-nos no Podcast',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 4f3b73da8641..8c5bbe4d1faa 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -523,6 +523,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API 密钥',
         exportsTo: '导出到',
         shareReport: '分享报表',
+        reportShared: '报表已共享',
     },
     socials: {
         podcast: '在播客上关注我们',

From f3c63a2a60a5303f68b9d1bbe88795b1cfa80d9c Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 08:16:03 +0530
Subject: [PATCH 507/781] match the share report wording in german and chinese

---
 src/languages/de.ts      | 2 +-
 src/languages/zh-hans.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index f5fc2e852054..e8328119c135 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -529,7 +529,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API-Schlüssel',
         exportsTo: 'Exportiert nach',
         shareReport: 'Bericht teilen',
-        reportShared: 'Bericht freigegeben',
+        reportShared: 'Bericht geteilt',
     },
     socials: {
         podcast: 'Folgen Sie uns auf Podcast',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 8c5bbe4d1faa..27f203f0c2ea 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -523,7 +523,7 @@ const translations: TranslationDeepObject<typeof en> = {
         apiKey: 'API 密钥',
         exportsTo: '导出到',
         shareReport: '分享报表',
-        reportShared: '报表已共享',
+        reportShared: '报表已分享',
     },
     socials: {
         podcast: '在播客上关注我们',

From 46078de09ed74ddf682e4168c936e8685dded5c8 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 08:16:13 +0530
Subject: [PATCH 508/781] show a growl after sharing a report

---
 src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
index c849a153d4a2..464a9cb4bb8c 100644
--- a/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
+++ b/src/pages/inbox/report/DynamicReportDetailsShareReportPage.tsx
@@ -20,6 +20,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {searchUserInServer, shareReport} from '@libs/actions/Report';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import getPlatform from '@libs/getPlatform';
+import Growl from '@libs/Growl';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
@@ -75,6 +76,7 @@ function DynamicReportDetailsShareReportPage({report, policy}: DynamicReportDeta
         startWithLoading(() => {
             shareReport(report.reportID, selectedLogin);
             Navigation.goBack(backPath);
+            Growl.success(translate('common.reportShared'));
         });
     };
 

From 20ecff587f88e46ea3f5a7e31cb2477da31c9e8a Mon Sep 17 00:00:00 2001
From: Stephanie Elliott <31225194+stephanieelliott@users.noreply.github.com>
Date: Mon, 12 Oct 2026 16:54:33 -1000
Subject: [PATCH 509/781] Remove 'group-by:report' example from documentation

Removed example for grouping by report in search operators documentation.
---
 .../Use-Search-Operators-to-Filter-and-Analyze.md                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/articles/new-expensify/reports-and-expenses/Use-Search-Operators-to-Filter-and-Analyze.md b/docs/articles/new-expensify/reports-and-expenses/Use-Search-Operators-to-Filter-and-Analyze.md
index e770c6e3be6c..1956bdc235a5 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Use-Search-Operators-to-Filter-and-Analyze.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Use-Search-Operators-to-Filter-and-Analyze.md
@@ -180,7 +180,6 @@ Use `group-by:` to group results by a specific dimension.
 
 | **Syntax** | **Description** | **Example** |
 |---|---|---|
-| `group-by:report` | Group results by report | `type:expense group-by:report` |
 | `group-by:from` | Group results by submitter | `type:expense group-by:from` |
 | `group-by:card` | Group results by card | `type:expense group-by:card` |
 | `group-by:withdrawal-id` | Group results by withdrawal ID | `type:expense group-by:withdrawal-id` |

From 8e925fd32890eea9afbc9fac80cc97a1470c6b17 Mon Sep 17 00:00:00 2001
From: Stephanie Elliott <31225194+stephanieelliott@users.noreply.github.com>
Date: Mon, 12 Oct 2026 17:19:02 -1000
Subject: [PATCH 510/781] Update Join-your-company's-workspace.md

---
 .../getting-started/Join-your-company's-workspace.md            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
index 8e12736a204b..ce1938db439d 100644
--- a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
+++ b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
@@ -5,7 +5,7 @@ keywords: [New Expensify, join workspace, set up profile, add expense, enable tw
 ---
 
 
-Welcome to Expensify! If you've received an invite to join your company's workspace, this guide walks you through setting up your account and getting started.
+Welcome to Expensify! Whether you've received an invite to join your company's workspace or need to instruct your admin to send you one, this guide walks you through setting up your account and getting started.
 
 ---
 

From 29d02a0ffd8635f2496907997f6846b5bd14103f Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Tue, 13 Oct 2026 10:36:43 +0700
Subject: [PATCH 511/781] fix: typecheck

---
 tests/actions/PolicyTest.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index 11d8a551265f..3014a1baaf3a 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -761,7 +761,6 @@ describe('actions/Policy', () => {
                 policyID: fakePolicy.id,
                 targetPolicyID: policyID,
                 welcomeNote: 'Join my policy',
-                personalDetailsByLogins: {},
                 parts: {
                     people: false,
                     reports: false,

From fe5a2bd36643f3cdb20ea044f85f834f564a73c3 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Tue, 13 Oct 2026 11:52:06 +0700
Subject: [PATCH 512/781] Update CategoryPickerModal styles for improved layout
 and spacing

---
 src/components/CategoryPicker/CategoryPickerModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index f21f4ceed98d..f9cd19d41962 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -160,7 +160,7 @@ function CategoryPickerModal({
         >
             <View style={[StyleUtils.getHeight(popoverDimensions.height), styles.flexColumn, styles.pt4, bottomSafeAreaPaddingStyle]}>
                 {!!onAddCategory && (
-                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.pb5, StyleUtils.getHeight(headerHeight)]}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.pt1, styles.pb4, StyleUtils.getHeight(headerHeight)]}>
                         <Text style={styles.textLabelSupporting}>{translate('common.category')}</Text>
                         <Tooltip text={translate('workspace.categories.addCategory')}>
                             <PressableWithFeedback

From 290000185699042edcde3e76e507a3e0afa0dad1 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 09:22:08 +0200
Subject: [PATCH 513/781] Read only hasParentAccess for the current report in
 ParentNavigationSubtitle

---
 src/components/ParentNavigationSubtitle.tsx |  5 +++--
 src/selectors/Report.ts                     |  5 +++++
 tests/ui/ParentNavigationSubtitleTest.tsx   | 19 ++++++++++++++++
 tests/unit/ReportSelectorTest.ts            | 25 ++++++++++++++++++++-
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 802a83438fcd..0f7067f1488f 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -24,6 +24,7 @@ import SCREENS from '@src/SCREENS';
 import type {ColorValue, StyleProp, TextStyle, ViewStyle} from 'react-native';
 
 import {useRoute} from '@react-navigation/native';
+import {getReportHasParentAccess} from '@selectors/Report';
 import {reportVisibleActionsSelector} from '@selectors/ReportAction';
 import React from 'react';
 import {View} from 'react-native';
@@ -99,12 +100,12 @@ function ParentNavigationSubtitle({
 
     const {workspaceName, reportName} = parentNavigationSubtitleData;
     const {translate} = useLocalize();
-    const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [hasParentAccess] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getReportHasParentAccess});
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {selector: reportVisibleActionsSelector(parentReportID)});
     const isReportArchived = useReportIsArchived(report?.reportID);
     const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
-    const hasAccessToParentReport = currentReport?.hasParentAccess !== false;
+    const hasAccessToParentReport = hasParentAccess !== false;
     const {currentFullScreenRoute, currentFocusedNavigator} = useRootNavigationState((state) => {
         // Find the tab navigator, which wraps all full-screen navigators
         const tabNavigatorRoute = state?.routes?.findLast((route) => route.name === NAVIGATORS.TAB_NAVIGATOR);
diff --git a/src/selectors/Report.ts b/src/selectors/Report.ts
index 79c50694ed48..6f3811e6bd8c 100644
--- a/src/selectors/Report.ts
+++ b/src/selectors/Report.ts
@@ -49,6 +49,10 @@ function getReportParentReportID(report: OnyxEntry<Report>) {
     return report?.parentReportID;
 }
 
+function getReportHasParentAccess(report: OnyxEntry<Report>) {
+    return report?.hasParentAccess;
+}
+
 /** Which report-type avatar wrapper the `ReportAvatar` dispatcher should render for this report. */
 function reportAvatarKindSelector(report: OnyxEntry<Report>): ValueOf<typeof CONST.REPORT_AVATAR_KIND> | undefined {
     if (!report) {
@@ -400,6 +404,7 @@ export {
     groupChatAvatarReportSelector,
     getReportOwnerAccountID,
     getReportParentReportID,
+    getReportHasParentAccess,
     getReportPolicyID,
     policyIDsWithEmptyReportsSelector,
     canShowReportRecipientLocalTimeSelector,
diff --git a/tests/ui/ParentNavigationSubtitleTest.tsx b/tests/ui/ParentNavigationSubtitleTest.tsx
index 8f1f3ab435d3..013a8302df99 100644
--- a/tests/ui/ParentNavigationSubtitleTest.tsx
+++ b/tests/ui/ParentNavigationSubtitleTest.tsx
@@ -337,6 +337,25 @@ describe('ParentNavigationSubtitle', () => {
             });
         });
 
+        it('renders the parent report name as plain text when the user has no access to the parent report', async () => {
+            // Given the current report says the user cannot access its parent
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${expenseReportID}`, {reportID: expenseReportID, hasParentAccess: false});
+
+            // When the subtitle renders
+            render(
+                <ParentNavigationSubtitle
+                    parentNavigationSubtitleData={subtitleData}
+                    parentReportID={parentReportID}
+                    reportID={expenseReportID}
+                />,
+            );
+            await waitForBatchedUpdates();
+
+            // Then the parent name is shown without the link, because hasParentAccess is read through getReportHasParentAccess
+            expect(screen.queryByTestId('parent-navigation-subtitle-link')).toBeNull();
+            expect(screen.getByText(subtitleData.reportName)).toBeTruthy();
+        });
+
         it('passes only the parent report visibility to isReportActionVisible', async () => {
             // Given visibility data for the parent report and for an unrelated report
             await Onyx.set(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS, {
diff --git a/tests/unit/ReportSelectorTest.ts b/tests/unit/ReportSelectorTest.ts
index 86c8d51a3e67..004ff62647d2 100644
--- a/tests/unit/ReportSelectorTest.ts
+++ b/tests/unit/ReportSelectorTest.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {createMoveExpenseReportNVPSelector, getStableReportSelector, policyChatRoomsSelector} from '@src/selectors/Report';
+import {createMoveExpenseReportNVPSelector, getReportHasParentAccess, getStableReportSelector, policyChatRoomsSelector} from '@src/selectors/Report';
 import type {Report} from '@src/types/onyx';
 
 describe('policyChatRoomsSelector', () => {
@@ -157,3 +157,26 @@ describe('getStableReportSelector', () => {
         expect(getStableReportSelector({reportID: '1'} as Report)?.permissions).toBeUndefined();
     });
 });
+
+describe('getReportHasParentAccess', () => {
+    it('returns the hasParentAccess value of the report', () => {
+        // Given reports with and without parent access
+        const reportWithAccess = {reportID: '1', hasParentAccess: true} as Report;
+        const reportWithoutAccess = {reportID: '2', hasParentAccess: false} as Report;
+
+        // When the selector reads them
+        // Then it returns the raw flag, so callers can tell an explicit `false` apart from a missing value
+        expect(getReportHasParentAccess(reportWithAccess)).toBe(true);
+        expect(getReportHasParentAccess(reportWithoutAccess)).toBe(false);
+    });
+
+    it('returns undefined when the report or the flag is missing', () => {
+        // Given a missing report and a report without the hasParentAccess field
+        const reportWithoutFlag = {reportID: '1'} as Report;
+
+        // When the selector reads them
+        // Then it returns undefined, which ParentNavigationSubtitle treats as having access
+        expect(getReportHasParentAccess(undefined)).toBeUndefined();
+        expect(getReportHasParentAccess(reportWithoutFlag)).toBeUndefined();
+    });
+});

From 01d578cf3f411c658f2862d669657ffb4fb96136 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 09:49:40 +0200
Subject: [PATCH 514/781] Reuse latestCalendlyCallSelector in
 OnboardingHelpDropdownButton

---
 src/components/OnboardingHelpDropdownButton.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/OnboardingHelpDropdownButton.tsx b/src/components/OnboardingHelpDropdownButton.tsx
index 3d388f9ba2ea..cc7408d8a5c2 100644
--- a/src/components/OnboardingHelpDropdownButton.tsx
+++ b/src/components/OnboardingHelpDropdownButton.tsx
@@ -13,8 +13,8 @@ import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {ReportNameValuePairs} from '@src/types/onyx';
 
+import {latestCalendlyCallSelector} from '@selectors/ReportNameValuePairs';
 import {accountIDSelector} from '@selectors/Session';
 import {addMinutes} from 'date-fns';
 import React from 'react';
@@ -37,8 +37,6 @@ type OnboardingHelpButtonProps = {
     hasActiveScheduledCall: boolean | undefined;
 };
 
-const reportNameValuePartsSelector = (reportNameValuePairs?: ReportNameValuePairs) => reportNameValuePairs?.calendlyCalls?.at(-1);
-
 function OnboardingHelpDropdownButton({reportID, shouldUseNarrowLayout, shouldShowRegisterForWebinar, shouldShowGuideBooking, hasActiveScheduledCall}: OnboardingHelpButtonProps) {
     const {translate, dateFnsLocale} = useLocalize();
     const StyleUtils = useStyleUtils();
@@ -47,7 +45,7 @@ function OnboardingHelpDropdownButton({reportID, shouldUseNarrowLayout, shouldSh
     });
 
     const [latestScheduledCall] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`, {
-        selector: reportNameValuePartsSelector,
+        selector: latestCalendlyCallSelector,
     });
 
     const styles = useThemeStyles();

From 77ea4fa9dcd726a9557ca04479c83d387ed351d5 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 10:22:54 +0200
Subject: [PATCH 515/781] Use useParentReportAction in ChatThreadAvatar instead
 of an inline selector

---
 src/components/Avatar/connected/ChatThreadAvatar.tsx | 6 ++----
 src/hooks/useParentReportAction.ts                   | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/Avatar/connected/ChatThreadAvatar.tsx b/src/components/Avatar/connected/ChatThreadAvatar.tsx
index 7949114889a3..805ecf8e6159 100644
--- a/src/components/Avatar/connected/ChatThreadAvatar.tsx
+++ b/src/components/Avatar/connected/ChatThreadAvatar.tsx
@@ -7,6 +7,7 @@ import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import useDefaultAvatars from '@hooks/useDefaultAvatars';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useParentReportAction from '@hooks/useParentReportAction';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useStyleUtils from '@hooks/useStyleUtils';
 
@@ -28,7 +29,6 @@ import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 import {reportAvatarFieldsSelector, reportAvatarKindSelector} from '@selectors/Report';
-import {getParentReportActionWithoutThreadRepliesSelector} from '@selectors/ReportAction';
 import React from 'react';
 
 import useAccountIcons, {seedFallbackIcons} from './useAccountIcons';
@@ -73,9 +73,7 @@ function ChatThreadAvatar({reportID, size, backdropColor, containerStyle, subscr
     const [thread] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: reportAvatarFieldsSelector});
     const parentReportID = getNonEmptyStringOnyxID(thread?.parentReportID);
     const [parentKind] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, {selector: reportAvatarKindSelector});
-    const [parentAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
-        selector: (actions) => getParentReportActionWithoutThreadRepliesSelector(actions, thread?.parentReportActionID),
-    });
+    const parentAction = useParentReportAction(thread, {shouldIgnoreThreadReplies: true});
 
     // A transaction thread points `chatReportID` at its parent, a comment thread leaves it unset. Only a linked thread shows the copilot, the revealed agent and the expense subscript.
     const isParentActionLinked = !!parentKind && !!thread?.chatReportID && thread.chatReportID === thread.parentReportID;
diff --git a/src/hooks/useParentReportAction.ts b/src/hooks/useParentReportAction.ts
index 58fef79104ae..e3b1052f0e8b 100644
--- a/src/hooks/useParentReportAction.ts
+++ b/src/hooks/useParentReportAction.ts
@@ -15,9 +15,12 @@ type UseParentReportActionOptions = {
     shouldIgnoreThreadReplies?: boolean;
 };
 
-function useParentReportAction(report: OnyxEntry<Report>): OnyxEntry<ReportAction>;
-function useParentReportAction(report: OnyxEntry<Report>, options: UseParentReportActionOptions): ReportActionWithoutThreadReplyCounters | undefined;
-function useParentReportAction(report: OnyxEntry<Report>, {shouldIgnoreThreadReplies = false}: UseParentReportActionOptions = {}) {
+/** The only report fields the hook reads, so callers can pass a narrowed report projection. */
+type ParentReportFields = Pick<Report, 'parentReportID' | 'parentReportActionID'>;
+
+function useParentReportAction(report: OnyxEntry<ParentReportFields>): OnyxEntry<ReportAction>;
+function useParentReportAction(report: OnyxEntry<ParentReportFields>, options: UseParentReportActionOptions): ReportActionWithoutThreadReplyCounters | undefined;
+function useParentReportAction(report: OnyxEntry<ParentReportFields>, {shouldIgnoreThreadReplies = false}: UseParentReportActionOptions = {}) {
     const getParentReportAction = useCallback(
         (parentReportActions: OnyxEntry<ReportActions>) =>
             shouldIgnoreThreadReplies

From a689661c529553f255fc292165be9870ed96c23f Mon Sep 17 00:00:00 2001
From: "ahmedGaber93 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 08:58:44 +0000
Subject: [PATCH 516/781] Keep the GPS distance unit at the counter's large
 headline size

Co-authored-by: ahmedGaber93 <ahmedGaber93@users.noreply.github.com>
---
 .../IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
index 3c433e4a3c7d..c40234f0be40 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/DistanceCounter.tsx
@@ -40,7 +40,7 @@ function DistanceCounter({unit}: DistanceCounterProps) {
                             part.type === 'unit' ? (
                                 <Text
                                     key="unit"
-                                    style={styles.colorMuted}
+                                    style={[styles.iouAmountTextInput, styles.textXLarge, styles.colorMuted]}
                                 >
                                     {part.value}
                                 </Text>

From 3c2a441d95e5b44d3179a98cded983288201afc6 Mon Sep 17 00:00:00 2001
From: Jakub Korytko <jakub@korytko.me>
Date: Tue, 13 Oct 2026 11:16:58 +0200
Subject: [PATCH 517/781] fix: keep built params when revealing mounted
 pre-mount

---
 .../GetStateForActionHandlers.ts              |  7 +++--
 .../handleReplaceFullscreenUnderRHP.test.ts   | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
index 2def01b17ac4..c7e2f527f938 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
@@ -860,8 +860,11 @@ function withPreMountedDestination(builtTabState: TabStateForReplacement, existi
     // When every screen of the built stack is already mounted, the mounted stack state is kept with only its routes changed.
     // A partial state would be rehydrated under a new key, which makes the navigator re-render all of its screens.
     const mountedNestedState = isRealizedNavigationState(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
+    // Params still come from the built routes, so both branches reveal the destination the action asked for.
     const mountedRoutes = mountedNestedState
-        ? nestedRoutes.map((route) => mountedNestedState.routes.find((existing) => 'key' in route && existing.key === route.key)).filter((route) => route !== undefined)
+        ? nestedRoutes.flatMap((route) =>
+              mountedNestedState.routes.filter((existing) => 'key' in route && existing.key === route.key).map((existing) => ({...existing, params: route.params})),
+          )
         : [];
     const routes = [...builtTabState.routes];
     if (mountedNestedState && mountedRoutes.length === nestedRoutes.length && 'key' in targetTabRoute && typeof targetTabRoute.key === 'string') {
@@ -890,8 +893,8 @@ export {
     getPreInsertedOriginalTabRoute,
     clearPreInsertedOriginalTabRoute,
     MODAL_ROUTES_TO_DISMISS,
-    getTabStateWithFreshTarget,
     // Exported for unit-test access; not used outside of testing.
+    getTabStateWithFreshTarget,
     withSanitizedDeepLinkParams,
     getTabStateWithFocusedTarget,
     markFocusedTabRouteForRemount,
diff --git a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
index 03f964e1a5bd..5645d4ed0578 100644
--- a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
+++ b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
@@ -398,6 +398,33 @@ describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation
         expect(getReportsSplitRouteKey(result)).toBe('reports-split-key');
     });
 
+    it('reveals the wide pre-mount in the mounted stack state with the params of the built destination', () => {
+        // Given a wide layout with a mounted Reports stack where report B was pre-mounted with params the reveal no longer asks for
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const state = makeExistingReportsState(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B', reportActionID: 'old-action'}, undefined, 'Report-wide-pre-mount-5'),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key'),
+            ],
+            2,
+        );
+        const reportsSplitState = getReportsSplitState(state);
+        if (reportsSplitState) {
+            Object.assign(reportsSplitState, {stale: false, key: 'reports-split-state-key'});
+        }
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-5'}};
+
+        // When report B is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(state, action, CONFIG_OPTIONS, stackRouter);
+
+        // Then the mounted stack state is kept so its screens are not re-rendered, but the destination shows what the action asked for
+        expect(getReportsSplitState(result)?.key).toBe('reports-split-state-key');
+        expect(getReportsSplitState(result)?.routes.at(-1)?.key).toBe('Report-wide-pre-mount-5');
+        expect(getReportsSplitState(result)?.routes.at(-1)?.params).toEqual({reportID: 'B'});
+    });
+
     it('reveals a report pre-mounted in a covered tab and stops keeping that tab preloaded', () => {
         // Given the Search tab focused and report B pre-mounted on top of the covered Reports tab, which is marked preloaded
         mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);

From ad2ed11b54099c5603fddbf86a28051331d44e2e Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 13 Oct 2026 11:17:46 +0200
Subject: [PATCH 518/781] fix: iOS offline indicator sits on the tab bar with
 its background running to the screen bottom, no gap

---
 .../useTabRootScreenWrapperProps/index.ios.tsx      |  6 +++---
 src/styles/index.ts                                 | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 3b815cf130c2..00599a26b54b 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -13,8 +13,8 @@ import type TabRootScreenWrapperProps from './types';
 /**
  * On narrow layouts the content of a tab root screen runs under the translucent UITabBar, down to the bottom edge of
  * the screen, so the ScreenWrapper runs edge to edge and adds no bottom padding, to the screen or to the offline
- * indicator. Each tab root's list lets UIKit inset its end past the bar, and the offline indicator sits above the bar.
- * Account drawn over the tabs hides the bar.
+ * indicator. Each tab root's list lets UIKit inset its end past the bar, and the offline indicator sits on the bar with
+ * its background running down to the bottom edge. Account drawn over the tabs hides the bar.
  */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -28,7 +28,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
 
     return {
         enableEdgeToEdgeBottomSafeAreaPadding: false,
-        offlineIndicatorStyle: styles.tabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
+        offlineIndicatorStyle: styles.nativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
     };
 }
 
diff --git a/src/styles/index.ts b/src/styles/index.ts
index dd6f8fe98e36..1f892d1329ed 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -7007,6 +7007,19 @@ const dynamicStyles = (theme: ThemeColors) =>
                 backgroundColor: theme.appBG,
             }) satisfies ViewStyle,
 
+        // Fills the screen from the top of the native tab bar down to the bottom edge, so no content shows between
+        // the offline indicator and the bar.
+        nativeTabBarOfflineIndicator: (tabBarHeight: number) =>
+            ({
+                position: 'absolute',
+                right: 0,
+                bottom: 0,
+                left: 0,
+                height: CONST.OFFLINE_INDICATOR_HEIGHT + tabBarHeight,
+                paddingBottom: tabBarHeight,
+                backgroundColor: theme.appBG,
+            }) satisfies ViewStyle,
+
         // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
         // against it without taking part in the tab screen's layout.
         nativeTabBarFloatingButtons: (bottom: number) =>

From 6d23651666659f1581f0519c1bcbe667e2e393cd Mon Sep 17 00:00:00 2001
From: "Vinh Hoang (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 09:25:39 +0000
Subject: [PATCH 519/781] Stop double-decoding the contact method route param

The router already decodes path params, so the extra decodeURIComponent call threw URIError for emails containing a literal % (e.g. test%alias@gmail.com) and crashed the contact method details page.

Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>
---
 src/CONST/index.ts                            |  1 -
 src/pages/settings/Profile/Contacts/utils.ts  | 20 ++------
 ...getDecodedContactMethodFromUriParamTest.ts | 47 +++++++++++++++++++
 3 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 tests/unit/getDecodedContactMethodFromUriParamTest.ts

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index da41fff20baf..488da900f3b3 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6018,7 +6018,6 @@ const CONST = {
         TIME_FORMAT: /^\d{2}:\d{2} [AP]M$/,
         DATE_TIME_FORMAT: /^\d{2}-\d{2} \d{2}:\d{2} [AP]M$/,
         ILLEGAL_FILENAME_CHARACTERS: /\/|<|>|\*|"|:|#|\?|\\|\|/g,
-        ENCODE_PERCENT_CHARACTER: /%(25)+/g,
         INVISIBLE_CHARACTERS_GROUPS: /[\p{C}\p{Z}]/gu,
         OTHER_INVISIBLE_CHARACTERS: /[\u3164\u115f\u1160\uffa0\u2800]/g,
         SHORT_MENTION_HTML: /<mention-short>(.*?)<\/mention-short>/g,
diff --git a/src/pages/settings/Profile/Contacts/utils.ts b/src/pages/settings/Profile/Contacts/utils.ts
index 4d9bf0190953..9edae95e7d82 100644
--- a/src/pages/settings/Profile/Contacts/utils.ts
+++ b/src/pages/settings/Profile/Contacts/utils.ts
@@ -1,25 +1,11 @@
 import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 
-import CONST from '@src/CONST';
-
 /**
- * Decodes the contact method from the route params
+ * Gets the contact method from the route params. The router already decodes path params once,
+ * so decoding again here would throw on a literal `%` (e.g. `test%alias@gmail.com`) or alter valid escapes.
  */
 function getDecodedContactMethodFromUriParam(contactMethodParam: string) {
-    // We find the number of times the url is encoded based on the last % sign and remove them.
-    const lastPercentIndex = contactMethodParam.lastIndexOf('%');
-    const encodePercents = contactMethodParam.substring(lastPercentIndex).match(/25/g);
-    let numberEncodePercents = encodePercents?.length ?? 0;
-    const beforeAtSign = contactMethodParam.substring(0, lastPercentIndex).replaceAll(CONST.REGEX.ENCODE_PERCENT_CHARACTER, (match) => {
-        if (numberEncodePercents > 0) {
-            numberEncodePercents--;
-            return '%';
-        }
-        return match;
-    });
-    const afterAtSign = contactMethodParam.substring(lastPercentIndex).replaceAll(CONST.REGEX.ENCODE_PERCENT_CHARACTER, '%');
-
-    return addSMSDomainIfPhoneNumber(decodeURIComponent(beforeAtSign + afterAtSign));
+    return addSMSDomainIfPhoneNumber(contactMethodParam);
 }
 
 export default getDecodedContactMethodFromUriParam;
diff --git a/tests/unit/getDecodedContactMethodFromUriParamTest.ts b/tests/unit/getDecodedContactMethodFromUriParamTest.ts
new file mode 100644
index 000000000000..31cc500b7823
--- /dev/null
+++ b/tests/unit/getDecodedContactMethodFromUriParamTest.ts
@@ -0,0 +1,47 @@
+import getDecodedContactMethodFromUriParam from '@pages/settings/Profile/Contacts/utils';
+
+describe('getDecodedContactMethodFromUriParam', () => {
+    it('returns an email containing a literal % without throwing', () => {
+        // Given a route param the router already decoded, for an email whose `%al` is not a valid escape sequence
+        const contactMethodParam = 'test%alias@gmail.com';
+
+        // When the contact method details page reads it
+        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
+
+        // Then the email is kept as-is, because decoding it a second time would throw a URIError and crash the page
+        expect(contactMethod).toBe('test%alias@gmail.com');
+    });
+
+    it('does not decode valid escape sequences a second time', () => {
+        // Given an already-decoded email that happens to contain a valid escape sequence
+        const contactMethodParam = 'a%41b@x.com';
+
+        // When the contact method details page reads it
+        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
+
+        // Then the email is kept as-is, because turning `%41` into `A` would make the login lookup miss
+        expect(contactMethod).toBe('a%41b@x.com');
+    });
+
+    it('returns a regular email unchanged', () => {
+        // Given a regular email route param
+        const contactMethodParam = 'test@gmail.com';
+
+        // When the contact method details page reads it
+        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
+
+        // Then the email matches the login key stored in the login list
+        expect(contactMethod).toBe('test@gmail.com');
+    });
+
+    it('adds the SMS domain to a phone number', () => {
+        // Given a phone number route param, which is stored in the login list with the SMS domain
+        const contactMethodParam = '+15005550006';
+
+        // When the contact method details page reads it
+        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
+
+        // Then the SMS domain is added so the login lookup finds the phone number
+        expect(contactMethod).toBe('+15005550006@expensify.sms');
+    });
+});

From 4b6326bb12236dac112a98906a011745b348cf72 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 13 Oct 2026 11:32:47 +0200
Subject: [PATCH 520/781] Skip appversion from the ReconnectApp startup
 prefetch body

---
 .../registerPrefetchOnAppStart/index.ts       | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/libs/Prefetch/registerPrefetchOnAppStart/index.ts b/src/libs/Prefetch/registerPrefetchOnAppStart/index.ts
index 8a18ea9ef288..2857ee0ca1d7 100644
--- a/src/libs/Prefetch/registerPrefetchOnAppStart/index.ts
+++ b/src/libs/Prefetch/registerPrefetchOnAppStart/index.ts
@@ -19,6 +19,10 @@ import type RegisterPrefetchOnAppStart from './types';
 const NITRO_FETCH_TARGET = 'fetch';
 const CONTENT_TYPE_HEADER = 'Content-Type';
 
+type PrefetchFormData = {
+    getParts: () => Array<{fieldName: string; string: string}>;
+};
+
 function buildAuthenticateBody(credentials: Credentials): string {
     // NitroFetch token refresh runs outside the JS request pipeline, so we must serialize the
     // Authenticate body here instead of going through Request.post() and enhanceParameters().
@@ -47,6 +51,29 @@ function buildAuthenticateBody(credentials: Credentials): string {
     return body.toString();
 }
 
+function isPrefetchFormData(body: unknown): body is PrefetchFormData {
+    return typeof body === 'object' && body !== null && 'getParts' in body && typeof body.getParts === 'function';
+}
+
+/**
+ * The saved body can be replayed natively on the next app start, which may already be running a newer version after an update.
+ * Sending the old `appversion` there would get a 426 and show the Update Required screen, so it is omitted.
+ */
+function removeAppVersionFromPrefetchBody(body: RequestInit['body']): RequestInit['body'] {
+    if (!isPrefetchFormData(body)) {
+        return body;
+    }
+
+    const prefetchBody = new FormData();
+    for (const part of body.getParts()) {
+        if (part.fieldName === 'appversion') {
+            continue;
+        }
+        prefetchBody.append(part.fieldName, part.string);
+    }
+    return prefetchBody;
+}
+
 function registerPrefetchTokenRefresh(): void {
     const credentials = getCredentials();
 
@@ -80,7 +107,7 @@ const registerPrefetchOnAppStart: RegisterPrefetchOnAppStart = ({prefetchKey, fe
     }
 
     registerPrefetchTokenRefresh();
-    prefetchOnAppStart(url, fetchParams).catch((error) => {
+    prefetchOnAppStart(url, {...fetchParams, body: removeAppVersionFromPrefetchBody(fetchParams.body)}).catch((error) => {
         Log.warn(`[NitroFetch] prefetchOnAppStart failed for ${command}`, {error, fetchParams, url});
     });
 };

From f8fcf9b36b4ca5847f4bd4f73e473f0499f72435 Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 09:33:17 +0000
Subject: [PATCH 521/781] Load bulk edit categories and tags with the shared
 loaders

Reuse useLoadPolicyCategories and useLoadPolicyTags so a partial collection on a lazy-loaded account still triggers a full read.

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../SearchEditMultiplePage.tsx                | 29 ++++---------------
 tests/ui/SearchEditMultiplePageTest.tsx       | 28 ++++++++++++++----
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
index dba4bb35a2e0..a5f779ed4006 100644
--- a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
+++ b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
@@ -12,8 +12,9 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDelegateAccountID from '@hooks/useDelegateAccountID';
+import useLoadPolicyCategories from '@hooks/useLoadPolicyCategories';
+import useLoadPolicyTags from '@hooks/useLoadPolicyTags';
 import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
@@ -21,8 +22,6 @@ import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearBulkEditDraftTransaction, updateMultipleMoneyRequests} from '@libs/actions/IOU/BulkEdit';
-import {openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
-import {openPolicyTagsPage} from '@libs/actions/Policy/Tag';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
@@ -176,26 +175,10 @@ function SearchEditMultiplePage() {
     const areAttendeesEnabled = areSelectedTransactionsExpenses && isAttendeeTrackingEnabledForSelection;
 
     // Policy categories and tags are not part of the search snapshot, and this page can be opened straight from Search
-    // before any screen has loaded them (e.g. after a cache clear), so fetch them here or their rows stay hidden.
-    const fetchPolicyData = () => {
-        if (!policyID) {
-            return;
-        }
-        if (policy?.areCategoriesEnabled && !policyCategories) {
-            openPolicyCategoriesPage(policyID);
-        }
-        if (policy?.areTagsEnabled && !policyTags) {
-            openPolicyTagsPage(policyID);
-        }
-    };
-
-    useNetwork({onReconnect: fetchPolicyData});
-
-    useEffect(() => {
-        fetchPolicyData();
-        // Only refetch when the policy or its enabled features change, not when the fetched data lands.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policyID, policy?.areCategoriesEnabled, policy?.areTagsEnabled]);
+    // before any screen has fully loaded them (e.g. after a cache clear, or on a lazy-loaded account that only holds the
+    // values already on its expenses), so load them here or their rows stay hidden or incomplete.
+    useLoadPolicyCategories(policy?.areCategoriesEnabled ? policyID : undefined);
+    useLoadPolicyTags(policy?.areTagsEnabled ? policyID : undefined);
 
     useEffect(() => {
         return () => {
diff --git a/tests/ui/SearchEditMultiplePageTest.tsx b/tests/ui/SearchEditMultiplePageTest.tsx
index c4fd2b8e5cb1..bbaaa171f40d 100644
--- a/tests/ui/SearchEditMultiplePageTest.tsx
+++ b/tests/ui/SearchEditMultiplePageTest.tsx
@@ -12,7 +12,7 @@ import ThemeStylesProvider from '@components/ThemeStylesContextProvider';
 import SearchEditMultiplePage from '@pages/Search/SearchEditMultiple/SearchEditMultiplePage';
 
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
-import {openPolicyCategoriesPage} from '@userActions/Policy/Category';
+import {getPolicyCategories} from '@userActions/Policy/Category';
 import {openPolicyTagsPage} from '@userActions/Policy/Tag';
 
 import CONST from '@src/CONST';
@@ -36,7 +36,7 @@ import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'
 
 jest.mock('@userActions/Policy/Category', () => ({
     ...jest.requireActual<Record<string, unknown>>('@userActions/Policy/Category'),
-    openPolicyCategoriesPage: jest.fn(),
+    getPolicyCategories: jest.fn(),
 }));
 
 jest.mock('@userActions/Policy/Tag', () => ({
@@ -196,15 +196,33 @@ describe('SearchEditMultiplePage', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Then it fetches them itself, since the search snapshot doesn't include them and the Category/Tag rows depend on them
-        expect(openPolicyCategoriesPage).toHaveBeenCalledWith(POLICY_ID);
+        expect(getPolicyCategories).toHaveBeenCalledWith(POLICY_ID);
+        expect(openPolicyTagsPage).toHaveBeenCalledWith(POLICY_ID);
+    });
+
+    it('fetches policy categories and tags when only a partial set is in Onyx', async () => {
+        // Given a lazy-loaded account that only holds the category and tag already on its expenses, with no completed read
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {areCategoriesEnabled: true, areTagsEnabled: true});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`, {Food: {name: 'Food', enabled: true}});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${POLICY_ID}`, {Department: {name: 'Department', required: false, orderWeight: 0, tags: {Sales: {name: 'Sales', enabled: true}}}});
+        await selectTransactions([OPEN_TRANSACTION_ID]);
+
+        // When the Edit multiple page opens
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it still fetches them, because a partial collection can be missing other categories or whole tag lists
+        expect(getPolicyCategories).toHaveBeenCalledWith(POLICY_ID);
         expect(openPolicyTagsPage).toHaveBeenCalledWith(POLICY_ID);
     });
 
     it('does not refetch policy categories and tags that are already loaded', async () => {
-        // Given a workspace with categories and tags enabled whose categories and tags are already in Onyx
+        // Given a workspace with categories and tags enabled whose categories and tags were already fully loaded
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {areCategoriesEnabled: true, areTagsEnabled: true});
         await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`, {Food: {name: 'Food', enabled: true}});
         await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${POLICY_ID}`, {Department: {name: 'Department', required: false, orderWeight: 0, tags: {Sales: {name: 'Sales', enabled: true}}}});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE}${POLICY_ID}`, {isLoading: false, hasOnceLoaded: true});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE}${POLICY_ID}`, {isLoading: false, hasOnceLoaded: true});
         await selectTransactions([OPEN_TRANSACTION_ID]);
 
         // When the Edit multiple page opens
@@ -212,7 +230,7 @@ describe('SearchEditMultiplePage', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Then no extra request is made, so opening the page doesn't add network traffic when the data is already available
-        expect(openPolicyCategoriesPage).not.toHaveBeenCalled();
+        expect(getPolicyCategories).not.toHaveBeenCalled();
         expect(openPolicyTagsPage).not.toHaveBeenCalled();
     });
 });

From 5c9ff12c4cfbd7a8e9d18405818d1b40c8252752 Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 09:40:10 +0000
Subject: [PATCH 522/781] Remove code comment above policy data loading

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
index a5f779ed4006..6174ee24dfca 100644
--- a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
+++ b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
@@ -174,9 +174,6 @@ function SearchEditMultiplePage() {
     const areTagsEnabled = areSelectedTransactionsExpenses && !!policy?.areTagsEnabled && hasEnabledTags(policyTagLists);
     const areAttendeesEnabled = areSelectedTransactionsExpenses && isAttendeeTrackingEnabledForSelection;
 
-    // Policy categories and tags are not part of the search snapshot, and this page can be opened straight from Search
-    // before any screen has fully loaded them (e.g. after a cache clear, or on a lazy-loaded account that only holds the
-    // values already on its expenses), so load them here or their rows stay hidden or incomplete.
     useLoadPolicyCategories(policy?.areCategoriesEnabled ? policyID : undefined);
     useLoadPolicyTags(policy?.areTagsEnabled ? policyID : undefined);
 

From dc46544694de362e179b300e355296b5e9ebe8d8 Mon Sep 17 00:00:00 2001
From: "Vinh Hoang (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 10:01:33 +0000
Subject: [PATCH 523/781] Call addSMSDomainIfPhoneNumber directly instead of
 the contact method wrapper

Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>
---
 .../DynamicContactMethodDetailsPage.tsx       |  5 +-
 ...ltContactMethodConfirmValidateCodePage.tsx |  5 +-
 src/pages/settings/Profile/Contacts/utils.ts  | 11 -----
 tests/unit/PhoneNumberTest.ts                 | 48 ++++++++++++++++++-
 ...getDecodedContactMethodFromUriParamTest.ts | 47 ------------------
 5 files changed, 51 insertions(+), 65 deletions(-)
 delete mode 100644 src/pages/settings/Profile/Contacts/utils.ts
 delete mode 100644 tests/unit/getDecodedContactMethodFromUriParamTest.ts

diff --git a/src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx
index bb79c19b6771..c5a9b9a6b7e0 100644
--- a/src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx
@@ -40,6 +40,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 import {expensifyLoginsSelector} from '@libs/UserUtils';
 
 import {close} from '@userActions/Modal';
@@ -57,8 +58,6 @@ import {useIsFocused} from '@react-navigation/native';
 import {Str} from 'expensify-common';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 
-import getDecodedContactMethodFromUriParam from './utils';
-
 type DynamicContactMethodDetailsPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.DYNAMIC_CONTACT_METHOD_DETAILS>;
 
 function DynamicContactMethodDetailsPage({route}: DynamicContactMethodDetailsPageProps) {
@@ -88,7 +87,7 @@ function DynamicContactMethodDetailsPage({route}: DynamicContactMethodDetailsPag
     /**
      * Gets the current contact method from the route params
      */
-    const contactMethod: string = useMemo(() => getDecodedContactMethodFromUriParam(route.params.contactMethod), [route.params.contactMethod]);
+    const contactMethod: string = useMemo(() => addSMSDomainIfPhoneNumber(route.params.contactMethod), [route.params.contactMethod]);
 
     const loginDataRef = useRef<Login | undefined>(undefined);
     const loginData = useMemo(() => {
diff --git a/src/pages/settings/Profile/Contacts/SetDefaultContactMethodConfirmValidateCodePage.tsx b/src/pages/settings/Profile/Contacts/SetDefaultContactMethodConfirmValidateCodePage.tsx
index 9b7513ebbc8d..98330ca4f6ca 100644
--- a/src/pages/settings/Profile/Contacts/SetDefaultContactMethodConfirmValidateCodePage.tsx
+++ b/src/pages/settings/Profile/Contacts/SetDefaultContactMethodConfirmValidateCodePage.tsx
@@ -12,6 +12,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 import {expensifyLoginsSelector, getContactMethod} from '@libs/UserUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -21,14 +22,12 @@ import type SCREENS from '@src/SCREENS';
 import {CONST as COMMON_CONST} from 'expensify-common';
 import React, {useEffect} from 'react';
 
-import getDecodedContactMethodFromUriParam from './utils';
-
 type SetDefaultContactMethodConfirmValidateCodePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_SET_DEFAULT_CONFIRM>;
 
 function SetDefaultContactMethodConfirmValidateCodePage({route}: SetDefaultContactMethodConfirmValidateCodePageProps) {
     const {translate, formatPhoneNumber} = useLocalize();
     const backTo = route.params?.backTo;
-    const contactMethod = getDecodedContactMethodFromUriParam(route.params.contactMethod);
+    const contactMethod = addSMSDomainIfPhoneNumber(route.params.contactMethod);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
diff --git a/src/pages/settings/Profile/Contacts/utils.ts b/src/pages/settings/Profile/Contacts/utils.ts
deleted file mode 100644
index 9edae95e7d82..000000000000
--- a/src/pages/settings/Profile/Contacts/utils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
-
-/**
- * Gets the contact method from the route params. The router already decodes path params once,
- * so decoding again here would throw on a literal `%` (e.g. `test%alias@gmail.com`) or alter valid escapes.
- */
-function getDecodedContactMethodFromUriParam(contactMethodParam: string) {
-    return addSMSDomainIfPhoneNumber(contactMethodParam);
-}
-
-export default getDecodedContactMethodFromUriParam;
diff --git a/tests/unit/PhoneNumberTest.ts b/tests/unit/PhoneNumberTest.ts
index ef4fa599492f..195ea486b143 100644
--- a/tests/unit/PhoneNumberTest.ts
+++ b/tests/unit/PhoneNumberTest.ts
@@ -1,4 +1,4 @@
-import {parsePhoneNumber} from '@libs/PhoneNumber';
+import {addSMSDomainIfPhoneNumber, parsePhoneNumber} from '@libs/PhoneNumber';
 
 describe('PhoneNumber', () => {
     describe('parsePhoneNumber', () => {
@@ -40,4 +40,50 @@ describe('PhoneNumber', () => {
             }
         });
     });
+
+    describe('addSMSDomainIfPhoneNumber', () => {
+        it('returns an email containing a literal % without throwing', () => {
+            // Given a contact method route param the router already decoded, for an email whose `%al` is not a valid escape sequence
+            const contactMethodParam = 'test%alias@gmail.com';
+
+            // When the contact method pages read it
+            const contactMethod = addSMSDomainIfPhoneNumber(contactMethodParam);
+
+            // Then the email is kept as-is, because decoding it a second time would throw a URIError and crash the page
+            expect(contactMethod).toBe('test%alias@gmail.com');
+        });
+
+        it('does not decode valid escape sequences', () => {
+            // Given an already-decoded email that happens to contain a valid escape sequence
+            const contactMethodParam = 'a%41b@x.com';
+
+            // When the contact method pages read it
+            const contactMethod = addSMSDomainIfPhoneNumber(contactMethodParam);
+
+            // Then the email is kept as-is, because turning `%41` into `A` would make the login lookup miss
+            expect(contactMethod).toBe('a%41b@x.com');
+        });
+
+        it('returns a regular email unchanged', () => {
+            // Given a regular email
+            const contactMethodParam = 'test@gmail.com';
+
+            // When the contact method pages read it
+            const contactMethod = addSMSDomainIfPhoneNumber(contactMethodParam);
+
+            // Then the email matches the login key stored in the login list
+            expect(contactMethod).toBe('test@gmail.com');
+        });
+
+        it('adds the SMS domain to a phone number', () => {
+            // Given a phone number, which is stored in the login list with the SMS domain
+            const contactMethodParam = '+15005550006';
+
+            // When the contact method pages read it
+            const contactMethod = addSMSDomainIfPhoneNumber(contactMethodParam);
+
+            // Then the SMS domain is added so the login lookup finds the phone number
+            expect(contactMethod).toBe('+15005550006@expensify.sms');
+        });
+    });
 });
diff --git a/tests/unit/getDecodedContactMethodFromUriParamTest.ts b/tests/unit/getDecodedContactMethodFromUriParamTest.ts
deleted file mode 100644
index 31cc500b7823..000000000000
--- a/tests/unit/getDecodedContactMethodFromUriParamTest.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import getDecodedContactMethodFromUriParam from '@pages/settings/Profile/Contacts/utils';
-
-describe('getDecodedContactMethodFromUriParam', () => {
-    it('returns an email containing a literal % without throwing', () => {
-        // Given a route param the router already decoded, for an email whose `%al` is not a valid escape sequence
-        const contactMethodParam = 'test%alias@gmail.com';
-
-        // When the contact method details page reads it
-        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
-
-        // Then the email is kept as-is, because decoding it a second time would throw a URIError and crash the page
-        expect(contactMethod).toBe('test%alias@gmail.com');
-    });
-
-    it('does not decode valid escape sequences a second time', () => {
-        // Given an already-decoded email that happens to contain a valid escape sequence
-        const contactMethodParam = 'a%41b@x.com';
-
-        // When the contact method details page reads it
-        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
-
-        // Then the email is kept as-is, because turning `%41` into `A` would make the login lookup miss
-        expect(contactMethod).toBe('a%41b@x.com');
-    });
-
-    it('returns a regular email unchanged', () => {
-        // Given a regular email route param
-        const contactMethodParam = 'test@gmail.com';
-
-        // When the contact method details page reads it
-        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
-
-        // Then the email matches the login key stored in the login list
-        expect(contactMethod).toBe('test@gmail.com');
-    });
-
-    it('adds the SMS domain to a phone number', () => {
-        // Given a phone number route param, which is stored in the login list with the SMS domain
-        const contactMethodParam = '+15005550006';
-
-        // When the contact method details page reads it
-        const contactMethod = getDecodedContactMethodFromUriParam(contactMethodParam);
-
-        // Then the SMS domain is added so the login lookup finds the phone number
-        expect(contactMethod).toBe('+15005550006@expensify.sms');
-    });
-});

From 78b8f412d064e657d24567fe3fedf51abce18268 Mon Sep 17 00:00:00 2001
From: "Garrett Knight (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 10:15:01 +0000
Subject: [PATCH 524/781] Docs: address review comments on plan-change articles

Co-authored-by: Garrett Knight <garrettmknight@users.noreply.github.com>
---
 .../Learn-About-Billing-Permissions.md        |  4 ++--
 .../Change-Your-Workspace-Plan.md             | 24 +++++++++----------
 ...-About-Plan-and-Subscription-Management.md |  8 +++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions.md b/docs/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions.md
index 1fb8f2825430..d70ec3a64667 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions.md
@@ -11,7 +11,7 @@ order: 2
 
 # Learn About Billing Permissions
 
-Every Workspace has a Workspace owner, sometimes called the billing owner. The Workspace owner is responsible for the Workspace's Expensify subscription and is the only person who can manage billing-related settings like plans and subscriptions.
+Every Workspace has a Workspace owner, sometimes called the billing owner. The Workspace owner is responsible for the Workspace's Expensify subscription and is the only person who can manage billing-related settings like the subscription and payment method. Any Workspace Admin can change the Workspace's plan, which affects the Workspace owner's bill.
 
 To change the Workspace owner, see [Transfer Workspace Ownership](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-billing/Transfer-Workspace-Ownership).
 
@@ -57,7 +57,7 @@ No. Each Workspace has one Workspace owner, although the same member can own mul
 
 ## Can Workspace Admins manage billing?
 
-No. Workspace Admins can only manage workspace settings, but only the Workspace owner can manage billing and related settings. To learn more about the difference between Workspace Admin and Workspace owner, see [What member terms mean](/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Terms-and-Definitions).
+Partly. Workspace Admins can manage Workspace settings and change the Workspace's plan, but only the Workspace owner can manage the subscription, payment method, and other billing settings. To learn more about changing the plan, see [Change Your Workspace Plan](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan). To learn more about the difference between Workspace Admin and Workspace owner, see [What member terms mean](/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Terms-and-Definitions).
 
 ## Who can view the Expensify billing receipts? 
 
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
index 14549eb251e6..f83efcdd6778 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Change-Your-Workspace-Plan.md
@@ -1,8 +1,8 @@
 ---
 title: Change Your Workspace Plan
 description: Change your Workspace's Plan type to Collect or Control. 
-keywords: [New Expensify, change workspace plan, switch plan, Collect plan, Control plan, Submit plan, plan type, upgrade, downgrade, upgrade to Control, downgrade to Collect, upgrade Submit workspace, workspace admin]
-internalScope: Audience is Workspace admins. Covers how to switch a Workspace between the Collect and Control plans, who's notified in the #admins room when the plan changes, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
+keywords: [New Expensify, change workspace plan, switch plan, Collect plan, Control plan, Submit plan, plan type, upgrade, downgrade, upgrade to Control, downgrade to Collect, upgrade Submit workspace, Workspace Admin]
+internalScope: Audience is Workspace Admins. Covers how to switch a Workspace between the Collect and Control plans, what happens in the #admins room after the plan changes, and how upgrading a free Submit workspace works. Does not cover the differences between plans or how to change a subscription.
 retrievalIntent: How to switch a Workspace plan between Collect and Control.
 contentType: task
 platform: new
@@ -19,20 +19,20 @@ To learn which plan is right for your organization, see [Compare Collect and Con
 
 ## Who can change the workspace plan
 
-Any Workspace Admin can change a workspace's plan, including upgrading from Collect to Control and downgrading from Control to Collect. 
+Any Workspace Admin can change a Workspace's plan, including upgrading from Collect to Control and downgrading from Control to Collect. 
 
-The Workspace owner pays for the workspace, so plan changes made by any Workspace Admin affect the Workspace owner's bill.
+The Workspace owner pays for the Workspace, so plan changes made by any Workspace Admin affect the Workspace owner's bill.
 
 If you have an Annual subscription, changes to your plan may be restricted. To learn more, see [When You Can Change Your Plan](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management#when-you-can-change-your-plan).
 
 ---
 
-## Who's notified when the workspace plan changes
+## What happens after you change the Workspace plan
 
-When a Workspace Admin changes the plan, Expensify posts a message in the workspace's **#admins** room. The Workspace owner and all Workspace Admins can see it. The message shows which admin made the change.
+When a Workspace Admin changes the plan, Expensify posts a message in the Workspace's **#admins** room. The message shows which Workspace Admin made the change, and the Workspace owner and all Workspace Admins can see it.
 
-- **Upgrade to Control:** The #admins room shows "[Admin name] upgraded this workspace to the Control plan." The admin who upgraded also gets a private message in #admins with Control plan pricing and a link to **Settings > Subscription**. Only that admin can see it.
-- **Downgrade to Collect:** The #admins room shows "[Admin name] downgraded this workspace to the Collect plan."
+- **Upgrade to Control:** The message says "[Admin name] upgraded this workspace to the Control plan." The Workspace Admin who upgraded also gets a private message in #admins with Control plan pricing.
+- **Downgrade to Collect:** The message says "[Admin name] downgraded this workspace to the Collect plan."
 
 ---
 
@@ -63,13 +63,13 @@ A free Submit workspace can be upgraded to Collect or Control. Once upgraded, it
 
 # FAQ
 
-## Can a Workspace Admin change the workspace plan?
+## Can a Workspace Admin change the Workspace plan?
 
-Yes. Any Workspace Admin can upgrade or downgrade the workspace plan. Subscription settings, such as the subscription type and payment card, are still managed by the Workspace owner.
+Yes. Any Workspace Admin can upgrade or downgrade the Workspace plan. Subscription settings, such as the subscription type and payment card, are still managed by the Workspace owner.
 
-## How will the Workspace owner know if an admin changed the plan?
+## How will the Workspace owner know if a Workspace Admin changed the plan?
 
-Expensify posts every plan change in the workspace's **#admins** room, which the Workspace owner and all Workspace Admins can see. The message shows which admin upgraded or downgraded the workspace.
+Expensify posts every plan change in the Workspace's **#admins** room, which the Workspace owner and all Workspace Admins can see. The message shows which Workspace Admin upgraded or downgraded the Workspace.
 
 ## Can I switch back to Control after downgrading to Collect?
 
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
index 9b0f75355d71..cd7a34adcdb2 100644
--- a/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
+++ b/docs/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-subscription/Learn-About-Plan-and-Subscription-Management.md
@@ -1,8 +1,8 @@
 ---
 title: Learn About Plan and Subscription Management
 description: Learn who can change a Workspace's plan or subscription in New Expensify and the conditions that apply, including when you can and can't downgrade.
-keywords: [New Expensify, plan management, subscription management, change plan, change subscription, downgrade plan, workspace Owner, workspace admin, Collect, Control, Annual, Pay-per-use]
-internalScope: Audience is Workspace owners and Workspace admins. Covers who can change a Workspace's plan or subscription and the conditions that apply. Does not cover plan features or how to change a subscription.
+keywords: [New Expensify, plan management, subscription management, change plan, change subscription, downgrade plan, workspace Owner, Workspace Admin, Collect, Control, Annual, Pay-per-use]
+internalScope: Audience is Workspace owners and Workspace Admins. Covers who can change a Workspace's plan or subscription and the conditions that apply. Does not cover plan features or how to change a subscription.
 retrievalIntent: When are Workspace plan or subscription changes allowed.
 contentType: topic
 platform: new
@@ -21,7 +21,7 @@ If you're new to Expensify billing, start with [Learn How Billing and Subscripti
 
 Any Workspace Admin can change the Workspace's plan, including upgrading from Collect to Control and downgrading from Control to Collect.
 
-Only the Workspace owner can manage the Workspace's subscription. Each workspace has exactly one owner, whose payment card is charged for the subscription. Plan changes made by any Workspace Admin affect the Workspace owner's bill.
+Only the Workspace owner can manage the Workspace's subscription. Each Workspace has exactly one owner, whose payment card is charged for the subscription. Plan changes made by any Workspace Admin affect the Workspace owner's bill.
 
 To learn more, see [Learn About Billing Permissions](/articles/new-expensify/billing-and-subscriptions/Learn-About-Billing-Permissions).
 
@@ -57,7 +57,7 @@ Use these articles to complete common plan and subscription tasks:
 
 ## Can a Workspace Admin change the plan or subscription?
 
-A Workspace Admin can change the plan, but not the subscription. Only the Workspace owner can manage the Workspace's subscription. If an admin needs to change the subscription, they must first become the Workspace owner. [Learn how to transfer workspace ownership](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-billing/Transfer-Workspace-Ownership).
+A Workspace Admin can change the plan, but not the subscription. Only the Workspace owner can manage the Workspace's subscription. If a Workspace Admin needs to change the subscription, they must first become the Workspace owner. [Learn how to transfer Workspace ownership](/articles/new-expensify/billing-and-subscriptions/manage-your-subscription-and-billing/manage-billing/Transfer-Workspace-Ownership).
 
 ## Why can't I switch from Control to Collect?
 

From 3df9a8d4678d96da7a88c3ff648ef8699472f911 Mon Sep 17 00:00:00 2001
From: "Gandalf (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 10:23:42 +0000
Subject: [PATCH 525/781] Document how admins set a member's display name

Co-authored-by: Gandalf <allgandalf@users.noreply.github.com>
---
 .../workspaces/Managing-Workspace-Members.md      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/workspaces/Managing-Workspace-Members.md b/docs/articles/new-expensify/workspaces/Managing-Workspace-Members.md
index 7179adb64976..2821511d1309 100644
--- a/docs/articles/new-expensify/workspaces/Managing-Workspace-Members.md
+++ b/docs/articles/new-expensify/workspaces/Managing-Workspace-Members.md
@@ -1,7 +1,7 @@
 ---
 title: Managing Workspace Members in New Expensify
 description: Learn how to add, remove, filter, and manage user roles in a New Expensify workspace.
-keywords: [New Expensify, workspace members, add user, remove user, user roles, workspace admin, card admin, people admin, payments admin, invite users, filter members, role filter]
+keywords: [New Expensify, workspace members, add user, remove user, user roles, workspace admin, card admin, people admin, payments admin, invite users, filter members, role filter, member display name]
 ---
 
 
@@ -100,6 +100,19 @@ On the web, you can also change a member’s role directly from the members list
 
 ---
 
+# How to Set a Member’s Display Name
+
+Workspace admins can set a display name for a member who hasn’t added a name of their own.
+
+1. Go to **Workspaces > [Workspace Name] > Members**.
+2. Click the member’s name.
+3. In the right-hand panel, click **Profile**.
+4. Click **Display name**, enter a first and last name, and click **Save**.
+
+The name applies in every workspace the member belongs to. After it’s saved, only the member can change it.
+
+---
+
 # Transfer Workspace Ownership
 
 To transfer ownership to another admin:

From 0fddc9e79f33b00a154064b78fd127c74451de84 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 13 Oct 2026 12:25:36 +0200
Subject: [PATCH 526/781] chore: restore main's formatting of four files the
 merge reformatted

---
 .../ReportActionItem/MoneyReportView.tsx      | 25 ++++++++++---------
 .../AppNavigator/AuthScreensInitHandler.tsx   | 16 ++----------
 src/libs/ReportActionsUtils.ts                |  2 +-
 src/libs/TransactionUtils/index.ts            | 14 ++++++-----
 4 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index f030814433c7..bfd03faed323 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -159,18 +159,19 @@ function MoneyReportView({
                 {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
                 {!isClosedExpenseReportWithNoExpenses && (
                     <>
-                        {shouldDisplayReportFields && (!isCombinedReport || !isOnlyTitleFieldEnabled) && (
-                            // One-expense reports edit their fields in place like the report view does, instead of
-                            // opening the report field editor page. They stay one field per row though: this screen
-                            // reads as a single expense rather than a table, so the fields stack vertically here.
-                            <MoneyRequestViewReportFields
-                                report={report}
-                                policy={policy}
-                                pendingAction={pendingAction}
-                                style={styles.mt5}
-                                shouldUseSingleColumn
-                            />
-                        )}
+                        {shouldDisplayReportFields &&
+                            (!isCombinedReport || !isOnlyTitleFieldEnabled) && (
+                                // One-expense reports edit their fields in place like the report view does, instead of
+                                // opening the report field editor page. They stay one field per row though: this screen
+                                // reads as a single expense rather than a table, so the fields stack vertically here.
+                                <MoneyRequestViewReportFields
+                                    report={report}
+                                    policy={policy}
+                                    pendingAction={pendingAction}
+                                    style={styles.mt5}
+                                    shouldUseSingleColumn
+                                />
+                            )}
                         {shouldShowTotalRow && (
                             <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
                                 <View style={[styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx b/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
index 5df3ff56cc80..0250e3d1e4b9 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
@@ -161,13 +161,7 @@ function AuthScreensInitHandler() {
             return;
         }
         // This means sign in in RHP was successful, so we can subscribe to user events
-        initializePusher(
-            session?.accountID,
-            session?.email,
-            () => topmostOneTransactionThreadReportIDRef.current,
-            formatPhoneNumber,
-            () => reportAttributesRef.current,
-        );
+        initializePusher(session?.accountID, session?.email, () => topmostOneTransactionThreadReportIDRef.current, formatPhoneNumber, () => reportAttributesRef.current);
         // eslint-disable-next-line react-hooks/exhaustive-deps -- This handler should only be re-registered when the session changes.
     }, [session?.accountID, session?.email]);
 
@@ -196,13 +190,7 @@ function AuthScreensInitHandler() {
         });
         PusherConnectionManager.init();
 
-        initializePusher(
-            session?.accountID,
-            session?.email,
-            () => topmostOneTransactionThreadReportIDRef.current,
-            formatPhoneNumber,
-            () => reportAttributesRef.current,
-        ).finally(() => {
+        initializePusher(session?.accountID, session?.email, () => topmostOneTransactionThreadReportIDRef.current, formatPhoneNumber, () => reportAttributesRef.current).finally(() => {
             endSpan(CONST.TELEMETRY.SPAN_NAVIGATION.PUSHER_INIT);
         });
 
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 6152430b3b8f..e1c7a05acba0 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -726,7 +726,7 @@ function getSystemMessageDisplayState(
         displayReportActions.push(reportAction);
     };
 
-    for (let index = 0; index < chronologicalActions.length;) {
+    for (let index = 0; index < chronologicalActions.length; ) {
         const reportAction = chronologicalActions.at(index);
         if (!reportAction) {
             index++;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 1ae5b3e68c08..08cbbf570b8f 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -1544,12 +1544,14 @@ function getChildTransactions(transactions: OnyxCollection<Transaction>, origina
 function createUnreportedExpenses(transactions: Array<OnyxEntry<Transaction> | undefined>): UnreportedExpenseListItemType[] {
     return transactions
         .filter((t): t is Transaction => t !== undefined)
-        .map((transaction): UnreportedExpenseListItemType => ({
-            ...transaction,
-            isDisabled: isTransactionPendingDelete(transaction),
-            keyForList: transaction.transactionID,
-            errors: transaction.errors as Errors | undefined,
-        }));
+        .map(
+            (transaction): UnreportedExpenseListItemType => ({
+                ...transaction,
+                isDisabled: isTransactionPendingDelete(transaction),
+                keyForList: transaction.transactionID,
+                errors: transaction.errors as Errors | undefined,
+            }),
+        );
 }
 
 type GetEligibleTransactionsToAddParams = {

From ade8996728295f237293bf1eaa92907e4a527285 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 13 Oct 2026 12:47:43 +0200
Subject: [PATCH 527/781] Add tests

---
 tests/unit/RegisterPrefetchOnAppStartTest.ts | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 tests/unit/RegisterPrefetchOnAppStartTest.ts

diff --git a/tests/unit/RegisterPrefetchOnAppStartTest.ts b/tests/unit/RegisterPrefetchOnAppStartTest.ts
new file mode 100644
index 000000000000..425b9985b08e
--- /dev/null
+++ b/tests/unit/RegisterPrefetchOnAppStartTest.ts
@@ -0,0 +1,57 @@
+import registerPrefetchOnAppStart from '@libs/Prefetch/registerPrefetchOnAppStart';
+
+import {prefetchOnAppStart} from 'react-native-nitro-fetch';
+
+const URL = 'https://www.expensify.com.dev/api/ReconnectApp?';
+const PREFETCH_KEY = 'ReconnectApp:1';
+
+type ReactNativeFormDataPart = {fieldName: string; string: string};
+
+/** Jest's FormData has no getParts, so this mimics the RN FormData the app sends on native */
+function createReactNativeFormData(parts: ReactNativeFormDataPart[]): FormData {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    return {append: jest.fn(), getParts: () => parts} as unknown as FormData;
+}
+
+function getSavedPrefetchBody(): RequestInit['body'] {
+    const [, fetchParams] = jest.mocked(prefetchOnAppStart).mock.calls.at(0) ?? [];
+    return fetchParams?.body;
+}
+
+describe('registerPrefetchOnAppStart', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('saves the prefetch body without appversion and keeps the other fields', () => {
+        // Given a ReconnectApp body with appversion, as built by enhanceParameters
+        const body = createReactNativeFormData([
+            {fieldName: 'authToken', string: 'token'},
+            {fieldName: 'appversion', string: '9.4.89-0'},
+            {fieldName: 'clientUpdateID', string: '123'},
+        ]);
+
+        // When the request is registered for the next app start
+        registerPrefetchOnAppStart({prefetchKey: PREFETCH_KEY, command: 'ReconnectApp', url: URL, fetchParams: {method: 'POST', body}});
+
+        // Then the saved body has no appversion, so a newer version replaying it after an update isn't sent to the server as the old one
+        const savedBody = getSavedPrefetchBody();
+        if (!(savedBody instanceof FormData)) {
+            throw new Error('Expected the saved prefetch body to be FormData');
+        }
+        expect(savedBody.has('appversion')).toBe(false);
+        expect(savedBody.get('authToken')).toBe('token');
+        expect(savedBody.get('clientUpdateID')).toBe('123');
+    });
+
+    it('saves a body that is not RN FormData unchanged', () => {
+        // Given a body that is a plain string, which has no parts to filter
+        const body = 'appversion=9.4.89-0';
+
+        // When the request is registered for the next app start
+        registerPrefetchOnAppStart({prefetchKey: PREFETCH_KEY, command: 'ReconnectApp', url: URL, fetchParams: {method: 'POST', body}});
+
+        // Then the body is saved as is, because only RN FormData bodies are rebuilt
+        expect(getSavedPrefetchBody()).toBe(body);
+    });
+});

From 978830849164de4d108fa25f92851fdc7f15684b Mon Sep 17 00:00:00 2001
From: Jakub Korytko <jakub@korytko.me>
Date: Tue, 13 Oct 2026 12:52:45 +0200
Subject: [PATCH 528/781] fix: dedupe native pre-mount and clear preload on
 reveal fallback

---
 .../GetStateForActionHandlers.ts              | 19 +++++---
 .../handleReplaceFullscreenUnderRHP.test.ts   | 47 +++++++++++++++++++
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
index c7e2f527f938..dc0bedae4209 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
@@ -853,10 +853,12 @@ function withPreMountedDestination(builtTabState: TabStateForReplacement, existi
     const builtDestination = builtNestedState?.routes.at(-1);
     if (!targetTabRoute || !preMountedRoute || !builtNestedState || builtDestination?.name !== preMountedRoute.name) {
         Log.hmmm('[Navigation] Wide pre-mount does not match the revealed destination, replacing without it', {preMountedRouteKey});
-        return builtTabState;
+        return withoutFocusedTabPreload(builtTabState);
     }
 
-    const nestedRoutes = [...builtNestedState.routes.slice(0, -1), {...builtDestination, key: preMountedRouteKey}];
+    // Native keeps the focused report's history, which holds the pre-mount under it, so that copy is dropped to keep keys unique.
+    const backRoutes = builtNestedState.routes.slice(0, -1).filter((route) => !('key' in route) || route.key !== preMountedRouteKey);
+    const nestedRoutes = [...backRoutes, {...builtDestination, key: preMountedRouteKey}];
     // When every screen of the built stack is already mounted, the mounted stack state is kept with only its routes changed.
     // A partial state would be rehydrated under a new key, which makes the navigator re-render all of its screens.
     const mountedNestedState = isRealizedNavigationState(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
@@ -872,10 +874,15 @@ function withPreMountedDestination(builtTabState: TabStateForReplacement, existi
     } else {
         routes[builtTabState.index] = {...targetTabRoute, state: {...builtNestedState, routes: nestedRoutes, index: nestedRoutes.length - 1}};
     }
-    // The pre-mount kept a covered tab unfrozen. It is focused from here, so it no longer needs that.
-    const {preloadedRouteKeys} = builtTabState as TabStateForReplacement & {preloadedRouteKeys?: string[]};
-    const targetTabRouteKey = 'key' in targetTabRoute ? targetTabRoute.key : undefined;
-    return {...builtTabState, routes, ...(preloadedRouteKeys ? {preloadedRouteKeys: preloadedRouteKeys.filter((key) => key !== targetTabRouteKey)} : {})};
+    return withoutFocusedTabPreload({...builtTabState, routes});
+}
+
+/** The pre-mount kept a covered tab unfrozen. It is focused from here, so it no longer needs that. */
+function withoutFocusedTabPreload(tabState: TabStateForReplacement): TabStateForReplacement {
+    const {preloadedRouteKeys} = tabState as TabStateForReplacement & {preloadedRouteKeys?: string[]};
+    const focusedTabRoute = tabState.routes[tabState.index];
+    const focusedTabRouteKey = focusedTabRoute && 'key' in focusedTabRoute ? focusedTabRoute.key : undefined;
+    return {...tabState, ...(preloadedRouteKeys ? {preloadedRouteKeys: preloadedRouteKeys.filter((key) => key !== focusedTabRouteKey)} : {})};
 }
 
 export {
diff --git a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
index 5645d4ed0578..5969927230d6 100644
--- a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
+++ b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
@@ -425,6 +425,29 @@ describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation
         expect(getReportsSplitState(result)?.routes.at(-1)?.params).toEqual({reportID: 'B'});
     });
 
+    it('drops the pre-mount kept in the preserved native history, so the revealed destination is its only copy', () => {
+        // Given a wide native layout with the Reports tab focused on report A and report B pre-mounted under it
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.IOS);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const state = makeExistingReportsState(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B'}, undefined, 'Report-wide-pre-mount-6'),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key'),
+            ],
+            2,
+        );
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-6'}};
+
+        // When report B is revealed under the RHP, which on native keeps the history through the focused report A
+        const result = handleReplaceFullscreenUnderRHP(state, action, CONFIG_OPTIONS, stackRouter);
+
+        // Then the pre-mount appears only as the destination, since duplicate keys would let the navigator show the wrong screen
+        expect(getReportIDs(result)).toEqual([undefined, 'A', 'B']);
+        expect(getReportsSplitState(result)?.routes.map((route) => route.key)).toEqual(['inbox-key', undefined, 'Report-wide-pre-mount-6']);
+    });
+
     it('reveals a report pre-mounted in a covered tab and stops keeping that tab preloaded', () => {
         // Given the Search tab focused and report B pre-mounted on top of the covered Reports tab, which is marked preloaded
         mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
@@ -523,6 +546,30 @@ describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation
         expect(getReportsSplitState(result)?.routes.at(-1)?.key).toBeUndefined();
     });
 
+    it('stops keeping the destination tab preloaded when the pre-mount is gone before a cross-tab reveal', () => {
+        // Given the Search tab focused and the covered Reports tab still marked preloaded, but its pre-mounted report already removed
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const existing = makeExistingReportsState(
+            [makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'), makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key')],
+            1,
+            false,
+        );
+        const tabNavigatorState = existing.routes.at(0)?.state;
+        if (tabNavigatorState) {
+            Object.assign(tabNavigatorState, {preloadedRouteKeys: ['reports-split-key']});
+        }
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-gone'}};
+
+        // When report B is revealed under the RHP without the pre-mount
+        const result = handleReplaceFullscreenUnderRHP(existing, action, CONFIG_OPTIONS, stackRouter);
+        const resultTabState: {index?: number; preloadedRouteKeys?: string[]} | undefined = result?.routes.at(0)?.state;
+
+        // Then the focused Reports tab leaves the preload list, otherwise its screens keep skipping their fetch and read effects
+        expect(resultTabState?.index).toBe(0);
+        expect(resultTabState?.preloadedRouteKeys).toEqual([]);
+    });
+
     it('restores the untouched original Reports stack when the user cancels', () => {
         mockStubbedParsedState = makeReportsParsedState('B');
         const originalState = makeExistingReportsState(

From 635840653c9af281e16c7deec282798ad43e5178 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 12:53:40 +0200
Subject: [PATCH 529/781] Extract shared logic into matchTargetAt worklet

---
 .../Charts/hooks/useChartInteractions.ts      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 1f6c76fff9b9..a8d81c877bee 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -312,22 +312,29 @@ function useChartInteractions({
         return updateInteractionFlags(hitTestArgs.targetIndex, hitTestArgs.cursorX, hitTestArgs.cursorY, hitTestArgs.chartBottom);
     };
 
+    /** Resolves the target at the given chart position, then updates the interaction flags and returns whether the cursor is over the target */
+    const matchTargetAt = (cursorX: number, cursorY: number) => {
+        'worklet';
+
+        const bottom = chartBottom?.get() ?? cursorY;
+        const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
+        const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
+        applyTargetIndex(targetIndex);
+        return updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+    };
+
     /** Moves the hover cursor to the given chart position and updates the matched target and the tooltip visibility */
     const updateHoverAt = (cursorX: number, cursorY: number) => {
         'worklet';
 
         chartInteractionState.cursor.x.set(cursorX);
         chartInteractionState.cursor.y.set(cursorY);
-        const bottom = chartBottom?.get() ?? cursorY;
         const isOverCurrentTarget = updateCurrentInteractionFlags();
         // Only update the matched index when the cursor is not over the current target.
         // This keeps the active index locked while hovering over a bar/point/label,
         // preventing it from jumping to a different point during continuous movement.
         if (!isOverCurrentTarget) {
-            const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
-            const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
-            applyTargetIndex(targetIndex);
-            updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+            matchTargetAt(cursorX, cursorY);
         }
     };
 
@@ -377,11 +384,7 @@ function useChartInteractions({
                 chartInteractionState.isActive.set(true);
                 chartInteractionState.cursor.x.set(cursorX);
                 chartInteractionState.cursor.y.set(cursorY);
-                const bottom = chartBottom?.get() ?? cursorY;
-                const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
-                const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
-                applyTargetIndex(targetIndex);
-                updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+                matchTargetAt(cursorX, cursorY);
             })
             .onUpdate((e) => {
                 'worklet';
@@ -409,12 +412,8 @@ function useChartInteractions({
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';
 
-        const bottom = chartBottom?.get() ?? cursorY;
-        const touchX = cursorY >= bottom && resolveLabelTouchX ? resolveLabelTouchX(cursorX, cursorY) : cursorX;
-        const targetIndex = getResolvedTargetIndex(cursorX, cursorY, touchX);
         chartInteractionState.isActive.set(true);
-        applyTargetIndex(targetIndex);
-        const isOverTarget = updateInteractionFlags(targetIndex, cursorX, cursorY, bottom);
+        const isOverTarget = matchTargetAt(cursorX, cursorY);
         if (!isOverTarget) {
             scheduleOnRN(dismissTouchTooltip);
             return;

From 972a5bbe150204085aa1882c186a65358107da2f Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 12:57:42 +0200
Subject: [PATCH 530/781] call hoverAt instead of repeating the lookup

---
 src/components/Charts/PieChart/PieChartContent.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index d5f602ea536e..6bf3d3520edc 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -126,6 +126,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
     const dismissTouchedSlice = () => {
         matchedIndex.set(-1);
         setIsTouchPinned(false);
+        setIsHoveringOverPie(false);
     };
 
     // Hover gesture
@@ -176,10 +177,8 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
 
                 // Touch taps show the slice tooltip instead of drilling in, and the next touch anywhere on the screen hides it
                 if (e.pointerType === PointerType.TOUCH) {
-                    const dataIndex = findDataIndexAt(e.x, e.y);
-                    tooltipPosition.set({x: e.x, y: e.y - TOOLTIP_BAR_GAP});
-                    matchedIndex.set(dataIndex);
-                    scheduleOnRN(setIsTouchPinned, dataIndex >= 0);
+                    hoverAt(e.x, e.y);
+                    scheduleOnRN(setIsTouchPinned, matchedIndex.get() >= 0);
                     return;
                 }
 

From 4f74d79234e1cbff794d9f7e991365aa9e8a0bb0 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 13:11:05 +0200
Subject: [PATCH 531/781] perf(selectors): scope reports parent hierarchy
 subscription to the ancestor chain

Replace the whole-collection reportsParentHierarchySelector with
reportParentChainSelector(reportID), which walks only the given report and
its ancestors. ReportActionItem and MoneyRequestReceiptView now pass their
reportID so unrelated report updates no longer re-render them.
---
 .../MoneyRequestReceiptView.tsx               |  2 +-
 src/hooks/useReportsParentHierarchy.ts        | 14 ++--
 src/pages/inbox/report/ReportActionItem.tsx   |  2 +-
 src/selectors/Report.ts                       | 31 +++++----
 tests/ui/ClearReportActionErrorsUITest.tsx    | 64 +++++++++++++++++++
 tests/unit/ClearReportActionErrorsTest.ts     | 45 +++++++++++++
 tests/unit/selectors/ReportTest.ts            | 64 ++++++++++++++++++-
 7 files changed, 201 insertions(+), 21 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
index dc16d8eb13b0..0f49064c7ce9 100644
--- a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
@@ -171,7 +171,7 @@ function MoneyRequestReceiptView({
     const [parentReportActionChildReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(parentReportAction?.childReportID)}`);
 
     const originalReportID = useOriginalReportID(report?.reportID, parentReportAction);
-    const reportsParentHierarchy = useReportsParentHierarchy();
+    const reportsParentHierarchy = useReportsParentHierarchy(report?.reportID);
     const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(parentReportAction);
     const iouReportTransactionsCollection = useReportTransactionsCollection(iouReport?.reportID);
     const iouReportTransactions = Object.values(iouReportTransactionsCollection);
diff --git a/src/hooks/useReportsParentHierarchy.ts b/src/hooks/useReportsParentHierarchy.ts
index 43dd826bd057..9b2291b4ef0a 100644
--- a/src/hooks/useReportsParentHierarchy.ts
+++ b/src/hooks/useReportsParentHierarchy.ts
@@ -1,20 +1,20 @@
 import type {ReportHierarchyInfo} from '@userActions/ClearReportActionErrors';
 
 import ONYXKEYS from '@src/ONYXKEYS';
-import {reportsParentHierarchySelector} from '@src/selectors/Report';
+import {reportParentChainSelector} from '@src/selectors/Report';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
 import useOnyx from './useOnyx';
 
 /**
- * Subscribes to the parent hierarchy links (`parentReportID`/`parentReportActionID`) of every report so callers
- * can resolve arbitrary ancestor chains (e.g. `clearAllRelatedReportActionErrors`) without subscribing to full
- * report objects. Since these links are effectively immutable, the projected result only changes when reports
- * are added or removed, so regular report updates don't re-render the subscriber.
+ * Subscribes to the parent hierarchy links (`parentReportID`/`parentReportActionID`) of the given report and its
+ * ancestors so callers can walk the ancestor chain (e.g. `clearAllRelatedReportActionErrors`) without subscribing to
+ * full report objects. The selector only looks up the reports on that chain, and since these links are effectively
+ * immutable, the result only changes when a report on the chain is added or removed.
  */
-function useReportsParentHierarchy(): OnyxCollection<ReportHierarchyInfo> {
-    const [reportsParentHierarchy] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: reportsParentHierarchySelector});
+function useReportsParentHierarchy(reportID: string | undefined): OnyxCollection<ReportHierarchyInfo> {
+    const [reportsParentHierarchy] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: reportParentChainSelector(reportID)});
     return reportsParentHierarchy;
 }
 
diff --git a/src/pages/inbox/report/ReportActionItem.tsx b/src/pages/inbox/report/ReportActionItem.tsx
index c5febaef3ea1..92d9d7d80188 100644
--- a/src/pages/inbox/report/ReportActionItem.tsx
+++ b/src/pages/inbox/report/ReportActionItem.tsx
@@ -192,7 +192,7 @@ function ReportActionItem({
     const reportID = report?.reportID ?? action?.reportID;
     const originalReportID = useOriginalReportID(report?.reportID, action);
     const {isOffline} = useNetwork();
-    const reportsParentHierarchy = useReportsParentHierarchy();
+    const reportsParentHierarchy = useReportsParentHierarchy(reportID);
     const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getIOUReportIDFromReportActionPreview(action)}`, {selector: getStableReportSelector});
     const [iouPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
 
diff --git a/src/selectors/Report.ts b/src/selectors/Report.ts
index 79c50694ed48..adff856a608b 100644
--- a/src/selectors/Report.ts
+++ b/src/selectors/Report.ts
@@ -14,7 +14,6 @@ import {
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {OutstandingReportsByPolicyIDDerivedValue, PersonalDetailsList, Report, ReportActions, ReportNameValuePairs, Transaction} from '@src/types/onyx';
-import mapOnyxCollectionItems from '@src/utils/mapOnyxCollectionItems';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {TupleToUnion, ValueOf} from 'type-fest';
@@ -367,18 +366,28 @@ function isDraftReportSelector(draft: OnyxEntry<Report>): boolean {
     return !!draft;
 }
 
-function reportHierarchySelector(report: OnyxEntry<Report>): OnyxEntry<ReportHierarchyInfo> {
-    return (
-        report && {
-            parentReportID: report.parentReportID,
-            parentReportActionID: report.parentReportActionID,
+/**
+ * Creates a selector returning the parent links of the given report and each of its ancestors, so a consumer only
+ * looks up the reports on that chain instead of iterating the whole collection.
+ */
+function reportParentChainSelector(reportID: string | undefined) {
+    return function selectReportParentChain(reports: OnyxCollection<Report>): OnyxCollection<ReportHierarchyInfo> {
+        const result: OnyxCollection<ReportHierarchyInfo> = {};
+        let currentReportID = reportID;
+        while (currentReportID) {
+            const key = `${ONYXKEYS.COLLECTION.REPORT}${currentReportID}` as const;
+            const report = reports?.[key];
+            // Stop at the top of the chain, and at an already visited report in case the links form a cycle
+            if (!report || result[key]) {
+                break;
+            }
+            result[key] = {parentReportID: report.parentReportID, parentReportActionID: report.parentReportActionID};
+            currentReportID = report.parentReportID;
         }
-    );
+        return result;
+    };
 }
 
-function reportsParentHierarchySelector(reports: OnyxCollection<Report>): OnyxCollection<ReportHierarchyInfo> {
-    return mapOnyxCollectionItems(reports, reportHierarchySelector);
-}
 /**
  * Creates a selector returning only the reports for the given IDs, so a consumer that knows the exact
  * reports it needs doesn't re-render when any other report in the account changes.
@@ -412,7 +421,7 @@ export {
     openExpenseReportIDsSelector,
     getStableReportSelector,
     isDraftReportSelector,
-    reportsParentHierarchySelector,
+    reportParentChainSelector,
     reportsByIDsSelector,
 };
 
diff --git a/tests/ui/ClearReportActionErrorsUITest.tsx b/tests/ui/ClearReportActionErrorsUITest.tsx
index 8c20d01abae6..308a97c24111 100644
--- a/tests/ui/ClearReportActionErrorsUITest.tsx
+++ b/tests/ui/ClearReportActionErrorsUITest.tsx
@@ -35,6 +35,10 @@ const REPORT_ID = '12345';
 const REPORT_ACTION_ID = '99999';
 const CHILD_REPORT_ID = '67890';
 const CHILD_REPORT_ACTION_ID = '88888';
+const PARENT_REPORT_ACTION_ID = '55555';
+const GRANDPARENT_REPORT_ID = '44444';
+const GRANDPARENT_REPORT_ACTION_ID = '33333';
+const UNRELATED_REPORT_ID = '22222';
 const SPLIT_CHILD_TRANSACTION_ID = '77777';
 const SPLIT_CONTAINER_TRANSACTION_ID = '66666';
 
@@ -248,6 +252,66 @@ describe('ClearReportActionErrors UI', () => {
             expect(parentReportActions?.[REPORT_ACTION_ID]?.errors).toBeUndefined();
             expect(childReportActions?.[CHILD_REPORT_ACTION_ID]?.errors).toEqual({});
         });
+
+        it('should clear errors on every ancestor action when a thread action error is dismissed', async () => {
+            // Given a thread -> parent -> grandparent chain where each level's linking action has the same error key,
+            // plus an unrelated report, so the component must resolve the whole ancestor chain from Onyx
+            const sharedError = {[DEFAULT_ERROR_TIMESTAMP]: 'Shared error message'};
+            const threadAction = getFakeReportAction(Number(CHILD_REPORT_ACTION_ID), {actorAccountID: ACTOR_ACCOUNT_ID, errors: sharedError});
+            const parentAction = getFakeReportAction(Number(PARENT_REPORT_ACTION_ID), {actorAccountID: ACTOR_ACCOUNT_ID, childReportID: CHILD_REPORT_ID, errors: sharedError});
+            const grandparentAction = getFakeReportAction(Number(GRANDPARENT_REPORT_ACTION_ID), {actorAccountID: ACTOR_ACCOUNT_ID, childReportID: REPORT_ID, errors: sharedError});
+
+            const grandparentReport = createMockReport({reportID: GRANDPARENT_REPORT_ID, ownerAccountID: ACTOR_ACCOUNT_ID});
+            const parentReport = createMockReport({
+                reportID: REPORT_ID,
+                parentReportID: GRANDPARENT_REPORT_ID,
+                parentReportActionID: GRANDPARENT_REPORT_ACTION_ID,
+                ownerAccountID: ACTOR_ACCOUNT_ID,
+            });
+            const threadReport = createMockReport({
+                reportID: CHILD_REPORT_ID,
+                parentReportID: REPORT_ID,
+                parentReportActionID: PARENT_REPORT_ACTION_ID,
+                ownerAccountID: ACTOR_ACCOUNT_ID,
+            });
+            const unrelatedReport = createMockReport({reportID: UNRELATED_REPORT_ID, ownerAccountID: ACTOR_ACCOUNT_ID});
+            const spy = jest.spyOn(ClearReportActionErrorsActions, 'clearAllRelatedReportActionErrors');
+
+            await act(async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${GRANDPARENT_REPORT_ID}`, grandparentReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, parentReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${CHILD_REPORT_ID}`, threadReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${UNRELATED_REPORT_ID}`, unrelatedReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${GRANDPARENT_REPORT_ID}`, {[GRANDPARENT_REPORT_ACTION_ID]: grandparentAction});
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[PARENT_REPORT_ACTION_ID]: parentAction});
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHILD_REPORT_ID}`, {[CHILD_REPORT_ACTION_ID]: threadAction});
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            renderReportActionItem(threadAction, threadReport);
+            await waitForBatchedUpdatesWithAct();
+
+            // When the user dismisses the error on the thread action
+            fireEvent.press(screen.getByLabelText('Dismiss'));
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the component supplies the ancestor links itself, so the walk does not depend on the module-level fallback
+            const suppliedReports = spy.mock.calls.at(0)?.at(0)?.reports;
+            expect(suppliedReports?.[`${ONYXKEYS.COLLECTION.REPORT}${CHILD_REPORT_ID}`]).toMatchObject({parentReportID: REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID});
+            expect(suppliedReports?.[`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`]).toMatchObject({
+                parentReportID: GRANDPARENT_REPORT_ID,
+                parentReportActionID: GRANDPARENT_REPORT_ACTION_ID,
+            });
+            spy.mockRestore();
+
+            // And the matching error is cleared at every level of the chain
+            const threadReportActions = await getReportActionsFromOnyx(CHILD_REPORT_ID);
+            const parentReportActions = await getReportActionsFromOnyx(REPORT_ID);
+            const grandparentReportActions = await getReportActionsFromOnyx(GRANDPARENT_REPORT_ID);
+            expect(threadReportActions?.[CHILD_REPORT_ACTION_ID]?.errors).toBeUndefined();
+            expect(parentReportActions?.[PARENT_REPORT_ACTION_ID]?.errors).toEqual({});
+            expect(grandparentReportActions?.[GRANDPARENT_REPORT_ACTION_ID]?.errors).toEqual({});
+        });
     });
 
     describe('Split container error propagation', () => {
diff --git a/tests/unit/ClearReportActionErrorsTest.ts b/tests/unit/ClearReportActionErrorsTest.ts
index 1a931fa54d6a..81e895210001 100644
--- a/tests/unit/ClearReportActionErrorsTest.ts
+++ b/tests/unit/ClearReportActionErrorsTest.ts
@@ -414,6 +414,51 @@ describe('ClearReportActionErrors', () => {
             expect(parentReportActions?.[PARENT_REPORT_ACTION_ID]?.errors).toEqual({});
         });
 
+        it('should clear child errors when the reports parameter contains only the ancestor chain', async () => {
+            // Given an action with both a parent and a child thread, where the reports parameter holds only the
+            // ancestor link of the starting report (no entry for the child report, and the REPORT collection is not
+            // seeded), so a caller may narrow `reports` to ancestors without losing the downward walk
+            const reportAction = getFakeReportAction(Number(REPORT_ACTION_ID), {
+                childReportID: CHILD_REPORT_ID,
+                errors: {sharedError: 'Error message'},
+            });
+            const parentReportAction = getFakeReportAction(Number(PARENT_REPORT_ACTION_ID), {
+                errors: {sharedError: 'Parent error message'},
+            });
+            const childReportAction = getFakeReportAction(Number(CHILD_REPORT_ACTION_ID), {
+                errors: {sharedError: 'Child error message'},
+            });
+
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {
+                [REPORT_ACTION_ID]: reportAction,
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`, {
+                [PARENT_REPORT_ACTION_ID]: parentReportAction,
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHILD_REPORT_ID}`, {
+                [CHILD_REPORT_ACTION_ID]: childReportAction,
+            });
+            await waitForBatchedUpdates();
+
+            // When clearAllRelatedReportActionErrors is called with an ancestor-only reports collection
+            clearAllRelatedReportActionErrors({
+                reportID: REPORT_ID,
+                reportAction,
+                originalReportID: REPORT_ID,
+                isOffline: false,
+                reports: {
+                    [`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`]: {parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID},
+                },
+            });
+            await waitForBatchedUpdates();
+
+            // Then the matching errors are cleared on both the parent and the child actions
+            const parentReportActions = await getReportActionsFromOnyx(PARENT_REPORT_ID);
+            expect(parentReportActions?.[PARENT_REPORT_ACTION_ID]?.errors).toEqual({});
+            const childReportActions = await getReportActionsFromOnyx(CHILD_REPORT_ID);
+            expect(childReportActions?.[CHILD_REPORT_ACTION_ID]?.errors).toEqual({});
+        });
+
         it('should clear errors across a multi-level ancestor chain supplied via the reports parameter', async () => {
             // Given a three-level chain (report -> parent -> grandparent) whose hierarchy exists ONLY in the
             // reports parameter (the REPORT collection is not seeded), so the walk can only reach the
diff --git a/tests/unit/selectors/ReportTest.ts b/tests/unit/selectors/ReportTest.ts
index e8ec24e9c382..67d74d70d7de 100644
--- a/tests/unit/selectors/ReportTest.ts
+++ b/tests/unit/selectors/ReportTest.ts
@@ -1,7 +1,8 @@
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report} from '@src/types/onyx';
 
-import {reportAvatarFieldsSelector, reportAvatarKindSelector, reportPolicyFieldsSelector} from '@selectors/Report';
+import {reportAvatarFieldsSelector, reportAvatarKindSelector, reportParentChainSelector, reportPolicyFieldsSelector} from '@selectors/Report';
 
 const REPORT_ID = 'report123';
 const PARENT_REPORT_ID = 'parentReport123';
@@ -104,3 +105,64 @@ describe('reportPolicyFieldsSelector', () => {
         expect(reportPolicyFieldsSelector(undefined)).toBeUndefined();
     });
 });
+
+describe('reportParentChainSelector', () => {
+    const GRANDPARENT_REPORT_ID = 'grandparentReport123';
+    const GRANDPARENT_REPORT_ACTION_ID = 'grandparentReportAction123';
+    const UNRELATED_REPORT_ID = 'unrelatedReport123';
+
+    const reportKey = (reportID: string) => `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
+
+    it('should return the parent links of the report and every ancestor, and nothing else', () => {
+        // Given a thread -> parent -> grandparent chain plus an unrelated report in the collection
+        const reports = {
+            [reportKey(REPORT_ID)]: createReport({...threadFields, lastMessageText: 'Hello'}),
+            [reportKey(PARENT_REPORT_ID)]: createReport({reportID: PARENT_REPORT_ID, parentReportID: GRANDPARENT_REPORT_ID, parentReportActionID: GRANDPARENT_REPORT_ACTION_ID}),
+            [reportKey(GRANDPARENT_REPORT_ID)]: createReport({reportID: GRANDPARENT_REPORT_ID}),
+            [reportKey(UNRELATED_REPORT_ID)]: createReport({reportID: UNRELATED_REPORT_ID, ...threadFields}),
+        };
+
+        // When the selector is applied for the thread
+        const result = reportParentChainSelector(REPORT_ID)(reports);
+
+        // Then only the chain entries are returned, projected to the parent link fields, so unrelated reports cannot affect the result
+        expect(result).toEqual({
+            [reportKey(REPORT_ID)]: threadFields,
+            [reportKey(PARENT_REPORT_ID)]: {parentReportID: GRANDPARENT_REPORT_ID, parentReportActionID: GRANDPARENT_REPORT_ACTION_ID},
+            [reportKey(GRANDPARENT_REPORT_ID)]: {parentReportID: undefined, parentReportActionID: undefined},
+        });
+    });
+
+    it('should stop at the first ancestor that is not in Onyx', () => {
+        // Given a thread whose parent report is not loaded
+        const reports = {[reportKey(REPORT_ID)]: createReport(threadFields)};
+
+        // When the selector is applied for the thread
+        const result = reportParentChainSelector(REPORT_ID)(reports);
+
+        // Then only the thread's own links are returned, which is all the error-clearing walk can use
+        expect(result).toEqual({[reportKey(REPORT_ID)]: threadFields});
+    });
+
+    it('should terminate when the parent links form a cycle', () => {
+        // Given two reports that list each other as parent (corrupt data must not hang the UI thread)
+        const reports = {
+            [reportKey(REPORT_ID)]: createReport(threadFields),
+            [reportKey(PARENT_REPORT_ID)]: createReport({reportID: PARENT_REPORT_ID, parentReportID: REPORT_ID, parentReportActionID: 'action1'}),
+        };
+
+        // When the selector is applied for the thread
+        const result = reportParentChainSelector(REPORT_ID)(reports);
+
+        // Then each report on the cycle appears once
+        expect(Object.keys(result ?? {})).toEqual([reportKey(REPORT_ID), reportKey(PARENT_REPORT_ID)]);
+    });
+
+    it('should return an empty collection when the report ID is missing or the collection is not loaded', () => {
+        // Given no report ID, or no report collection
+        // When the selector is applied
+        // Then nothing is returned, so the caller's walk does not fall back to stale data
+        expect(reportParentChainSelector(undefined)({[reportKey(REPORT_ID)]: createReport(threadFields)})).toEqual({});
+        expect(reportParentChainSelector(REPORT_ID)(undefined)).toEqual({});
+    });
+});

From 23e27c05672b4ccda1d9183f468442200cff5357 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Tue, 13 Oct 2026 13:23:35 +0200
Subject: [PATCH 532/781] Save group-by only when explicitly selected by the
 user

---
 .../Insights/charts/InsightsChartWidget.tsx   |  2 +-
 src/pages/Insights/insightsGroupByUtils.ts    |  7 +++--
 src/pages/Insights/insightsQueries.ts         |  2 +-
 src/pages/Insights/useInsightsFilters.ts      |  9 ++----
 tests/unit/hooks/useInsightsFilters.test.ts   | 28 ++++---------------
 tests/unit/insightsGroupByUtilsTest.ts        | 26 ++++++++++++++++-
 tests/unit/insightsQueriesTest.ts             | 18 ++++++++++--
 7 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 261c7c6d7b31..36fbdf6108b0 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -70,7 +70,7 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const groupByControl =
         onGroupByChange && groupByOptions.length > 0 ? (
             <InsightsGroupByDropdown
-                groupBy={filters.groupBy}
+                groupBy={getQueryGroupBy(filters)}
                 options={groupByOptions}
                 onChange={onGroupByChange}
             />
diff --git a/src/pages/Insights/insightsGroupByUtils.ts b/src/pages/Insights/insightsGroupByUtils.ts
index cddfda666565..e54b3a3ca2aa 100644
--- a/src/pages/Insights/insightsGroupByUtils.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -59,9 +59,12 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
     return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
-/** Returns the Group by the charts are queried with. A single date has no options to pick from, so its one point is grouped by day. */
+/** Returns the Group by the charts are queried with, fitted to the date range. A single date has no options to pick from, so its one point is grouped by day. */
 function getQueryGroupBy(filters: InsightsFilters): InsightsGroupBy {
-    return 'on' in filters.date ? CONST.SEARCH.GROUP_BY.DAY : filters.groupBy;
+    if ('on' in filters.date) {
+        return CONST.SEARCH.GROUP_BY.DAY;
+    }
+    return getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date));
 }
 
 export {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy};
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index e0815ef95e23..5711c937ff1a 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -95,7 +95,7 @@ type InsightsQuery = {
 
 /** Builds one request for the whole dashboard, naming each graph's snapshots by its chart's query hashes, and returns those chart queries to read the snapshots back with. */
 function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsQuery | undefined {
-    // The backend saves inputQuery as the dashboard's filters, so a single date keeps the saved Group by instead of the day it's queried by
+    // The backend saves inputQuery as the dashboard's filters, so it keeps the Group by the user picked, not the one fitted to the date range
     const inputQuery = buildInsightsQueryString({...filters, compare: undefined});
     const queryJSON = buildSearchQueryJSON(buildInsightsQueryString({...filters, groupBy: getQueryGroupBy(filters), compare: undefined}));
     if (!queryJSON) {
diff --git a/src/pages/Insights/useInsightsFilters.ts b/src/pages/Insights/useInsightsFilters.ts
index 376d4fbb7bb3..78498aa3f8a0 100644
--- a/src/pages/Insights/useInsightsFilters.ts
+++ b/src/pages/Insights/useInsightsFilters.ts
@@ -13,7 +13,6 @@ import type {InsightsFilters} from './insightsFilters';
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 import {parseInsightsFilters} from './insightsFilterParsing';
 import DEFAULT_INSIGHTS_FILTERS from './insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from './insightsGroupByUtils';
 import {buildInsightsQueryString} from './insightsQueries';
 
 type UseInsightsFiltersResult = {
@@ -30,10 +29,6 @@ type UseInsightsFiltersResult = {
     setFilters: (update: Partial<InsightsFilters>) => void;
 };
 
-function normalizeInsightsFilters(filters: InsightsFilters): InsightsFilters {
-    return {...filters, groupBy: getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date))};
-}
-
 function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersResult {
     const {searchKey} = INSIGHTS_DASHBOARD_SPECS[dashboard];
     const [activePolicyID, activePolicyIDMetadata] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
@@ -45,10 +40,10 @@ function useInsightsFilters(dashboard: InsightsDashboardID): UseInsightsFiltersR
         ...DEFAULT_INSIGHTS_FILTERS,
         groupCurrency: activePolicy?.outputCurrency ?? CONST.CURRENCY.USD,
     };
-    const filters = normalizeInsightsFilters({...defaultFilters, ...parseInsightsFilters(storedQuery)});
+    const filters: InsightsFilters = {...defaultFilters, ...parseInsightsFilters(storedQuery)};
 
     const setFilters = (update: Partial<InsightsFilters>) => {
-        setInsightsFilters(searchKey, buildInsightsQueryString(normalizeInsightsFilters({...filters, ...update})));
+        setInsightsFilters(searchKey, buildInsightsQueryString({...filters, ...update}));
     };
 
     return {
diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index c0a61f845fef..0c7ec810aef2 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -155,40 +155,22 @@ describe('useInsightsFilters', () => {
         expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD policyID:A1 date:last-12-months');
     });
 
-    it('opens on the nearest fitting grouping when the stored one no longer fits the date range', async () => {
-        // Given a dashboard stored as this month grouped by quarter, which plots a single point
-        await setUpActivePolicy('PLN');
-        await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
-
-        // When the dashboard resolves its filters
-        const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
-        await waitFor(() => expect(result.current.isResolved).toBe(true));
-
-        // Then it groups by week, the closest grouping to quarter that this month offers
-        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
-    });
-
-    it('saves the nearest fitting grouping when a new date range rules out the selected one, and keeps it after', async () => {
+    it('keeps the selected grouping saved when a new date range rules it out', async () => {
         // Given a dashboard over the last 12 months grouped by quarter
         await setUpActivePolicy('PLN');
         await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
         const {result} = renderHook(() => useInsightsFilters(CONST.INSIGHTS.DASHBOARD.SPEND));
         await waitFor(() => expect(result.current.isResolved).toBe(true));
 
-        // When the date is changed to this month, then back to the last 12 months
+        // When the date is changed to this month, which only offers Day and Week
         await act(async () => {
             result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}});
             await waitForBatchedUpdates();
         });
-        const groupByOnThisMonth = (await getStoredQuery())?.split(' ').at(0);
-        await act(async () => {
-            result.current.setFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}});
-            await waitForBatchedUpdates();
-        });
 
-        // Then week is saved as the new selection, so going back to a range that offers quarter doesn't restore it
-        expect(groupByOnThisMonth).toBe('groupBy:week');
-        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+        // Then quarter stays saved, so it comes back once a range that offers it is picked
+        expect(await getStoredQuery()).toBe('groupBy:quarter groupCurrency:USD date:this-month');
+        expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
     });
 
     it('keeps the saved grouping on a single day, which has no grouping to pick', async () => {
diff --git a/tests/unit/insightsGroupByUtilsTest.ts b/tests/unit/insightsGroupByUtilsTest.ts
index 991369dd50cf..04d4786046f2 100644
--- a/tests/unit/insightsGroupByUtilsTest.ts
+++ b/tests/unit/insightsGroupByUtilsTest.ts
@@ -1,5 +1,5 @@
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy, getInsightsGroupByOptions} from '@pages/Insights/insightsGroupByUtils';
+import {getFittingGroupBy, getInsightsGroupByOptions, getQueryGroupBy} from '@pages/Insights/insightsGroupByUtils';
 
 import CONST from '@src/CONST';
 
@@ -93,4 +93,28 @@ describe('insightsGroupByUtils', () => {
             expect(groupBy).toBe(QUARTER);
         });
     });
+
+    describe('getQueryGroupBy', () => {
+        it('queries the nearest offered option when the date range rules the selection out', () => {
+            // Given a quarterly dashboard moved to this month, which only offers Day and Week
+            const filters: InsightsFilters = {date: {preset: THIS_MONTH}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
+
+            // When the Group by to query with is picked
+            const groupBy = getQueryGroupBy(filters);
+
+            // Then Week is queried, the closest grouping to Quarter that the month offers
+            expect(groupBy).toBe(WEEK);
+        });
+
+        it('queries a single date by day, whatever grouping is selected', () => {
+            // Given a quarterly dashboard moved to a single date
+            const filters: InsightsFilters = {date: {on: '2026-03-04'}, policyIDs: [], groupBy: QUARTER, groupCurrency: 'USD'};
+
+            // When the Group by to query with is picked
+            const groupBy = getQueryGroupBy(filters);
+
+            // Then its one point is grouped by day
+            expect(groupBy).toBe(DAY);
+        });
+    });
 });
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index 747c57788c53..ae1bc3ead359 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -145,12 +145,24 @@ describe('insightsQueries', () => {
             // When its request is built
             const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
-            // Then the query names that day the same way it names a preset and keeps the saved grouping, while its one point is grouped by day
+            // Then the query names that day the same way it names a preset, and its one point is grouped by day since a single date offers no grouping to pick
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
             expect(parsePayload(request)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
             expect(parsePayload(request)).toEqual(expect.objectContaining({insightsHashes: buildExpectedHashes(filters)}));
         });
 
+        it('saves the selected grouping while querying the one fitted to the date range', () => {
+            // Given a quarterly dashboard narrowed to a month, which only offers Day and Week
+            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.QUARTER};
+
+            // When its request is built
+            const payload = parsePayload(buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true));
+
+            // Then the backend saves quarter, so a longer range brings it back, while the charts are grouped by week
+            expect(payload?.inputQuery).toBe('groupBy:quarter groupCurrency:USD date>=2026-03-01 date<=2026-03-31');
+            expect(payload?.groupBy).toBe(CONST.SEARCH.GROUP_BY.WEEK);
+        });
+
         it('leaves the workspaces out of the query until some are selected', () => {
             // Given a dashboard requested with no workspace selected
             const allWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
@@ -222,8 +234,8 @@ describe('insightsQueries', () => {
         });
 
         it('groups the headline chart by day while supporting charts keep their own group-by', () => {
-            // Given the page filters grouped by day
-            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.DAY};
+            // Given the page filters over a month, grouped by day
+            const filters: InsightsFilters = {...FILTERS, date: {from: '2026-03-01', to: '2026-03-31'}, groupBy: CONST.SEARCH.GROUP_BY.DAY};
 
             // When the filters are applied to the headline chart and to every supporting chart
             const headlineQuery = applyInsightsFilters(SPEND_SPEC.headlineChart, filters);

From ddb65825be54a8ccfe0419391749ed1ba53938d3 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 13 Oct 2026 13:24:41 +0200
Subject: [PATCH 533/781] refactor: share retry transaction params between
 RequestMoney and TrackExpense

---
 .../buildRetryPayload.ts                      | 51 +++++++++++--------
 .../buildTrackExpenseRetryPayload.ts          | 29 ++---------
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
index b3da3c1f0bff..851e2a52546a 100644
--- a/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
+++ b/src/libs/ReceiptUploadRetryHandler/buildRetryPayload.ts
@@ -69,6 +69,32 @@ function getMerchantForRetry(merchant: string | undefined): string {
     return merchant;
 }
 
+function buildRetryTransactionParams(context: ReceiptRetryContext, receiptFile: FileObject) {
+    const {transaction} = context;
+    const details = getTransactionDetails(transaction);
+    if (!transaction || !details) {
+        return undefined;
+    }
+    const receipt: Receipt = {...receiptFile, source: context.receiptError.source, state: CONST.IOU.RECEIPT_STATE.SCAN_READY};
+
+    return {
+        amount: details.amount,
+        currency: details.currency,
+        created: details.created,
+        merchant: getMerchantForRetry(details.merchant),
+        comment: details.comment,
+        category: details.category,
+        tag: details.tag,
+        taxCode: details.taxCode,
+        taxAmount: details.taxAmount,
+        billable: details.billable,
+        reimbursable: details.reimbursable,
+        attendees: transaction.comment?.attendees,
+        isFromGlobalCreate: getIsFromGlobalCreate(transaction),
+        receipt,
+    };
+}
+
 /** Checks the action here too, not only in `retryReceiptUpload`, so the button is hidden instead of doing nothing. */
 function canBuildRetryPayload(context: ReceiptRetryContext): boolean {
     const {transaction, iouReport, receiptError} = context;
@@ -102,11 +128,10 @@ function buildRetryPayload(context: ReceiptRetryContext, receiptFile: FileObject
     }
 
     const currentUser = getCurrentUserPersonalDetails();
-    const details = getTransactionDetails(transaction);
-    if (!details) {
+    const transactionParams = buildRetryTransactionParams(context, receiptFile);
+    if (!transactionParams) {
         return undefined;
     }
-    const receipt: Receipt = {...receiptFile, source: context.receiptError.source, state: CONST.IOU.RECEIPT_STATE.SCAN_READY};
 
     return {
         report: iouReport,
@@ -116,23 +141,7 @@ function buildRetryPayload(context: ReceiptRetryContext, receiptFile: FileObject
             participant,
         },
         policyParams,
-        transactionParams: {
-            amount: details.amount,
-            currency: details.currency,
-            created: details.created,
-            merchant: getMerchantForRetry(details.merchant),
-            comment: details.comment,
-            category: details.category,
-            tag: details.tag,
-            taxCode: details.taxCode,
-            taxAmount: details.taxAmount,
-            billable: details.billable,
-            reimbursable: details.reimbursable,
-            // Read from the transaction because `details` widens this to `string | Attendee[]`.
-            attendees: transaction.comment?.attendees,
-            isFromGlobalCreate: getIsFromGlobalCreate(transaction),
-            receipt,
-        },
+        transactionParams,
         // Same ID, so if the first attempt reached Auth the retry gets `Transaction already created.` instead of a second expense.
         optimisticTransactionID: transaction.transactionID,
         optimisticIOUReportID: iouReport.reportID,
@@ -166,4 +175,4 @@ function buildRetryPayload(context: ReceiptRetryContext, receiptFile: FileObject
 }
 
 export default buildRetryPayload;
-export {canBuildRetryPayload, getCurrentUserAccountID, getMerchantForRetry, isRetryableFlow, resolveParticipant};
+export {buildRetryTransactionParams, canBuildRetryPayload, getCurrentUserAccountID, isRetryableFlow, resolveParticipant};
diff --git a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
index 45a27b5c10b0..49082ea90ce2 100644
--- a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
+++ b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
@@ -1,18 +1,16 @@
 /** Decides whether a failed `TrackExpense` can be retried and rebuilds the call from Onyx. */
-import {getTransactionDetails, isSelfDM} from '@libs/ReportUtils';
-import {getIsFromGlobalCreate} from '@libs/TransactionUtils';
+import {isSelfDM} from '@libs/ReportUtils';
 
 import {getAllReports, getCurrentUserPersonalDetails} from '@userActions/IOU';
 import type {CreateTrackExpenseParams} from '@userActions/IOU/types/CreateTrackExpenseParams';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Receipt} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 
 import type {ReceiptRetryContext} from './types';
 
-import {getCurrentUserAccountID, getMerchantForRetry, isRetryableFlow, resolveParticipant} from './buildRetryPayload';
+import {buildRetryTransactionParams, getCurrentUserAccountID, isRetryableFlow, resolveParticipant} from './buildRetryPayload';
 
 function canBuildTrackExpenseRetryPayload(context: ReceiptRetryContext): boolean {
     const {transaction, iouReport, receiptError} = context;
@@ -44,11 +42,10 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
     }
 
     const currentUser = getCurrentUserPersonalDetails();
-    const details = getTransactionDetails(transaction);
-    if (!details) {
+    const transactionParams = buildRetryTransactionParams(context, receiptFile);
+    if (!transactionParams) {
         return undefined;
     }
-    const receipt: Receipt = {...receiptFile, source: context.receiptError.source, state: CONST.IOU.RECEIPT_STATE.SCAN_READY};
 
     return {
         report: iouReport,
@@ -60,23 +57,7 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
             participant,
         },
         policyParams,
-        transactionParams: {
-            amount: details.amount,
-            currency: details.currency,
-            created: details.created,
-            merchant: getMerchantForRetry(details.merchant),
-            comment: details.comment,
-            category: details.category,
-            tag: details.tag,
-            taxCode: details.taxCode,
-            taxAmount: details.taxAmount,
-            billable: details.billable,
-            reimbursable: details.reimbursable,
-            // Read from the transaction because `details` widens this to `string | Attendee[]`.
-            attendees: transaction.comment?.attendees,
-            isFromGlobalCreate: getIsFromGlobalCreate(transaction),
-            receipt,
-        },
+        transactionParams,
         optimisticTransactionID: transaction.transactionID,
         currentReportActionID: iouActionID,
         existingTransactionThreadReportID: transactionThreadReportID,

From 7dbd7bc0ff97ced8fc8cecb99bd89d719ead2f48 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 13 Oct 2026 13:39:08 +0200
Subject: [PATCH 534/781] fix: reuse the thread CREATED action on a track
 expense retry

---
 .../buildTrackExpenseRetryPayload.ts                  |  2 ++
 src/libs/actions/IOU/TrackExpense.ts                  | 11 ++++++++++-
 .../actions/IOU/types/CreateTrackExpenseParams.ts     |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
index 49082ea90ce2..c44209c94036 100644
--- a/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
+++ b/src/libs/ReceiptUploadRetryHandler/buildTrackExpenseRetryPayload.ts
@@ -1,4 +1,5 @@
 /** Decides whether a failed `TrackExpense` can be retried and rebuilds the call from Onyx. */
+import {getAllReportActions, isCreatedAction} from '@libs/ReportActionsUtils';
 import {isSelfDM} from '@libs/ReportUtils';
 
 import {getAllReports, getCurrentUserPersonalDetails} from '@userActions/IOU';
@@ -61,6 +62,7 @@ function buildTrackExpenseRetryPayload(context: ReceiptRetryContext, receiptFile
         optimisticTransactionID: transaction.transactionID,
         currentReportActionID: iouActionID,
         existingTransactionThreadReportID: transactionThreadReportID,
+        existingTransactionThreadCreatedReportActionID: Object.values(getAllReportActions(transactionThreadReportID)).find((action) => isCreatedAction(action))?.reportActionID,
         existingTransaction: transaction,
         isASAPSubmitBetaEnabled,
         currentUser: {
diff --git a/src/libs/actions/IOU/TrackExpense.ts b/src/libs/actions/IOU/TrackExpense.ts
index 6e58d9c23df9..31bcbb6894c2 100644
--- a/src/libs/actions/IOU/TrackExpense.ts
+++ b/src/libs/actions/IOU/TrackExpense.ts
@@ -194,6 +194,7 @@ type GetTrackExpenseInformationParams = {
     optimisticTransactionID?: string;
     currentReportActionID?: string;
     existingTransactionThreadReportID?: string;
+    existingTransactionThreadCreatedReportActionID?: string;
     participantParams: GetTrackExpenseInformationParticipantParams;
     policyParams: BasePolicyParams;
     transactionParams: GetTrackExpenseInformationTransactionParams;
@@ -886,6 +887,7 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
         optimisticTransactionID: providedOptimisticTransactionID,
         currentReportActionID,
         existingTransactionThreadReportID,
+        existingTransactionThreadCreatedReportActionID,
         participantParams,
         policyParams,
         transactionParams,
@@ -1172,7 +1174,7 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
     // 2. IOU action for the iouReport (if tracking in the Expense chat), otherwise – for chatReport
     // 3. The transaction thread, which requires the iouAction, and CREATED action for the transaction thread
     // 4. REPORT_PREVIEW action for the chatReport (if tracking in the Expense chat)
-    const [, optimisticCreatedActionForIOUReport, iouAction, optimisticTransactionThread, optimisticCreatedActionForTransactionThread] = buildOptimisticMoneyRequestEntities({
+    const [, optimisticCreatedActionForIOUReport, iouAction, optimisticTransactionThread, newCreatedActionForTransactionThread] = buildOptimisticMoneyRequestEntities({
         getCurrencyDecimals,
         iouReport: shouldUseMoneyReport && iouReport ? iouReport : chatReport,
         type: CONST.IOU.REPORT_ACTION_TYPE.TRACK,
@@ -1190,6 +1192,11 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
         delegateAccountIDParam: delegateAccountID,
     });
 
+    const optimisticCreatedActionForTransactionThread =
+        existingTransactionThreadReportID && existingTransactionThreadCreatedReportActionID
+            ? buildOptimisticCreatedReportAction({emailCreatingAction: payeeEmail, optimisticReportActionID: existingTransactionThreadCreatedReportActionID})
+            : newCreatedActionForTransactionThread;
+
     let reportPreviewAction: OnyxInputValue<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW>> = null;
     if (shouldUseMoneyReport && iouReport) {
         reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : getReportPreviewReportAction(chatReport.reportID, iouReport.reportID);
@@ -2499,6 +2506,7 @@ function trackExpense(params: CreateTrackExpenseParams) {
         optimisticTransactionID,
         currentReportActionID,
         existingTransactionThreadReportID,
+        existingTransactionThreadCreatedReportActionID,
         isASAPSubmitBetaEnabled,
         currentUser,
         introSelected,
@@ -2638,6 +2646,7 @@ function trackExpense(params: CreateTrackExpenseParams) {
         optimisticTransactionID,
         currentReportActionID,
         existingTransactionThreadReportID,
+        existingTransactionThreadCreatedReportActionID,
         existingTransactionID:
             isMovingTransactionFromTrackExpense && linkedTrackedExpenseReportAction && isMoneyRequestAction(linkedTrackedExpenseReportAction)
                 ? getOriginalMessage(linkedTrackedExpenseReportAction)?.IOUTransactionID
diff --git a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
index 997485c6fcd5..89eae717db81 100644
--- a/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
+++ b/src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
@@ -41,6 +41,7 @@ type CreateTrackExpenseParams = {
     optimisticTransactionID?: string;
     currentReportActionID?: string;
     existingTransactionThreadReportID?: string;
+    existingTransactionThreadCreatedReportActionID?: string;
     isASAPSubmitBetaEnabled: boolean;
     currentUser: CurrentUser;
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;

From cd863dae345f5b5f93a81b6a4526456f02758444 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 13 Oct 2026 13:39:48 +0200
Subject: [PATCH 535/781] test: add additional tests for reusing the thread
 CREATED action on a track expense retry

---
 tests/actions/IOUTest/TrackExpenseTest.ts   | 47 +++++++++++++++++++++
 tests/unit/ReceiptUploadRetryHandlerTest.ts | 10 ++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/tests/actions/IOUTest/TrackExpenseTest.ts b/tests/actions/IOUTest/TrackExpenseTest.ts
index d92a455155f2..767647a1a2a1 100644
--- a/tests/actions/IOUTest/TrackExpenseTest.ts
+++ b/tests/actions/IOUTest/TrackExpenseTest.ts
@@ -1424,6 +1424,53 @@ describe('actions/IOU/TrackExpense', () => {
             expect(threadReport?.errorFields?.createChat).toBeFalsy();
         });
 
+        it('rebuilds the failed thread CREATED action on a receipt retry, so the success clears its pending state and errors', async () => {
+            // Given a self-DM, and the thread and CREATED action a failed track left behind, still pending and carrying an error
+            const selfDMReport: Report = {
+                ...createRandomReport(1, CONST.REPORT.CHAT_TYPE.SELF_DM),
+                reportID: 'selfDM-retry-created',
+            };
+            const failedIOUActionID = '4444444444444444';
+            const failedThreadReportID = '5555555555555555';
+            const failedThreadCreatedActionID = '6666666666666666';
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`, selfDMReport);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${failedThreadReportID}`, {
+                reportID: failedThreadReportID,
+                parentReportID: selfDMReport.reportID,
+                parentReportActionID: failedIOUActionID,
+            });
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${failedThreadReportID}`, {
+                [failedThreadCreatedActionID]: {
+                    reportActionID: failedThreadCreatedActionID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                    created: '2026-10-01 00:00:00.000',
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    errors: {genericCreateFailure: 'iou.error.genericCreateFailureMessage'},
+                } as ReportAction,
+            });
+
+            // When the receipt retry calls trackExpense with the failed attempt's IDs, and the request succeeds
+            trackExpense({
+                ...getDefaultTrackExpenseParams(selfDMReport, {amount: 1200}),
+                optimisticTransactionID: '7777777777777777',
+                currentReportActionID: failedIOUActionID,
+                existingTransactionThreadReportID: failedThreadReportID,
+                existingTransactionThreadCreatedReportActionID: failedThreadCreatedActionID,
+                isRetry: true,
+            });
+            await waitForBatchedUpdates();
+
+            // Then the backend gets the same CREATED action ID, so it doesn't add a second one to the thread
+            const requestBody = TestHelper.getFetchMockCalls(WRITE_COMMANDS.TRACK_EXPENSE).at(0)?.[1]?.body;
+            const requestParams = requestBody instanceof FormData ? Object.fromEntries(requestBody) : {};
+            expect(requestParams).toEqual(expect.objectContaining({createdReportActionIDForThread: failedThreadCreatedActionID}));
+
+            // And the failed CREATED action loses its pending state and error, so the expense no longer looks unsaved
+            const threadReportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${failedThreadReportID}`);
+            expect(threadReportActions?.[failedThreadCreatedActionID]?.pendingAction).toBeFalsy();
+            expect(threadReportActions?.[failedThreadCreatedActionID]?.errors).toBeFalsy();
+        });
+
         it('should set correct tax fields when tax parameters are provided', async () => {
             // Given a selfDM report and transaction with tax
             const selfDMReport: Report = {
diff --git a/tests/unit/ReceiptUploadRetryHandlerTest.ts b/tests/unit/ReceiptUploadRetryHandlerTest.ts
index a735a492435c..57c466431a9d 100644
--- a/tests/unit/ReceiptUploadRetryHandlerTest.ts
+++ b/tests/unit/ReceiptUploadRetryHandlerTest.ts
@@ -376,8 +376,13 @@ describe('buildRetryPayload', () => {
             expect(canRetry).toBe(false);
         });
 
-        it('reuses the failed transaction, IOU action and thread, so the retry does not create a second tracked expense', () => {
-            // Given a failed track in the self-DM
+        it('reuses the failed transaction, IOU action and thread, so the retry does not create a second tracked expense', async () => {
+            // Given a failed track in the self-DM, whose thread still holds the CREATED action of the first attempt
+            const threadCreatedActionID = '1000000000000001';
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${THREAD_REPORT_ID}`, {
+                [threadCreatedActionID]: {reportActionID: threadCreatedActionID, actionName: CONST.REPORT.ACTIONS.TYPE.CREATED, created: '2026-09-01 00:00:00.000'},
+            });
+            await waitForBatchedUpdates();
             const context = buildTrackExpenseContext();
 
             // When the retry payload is rebuilt
@@ -387,6 +392,7 @@ describe('buildRetryPayload', () => {
             expect(payload?.optimisticTransactionID).toBe(TRANSACTION_ID);
             expect(payload?.currentReportActionID).toBe(IOU_ACTION_ID);
             expect(payload?.existingTransactionThreadReportID).toBe(THREAD_REPORT_ID);
+            expect(payload?.existingTransactionThreadCreatedReportActionID).toBe(threadCreatedActionID);
             expect(payload?.report?.reportID).toBe(SELF_DM_REPORT_ID);
             expect(payload?.transactionParams.amount).toBe(1200);
         });

From dea0e3e0bba12e2a698f273afddf172f4ea6cd2e Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 17:25:50 +0530
Subject: [PATCH 536/781] keep the display name page open while its own save
 closes it

---
 .../workspace/members/WorkspaceMemberDisplayNamePage.tsx  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/members/WorkspaceMemberDisplayNamePage.tsx b/src/pages/workspace/members/WorkspaceMemberDisplayNamePage.tsx
index 0f01ca56d076..558b34ed61d2 100644
--- a/src/pages/workspace/members/WorkspaceMemberDisplayNamePage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDisplayNamePage.tsx
@@ -27,7 +27,7 @@ import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/DisplayNameForm';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import React from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 
 type WorkspaceMemberDisplayNamePageProps = PlatformStackScreenProps<ProfileNavigatorParamList, typeof SCREENS.DYNAMIC_PROFILE_DISPLAY_NAME>;
@@ -44,6 +44,9 @@ function WorkspaceMemberDisplayNamePage({route}: WorkspaceMemberDisplayNamePageP
     const hasDisplayNameSet = !!memberPersonalDetails?.firstName || !!memberPersonalDetails?.lastName;
     const isPolicyMember = !!memberLogin && !!policy?.employeeList?.[memberLogin];
 
+    // Saving sets the name straight away, so without this the page would block itself while it closes.
+    const [hasSubmitted, setHasSubmitted] = useState(false);
+
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_MEMBER_DISPLAY_NAME_FORM>) => getDisplayNameErrors(values.firstName, values.lastName, translate);
 
     return (
@@ -52,7 +55,7 @@ function WorkspaceMemberDisplayNamePage({route}: WorkspaceMemberDisplayNamePageP
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             policyFeature={CONST.POLICY.POLICY_FEATURE.MEMBERS}
             policyFeatureAccess={CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE}
-            shouldBeBlocked={!isLoadingMemberPersonalDetails && (hasDisplayNameSet || !isPolicyMember)}
+            shouldBeBlocked={!isLoadingMemberPersonalDetails && !hasSubmitted && (hasDisplayNameSet || !isPolicyMember)}
         >
             <ScreenWrapper
                 includeSafeAreaPaddingBottom
@@ -75,6 +78,7 @@ function WorkspaceMemberDisplayNamePage({route}: WorkspaceMemberDisplayNamePageP
                                 if (!memberLogin) {
                                     return;
                                 }
+                                setHasSubmitted(true);
                                 updatePolicyMemberDisplayName(policyID, values.firstName.trim(), values.lastName.trim(), formatPhoneNumber, {
                                     accountID,
                                     email: memberLogin,

From 515cf4bd69c963518d156f836b0e43513ee16e48 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 13:58:45 +0200
Subject: [PATCH 537/781] Add pinnedChartTooltip tests

---
 tests/unit/pinnedChartTooltipTest.ts | 157 +++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 tests/unit/pinnedChartTooltipTest.ts

diff --git a/tests/unit/pinnedChartTooltipTest.ts b/tests/unit/pinnedChartTooltipTest.ts
new file mode 100644
index 000000000000..e7889cab17bd
--- /dev/null
+++ b/tests/unit/pinnedChartTooltipTest.ts
@@ -0,0 +1,157 @@
+import {dismissPinnedChartTooltip, markChartTouch, pinChartTooltip, unpinChartTooltip} from '@components/Charts/utils/pinnedChartTooltip';
+
+describe('pinnedChartTooltip', () => {
+    beforeEach(() => {
+        // The pinned tooltip lives in module state, so each test starts with nothing pinned and no chart touched
+        dismissPinnedChartTooltip();
+    });
+
+    describe('pinChartTooltip', () => {
+        it('hides the tooltip of another chart when a new one is pinned', () => {
+            // Given a tooltip pinned on one chart
+            const firstDismiss = jest.fn();
+            const secondDismiss = jest.fn();
+            pinChartTooltip(firstDismiss);
+
+            // When a tooltip is pinned on another chart
+            pinChartTooltip(secondDismiss);
+
+            // Then only one tooltip stays visible on the screen
+            expect(firstDismiss).toHaveBeenCalledTimes(1);
+            expect(secondDismiss).not.toHaveBeenCalled();
+        });
+
+        it('keeps the tooltip visible when the same one is pinned again', () => {
+            // Given a pinned tooltip
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+
+            // When it is pinned again, as happens when its chart re-renders
+            pinChartTooltip(dismiss);
+
+            // Then it is not hidden by its own re-registration
+            expect(dismiss).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('unpinChartTooltip', () => {
+        it('stops hiding a tooltip on screen touches once it is unpinned', () => {
+            // Given a pinned tooltip that its chart already hid by itself
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+            unpinChartTooltip(dismiss);
+
+            // When the screen is touched
+            dismissPinnedChartTooltip();
+
+            // Then the tooltip is not hidden a second time
+            expect(dismiss).not.toHaveBeenCalled();
+        });
+
+        it('keeps the pinned tooltip when a tooltip that was replaced earlier is unpinned', () => {
+            // Given a tooltip that was replaced by one pinned on another chart
+            const firstDismiss = jest.fn();
+            const secondDismiss = jest.fn();
+            pinChartTooltip(firstDismiss);
+            pinChartTooltip(secondDismiss);
+
+            // When the replaced tooltip cleans up after itself
+            unpinChartTooltip(firstDismiss);
+            dismissPinnedChartTooltip();
+
+            // Then the current tooltip is still registered and gets hidden by the screen touch
+            expect(secondDismiss).toHaveBeenCalledTimes(1);
+            expect(firstDismiss).toHaveBeenCalledTimes(1);
+        });
+    });
+
+    describe('dismissPinnedChartTooltip', () => {
+        it('hides the pinned tooltip on a touch outside of any chart', () => {
+            // Given a pinned tooltip
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+
+            // When the screen is touched outside of any chart
+            dismissPinnedChartTooltip();
+
+            // Then the tooltip is hidden
+            expect(dismiss).toHaveBeenCalledTimes(1);
+        });
+
+        it('keeps the pinned tooltip on a touch on its own chart', () => {
+            // Given a pinned tooltip
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+
+            // When its own chart is touched, so the chart decides what happens with the tooltip
+            markChartTouch(dismiss);
+            dismissPinnedChartTooltip();
+
+            // Then the screen touch does not hide it
+            expect(dismiss).not.toHaveBeenCalled();
+        });
+
+        it('hides the pinned tooltip on a touch on another chart with a pinned tooltip', () => {
+            // Given a pinned tooltip
+            const dismiss = jest.fn();
+            const otherDismiss = jest.fn();
+            pinChartTooltip(dismiss);
+
+            // When a chart other than the one showing the tooltip is touched
+            markChartTouch(otherDismiss);
+            dismissPinnedChartTooltip();
+
+            // Then the tooltip is hidden
+            expect(dismiss).toHaveBeenCalledTimes(1);
+            expect(otherDismiss).not.toHaveBeenCalled();
+        });
+
+        it('hides the pinned tooltip on a touch on a chart with nothing pinned', () => {
+            // Given a pinned tooltip
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+
+            // When a chart without a pinned tooltip is touched
+            markChartTouch(undefined);
+            dismissPinnedChartTooltip();
+
+            // Then the tooltip is hidden
+            expect(dismiss).toHaveBeenCalledTimes(1);
+        });
+
+        it('hides the pinned tooltip on a touch outside after a touch on its own chart', () => {
+            // Given a pinned tooltip whose own chart was touched once
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+            markChartTouch(dismiss);
+            dismissPinnedChartTooltip();
+
+            // When the screen is touched outside of any chart
+            dismissPinnedChartTooltip();
+
+            // Then the touch on the chart only protected the tooltip from the touch it belonged to
+            expect(dismiss).toHaveBeenCalledTimes(1);
+        });
+
+        it('hides the pinned tooltip only once', () => {
+            // Given a pinned tooltip hidden by a screen touch
+            const dismiss = jest.fn();
+            pinChartTooltip(dismiss);
+            dismissPinnedChartTooltip();
+
+            // When the screen is touched again
+            dismissPinnedChartTooltip();
+
+            // Then the tooltip is not hidden again
+            expect(dismiss).toHaveBeenCalledTimes(1);
+        });
+
+        it('does nothing on a touch when no tooltip is pinned', () => {
+            // Given no pinned tooltip
+
+            // When the screen is touched
+            // Then nothing breaks
+            expect(() => dismissPinnedChartTooltip()).not.toThrow();
+        });
+    });
+});

From 076ea6f2c41a461958acf5062e8f659f5172d0a2 Mon Sep 17 00:00:00 2001
From: Hubert Sosinski <hubert.sosinski@callstack.com>
Date: Tue, 13 Oct 2026 14:45:08 +0200
Subject: [PATCH 538/781] Move LHN row data reads into rows and narrow report
 attributes

---
 .../LHNOptionsList/LHNOptionsList.tsx         |  39 +-----
 .../OptionRowLHN/OptionRowLHNData.tsx         |  38 +++---
 src/components/LHNOptionsList/types.ts        |  17 +--
 src/libs/ReportAlternateTextUtils.ts          |   6 +-
 src/libs/SidebarUtils.ts                      |   4 +-
 src/selectors/ReportAttributes.ts             |  15 ++-
 src/types/onyx/DerivedValues.ts               |   4 +
 .../SidebarLinksRowWrites.perf-test.tsx       | 123 ++++++++++++++++++
 8 files changed, 177 insertions(+), 69 deletions(-)
 create mode 100644 tests/perf-test/SidebarLinksRowWrites.perf-test.tsx

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 034067553d11..7d5206823906 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -2,9 +2,7 @@ import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePrevious from '@hooks/usePrevious';
-import useReportAttributes from '@hooks/useReportAttributes';
 import useScrollEventEmitter from '@hooks/useScrollEventEmitter';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -20,6 +18,7 @@ import type {FlashListProps, FlashListRef} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 
 import {useRoute} from '@react-navigation/native';
+import {reportNamesSelector} from '@selectors/ReportAttributes';
 import {FlashList} from '@shopify/flash-list';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef} from 'react';
 import {StyleSheet, View} from 'react-native';
@@ -39,10 +38,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const {isOffline} = useNetwork();
     const flashListRef = useRef<FlashListRef<Report>>(null);
     const route = useRoute();
-    const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
-    const reportAttributes = useReportAttributes();
-    const [policy] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const [personalDetails] = useAllPersonalDetails();
+    const [reportNames] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {selector: reportNamesSelector});
 
     const styles = useThemeStyles();
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
@@ -70,31 +66,11 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             if (!item) {
                 return null;
             }
-            const reportID = item.reportID;
-            const itemReportAttributes = reportAttributes?.[reportID];
-            const itemParentReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.parentReportID}`];
-            const itemOneTransactionThreadReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${itemReportAttributes?.oneTransactionThreadReportID}`];
-
-            let invoiceReceiverPolicyID = '-1';
-            if (item.invoiceReceiver && 'policyID' in item.invoiceReceiver) {
-                invoiceReceiverPolicyID = item.invoiceReceiver.policyID;
-            }
-            if (itemParentReport?.invoiceReceiver && 'policyID' in itemParentReport.invoiceReceiver) {
-                invoiceReceiverPolicyID = itemParentReport.invoiceReceiver.policyID;
-            }
-            const itemInvoiceReceiverPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`];
-            const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${item.policyID}`];
-
             return (
                 <OptionRowLHNData
-                    reportID={reportID}
+                    reportID={item.reportID}
                     fullReport={item}
-                    reportAttributes={itemReportAttributes}
-                    reportAttributesDerived={reportAttributes}
-                    oneTransactionThreadReport={itemOneTransactionThreadReport}
-                    policy={itemPolicy}
-                    invoiceReceiverPolicy={itemInvoiceReceiverPolicy}
-                    personalDetails={personalDetails ?? {}}
+                    reportNames={reportNames}
                     viewMode={optionMode}
                     isOptionFocused={!shouldDisableFocusOptions}
                     onSelectRow={onSelectRow}
@@ -103,13 +79,10 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 />
             );
         },
-        [reportAttributes, reports, policy, personalDetails, optionMode, shouldDisableFocusOptions, onSelectRow, onLayoutItem],
+        [reportNames, optionMode, shouldDisableFocusOptions, onSelectRow, onLayoutItem],
     );
 
-    const extraData = useMemo(
-        () => [reports, reportAttributes, policy, personalDetails, data.length, optionMode, isOffline],
-        [reports, reportAttributes, policy, personalDetails, data.length, optionMode, isOffline],
-    );
+    const extraData = useMemo(() => [data.length, optionMode, isOffline], [data.length, optionMode, isOffline]);
 
     const previousOptionMode = usePrevious(optionMode);
 
diff --git a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
index e90e1e05fb5a..f13d3a2c34ff 100644
--- a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
@@ -1,4 +1,5 @@
 import type {OptionRowLHNDataProps} from '@components/LHNOptionsList/types';
+import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import useReportPreviewSenderID from '@components/ReportActionAvatars/useReportPreviewSenderID';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
@@ -7,6 +8,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useGetExpensifyCardFromReportAction from '@hooks/useGetExpensifyCardFromReportAction';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useReportAttributesByID} from '@hooks/useReportAttributes';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
@@ -17,12 +19,12 @@ import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import {getMovedReportID} from '@src/libs/ModifiedExpenseMessage';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {ReportActions as ReportActionsType} from '@src/types/onyx';
+import type {Report, ReportActions as ReportActionsType} from '@src/types/onyx';
 import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 
 import type {ViewStyle} from 'react-native';
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React, {useCallback, useMemo} from 'react';
@@ -36,27 +38,29 @@ import OptionRowLHN from './OptionRowLHN';
  * OptionRowLHN is auto-memoized by React Compiler, so it will
  * only re-render when the inputs derived from this wrapper change.
  */
-function OptionRowLHNData({
-    isOptionFocused = false,
-    fullReport,
-    reportAttributes,
-    reportAttributesDerived,
-    oneTransactionThreadReport,
-    personalDetails = {},
-    policy,
-    invoiceReceiverPolicy,
-    viewMode = 'default',
-    reportID,
-    ...propsToForward
-}: OptionRowLHNDataProps) {
+function invoiceReceiverPolicyIDSelector(report: OnyxEntry<Report>): string | undefined {
+    return report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : undefined;
+}
+
+function OptionRowLHNData({isOptionFocused = false, fullReport, reportNames, viewMode = 'default', reportID, ...propsToForward}: OptionRowLHNDataProps) {
     const styles = useThemeStyles();
     const {currentReportID: currentReportIDValue} = useCurrentReportIDState();
     const isReportFocused = isOptionFocused && currentReportIDValue === reportID;
     const {translate, localeCompare, dateFnsLocale, formatPhoneNumber} = useLocalize();
     const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const {login, accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+    const personalDetails = usePersonalDetails();
 
+    const reportAttributes = useReportAttributesByID(reportID);
+    const [oneTransactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportAttributes?.oneTransactionThreadReportID)}`);
     const oneTransactionThreadReportID = oneTransactionThreadReport?.reportID;
+
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(fullReport?.policyID)}`);
+    const [parentReportInvoiceReceiverPolicyID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(fullReport?.parentReportID)}`, {
+        selector: invoiceReceiverPolicyIDSelector,
+    });
+    const invoiceReceiverPolicyID = parentReportInvoiceReceiverPolicyID ?? invoiceReceiverPolicyIDSelector(fullReport);
+    const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(invoiceReceiverPolicyID)}`);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
 
     // Per-item report actions subscriptions (scoped by specific report ID)
@@ -153,7 +157,7 @@ function OptionRowLHNData({
         reportAttributes,
         oneTransactionThreadReport,
         reportNameValuePairs,
-        personalDetails,
+        personalDetails: personalDetails ?? {},
         policy,
         parentReportAction,
         conciergeReportID,
@@ -170,7 +174,7 @@ function OptionRowLHNData({
         movedFromReport,
         movedToReport,
         currentUserAccountID,
-        reportAttributesDerived,
+        reportAttributesDerived: reportNames,
         visibleReportActionsData,
         policyTags,
         currentUserLogin: login ?? '',
diff --git a/src/components/LHNOptionsList/types.ts b/src/components/LHNOptionsList/types.ts
index c95083c09ce1..4743687bf34d 100644
--- a/src/components/LHNOptionsList/types.ts
+++ b/src/components/LHNOptionsList/types.ts
@@ -1,7 +1,7 @@
 import type CONST from '@src/CONST';
 import type {OptionData} from '@src/libs/ReportUtils';
-import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx';
-import type {ReportAttributes, ReportAttributesDerivedValue} from '@src/types/onyx/DerivedValues';
+import type {Report} from '@src/types/onyx';
+import type {ReportNamesDerivedValue} from '@src/types/onyx/DerivedValues';
 
 import type {ComponentRef, RefObject} from 'react';
 import type {LayoutChangeEvent, StyleProp, View, ViewStyle} from 'react-native';
@@ -35,16 +35,12 @@ type OptionRowLHNDataProps = {
     /** Whether row should be focused */
     isOptionFocused?: boolean;
 
-    personalDetails?: PersonalDetailsList;
     fullReport: OnyxEntry<Report>;
-    oneTransactionThreadReport: OnyxEntry<Report>;
-
-    /** The policy which the user has access to and which the report could be tied to */
-    policy?: OnyxEntry<Policy>;
-
-    invoiceReceiverPolicy?: OnyxEntry<Policy>;
     reportID: string;
 
+    /** Names of all reports, for the alternate text of rows whose last action points at another report */
+    reportNames: ReportNamesDerivedValue | undefined;
+
     /** Toggle between compact and default view */
     viewMode?: OptionMode;
 
@@ -54,9 +50,6 @@ type OptionRowLHNDataProps = {
     /** Callback to execute when the OptionList lays out */
     onLayout?: (event: LayoutChangeEvent) => void;
 
-    reportAttributes: OnyxEntry<ReportAttributes>;
-    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
-
     /** TestID of the row, indicating order */
     testID: number;
 };
diff --git a/src/libs/ReportAlternateTextUtils.ts b/src/libs/ReportAlternateTextUtils.ts
index 8f01c40407f9..122ea8aa95f2 100644
--- a/src/libs/ReportAlternateTextUtils.ts
+++ b/src/libs/ReportAlternateTextUtils.ts
@@ -14,13 +14,13 @@ import type {
     Report,
     ReportAction,
     ReportActions,
-    ReportAttributesDerivedValue,
     ReportMetadata,
     Rule,
     Transaction,
     VisibleReportActionsDerivedValue,
     WorkspaceCardsList,
 } from '@src/types/onyx';
+import type {ReportNamesDerivedValue} from '@src/types/onyx/DerivedValues';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {Locale as DateFnsLocale} from 'date-fns';
@@ -518,7 +518,7 @@ function getLastMessageTextForReport({
     reportMetadata?: OnyxEntry<ReportMetadata>;
     visibleReportActionsDataParam?: VisibleReportActionsDerivedValue;
     lastAction?: OnyxEntry<ReportAction>;
-    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
+    reportAttributesDerived?: ReportNamesDerivedValue;
     policyTags?: OnyxEntry<PolicyTagLists>;
     currentUserLogin?: string;
     conciergeReportID: string | undefined;
@@ -1180,7 +1180,7 @@ type GetReportAlternateTextParams = {
     isReportArchived: boolean | undefined;
     privateIsArchived: boolean;
     conciergeReportID: string | undefined;
-    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
+    reportAttributesDerived?: ReportNamesDerivedValue;
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
     sortedActions?: Record<string, ReportAction[]>;
     oneTransactionThreadReportID?: string;
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 456ca5fddf4b..b332834fda39 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -18,7 +18,7 @@ import type {
     TransactionViolation,
     VisibleReportActionsDerivedValue,
 } from '@src/types/onyx';
-import type {ReportAttributes} from '@src/types/onyx/DerivedValues';
+import type {ReportAttributes, ReportNamesDerivedValue} from '@src/types/onyx/DerivedValues';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import type Policy from '@src/types/onyx/Policy';
 import type PriorityMode from '@src/types/onyx/PriorityMode';
@@ -788,7 +788,7 @@ function getOptionData({
     movedToReport?: OnyxEntry<Report>;
     currentUserAccountID: number;
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
-    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
+    reportAttributesDerived?: ReportNamesDerivedValue;
     policyTags?: OnyxEntry<PolicyTagLists>;
     currentUserLogin: string;
     isTrackIntentUser?: boolean;
diff --git a/src/selectors/ReportAttributes.ts b/src/selectors/ReportAttributes.ts
index 3c6fb8789673..7d8f390afd8b 100644
--- a/src/selectors/ReportAttributes.ts
+++ b/src/selectors/ReportAttributes.ts
@@ -1,5 +1,5 @@
 import type {ReportAttributesDerivedValue} from '@src/types/onyx';
-import type {ReportAttributes} from '@src/types/onyx/DerivedValues';
+import type {ReportAttributes, ReportNamesDerivedValue} from '@src/types/onyx/DerivedValues';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
@@ -19,5 +19,16 @@ const reportNameSelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>,
 
 const reportIsEmptySelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>, reportID: string | undefined) => (reportID ? attributes?.reports?.[reportID]?.isEmpty : undefined);
 
-export {reportNameSelector, reportIsEmptySelector};
+const reportNamesSelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>): ReportNamesDerivedValue | undefined => {
+    if (!attributes?.reports) {
+        return undefined;
+    }
+    const reportNames: ReportNamesDerivedValue = {};
+    for (const [reportID, reportAttributes] of Object.entries(attributes.reports)) {
+        reportNames[reportID] = {reportName: reportAttributes.reportName};
+    }
+    return reportNames;
+};
+
+export {reportNameSelector, reportIsEmptySelector, reportNamesSelector};
 export default reportByIDsSelector;
diff --git a/src/types/onyx/DerivedValues.ts b/src/types/onyx/DerivedValues.ts
index 3f5e2a136157..0d71120505c0 100644
--- a/src/types/onyx/DerivedValues.ts
+++ b/src/types/onyx/DerivedValues.ts
@@ -48,6 +48,9 @@ type ReportAttributes = {
     needsParentChatErrorPropagation?: boolean;
 };
 
+/** Report names keyed by reportID, the only part of the report attributes that option rows read for reports other than their own */
+type ReportNamesDerivedValue = Record<string, Pick<ReportAttributes, 'reportName'>>;
+
 /**
  * The derived value for report attributes.
  */
@@ -247,6 +250,7 @@ type OneOnOneChatReportIDsDerivedValue = {
 export type {
     ReportAttributes,
     ReportAttributesDerivedValue,
+    ReportNamesDerivedValue,
     ReportTransactionsAndViolationsDerivedValue,
     ReportTransactionsAndViolations,
     OutstandingReportsByPolicyIDDerivedValue,
diff --git a/tests/perf-test/SidebarLinksRowWrites.perf-test.tsx b/tests/perf-test/SidebarLinksRowWrites.perf-test.tsx
new file mode 100644
index 000000000000..ca738b3ef2e5
--- /dev/null
+++ b/tests/perf-test/SidebarLinksRowWrites.perf-test.tsx
@@ -0,0 +1,123 @@
+import {screen} from '@testing-library/react-native';
+
+import {setHasRadio} from '@libs/NetworkState';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ReportCollectionDataSet} from '@src/types/onyx/Report';
+
+import Onyx from 'react-native-onyx';
+import {measureRenders} from 'reassure';
+
+import * as LHNTestUtils from '../utils/LHNTestUtils';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
+
+jest.mock('@libs/Permissions');
+jest.mock('../../src/libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    isActiveRoute: jest.fn(),
+    getTopmostReportId: jest.fn(),
+    getActiveRoute: jest.fn(),
+    getTopmostReportActionId: jest.fn(),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    isDisplayedInModal: jest.fn(() => false),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+}));
+jest.mock('../../src/libs/Navigation/navigationRef', () => ({
+    getState: () => ({
+        routes: [{name: 'Report'}],
+    }),
+    getRootState: () => ({
+        routes: [],
+    }),
+    addListener: () => () => {},
+    isReady: () => true,
+}));
+
+jest.mock('@react-navigation/native');
+
+const REPORT_COUNT = 500;
+const WRITES_PER_SCENARIO = 10;
+const UNRELATED_POLICY_ID = 'UNRELATED_POLICY';
+const UNRELATED_POLICY_KEY = `${ONYXKEYS.COLLECTION.POLICY}${UNRELATED_POLICY_ID}` as const;
+
+const reports: ReportCollectionDataSet = Object.fromEntries(
+    Array.from({length: REPORT_COUNT}, () => {
+        const report = {...LHNTestUtils.getFakeReport([1, 2], 1, true), lastMessageText: 'hey'};
+        return [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report];
+    }),
+);
+const firstReportID = Object.values(reports).at(0)?.reportID;
+
+describe('SidebarLinks on single-key writes', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        });
+        // Required lazily so LHNTestUtils registers its @react-navigation/native mock before the engine's imports load it
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        require('@userActions/OnyxDerived').default();
+    });
+
+    beforeEach(async () => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
+        setHasRadio(true);
+        await TestHelper.signInWithTestUser(1, 'email1@test.com', undefined, undefined, 'One');
+        await waitForBatchedUpdates();
+
+        // Given 500 reports in the LHN and a policy that none of them belongs to
+        await Onyx.multiSet({
+            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+            [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+            [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
+            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
+            [UNRELATED_POLICY_KEY]: {id: UNRELATED_POLICY_ID, name: 'Unrelated', type: CONST.POLICY.TYPE.TEAM},
+            ...reports,
+        });
+        await waitForBatchedUpdates();
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    test('[SidebarLinks] should re-render when one report is written', async () => {
+        // Reassure runs the scenario several times against one seeded Onyx, so every run writes a value that doesn't exist yet
+        let run = 0;
+        const scenario = async () => {
+            await screen.findByTestId('lhn-options-list');
+
+            // When a single report gets a field update that does not change the LHN order
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${firstReportID}`, {lastReadTime: `2026-01-01 00:${String(run % 60).padStart(2, '0')}:${String(index).padStart(2, '0')}.000`});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        };
+
+        // Then reassure measures what a write to one report costs the LHN
+        await measureRenders(<LHNTestUtils.MockedSidebarLinks />, {scenario});
+    });
+
+    test('[SidebarLinks] should re-render when an unrelated policy is written', async () => {
+        let run = 0;
+        const scenario = async () => {
+            await screen.findByTestId('lhn-options-list');
+
+            // When a policy that no LHN report belongs to is renamed
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(UNRELATED_POLICY_KEY, {name: `Unrelated ${run}-${index}`});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        };
+
+        // Then reassure measures what the unrelated policy writes cost the LHN
+        await measureRenders(<LHNTestUtils.MockedSidebarLinks />, {scenario});
+    });
+});

From 0f539a3b51b866b3b0601bf6d70e67b30368cd41 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Tue, 13 Oct 2026 14:57:44 +0200
Subject: [PATCH 539/781] Show the group-by dropdown only when there's more
 than one option

---
 src/pages/Insights/charts/InsightsChartWidget.tsx |  2 +-
 src/pages/Insights/insightsGroupByUtils.ts        |  8 ++------
 tests/unit/hooks/useInsightsFilters.test.ts       |  2 +-
 tests/unit/insightsGroupByUtilsTest.ts            | 12 +-----------
 tests/unit/insightsQueriesTest.ts                 |  2 +-
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 36fbdf6108b0..aa5f48be016a 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -68,7 +68,7 @@ function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGr
     const groupByOptions = getInsightsGroupByOptions(filters.date);
 
     const groupByControl =
-        onGroupByChange && groupByOptions.length > 0 ? (
+        onGroupByChange && groupByOptions.length > 1 ? (
             <InsightsGroupByDropdown
                 groupBy={getQueryGroupBy(filters)}
                 options={groupByOptions}
diff --git a/src/pages/Insights/insightsGroupByUtils.ts b/src/pages/Insights/insightsGroupByUtils.ts
index e54b3a3ca2aa..f34a944b3a2d 100644
--- a/src/pages/Insights/insightsGroupByUtils.ts
+++ b/src/pages/Insights/insightsGroupByUtils.ts
@@ -20,9 +20,8 @@ const MIN_MONTHS_BY_GROUP_BY = {
 
 /** Returns the Group by options that fit the date range, in the dropdown's order */
 function getInsightsGroupByOptions(date: InsightsFilters['date']): InsightsGroupBy[] {
-    // We don't show the group-by filter for "Custom date" date option
     if ('on' in date) {
-        return [];
+        return [CONST.SEARCH.GROUP_BY.DAY];
     }
 
     const boundaries = 'from' in date ? {start: date.from, end: date.to} : getDateRangeForPreset(date.preset);
@@ -59,11 +58,8 @@ function getFittingGroupBy(groupBy: InsightsGroupBy, options: InsightsGroupBy[])
     return options.reduce((nearest, option) => (getDistanceFromSelection(option) < getDistanceFromSelection(nearest) ? option : nearest));
 }
 
-/** Returns the Group by the charts are queried with, fitted to the date range. A single date has no options to pick from, so its one point is grouped by day. */
+/** Returns the Group by the charts are queried with, fitted to the date range. */
 function getQueryGroupBy(filters: InsightsFilters): InsightsGroupBy {
-    if ('on' in filters.date) {
-        return CONST.SEARCH.GROUP_BY.DAY;
-    }
     return getFittingGroupBy(filters.groupBy, getInsightsGroupByOptions(filters.date));
 }
 
diff --git a/tests/unit/hooks/useInsightsFilters.test.ts b/tests/unit/hooks/useInsightsFilters.test.ts
index 0c7ec810aef2..61ff45f38d08 100644
--- a/tests/unit/hooks/useInsightsFilters.test.ts
+++ b/tests/unit/hooks/useInsightsFilters.test.ts
@@ -173,7 +173,7 @@ describe('useInsightsFilters', () => {
         expect(result.current.filters.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
     });
 
-    it('keeps the saved grouping on a single day, which has no grouping to pick', async () => {
+    it('keeps the saved grouping on a single day, which only offers day', async () => {
         // Given a dashboard over the last 12 months grouped by quarter
         await setUpActivePolicy('PLN');
         await storeFilters({date: {preset: CONST.SEARCH.DATE_PRESETS.LAST_12_MONTHS}, policyIDs: [], groupBy: CONST.SEARCH.GROUP_BY.QUARTER, groupCurrency: 'USD'});
diff --git a/tests/unit/insightsGroupByUtilsTest.ts b/tests/unit/insightsGroupByUtilsTest.ts
index 04d4786046f2..f539c11a09ac 100644
--- a/tests/unit/insightsGroupByUtilsTest.ts
+++ b/tests/unit/insightsGroupByUtilsTest.ts
@@ -29,7 +29,7 @@ describe('insightsGroupByUtils', () => {
             ['a range of 63 days', {from: '2026-03-01', to: '2026-05-02'}, [WEEK, MONTH]],
             ['a range of exactly two months', {from: '2026-01-01', to: '2026-02-28'}, [DAY, WEEK, MONTH]],
             ['a range of two years', {from: '2024-01-01', to: '2025-12-31'}, [WEEK, MONTH, QUARTER, YEAR]],
-            ['a single day', {on: '2026-03-04'}, []],
+            ['a single day', {on: '2026-03-04'}, [DAY]],
         ])('offers the options that fit %s', (_label, date, expected) => {
             // Given a dashboard reporting on that date range
 
@@ -82,16 +82,6 @@ describe('insightsGroupByUtils', () => {
             // Then Week is picked, the closest grouping to Day that the range offers
             expect(groupBy).toBe(WEEK);
         });
-
-        it('keeps the selection for a single day, which has no options to pick from', () => {
-            // Given a quarterly chart moved to a single day
-
-            // When the Group by is fitted to the day
-            const groupBy = getFittingGroupBy(QUARTER, getInsightsGroupByOptions({on: '2026-03-04'}));
-
-            // Then the saved selection is left alone, so it comes back when a range is picked again
-            expect(groupBy).toBe(QUARTER);
-        });
     });
 
     describe('getQueryGroupBy', () => {
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index ae1bc3ead359..57a4696723cd 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -145,7 +145,7 @@ describe('insightsQueries', () => {
             // When its request is built
             const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
-            // Then the query names that day the same way it names a preset, and its one point is grouped by day since a single date offers no grouping to pick
+            // Then the query names that day the same way it names a preset, and its one point is grouped by day, the only grouping a single date offers
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
             expect(parsePayload(request)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
             expect(parsePayload(request)).toEqual(expect.objectContaining({insightsHashes: buildExpectedHashes(filters)}));

From 1009a3a0934ec26d63c83d5c212f51e8e34b0388 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 13 Oct 2026 18:32:26 +0530
Subject: [PATCH 540/781] extend display name hover to the full profile width

---
 src/pages/ProfilePage.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index d6af9a528d91..fbd28a76ef4a 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -293,10 +293,9 @@ function ProfilePage({route}: ProfilePageProps) {
                                 </View>
                             ) : null}
                             {canManageMemberDisplayName ? (
-                                <View style={[styles.w100, styles.detailsPageSectionContainer]}>
+                                <View style={[styles.alignSelfStretch, styles.mhn5]}>
                                     <OfflineWithFeedback pendingAction={details?.pendingFields?.displayName}>
                                         <MenuItemWithTopDescription
-                                            style={[styles.ph0]}
                                             title={displayName}
                                             description={translate('displayNamePage.headerTitle')}
                                             interactive={!hasDisplayNameSet}

From 602870ed3d926d7721c40d4786dbd0da9c234269 Mon Sep 17 00:00:00 2001
From: Sergei Sharabai <105950333+sharabai@users.noreply.github.com>
Date: Tue, 13 Oct 2026 15:16:28 +0200
Subject: [PATCH 541/781] Keep the chart width when its card reports 0

---
 .../Charts/components/ChartWidthBox.tsx       | 17 ++++++++++++++---
 .../Charts/chartWidthHandoff.test.tsx         | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/Charts/components/ChartWidthBox.tsx b/src/components/Charts/components/ChartWidthBox.tsx
index 274aecd049f1..4d71efe2c303 100644
--- a/src/components/Charts/components/ChartWidthBox.tsx
+++ b/src/components/Charts/components/ChartWidthBox.tsx
@@ -1,8 +1,9 @@
-import useContainerWidth from '@hooks/useContainerWidth';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ReactNode} from 'react';
+import type {LayoutChangeEvent} from 'react-native';
 
+import {useState} from 'react';
 import {View} from 'react-native';
 
 type ChartWidthBoxProps = {
@@ -13,14 +14,24 @@ type ChartWidthBoxProps = {
 /** On web the chart component mounts only once the chart engine has downloaded, so measuring here keeps the width across that mount. */
 function ChartWidthBox({children}: ChartWidthBoxProps) {
     const styles = useThemeStyles();
-    const {onLayout, containerWidth} = useContainerWidth();
+    const [chartWidth, setChartWidth] = useState<number | null>(null);
+
+    const onLayout = (event: LayoutChangeEvent) => {
+        const {width} = event.nativeEvent.layout;
+
+        // A hidden card reports a width of 0. Keeping the last width keeps the chart and its hover state mounted until the card shows again.
+        if (width <= 0) {
+            return;
+        }
+        setChartWidth(width);
+    };
 
     return (
         <View
             style={styles.w100}
             onLayout={onLayout}
         >
-            {children(containerWidth > 0 ? containerWidth : null)}
+            {children(chartWidth)}
         </View>
     );
 }
diff --git a/tests/unit/components/Charts/chartWidthHandoff.test.tsx b/tests/unit/components/Charts/chartWidthHandoff.test.tsx
index cd4bc4c76dd0..af942c4666ab 100644
--- a/tests/unit/components/Charts/chartWidthHandoff.test.tsx
+++ b/tests/unit/components/Charts/chartWidthHandoff.test.tsx
@@ -91,4 +91,23 @@ describe('chart width handoff', () => {
         expect(PolarChart).not.toHaveBeenCalled();
         expect(screen.UNSAFE_queryByType(ActivityIndicator)).not.toBeNull();
     });
+
+    it('should keep the pie chart mounted when its box reports a width of 0', () => {
+        // Given a pie chart that has mounted at its measured width
+        render(
+            <PieChart
+                data={data}
+                isLoading={false}
+            />,
+        );
+        const measuredBox = getMeasuredBox();
+        fireEvent(measuredBox, 'layout', {nativeEvent: {layout: {width: CONTAINER_WIDTH, height: CHART_CONTENT_MIN_HEIGHT}}});
+
+        // When its card is hidden and the box reports a width of 0
+        fireEvent(measuredBox, 'layout', {nativeEvent: {layout: {width: 0, height: 0}}});
+
+        // Then the chart stays mounted at its last width instead of falling back to the spinner, which would drop its hover state and rebuild its canvas
+        expect(screen.UNSAFE_queryByType(ActivityIndicator)).toBeNull();
+        expect(PolarChart).toHaveBeenLastCalledWith(expect.objectContaining({explicitSize: {width: CONTAINER_WIDTH, height: CHART_CONTENT_MIN_HEIGHT}}), undefined);
+    });
 });

From b1c86283cfe93b47fb5cebdfe45cc4ca831d0927 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Tue, 13 Oct 2026 15:19:22 +0200
Subject: [PATCH 542/781] Make "Reset" button set the default group-by (Month),
 not the adjusted one

---
 src/pages/Insights/controls/InsightsGroupByDropdown.tsx | 6 ++----
 tests/ui/InsightsControlsTest.tsx                       | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
index d31d8b27a9dc..3f60916ea578 100644
--- a/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
+++ b/src/pages/Insights/controls/InsightsGroupByDropdown.tsx
@@ -8,7 +8,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
 import DEFAULT_INSIGHTS_FILTERS from '@pages/Insights/insightsFilters';
-import {getFittingGroupBy} from '@pages/Insights/insightsGroupByUtils';
 
 import variables from '@styles/variables';
 
@@ -31,7 +30,6 @@ type InsightsGroupByDropdownProps = {
 function InsightsGroupByDropdown({groupBy, options, onChange}: InsightsGroupByDropdownProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const defaultGroupBy = getFittingGroupBy(DEFAULT_INSIGHTS_FILTERS.groupBy, options);
 
     const items: Array<SingleSelectItem<InsightsFilters['groupBy']>> = options.map((option) => ({
         text: translate(`search.filters.groupBy.${option}`),
@@ -46,9 +44,9 @@ function InsightsGroupByDropdown({groupBy, options, onChange}: InsightsGroupByDr
             label={label}
             items={items}
             value={selectedItem}
-            defaultValue={defaultGroupBy}
+            defaultValue={DEFAULT_INSIGHTS_FILTERS.groupBy}
             closeOverlay={closeOverlay}
-            onChange={(item) => onChange(item?.value ?? defaultGroupBy)}
+            onChange={(item) => onChange(item?.value ?? DEFAULT_INSIGHTS_FILTERS.groupBy)}
         />
     );
 
diff --git a/tests/ui/InsightsControlsTest.tsx b/tests/ui/InsightsControlsTest.tsx
index 61717f2ebd81..4ea963010791 100644
--- a/tests/ui/InsightsControlsTest.tsx
+++ b/tests/ui/InsightsControlsTest.tsx
@@ -178,7 +178,7 @@ describe('Insights controls', () => {
         expect(screen.queryByText(/^(Quarter|search\.filters\.groupBy\.quarter)$/)).toBeNull();
     });
 
-    it('resets the grouping to the nearest fit for month when the date range rules month out', async () => {
+    it('resets the grouping to month even when the date range rules month out', async () => {
         // Given the headline chart grouped by day over this month, which doesn't offer Month
         const onChange = jest.fn();
         const date: InsightsFilters['date'] = {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH};
@@ -195,8 +195,8 @@ describe('Insights controls', () => {
         fireEvent.press(screen.getByText(RESET));
         await waitForBatchedUpdatesWithAct();
 
-        // Then the chart goes to Week, the closest offered grouping to the monthly default
-        expect(onChange).toHaveBeenCalledWith(CONST.SEARCH.GROUP_BY.WEEK);
+        // Then month is saved, so it comes back once the date range fits it
+        expect(onChange).toHaveBeenCalledWith(CONST.SEARCH.GROUP_BY.MONTH);
     });
 
     it('resets Workspace to every workspace', async () => {

From d498110d541b932e999e590baa10b00caa093c66 Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 15:24:33 +0200
Subject: [PATCH 543/781] perf(report-actions): read the parent hierarchy once
 per list instead of once per row

---
 .../MoneyRequestReportActionsList.tsx         | 12 ++-
 .../SearchList/ListItem/ChatListItem.tsx      |  3 +
 .../DebugReportActionCreatePage.tsx           |  3 +
 .../ReportAction/DebugReportActionPreview.tsx |  3 +
 .../inbox/report/AncestorReportActionItem.tsx |  6 ++
 src/pages/inbox/report/ReportActionItem.tsx   |  9 +-
 .../report/ReportActionItemParentAction.tsx   |  6 ++
 src/pages/inbox/report/ReportActionsList.tsx  |  4 +
 .../report/ReportActionsListItemRenderer.tsx  | 10 ++-
 tests/ui/ClearReportActionErrorsUITest.tsx    | 31 +++++--
 tests/ui/ReportActionItemTest.tsx             | 41 +++++++++
 tests/unit/useReportsParentHierarchyTest.ts   | 89 +++++++++++++++++++
 12 files changed, 203 insertions(+), 14 deletions(-)
 create mode 100644 tests/unit/useReportsParentHierarchyTest.ts

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index 0752ad30b8a1..ea9484343abf 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -7,6 +7,7 @@ import useOnyx from '@hooks/useOnyx';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
 import useParentReportAction from '@hooks/useParentReportAction';
 import useReportIsArchived from '@hooks/useReportIsArchived';
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useUnreadMarker from '@hooks/useUnreadMarker';
@@ -95,6 +96,7 @@ function MoneyRequestReportActionsListContent({reportIDFromRoute, onLayout}: Mon
     // Self-subscribe to report, policy, metadata, actions, transactions
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`);
     const [reportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`, {selector: getStableReportSelector});
+    const reportsParentHierarchy = useReportsParentHierarchy(reportIDFromRoute);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(report?.policyID)}`);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const [reportLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${reportIDFromRoute}`);
@@ -280,6 +282,7 @@ function MoneyRequestReportActionsListContent({reportIDFromRoute, onLayout}: Mon
                             isHarvestCreatedExpenseReport={shouldShowHarvestCreatedAction}
                             shouldDisableContextMenuForConciergeDraft={shouldDisableContextMenuForConciergeDraft}
                             isLatestConciergeFeedbackAction={!!latestConciergeFeedbackActionID && latestConciergeFeedbackActionID === reportAction.reportActionID}
+                            reportsParentHierarchy={reportsParentHierarchy}
                         />
                     )}
                 </ReportActionPositionContextProvider>
@@ -287,7 +290,14 @@ function MoneyRequestReportActionsListContent({reportIDFromRoute, onLayout}: Mon
         );
     };
 
-    const reportActionsExtraData = [draftReportActionID, isDraftPendingCompletion, latestConciergeFeedbackActionID, expandedSystemMessageReportActionIDs, unreadMarkerReportActionID];
+    const reportActionsExtraData = [
+        draftReportActionID,
+        isDraftPendingCompletion,
+        latestConciergeFeedbackActionID,
+        expandedSystemMessageReportActionIDs,
+        unreadMarkerReportActionID,
+        reportsParentHierarchy,
+    ];
 
     /**
      * Runs when the FlatList finishes laying out
diff --git a/src/components/Search/SearchList/ListItem/ChatListItem.tsx b/src/components/Search/SearchList/ListItem/ChatListItem.tsx
index 2918e07d7b62..4f5a1bfd7283 100644
--- a/src/components/Search/SearchList/ListItem/ChatListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ChatListItem.tsx
@@ -4,6 +4,7 @@ import type {ListItem} from '@components/SelectionList/types';
 
 import useLayoutSpacing from '@hooks/useLayoutSpacing';
 import useOnyx from '@hooks/useOnyx';
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -39,6 +40,7 @@ function ChatListItem<TItem extends ListItem>({
     const [reportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportActionItem?.reportID}`, {selector: getStableReportSelector});
     const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportActionItem?.childReportID}`);
     const [chatReportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportStable?.chatReportID)}`, {selector: getStableReportSelector});
+    const reportsParentHierarchy = useReportsParentHierarchy(reportActionItem?.reportID);
     const styles = useThemeStyles();
     const {pageGutterMargin} = useLayoutSpacing();
     const StyleUtils = useStyleUtils();
@@ -91,6 +93,7 @@ function ChatListItem<TItem extends ListItem>({
                     isFirstVisibleReportAction={false}
                     shouldDisplayContextMenu={false}
                     shouldShowBorder
+                    reportsParentHierarchy={reportsParentHierarchy}
                 />
             </View>
         </ListItemComposed>
diff --git a/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx b/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
index 9dadbf096997..fcb48b715e4d 100644
--- a/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
+++ b/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
@@ -8,6 +8,7 @@ import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import DateUtils from '@libs/DateUtils';
@@ -73,6 +74,7 @@ function DebugReportActionCreatePage({
     const [draftReportAction, setDraftReportAction] = useState<string>(() => getInitialReportAction(reportID, session, currentUserPersonalDetail));
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.chatReportID)}`);
+    const reportsParentHierarchy = useReportsParentHierarchy(reportID);
 
     const reportAction = parseReportActionJSON(draftReportAction);
 
@@ -142,6 +144,7 @@ function DebugReportActionCreatePage({
                                     shouldDisplayNewMarker={false}
                                     isFirstVisibleReportAction={false}
                                     shouldDisplayContextMenu={false}
+                                    reportsParentHierarchy={reportsParentHierarchy}
                                 />
                             ) : (
                                 <Text>{translate('debug.nothingToPreview')}</Text>
diff --git a/src/pages/Debug/ReportAction/DebugReportActionPreview.tsx b/src/pages/Debug/ReportAction/DebugReportActionPreview.tsx
index ea59af7c6344..235702973b60 100644
--- a/src/pages/Debug/ReportAction/DebugReportActionPreview.tsx
+++ b/src/pages/Debug/ReportAction/DebugReportActionPreview.tsx
@@ -1,6 +1,7 @@
 import ScrollView from '@components/ScrollView';
 
 import useOnyx from '@hooks/useOnyx';
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 
@@ -25,6 +26,7 @@ function DebugReportActionPreview({reportAction, reportID}: DebugReportActionPre
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportAction?.childReportID}`);
     const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.chatReportID)}`);
+    const reportsParentHierarchy = useReportsParentHierarchy(reportID);
 
     return (
         <ScrollView>
@@ -38,6 +40,7 @@ function DebugReportActionPreview({reportAction, reportID}: DebugReportActionPre
                 shouldDisplayNewMarker={false}
                 isFirstVisibleReportAction={false}
                 shouldDisplayContextMenu={false}
+                reportsParentHierarchy={reportsParentHierarchy}
             />
         </ScrollView>
     );
diff --git a/src/pages/inbox/report/AncestorReportActionItem.tsx b/src/pages/inbox/report/AncestorReportActionItem.tsx
index caf4dbb51e8d..86d8ab31407b 100644
--- a/src/pages/inbox/report/AncestorReportActionItem.tsx
+++ b/src/pages/inbox/report/AncestorReportActionItem.tsx
@@ -18,6 +18,7 @@ import {
     navigateToLinkedReportAction,
 } from '@libs/ReportUtils';
 
+import type {ReportHierarchyInfo} from '@userActions/ClearReportActionErrors';
 import {navigateToConciergeChatAndDeleteReport} from '@userActions/Report';
 
 import CONST from '@src/CONST';
@@ -64,6 +65,9 @@ type AncestorReportActionItemProps = {
     shouldAllowConciergeFeedback: boolean;
     shouldUseThreadDividerLine: boolean;
     transactionThreadReport: OnyxEntry<Report>;
+
+    /** Parent links of the thread and its ancestors, used to clear related errors on dismiss */
+    reportsParentHierarchy: OnyxCollection<ReportHierarchyInfo>;
 };
 
 function AncestorReportActionItem({
@@ -83,6 +87,7 @@ function AncestorReportActionItem({
     shouldAllowConciergeFeedback,
     shouldUseThreadDividerLine,
     transactionThreadReport,
+    reportsParentHierarchy,
 }: AncestorReportActionItemProps) {
     const styles = useThemeStyles();
     const currentUserPersonalDetail = useCurrentUserPersonalDetails();
@@ -167,6 +172,7 @@ function AncestorReportActionItem({
                 isThreadReportParentAction
                 isLatestConciergeFeedbackAction={shouldAllowConciergeFeedback && !!latestConciergeFeedbackActionID && latestConciergeFeedbackActionID === reportAction.reportActionID}
                 linkedTransactionRouteError={linkedTransactionRouteError}
+                reportsParentHierarchy={reportsParentHierarchy}
             />
         </OfflineWithFeedback>
     );
diff --git a/src/pages/inbox/report/ReportActionItem.tsx b/src/pages/inbox/report/ReportActionItem.tsx
index 92d9d7d80188..856d4cc85784 100644
--- a/src/pages/inbox/report/ReportActionItem.tsx
+++ b/src/pages/inbox/report/ReportActionItem.tsx
@@ -19,7 +19,6 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useOriginalReportID from '@hooks/useOriginalReportID';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
-import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 import useReportTransactionsCollection from '@hooks/useReportTransactionsCollection';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -72,6 +71,7 @@ import {ReactionListContext} from '@pages/inbox/ReactionListContext';
 import AttachmentModalContext from '@pages/media/AttachmentModalScreen/AttachmentModalContext';
 
 import {clearAllRelatedReportActionErrors} from '@userActions/ClearReportActionErrors';
+import type {ReportHierarchyInfo} from '@userActions/ClearReportActionErrors';
 import {hideEmojiPicker, isActive} from '@userActions/EmojiPickerAction';
 import {expandURLPreview} from '@userActions/Report';
 import {clearErrorWithOriginalTransactionError} from '@userActions/Transaction';
@@ -87,7 +87,7 @@ import type {Errors} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject, isEmptyValueObject} from '@src/types/utils/EmptyObject';
 
 import type {GestureResponderEvent, TextInput} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {useNavigation} from '@react-navigation/native';
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
@@ -165,6 +165,9 @@ type ReportActionItemProps = {
 
     /** Whether the action is the "Created" action of a harvest-created expense report */
     isHarvestCreatedExpenseReport?: boolean;
+
+    /** Parent links of the report and its ancestors, used to clear related errors on dismiss */
+    reportsParentHierarchy: OnyxCollection<ReportHierarchyInfo>;
 };
 
 function ReportActionItem({
@@ -188,11 +191,11 @@ function ReportActionItem({
     shouldShowBorder,
     shouldHighlight = false,
     isHarvestCreatedExpenseReport = false,
+    reportsParentHierarchy,
 }: ReportActionItemProps) {
     const reportID = report?.reportID ?? action?.reportID;
     const originalReportID = useOriginalReportID(report?.reportID, action);
     const {isOffline} = useNetwork();
-    const reportsParentHierarchy = useReportsParentHierarchy(reportID);
     const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getIOUReportIDFromReportActionPreview(action)}`, {selector: getStableReportSelector});
     const [iouPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
 
diff --git a/src/pages/inbox/report/ReportActionItemParentAction.tsx b/src/pages/inbox/report/ReportActionItemParentAction.tsx
index 4c5504a2fb68..e25f109d1359 100644
--- a/src/pages/inbox/report/ReportActionItemParentAction.tsx
+++ b/src/pages/inbox/report/ReportActionItemParentAction.tsx
@@ -12,6 +12,7 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {shouldExcludeAncestorReportAction} from '@libs/ReportUtils';
 
+import type {ReportHierarchyInfo} from '@userActions/ClearReportActionErrors';
 import {navigateToConciergeChatAndDeleteReport} from '@userActions/Report';
 
 import CONST from '@src/CONST';
@@ -42,6 +43,9 @@ type ReportActionItemParentActionProps = {
     shouldDisplayReplyDivider: boolean;
     isFirstVisibleReportAction: boolean;
     shouldUseThreadDividerLine?: boolean;
+
+    /** Parent links of the thread and its ancestors, shared by every ancestor shown above it */
+    reportsParentHierarchy: OnyxCollection<ReportHierarchyInfo>;
 };
 
 function ReportActionItemParentAction({
@@ -53,6 +57,7 @@ function ReportActionItemParentAction({
     shouldDisplayReplyDivider,
     isFirstVisibleReportAction = false,
     shouldUseThreadDividerLine = false,
+    reportsParentHierarchy,
 }: ReportActionItemParentActionProps) {
     const styles = useThemeStyles();
     const ancestors = useAncestors(report, shouldExcludeAncestorReportAction);
@@ -138,6 +143,7 @@ function ReportActionItemParentAction({
                         shouldAllowConciergeFeedback={!conciergeFeedbackForReportActionID}
                         shouldUseThreadDividerLine={shouldUseThreadDividerLine}
                         linkedTransactionRouteError={linkedTransactionRouteError}
+                        reportsParentHierarchy={reportsParentHierarchy}
                     />
                 ))}
             </OfflineWithFeedback>
diff --git a/src/pages/inbox/report/ReportActionsList.tsx b/src/pages/inbox/report/ReportActionsList.tsx
index 157e67c611eb..5dc634ac2a24 100644
--- a/src/pages/inbox/report/ReportActionsList.tsx
+++ b/src/pages/inbox/report/ReportActionsList.tsx
@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useReportActionsScroll from '@hooks/useReportActionsScroll';
 import useReportScrollManager from '@hooks/useReportScrollManager';
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useRetireMerchantRuleSuggestionOnLeave from '@hooks/useRetireMerchantRuleSuggestionOnLeave';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -188,6 +189,7 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
 
     const [reportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getStableReportSelector});
     const [chatReportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportStable?.chatReportID)}`, {selector: getStableReportSelector});
+    const reportsParentHierarchy = useReportsParentHierarchy(reportID);
 
     const linkedReportActionID = reportActionIDFromRoute;
 
@@ -503,6 +505,7 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
                         shouldUseThreadDividerLine={shouldUseThreadDividerLine}
                         isHarvestCreatedExpenseReport={isHarvestCreatedExpenseReportAction}
                         shouldDisableContextMenuForConciergeDraft={shouldDisableContextMenuForConciergeDraft}
+                        reportsParentHierarchy={reportsParentHierarchy}
                     />
                 )}
                 {!!reportStable?.reportID && (
@@ -528,6 +531,7 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
         isDraftPendingCompletion,
         latestConciergeFeedbackActionID,
         expandedSystemMessageReportActionIDs,
+        reportsParentHierarchy,
     ];
 
     const listHeaderComponent = (
diff --git a/src/pages/inbox/report/ReportActionsListItemRenderer.tsx b/src/pages/inbox/report/ReportActionsListItemRenderer.tsx
index 4da6c57f43b5..91f543e7a4df 100644
--- a/src/pages/inbox/report/ReportActionsListItemRenderer.tsx
+++ b/src/pages/inbox/report/ReportActionsListItemRenderer.tsx
@@ -1,10 +1,12 @@
 import {getOriginalMessage, isSentMoneyReportAction, isTransactionThread} from '@libs/ReportActionsUtils';
 import {isChatThread} from '@libs/ReportUtils';
 
+import type {ReportHierarchyInfo} from '@userActions/ClearReportActionErrors';
+
 import CONST from '@src/CONST';
 import type {Report, ReportAction} from '@src/types/onyx';
 
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import React, {memo, useMemo} from 'react';
 
@@ -52,6 +54,9 @@ type ReportActionsListItemRendererProps = {
 
     /** Whether context menu should be disabled for the active Concierge draft */
     shouldDisableContextMenuForConciergeDraft?: boolean;
+
+    /** Parent links of the report and its ancestors, used to clear related errors on dismiss */
+    reportsParentHierarchy: OnyxCollection<ReportHierarchyInfo>;
 };
 
 function ReportActionsListItemRenderer({
@@ -72,6 +77,7 @@ function ReportActionsListItemRenderer({
     isHarvestCreatedExpenseReport = false,
     shouldDisableContextMenuForConciergeDraft = false,
     isLatestConciergeFeedbackAction = false,
+    reportsParentHierarchy,
 }: ReportActionsListItemRendererProps) {
     const originalMessage = useMemo(() => getOriginalMessage(reportAction), [reportAction]);
 
@@ -160,6 +166,7 @@ function ReportActionsListItemRenderer({
                 transactionThreadReport={transactionThreadReport}
                 isFirstVisibleReportAction={isFirstVisibleReportAction}
                 shouldUseThreadDividerLine={shouldUseThreadDividerLine}
+                reportsParentHierarchy={reportsParentHierarchy}
             />
         );
     }
@@ -182,6 +189,7 @@ function ReportActionsListItemRenderer({
             isHarvestCreatedExpenseReport={isHarvestCreatedExpenseReport}
             shouldDisplayContextMenu={!shouldDisableContextMenuForConciergeDraft}
             isLatestConciergeFeedbackAction={isLatestConciergeFeedbackAction}
+            reportsParentHierarchy={reportsParentHierarchy}
         />
     );
 }
diff --git a/tests/ui/ClearReportActionErrorsUITest.tsx b/tests/ui/ClearReportActionErrorsUITest.tsx
index 308a97c24111..0120769d359c 100644
--- a/tests/ui/ClearReportActionErrorsUITest.tsx
+++ b/tests/ui/ClearReportActionErrorsUITest.tsx
@@ -6,6 +6,8 @@ import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
+
 import * as ClearReportActionErrorsActions from '@libs/actions/ClearReportActionErrors';
 import {setHasRadio} from '@libs/NetworkState';
 import {getIOUActionForReportID} from '@libs/ReportActionsUtils';
@@ -90,20 +92,31 @@ describe('ClearReportActionErrors UI', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    function ReportActionItemWithHierarchy({action, report}: {action: ReportAction; report: Report}) {
+        const reportsParentHierarchy = useReportsParentHierarchy(report.reportID);
+        return (
+            <ReportActionItem
+                report={report}
+                chatReport={undefined}
+                transactionThreadReport={undefined}
+                parentReportAction={undefined}
+                action={action}
+                displayAsGroup={false}
+                shouldDisplayNewMarker={false}
+                isFirstVisibleReportAction={false}
+                reportsParentHierarchy={reportsParentHierarchy}
+            />
+        );
+    }
+
     function renderReportActionItem(action: ReportAction, report: Report) {
         return render(
             <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, HTMLEngineProvider]}>
                 <ScreenWrapper testID="test">
                     <PortalProvider>
-                        <ReportActionItem
-                            report={report}
-                            chatReport={undefined}
-                            transactionThreadReport={undefined}
-                            parentReportAction={undefined}
+                        <ReportActionItemWithHierarchy
                             action={action}
-                            displayAsGroup={false}
-                            shouldDisplayNewMarker={false}
-                            isFirstVisibleReportAction={false}
+                            report={report}
                         />
                     </PortalProvider>
                 </ScreenWrapper>
@@ -295,7 +308,7 @@ describe('ClearReportActionErrors UI', () => {
             fireEvent.press(screen.getByLabelText('Dismiss'));
             await waitForBatchedUpdatesWithAct();
 
-            // Then the component supplies the ancestor links itself, so the walk does not depend on the module-level fallback
+            // Then the ancestor links read by the hook reach the action, so the walk does not depend on the module-level fallback
             const suppliedReports = spy.mock.calls.at(0)?.at(0)?.reports;
             expect(suppliedReports?.[`${ONYXKEYS.COLLECTION.REPORT}${CHILD_REPORT_ID}`]).toMatchObject({parentReportID: REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID});
             expect(suppliedReports?.[`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`]).toMatchObject({
diff --git a/tests/ui/ReportActionItemTest.tsx b/tests/ui/ReportActionItemTest.tsx
index 6212a44f8585..7be4f19f5135 100644
--- a/tests/ui/ReportActionItemTest.tsx
+++ b/tests/ui/ReportActionItemTest.tsx
@@ -151,6 +151,7 @@ describe('ReportActionItem', () => {
                 <ScreenWrapper testID="test">
                     <PortalProvider>
                         <ReportActionItem
+                            reportsParentHierarchy={undefined}
                             chatReport={undefined}
                             report={undefined}
                             transactionThreadReport={undefined}
@@ -451,6 +452,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'testPolicy'}}
                                 transactionThreadReport={undefined}
@@ -497,6 +499,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'testPolicy'}}
                                 transactionThreadReport={undefined}
@@ -547,6 +550,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'testPolicy'}}
                                 transactionThreadReport={undefined}
@@ -589,6 +593,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'testPolicy'}}
                                 transactionThreadReport={undefined}
@@ -662,6 +667,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -722,6 +728,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -804,6 +811,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -982,6 +990,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1028,6 +1037,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1075,6 +1085,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1126,6 +1137,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1174,6 +1186,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1223,6 +1236,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1274,6 +1288,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1460,6 +1475,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -1647,6 +1663,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'pol123'}}
                                 transactionThreadReport={undefined}
@@ -1684,6 +1701,7 @@ describe('ReportActionItem', () => {
                         <PortalProvider>
                             <StyleProbe />
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID: 'pol123'}}
                                 transactionThreadReport={undefined}
@@ -1736,6 +1754,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', policyID}}
                                 transactionThreadReport={undefined}
@@ -1800,6 +1819,7 @@ describe('ReportActionItem', () => {
                         <ScreenWrapper testID="test">
                             <PortalProvider>
                                 <ReportActionItem
+                                    reportsParentHierarchy={undefined}
                                     chatReport={undefined}
                                     report={{reportID: 'testReport', policyID: COMMUTER_EXCLUSION_POLICY_ID}}
                                     transactionThreadReport={undefined}
@@ -1906,6 +1926,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport'}}
                                 transactionThreadReport={undefined}
@@ -1940,6 +1961,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', ownerAccountID: ACTOR_ACCOUNT_ID}}
                                 transactionThreadReport={undefined}
@@ -1976,6 +1998,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', ownerAccountID: ACTOR_ACCOUNT_ID}}
                                 transactionThreadReport={undefined}
@@ -2017,6 +2040,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{
                                     reportID: 'threadReport',
@@ -2058,6 +2082,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', ownerAccountID: ACTOR_ACCOUNT_ID}}
                                 transactionThreadReport={undefined}
@@ -2097,6 +2122,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', ownerAccountID: ACTOR_ACCOUNT_ID}}
                                 transactionThreadReport={undefined}
@@ -2134,6 +2160,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2168,6 +2195,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2204,6 +2232,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2263,6 +2292,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={createMock<Report>({reportID})}
                                 transactionThreadReport={undefined}
@@ -2336,6 +2366,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={report}
                                 transactionThreadReport={undefined}
@@ -2373,6 +2404,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2412,6 +2444,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2452,6 +2485,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
@@ -2576,6 +2610,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', type: CONST.REPORT.TYPE.CHAT}}
                                 transactionThreadReport={undefined}
@@ -2612,6 +2647,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'testReport', isWaitingOnBankAccount: true}}
                                 transactionThreadReport={undefined}
@@ -3290,6 +3326,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'chatReport1', chatReportID: 'chatReport1', type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.SELF_DM}}
                                 transactionThreadReport={undefined}
@@ -3343,6 +3380,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: 'expenseReport1', chatReportID: 'workspaceChat1', type: CONST.REPORT.TYPE.EXPENSE}}
                                 transactionThreadReport={undefined}
@@ -3465,6 +3503,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 transactionThreadReport={undefined}
                                 report={{reportID: HARVEST_REPORT_ID}}
@@ -3505,6 +3544,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={{reportID: HARVEST_REPORT_ID}}
                                 parentReportAction={undefined}
@@ -3553,6 +3593,7 @@ describe('ReportActionItem', () => {
                     <ScreenWrapper testID="test">
                         <PortalProvider>
                             <ReportActionItem
+                                reportsParentHierarchy={undefined}
                                 chatReport={undefined}
                                 report={undefined}
                                 transactionThreadReport={undefined}
diff --git a/tests/unit/useReportsParentHierarchyTest.ts b/tests/unit/useReportsParentHierarchyTest.ts
new file mode 100644
index 000000000000..b30affdf27d8
--- /dev/null
+++ b/tests/unit/useReportsParentHierarchyTest.ts
@@ -0,0 +1,89 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useReportsParentHierarchy from '@hooks/useReportsParentHierarchy';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const THREAD_REPORT_ID = '1';
+const PARENT_REPORT_ID = '2';
+const UNRELATED_REPORT_ID = '3';
+const OTHER_THREAD_REPORT_ID = '4';
+const PARENT_REPORT_ACTION_ID = '100';
+
+const reportKey = (reportID: string) => `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
+
+describe('useReportsParentHierarchy', () => {
+    beforeAll(() => Onyx.init({keys: ONYXKEYS}));
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+    });
+
+    it('should keep the same reference across report changes and re-renders that do not touch the chain', async () => {
+        // Given a thread and its parent in Onyx, and the hook mounted for the thread
+        await act(async () => {
+            await Onyx.merge(reportKey(THREAD_REPORT_ID), {reportID: THREAD_REPORT_ID, parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID});
+            await Onyx.merge(reportKey(PARENT_REPORT_ID), {reportID: PARENT_REPORT_ID});
+        });
+        const {result, rerender} = renderHook(() => useReportsParentHierarchy(THREAD_REPORT_ID));
+        await waitForBatchedUpdatesWithAct();
+        const initialHierarchy = result.current;
+
+        // When an unrelated report is added, a chain report changes a field that is not a parent link, and the list re-renders
+        await act(async () => {
+            await Onyx.merge(reportKey(UNRELATED_REPORT_ID), {reportID: UNRELATED_REPORT_ID});
+            await Onyx.merge(reportKey(THREAD_REPORT_ID), {lastMessageText: 'new message'});
+        });
+        await waitForBatchedUpdatesWithAct();
+        rerender({});
+
+        // Then the hook returns the same object, so the list that shares it with every row does not re-render them
+        expect(initialHierarchy).toEqual({
+            [reportKey(THREAD_REPORT_ID)]: {parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID},
+            [reportKey(PARENT_REPORT_ID)]: {parentReportID: undefined, parentReportActionID: undefined},
+        });
+        expect(result.current).toBe(initialHierarchy);
+    });
+
+    it('should include a parent report that loads after the hook is mounted', async () => {
+        // Given a thread whose parent report is not in Onyx yet
+        await act(async () => {
+            await Onyx.merge(reportKey(THREAD_REPORT_ID), {reportID: THREAD_REPORT_ID, parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID});
+        });
+        const {result} = renderHook(() => useReportsParentHierarchy(THREAD_REPORT_ID));
+        await waitForBatchedUpdatesWithAct();
+        expect(Object.keys(result.current ?? {})).toEqual([reportKey(THREAD_REPORT_ID)]);
+
+        // When the parent report arrives, e.g. from an API response
+        await act(async () => {
+            await Onyx.merge(reportKey(PARENT_REPORT_ID), {reportID: PARENT_REPORT_ID});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the chain includes it, so dismissing an error can still walk up to the parent
+        expect(Object.keys(result.current ?? {})).toEqual([reportKey(THREAD_REPORT_ID), reportKey(PARENT_REPORT_ID)]);
+    });
+
+    it('should switch to the new chain when the reportID changes', async () => {
+        // Given two unrelated threads in Onyx and the hook mounted for the first one
+        await act(async () => {
+            await Onyx.merge(reportKey(THREAD_REPORT_ID), {reportID: THREAD_REPORT_ID, parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_REPORT_ACTION_ID});
+            await Onyx.merge(reportKey(OTHER_THREAD_REPORT_ID), {reportID: OTHER_THREAD_REPORT_ID});
+        });
+        const {result, rerender} = renderHook(({reportID}: {reportID: string}) => useReportsParentHierarchy(reportID), {initialProps: {reportID: THREAD_REPORT_ID}});
+        await waitForBatchedUpdatesWithAct();
+
+        // When the hook is re-rendered for the other thread
+        rerender({reportID: OTHER_THREAD_REPORT_ID});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then only the other thread's chain is returned, so no stale links from the first thread leak into the walk
+        expect(Object.keys(result.current ?? {})).toEqual([reportKey(OTHER_THREAD_REPORT_ID)]);
+    });
+});

From b08c09c0f2fed10ed70dbb848f82e67b417a4076 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:11:37 +0200
Subject: [PATCH 544/781] Add DynamicForm page, schema and sensitive answers
 types

---
 src/types/onyx/DynamicFormField.ts | 18 ++++++++++++++++++
 src/types/onyx/index.ts            |  6 ++++++
 2 files changed, 24 insertions(+)

diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index 036b7b4f43b4..e2b62282bba2 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -1,4 +1,7 @@
+import type {FormValue} from '@components/Form/types';
+
 import type {TranslationPaths} from '@src/languages/types';
+import type {OnyxFormKey} from '@src/ONYXKEYS';
 
 import type {InputModeOptions} from 'react-native';
 
@@ -170,6 +173,18 @@ type DynamicFormSchemaField = DynamicFormField | (DynamicFormFieldBase & {type:
 /** A heading or a field of a page */
 type DynamicFormContentItem = DynamicFormHeading | DynamicFormSchemaField;
 
+/** A page of a multi-page form. It is a heading with its own content, so it can carry a title, a description and a `showWhen`. */
+type DynamicFormPage = DynamicFormHeading & {
+    /** The headings and fields shown on this page */
+    content: DynamicFormContentItem[];
+};
+
+/** What a multi-page form is built from: pages as the server groups them, or a flat list of fields the App paginates */
+type DynamicFormSchema = {pages: DynamicFormPage[]} | {fields: DynamicFormSchemaField[]};
+
+/** Answers to sensitive fields, keyed by form ID, then by field key. Kept in memory only, never in a draft. */
+type DynamicFormSensitiveAnswers = Partial<Record<OnyxFormKey, Partial<Record<string, FormValue>>>>;
+
 /** Every type the renderer and validator handle */
 type DynamicFormFieldType = DynamicFormField['type'];
 
@@ -184,6 +199,9 @@ export type {
     DynamicFormHeading,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
+    DynamicFormPage,
+    DynamicFormSchema,
     DynamicFormSchemaField,
+    DynamicFormSensitiveAnswers,
     DynamicFormTextField,
 };
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 373c346a3087..a86e9d85adb5 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -93,7 +93,10 @@ import type {
     DynamicFormHeading,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
+    DynamicFormPage,
+    DynamicFormSchema,
     DynamicFormSchemaField,
+    DynamicFormSensitiveAnswers,
     DynamicFormTextField,
 } from './DynamicFormField';
 import type EarlyRenewalOfferEligibility from './EarlyRenewalOfferEligibility';
@@ -477,7 +480,10 @@ export type {
     DynamicFormHeading,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
+    DynamicFormPage,
+    DynamicFormSchema,
     DynamicFormSchemaField,
+    DynamicFormSensitiveAnswers,
     DynamicFormTextField,
     JoinablePolicies,
     DismissedProductTraining,

From 873c08f731f002553302e13363f3eca9baf6b580 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:13:13 +0200
Subject: [PATCH 545/781] Add DynamicForm pagination, page titles and page
 visibility utils

---
 src/CONST/index.ts                            |  13 ++
 .../DynamicForm/utils/getPageTitle.ts         |  30 ++++
 src/components/DynamicForm/utils/paginate.ts  |  90 ++++++++++
 .../components/DynamicForm/paginateTest.ts    | 166 ++++++++++++++++++
 4 files changed, 299 insertions(+)
 create mode 100644 src/components/DynamicForm/utils/getPageTitle.ts
 create mode 100644 src/components/DynamicForm/utils/paginate.ts
 create mode 100644 tests/unit/components/DynamicForm/paginateTest.ts

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index a79b34b11ce4..d987c6808dac 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -969,6 +969,19 @@ const CONST = {
         ALLOWED_FILE_TYPES: ['pdf', 'jpg', 'jpeg', 'png'],
         FILE_LIMIT: 1,
     },
+    DYNAMIC_FORM: {
+        /** A select with more options than this sits on its own page, since it opens a searchable list */
+        LARGE_SELECT_MIN_OPTIONS: 10,
+
+        /** Most questions sharing a page when pages are built from a flat list of fields */
+        MAX_FIELDS_PER_PAGE: 4,
+
+        /** Pages from which the flow shows a step indicator on its own */
+        STEP_INDICATOR_MIN_PAGES: 3,
+
+        /** Route segment of the confirmation page, which no page may take */
+        CONFIRMATION_PAGE_KEY: 'confirm',
+    },
     NON_USD_BANK_ACCOUNT: {
         PURPOSE_OF_TRANSACTION_ID: 'Intercompany_Payment',
         CURRENT_USER_KEY: 'currentUser',
diff --git a/src/components/DynamicForm/utils/getPageTitle.ts b/src/components/DynamicForm/utils/getPageTitle.ts
new file mode 100644
index 000000000000..dd0bdffa3a45
--- /dev/null
+++ b/src/components/DynamicForm/utils/getPageTitle.ts
@@ -0,0 +1,30 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
+
+import getContentFields from './getContentFields';
+import getLocalizedText, {getFieldLabel} from './getLocalizedText';
+import {getLoneField, getVisibleContent, isFieldVisible} from './getVisibleFields';
+
+/** The page's own title, else the label of its lone question, else the label of its first visible field, so no step is ever blank */
+function getPageTitle(page: DynamicFormPage, values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): string {
+    const ownTitle = getLocalizedText(translate, page.titleKey, page.title);
+    if (ownTitle) {
+        return ownTitle;
+    }
+    const visibleFields = getContentFields(getVisibleContent(page.content, values, allFields));
+    const field = getLoneField(visibleFields) ?? visibleFields.at(0);
+    return field ? getFieldLabel(field, translate) : '';
+}
+
+/** A page is shown when its own `showWhen` matches and it has a field to show. A page that is not shown is skipped, and its fields are not asked or submitted. */
+function isPageShown(page: DynamicFormPage, values: DynamicFormValues, allFields: DynamicFormField[]): boolean {
+    if (!isFieldVisible(page, values, allFields)) {
+        return false;
+    }
+    return getContentFields(getVisibleContent(page.content, values, allFields)).length > 0;
+}
+
+export default getPageTitle;
+export {isPageShown};
diff --git a/src/components/DynamicForm/utils/paginate.ts b/src/components/DynamicForm/utils/paginate.ts
new file mode 100644
index 000000000000..8936e99b460d
--- /dev/null
+++ b/src/components/DynamicForm/utils/paginate.ts
@@ -0,0 +1,90 @@
+import CONST from '@src/CONST';
+import type {DynamicFormField, DynamicFormPage, DynamicFormSchema, DynamicFormSchemaField} from '@src/types/onyx';
+
+import getContentFields from './getContentFields';
+import isSupportedField from './isSupportedField';
+
+const OWN_PAGE_TYPES = new Set<DynamicFormField['type']>(['address', 'file', 'multiselect', 'countryMultiselect']);
+
+function needsOwnPage(field: DynamicFormField): boolean {
+    if (OWN_PAGE_TYPES.has(field.type)) {
+        return true;
+    }
+    if (field.type !== 'select') {
+        return false;
+    }
+    return !!field.dependsOn || (field.values?.length ?? 0) > CONST.DYNAMIC_FORM.LARGE_SELECT_MIN_OPTIONS;
+}
+
+function toSlug(key: string): string {
+    return key
+        .toLowerCase()
+        .replaceAll(/[^a-z0-9]+/g, '-')
+        .replaceAll(/^-+|-+$/g, '');
+}
+
+/**
+ * Groups a flat list of fields into pages. Fields that need room (addresses, files, multiselects, dependent or large selects) get a page of their own,
+ * and the rest share a page up to `MAX_FIELDS_PER_PAGE` in a row. A field with `showWhen` joins the page of its controller and does not count toward that limit.
+ * The pages have no title and no key, `getPages` names them.
+ */
+function paginate(fields: DynamicFormSchemaField[]): DynamicFormPage[] {
+    const pages: DynamicFormPage[] = [];
+    const pageOfKey = new Map<string, DynamicFormPage>();
+    let sharedPage: DynamicFormPage | undefined;
+    let sharedQuestionCount = 0;
+
+    for (const field of fields.filter(isSupportedField)) {
+        const controllerPage = field.showWhen ? pageOfKey.get(field.showWhen.key) : undefined;
+        if (controllerPage) {
+            controllerPage.content.push(field);
+            pageOfKey.set(field.key, controllerPage);
+            continue;
+        }
+
+        if (needsOwnPage(field)) {
+            const ownPage: DynamicFormPage = {key: '', content: [field]};
+            pages.push(ownPage);
+            pageOfKey.set(field.key, ownPage);
+            sharedPage = undefined;
+            continue;
+        }
+
+        if (!sharedPage || sharedQuestionCount >= CONST.DYNAMIC_FORM.MAX_FIELDS_PER_PAGE) {
+            sharedPage = {key: '', content: []};
+            sharedQuestionCount = 0;
+            pages.push(sharedPage);
+        }
+        sharedPage.content.push(field);
+        sharedQuestionCount++;
+        pageOfKey.set(field.key, sharedPage);
+    }
+    return pages;
+}
+
+/** Every page's key becomes a URL-safe route segment that is unique and never the confirmation page's. Pages with no usable key get `page-N`. */
+function withRouteKeys(pages: DynamicFormPage[]): DynamicFormPage[] {
+    const takenKeys = new Set<string>([CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY]);
+    return pages.map((page, index) => {
+        const baseKey = toSlug(page.key) || `page-${index + 1}`;
+        let key = baseKey;
+        for (let suffix = 2; takenKeys.has(key); suffix++) {
+            key = `${baseKey}-${suffix}`;
+        }
+        takenKeys.add(key);
+        return {...page, key};
+    });
+}
+
+/** The pages of a schema, as the server grouped them or as `paginate` builds them */
+function getPages(schema: DynamicFormSchema): DynamicFormPage[] {
+    return withRouteKeys('pages' in schema ? schema.pages : paginate(schema.fields));
+}
+
+/** Every field of every page, which is where a `showWhen` finds its controller */
+function getAllFields(pages: DynamicFormPage[]): DynamicFormField[] {
+    return pages.flatMap((page) => getContentFields(page.content).filter(isSupportedField));
+}
+
+export default paginate;
+export {getAllFields, getPages};
diff --git a/tests/unit/components/DynamicForm/paginateTest.ts b/tests/unit/components/DynamicForm/paginateTest.ts
new file mode 100644
index 000000000000..fd1a9ea7ce43
--- /dev/null
+++ b/tests/unit/components/DynamicForm/paginateTest.ts
@@ -0,0 +1,166 @@
+import getPageTitle, {isPageShown} from '@components/DynamicForm/utils/getPageTitle';
+import paginate, {getAllFields, getPages} from '@components/DynamicForm/utils/paginate';
+
+import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
+
+import {translateLocal} from '../../../utils/TestHelper';
+
+function text(key: string, extra: Partial<DynamicFormField> = {}): DynamicFormField {
+    return {key, type: 'text', required: true, label: key, ...extra} as DynamicFormField;
+}
+
+function options(count: number) {
+    return Array.from({length: count}, (_, index) => ({key: `o${index}`, label: `o${index}`}));
+}
+
+function keysOf(pages: DynamicFormPage[]): string[][] {
+    return pages.map((page) => page.content.map((item) => item.key));
+}
+
+describe('paginate', () => {
+    it('puts each own-page type on a page of its own', () => {
+        // Given one field of every type that needs room
+        const fields: DynamicFormField[] = [
+            {key: 'address', type: 'address', required: true},
+            {key: 'file', type: 'file', required: true},
+            {key: 'multi', type: 'multiselect', required: true, values: options(2)},
+            {key: 'countries', type: 'countryMultiselect', required: true},
+            {key: 'dependent', type: 'select', required: true, dependsOn: {key: 'country', valuesBy: {}}},
+        ];
+
+        // When the fields are paginated
+        const pages = paginate(fields);
+
+        // Then none of them shares a page, since each needs the whole screen
+        expect(keysOf(pages)).toEqual([['address'], ['file'], ['multi'], ['countries'], ['dependent']]);
+    });
+
+    it('keeps a small select with the other short questions but moves a large one out', () => {
+        // Given a small select and a select with more options than the threshold
+        const small: DynamicFormField = {key: 'small', type: 'select', required: true, values: options(3)};
+        const large: DynamicFormField = {key: 'large', type: 'select', required: true, values: options(11)};
+
+        // When they are paginated between two text fields
+        const pages = paginate([text('a'), small, large, text('b')]);
+
+        // Then the large select, which opens a searchable list, is alone and breaks the run
+        expect(keysOf(pages)).toEqual([['a', 'small'], ['large'], ['b']]);
+    });
+
+    it('starts a new page after four questions in a row', () => {
+        // Given five short questions
+        const pages = paginate([text('a'), text('b'), text('c'), text('d'), text('e')]);
+
+        // Then the fifth does not fit the shared page
+        expect(keysOf(pages)).toEqual([['a', 'b', 'c', 'd'], ['e']]);
+    });
+
+    it('keeps a field revealed by its controller on the controller page without counting it', () => {
+        // Given four questions where the second reveals a fifth field
+        const revealed = text('other', {showWhen: {key: 'b', equals: ['x']}});
+
+        // When they are paginated
+        const pages = paginate([text('a'), text('b'), revealed, text('c'), text('d')]);
+
+        // Then all of them stay on one page, since the revealed field is not a question of its own
+        expect(keysOf(pages)).toEqual([['a', 'b', 'other', 'c', 'd']]);
+    });
+
+    it('keeps the fields an own-page controller reveals with it', () => {
+        // Given an own-page select that reveals a text field
+        const select: DynamicFormField = {key: 'dep', type: 'select', required: true, dependsOn: {key: 'x', valuesBy: {}}};
+
+        // When paginated with a field after the revealed one
+        const pages = paginate([select, text('why', {showWhen: {key: 'dep', equals: ['y']}}), text('z')]);
+
+        // Then the revealed field follows its controller and the next question starts a new page
+        expect(keysOf(pages)).toEqual([['dep', 'why'], ['z']]);
+    });
+
+    it('leaves out fields of an unknown type', () => {
+        // Given a field of a type this App version does not know
+        const unknown = {key: 'x', type: 'hologram', required: true};
+
+        // When paginated
+        const pages = paginate([unknown, text('a')]);
+
+        // Then it does not produce an empty page
+        expect(keysOf(pages)).toEqual([['a']]);
+    });
+});
+
+describe('getPages', () => {
+    it('names pages built from fields page-N', () => {
+        // Given a flat schema
+        const pages = getPages({fields: [text('a'), {key: 'address', type: 'address', required: true}]});
+
+        // Then the pages get stable keys
+        expect(pages.map((page) => page.key)).toEqual(['page-1', 'page-2']);
+    });
+
+    it('slugifies keys, reserves confirm and makes keys unique', () => {
+        // Given pages whose keys are not URL-safe, collide, or take the confirmation route
+        const content = [text('a')];
+        const pages = getPages({
+            pages: [
+                {key: 'Bank Info', content},
+                {key: 'bank-info', content},
+                {key: 'confirm', content},
+                {key: '###', content},
+            ],
+        });
+
+        // Then each is a unique route segment
+        expect(pages.map((page) => page.key)).toEqual(['bank-info', 'bank-info-2', 'confirm-2', 'page-4']);
+    });
+});
+
+describe('getPageTitle', () => {
+    it('prefers the page title, translated when it has a key', () => {
+        // Given a page with a titleKey
+        const page = {key: 'p', titleKey: 'common.next', content: [text('a')]} as DynamicFormPage;
+
+        // Then the translation is used
+        expect(getPageTitle(page, {}, translateLocal)).toBe(translateLocal('common.next'));
+    });
+
+    it('falls back to the label of the lone question, ignoring a field it reveals', () => {
+        // Given an untitled page with one question and a field it reveals
+        const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Alpha'}), text('b', {label: 'Beta', showWhen: {key: 'a', equals: ['x']}})]};
+
+        // When the revealed field shows
+        const title = getPageTitle(page, {a: 'x'}, translateLocal);
+
+        // Then the title is still the question's label
+        expect(title).toBe('Alpha');
+    });
+
+    it('falls back to the first visible field label when there are several questions', () => {
+        // Given an untitled page whose first field is hidden
+        const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Alpha', showWhen: {key: 'z', equals: ['1']}}), text('b', {label: 'Beta'}), text('c', {label: 'Gamma'})]};
+
+        // Then the title is the first field the user sees
+        expect(getPageTitle(page, {}, translateLocal)).toBe('Beta');
+    });
+});
+
+describe('isPageShown', () => {
+    it('hides a page whose own showWhen does not match, using a field of another page', () => {
+        // Given a page shown only for business, controlled from another page
+        const type = text('type');
+        const page: DynamicFormPage = {key: 'biz', showWhen: {key: 'type', equals: ['BUSINESS']}, content: [text('ein')]};
+        const allFields = getAllFields([{key: 'first', content: [type]}, page]);
+
+        // Then it follows the answer
+        expect(isPageShown(page, {type: 'PRIVATE'}, allFields)).toBe(false);
+        expect(isPageShown(page, {type: 'BUSINESS'}, allFields)).toBe(true);
+    });
+
+    it('hides a page with no visible field', () => {
+        // Given a page whose only field is hidden
+        const page: DynamicFormPage = {key: 'p', content: [text('a', {showWhen: {key: 'z', equals: ['1']}})]};
+
+        // Then the page is skipped
+        expect(isPageShown(page, {}, getAllFields([page]))).toBe(false);
+    });
+});

From da6742c2c60e7068fce9b92926b42ceb779e589d Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:17:52 +0200
Subject: [PATCH 546/781] Add grouped summary sections to ConfirmationStep

---
 .../SubStepForms/ConfirmationStep.tsx         | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index 49d075de0810..8cf0c490f5fb 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -29,10 +29,26 @@ type SummaryItem = {
     testID?: string;
 };
 
+/** One row of a group. A single kind for now, so groups can grow other row kinds without touching their callers. */
+type SummaryGroupRow = SummaryItem;
+
+/** Answers under one heading. Used instead of `summaryItems` when the confirmation is split by section. */
+type SummaryGroup = {
+    id: string;
+
+    /** The heading, left out when empty */
+    name: string;
+
+    rows: SummaryGroupRow[];
+};
+
 type ConfirmationStepProps = SubPageProps &
     ForwardedFSClassProps & {
         pageTitle: string;
-        summaryItems: SummaryItem[];
+        summaryItems?: SummaryItem[];
+
+        /** Sections with their own heading, each holding field rows */
+        groups?: SummaryGroup[];
 
         /** Whether show additional section with Onfido terms etc. */
         showOnfidoLinks: boolean;
@@ -50,7 +66,8 @@ type ConfirmationStepProps = SubPageProps &
 
 function ConfirmationStep({
     pageTitle,
-    summaryItems,
+    summaryItems = [],
+    groups = [],
     showOnfidoLinks,
     onfidoLinksTitle,
     isLoading,
@@ -84,6 +101,26 @@ function ConfirmationStep({
                 />
             ))}
 
+            {groups.map((group, index) => (
+                <View key={group.id}>
+                    {index > 0 && <View style={[styles.mh5, styles.mt3, styles.borderBottom]} />}
+                    {!!group.name && <Text style={[styles.textNormalThemeText, styles.textLineHeightNormal, styles.textStrong, styles.ph5, styles.mt4, styles.mb1]}>{group.name}</Text>}
+                    {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, brickRoadIndicator, errorText, testID}) => (
+                        <MenuItemWithTopDescription
+                            key={id}
+                            pressableTestID={testID ?? id}
+                            description={description}
+                            title={title}
+                            shouldShowRightIcon={shouldShowRightIcon}
+                            onPress={onPress}
+                            brickRoadIndicator={brickRoadIndicator}
+                            errorText={errorText}
+                            forwardedFSClass={forwardedFSClass}
+                        />
+                    ))}
+                </View>
+            ))}
+
             {showOnfidoLinks && (
                 <View style={[styles.renderHTML, styles.ph5, styles.mt3]}>
                     <RenderHTML html={translate('onfidoStep.onfidoLinks', onfidoLinksTitle ?? '')} />
@@ -113,3 +150,4 @@ function ConfirmationStep({
 }
 
 export default ConfirmationStep;
+export type {SummaryGroup, SummaryGroupRow, SummaryItem};

From 6bb595ba809866e607fa45b62ab02d449aeb2787 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:19:05 +0200
Subject: [PATCH 547/781] Add DynamicForm answers, confirmation and masking
 utils

---
 .../components/DynamicFormFieldRow.tsx        |  7 ++-
 .../components/DynamicFormFields.tsx          | 13 ++++-
 .../DynamicForm/utils/getConfirmationItems.ts | 44 ++++++++++++++
 .../utils/getDynamicFieldErrors.ts            |  9 ++-
 .../DynamicForm/utils/getSubmittedAnswers.ts  | 33 +++++++++++
 .../DynamicForm/utils/maskSensitiveValue.ts   | 11 ++++
 .../DynamicForm/getConfirmationItemsTest.ts   | 57 +++++++++++++++++++
 .../DynamicForm/getSubmittedAnswersTest.ts    | 45 +++++++++++++++
 .../DynamicForm/maskSensitiveValueTest.ts     | 24 ++++++++
 9 files changed, 235 insertions(+), 8 deletions(-)
 create mode 100644 src/components/DynamicForm/utils/getConfirmationItems.ts
 create mode 100644 src/components/DynamicForm/utils/getSubmittedAnswers.ts
 create mode 100644 src/components/DynamicForm/utils/maskSensitiveValue.ts
 create mode 100644 tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
 create mode 100644 tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
 create mode 100644 tests/unit/components/DynamicForm/maskSensitiveValueTest.ts

diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index 2f88ec864c17..2bfe99ec849f 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -22,13 +22,16 @@ type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFile
 
         /** The field is the page's only question, so a choice is drawn as the page itself instead of as a row */
         isLoneField: boolean;
+
+        /** The page title already says what the field asks, so its label is not drawn above the input. Inputs keep their own accessibility name. */
+        shouldHideLabel?: boolean;
     };
 
 /** Typed answers change on every keystroke, so they ask for new requirements when the user leaves the input instead */
 const TYPED_FIELD_TYPES = new Set<DynamicFormFieldType>(['text', 'number', 'amount', 'percent']);
 
 /** One field of a schema-driven form: its input, or its value when the field is readonly */
-function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField, onRefreshRequirements}: DynamicFormFieldRowProps) {
+function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField, shouldHideLabel = false, onRefreshRequirements}: DynamicFormFieldRowProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const label = getFieldLabel(field, translate);
@@ -70,7 +73,7 @@ function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField,
 
     return (
         <View style={isMenuRow ? [styles.mhn5, styles.pv1] : styles.pv2}>
-            {!!labelAbove && (
+            {!!labelAbove && !shouldHideLabel && (
                 <Text
                     style={[labelAbove === 'prompt' ? styles.mt3 : [styles.textStrong, styles.mb3], isMenuRow && styles.ph5]}
                     role={labelAbove === 'heading' ? CONST.ROLE.HEADING : undefined}
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index b8fbc9b39e44..8651e3398b50 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -5,7 +5,7 @@ import isHeading from '@components/DynamicForm/utils/isHeading';
 import type {FormValue} from '@components/Form/types';
 
 import CONST from '@src/CONST';
-import type {DynamicFormContentItem} from '@src/types/onyx';
+import type {DynamicFormContentItem, DynamicFormField} from '@src/types/onyx';
 
 import React from 'react';
 
@@ -19,6 +19,12 @@ type DynamicFormFieldsProps = {
     /** Current answers, from FormProvider's render-prop `inputValues`, so showWhen and dependsOn follow the user's typing */
     values: DynamicFormValues;
 
+    /** The whole form when `content` is one page of it, since a field's `showWhen` can name a controller on another page */
+    allFields?: DynamicFormField[];
+
+    /** The page's title already names its only question, so that question's label is not drawn again above its input */
+    isTitledByPage?: boolean;
+
     /** Currency of amount fields that let the user pick none */
     currency?: string;
 
@@ -30,8 +36,8 @@ type DynamicFormFieldsProps = {
 };
 
 /** The inputs of a schema-driven form. Render it inside a FormProvider and validate the fields of the same content with getDynamicFieldErrors. */
-function DynamicFormFields({content, values, currency = CONST.CURRENCY.USD, maxFileSize, onRefreshRequirements}: DynamicFormFieldsProps) {
-    const visibleContent = getVisibleContent(content, values);
+function DynamicFormFields({content, values, allFields, isTitledByPage = false, currency = CONST.CURRENCY.USD, maxFileSize, onRefreshRequirements}: DynamicFormFieldsProps) {
+    const visibleContent = getVisibleContent(content, values, allFields);
     const loneField = getLoneField(getContentFields(visibleContent));
 
     return visibleContent.map((item, index) =>
@@ -49,6 +55,7 @@ function DynamicFormFields({content, values, currency = CONST.CURRENCY.USD, maxF
                 currency={currency}
                 maxFileSize={maxFileSize}
                 isLoneField={item === loneField}
+                shouldHideLabel={isTitledByPage && item === loneField}
                 onRefreshRequirements={onRefreshRequirements}
             />
         ),
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
new file mode 100644
index 000000000000..ec58d561434f
--- /dev/null
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -0,0 +1,44 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+import type {SummaryGroup} from '@components/SubStepForms/ConfirmationStep';
+
+import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
+
+import formatDynamicFieldValue from './formatDynamicFieldValue';
+import getContentFields from './getContentFields';
+import {getFieldLabel} from './getLocalizedText';
+import getPageTitle, {isPageShown} from './getPageTitle';
+import getVisibleFields from './getVisibleFields';
+import isSensitiveField from './isSensitiveField';
+import isSupportedField from './isSupportedField';
+import maskSensitiveValue from './maskSensitiveValue';
+
+/** One section per shown page holding its visible answers. Tapping a row opens the page to edit; readonly rows open nothing. */
+function getConfirmationItems(
+    pages: DynamicFormPage[],
+    allFields: DynamicFormField[],
+    values: DynamicFormValues,
+    translate: LocalizedTranslate,
+    onEditPage: (pageIndex: number) => void,
+): SummaryGroup[] {
+    return pages
+        .map((page, pageIndex) => ({page, pageIndex}))
+        .filter(({page}) => isPageShown(page, values, allFields))
+        .map(({page, pageIndex}) => ({
+            id: page.key,
+            name: getPageTitle(page, values, translate, allFields),
+            rows: getVisibleFields(getContentFields(page.content).filter(isSupportedField), values, allFields).map((field) => {
+                const answer = formatDynamicFieldValue(field, values, translate);
+                return {
+                    id: field.key,
+                    description: getFieldLabel(field, translate),
+                    title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
+                    shouldShowRightIcon: !field.readonly,
+                    onPress: field.readonly ? () => {} : () => onEditPage(pageIndex),
+                };
+            }),
+        }))
+        .filter((section) => section.rows.length > 0);
+}
+
+export default getConfirmationItems;
diff --git a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
index b1e393910e3b..440bf07e6bfc 100644
--- a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
+++ b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
@@ -191,10 +191,13 @@ function validateField<TType extends DynamicFormFieldType>(field: DynamicFormFie
     return validate(field, values, translate);
 }
 
-/** Errors for the fields the user can see, keyed by draft key, in the shape FormProvider's `validate` returns. */
-function getDynamicFieldErrors(fields: DynamicFormSchemaField[], values: DynamicFormValues, translate: LocalizedTranslate): Record<string, string> {
+/**
+ * Errors for the fields the user can see, keyed by draft key, in the shape FormProvider's `validate` returns.
+ * `fields` must be exactly one page's fields, since the lone-field check has to match what the page renders. Pass the whole form as `allFields` when a `showWhen` can name a field on another page.
+ */
+function getDynamicFieldErrors(fields: DynamicFormSchemaField[], values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): Record<string, string> {
     const errors: Record<string, string> = {};
-    const visibleFields = getVisibleFields(fields.filter(isSupportedField), values);
+    const visibleFields = getVisibleFields(fields.filter(isSupportedField), values, allFields);
     const loneField = getLoneField(visibleFields);
     for (const field of visibleFields) {
         if (field.readonly) {
diff --git a/src/components/DynamicForm/utils/getSubmittedAnswers.ts b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
new file mode 100644
index 000000000000..28685e5d097a
--- /dev/null
+++ b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
@@ -0,0 +1,33 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+
+import type {DynamicFormField} from '@src/types/onyx';
+
+import getAddressInputKeys from './getAddressInputKeys';
+import getVisibleFields from './getVisibleFields';
+
+/** The draft keys a field writes to: its own, plus its address parts or its chosen currency */
+function getAnswerKeys(field: DynamicFormField): string[] {
+    switch (field.type) {
+        case 'address':
+            return Object.values(getAddressInputKeys(field.key)).filter(Boolean);
+        case 'amount':
+            return field.currencyKey ? [field.key, field.currencyKey] : [field.key];
+        default:
+            return [field.key];
+    }
+}
+
+/** The answers to the fields the user can see, so answers left on fields hidden later are not submitted. Pass the whole form as `allFields` when `fields` is one page of it. */
+function getSubmittedAnswers(fields: DynamicFormField[], values: DynamicFormValues, allFields = fields): DynamicFormValues {
+    const answers: DynamicFormValues = {};
+    for (const field of getVisibleFields(fields, values, allFields)) {
+        for (const key of getAnswerKeys(field)) {
+            if (values[key] !== undefined) {
+                answers[key] = values[key];
+            }
+        }
+    }
+    return answers;
+}
+
+export default getSubmittedAnswers;
diff --git a/src/components/DynamicForm/utils/maskSensitiveValue.ts b/src/components/DynamicForm/utils/maskSensitiveValue.ts
new file mode 100644
index 000000000000..7593296a2820
--- /dev/null
+++ b/src/components/DynamicForm/utils/maskSensitiveValue.ts
@@ -0,0 +1,11 @@
+import {isValidSSNFullNine} from '@libs/ValidationUtils';
+
+const VISIBLE_CHARACTERS = 4;
+
+/** All but the last four characters hidden, as in •••-••-6789, so the user can tell which number they entered */
+function maskSensitiveValue(value: string): string {
+    const masked = '•'.repeat(Math.max(value.length - VISIBLE_CHARACTERS, 0)) + value.slice(-VISIBLE_CHARACTERS);
+    return isValidSSNFullNine(value) ? `${masked.slice(0, 3)}-${masked.slice(3, 5)}-${masked.slice(5)}` : masked;
+}
+
+export default maskSensitiveValue;
diff --git a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
new file mode 100644
index 000000000000..4a4585a2f71a
--- /dev/null
+++ b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
@@ -0,0 +1,57 @@
+import getConfirmationItems from '@components/DynamicForm/utils/getConfirmationItems';
+import {getAllFields} from '@components/DynamicForm/utils/paginate';
+
+import type {DynamicFormPage} from '@src/types/onyx';
+
+import {translateLocal} from '../../../utils/TestHelper';
+
+const pages: DynamicFormPage[] = [
+    {
+        key: 'identity',
+        title: 'Identity',
+        content: [
+            {key: 'name', type: 'text', required: true, label: 'Name'},
+            {key: 'ssn', type: 'text', required: true, label: 'SSN', sensitive: true},
+            {key: 'country', type: 'text', required: false, label: 'Country', readonly: true},
+        ],
+    },
+    {key: 'business', title: 'Business', showWhen: {key: 'type', equals: ['BUSINESS']}, content: [{key: 'ein', type: 'text', required: true, label: 'EIN'}]},
+];
+
+describe('getConfirmationItems', () => {
+    it('masks sensitive answers and opens the page of an editable row', () => {
+        // Given answers with an SSN
+        const onEditPage = jest.fn();
+        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage);
+
+        // When the user taps the SSN row
+        const ssnRow = group.rows.find((row) => row.id === 'ssn');
+        ssnRow?.onPress();
+
+        // Then the SSN is masked to its last four digits and the page is opened
+        expect(ssnRow?.title).toBe('•••-••-1234');
+        expect(onEditPage).toHaveBeenCalledWith(0);
+    });
+
+    it('shows a readonly row with no chevron and no action', () => {
+        // Given a readonly field
+        const onEditPage = jest.fn();
+        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage);
+
+        // When its row is tapped
+        const row = group.rows.find((candidate) => candidate.id === 'country');
+        row?.onPress();
+
+        // Then it is not editable
+        expect(row?.shouldShowRightIcon).toBe(false);
+        expect(onEditPage).not.toHaveBeenCalled();
+    });
+
+    it('has no group for a page that is not shown', () => {
+        // Given a private recipient, so the business page is skipped
+        const groups = getConfirmationItems(pages, getAllFields(pages), {type: 'PRIVATE', name: 'Ada', ein: '1'}, translateLocal, jest.fn());
+
+        // Then only the identity page is summarized
+        expect(groups.map((group) => group.id)).toEqual(['identity']);
+    });
+});
diff --git a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
new file mode 100644
index 000000000000..598b58fee3a7
--- /dev/null
+++ b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
@@ -0,0 +1,45 @@
+import getSubmittedAnswers from '@components/DynamicForm/utils/getSubmittedAnswers';
+
+import type {DynamicFormField} from '@src/types/onyx';
+
+describe('getSubmittedAnswers', () => {
+    it('leaves out the answer of a field hidden by its controller', () => {
+        // Given a text field shown only for business, with an answer left over from an earlier choice
+        const fields: DynamicFormField[] = [
+            {key: 'type', type: 'text', required: true},
+            {key: 'ein', type: 'text', required: true, showWhen: {key: 'type', equals: ['BUSINESS']}},
+        ];
+
+        // When the answers are collected for a private recipient
+        const answers = getSubmittedAnswers(fields, {type: 'PRIVATE', ein: '123'});
+
+        // Then the stale answer is not submitted
+        expect(answers).toEqual({type: 'PRIVATE'});
+    });
+
+    it('uses the whole form to find a controller on another page', () => {
+        // Given a field whose controller sits on another page
+        const controller: DynamicFormField = {key: 'type', type: 'text', required: true};
+        const dependent: DynamicFormField = {key: 'ein', type: 'text', required: true, showWhen: {key: 'type', equals: ['BUSINESS']}};
+
+        // When one page is collected with the whole form
+        const answers = getSubmittedAnswers([dependent], {type: 'BUSINESS', ein: '123'}, [controller, dependent]);
+
+        // Then the field counts as visible
+        expect(answers).toEqual({ein: '123'});
+    });
+
+    it('submits the address parts and the chosen currency along with the field', () => {
+        // Given an address and an amount that lets the user pick a currency
+        const fields: DynamicFormField[] = [
+            {key: 'home', type: 'address', required: true},
+            {key: 'fee', type: 'amount', required: true, currencyKey: 'feeCurrency'},
+        ];
+
+        // When the answers are collected
+        const answers = getSubmittedAnswers(fields, {home: '1 Main St', 'home.city': 'Austin', fee: '100', feeCurrency: 'EUR'});
+
+        // Then the currency is part of the answer, since the amount means nothing without it
+        expect(answers).toMatchObject({home: '1 Main St', 'home.city': 'Austin', fee: '100', feeCurrency: 'EUR'});
+    });
+});
diff --git a/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts b/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts
new file mode 100644
index 000000000000..d49222ef3f15
--- /dev/null
+++ b/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts
@@ -0,0 +1,24 @@
+import maskSensitiveValue from '@components/DynamicForm/utils/maskSensitiveValue';
+
+describe('maskSensitiveValue', () => {
+    it('shows an SSN as •••-••-1234', () => {
+        // Given a full nine digit SSN
+        // When it is masked
+        // Then only the last four digits stay, in the usual SSN grouping, so the user can tell which number they entered
+        expect(maskSensitiveValue('123451234')).toBe('•••-••-1234');
+    });
+
+    it('keeps the last four characters of any other value', () => {
+        // Given an account number that is not an SSN
+        // When it is masked
+        // Then everything but the last four characters is hidden
+        expect(maskSensitiveValue('00112233445')).toBe('•••••••3445');
+    });
+
+    it('does not hide a value of four characters or fewer', () => {
+        // Given a short value
+        // When it is masked
+        // Then nothing is padded and the value is shown as typed
+        expect(maskSensitiveValue('12')).toBe('12');
+    });
+});

From a74d53d583a700f509e7aad1e395fdb2752d80cb Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:19:39 +0200
Subject: [PATCH 548/781] Store sensitive DynamicForm answers in memory only

---
 src/ONYXKEYS.ts                     |  4 ++++
 src/libs/ExportOnyxState/masking.ts |  2 ++
 src/libs/actions/DynamicForm.ts     | 23 +++++++++++++++++++++++
 src/setup/index.ts                  |  1 +
 4 files changed, 30 insertions(+)
 create mode 100644 src/libs/actions/DynamicForm.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 67aed9f0ba9c..55dd5da845a8 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -828,6 +828,9 @@ const ONYXKEYS = {
     /** Signals the UI to show the Enable Global Reimbursements modal when a pay attempt fails because the workspace USD VBBA is not set up on Corpay */
     RAM_ONLY_CORPAY_PAY_MODAL: 'corpayPayModal',
 
+    /** Answers to sensitive DynamicForm fields, such as SSNs, carried between the pages of one visit to the form instead of saved to its draft */
+    RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS: 'dynamicFormSensitiveAnswers',
+
     /** Stores the information about the state of side panel */
     NVP_SIDE_PANEL: 'nvp_sidePanel',
 
@@ -1962,6 +1965,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: string;
     [ONYXKEYS.TRAVEL_PROVISIONING]: OnyxTypes.TravelProvisioning;
     [ONYXKEYS.RAM_ONLY_CORPAY_PAY_MODAL]: OnyxTypes.CorpayPayModal;
+    [ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS]: OnyxTypes.DynamicFormSensitiveAnswers;
     [ONYXKEYS.IS_LOADING_BILL_WHEN_DOWNGRADE]: boolean | undefined;
     [ONYXKEYS.SHOULD_BILL_WHEN_DOWNGRADING]: boolean | undefined;
     [ONYXKEYS.BILLING_RECEIPT_DETAILS]: OnyxTypes.BillingReceiptDetails;
diff --git a/src/libs/ExportOnyxState/masking.ts b/src/libs/ExportOnyxState/masking.ts
index 71e5804d8e5a..de11f5d10fd5 100644
--- a/src/libs/ExportOnyxState/masking.ts
+++ b/src/libs/ExportOnyxState/masking.ts
@@ -25,6 +25,8 @@ const onyxKeysToRemove = new Set<ValueOf<typeof ONYXKEYS> | ValueOf<typeof ONYXK
     ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
     ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
     ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED,
+    // Holds SSNs and bank account numbers
+    ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS,
     ONYXKEYS.ONFIDO_TOKEN,
     ONYXKEYS.ONFIDO_APPLICANT_ID,
     // maskFragileData won't catch this one, since the secret sits in a field named "token"
diff --git a/src/libs/actions/DynamicForm.ts b/src/libs/actions/DynamicForm.ts
new file mode 100644
index 000000000000..ded7b0030193
--- /dev/null
+++ b/src/libs/actions/DynamicForm.ts
@@ -0,0 +1,23 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxFormKey} from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+/** A dynamic form's keys come from its schema, so they are merged into the draft without its Onyx type listing them */
+function saveDraftAnswers(formID: OnyxFormKey, answers: DynamicFormValues) {
+    Onyx.merge(`${formID}Draft`, answers);
+}
+
+/** Sensitive answers live in memory only, so they reach the next page of the flow but are never written to the draft */
+function saveSensitiveAnswers(formID: OnyxFormKey, answers: DynamicFormValues) {
+    Onyx.merge(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[formID]: answers});
+}
+
+/** Call once the form is submitted or abandoned, so sensitive answers do not outlive the visit */
+function clearSensitiveAnswers(formID: OnyxFormKey) {
+    Onyx.merge(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[formID]: null});
+}
+
+export {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers};
diff --git a/src/setup/index.ts b/src/setup/index.ts
index c6967ca7bffc..9a1f7ba8a065 100644
--- a/src/setup/index.ts
+++ b/src/setup/index.ts
@@ -106,6 +106,7 @@ export default function () {
             ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE,
             ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER,
             ONYXKEYS.RAM_ONLY_CORPAY_PAY_MODAL,
+            ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS,
         ],
     });
 

From 2f8143575664a7980040b1cc9d1f3b8365230160 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:21:29 +0200
Subject: [PATCH 549/781] Add the DynamicForm multi-page flow

---
 .../DynamicFormConfirmationPage.tsx           |  31 +++
 .../components/DynamicFormFieldsPage.tsx      |  81 ++++++
 .../components/DynamicFormShell.tsx           |  62 +++++
 src/components/DynamicForm/index.tsx          | 245 ++++++++++++++++++
 src/components/DynamicForm/types.ts           |  73 +++++-
 .../DynamicForm/utils/getContentFields.ts     |   8 +-
 src/components/InteractiveStepWrapper.tsx     |   2 +
 7 files changed, 496 insertions(+), 6 deletions(-)
 create mode 100644 src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
 create mode 100644 src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
 create mode 100644 src/components/DynamicForm/components/DynamicFormShell.tsx
 create mode 100644 src/components/DynamicForm/index.tsx

diff --git a/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx b/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
new file mode 100644
index 000000000000..5680ea397ca3
--- /dev/null
+++ b/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
@@ -0,0 +1,31 @@
+import type {DynamicFormSubPageProps} from '@components/DynamicForm/types';
+import getConfirmationItems from '@components/DynamicForm/utils/getConfirmationItems';
+import ConfirmationStep from '@components/SubStepForms/ConfirmationStep';
+
+import useLocalize from '@hooks/useLocalize';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+/** The last page of a dynamic form flow: every answer as a row the user can tap to edit, and a Confirm button */
+function DynamicFormConfirmationPage({isEditing, onNext, onMove, pages, allFields, values, confirmationTitle, isSubmitting, submitError}: DynamicFormSubPageProps) {
+    const {translate} = useLocalize();
+
+    return (
+        <ConfirmationStep
+            isEditing={isEditing}
+            // The flow submits whatever onNext carries, and the press event is not answers
+            onNext={() => onNext()}
+            onMove={onMove}
+            pageTitle={confirmationTitle}
+            groups={getConfirmationItems(pages, allFields, values, translate, onMove)}
+            showOnfidoLinks={false}
+            isLoading={isSubmitting}
+            error={submitError}
+            forwardedFSClass={CONST.FULLSTORY.CLASS.MASK}
+        />
+    );
+}
+
+export default DynamicFormConfirmationPage;
diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
new file mode 100644
index 000000000000..fda313e467a3
--- /dev/null
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -0,0 +1,81 @@
+import type {DynamicFormSubPageProps} from '@components/DynamicForm/types';
+import getContentFields from '@components/DynamicForm/utils/getContentFields';
+import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
+import getLocalizedText from '@components/DynamicForm/utils/getLocalizedText';
+import getPageTitle from '@components/DynamicForm/utils/getPageTitle';
+import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
+import FormProvider from '@components/Form/FormProvider';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+import DynamicFormFields from './DynamicFormFields';
+
+/** One page of a dynamic form flow: its title and description, its fields and a Next button */
+function DynamicFormFieldsPage({
+    currentPageName,
+    isEditing,
+    isLastPage,
+    onNext,
+    formID,
+    pages,
+    allFields,
+    values,
+    currency,
+    maxFileSize,
+    onRefreshRequirements,
+    onPageSubmit,
+}: DynamicFormSubPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const page = pages.find((candidate) => candidate.key === currentPageName);
+    if (!page) {
+        return null;
+    }
+    const withInputValues = (inputValues: unknown) => ({...values, ...toDynamicFormValues(inputValues)});
+
+    return (
+        <FormProvider
+            formID={formID}
+            submitButtonText={translate(isEditing || isLastPage ? 'common.confirm' : 'common.next')}
+            validate={(inputValues) => getDynamicFieldErrors(getContentFields(page.content), withInputValues(inputValues), translate, allFields)}
+            onSubmit={(inputValues) => {
+                const pageValues = toDynamicFormValues(inputValues);
+                onPageSubmit(page, pageValues);
+                onNext(pageValues);
+            }}
+            style={[styles.mh5, styles.flexGrow1]}
+            submitButtonStyles={styles.mb0}
+            keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}
+            enabledWhenOffline
+        >
+            {({inputValues}) => {
+                const currentValues = withInputValues(inputValues);
+                const title = getPageTitle(page, currentValues, translate, allFields);
+                const description = getLocalizedText(translate, page.descriptionKey, page.description);
+                return (
+                    <>
+                        {!!title && <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{title}</Text>}
+                        {!!description && <Text style={[styles.textSupporting, styles.mb3]}>{description}</Text>}
+                        <DynamicFormFields
+                            content={page.content}
+                            allFields={allFields}
+                            isTitledByPage
+                            values={currentValues}
+                            currency={currency}
+                            maxFileSize={maxFileSize}
+                            onRefreshRequirements={onRefreshRequirements}
+                        />
+                    </>
+                );
+            }}
+        </FormProvider>
+    );
+}
+
+export default DynamicFormFieldsPage;
diff --git a/src/components/DynamicForm/components/DynamicFormShell.tsx b/src/components/DynamicForm/components/DynamicFormShell.tsx
new file mode 100644
index 000000000000..4bbd9c378ca4
--- /dev/null
+++ b/src/components/DynamicForm/components/DynamicFormShell.tsx
@@ -0,0 +1,62 @@
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
+import InteractiveStepWrapper from '@components/InteractiveStepWrapper';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+import type {ReactNode} from 'react';
+
+import React from 'react';
+
+type DynamicFormShellProps = {
+    /** The current page */
+    children: ReactNode;
+
+    /** testID of the screen wrapper */
+    testID: string;
+
+    /** Title in the header */
+    headerTitle: string;
+
+    /** Called when the user presses the header's back button */
+    onBackButtonPress: () => void;
+
+    /** Page names in order, for the step indicator */
+    stepNames: string[];
+
+    /** Index of the highlighted step */
+    stepIndex: number;
+
+    /** Shows the step indicator under the header */
+    shouldShowStepIndicator: boolean;
+};
+
+/** Header, and a step indicator when asked for, around one dynamic form page */
+function DynamicFormShell({children, testID, headerTitle, onBackButtonPress, stepNames, stepIndex, shouldShowStepIndicator}: DynamicFormShellProps) {
+    if (shouldShowStepIndicator) {
+        return (
+            <InteractiveStepWrapper
+                wrapperID={testID}
+                headerTitle={headerTitle}
+                stepNames={stepNames}
+                startStepIndex={stepIndex}
+                handleBackButtonPress={onBackButtonPress}
+                shouldEnableMaxHeight
+            >
+                {children}
+            </InteractiveStepWrapper>
+        );
+    }
+    return (
+        <ScreenWrapper
+            testID={testID}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButtonAndTitle
+                title={headerTitle}
+                onBackButtonPress={onBackButtonPress}
+            />
+            {children}
+        </ScreenWrapper>
+    );
+}
+
+export default DynamicFormShell;
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
new file mode 100644
index 000000000000..adf60d8580d4
--- /dev/null
+++ b/src/components/DynamicForm/index.tsx
@@ -0,0 +1,245 @@
+import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useSubPage from '@hooks/useSubPage';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {findLastPageIndex} from '@libs/SubPageUtils';
+
+import {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {DynamicFormPage} from '@src/types/onyx';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+import React, {useEffect, useRef} from 'react';
+
+import type {DynamicFormFlowProps, DynamicFormSubPageProps, DynamicFormValues} from './types';
+
+import DynamicFormConfirmationPage from './components/DynamicFormConfirmationPage';
+import DynamicFormFields from './components/DynamicFormFields';
+import DynamicFormFieldsPage from './components/DynamicFormFieldsPage';
+import DynamicFormShell from './components/DynamicFormShell';
+import getContentFields from './utils/getContentFields';
+import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
+import getPageTitle, {isPageShown} from './utils/getPageTitle';
+import getSubmittedAnswers from './utils/getSubmittedAnswers';
+import isSensitiveField from './utils/isSensitiveField';
+import isSupportedField from './utils/isSupportedField';
+import {getAllFields, getPages} from './utils/paginate';
+import toDynamicFormValues from './utils/toDynamicFormValues';
+
+/** An answer the user gave, including `false`, which counts as progress when deciding where a visit resumes */
+function hasDraftAnswer(answer: DynamicFormValues[string]): boolean {
+    return answer !== undefined && answer !== '' && !(Array.isArray(answer) && answer.length === 0);
+}
+
+/** A whole dynamic form: one page per schema page, skipping pages with nothing to ask, then a confirmation page */
+function DynamicFormFlow({
+    schema,
+    formID,
+    headerTitle,
+    confirmationTitle,
+    testID,
+    buildRoute,
+    shouldReplaceRoute,
+    onSubmit,
+    onPageSubmit,
+    onBack,
+    currency,
+    maxFileSize,
+    onRefreshRequirements,
+    isSubmitting,
+    submitError,
+    layout = 'auto',
+    hasConfirmation = true,
+}: DynamicFormFlowProps) {
+    const {translate} = useLocalize();
+    const [draft, draftMetadata] = useOnyx(`${formID}Draft`);
+    const [sensitiveAnswersByForm] = useOnyx(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS);
+    const isDraftLoading = isLoadingOnyxValue(draftMetadata);
+    const draftValues = toDynamicFormValues(draft);
+    const values: DynamicFormValues = {...draftValues, ...sensitiveAnswersByForm?.[formID]};
+
+    const pages = getPages(schema);
+    const allFields = getAllFields(pages);
+    const shownPages = pages.filter((page) => isPageShown(page, values, allFields));
+    const hasPageToShow = shownPages.length > 0;
+
+    // useSubPage needs at least one page, so a form without pages gets the confirmation page
+    const hasConfirmationPage = pages.length === 0 || hasConfirmation;
+    const subPages = [
+        ...pages.map((page) => ({pageName: page.key, component: DynamicFormFieldsPage})),
+        ...(hasConfirmationPage ? [{pageName: CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY, component: DynamicFormConfirmationPage}] : []),
+    ];
+    // While nothing is shown no page is skipped, since useSubPage needs a page that is not skipped
+    const skipPages = hasPageToShow ? pages.filter((page) => !shownPages.includes(page)).map((page) => page.key) : [];
+    const firstShownPageIndex = subPages.findIndex((page) => !skipPages.includes(page.pageName));
+    const lastShownPageIndex = findLastPageIndex<DynamicFormSubPageProps>(subPages, skipPages);
+
+    /** Pages the answers hide are never asked, so they cannot be the first gap */
+    const getFirstIncompletePageIndex = (answers: DynamicFormValues) =>
+        pages.findIndex((page) => isPageShown(page, answers, allFields) && Object.keys(getDynamicFieldErrors(getContentFields(page.content), answers, translate, allFields)).length > 0);
+
+    // A visit opened without a page in the URL drops the sensitive answers of earlier visits, so it starts from what the draft holds
+    let startFrom = firstShownPageIndex;
+    if (isDraftLoading) {
+        startFrom = -1;
+    } else if (allFields.some((field) => hasDraftAnswer(draftValues[field.key]))) {
+        const firstIncompleteIndex = getFirstIncompletePageIndex(draftValues);
+        startFrom = firstIncompleteIndex === -1 ? lastShownPageIndex : firstIncompleteIndex;
+    }
+
+    const {CurrentPage, isEditing, currentPageName, pageIndex, nextPage, prevPage, moveTo, resetToPage, isRedirecting} = useSubPage<DynamicFormSubPageProps>({
+        pages: subPages,
+        skipPages,
+        startFrom,
+        buildRoute,
+        shouldReplaceRoute,
+        onFinished: submitIfComplete,
+    });
+
+    /** Goes back to a page without stacking a second copy of it. Replaced routes leave nothing in the stack to go back to. */
+    const returnTo = (pageName: string) => {
+        if (shouldReplaceRoute) {
+            resetToPage(pageName);
+            return;
+        }
+        Navigation.goBack(buildRoute(pageName));
+    };
+
+    /** The confirmation page can be opened by URL before every page is answered, so an incomplete form goes back to its first gap instead. Without a confirmation page the last page's answers arrive here, before their draft is saved. */
+    function submitIfComplete(lastPageValues?: unknown) {
+        const answers = {...values, ...toDynamicFormValues(lastPageValues)};
+        const firstIncompleteIndex = getFirstIncompletePageIndex(answers);
+        const incompletePage = firstIncompleteIndex === -1 ? undefined : pages.at(firstIncompleteIndex);
+        if (incompletePage) {
+            returnTo(incompletePage.key);
+            return;
+        }
+        // Fields of a page the answers skip are not submitted
+        const shownFields = getAllFields(pages.filter((page) => isPageShown(page, answers, allFields)));
+        const submittedAnswers = getSubmittedAnswers(shownFields, answers, allFields);
+        if (isSubmitting === undefined) {
+            clearSensitiveAnswers(formID);
+        }
+        onSubmit(submittedAnswers);
+    }
+
+    const isOnSkippedPage = !!currentPageName && skipPages.includes(currentPageName);
+    const isOnUnavailablePage = !isDraftLoading && !isRedirecting && (!subPages.some((page) => page.pageName === currentPageName) || isOnSkippedPage);
+
+    useEffect(() => {
+        if (!isRedirecting) {
+            return;
+        }
+        clearSensitiveAnswers(formID);
+    }, [isRedirecting, formID]);
+
+    // A submission that finishes without an error drops the sensitive answers
+    const wasSubmittingRef = useRef(false);
+    useEffect(() => {
+        if (isSubmitting) {
+            wasSubmittingRef.current = true;
+            return;
+        }
+        if (!wasSubmittingRef.current || submitError) {
+            return;
+        }
+        wasSubmittingRef.current = false;
+        clearSensitiveAnswers(formID);
+    }, [isSubmitting, submitError, formID]);
+
+    // A page the answers now skip is replaced by the next shown page, or the previous one, so Back never lands on it. A stale link opens where a new visit would start.
+    const pageNames = subPages.map((page) => page.pageName);
+    const nextShownPageName = pageNames.find((pageName, index) => index > pageIndex && !skipPages.includes(pageName));
+    const previousShownPageName = pageNames.findLast((pageName, index) => index < pageIndex && !skipPages.includes(pageName));
+    const unavailablePageTarget = isOnSkippedPage ? (nextShownPageName ?? previousShownPageName) : subPages.at(startFrom)?.pageName;
+    useEffect(() => {
+        if (!isOnUnavailablePage || !unavailablePageTarget) {
+            return;
+        }
+        Navigation.navigate(buildRoute(unavailablePageTarget), {forceReplace: true});
+    }, [isOnUnavailablePage, buildRoute, unavailablePageTarget]);
+
+    /** Typed answers are drafted as FormProvider cleaned them and inputs left untouched are drafted with their defaults, so the draft matches what the page validated. Sensitive answers go to memory only, and only the draft ones reach the screen. */
+    const handlePageSubmit = (page: DynamicFormPage, pageValues: DynamicFormValues) => {
+        const currentValues = {...values, ...pageValues};
+        const pageFields = getContentFields(page.content).filter(isSupportedField);
+        const answers = getSubmittedAnswers(pageFields, currentValues, allFields);
+        const sensitiveKeys = new Set(pageFields.filter((field) => isSensitiveField(field)).map((field) => field.key));
+        const draftAnswers: DynamicFormValues = {};
+        const sensitiveAnswers: DynamicFormValues = {};
+        for (const [key, answer] of Object.entries(answers)) {
+            if (sensitiveKeys.has(key)) {
+                sensitiveAnswers[key] = answer;
+            } else {
+                draftAnswers[key] = answer;
+            }
+        }
+        saveDraftAnswers(formID, draftAnswers);
+        if (Object.keys(sensitiveAnswers).length > 0) {
+            saveSensitiveAnswers(formID, sensitiveAnswers);
+        }
+        onPageSubmit?.(page, draftAnswers);
+    };
+
+    const goBack = () => {
+        if (isEditing) {
+            returnTo(CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY);
+            return;
+        }
+        if (pageIndex <= firstShownPageIndex) {
+            clearSensitiveAnswers(formID);
+            onBack();
+            return;
+        }
+        prevPage();
+    };
+
+    // The confirmation page highlights the last step
+    const stepNames = [...shownPages.map((page) => getPageTitle(page, values, translate, allFields)), ...(hasConfirmationPage ? [translate('common.confirm')] : [])];
+    const currentShownPageIndex = shownPages.findIndex((page) => page.key === currentPageName);
+    const stepIndex = currentShownPageIndex === -1 ? stepNames.length - 1 : currentShownPageIndex;
+    const isStepIndicatorAsked = layout === 'auto' ? shownPages.length >= CONST.DYNAMIC_FORM.STEP_INDICATOR_MIN_PAGES : layout === 'stepper';
+
+    return (
+        <DynamicFormShell
+            testID={testID}
+            headerTitle={headerTitle}
+            onBackButtonPress={goBack}
+            stepNames={stepNames}
+            stepIndex={stepIndex}
+            shouldShowStepIndicator={isStepIndicatorAsked && stepNames.length > 1}
+        >
+            {isDraftLoading || isRedirecting || isOnUnavailablePage || !hasPageToShow ? (
+                <FullscreenLoadingIndicator />
+            ) : (
+                <CurrentPage
+                    isEditing={isEditing}
+                    isLastPage={!hasConfirmationPage && pageIndex === lastShownPageIndex}
+                    currentPageName={currentPageName}
+                    onNext={nextPage}
+                    onMove={moveTo}
+                    prevPage={prevPage}
+                    formID={formID}
+                    pages={pages}
+                    allFields={allFields}
+                    values={values}
+                    currency={currency}
+                    maxFileSize={maxFileSize}
+                    onRefreshRequirements={onRefreshRequirements}
+                    onPageSubmit={handlePageSubmit}
+                    confirmationTitle={confirmationTitle}
+                    isSubmitting={isSubmitting}
+                    submitError={submitError}
+                />
+            )}
+        </DynamicFormShell>
+    );
+}
+
+export default DynamicFormFlow;
+export {DynamicFormFields, getDynamicFieldErrors};
diff --git a/src/components/DynamicForm/types.ts b/src/components/DynamicForm/types.ts
index dacf69a06497..c322aede7758 100644
--- a/src/components/DynamicForm/types.ts
+++ b/src/components/DynamicForm/types.ts
@@ -1,6 +1,11 @@
 import type {FormValue} from '@components/Form/types';
 
-import type {DynamicFormField, DynamicFormFieldType} from '@src/types/onyx';
+import type {SubPageProps, UseSubPageProps} from '@hooks/useSubPage/types';
+
+import type {OnyxFormKey} from '@src/ONYXKEYS';
+import type {DynamicFormField, DynamicFormFieldType, DynamicFormPage, DynamicFormSchema} from '@src/types/onyx';
+
+import type {DynamicFormFieldsProps} from './components/DynamicFormFields';
 
 /** Current answers keyed by draft key. Address parts sit under `<fieldKey>.<part>`. */
 type DynamicFormValues = Partial<Record<string, FormValue>>;
@@ -8,4 +13,68 @@ type DynamicFormValues = Partial<Record<string, FormValue>>;
 /** The variant of one type. An intersection rather than Extract, since one variant can cover several types, such as select and radio. */
 type DynamicFormFieldOfType<TType extends DynamicFormFieldType> = DynamicFormField & {type: TType};
 
-export type {DynamicFormFieldOfType, DynamicFormValues};
+/** `auto` shows a step indicator at three or more pages, `stepper` always, `pages` never */
+type DynamicFormLayout = 'auto' | 'pages' | 'stepper';
+
+type DynamicFormFlowProps = Pick<DynamicFormFieldsProps, 'currency' | 'maxFileSize' | 'onRefreshRequirements'> & {
+    /** The pages as the server groups them, or a flat list of fields the App paginates. Fields of a type this App version does not know are left out. */
+    schema: DynamicFormSchema;
+
+    /** The form whose draft holds the answers. Sensitive answers stay in memory instead. */
+    formID: OnyxFormKey;
+
+    /** Title in the header of every page */
+    headerTitle: string;
+
+    /** Title of the confirmation page */
+    confirmationTitle: string;
+
+    /** testID of the screen wrapper */
+    testID: string;
+
+    /** Route of a page. The flow passes `edit` when the user opens a page from the confirmation page. */
+    buildRoute: UseSubPageProps<SubPageProps>['buildRoute'];
+
+    /** Replaces the route on each page change instead of pushing a new one, for flows on dynamic routes */
+    shouldReplaceRoute?: UseSubPageProps<SubPageProps>['shouldReplaceRoute'];
+
+    /** Receives the answers to every visible field, sensitive ones included. The flow drops sensitive answers once `isSubmitting` turns false without `submitError`, or right away when `isSubmitting` is not passed. */
+    onSubmit: (answers: DynamicFormValues) => void;
+
+    /** Receives a page and its draft answers when the user leaves it with Next, for flows that save each page. Sensitive answers are not passed, since a page save would persist them in the request queue. */
+    onPageSubmit?: (page: DynamicFormPage, answers: DynamicFormValues) => void;
+
+    /** Leaves the flow from its first page */
+    onBack: () => void;
+
+    /** Shows the confirmation page's Confirm button loading while the screen sends the answers */
+    isSubmitting?: boolean;
+
+    /** Error from sending the answers, shown on the confirmation page */
+    submitError?: string;
+
+    /** When the step indicator shows: `auto` from three shown pages on, `stepper` always, `pages` never */
+    layout?: DynamicFormLayout;
+
+    /** Whether a confirmation page follows the last page. On by default. A form with no page always gets one, since there has to be a page to land on. */
+    hasConfirmation?: boolean;
+};
+
+/** Props of every page in the flow: useSubPage's routing props plus the form's data */
+type DynamicFormSubPageProps = SubPageProps &
+    Pick<DynamicFormFlowProps, 'formID' | 'currency' | 'maxFileSize' | 'onRefreshRequirements' | 'confirmationTitle' | 'isSubmitting' | 'submitError'> & {
+        pages: DynamicFormPage[];
+
+        /** Every supported field of the form, which is where a `showWhen` finds its controller */
+        allFields: DynamicFormField[];
+
+        /** Draft answers merged with the sensitive answers kept in memory */
+        values: DynamicFormValues;
+
+        onPageSubmit: (page: DynamicFormPage, pageValues: DynamicFormValues) => void;
+
+        /** The last page submits the form, since no confirmation page follows */
+        isLastPage: boolean;
+    };
+
+export type {DynamicFormFieldOfType, DynamicFormFlowProps, DynamicFormLayout, DynamicFormSubPageProps, DynamicFormValues};
diff --git a/src/components/DynamicForm/utils/getContentFields.ts b/src/components/DynamicForm/utils/getContentFields.ts
index aa7d39ce4744..4d40f29a1fbf 100644
--- a/src/components/DynamicForm/utils/getContentFields.ts
+++ b/src/components/DynamicForm/utils/getContentFields.ts
@@ -1,10 +1,10 @@
-import type {DynamicFormContentItem, DynamicFormHeading} from '@src/types/onyx';
+import type {DynamicFormContentItem} from '@src/types/onyx';
 
 import isHeading from './isHeading';
 
-/** The fields of a page's content, for getDynamicFieldErrors and other field-only checks */
-function getContentFields<TItem extends DynamicFormContentItem>(content: TItem[]): Array<Exclude<TItem, DynamicFormHeading>> {
-    return content.filter((item): item is Exclude<TItem, DynamicFormHeading> => !isHeading(item));
+/** The fields of a page's content, for getDynamicFieldErrors and other field-only checks. Extract rather than Exclude, since every field is structurally a heading too. */
+function getContentFields<TItem extends DynamicFormContentItem>(content: TItem[]): Array<Extract<TItem, {type: string}>> {
+    return content.filter((item): item is Extract<TItem, {type: string}> => !isHeading(item));
 }
 
 export default getContentFields;
diff --git a/src/components/InteractiveStepWrapper.tsx b/src/components/InteractiveStepWrapper.tsx
index a97c48504e7e..7010187d5001 100644
--- a/src/components/InteractiveStepWrapper.tsx
+++ b/src/components/InteractiveStepWrapper.tsx
@@ -94,6 +94,8 @@ function InteractiveStepWrapper({
                 {!!stepNames && (
                     <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
                         <InteractiveStepSubHeader
+                            // The sub header keeps its own step state, so a new start index has to remount it for flows that move between steps on one screen
+                            key={startStepIndex}
                             startStepIndex={startStepIndex}
                             stepNames={stepNames}
                             currentStepAccessibilityDescription={headerTitle}

From a736d2e2514bca707a91e8a7d72a429412e1a268 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:22:39 +0200
Subject: [PATCH 550/781] Add DynamicForm flow tests

---
 .../DynamicForm/DynamicFormFlowTest.tsx       | 457 ++++++++++++++++++
 1 file changed, 457 insertions(+)
 create mode 100644 tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx

diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
new file mode 100644
index 000000000000..404fa15faf5f
--- /dev/null
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -0,0 +1,457 @@
+import {render} from '@testing-library/react-native';
+
+import DynamicFormFlow from '@components/DynamicForm';
+import type {DynamicFormLayout, DynamicFormSubPageProps} from '@components/DynamicForm/types';
+import type {FormValue} from '@components/Form/types';
+
+import useSubPage from '@hooks/useSubPage';
+import type {SubPageProps} from '@hooks/useSubPage/types';
+
+import Navigation from '@libs/Navigation/Navigation';
+
+import {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {DynamicFormPage, DynamicFormSchema} from '@src/types/onyx';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdatesWithAct from '../../../utils/waitForBatchedUpdatesWithAct';
+
+/** useSubPage types its page as taking SubPageProps alone, so the flow's props are checked for at run time */
+function hasDynamicFormProps(props: SubPageProps | undefined): props is DynamicFormSubPageProps {
+    return !!props && 'onPageSubmit' in props;
+}
+
+const mockCurrentPage = jest.fn<null, [SubPageProps]>(() => null);
+const mockPrevPage = jest.fn();
+const mockResetToPage = jest.fn();
+const mockMoveTo = jest.fn();
+let mockOnBackButtonPress: (() => void) | undefined;
+const mockStepWrapper = jest.fn<null, [{stepNames: string[]; startStepIndex: number}]>(() => null);
+
+jest.mock('@hooks/useSubPage', () => jest.fn());
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@userActions/DynamicForm', () => ({
+    saveDraftAnswers: jest.fn(),
+    saveSensitiveAnswers: jest.fn(),
+    clearSensitiveAnswers: jest.fn(),
+}));
+jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn(), goBack: jest.fn()}));
+jest.mock('@components/ScreenWrapper', () => jest.fn(({children}: {children: React.ReactNode}) => children));
+jest.mock('@components/FullscreenLoadingIndicator', () => jest.fn(() => null));
+jest.mock('@components/InteractiveStepWrapper', () => jest.fn((props: {stepNames: string[]; startStepIndex: number}) => mockStepWrapper(props)));
+jest.mock('@components/Header/composed/HeaderWithBackButtonAndTitle', () =>
+    jest.fn(({onBackButtonPress}: {onBackButtonPress: () => void}) => {
+        mockOnBackButtonPress = onBackButtonPress;
+        return null;
+    }),
+);
+
+// Any form key works, since the draft is read as plain values
+const FORM_ID = ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM;
+
+const personalDetails: DynamicFormPage = {
+    key: 'personal-details',
+    title: 'Personal details',
+    content: [
+        {key: 'firstName', type: 'text', required: true},
+        {key: 'ssn', type: 'text', required: true, sensitive: true},
+    ],
+};
+const recipient: DynamicFormPage = {
+    key: 'recipient',
+    title: 'Recipient',
+    content: [{key: 'legalType', type: 'radio', required: true, values: [{key: 'PRIVATE'}, {key: 'BUSINESS'}]}],
+};
+const company: DynamicFormPage = {
+    key: 'company',
+    title: 'Company',
+    content: [{key: 'companyNumber', type: 'text', required: true, showWhen: {key: 'legalType', equals: ['BUSINESS']}}],
+};
+
+const schema: DynamicFormSchema = {pages: [personalDetails, recipient, company]};
+const schemaWithoutSsn: DynamicFormSchema = {pages: [{...personalDetails, content: personalDetails.content.slice(0, 1)}, recipient, company]};
+
+const buildRoute = (pageName: string, action?: 'edit') => ROUTES.BANK_ACCOUNT_PERSONAL.getRoute(pageName, action);
+
+type RenderFlowOptions = {
+    flowSchema?: DynamicFormSchema;
+    draft?: Record<string, FormValue>;
+    sensitiveAnswers?: Record<string, string>;
+    pageIndex?: number;
+    currentPageName?: string;
+    isRedirecting?: boolean;
+    hasConfirmation?: boolean;
+    layout?: DynamicFormLayout;
+    isSubmitting?: boolean;
+    shouldReplaceRoute?: boolean;
+    maxFileSize?: number;
+};
+
+async function renderFlow({
+    flowSchema = schema,
+    draft = {},
+    sensitiveAnswers = {},
+    pageIndex = 0,
+    currentPageName = 'personal-details',
+    isRedirecting = false,
+    hasConfirmation = false,
+    layout,
+    isSubmitting,
+    shouldReplaceRoute,
+    maxFileSize,
+}: RenderFlowOptions = {}) {
+    await Onyx.set(`${FORM_ID}Draft`, draft);
+    await Onyx.set(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[FORM_ID]: sensitiveAnswers});
+    jest.mocked(useSubPage<DynamicFormSubPageProps>).mockReturnValue({
+        CurrentPage: mockCurrentPage,
+        isEditing: false,
+        currentPageName,
+        pageIndex,
+        lastPageIndex: 3,
+        nextPage: jest.fn(),
+        prevPage: mockPrevPage,
+        moveTo: mockMoveTo,
+        resetToPage: mockResetToPage,
+        isRedirecting,
+    });
+    const onSubmit = jest.fn();
+    const onBack = jest.fn();
+    const onPageSubmit = jest.fn();
+    const renderWith = (submitting?: boolean) => (
+        <DynamicFormFlow
+            schema={flowSchema}
+            formID={FORM_ID}
+            headerTitle="Bank account"
+            confirmationTitle="Confirm"
+            testID="DynamicFormFlowTest"
+            buildRoute={buildRoute}
+            shouldReplaceRoute={shouldReplaceRoute}
+            onSubmit={onSubmit}
+            onBack={onBack}
+            onPageSubmit={onPageSubmit}
+            hasConfirmation={hasConfirmation}
+            layout={layout}
+            maxFileSize={maxFileSize}
+            isSubmitting={submitting}
+        />
+    );
+    const {rerender} = render(renderWith(isSubmitting));
+    const setSubmitting = async (submitting?: boolean) => {
+        rerender(renderWith(submitting));
+        await waitForBatchedUpdatesWithAct();
+    };
+    await waitForBatchedUpdatesWithAct();
+    const subPageOptions = jest.mocked(useSubPage<DynamicFormSubPageProps>).mock.lastCall?.[0];
+    if (!subPageOptions) {
+        throw new Error('useSubPage was not called');
+    }
+    const pageProps = mockCurrentPage.mock.lastCall?.[0];
+    return {subPageOptions, setSubmitting, onSubmit, onBack, onPageSubmit, pageProps: hasDynamicFormProps(pageProps) ? pageProps : undefined};
+}
+
+describe('DynamicFormFlow', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+    });
+
+    it('makes one page per schema page plus a confirmation page, and skips pages with nothing to ask', async () => {
+        // Given a private recipient, so the company page has no visible field
+        // When the flow renders with a confirmation page
+        const {subPageOptions} = await renderFlow({draft: {legalType: 'PRIVATE'}, hasConfirmation: true});
+
+        // Then every page is a route before the confirmation page, and the company page is skipped
+        expect(subPageOptions.pages.map((page) => page.pageName)).toEqual(['personal-details', 'recipient', 'company', 'confirm']);
+        expect(subPageOptions.skipPages).toEqual(['company']);
+    });
+
+    it('asks for a confirmation page unless the screen turns it off', async () => {
+        // Given the same schema rendered with the default and with the confirmation page turned off
+        const defaultFlow = await renderFlow({hasConfirmation: undefined});
+        const withoutConfirmation = await renderFlow({hasConfirmation: false});
+
+        // Then only the first ends on a confirmation page, since a flow of any length has answers worth reviewing
+        expect(defaultFlow.subPageOptions.pages.at(-1)?.pageName).toBe('confirm');
+        expect(withoutConfirmation.subPageOptions.pages.map((page) => page.pageName)).toEqual(['personal-details', 'recipient', 'company']);
+    });
+
+    it('still lands on a confirmation page when the schema has no page and none was asked for', async () => {
+        // Given a schema with no page, and a screen that turned the confirmation page off
+        // When the flow renders
+        const {subPageOptions} = await renderFlow({flowSchema: {pages: []}, hasConfirmation: false});
+
+        // Then the confirmation page is the only page, since useSubPage throws when every page is skipped
+        expect(subPageOptions.pages.map((page) => page.pageName)).toEqual(['confirm']);
+    });
+
+    it('paginates a flat list of fields', async () => {
+        // Given a schema of fields with no pages, one of them an address that needs a page of its own
+        const flowSchema: DynamicFormSchema = {
+            fields: [
+                {key: 'firstName', type: 'text', required: true},
+                {key: 'lastName', type: 'text', required: true},
+                {key: 'home', type: 'address', required: true},
+            ],
+        };
+
+        // When the flow renders
+        const {subPageOptions} = await renderFlow({flowSchema, currentPageName: 'page-1'});
+
+        // Then the pages get stable names
+        expect(subPageOptions.pages.map((page) => page.pageName)).toEqual(['page-1', 'page-2']);
+    });
+
+    it('submits from the last page, with its answers, when no confirmation page follows', async () => {
+        // Given the recipient page, the last one shown while no business recipient is chosen, with the first page answered
+        const {pageProps, subPageOptions, onSubmit} = await renderFlow({draft: {firstName: 'Jane'}, sensitiveAnswers: {ssn: '123456789'}, pageIndex: 1, currentPageName: 'recipient'});
+
+        // When the user picks a private recipient, and useSubPage finishes the flow with the page's answers
+        subPageOptions.onFinished({legalType: 'PRIVATE'});
+
+        // Then the page is marked last, so it shows Confirm, and the submission holds its answer, which the draft does not have yet
+        expect(pageProps?.isLastPage).toBe(true);
+        expect(onSubmit).toHaveBeenCalledWith({firstName: 'Jane', legalType: 'PRIVATE', ssn: '123456789'});
+    });
+
+    it('shows a step indicator from three pages on, unless the layout turns it off', async () => {
+        // Given a business recipient, so all three pages are shown
+        const draft = {legalType: 'BUSINESS'};
+
+        // When the flow renders with the default layout, and then with plain pages
+        await renderFlow({draft, pageIndex: 1, currentPageName: 'recipient'});
+        const autoLayout = mockStepWrapper.mock.lastCall?.[0];
+        mockStepWrapper.mockClear();
+        await renderFlow({draft, layout: 'pages'});
+
+        // Then the default layout names every page and highlights the current one, and plain pages have no indicator
+        expect(autoLayout).toEqual(expect.objectContaining({stepNames: ['Personal details', 'Recipient', 'Company'], startStepIndex: 1}));
+        expect(mockStepWrapper).not.toHaveBeenCalled();
+    });
+
+    it('names the step of a page with no title after its field', async () => {
+        // Given pages built from a flat list, which carry no title, shown with the stepper
+        const flowSchema: DynamicFormSchema = {
+            fields: [
+                {key: 'home', type: 'address', required: true, label: 'Home address'},
+                {key: 'work', type: 'address', required: true, label: 'Work address'},
+            ],
+        };
+
+        // When the flow renders
+        await renderFlow({flowSchema, layout: 'stepper', currentPageName: 'page-1'});
+
+        // Then no step is blank
+        expect(mockStepWrapper.mock.lastCall?.[0].stepNames).toEqual(['Home address', 'Work address']);
+    });
+
+    it('starts a new form on its first page that has something to ask', async () => {
+        // Given an empty draft, and a form whose first page only asks a follow-up to a later answer
+        const followUpFirst: DynamicFormSchema = {pages: [company, personalDetails, recipient]};
+
+        // When the flow renders each
+        const newForm = (await renderFlow()).subPageOptions;
+        const skippedFirstPage = (await renderFlow({flowSchema: followUpFirst})).subPageOptions;
+
+        // Then the first form starts on page one, and the other skips its empty first page instead of showing it
+        expect(newForm.startFrom).toBe(0);
+        expect(skippedFirstPage.startFrom).toBe(1);
+    });
+
+    it('resumes a started form on the first page its draft leaves incomplete', async () => {
+        // Given a form without sensitive fields whose first page is answered and whose recipient page is not
+        // When the flow renders
+        const {subPageOptions} = await renderFlow({flowSchema: schemaWithoutSsn, draft: {firstName: 'Jane'}});
+
+        // Then it resumes on the recipient page, so the user does not walk through answered pages again
+        expect(subPageOptions.startFrom).toBe(1);
+    });
+
+    it('resumes a complete form without a confirmation page on its last page', async () => {
+        // Given a complete form without sensitive fields or a confirmation page
+        // When the flow renders
+        const {subPageOptions} = await renderFlow({flowSchema: schemaWithoutSsn, draft: {firstName: 'Jane', legalType: 'PRIVATE'}});
+
+        // Then it opens on the recipient page, the last one this recipient sees
+        expect(subPageOptions.startFrom).toBe(1);
+    });
+
+    it('opens the confirmation page when the draft completes every page', async () => {
+        // Given a complete form without sensitive fields
+        // When the flow renders with a confirmation page
+        const {subPageOptions} = await renderFlow({flowSchema: schemaWithoutSsn, draft: {firstName: 'Jane', legalType: 'PRIVATE'}, hasConfirmation: true});
+
+        // Then it opens on the confirmation page, where the user only has to confirm
+        expect(subPageOptions.startFrom).toBe(3);
+    });
+
+    it('skips a page whose own showWhen does not match, and resume passes over it', async () => {
+        // Given a page shown only for business recipients, holding a field the draft never answered
+        const businessPage: DynamicFormPage = {key: 'business', title: 'Business', showWhen: {key: 'legalType', equals: ['BUSINESS']}, content: [{key: 'ein', type: 'text', required: true}]};
+        const flowSchema: DynamicFormSchema = {pages: [{...personalDetails, content: personalDetails.content.slice(0, 1)}, recipient, businessPage]};
+
+        // When the flow renders for a private recipient with a confirmation page
+        const {subPageOptions} = await renderFlow({flowSchema, draft: {firstName: 'Jane', legalType: 'PRIVATE'}, hasConfirmation: true});
+
+        // Then the page is skipped and its missing answer does not stop resume from opening the confirmation page
+        expect(subPageOptions.skipPages).toEqual(['business']);
+        expect(subPageOptions.startFrom).toBe(3);
+    });
+
+    it('drops sensitive answers of an earlier visit and asks for them again on a new visit', async () => {
+        // Given a draft that completes the form, and an SSN kept in memory from an earlier visit
+        // When the flow opens with no page in the URL
+        const {subPageOptions} = await renderFlow({draft: {firstName: 'Jane', legalType: 'PRIVATE'}, sensitiveAnswers: {ssn: '123456789'}, isRedirecting: true});
+
+        // Then the old SSN is cleared and the visit starts on the SSN's page, since sensitive answers last one visit only
+        expect(clearSensitiveAnswers).toHaveBeenCalledWith(FORM_ID);
+        expect(subPageOptions.startFrom).toBe(0);
+    });
+
+    it('replaces a URL naming a skipped page with the next shown page', async () => {
+        // Given a private recipient, so the company page has nothing to ask, and a confirmation page after it
+        // When the URL names the company page
+        await renderFlow({draft: {legalType: 'PRIVATE'}, currentPageName: 'company', pageIndex: 2, hasConfirmation: true});
+
+        // Then the confirmation page takes the company page's place in the stack, so Back does not return to the empty page
+        expect(Navigation.navigate).toHaveBeenCalledWith(buildRoute('confirm'), {forceReplace: true});
+        expect(mockResetToPage).not.toHaveBeenCalled();
+    });
+
+    it('replaces a URL naming an unknown page with the page a new visit starts on', async () => {
+        // Given a new form
+        // When the URL names a page the form does not have, as an old link would
+        await renderFlow({currentPageName: 'removed-page', pageIndex: 0});
+
+        // Then the first page takes its place in the stack
+        expect(Navigation.navigate).toHaveBeenCalledWith(buildRoute('personal-details'), {forceReplace: true});
+    });
+
+    it('drafts the page answers, keeps sensitive ones in memory, and hands the screen draft answers only', async () => {
+        // Given the first page
+        const {pageProps, onPageSubmit} = await renderFlow();
+        const page = pageProps?.pages.at(0);
+        if (!pageProps || !page) {
+            throw new Error('No first page');
+        }
+
+        // When the user leaves it with Next, with FormProvider's values also holding another page's answer
+        pageProps.onPageSubmit(page, {firstName: 'Jane', ssn: '123456789', legalType: 'PRIVATE'});
+
+        // Then only this page's name is drafted, the SSN goes to memory only, and the screen never sees the SSN, since a page save would queue it
+        expect(saveDraftAnswers).toHaveBeenCalledWith(FORM_ID, {firstName: 'Jane'});
+        expect(saveSensitiveAnswers).toHaveBeenCalledWith(FORM_ID, {ssn: '123456789'});
+        expect(onPageSubmit).toHaveBeenCalledWith(page, {firstName: 'Jane'});
+    });
+
+    it('submits the visible answers, sensitive ones included, from the confirmation page', async () => {
+        // Given a complete form with a stale company number left from a business recipient
+        const {subPageOptions, onSubmit} = await renderFlow({draft: {firstName: 'Jane', legalType: 'PRIVATE', companyNumber: '123'}, sensitiveAnswers: {ssn: '123456789'}});
+
+        // When the user confirms
+        subPageOptions.onFinished();
+
+        // Then the answers include the SSN from memory and leave out the hidden company number
+        expect(onSubmit).toHaveBeenCalledWith({firstName: 'Jane', legalType: 'PRIVATE', ssn: '123456789'});
+    });
+
+    it('drops sensitive answers once they are submitted', async () => {
+        // Given a complete form with an SSN in memory, once submitted by a screen that reports no progress and once by one that does
+        const draft = {firstName: 'Jane', legalType: 'PRIVATE'};
+        const sensitiveAnswers = {ssn: '123456789'};
+        const untracked = await renderFlow({draft, sensitiveAnswers});
+
+        // When the user confirms on each
+        untracked.subPageOptions.onFinished();
+        const clearedWithoutTracking = jest.mocked(clearSensitiveAnswers).mock.calls.length;
+        jest.mocked(clearSensitiveAnswers).mockClear();
+        const tracked = await renderFlow({draft, sensitiveAnswers, isSubmitting: false});
+        tracked.subPageOptions.onFinished();
+        const clearedBeforeTheRequestEnds = jest.mocked(clearSensitiveAnswers).mock.calls.length;
+        await tracked.setSubmitting(true);
+        await tracked.setSubmitting(false);
+
+        // Then the first drops the SSN right away, and the second only once its request ends without an error, so a retry still has it
+        expect(clearedWithoutTracking).toBe(1);
+        expect(clearedBeforeTheRequestEnds).toBe(0);
+        expect(clearSensitiveAnswers).toHaveBeenCalledWith(FORM_ID);
+    });
+
+    it('shows no page and submits nothing while every field is hidden', async () => {
+        // Given a form whose only field is shown for business recipients, and a private recipient
+        const flowSchema: DynamicFormSchema = {pages: [company]};
+
+        // When the flow renders
+        const {subPageOptions} = await renderFlow({flowSchema, draft: {legalType: 'PRIVATE'}, currentPageName: 'company'});
+
+        // Then no page is drawn and the hidden page is not skipped, since useSubPage needs a page to stay on
+        expect(mockCurrentPage).not.toHaveBeenCalled();
+        expect(subPageOptions.skipPages).toEqual([]);
+    });
+
+    it('sends the user back to the incomplete page without pushing a second copy of it', async () => {
+        // Given a form whose SSN was lost when the app restarted
+        const {subPageOptions, onSubmit} = await renderFlow({draft: {firstName: 'Jane', legalType: 'PRIVATE'}});
+
+        // When the user confirms from the confirmation page
+        subPageOptions.onFinished();
+
+        // Then the stack goes back to the page instead of growing, and nothing is submitted
+        expect(Navigation.goBack).toHaveBeenCalledWith(buildRoute('personal-details'));
+        expect(mockResetToPage).not.toHaveBeenCalled();
+        expect(onSubmit).not.toHaveBeenCalled();
+    });
+
+    it('resets to the incomplete page when routes are replaced, since there is no stack to go back in', async () => {
+        // Given the same lost SSN on a flow that replaces its routes
+        const {subPageOptions} = await renderFlow({draft: {firstName: 'Jane', legalType: 'PRIVATE'}, shouldReplaceRoute: true});
+
+        // When the user confirms
+        subPageOptions.onFinished();
+
+        // Then the page replaces the current route
+        expect(mockResetToPage).toHaveBeenCalledWith('personal-details');
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('forgets sensitive answers when the user leaves from the first page', async () => {
+        // Given the first page
+        const {onBack} = await renderFlow({pageIndex: 0});
+
+        // When the user presses back
+        mockOnBackButtonPress?.();
+
+        // Then the sensitive answers are cleared and the screen is left
+        expect(clearSensitiveAnswers).toHaveBeenCalledWith(FORM_ID);
+        expect(onBack).toHaveBeenCalled();
+        expect(mockPrevPage).not.toHaveBeenCalled();
+    });
+
+    it('goes back one page from a later page', async () => {
+        // Given the second page
+        await renderFlow({pageIndex: 1});
+
+        // When the user presses back
+        mockOnBackButtonPress?.();
+
+        // Then the previous page opens and the sensitive answers are kept
+        expect(mockPrevPage).toHaveBeenCalled();
+        expect(clearSensitiveAnswers).not.toHaveBeenCalled();
+    });
+
+    it('passes the file size limit on to the page', async () => {
+        // Given a screen that sets a file size limit
+        // When the flow renders
+        const {pageProps} = await renderFlow({maxFileSize: 2097152});
+
+        // Then the page gets it, so file fields can enforce it
+        expect(pageProps?.maxFileSize).toBe(2097152);
+    });
+});

From 2f803db1315ca9e3d067d781b642a15cb5c5eef7 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:23:10 +0200
Subject: [PATCH 551/781] Fix DynamicForm flow test draft type

---
 tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 404fa15faf5f..0accab24b7ee 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -2,7 +2,6 @@ import {render} from '@testing-library/react-native';
 
 import DynamicFormFlow from '@components/DynamicForm';
 import type {DynamicFormLayout, DynamicFormSubPageProps} from '@components/DynamicForm/types';
-import type {FormValue} from '@components/Form/types';
 
 import useSubPage from '@hooks/useSubPage';
 import type {SubPageProps} from '@hooks/useSubPage/types';
@@ -79,7 +78,7 @@ const buildRoute = (pageName: string, action?: 'edit') => ROUTES.BANK_ACCOUNT_PE
 
 type RenderFlowOptions = {
     flowSchema?: DynamicFormSchema;
-    draft?: Record<string, FormValue>;
+    draft?: Record<string, string>;
     sensitiveAnswers?: Record<string, string>;
     pageIndex?: number;
     currentPageName?: string;

From 680afd2ab0d795145512988faa575cbb087dc7bc Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:23:27 +0200
Subject: [PATCH 552/781] Fix spelling in DynamicForm pagination

---
 src/components/DynamicForm/utils/paginate.ts      | 2 +-
 tests/unit/components/DynamicForm/paginateTest.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/DynamicForm/utils/paginate.ts b/src/components/DynamicForm/utils/paginate.ts
index 8936e99b460d..34a1132b2680 100644
--- a/src/components/DynamicForm/utils/paginate.ts
+++ b/src/components/DynamicForm/utils/paginate.ts
@@ -24,7 +24,7 @@ function toSlug(key: string): string {
 }
 
 /**
- * Groups a flat list of fields into pages. Fields that need room (addresses, files, multiselects, dependent or large selects) get a page of their own,
+ * Groups a flat list of fields into pages. Fields that need room (addresses, files, multi-selects, dependent or large selects) get a page of their own,
  * and the rest share a page up to `MAX_FIELDS_PER_PAGE` in a row. A field with `showWhen` joins the page of its controller and does not count toward that limit.
  * The pages have no title and no key, `getPages` names them.
  */
diff --git a/tests/unit/components/DynamicForm/paginateTest.ts b/tests/unit/components/DynamicForm/paginateTest.ts
index fd1a9ea7ce43..e1d07f28f1fe 100644
--- a/tests/unit/components/DynamicForm/paginateTest.ts
+++ b/tests/unit/components/DynamicForm/paginateTest.ts
@@ -98,7 +98,7 @@ describe('getPages', () => {
         expect(pages.map((page) => page.key)).toEqual(['page-1', 'page-2']);
     });
 
-    it('slugifies keys, reserves confirm and makes keys unique', () => {
+    it('turns keys into URL-safe slugs, reserves confirm and makes keys unique', () => {
         // Given pages whose keys are not URL-safe, collide, or take the confirmation route
         const content = [text('a')];
         const pages = getPages({

From d2ab0f0a2f57eac7a916b62547bff6b819faa166 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:25:59 +0200
Subject: [PATCH 553/781] Fix confirmation default case in DynamicForm flow
 test

---
 tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 0accab24b7ee..689fff067930 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -83,7 +83,8 @@ type RenderFlowOptions = {
     pageIndex?: number;
     currentPageName?: string;
     isRedirecting?: boolean;
-    hasConfirmation?: boolean;
+    /** `default` leaves the prop out, so the flow's own default applies. Tests that do not care about the confirmation page turn it off. */
+    hasConfirmation?: boolean | 'default';
     layout?: DynamicFormLayout;
     isSubmitting?: boolean;
     shouldReplaceRoute?: boolean;
@@ -132,7 +133,7 @@ async function renderFlow({
             onSubmit={onSubmit}
             onBack={onBack}
             onPageSubmit={onPageSubmit}
-            hasConfirmation={hasConfirmation}
+            hasConfirmation={hasConfirmation === 'default' ? undefined : hasConfirmation}
             layout={layout}
             maxFileSize={maxFileSize}
             isSubmitting={submitting}
@@ -174,7 +175,7 @@ describe('DynamicFormFlow', () => {
 
     it('asks for a confirmation page unless the screen turns it off', async () => {
         // Given the same schema rendered with the default and with the confirmation page turned off
-        const defaultFlow = await renderFlow({hasConfirmation: undefined});
+        const defaultFlow = await renderFlow({hasConfirmation: 'default'});
         const withoutConfirmation = await renderFlow({hasConfirmation: false});
 
         // Then only the first ends on a confirmation page, since a flow of any length has answers worth reviewing

From be32da11f05bd04f2249525012051b1c648e4dd9 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 14:27:13 +0200
Subject: [PATCH 554/781] Fix lint errors in DynamicForm tests

---
 .../unit/components/DynamicForm/getSubmittedAnswersTest.ts | 7 +++++--
 tests/unit/components/DynamicForm/paginateTest.ts          | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
index 598b58fee3a7..f8c50695e426 100644
--- a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
+++ b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
@@ -1,7 +1,10 @@
+import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
 import getSubmittedAnswers from '@components/DynamicForm/utils/getSubmittedAnswers';
 
 import type {DynamicFormField} from '@src/types/onyx';
 
+const cityKey = getAddressInputKeys('home').city;
+
 describe('getSubmittedAnswers', () => {
     it('leaves out the answer of a field hidden by its controller', () => {
         // Given a text field shown only for business, with an answer left over from an earlier choice
@@ -37,9 +40,9 @@ describe('getSubmittedAnswers', () => {
         ];
 
         // When the answers are collected
-        const answers = getSubmittedAnswers(fields, {home: '1 Main St', 'home.city': 'Austin', fee: '100', feeCurrency: 'EUR'});
+        const answers = getSubmittedAnswers(fields, {home: '1 Main St', [cityKey]: 'Austin', fee: '100', feeCurrency: 'EUR'});
 
         // Then the currency is part of the answer, since the amount means nothing without it
-        expect(answers).toMatchObject({home: '1 Main St', 'home.city': 'Austin', fee: '100', feeCurrency: 'EUR'});
+        expect(answers).toMatchObject({home: '1 Main St', [cityKey]: 'Austin', fee: '100', feeCurrency: 'EUR'});
     });
 });
diff --git a/tests/unit/components/DynamicForm/paginateTest.ts b/tests/unit/components/DynamicForm/paginateTest.ts
index e1d07f28f1fe..2a12e4f0b5ba 100644
--- a/tests/unit/components/DynamicForm/paginateTest.ts
+++ b/tests/unit/components/DynamicForm/paginateTest.ts
@@ -1,12 +1,12 @@
 import getPageTitle, {isPageShown} from '@components/DynamicForm/utils/getPageTitle';
 import paginate, {getAllFields, getPages} from '@components/DynamicForm/utils/paginate';
 
-import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
+import type {DynamicFormField, DynamicFormPage, DynamicFormTextField} from '@src/types/onyx';
 
 import {translateLocal} from '../../../utils/TestHelper';
 
-function text(key: string, extra: Partial<DynamicFormField> = {}): DynamicFormField {
-    return {key, type: 'text', required: true, label: key, ...extra} as DynamicFormField;
+function text(key: string, extra: Partial<DynamicFormTextField> = {}): DynamicFormTextField {
+    return {key, type: 'text', required: true, label: key, ...extra};
 }
 
 function options(count: number) {

From ca9bd241f3fa089723763b7e42018384d93cc5a5 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 15:04:01 +0200
Subject: [PATCH 555/781] Drop unused DynamicForm and ConfirmationStep exports

---
 src/components/DynamicForm/index.tsx             | 2 --
 src/components/SubStepForms/ConfirmationStep.tsx | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index adf60d8580d4..3d9a7c69b420 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -19,7 +19,6 @@ import React, {useEffect, useRef} from 'react';
 import type {DynamicFormFlowProps, DynamicFormSubPageProps, DynamicFormValues} from './types';
 
 import DynamicFormConfirmationPage from './components/DynamicFormConfirmationPage';
-import DynamicFormFields from './components/DynamicFormFields';
 import DynamicFormFieldsPage from './components/DynamicFormFieldsPage';
 import DynamicFormShell from './components/DynamicFormShell';
 import getContentFields from './utils/getContentFields';
@@ -242,4 +241,3 @@ function DynamicFormFlow({
 }
 
 export default DynamicFormFlow;
-export {DynamicFormFields, getDynamicFieldErrors};
diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index 8cf0c490f5fb..0845ef3f8183 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -150,4 +150,4 @@ function ConfirmationStep({
 }
 
 export default ConfirmationStep;
-export type {SummaryGroup, SummaryGroupRow, SummaryItem};
+export type {SummaryGroup};

From 4249b2403eefca39edc5790467da64172df87314 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 15:28:53 +0200
Subject: [PATCH 556/781] Fix DynamicForm empty schema, sensitive answer
 cleanup and short value masking

---
 .../components/DynamicFormShell.tsx           |  1 +
 src/components/DynamicForm/index.tsx          | 10 +++++++-
 .../DynamicForm/utils/maskSensitiveValue.ts   |  5 ++--
 src/components/InteractiveStepWrapper.tsx     |  6 ++++-
 .../DynamicForm/DynamicFormFlowTest.tsx       | 25 +++++++++++++++++--
 .../DynamicForm/maskSensitiveValueTest.ts     | 12 +++++----
 6 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/components/DynamicForm/components/DynamicFormShell.tsx b/src/components/DynamicForm/components/DynamicFormShell.tsx
index 4bbd9c378ca4..354d5e6ba38f 100644
--- a/src/components/DynamicForm/components/DynamicFormShell.tsx
+++ b/src/components/DynamicForm/components/DynamicFormShell.tsx
@@ -39,6 +39,7 @@ function DynamicFormShell({children, testID, headerTitle, onBackButtonPress, ste
                 stepNames={stepNames}
                 startStepIndex={stepIndex}
                 handleBackButtonPress={onBackButtonPress}
+                shouldRemountSubHeaderOnStepChange
                 shouldEnableMaxHeight
             >
                 {children}
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 3d9a7c69b420..41030f0b8ab8 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -137,6 +137,14 @@ function DynamicFormFlow({
         clearSensitiveAnswers(formID);
     }, [isRedirecting, formID]);
 
+    // Leaving the flow any way other than its Back button (hardware back, swipe, a link) must not leave sensitive answers behind
+    useEffect(
+        () => () => {
+            clearSensitiveAnswers(formID);
+        },
+        [formID],
+    );
+
     // A submission that finishes without an error drops the sensitive answers
     const wasSubmittingRef = useRef(false);
     useEffect(() => {
@@ -213,7 +221,7 @@ function DynamicFormFlow({
             stepIndex={stepIndex}
             shouldShowStepIndicator={isStepIndicatorAsked && stepNames.length > 1}
         >
-            {isDraftLoading || isRedirecting || isOnUnavailablePage || !hasPageToShow ? (
+            {isDraftLoading || isRedirecting || isOnUnavailablePage || (!hasPageToShow && pages.length > 0) ? (
                 <FullscreenLoadingIndicator />
             ) : (
                 <CurrentPage
diff --git a/src/components/DynamicForm/utils/maskSensitiveValue.ts b/src/components/DynamicForm/utils/maskSensitiveValue.ts
index 7593296a2820..d760451921e9 100644
--- a/src/components/DynamicForm/utils/maskSensitiveValue.ts
+++ b/src/components/DynamicForm/utils/maskSensitiveValue.ts
@@ -2,9 +2,10 @@ import {isValidSSNFullNine} from '@libs/ValidationUtils';
 
 const VISIBLE_CHARACTERS = 4;
 
-/** All but the last four characters hidden, as in •••-••-6789, so the user can tell which number they entered */
+/** All but the last four characters hidden, as in •••-••-6789, so the user can tell which number they entered. A short value shows at most half of itself. */
 function maskSensitiveValue(value: string): string {
-    const masked = '•'.repeat(Math.max(value.length - VISIBLE_CHARACTERS, 0)) + value.slice(-VISIBLE_CHARACTERS);
+    const visibleCharacters = Math.min(VISIBLE_CHARACTERS, Math.floor(value.length / 2));
+    const masked = '•'.repeat(value.length - visibleCharacters) + value.slice(value.length - visibleCharacters);
     return isValidSSNFullNine(value) ? `${masked.slice(0, 3)}-${masked.slice(3, 5)}-${masked.slice(5)}` : masked;
 }
 
diff --git a/src/components/InteractiveStepWrapper.tsx b/src/components/InteractiveStepWrapper.tsx
index 7010187d5001..95fb562daa7d 100644
--- a/src/components/InteractiveStepWrapper.tsx
+++ b/src/components/InteractiveStepWrapper.tsx
@@ -26,6 +26,9 @@ type InteractiveStepWrapperProps = {
     startStepIndex?: number;
 
     stepNames?: readonly string[];
+
+    /** Remounts the sub header when `startStepIndex` changes, for flows that move between steps on one screen. Other flows drive the sub header through its own state. */
+    shouldRemountSubHeaderOnStepChange?: boolean;
     shouldEnableMaxHeight?: boolean;
     shouldShowOfflineIndicator?: boolean;
     shouldShowOfflineIndicatorInWideScreen?: boolean;
@@ -59,6 +62,7 @@ function InteractiveStepWrapper({
     headerSubtitle,
     startStepIndex,
     stepNames,
+    shouldRemountSubHeaderOnStepChange = false,
     shouldEnableMaxHeight,
     shouldShowOfflineIndicator,
     shouldShowOfflineIndicatorInWideScreen,
@@ -95,7 +99,7 @@ function InteractiveStepWrapper({
                     <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
                         <InteractiveStepSubHeader
                             // The sub header keeps its own step state, so a new start index has to remount it for flows that move between steps on one screen
-                            key={startStepIndex}
+                            key={shouldRemountSubHeaderOnStepChange ? startStepIndex : undefined}
                             startStepIndex={startStepIndex}
                             stepNames={stepNames}
                             currentStepAccessibilityDescription={headerTitle}
diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 689fff067930..935d1cfd49ae 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -139,7 +139,7 @@ async function renderFlow({
             isSubmitting={submitting}
         />
     );
-    const {rerender} = render(renderWith(isSubmitting));
+    const {rerender, unmount} = render(renderWith(isSubmitting));
     const setSubmitting = async (submitting?: boolean) => {
         rerender(renderWith(submitting));
         await waitForBatchedUpdatesWithAct();
@@ -150,7 +150,7 @@ async function renderFlow({
         throw new Error('useSubPage was not called');
     }
     const pageProps = mockCurrentPage.mock.lastCall?.[0];
-    return {subPageOptions, setSubmitting, onSubmit, onBack, onPageSubmit, pageProps: hasDynamicFormProps(pageProps) ? pageProps : undefined};
+    return {subPageOptions, setSubmitting, unmount, onSubmit, onBack, onPageSubmit, pageProps: hasDynamicFormProps(pageProps) ? pageProps : undefined};
 }
 
 describe('DynamicFormFlow', () => {
@@ -192,6 +192,27 @@ describe('DynamicFormFlow', () => {
         expect(subPageOptions.pages.map((page) => page.pageName)).toEqual(['confirm']);
     });
 
+    it('draws the confirmation page when the schema has no page', async () => {
+        // Given a schema with no page and a confirmation page
+        // When the flow renders
+        await renderFlow({flowSchema: {pages: []}, hasConfirmation: true, currentPageName: 'confirm'});
+
+        // Then the confirmation page is drawn instead of a loading indicator the user could never leave
+        expect(mockCurrentPage).toHaveBeenCalled();
+    });
+
+    it('drops the sensitive answers when the flow unmounts', async () => {
+        // Given a flow that was left by the hardware back button or a link instead of its own Back button
+        const {unmount} = await renderFlow();
+        jest.mocked(clearSensitiveAnswers).mockClear();
+
+        // When the flow unmounts
+        unmount();
+
+        // Then the sensitive answers do not stay in memory for the next visit
+        expect(clearSensitiveAnswers).toHaveBeenCalledWith(FORM_ID);
+    });
+
     it('paginates a flat list of fields', async () => {
         // Given a schema of fields with no pages, one of them an address that needs a page of its own
         const flowSchema: DynamicFormSchema = {
diff --git a/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts b/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts
index d49222ef3f15..2688332b3d05 100644
--- a/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts
+++ b/tests/unit/components/DynamicForm/maskSensitiveValueTest.ts
@@ -15,10 +15,12 @@ describe('maskSensitiveValue', () => {
         expect(maskSensitiveValue('00112233445')).toBe('•••••••3445');
     });
 
-    it('does not hide a value of four characters or fewer', () => {
-        // Given a short value
-        // When it is masked
-        // Then nothing is padded and the value is shown as typed
-        expect(maskSensitiveValue('12')).toBe('12');
+    it('hides half of a short value', () => {
+        // Given values of four characters or fewer, such as a PIN
+        // When they are masked
+        // Then at most half of each stays visible, so a short answer is never shown in full
+        expect(maskSensitiveValue('1234')).toBe('••34');
+        expect(maskSensitiveValue('12')).toBe('•2');
+        expect(maskSensitiveValue('1')).toBe('•');
     });
 });

From 71116cdc9088fa8c7ac6e83d0f0d326c54c1a28e Mon Sep 17 00:00:00 2001
From: Lukasz Modzelewski <lukasz.modzelewski@callstack.com>
Date: Tue, 13 Oct 2026 15:47:48 +0200
Subject: [PATCH 557/781] Drop reportsParentHierarchy from list extraData since
 renderItem already carries it

---
 .../MoneyRequestReportActionsList.tsx                    | 9 +--------
 src/pages/inbox/report/ReportActionsList.tsx             | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index ea9484343abf..01fcf887791b 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -290,14 +290,7 @@ function MoneyRequestReportActionsListContent({reportIDFromRoute, onLayout}: Mon
         );
     };
 
-    const reportActionsExtraData = [
-        draftReportActionID,
-        isDraftPendingCompletion,
-        latestConciergeFeedbackActionID,
-        expandedSystemMessageReportActionIDs,
-        unreadMarkerReportActionID,
-        reportsParentHierarchy,
-    ];
+    const reportActionsExtraData = [draftReportActionID, isDraftPendingCompletion, latestConciergeFeedbackActionID, expandedSystemMessageReportActionIDs, unreadMarkerReportActionID];
 
     /**
      * Runs when the FlatList finishes laying out
diff --git a/src/pages/inbox/report/ReportActionsList.tsx b/src/pages/inbox/report/ReportActionsList.tsx
index 5dc634ac2a24..508f7873e06f 100644
--- a/src/pages/inbox/report/ReportActionsList.tsx
+++ b/src/pages/inbox/report/ReportActionsList.tsx
@@ -531,7 +531,6 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
         isDraftPendingCompletion,
         latestConciergeFeedbackActionID,
         expandedSystemMessageReportActionIDs,
-        reportsParentHierarchy,
     ];
 
     const listHeaderComponent = (

From 93e9c11b2a4d7ee6d0b9f779250695dd0bdd9976 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 15:54:58 +0200
Subject: [PATCH 558/781] Keep DynamicForm sensitive answers across pages,
 latch auto step indicator, make readonly rows non-interactive

---
 src/components/DynamicForm/index.tsx            | 17 +++++++----------
 .../DynamicForm/utils/getConfirmationItems.ts   |  1 +
 .../SubStepForms/ConfirmationStep.tsx           |  9 +++++++--
 .../DynamicForm/DynamicFormFlowTest.tsx         | 10 +++++-----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 41030f0b8ab8..5b1daa8cb2b9 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -14,7 +14,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {DynamicFormPage} from '@src/types/onyx';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 
 import type {DynamicFormFlowProps, DynamicFormSubPageProps, DynamicFormValues} from './types';
 
@@ -137,14 +137,6 @@ function DynamicFormFlow({
         clearSensitiveAnswers(formID);
     }, [isRedirecting, formID]);
 
-    // Leaving the flow any way other than its Back button (hardware back, swipe, a link) must not leave sensitive answers behind
-    useEffect(
-        () => () => {
-            clearSensitiveAnswers(formID);
-        },
-        [formID],
-    );
-
     // A submission that finishes without an error drops the sensitive answers
     const wasSubmittingRef = useRef(false);
     useEffect(() => {
@@ -210,7 +202,12 @@ function DynamicFormFlow({
     const stepNames = [...shownPages.map((page) => getPageTitle(page, values, translate, allFields)), ...(hasConfirmationPage ? [translate('common.confirm')] : [])];
     const currentShownPageIndex = shownPages.findIndex((page) => page.key === currentPageName);
     const stepIndex = currentShownPageIndex === -1 ? stepNames.length - 1 : currentShownPageIndex;
-    const isStepIndicatorAsked = layout === 'auto' ? shownPages.length >= CONST.DYNAMIC_FORM.STEP_INDICATOR_MIN_PAGES : layout === 'stepper';
+    // The shell swaps its root when the indicator toggles, which remounts the page. So `auto` decides once, from the answers the draft held on arrival, and keeps it while the user types.
+    const [isAutoStepIndicatorAsked, setIsAutoStepIndicatorAsked] = useState<boolean>();
+    if (!isDraftLoading && isAutoStepIndicatorAsked === undefined) {
+        setIsAutoStepIndicatorAsked(shownPages.length >= CONST.DYNAMIC_FORM.STEP_INDICATOR_MIN_PAGES);
+    }
+    const isStepIndicatorAsked = layout === 'auto' ? !!isAutoStepIndicatorAsked : layout === 'stepper';
 
     return (
         <DynamicFormShell
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index ec58d561434f..e6cbc7ea1b7e 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -35,6 +35,7 @@ function getConfirmationItems(
                     title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
                     shouldShowRightIcon: !field.readonly,
                     onPress: field.readonly ? () => {} : () => onEditPage(pageIndex),
+                    interactive: !field.readonly,
                 };
             }),
         }))
diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index 0845ef3f8183..a2c5b48aab66 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -24,6 +24,9 @@ type SummaryItem = {
     title: string;
     shouldShowRightIcon: boolean;
     onPress: () => void;
+
+    /** False for a row that opens nothing, so it is not announced as a button. Defaults to true. */
+    interactive?: boolean;
     brickRoadIndicator?: BrickRoad;
     errorText?: string;
     testID?: string;
@@ -87,7 +90,7 @@ function ConfirmationStep({
             contentContainerStyle={[styles.flexGrow1, shouldApplySafeAreaPaddingBottom && {paddingBottom: safeAreaInsetPaddingBottom + styles.pb5.paddingBottom}]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{pageTitle}</Text>
-            {summaryItems.map(({id, description, title, shouldShowRightIcon, onPress, brickRoadIndicator, errorText, testID}) => (
+            {summaryItems.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
                 <MenuItemWithTopDescription
                     key={id}
                     pressableTestID={testID ?? id}
@@ -95,6 +98,7 @@ function ConfirmationStep({
                     title={title}
                     shouldShowRightIcon={shouldShowRightIcon}
                     onPress={onPress}
+                    interactive={interactive}
                     brickRoadIndicator={brickRoadIndicator}
                     errorText={errorText}
                     forwardedFSClass={forwardedFSClass}
@@ -105,7 +109,7 @@ function ConfirmationStep({
                 <View key={group.id}>
                     {index > 0 && <View style={[styles.mh5, styles.mt3, styles.borderBottom]} />}
                     {!!group.name && <Text style={[styles.textNormalThemeText, styles.textLineHeightNormal, styles.textStrong, styles.ph5, styles.mt4, styles.mb1]}>{group.name}</Text>}
-                    {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, brickRoadIndicator, errorText, testID}) => (
+                    {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
                         <MenuItemWithTopDescription
                             key={id}
                             pressableTestID={testID ?? id}
@@ -113,6 +117,7 @@ function ConfirmationStep({
                             title={title}
                             shouldShowRightIcon={shouldShowRightIcon}
                             onPress={onPress}
+                            interactive={interactive}
                             brickRoadIndicator={brickRoadIndicator}
                             errorText={errorText}
                             forwardedFSClass={forwardedFSClass}
diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 935d1cfd49ae..5f44cc6016dc 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -201,16 +201,16 @@ describe('DynamicFormFlow', () => {
         expect(mockCurrentPage).toHaveBeenCalled();
     });
 
-    it('drops the sensitive answers when the flow unmounts', async () => {
-        // Given a flow that was left by the hardware back button or a link instead of its own Back button
+    it('keeps the sensitive answers when a page of the flow unmounts', async () => {
+        // Given a flow where every page is its own screen, so moving between pages unmounts one instance
         const {unmount} = await renderFlow();
         jest.mocked(clearSensitiveAnswers).mockClear();
 
-        // When the flow unmounts
+        // When a page instance unmounts while the user is still in the flow
         unmount();
 
-        // Then the sensitive answers do not stay in memory for the next visit
-        expect(clearSensitiveAnswers).toHaveBeenCalledWith(FORM_ID);
+        // Then the sensitive answers stay, so Back and Next do not wipe what the user already entered
+        expect(clearSensitiveAnswers).not.toHaveBeenCalled();
     });
 
     it('paginates a flat list of fields', async () => {

From c31dfd78f0bb3dc5055bd3cc3e032d9b4c0678b9 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 16:02:15 +0200
Subject: [PATCH 559/781] Keep every answer key of a sensitive DynamicForm
 field out of the draft

---
 src/components/DynamicForm/index.tsx               |  4 ++--
 .../DynamicForm/utils/getSubmittedAnswers.ts       |  1 +
 .../DynamicForm/getSubmittedAnswersTest.ts         | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 5b1daa8cb2b9..e5110ba9da6f 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -24,7 +24,7 @@ import DynamicFormShell from './components/DynamicFormShell';
 import getContentFields from './utils/getContentFields';
 import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
 import getPageTitle, {isPageShown} from './utils/getPageTitle';
-import getSubmittedAnswers from './utils/getSubmittedAnswers';
+import getSubmittedAnswers, {getAnswerKeys} from './utils/getSubmittedAnswers';
 import isSensitiveField from './utils/isSensitiveField';
 import isSupportedField from './utils/isSupportedField';
 import {getAllFields, getPages} from './utils/paginate';
@@ -168,7 +168,7 @@ function DynamicFormFlow({
         const currentValues = {...values, ...pageValues};
         const pageFields = getContentFields(page.content).filter(isSupportedField);
         const answers = getSubmittedAnswers(pageFields, currentValues, allFields);
-        const sensitiveKeys = new Set(pageFields.filter((field) => isSensitiveField(field)).map((field) => field.key));
+        const sensitiveKeys = new Set(pageFields.filter((field) => isSensitiveField(field)).flatMap((field) => getAnswerKeys(field)));
         const draftAnswers: DynamicFormValues = {};
         const sensitiveAnswers: DynamicFormValues = {};
         for (const [key, answer] of Object.entries(answers)) {
diff --git a/src/components/DynamicForm/utils/getSubmittedAnswers.ts b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
index 28685e5d097a..73cd33252f26 100644
--- a/src/components/DynamicForm/utils/getSubmittedAnswers.ts
+++ b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
@@ -31,3 +31,4 @@ function getSubmittedAnswers(fields: DynamicFormField[], values: DynamicFormValu
 }
 
 export default getSubmittedAnswers;
+export {getAnswerKeys};
diff --git a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
index f8c50695e426..fe7bd009fd79 100644
--- a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
+++ b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
@@ -1,5 +1,5 @@
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
-import getSubmittedAnswers from '@components/DynamicForm/utils/getSubmittedAnswers';
+import getSubmittedAnswers, {getAnswerKeys} from '@components/DynamicForm/utils/getSubmittedAnswers';
 
 import type {DynamicFormField} from '@src/types/onyx';
 
@@ -45,4 +45,16 @@ describe('getSubmittedAnswers', () => {
         // Then the currency is part of the answer, since the amount means nothing without it
         expect(answers).toMatchObject({home: '1 Main St', [cityKey]: 'Austin', fee: '100', feeCurrency: 'EUR'});
     });
+
+    it('lists every answer key of a compound field', () => {
+        // Given an address field, whose answer is spread over several keys
+        const field: DynamicFormField = {key: 'home', type: 'address', required: true, sensitive: true};
+
+        // When the answer keys are listed
+        const keys = getAnswerKeys(field);
+
+        // Then the address parts are included, so marking the field sensitive covers all of them
+        expect(keys).toContain('home');
+        expect(keys).toContain(cityKey);
+    });
 });

From 9dde5a350be6e89b2eaaba90d39eaf49b0cbf85c Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef.lourayad@gmail.com>
Date: Tue, 13 Oct 2026 14:04:07 +0000
Subject: [PATCH 560/781] Fix spurious attendee conflict when merging expenses
 across reports

Compare attendees as stored instead of applying the report-owner display
fallback, which is only resolvable for locally loaded reports and made one
side [owner] and the other [] when merging across reports. When either
expense has no attendees, keep the other side's attendees instead of
flagging a conflict. Remove the now-unused owner-fallback parameters.
---
 src/hooks/useSearchBulkActions.ts             | 14 +--
 src/hooks/useSelectedTransactionsActions.ts   |  2 -
 src/libs/MergeTransactionUtils.ts             | 14 ++-
 src/libs/actions/MergeTransaction.ts          | 36 +-------
 .../DynamicDetailsReviewPage.tsx              |  4 -
 .../DynamicReceiptReviewPage.tsx              |  5 --
 .../MergeTransactionsListContent.tsx          | 18 +---
 tests/unit/MergeTransactionUtilsTest.ts       | 88 +++++++++++++++++++
 .../useSelectedTransactionsActions.test.ts    | 13 +--
 9 files changed, 102 insertions(+), 92 deletions(-)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 1ed5db2350b5..223a1ea1eb35 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -3101,19 +3101,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         text: translate('common.merge'),
                         icon: expensifyIcons.ArrowCollapse,
                         value: CONST.SEARCH.BULK_ACTION_TYPES.MERGE,
-                        onSelected: () =>
-                            setupMergeTransactionDataAndNavigate(
-                                transactionID,
-                                searchedTransactions,
-                                localeCompare,
-                                getCurrencyDecimals,
-                                reports,
-                                false,
-                                true,
-                                undefined,
-                                accountID,
-                                personalDetails,
-                            ),
+                        onSelected: () => setupMergeTransactionDataAndNavigate(transactionID, searchedTransactions, localeCompare, getCurrencyDecimals, reports, false, true, undefined),
                     });
                 }
             }
diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts
index 2281a62f907c..d46b0101a6b4 100644
--- a/src/hooks/useSelectedTransactionsActions.ts
+++ b/src/hooks/useSelectedTransactionsActions.ts
@@ -508,8 +508,6 @@ function useSelectedTransactionsActions({
                             false,
                             isOnSearch,
                             selectedTransactionsList.length > 1 ? [policy, policy] : undefined,
-                            currentUserAccountID,
-                            personalDetails,
                         ),
                 });
             }
diff --git a/src/libs/MergeTransactionUtils.ts b/src/libs/MergeTransactionUtils.ts
index fbad088f740a..9456ddbcdc63 100644
--- a/src/libs/MergeTransactionUtils.ts
+++ b/src/libs/MergeTransactionUtils.ts
@@ -232,19 +232,16 @@ function getMergeableDataAndConflictFields(
     searchReports: Array<OnyxEntry<Report>> = [],
     targetTransactionPolicy?: OnyxEntry<Policy>,
     sourceTransactionPolicy?: OnyxEntry<Policy>,
-    targetReportOwnerAsAttendee?: Attendee,
-    sourceReportOwnerAsAttendee?: Attendee,
 ) {
     const conflictFields: string[] = [];
     const mergeableData: Record<string, unknown> = {};
     // The same object, typed for the field builders that read the values merged so far
     const mergedSoFar = mergeableData as MergeTransaction;
 
-    // Resolve the report-owner fallback the same way the display path (buildMergeFieldsData) does, so an expense
-    // with no stored attendee is compared as [owner] instead of [] and doesn't produce a false attendee conflict
-    // against an expense whose attendee is that same owner.
-    const targetTransactionDetails = getTransactionDetails(targetTransaction, undefined, undefined, undefined, undefined, targetReportOwnerAsAttendee);
-    const sourceTransactionDetails = getTransactionDetails(sourceTransaction, undefined, undefined, undefined, undefined, sourceReportOwnerAsAttendee);
+    // Attendees are compared as stored, without the report-owner display fallback. The owner can only be resolved for
+    // reports loaded locally, so applying it would give the two expenses different values when they sit on different reports.
+    const targetTransactionDetails = getTransactionDetails(targetTransaction);
+    const sourceTransactionDetails = getTransactionDetails(sourceTransaction);
 
     for (const field of getMergeFields(targetTransaction)) {
         const targetValue = getMergeFieldValue(targetTransactionDetails, targetTransaction, field);
@@ -319,7 +316,8 @@ function getMergeableDataAndConflictFields(
             const targetAttendeeLogins = ((targetValue as Attendee[] | undefined)?.map((attendee) => attendee.email) ?? []).filter((login): login is string => !!login).sort(localeCompare);
             const sourceAttendeeLogins = ((sourceValue as Attendee[] | undefined)?.map((attendee) => attendee.email) ?? []).filter((login): login is string => !!login).sort(localeCompare);
 
-            if (deepEqual(targetAttendeeLogins, sourceAttendeeLogins)) {
+            // An expense with no attendees has nothing to choose between, so the other side's attendees are kept
+            if (isTargetValueEmpty || isSourceValueEmpty || deepEqual(targetAttendeeLogins, sourceAttendeeLogins)) {
                 mergeableData[field] = isTargetValueEmpty ? sourceValue : targetValue;
             } else {
                 conflictFields.push(field);
diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index 852545eaf9d8..975d53377d90 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -31,24 +31,10 @@ import {
 } from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
-import {getReportOwnerAccountIDAsAttendee, getReportOwnerAsAttendee, isDistanceRequest, isTransactionPendingDelete} from '@src/libs/TransactionUtils';
+import {isDistanceRequest, isTransactionPendingDelete} from '@src/libs/TransactionUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {
-    CardList,
-    MergeTransaction,
-    PersonalDetailsList,
-    Policy,
-    PolicyCategories,
-    PolicyTagLists,
-    Report,
-    ReportAction,
-    ReportActions,
-    Rule,
-    Transaction,
-    TransactionViolations,
-} from '@src/types/onyx';
-import type {Attendee} from '@src/types/onyx/IOU';
+import type {CardList, MergeTransaction, Policy, PolicyCategories, PolicyTagLists, Report, ReportAction, ReportActions, Rule, Transaction, TransactionViolations} from '@src/types/onyx';
 
 import type {OnyxCollection, OnyxEntry, OnyxMergeInput, OnyxUpdate} from 'react-native-onyx';
 
@@ -61,20 +47,6 @@ import {getCleanUpTransactionThreadReportOnyxData} from './IOU/DeleteMoneyReques
 import {getDeleteTrackExpenseInformation} from './IOU/TrackExpense';
 import {getUpdateMoneyRequestParams, getUpdateTrackExpenseParams} from './IOU/UpdateMoneyRequest';
 
-/**
- * Resolve a transaction's report owner as a default attendee, mirroring the `useReportOwnerAsAttendee` hook so the
- * non-React merge entry point can apply the same empty-attendee fallback the details/receipt pages use. The Onyx data
- * is passed in by the caller rather than read from a module subscription.
- */
-function getReportOwnerAsAttendeeForTransaction(
-    transaction: OnyxEntry<Transaction>,
-    currentUserAccountID: number | undefined,
-    personalDetails: OnyxEntry<PersonalDetailsList>,
-): Attendee | undefined {
-    const ownerAccountID = getReportOwnerAccountIDAsAttendee(transaction, currentUserAccountID);
-    return getReportOwnerAsAttendee(ownerAccountID ? (personalDetails?.[ownerAccountID] ?? undefined) : undefined);
-}
-
 /**
  * Setup merge transaction data for merging flow
  */
@@ -119,8 +91,6 @@ function setupMergeTransactionDataAndNavigate(
     isSelectingSourceTransaction?: boolean,
     isOnSearch?: boolean,
     policies?: Array<OnyxEntry<Policy>>,
-    currentUserAccountID?: number,
-    personalDetails?: OnyxEntry<PersonalDetailsList>,
 ) {
     if (!transactions.length || transactions.length > 2) {
         return;
@@ -169,8 +139,6 @@ function setupMergeTransactionDataAndNavigate(
             searchReports,
             targetTransactionPolicy,
             sourceTransactionPolicy,
-            getReportOwnerAsAttendeeForTransaction(targetTransaction, currentUserAccountID, personalDetails),
-            getReportOwnerAsAttendeeForTransaction(sourceTransaction, currentUserAccountID, personalDetails),
         );
         if (!conflictFields.length) {
             // If there are no conflict fields, we should set mergeable data and navigate to the confirmation page
diff --git a/src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx b/src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx
index 9760acfbb2dd..14c34dabd3b3 100644
--- a/src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx
+++ b/src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx
@@ -82,8 +82,6 @@ function DynamicDetailsReviewPage({route}: DynamicDetailsReviewPageProps) {
             [targetTransactionReport, sourceTransactionReport],
             targetTransactionPolicy,
             sourceTransactionPolicy,
-            targetReportOwnerAsAttendee,
-            sourceReportOwnerAsAttendee,
         );
 
         setMergeTransactionKey(transactionID, mergeableData);
@@ -98,8 +96,6 @@ function DynamicDetailsReviewPage({route}: DynamicDetailsReviewPageProps) {
         targetTransactionPolicy,
         sourceTransactionPolicy,
         getCurrencyDecimals,
-        targetReportOwnerAsAttendee,
-        sourceReportOwnerAsAttendee,
     ]);
 
     // Handle selection
diff --git a/src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx b/src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx
index e4d2a4b7df9c..5415ec4e96f7 100644
--- a/src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx
+++ b/src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx
@@ -12,7 +12,6 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useMergeTransactions from '@hooks/useMergeTransactions';
 import useOnyx from '@hooks/useOnyx';
-import useReportOwnerAsAttendee from '@hooks/useReportOwnerAsAttendee';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {setMergeTransactionKey} from '@libs/actions/MergeTransaction';
@@ -47,8 +46,6 @@ function DynamicReceiptReviewPage({route}: DynamicReceiptReviewPageProps) {
 
     const [mergeTransaction, mergeTransactionMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
     const {targetTransaction, sourceTransaction, targetTransactionPolicy, sourceTransactionPolicy} = useMergeTransactions({mergeTransaction});
-    const targetReportOwnerAsAttendee = useReportOwnerAsAttendee(targetTransaction);
-    const sourceReportOwnerAsAttendee = useReportOwnerAsAttendee(sourceTransaction);
 
     const transactions = [targetTransaction, sourceTransaction].filter((transaction): transaction is Transaction => !!transaction);
 
@@ -69,8 +66,6 @@ function DynamicReceiptReviewPage({route}: DynamicReceiptReviewPageProps) {
             [],
             targetTransactionPolicy,
             sourceTransactionPolicy,
-            targetReportOwnerAsAttendee,
-            sourceReportOwnerAsAttendee,
         );
         if (!conflictFields.length) {
             // If there are no conflict fields, we should set mergeable data and navigate to the confirmation page
diff --git a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
index d09e9ac9a327..5953a67612c2 100644
--- a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
@@ -11,7 +11,6 @@ import useLocalize from '@hooks/useLocalize';
 import useMergeTransactions from '@hooks/useMergeTransactions';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useReportTransactions from '@hooks/useReportTransactions';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -64,7 +63,6 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
 
     const [session] = useOnyx(ONYXKEYS.SESSION);
-    const [personalDetails] = useAllPersonalDetails();
     const currentUserLogin = session?.email;
     const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
@@ -222,18 +220,10 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
         }
 
         const reports = targetTransactionReport && sourceTransactionReport ? [targetTransactionReport, sourceTransactionReport] : undefined;
-        setupMergeTransactionDataAndNavigate(
-            transactionID,
-            [targetTransaction, sourceTransaction],
-            localeCompare,
-            getCurrencyDecimals,
-            reports,
-            true,
-            undefined,
-            [targetTransactionPolicy, sourceTransactionPolicy],
-            session?.accountID,
-            personalDetails,
-        );
+        setupMergeTransactionDataAndNavigate(transactionID, [targetTransaction, sourceTransaction], localeCompare, getCurrencyDecimals, reports, true, undefined, [
+            targetTransactionPolicy,
+            sourceTransactionPolicy,
+        ]);
     };
 
     const confirmButtonOptions = {
diff --git a/tests/unit/MergeTransactionUtilsTest.ts b/tests/unit/MergeTransactionUtilsTest.ts
index d16e1dfdc493..fcab8dd3ab01 100644
--- a/tests/unit/MergeTransactionUtilsTest.ts
+++ b/tests/unit/MergeTransactionUtilsTest.ts
@@ -19,6 +19,7 @@ import {isFromCreditCardImport} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, ReportAction, SearchResults, Transaction} from '@src/types/onyx';
+import type {Attendee} from '@src/types/onyx/IOU';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
@@ -714,6 +715,93 @@ describe('MergeTransactionUtils', () => {
                 expect(result.conflictFields).toContain('attendees');
             });
 
+            describe('attendee combinations', () => {
+                const submitter = {
+                    email: 'submitter@example.com',
+                    displayName: 'Submitter',
+                    avatarUrl: '',
+                    login: 'submitter',
+                };
+                const alice = {
+                    email: 'alice@example.com',
+                    displayName: 'Alice',
+                    avatarUrl: '',
+                    login: 'alice',
+                };
+                const bob = {
+                    email: 'bob@example.com',
+                    displayName: 'Bob',
+                    avatarUrl: '',
+                    login: 'bob',
+                };
+
+                const merge = (targetAttendees: Attendee[], sourceAttendees: Attendee[]) => {
+                    const targetTransaction = {
+                        ...createRandomTransaction(0),
+                        comment: {
+                            ...createRandomTransaction(0).comment,
+                            attendees: targetAttendees,
+                        },
+                    };
+                    const sourceTransaction = {
+                        ...createRandomTransaction(1),
+                        comment: {
+                            ...createRandomTransaction(1).comment,
+                            attendees: sourceAttendees,
+                        },
+                    };
+                    return getMergeableDataAndConflictFields(targetTransaction, sourceTransaction, mockLocaleCompare, mockGetCurrencyDecimals);
+                };
+
+                it('should not conflict when neither expense has attendees', () => {
+                    const result = merge([], []);
+
+                    expect(result.conflictFields).not.toContain('attendees');
+                });
+
+                it('should keep the attendee when only the source expense has one', () => {
+                    const result = merge([], [submitter]);
+
+                    expect(result.conflictFields).not.toContain('attendees');
+                    expect(result.mergeableData).toMatchObject({
+                        attendees: [submitter],
+                    });
+                });
+
+                it('should keep the attendee when only the target expense has one', () => {
+                    const result = merge([submitter], []);
+
+                    expect(result.conflictFields).not.toContain('attendees');
+                    expect(result.mergeableData).toMatchObject({
+                        attendees: [submitter],
+                    });
+                });
+
+                it('should not conflict when both expenses have the same single attendee', () => {
+                    const result = merge([submitter], [submitter]);
+
+                    expect(result.conflictFields).not.toContain('attendees');
+                });
+
+                it('should conflict when the expenses have different single attendees', () => {
+                    const result = merge([alice], [bob]);
+
+                    expect(result.conflictFields).toContain('attendees');
+                });
+
+                it('should not conflict when both expenses have the same two attendees', () => {
+                    const result = merge([alice, bob], [bob, alice]);
+
+                    expect(result.conflictFields).not.toContain('attendees');
+                });
+
+                it('should conflict when one expense has two attendees and the other has a different one', () => {
+                    const result = merge([alice, bob], [submitter]);
+
+                    expect(result.conflictFields).toContain('attendees');
+                });
+            });
+
             it('should automatically merge login-only attendees', () => {
                 const targetTransaction = {
                     ...createRandomTransaction(0),
diff --git a/tests/unit/hooks/useSelectedTransactionsActions.test.ts b/tests/unit/hooks/useSelectedTransactionsActions.test.ts
index b3322fba72c2..a2a70babbfd9 100644
--- a/tests/unit/hooks/useSelectedTransactionsActions.test.ts
+++ b/tests/unit/hooks/useSelectedTransactionsActions.test.ts
@@ -1026,17 +1026,6 @@ describe('useSelectedTransactionsActions', () => {
 
         mergeOption?.onSelected?.();
 
-        expect(setupMergeTransactionDataAndNavigate).toHaveBeenCalledWith(
-            transaction.transactionID,
-            [transaction],
-            mockLocalCompare,
-            mockGetCurrencyDecimals,
-            [],
-            false,
-            false,
-            undefined,
-            CURRENT_USER_ACCOUNT_ID,
-            undefined,
-        );
+        expect(setupMergeTransactionDataAndNavigate).toHaveBeenCalledWith(transaction.transactionID, [transaction], mockLocalCompare, mockGetCurrencyDecimals, [], false, false, undefined);
     });
 });

From 0e6f0be71ff1498972e3bb6517909eb7e0457ea2 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Tue, 13 Oct 2026 16:18:50 +0200
Subject: [PATCH 561/781] parrot

---
 src/languages/de.ts      | 10 +++++-----
 src/languages/el.ts      | 12 ++++++------
 src/languages/es.ts      |  8 ++++----
 src/languages/fr.ts      | 28 ++++++++++++++--------------
 src/languages/it.ts      | 14 +++++++-------
 src/languages/ja.ts      | 14 +++++++-------
 src/languages/nl.ts      |  8 ++++----
 src/languages/pl.ts      | 16 ++++++++--------
 src/languages/pt-BR.ts   |  6 +++---
 src/languages/zh-hans.ts | 20 ++++++++++----------
 10 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 37c18e027817..2a1f9b25279d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7812,7 +7812,7 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
         },
         officeLocations: {
             title: 'Bürostandorte',
-            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern für Dinge wie die Entfernungserfassung zuzuweisen.',
+            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern für Dinge wie Entfernungserfassung zuzuweisen.',
             addOfficeLocation: 'Bürostandort hinzufügen',
             editOfficeLocation: 'Bürostandort bearbeiten',
             locationName: 'Standortname',
@@ -7820,9 +7820,9 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Bürostandort ${officeNumber}`,
             setAsPrimary: 'Als primär festlegen',
             primary: 'Primär',
-            deleteOfficeLocation: 'Standort löschen',
+            deleteOfficeLocation: 'Bürostandort löschen',
             deleteOfficeLocationConfirmation: 'Sind Sie sicher, dass Sie diesen Bürostandort löschen möchten?',
-            existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen existiert bereits',
+            existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen ist bereits vorhanden',
             setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptbüro festlegen?',
         },
         bankAccount: {
@@ -9653,11 +9653,11 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ zu verbotenen Ausgaben hinzugefügt`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ aus verbotenen Ausgaben entfernt`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ hinzugefügt (${address})`,
+            added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ (${address}) hinzugefügt`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `hat die Adresse des Bürostandorts „${name}“ in „${newAddress}“ geändert (zuvor „${oldAddress}“)`,
-            setAsPrimary: ({name}: {name: string}) => `Legen Sie den Bürostandort „${name}“ als primären fest`,
+            setAsPrimary: ({name}: {name: string}) => `setzen Sie den Bürostandort „${name}“ als primär`,
             setCompanyAddressAsPrimary: 'Firmenadresse als primär festlegen',
             removed: ({name}: {name: string}) => `hat den Bürostandort „${name}“ entfernt`,
         },
diff --git a/src/languages/el.ts b/src/languages/el.ts
index d4d16048a222..01675e13f7d2 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8112,8 +8112,8 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
         },
         officeLocations: {
             title: 'Τοποθεσίες γραφείων',
-            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αναθέτετε στα μέλη, για χρήσεις όπως η παρακολούθηση αποστάσεων.',
-            addOfficeLocation: 'Προσθέστε τοποθεσία γραφείου',
+            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αντιστοιχίζετε σε μέλη, π.χ. για την παρακολούθηση αποστάσεων.',
+            addOfficeLocation: 'Προσθήκη τοποθεσίας γραφείου',
             editOfficeLocation: 'Επεξεργασία τοποθεσίας γραφείου',
             locationName: 'Όνομα τοποθεσίας',
             locationNameHint: 'Επιλέξτε ένα ψευδώνυμο τοποθεσίας αν προσθέτετε πολλές τοποθεσίες γραφείων',
@@ -8123,7 +8123,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
             deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τοποθεσία γραφείου;',
             existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
-            setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η διεύθυνση της εταιρείας ως κύριο γραφείο;',
+            setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η εταιρική διεύθυνση ως κύριο γραφείο;',
         },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
@@ -9776,11 +9776,11 @@ ${reportName}`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `αφαιρέσατε το «${prohibitedExpense}» από τις απαγορευμένες δαπάνες`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `πρόσθεσε την τοποθεσία γραφείου «${name}» (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου "${oldName}" σε "${newName}"`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου «${oldName}» σε «${newName}»`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `άλλαξε τη διεύθυνση της τοποθεσίας γραφείου «${name}» σε «${newAddress}» (προηγουμένως «${oldAddress}»)`,
-            setAsPrimary: ({name}: {name: string}) => `ορισμός της τοποθεσίας γραφείου «${name}» ως κύριας`,
-            setCompanyAddressAsPrimary: 'ορίστε τη διεύθυνση της εταιρείας ως κύρια',
+            setAsPrimary: ({name}: {name: string}) => `ορίστε την τοποθεσία γραφείου «${name}» ως κύρια`,
+            setCompanyAddressAsPrimary: 'ορίστε την εταιρική διεύθυνση ως κύρια',
             removed: ({name}: {name: string}) => `αφαίρεσε την τοποθεσία γραφείου «${name}»`,
         },
         workArrangement: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b6967cfc6825..d4f890c9d509 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7835,10 +7835,10 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
         officeLocations: {
             title: 'Ubicaciones de oficinas',
             subtitle: 'Añade ubicaciones de oficina para asignarlas a miembros para cosas como el seguimiento de distancias.',
-            addOfficeLocation: 'Añadir ubicación de la oficina',
+            addOfficeLocation: 'Añade ubicación de oficina',
             editOfficeLocation: 'Editar ubicación de la oficina',
             locationName: 'Nombre de la ubicación',
-            locationNameHint: 'Elige un alias de ubicación si vas a añadir varias oficinas',
+            locationNameHint: 'Elige un nombre para la ubicación si estás añadiendo varias oficinas',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de la oficina ${officeNumber}`,
             setAsPrimary: 'Establecer como principal',
             primary: 'Principal',
@@ -9422,8 +9422,8 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}) => `añadió "${prohibitedExpense}" a los gastos prohibidos`,
         removedProhibitedExpense: ({prohibitedExpense}) => `eliminó "${prohibitedExpense}" de los gastos prohibidos`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `añadió la oficina "${name}" (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la oficina de "${oldName}" a "${newName}"`,
+            added: ({name, address}: {name: string; address: string}) => `añadió la ubicación de oficina «${name}» (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la ubicación de la oficina de "${oldName}" a "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `cambió la dirección de la oficina "${name}" a "${newAddress}" (previamente "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `establecer la ubicación de oficina "${name}" como principal`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index b704bc8631d2..cc9682be0706 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7833,18 +7833,18 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
         },
         officeLocations: {
             title: 'Sites de bureaux',
-            subtitle: 'Ajoutez des bureaux pour les assigner aux membres, par exemple pour le suivi des distances.',
-            addOfficeLocation: 'Ajouter un bureau',
-            editOfficeLocation: 'Modifier le lieu de travail',
+            subtitle: 'Ajoutez des bureaux à assigner aux membres pour des éléments comme le suivi des distances.',
+            addOfficeLocation: 'Ajouter un lieu de travail',
+            editOfficeLocation: 'Modifier l’emplacement du bureau',
             locationName: 'Nom du lieu',
-            locationNameHint: 'Choisissez un surnom pour l’emplacement si vous ajoutez plusieurs bureaux',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Emplacement de bureau ${officeNumber}`,
+            locationNameHint: 'Choisissez un nom personnalisé pour l’emplacement si vous ajoutez plusieurs bureaux',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Emplacement du bureau ${officeNumber}`,
             setAsPrimary: 'Définir comme principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Supprimer le site du bureau',
-            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ?',
-            existingOfficeLocationError: 'Un bureau portant ce nom existe déjà',
-            setCompanyAddressAsPrimaryConfirmation: "Définir l'adresse de l'entreprise comme bureau principal ?",
+            deleteOfficeLocation: 'Supprimer le bureau',
+            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ?',
+            existingOfficeLocationError: 'Un site de bureau portant ce nom existe déjà',
+            setCompanyAddressAsPrimaryConfirmation: "Définir l'adresse de l'entreprise comme bureau principal ?",
         },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
@@ -9675,12 +9675,12 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a ajouté « ${prohibitedExpense} » aux dépenses interdites`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a supprimé « ${prohibitedExpense} » des dépenses interdites`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de bureau « ${name} » (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le lieu de bureau « ${oldName} » en « ${newName} »`,
+            added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de bureau « ${name} » (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le bureau « ${oldName} » en « ${newName} »`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `a modifié l’adresse de l’emplacement de bureau « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
-            setAsPrimary: ({name}: {name: string}) => `définir l’emplacement de bureau « ${name} » comme principal`,
-            setCompanyAddressAsPrimary: 'définir l’adresse de l’entreprise comme principale',
+                `a modifié l’adresse de l’emplacement de bureau « ${name} » pour « ${newAddress} » (auparavant « ${oldAddress} »)`,
+            setAsPrimary: ({name}: {name: string}) => `définir le lieu de travail « ${name} » comme principal`,
+            setCompanyAddressAsPrimary: "définir l'adresse de l'entreprise comme principale",
             removed: ({name}: {name: string}) => `a supprimé le site "${name}"`,
         },
         workArrangement: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 85e08b1194df..2a80903f1b18 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7766,15 +7766,15 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             policy: 'Politica di spesa',
         },
         officeLocations: {
-            title: 'Sedi dell’ufficio',
-            subtitle: 'Aggiungi sedi degli uffici da assegnare ai membri per attività come il tracciamento delle distanze.',
+            title: 'Sedi degli uffici',
+            subtitle: 'Aggiungi sedi dell’ufficio da assegnare ai membri per attività come il tracciamento delle distanze.',
             addOfficeLocation: 'Aggiungi sede dell’ufficio',
             editOfficeLocation: 'Modifica sede ufficio',
             locationName: 'Nome località',
             locationNameHint: 'Scegli un nome abbreviato per la sede se stai aggiungendo più sedi di ufficio',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ${officeNumber}`,
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ufficio ${officeNumber}`,
             setAsPrimary: 'Imposta come principale',
-            primary: 'Principale',
+            primary: 'Primario',
             deleteOfficeLocation: 'Elimina sede ufficio',
             deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede?',
             existingOfficeLocationError: 'Esiste già una sede con questo nome',
@@ -9601,11 +9601,11 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha rimosso "${prohibitedExpense}" dalle spese vietate`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `ha aggiunto la sede "${name}" (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede dell’ufficio da "${oldName}" a "${newName}"`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede "${oldName}" in "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `ha modificato l’indirizzo della sede "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
+                `ha cambiato l'indirizzo della sede "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `imposta la sede "${name}" come principale`,
-            setCompanyAddressAsPrimary: 'imposta l’indirizzo dell’azienda come principale',
+            setCompanyAddressAsPrimary: 'imposta l’indirizzo aziendale come principale',
             removed: ({name}: {name: string}) => `ha rimosso la sede "${name}"`,
         },
         workArrangement: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 694055589725..fca099eac4a8 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7672,18 +7672,18 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
         },
         officeLocations: {
             title: 'オフィス所在地',
-            subtitle: 'オフィス所在地を追加して、距離の追跡などのためにメンバーに割り当てましょう。',
-            addOfficeLocation: 'オフィスの所在地を追加',
+            subtitle: 'オフィス所在地を追加して、距離の計測などのためにメンバーに割り当てましょう。',
+            addOfficeLocation: 'オフィス所在地を追加',
             editOfficeLocation: 'オフィス所在地を編集',
             locationName: '場所名',
             locationNameHint: '複数のオフィス所在地を追加する場合は、場所のニックネームを選択してください',
             defaultName: ({officeNumber}: {officeNumber: number}) => `オフィス所在地 ${officeNumber}`,
-            setAsPrimary: 'メインに設定',
+            setAsPrimary: '主要に設定',
             primary: 'メイン',
             deleteOfficeLocation: 'オフィス所在地を削除',
             deleteOfficeLocationConfirmation: 'このオフィス所在地を削除してもよろしいですか？',
             existingOfficeLocationError: 'この名前のオフィス所在地はすでに存在します',
-            setCompanyAddressAsPrimaryConfirmation: '会社住所を主なオフィスとして設定しますか？',
+            setCompanyAddressAsPrimaryConfirmation: '会社の住所を主なオフィスとして設定しますか？',
         },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
@@ -9468,9 +9468,9 @@ ${reportName}`,
             added: ({name, address}: {name: string; address: string}) => `オフィス所在地「${name}」（${address}）を追加しました`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `オフィス所在地名を「${oldName}」から「${newName}」に変更しました`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `オフィス所在地「${name}」の住所を「${newAddress}」に変更しました（以前の住所：「${oldAddress}」）`,
-            setAsPrimary: ({name}: {name: string}) => `オフィス所在地「${name}」を主所在地に設定します`,
-            setCompanyAddressAsPrimary: '会社の住所を主に設定する',
+                `オフィス拠点「${name}」の住所を「${newAddress}」に変更しました（以前の住所：「${oldAddress}」）`,
+            setAsPrimary: ({name}: {name: string}) => `オフィス所在地「${name}」を主な拠点に設定します`,
+            setCompanyAddressAsPrimary: '会社住所を主住所として設定する',
             removed: ({name}: {name: string}) => `オフィス所在地「${name}」を削除しました`,
         },
         workArrangement: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c288eb493c06..ee89ccc57a4c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7749,16 +7749,16 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             title: 'Kantoorlocaties',
             subtitle: 'Voeg kantoorlocaties toe om aan leden toe te wijzen voor zaken als afstandsregistratie.',
             addOfficeLocation: 'Kantoorlocatie toevoegen',
-            editOfficeLocation: 'Kantoorlocatie bewerken',
+            editOfficeLocation: 'Kantoorlokatie bewerken',
             locationName: 'Locatienaam',
             locationNameHint: 'Kies een locatiebijnaam als je meerdere kantoorlocaties toevoegt',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Kantoorlocatie ${officeNumber}`,
             setAsPrimary: 'Instellen als primair',
             primary: 'Primair',
-            deleteOfficeLocation: 'Kantoorlocatie verwijderen',
+            deleteOfficeLocation: 'Locatie kantoor verwijderen',
             deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
             existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
-            setCompanyAddressAsPrimaryConfirmation: 'Het bedrijfsadres als hoofdvestiging instellen?',
+            setCompanyAddressAsPrimaryConfirmation: 'Het bedrijfsadres instellen als hoofdvestiging?',
         },
         bankAccount: {
             continueWithSetup: 'Setup voortzetten',
@@ -9574,7 +9574,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             added: ({name, address}: {name: string; address: string}) => `heeft de kantoorlocatie "${name}" (${address}) toegevoegd`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlocatie “${oldName}” hernoemd naar “${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `heeft het adres van de kantoorlocatie „${name}” gewijzigd naar „${newAddress}” (voorheen „${oldAddress}”)`,
+                `heeft het adres van de kantoorlocatie ‘${name}’ gewijzigd in ‘${newAddress}’ (voorheen ‘${oldAddress}’)`,
             setAsPrimary: ({name}: {name: string}) => `stel de kantoorlocatie ‘${name}’ in als primair`,
             setCompanyAddressAsPrimary: 'stel het bedrijfsadres in als primair',
             removed: ({name}: {name: string}) => `heeft de kantoorlocatie "${name}" verwijderd`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 771d7af06e39..22450bd66bf6 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7771,14 +7771,14 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
         },
         officeLocations: {
             title: 'Lokalizacje biur',
-            subtitle: 'Dodaj lokalizacje biur, aby przypisywać je członkom na potrzeby m.in. śledzenia dystansu.',
-            addOfficeLocation: 'Dodaj siedzibę biura',
+            subtitle: 'Dodaj lokalizacje biur, żeby przypisywać je członkom, na przykład do śledzenia odległości.',
+            addOfficeLocation: 'Dodaj lokalizację biura',
             editOfficeLocation: 'Edytuj lokalizację biura',
             locationName: 'Nazwa lokalizacji',
             locationNameHint: 'Wybierz nazwę lokalizacji, jeśli dodajesz wiele biur',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Lokalizacja biura ${officeNumber}`,
             setAsPrimary: 'Ustaw jako główny',
-            primary: 'Główny',
+            primary: 'Podstawowe',
             deleteOfficeLocation: 'Usuń lokalizację biura',
             deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
             existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
@@ -9583,13 +9583,13 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `dodano „${prohibitedExpense}” do zabronionych wydatków`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `usunięto „${prohibitedExpense}” z wydatków zabronionych`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `dodał(a) lokalizację biura „${name}” (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmienił nazwę lokalizacji biura „${oldName}” na „${newName}”`,
+            added: ({name, address}: {name: string; address: string}) => `dodał(-a) lokalizację biura „${name}” (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmienił(a) nazwę lokalizacji biura z „${oldName}” na „${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `zmienił(a) adres lokalizacji biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
-            setAsPrimary: ({name}: {name: string}) => `ustaw główną lokalizację biura „${name}”`,
+                `zmienił adres biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
+            setAsPrimary: ({name}: {name: string}) => `ustaw lokalizację biura „${name}” jako główną`,
             setCompanyAddressAsPrimary: 'ustaw adres firmy jako główny',
-            removed: ({name}: {name: string}) => `usunął lokalizację biura „${name}”`,
+            removed: ({name}: {name: string}) => `usunął(-ę) lokalizację biura „${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `ustaw domyślny tryb pracy na ${arrangement}`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 69348635373f..85ad99731b4e 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7761,7 +7761,7 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             setAsPrimary: 'Definir como principal',
             primary: 'Principal',
             deleteOfficeLocation: 'Excluir local do escritório',
-            deleteOfficeLocationConfirmation: 'Tem certeza de que quer excluir este endereço do escritório?',
+            deleteOfficeLocationConfirmation: 'Tem certeza de que quer excluir este escritório?',
             existingOfficeLocationError: 'Já existe um local de escritório com esse nome',
             setCompanyAddressAsPrimaryConfirmation: 'Definir o endereço da empresa como escritório principal?',
         },
@@ -9569,10 +9569,10 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `adicionou "${prohibitedExpense}" às despesas proibidas`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removeu "${prohibitedExpense}" das despesas proibidas`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `adicionou o local do escritório "${name}" (${address})`,
+            added: ({name, address}: {name: string; address: string}) => `adicionou o local de escritório "${name}" (${address})`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renomeou o local do escritório de "${oldName}" para "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `alterou o endereço da unidade "${name}" para "${newAddress}" (anteriormente "${oldAddress}")`,
+                `alterou o endereço da filial "${name}" para "${newAddress}" (anteriormente "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `definir o local do escritório "${name}" como principal`,
             setCompanyAddressAsPrimary: 'definir o endereço da empresa como principal',
             removed: ({name}: {name: string}) => `removeu o local do escritório "${name}"`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index e74ea6d88b78..75c08ddcab9b 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7481,18 +7481,18 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
         },
         officeLocations: {
             title: '办公地点',
-            subtitle: '添加办公地点，以便将其分配给成员用于里程跟踪等用途。',
+            subtitle: '添加办公地点，并将其分配给成员，用于距离追踪等用途。',
             addOfficeLocation: '添加办公地点',
-            editOfficeLocation: '编辑办公地点',
-            locationName: '地点名称',
-            locationNameHint: '如果要添加多个办公地点，请为此地点选择一个昵称',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `办公室地点 ${officeNumber}`,
+            editOfficeLocation: '编辑办公室地点',
+            locationName: '位置名称',
+            locationNameHint: '如果你要添加多个办公地点，请为此地点选择一个昵称',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `办公室位置 ${officeNumber}`,
             setAsPrimary: '设为主要',
             primary: '主要',
             deleteOfficeLocation: '删除办公地点',
-            deleteOfficeLocationConfirmation: '确定要删除此办公地点吗？',
+            deleteOfficeLocationConfirmation: '确定要删除此办公室地点吗？',
             existingOfficeLocationError: '已存在同名的办公地点',
-            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公室地址？',
+            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公地点？',
         },
         bankAccount: {
             continueWithSetup: '继续设置',
@@ -9214,13 +9214,13 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已将“${prohibitedExpense}”添加到禁止报销的费用中`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已从禁用报销类别中移除“${prohibitedExpense}”`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `已添加办公室地点“${name}”（${address}）`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点从“${oldName}”重命名为“${newName}”`,
+            added: ({name, address}: {name: string; address: string}) => `已添加办公地点“${name}” (${address})`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点“${oldName}”重命名为“${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
             setAsPrimary: ({name}: {name: string}) => `将办公地点“${name}”设为主要地点`,
             setCompanyAddressAsPrimary: '将公司地址设为主要地址',
-            removed: ({name}: {name: string}) => `已移除办公室地点“${name}”`,
+            removed: ({name}: {name: string}) => `已移除办公地点“${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `将默认工作安排设置为 ${arrangement}`,

From e6460e18b0b801beb2126b4ba0b10fe63e51399e Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Tue, 13 Oct 2026 16:21:38 +0200
Subject: [PATCH 562/781] fix: shrink the grip and move it to the left

---
 src/CONST/index.ts                            |  6 ++--
 .../columnResize/ColumnResizeHandle/index.tsx | 36 ++++++++++++-------
 .../columnResize/useColumnResize/index.ts     |  8 ++---
 .../columnResize/useColumnResize/types.ts     |  2 +-
 .../useColumnResize/useResizeIndicator.ts     |  7 ++--
 src/styles/index.ts                           |  4 ---
 .../components/Table/useColumnResizeTest.ts   |  6 ++--
 7 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 495f63f1ac12..06324df0479b 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9530,12 +9530,12 @@ const CONST = {
             /** Narrowest drag width. Low enough to hide most content, but wide enough to keep the column's edge reachable. */
             MIN_WIDTH: 48,
 
-            /** Width of the invisible drag strip centred on a column's edge. */
-            HANDLE_HIT_WIDTH: 12,
-
             /** Width of the line shown while a column's edge is dragged, and of the grip shown while its heading is hovered. */
             INDICATOR_WIDTH: 2,
 
+            /** Share of the heading's height the grip spans, centred vertically. */
+            GRIP_HEIGHT_RATIO: 0.8,
+
             /** How long, in ms, the grip takes to stretch into the line once its edge is pressed. */
             INDICATOR_MORPH_DURATION: 150,
         },
diff --git a/src/components/Table/columnResize/ColumnResizeHandle/index.tsx b/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
index 43579f19ef88..f9625332a3c6 100644
--- a/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
+++ b/src/components/Table/columnResize/ColumnResizeHandle/index.tsx
@@ -1,3 +1,4 @@
+import Hoverable from '@components/Hoverable';
 import {
     RESIZE_GRIP_HOVER_VARIABLE,
     RESIZE_INDICATOR_DATA_ATTRIBUTE,
@@ -8,6 +9,7 @@ import {
 import type {ColumnResizeHandleProps} from '@components/Table/columnResize/types';
 import {useTableContext} from '@components/Table/TableContext';
 
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
@@ -15,15 +17,17 @@ import CONST from '@src/CONST';
 import React from 'react';
 
 // DOM `div` styles, which the React Native style system can't type because of the custom property expressions.
-// The handle centres both bars on the column edge.
+// Both bars sit at the handle's left, which is flush against the column's edge.
 const BAR_STYLE: React.CSSProperties = {
     position: 'absolute',
+    left: 0,
     width: CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH,
 };
 
 const GRIP_STYLE: React.CSSProperties = {
     ...BAR_STYLE,
-    height: '100%',
+    top: `${((1 - CONST.TABLES.COLUMN_RESIZE.GRIP_HEIGHT_RATIO) / 2) * 100}%`,
+    height: `${CONST.TABLES.COLUMN_RESIZE.GRIP_HEIGHT_RATIO * 100}%`,
     borderRadius: CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH / 2,
     // Hidden while the line shows, since the line grew out of it.
     opacity: `calc(var(${RESIZE_GRIP_HOVER_VARIABLE}, 0) * (1 - var(${RESIZE_INDICATOR_OPACITY_VARIABLE}, 0)))`,
@@ -45,6 +49,7 @@ const INDICATOR_STYLE: React.CSSProperties = {
  * A plain `div` because it relies on DOM pointer capture.
  */
 function ColumnResizeHandle({columnKey}: ColumnResizeHandleProps) {
+    const theme = useTheme();
     const styles = useThemeStyles();
     const {columnResize} = useTableContext();
     const handleProps = columnResize?.getHandleProps(columnKey);
@@ -54,17 +59,22 @@ function ColumnResizeHandle({columnKey}: ColumnResizeHandleProps) {
     }
 
     return (
-        <div {...handleProps}>
-            <div
-                aria-hidden
-                style={{...GRIP_STYLE, ...styles.tableColumnResizeGrip}}
-            />
-            <div
-                aria-hidden
-                {...{[RESIZE_INDICATOR_DATA_ATTRIBUTE]: true}}
-                style={{...INDICATOR_STYLE, ...styles.tableColumnResizeIndicator}}
-            />
-        </div>
+        <Hoverable>
+            {(isHovered) => (
+                <div {...handleProps}>
+                    <div
+                        aria-hidden
+                        // Takes the line's color while the handle itself is hovered, hinting that pressing grows it into the line.
+                        style={{...GRIP_STYLE, backgroundColor: isHovered ? theme.iconMenu : theme.border}}
+                    />
+                    <div
+                        aria-hidden
+                        {...{[RESIZE_INDICATOR_DATA_ATTRIBUTE]: true}}
+                        style={{...INDICATOR_STYLE, ...styles.tableColumnResizeIndicator}}
+                    />
+                </div>
+            )}
+        </Hoverable>
     );
 }
 
diff --git a/src/components/Table/columnResize/useColumnResize/index.ts b/src/components/Table/columnResize/useColumnResize/index.ts
index 70875ab161c5..0742b265f914 100644
--- a/src/components/Table/columnResize/useColumnResize/index.ts
+++ b/src/components/Table/columnResize/useColumnResize/index.ts
@@ -25,11 +25,9 @@ function getHandleStyle(columnGap: number): React.CSSProperties {
         position: 'absolute',
         top: 0,
         bottom: 0,
-        right: -(columnGap / 2 + CONST.TABLES.COLUMN_RESIZE.HANDLE_HIT_WIDTH / 2),
-        width: CONST.TABLES.COLUMN_RESIZE.HANDLE_HIT_WIDTH,
-        // Centres the grip and the line on the column edge.
-        display: 'flex',
-        justifyContent: 'center',
+        // Spans the gap to the next column, with the grip and the line flush against this column's edge, so they read as part of the column being resized.
+        right: -columnGap,
+        width: columnGap + CONST.TABLES.COLUMN_RESIZE.INDICATOR_WIDTH,
         // Otherwise a touch drag on the handle is taken over by the table's own horizontal scrolling.
         touchAction: 'none',
     };
diff --git a/src/components/Table/columnResize/useColumnResize/types.ts b/src/components/Table/columnResize/useColumnResize/types.ts
index 34f47a7214d9..e7634cfdc34a 100644
--- a/src/components/Table/columnResize/useColumnResize/types.ts
+++ b/src/components/Table/columnResize/useColumnResize/types.ts
@@ -13,7 +13,7 @@ type UseColumnResizeParams = {
     /** The narrowest width a drag may take a column to, for columns tighter than the default drag bound. */
     dragMinWidths?: Record<string, number>;
 
-    /** Gap between columns, so handles can be centred in it. */
+    /** Gap between columns, which handles span. */
     columnGap: number;
 };
 
diff --git a/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts b/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
index f7063215b91e..4648e82fdd9e 100644
--- a/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
+++ b/src/components/Table/columnResize/useColumnResize/useResizeIndicator.ts
@@ -46,9 +46,10 @@ function drawIndicatorAtHandle(scopeElement: HTMLElement | null, handleElement:
     handleElement.style.setProperty(RESIZE_INDICATOR_HEIGHT_VARIABLE, `${lowestRowBottom - headerRowTop}px`);
     handleElement.style.setProperty(RESIZE_INDICATOR_OPACITY_VARIABLE, INDICATOR_OPACITY.VISIBLE);
 
-    // Starts clipped to the handle's box, which the grip fills, so the grip reads as stretching into the line.
-    const gripTop = handleRect.top - headerRowTop;
-    const gripBottom = lowestRowBottom - handleRect.bottom;
+    // Starts clipped to the grip, so the grip reads as stretching into the line.
+    const gripInset = (handleRect.height * (1 - CONST.TABLES.COLUMN_RESIZE.GRIP_HEIGHT_RATIO)) / 2;
+    const gripTop = handleRect.top + gripInset - headerRowTop;
+    const gripBottom = lowestRowBottom - handleRect.bottom + gripInset;
     handleElement.querySelector<HTMLElement>(`[${RESIZE_INDICATOR_DATA_ATTRIBUTE}]`)?.animate([{clipPath: `inset(${gripTop}px 0 ${gripBottom}px 0)`}, {clipPath: 'inset(0 0 0 0)'}], {
         duration: CONST.TABLES.COLUMN_RESIZE.INDICATOR_MORPH_DURATION,
         easing: 'ease-out',
diff --git a/src/styles/index.ts b/src/styles/index.ts
index adf96e05af24..b92f7fdcf24d 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -2817,10 +2817,6 @@ const staticStyles = (theme: ThemeColors) =>
             borderColor: 'transparent',
         },
 
-        tableColumnResizeGrip: {
-            backgroundColor: theme.border,
-        },
-
         tableColumnResizeIndicator: {
             backgroundColor: theme.iconMenu,
         },
diff --git a/tests/unit/components/Table/useColumnResizeTest.ts b/tests/unit/components/Table/useColumnResizeTest.ts
index 9c97e13f6cb2..7d72541db0b0 100644
--- a/tests/unit/components/Table/useColumnResizeTest.ts
+++ b/tests/unit/components/Table/useColumnResizeTest.ts
@@ -42,13 +42,13 @@ function renderColumnResize(params?: Partial<UseColumnResizeParams>) {
 
     scopeElement.appendChild(headingElement);
     headingElement.appendChild(handleElement);
-    // jsdom has no layout: a 200x40 heading whose handle overhangs its right edge by 6px.
+    // jsdom has no layout: a 200x40 heading whose handle starts 2px inside its right edge and spans the 12px gap past it.
     document.elementFromPoint = (x, y) => {
-        if (y > 40 || x > 206) {
+        if (y > 40 || x > 212) {
             return document.body;
         }
 
-        return x > 194 ? handleElement : headingElement;
+        return x > 198 ? handleElement : headingElement;
     };
     // jsdom has no pointer capture.
     const setPointerCapture = jest.fn();

From 70eb4fc0a809198cb6bb17b83d54299978ba67a1 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 16:22:22 +0200
Subject: [PATCH 563/781] Use flatMap in getConfirmationItems

---
 .../DynamicForm/utils/getConfirmationItems.ts | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index e6cbc7ea1b7e..a1d2f74782c0 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -4,6 +4,8 @@ import type {SummaryGroup} from '@components/SubStepForms/ConfirmationStep';
 
 import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
 
+import noop from 'lodash/noop';
+
 import formatDynamicFieldValue from './formatDynamicFieldValue';
 import getContentFields from './getContentFields';
 import {getFieldLabel} from './getLocalizedText';
@@ -21,25 +23,39 @@ function getConfirmationItems(
     translate: LocalizedTranslate,
     onEditPage: (pageIndex: number) => void,
 ): SummaryGroup[] {
-    return pages
-        .map((page, pageIndex) => ({page, pageIndex}))
-        .filter(({page}) => isPageShown(page, values, allFields))
-        .map(({page, pageIndex}) => ({
-            id: page.key,
-            name: getPageTitle(page, values, translate, allFields),
-            rows: getVisibleFields(getContentFields(page.content).filter(isSupportedField), values, allFields).map((field) => {
-                const answer = formatDynamicFieldValue(field, values, translate);
-                return {
-                    id: field.key,
-                    description: getFieldLabel(field, translate),
-                    title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
-                    shouldShowRightIcon: !field.readonly,
-                    onPress: field.readonly ? () => {} : () => onEditPage(pageIndex),
-                    interactive: !field.readonly,
-                };
-            }),
-        }))
-        .filter((section) => section.rows.length > 0);
+    return pages.flatMap((page, pageIndex): SummaryGroup[] => {
+        if (!isPageShown(page, values, allFields)) {
+            return [];
+        }
+
+        const fields = getVisibleFields(getContentFields(page.content).filter(isSupportedField), values, allFields);
+
+        if (fields.length === 0) {
+            return [];
+        }
+
+        const handleEdit = () => onEditPage(pageIndex);
+
+        return [
+            {
+                id: page.key,
+                name: getPageTitle(page, values, translate, allFields),
+                rows: fields.map((field) => {
+                    const answer = formatDynamicFieldValue(field, values, translate);
+                    const isEditable = !field.readonly;
+
+                    return {
+                        id: field.key,
+                        description: getFieldLabel(field, translate),
+                        title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
+                        shouldShowRightIcon: isEditable,
+                        onPress: isEditable ? handleEdit : noop,
+                        interactive: isEditable,
+                    };
+                }),
+            },
+        ];
+    });
 }
 
 export default getConfirmationItems;

From b093b9a47bac488ec84b68520eca9e4cc453b996 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 16:31:28 +0200
Subject: [PATCH 564/781] Treat null as no draft answer and document
 ConfirmationStep summary types

---
 src/components/DynamicForm/index.tsx            |  3 ++-
 .../SubStepForms/ConfirmationStep.tsx           | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index e5110ba9da6f..db49583655f3 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -32,7 +32,7 @@ import toDynamicFormValues from './utils/toDynamicFormValues';
 
 /** An answer the user gave, including `false`, which counts as progress when deciding where a visit resumes */
 function hasDraftAnswer(answer: DynamicFormValues[string]): boolean {
-    return answer !== undefined && answer !== '' && !(Array.isArray(answer) && answer.length === 0);
+    return answer !== undefined && answer !== null && answer !== '' && !(Array.isArray(answer) && answer.length === 0);
 }
 
 /** A whole dynamic form: one page per schema page, skipping pages with nothing to ask, then a confirmation page */
@@ -156,6 +156,7 @@ function DynamicFormFlow({
     const nextShownPageName = pageNames.find((pageName, index) => index > pageIndex && !skipPages.includes(pageName));
     const previousShownPageName = pageNames.findLast((pageName, index) => index < pageIndex && !skipPages.includes(pageName));
     const unavailablePageTarget = isOnSkippedPage ? (nextShownPageName ?? previousShownPageName) : subPages.at(startFrom)?.pageName;
+
     useEffect(() => {
         if (!isOnUnavailablePage || !unavailablePageTarget) {
             return;
diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index a2c5b48aab66..b2a408b6b4f6 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -19,16 +19,31 @@ import CONST from '@src/CONST';
 import {View} from 'react-native';
 
 type SummaryItem = {
+    /** Unique key of the row */
     id: string;
+
+    /** The label shown above the answer */
     description: string;
+
+    /** The answer shown in the row */
     title: string;
+
+    /** Whether the chevron is shown on the right of the row */
     shouldShowRightIcon: boolean;
+
+    /** Called when the row is pressed */
     onPress: () => void;
 
     /** False for a row that opens nothing, so it is not announced as a button. Defaults to true. */
     interactive?: boolean;
+
+    /** The brick road indicator shown on the row */
     brickRoadIndicator?: BrickRoad;
+
+    /** The error shown under the row */
     errorText?: string;
+
+    /** The test ID of the row */
     testID?: string;
 };
 
@@ -37,11 +52,13 @@ type SummaryGroupRow = SummaryItem;
 
 /** Answers under one heading. Used instead of `summaryItems` when the confirmation is split by section. */
 type SummaryGroup = {
+    /** Unique key of the group */
     id: string;
 
     /** The heading, left out when empty */
     name: string;
 
+    /** The rows listed under the heading */
     rows: SummaryGroupRow[];
 };
 

From c532f1d1f9b1451e3bd8d9c5cbafd64348551f67 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 13 Oct 2026 16:42:39 +0200
Subject: [PATCH 565/781] Mark DynamicForm page and confirmation titles as
 headings

---
 .../DynamicForm/components/DynamicFormFields.tsx     |  2 +-
 .../DynamicForm/components/DynamicFormFieldsPage.tsx | 12 ++++++++++--
 src/components/SubStepForms/ConfirmationStep.tsx     |  9 ++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index 8651e3398b50..4f237e25865b 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -22,7 +22,7 @@ type DynamicFormFieldsProps = {
     /** The whole form when `content` is one page of it, since a field's `showWhen` can name a controller on another page */
     allFields?: DynamicFormField[];
 
-    /** The page's title already names its only question, so that question's label is not drawn again above its input */
+    /** The page's title is that question's label, so the label is not drawn again above its input. False when the page has its own title, since the label then still says what the inputs are for. */
     isTitledByPage?: boolean;
 
     /** Currency of amount fields that let the user pick none */
diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
index fda313e467a3..4b0cd5549e65 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -57,15 +57,23 @@ function DynamicFormFieldsPage({
             {({inputValues}) => {
                 const currentValues = withInputValues(inputValues);
                 const title = getPageTitle(page, currentValues, translate, allFields);
+                const hasOwnTitle = !!getLocalizedText(translate, page.titleKey, page.title);
                 const description = getLocalizedText(translate, page.descriptionKey, page.description);
                 return (
                     <>
-                        {!!title && <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{title}</Text>}
+                        {!!title && (
+                            <Text
+                                style={[styles.textHeadlineLineHeightXXL, styles.mb3]}
+                                accessibilityRole={CONST.ROLE.HEADER}
+                            >
+                                {title}
+                            </Text>
+                        )}
                         {!!description && <Text style={[styles.textSupporting, styles.mb3]}>{description}</Text>}
                         <DynamicFormFields
                             content={page.content}
                             allFields={allFields}
-                            isTitledByPage
+                            isTitledByPage={!hasOwnTitle}
                             values={currentValues}
                             currency={currency}
                             maxFileSize={maxFileSize}
diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index b2a408b6b4f6..c5de26d7c618 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -125,7 +125,14 @@ function ConfirmationStep({
             {groups.map((group, index) => (
                 <View key={group.id}>
                     {index > 0 && <View style={[styles.mh5, styles.mt3, styles.borderBottom]} />}
-                    {!!group.name && <Text style={[styles.textNormalThemeText, styles.textLineHeightNormal, styles.textStrong, styles.ph5, styles.mt4, styles.mb1]}>{group.name}</Text>}
+                    {!!group.name && (
+                        <Text
+                            style={[styles.textNormalThemeText, styles.textLineHeightNormal, styles.textStrong, styles.ph5, styles.mt4, styles.mb1]}
+                            accessibilityRole={CONST.ROLE.HEADER}
+                        >
+                            {group.name}
+                        </Text>
+                    )}
                     {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
                         <MenuItemWithTopDescription
                             key={id}

From b6d528d6cb859ae78030eefb3c018fcb2461324f Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 16:43:33 +0200
Subject: [PATCH 566/781] Show chart tooltips on tap in the Home Insights card

---
 src/components/Charts/PieChart/PieChartContent.tsx       | 2 +-
 src/components/Charts/hooks/useChartInteractions.ts      | 9 ++++++---
 .../home/InsightsSection/InsightsSectionContent.tsx      | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 6bf3d3520edc..4b53b71f2fbe 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -191,7 +191,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
             });
 
     // Combined gestures - Race allows both hover and tap to work independently
-    const combinedGesture = onSlicePress ? Gesture.Race(hoverGesture(), tapGesture()) : hoverGesture();
+    const combinedGesture = Gesture.Race(hoverGesture(), tapGesture());
 
     const renderLegendItem = (slice: PieSlice) => {
         return (
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index a8d81c877bee..0c3a410c9c7c 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -103,7 +103,7 @@ type UseChartInteractionsProps = {
     /** Scale applied to the rendered chart container */
     coordinateScale?: number;
 
-    /** Whether a touch tap pins the tooltip instead of calling handlePress */
+    /** Whether a touch tap shows the tooltip for the tapped data point */
     shouldPinTooltipOnTouch?: boolean;
 };
 
@@ -425,7 +425,7 @@ function useChartInteractions({
      * Tap gesture. Resolves the nearest data point entirely on the UI thread.
      * Touch taps show the tooltip; other pointers schedule onPress on the JS thread if the cursor is over the target.
      */
-    const tapGesture = (onPress: (index: number) => void) =>
+    const tapGesture = (onPress?: (index: number) => void) =>
         Gesture.Tap()
             // A touch on this chart that turns into a scroll leaves the pinned tooltip to the chart, so the chart hides it
             .onFinalize((e, success) => {
@@ -447,6 +447,9 @@ function useChartInteractions({
                     handleTouchTap(cursorX, cursorY);
                     return;
                 }
+                if (!onPress) {
+                    return;
+                }
                 const ox = pointOX.get();
                 const oy = pointOY.get();
                 const idx = getResolvedTargetIndex(cursorX, cursorY, cursorX);
@@ -490,7 +493,7 @@ function useChartInteractions({
         y: chartInteractionState.y.y.position.get(),
     }));
 
-    const customGestures = handlePress ? Gesture.Race(hoverGesture(), tapGesture(handlePress)) : hoverGesture();
+    const customGestures = handlePress || shouldPinTooltipOnTouch ? Gesture.Race(hoverGesture(), tapGesture(handlePress)) : hoverGesture();
 
     return {
         /** Custom gestures to be passed to CartesianChart */
diff --git a/src/pages/home/InsightsSection/InsightsSectionContent.tsx b/src/pages/home/InsightsSection/InsightsSectionContent.tsx
index cb6a346e5c2e..9dbaeec3fa45 100644
--- a/src/pages/home/InsightsSection/InsightsSectionContent.tsx
+++ b/src/pages/home/InsightsSection/InsightsSectionContent.tsx
@@ -15,6 +15,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {setNameValuePair} from '@libs/actions/User';
+import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
 import {INSIGHTS_CHART_STATE} from '@libs/resolveInsightsChartData';
 import type {SearchKey} from '@libs/SearchKeyUtils';
@@ -108,7 +109,7 @@ function InsightsSectionContent() {
         </WidgetContainer>
     );
 
-    if (!isInsightsPageEnabled) {
+    if (!isInsightsPageEnabled || canUseTouchScreen()) {
         return widget;
     }
 

From ffa27646ad1d22385cc32bacfc66e3dd88534971 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 13 Oct 2026 16:43:42 +0200
Subject: [PATCH 567/781] fix: Spend footer sits above the tab bar, with the
 offline indicator above it

---
 .../useTabBarCoveredHeight/index.android.ts   |  6 +++++
 .../useTabBarCoveredHeight/index.ios.ts       | 14 +++++++++++
 .../useTabBarCoveredHeight/index.ts           | 12 +++++++++
 .../index.ios.tsx                             |  8 +++---
 .../useTabRootScreenWrapperProps/index.tsx    |  6 ++---
 .../Search/SearchSelectionFooter.tsx          | 25 ++++++++++++-------
 src/pages/Search/SearchPageNarrow/index.tsx   | 13 ++++++++--
 src/styles/index.ts                           |  8 ++++++
 8 files changed, 73 insertions(+), 19 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.android.ts
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ios.ts
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts

diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.android.ts b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.android.ts
new file mode 100644
index 000000000000..d51c8db39122
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.android.ts
@@ -0,0 +1,6 @@
+/** A tab root screen reserves the row of Material's bar below its content, so the bar covers none of it. */
+function useTabBarCoveredHeight(): number {
+    return 0;
+}
+
+export default useTabBarCoveredHeight;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ios.ts b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ios.ts
new file mode 100644
index 000000000000..0293d6c6fd11
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ios.ts
@@ -0,0 +1,14 @@
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+
+import {getFloatingButtonsBottom} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions';
+
+/** The translucent UITabBar and the home indicator inset under it cover the bottom of a narrow tab root screen. */
+function useTabBarCoveredHeight(): number {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {bottom: bottomInset} = useSafeAreaInsets();
+
+    return shouldUseNarrowLayout ? getFloatingButtonsBottom(bottomInset) : 0;
+}
+
+export default useTabBarCoveredHeight;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts
new file mode 100644
index 000000000000..1c05afaa8f8e
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts
@@ -0,0 +1,12 @@
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+
+import variables from '@styles/variables';
+
+/** The floating tab bar and the gap under it cover the bottom of a narrow tab root screen. */
+function useTabBarCoveredHeight(): number {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    return shouldUseNarrowLayout ? variables.floatingTabBarHeight + variables.floatingTabBarBottomInset : 0;
+}
+
+export default useTabBarCoveredHeight;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 00599a26b54b..1f4249c73266 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -1,13 +1,11 @@
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+import useTabBarCoveredHeight from '@components/Navigation/TabBarBottomContent/useTabBarCoveredHeight';
 
 import useIsSettingsDrawnOverTabs from '@hooks/useIsSettingsDrawnOverTabs';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getFloatingButtonsBottom} from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions';
-
 import type TabRootScreenWrapperProps from './types';
 
 /**
@@ -20,7 +18,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isSettingsDrawnOverTabs = useIsSettingsDrawnOverTabs();
     const styles = useThemeStyles();
-    const {bottom: bottomInset} = useSafeAreaInsets();
+    const tabBarCoveredHeight = useTabBarCoveredHeight();
 
     if (!shouldUseNarrowLayout || (selectedTab === NAVIGATION_TABS.SETTINGS && isSettingsDrawnOverTabs)) {
         return {};
@@ -28,7 +26,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
 
     return {
         enableEdgeToEdgeBottomSafeAreaPadding: false,
-        offlineIndicatorStyle: styles.nativeTabBarOfflineIndicator(getFloatingButtonsBottom(bottomInset)),
+        offlineIndicatorStyle: styles.nativeTabBarOfflineIndicator(tabBarCoveredHeight),
     };
 }
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index c2acf741d829..009834598c06 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -1,10 +1,9 @@
 import type TabBarBottomContentProps from '@components/Navigation/TabBarBottomContent/types';
+import useTabBarCoveredHeight from '@components/Navigation/TabBarBottomContent/useTabBarCoveredHeight';
 
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import variables from '@styles/variables';
-
 import React from 'react';
 
 import type TabRootScreenWrapperProps from './types';
@@ -18,11 +17,12 @@ import TabBarBottomContent from '..';
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
+    const tabBarCoveredHeight = useTabBarCoveredHeight();
 
     return {
         bottomContent: <TabBarBottomContent selectedTab={selectedTab} />,
         bottomContentStyle: shouldUseNarrowLayout ? [styles.stickToBottom, styles.overflowVisible] : styles.overflowVisible,
-        offlineIndicatorStyle: shouldUseNarrowLayout ? styles.tabBarOfflineIndicator(variables.floatingTabBarHeight + variables.floatingTabBarBottomInset) : undefined,
+        offlineIndicatorStyle: shouldUseNarrowLayout ? styles.tabBarOfflineIndicator(tabBarCoveredHeight) : undefined,
     };
 }
 
diff --git a/src/components/Search/SearchSelectionFooter.tsx b/src/components/Search/SearchSelectionFooter.tsx
index 4b779c3cc15a..34036f6be215 100644
--- a/src/components/Search/SearchSelectionFooter.tsx
+++ b/src/components/Search/SearchSelectionFooter.tsx
@@ -11,9 +11,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchResults} from '@src/types/onyx';
 import {getEmptyObject} from '@src/types/utils/EmptyObject';
 
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import {View} from 'react-native';
 
 import type {SelectedTransactionInfo, SelectedTransactions} from './types';
 
@@ -23,6 +25,9 @@ import SearchPageFooter from './SearchPageFooter';
 type SearchSelectionFooterProps = {
     /** The (sorting-aware) results the page is displaying; source of the footer's totals metadata. */
     searchResults: OnyxEntry<SearchResults>;
+
+    /** Styles for the footer's container */
+    style?: StyleProp<ViewStyle>;
 };
 
 type FooterCurrencyState = {
@@ -102,7 +107,7 @@ function areAllSelectedReportsConverted(selectedReportIDs: string[], isReportFre
 
 // Self-subscribing footer leaf. Owns the `selectedTransactions` read so a checkbox press re-renders only this
 // footer — not SearchPage and the <Search> list it contains.
-function SearchSelectionFooter({searchResults}: SearchSelectionFooterProps) {
+function SearchSelectionFooter({searchResults, style}: SearchSelectionFooterProps) {
     const {selectedTransactions, excludedTransactions = getEmptyObject<SelectedTransactions>(), areAllMatchingItemsSelected, selectedReports} = useSearchSelectionContext();
     const {currentSearchResults} = useSearchResultsContext();
     const {currentSearchHash, currentSearchKey, currentSearchQueryJSON} = useSearchQueryContext();
@@ -626,14 +631,16 @@ function SearchSelectionFooter({searchResults}: SearchSelectionFooterProps) {
     const isFooterTotalLoading = isFooterTotalConverting || (!hasPartialSelection && !!metadata?.isLoading && metadata?.offset === 0);
 
     return (
-        <SearchPageFooter
-            count={footerData.count}
-            total={footerData.total}
-            currency={footerData.currency}
-            defaultCurrency={searchTargetCurrency}
-            isTotalLoading={isFooterTotalLoading}
-            onCurrencyChange={handleFooterCurrencyChange}
-        />
+        <View style={style}>
+            <SearchPageFooter
+                count={footerData.count}
+                total={footerData.total}
+                currency={footerData.currency}
+                defaultCurrency={searchTargetCurrency}
+                isTotalLoading={isFooterTotalLoading}
+                onCurrencyChange={handleFooterCurrencyChange}
+            />
+        </View>
     );
 }
 
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 088295b400b9..4bf250fba847 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -3,6 +3,7 @@ import CollapsibleHeaderOnKeyboardGroup from '@components/CollapsibleHeaderOnKey
 import CollapsibleHeaderOnKeyboardGroupMember from '@components/CollapsibleHeaderOnKeyboard/GroupMember';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import useTabBarCoveredHeight from '@components/Navigation/TabBarBottomContent/useTabBarCoveredHeight';
 import useTabRootScreenWrapperProps from '@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps';
 import PulsingView from '@components/PulsingView';
 import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
@@ -103,6 +104,9 @@ function SearchPageNarrow({
     const styles = useThemeStyles();
     const {pageGutterMargin} = useLayoutSpacing();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.SEARCH);
+    const tabBarCoveredHeight = useTabBarCoveredHeight();
+    // The footer is shown and hidden by its own selection state, so its height is read from layout.
+    const [footerHeight, setFooterHeight] = useState(0);
     const StyleUtils = useStyleUtils();
     const {clearSelectedTransactions} = useSearchSelectionActions();
     const {shouldUseLiveData} = useSearchResultsContext();
@@ -271,7 +275,7 @@ function SearchPageNarrow({
                     shouldEnableMaxHeight
                     shouldShowOfflineIndicator={!!searchResults}
                     {...tabRootScreenWrapperProps}
-                    offlineIndicatorStyle={[styles.mtAuto, tabRootScreenWrapperProps.offlineIndicatorStyle]}
+                    offlineIndicatorStyle={[styles.mtAuto, footerHeight > 0 ? styles.tabBarOfflineIndicator(footerHeight) : tabRootScreenWrapperProps.offlineIndicatorStyle]}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
@@ -406,7 +410,12 @@ function SearchPageNarrow({
                                 </>
                             )}
                         </View>
-                        <SearchSelectionFooter searchResults={searchResults} />
+                        <View onLayout={(event) => setFooterHeight(event.nativeEvent.layout.height)}>
+                            <SearchSelectionFooter
+                                searchResults={searchResults}
+                                style={styles.tabRootFooter(tabBarCoveredHeight)}
+                            />
+                        </View>
                     </View>
                 </ScreenWrapper>
             </ReceiptScanDropZone>
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8ce3e324fd6a..98be7a97b43c 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -7051,6 +7051,14 @@ const dynamicStyles = (theme: ThemeColors) =>
                 backgroundColor: theme.appBG,
             }) satisfies ViewStyle,
 
+        // Runs a footer's background down under the tab bar that covers the bottom of a tab root screen, so the
+        // footer's content sits above the bar.
+        tabRootFooter: (tabBarCoveredHeight: number) =>
+            ({
+                paddingBottom: tabBarCoveredHeight,
+                backgroundColor: theme.appBG,
+            }) satisfies ViewStyle,
+
         // Zero-height strip anchored above the native tab bar, so the floating buttons can be positioned
         // against it without taking part in the tab screen's layout.
         nativeTabBarFloatingButtons: (bottom: number) =>

From 2a215e8358ece9872f9a037e6c6c6ed6e2902272 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 14:48:53 +0000
Subject: [PATCH 568/781] Remove the unreachable branch and only flush the
 pending scroll on the next frame in aligned-to-top reports

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 src/hooks/useReportActionsScroll.ts           | 10 ++++++----
 .../useReportActionsNewActionLiveTail.ts      | 10 ----------
 tests/unit/useReportActionsScrollTest.tsx     | 20 +++++++++++++++----
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index d8942cb0dac9..43ea47df16d4 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -415,15 +415,17 @@ function useReportActionsScroll({
 
     const flushPendingScrollToBottomFromEffect = useEffectEvent(() => flushPendingScrollToBottom());
 
-    // The list's onLayout is not enough to flush a pending scroll: a new comment changes the content size, not the
-    // layout size, so onLayout may never fire. Flush on the next frame so this effect doesn't chain a synchronous setState.
+    // In an aligned-to-top report (expense, invoice, transaction thread), the list's onLayout is not enough to flush a
+    // pending scroll: a new comment changes the content size, not the layout size, so onLayout may never fire. Regular
+    // chats don't need this, because their first scrollToBottom already lands. Flush on the next frame so this effect
+    // doesn't chain a synchronous setState.
     useEffect(() => {
-        if (!isScrollToBottomEnabled) {
+        if (!shouldBeAlignedToTop || !isScrollToBottomEnabled) {
             return;
         }
         const frame = requestAnimationFrame(() => flushPendingScrollToBottomFromEffect());
         return () => cancelAnimationFrame(frame);
-    }, [isScrollToBottomEnabled]);
+    }, [shouldBeAlignedToTop, isScrollToBottomEnabled]);
 
     // Data is ready at the moment FlashList finishes its first render.
     const onLoad = () => {
diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 86a76484bbe0..3b930e3e4e52 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -13,7 +13,6 @@ import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {ReportsSplitNavigatorParamList} from '@navigation/types';
 
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 
@@ -109,15 +108,6 @@ function useReportActionsNewActionLiveTail({
                 if (!isFromCurrentUser || (!isReportTopmostSplitNavigator() && !Navigation.getReportRHPActiveRoute())) {
                     return;
                 }
-                if (!hasNewestReportAction && !isFromCurrentUser) {
-                    if (Navigation.getReportRHPActiveRoute()) {
-                        return;
-                    }
-                    Navigation.setNavigationActionToMicrotaskQueue(() => {
-                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
-                    });
-                    return;
-                }
 
                 // An unread marker only needs openReport when the newest actions are not loaded yet. When they are, they are
                 // just off-screen, so scroll to them directly instead of waiting on a network round trip.
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index 2b8ce520df9b..e165349e8f12 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -425,8 +425,6 @@ describe('useReportActionsScroll', () => {
             mockIsScrollToBottomEnabled = true;
 
             const {result} = await renderScroll();
-            // Ignore the flush the effect already made on mount, so only the layout-driven call is measured.
-            jest.clearAllMocks();
             act(() => {
                 result.current.flushPendingScrollToBottom();
             });
@@ -436,8 +434,9 @@ describe('useReportActionsScroll', () => {
             expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
         });
 
-        it('flushes a pending scroll-to-bottom without waiting for a list layout event', async () => {
-            // Given the live-tail hook asked for a scroll to bottom, as it does after the user sends a comment
+        it('flushes a pending scroll-to-bottom without waiting for a list layout event in an aligned-to-top report', async () => {
+            // Given an expense report, and the live-tail hook asked for a scroll to bottom, as it does after the user sends a comment
+            mockIsMoneyRequestReport = true;
             mockIsScrollToBottomEnabled = true;
 
             // When the hook renders and no list onLayout follows, because a new comment changes content size, not layout size
@@ -448,6 +447,19 @@ describe('useReportActionsScroll', () => {
             expect(mockSetIsScrollToBottomEnabled).toHaveBeenCalledWith(false);
             expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
         });
+
+        it('leaves a pending scroll-to-bottom to the list layout event in a regular chat', async () => {
+            // Given a regular chat, and the live-tail hook asked for a scroll to bottom
+            mockIsScrollToBottomEnabled = true;
+
+            // When the hook renders
+            await renderScroll();
+
+            // Then nothing flushes on the next frame, because the first scrollToBottom in a regular chat already lands
+            expect(mockScrollToBottom).not.toHaveBeenCalled();
+            expect(mockSetIsScrollToBottomEnabled).not.toHaveBeenCalled();
+            expect(mockCompleteLiveTailPrune).not.toHaveBeenCalled();
+        });
     });
 
     describe('onLoad', () => {

From 8131e7cb381227eda36477f1860a2aeeed68cbca Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 16:53:50 +0200
Subject: [PATCH 569/781] Add triggerScrollEvent to the Home page

---
 src/pages/home/HomePage.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index a09a8bb0a4f1..0852f31be85e 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -13,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useScrollEventEmitter from '@hooks/useScrollEventEmitter';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import openHomePage from '@libs/actions/HomePage';
@@ -46,6 +47,7 @@ function HomePage() {
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
     const {translate} = useLocalize();
+    const triggerScrollEvent = useScrollEventEmitter();
     useDocumentTitle(translate('common.home'));
     const {isOffline} = useNetwork({onReconnect: openHomePage});
     const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
@@ -156,6 +158,7 @@ function HomePage() {
                     />
                     <ScrollView
                         style={styles.homePageScrollView}
+                        onScroll={triggerScrollEvent}
                         contentContainerStyle={[styles.homePageContentContainer, pageGutter]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"

From 22bc177d3ebf103dff01dc8c56b3248de80b45b2 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 15:03:59 +0000
Subject: [PATCH 570/781] Skip marking read after the user's comment when newer
 actions are unloaded or the report is in the background

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 .../useReportActionsNewActionLiveTail.ts      | 17 ++++-
 .../useReportActionsNewActionLiveTailTest.ts  | 64 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 3b930e3e4e52..8998ae81ad0d 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -96,10 +96,25 @@ function useReportActionsNewActionLiveTail({
 
     // Scrolling to the user's own comment must also mark the report as read. Otherwise the "New" divider stays, and the
     // unread marker it leaves behind turns the "New messages" pill back on. An effect event keeps it out of effect deps.
+    // Marking read moves lastReadTime to now, so skip it while newer actions are not loaded (e.g. offline, where the
+    // live-tail jump can't run). Otherwise actions the user never saw would come back from the server already read.
     const markAsReadAfterScroll = useEffectEvent(() => {
+        if (!hasNewestReportAction || hasNewerActions) {
+            return;
+        }
         markNewestActionAsRead();
     });
 
+    // On web a report screen stays mounted after the user switches to another report, so openReport can finish while
+    // this screen is in the background. Only mark read if the user is still looking at it. The side panel's fallback
+    // navigation always reports focused.
+    const markAsReadAfterLiveTailJump = useEffectEvent(() => {
+        if (!navigation.isFocused()) {
+            return;
+        }
+        markAsReadAfterScroll();
+    });
+
     const scrollToBottomForCurrentUserAction = useEffectEvent((isFromCurrentUser: boolean, action?: OnyxTypes.ReportAction) => {
         TransitionTracker.runAfterTransitions({
             callback: () => {
@@ -206,7 +221,7 @@ function useReportActionsNewActionLiveTail({
 
         liveTailJumpRef.current = {stage: 'await_prune'};
         setIsFloatingMessageCounterVisible(false);
-        markAsReadAfterScroll();
+        markAsReadAfterLiveTailJump();
         // Defer so this effect does not synchronously chain a second render from setState (eslint react-hooks/set-state-in-effect).
         queueMicrotask(() => {
             setIsScrollToBottomEnabled(true);
diff --git a/tests/unit/useReportActionsNewActionLiveTailTest.ts b/tests/unit/useReportActionsNewActionLiveTailTest.ts
index faeaff36742e..9b07a1224002 100644
--- a/tests/unit/useReportActionsNewActionLiveTailTest.ts
+++ b/tests/unit/useReportActionsNewActionLiveTailTest.ts
@@ -31,7 +31,7 @@ jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
     default: () => ({accountID: 1}),
 }));
 
-let mockNavigation: Record<string, unknown> = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'})};
+let mockNavigation: Record<string, unknown> = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'}), isFocused: () => true};
 let mockIsInSidePanel = false;
 
 jest.mock('@react-navigation/native', () => ({
@@ -119,7 +119,7 @@ describe('useReportActionsNewActionLiveTail', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         newActionHandler = undefined;
-        mockNavigation = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'})};
+        mockNavigation = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'}), isFocused: () => true};
         mockIsInSidePanel = false;
     });
 
@@ -250,12 +250,70 @@ describe('useReportActionsNewActionLiveTail', () => {
 
         // When openReport finishes and the newest actions arrive
         rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}));
-        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: false, reportLoadingState: {isLoadingInitialReportActions: false}, hasNewestReportAction: true}));
+        rerender(
+            buildParams({
+                markNewestActionAsRead,
+                prevIsLoadingInitialReportActions: false,
+                reportLoadingState: {isLoadingInitialReportActions: false},
+                hasNewestReportAction: true,
+                hasNewerActions: false,
+            }),
+        );
 
         // Then the report is marked as read once, alongside hiding the pill
         expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
     });
 
+    it('does not mark the report as read when the user sends a comment offline while newer actions are not loaded', () => {
+        // Given an offline report with a gap of newer actions on the server. The optimistic comment still sits at the
+        // top of the newest chain, so hasNewestReportAction is true even though newer actions are missing.
+        const markNewestActionAsRead = jest.fn();
+        renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
+            initialProps: buildParams({isOffline: true, hasNewerActions: true, hasNewestReportAction: true, markNewestActionAsRead}),
+        });
+
+        // When the current user sends a comment, which scrolls directly because the live-tail jump can't run offline
+        act(() => {
+            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
+        });
+
+        // Then the list still scrolls, but nothing is marked as read, so the unloaded actions stay unread
+        expect(reportScrollManager.scrollToBottom).toHaveBeenCalledTimes(1);
+        expect(markNewestActionAsRead).not.toHaveBeenCalled();
+    });
+
+    it('does not mark the report as read when the live-tail jump finishes after the user switched to another report', () => {
+        // Given a live-tail jump started by the user's comment
+        const markNewestActionAsRead = jest.fn();
+        const setIsFloatingMessageCounterVisible = jest.fn();
+        const {rerender} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
+            initialProps: buildParams({markNewestActionAsRead, setIsFloatingMessageCounterVisible}),
+        });
+        act(() => {
+            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
+        });
+
+        // When the user switches to another report, leaving this screen mounted in the background on web, and openReport then finishes
+        mockNavigation = {...mockNavigation, isFocused: () => false};
+        rerender(
+            buildParams({markNewestActionAsRead, setIsFloatingMessageCounterVisible, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}),
+        );
+        rerender(
+            buildParams({
+                markNewestActionAsRead,
+                setIsFloatingMessageCounterVisible,
+                prevIsLoadingInitialReportActions: false,
+                reportLoadingState: {isLoadingInitialReportActions: false},
+                hasNewestReportAction: true,
+                hasNewerActions: false,
+            }),
+        );
+
+        // Then the jump still completes, but the background report is not marked as read
+        expect(setIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
+        expect(markNewestActionAsRead).not.toHaveBeenCalled();
+    });
+
     it('still loads the live tail when an unread marker is set and the newest actions are not loaded', () => {
         // Given an unread marker and a report whose newest actions are not loaded yet
         renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {

From 030fc18c05596264c3adfd1a51d231175bad0f79 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 15:17:23 +0000
Subject: [PATCH 571/781] Revert "Skip marking read after the user's comment
 when newer actions are unloaded or the report is in the background"

This reverts commit 22bc177d3ebf103dff01dc8c56b3248de80b45b2.
---
 .../useReportActionsNewActionLiveTail.ts      | 17 +----
 .../useReportActionsNewActionLiveTailTest.ts  | 64 +------------------
 2 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 8998ae81ad0d..3b930e3e4e52 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -96,25 +96,10 @@ function useReportActionsNewActionLiveTail({
 
     // Scrolling to the user's own comment must also mark the report as read. Otherwise the "New" divider stays, and the
     // unread marker it leaves behind turns the "New messages" pill back on. An effect event keeps it out of effect deps.
-    // Marking read moves lastReadTime to now, so skip it while newer actions are not loaded (e.g. offline, where the
-    // live-tail jump can't run). Otherwise actions the user never saw would come back from the server already read.
     const markAsReadAfterScroll = useEffectEvent(() => {
-        if (!hasNewestReportAction || hasNewerActions) {
-            return;
-        }
         markNewestActionAsRead();
     });
 
-    // On web a report screen stays mounted after the user switches to another report, so openReport can finish while
-    // this screen is in the background. Only mark read if the user is still looking at it. The side panel's fallback
-    // navigation always reports focused.
-    const markAsReadAfterLiveTailJump = useEffectEvent(() => {
-        if (!navigation.isFocused()) {
-            return;
-        }
-        markAsReadAfterScroll();
-    });
-
     const scrollToBottomForCurrentUserAction = useEffectEvent((isFromCurrentUser: boolean, action?: OnyxTypes.ReportAction) => {
         TransitionTracker.runAfterTransitions({
             callback: () => {
@@ -221,7 +206,7 @@ function useReportActionsNewActionLiveTail({
 
         liveTailJumpRef.current = {stage: 'await_prune'};
         setIsFloatingMessageCounterVisible(false);
-        markAsReadAfterLiveTailJump();
+        markAsReadAfterScroll();
         // Defer so this effect does not synchronously chain a second render from setState (eslint react-hooks/set-state-in-effect).
         queueMicrotask(() => {
             setIsScrollToBottomEnabled(true);
diff --git a/tests/unit/useReportActionsNewActionLiveTailTest.ts b/tests/unit/useReportActionsNewActionLiveTailTest.ts
index 9b07a1224002..faeaff36742e 100644
--- a/tests/unit/useReportActionsNewActionLiveTailTest.ts
+++ b/tests/unit/useReportActionsNewActionLiveTailTest.ts
@@ -31,7 +31,7 @@ jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
     default: () => ({accountID: 1}),
 }));
 
-let mockNavigation: Record<string, unknown> = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'}), isFocused: () => true};
+let mockNavigation: Record<string, unknown> = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'})};
 let mockIsInSidePanel = false;
 
 jest.mock('@react-navigation/native', () => ({
@@ -119,7 +119,7 @@ describe('useReportActionsNewActionLiveTail', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         newActionHandler = undefined;
-        mockNavigation = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'}), isFocused: () => true};
+        mockNavigation = {setParams: mockNavigationSetParams, getState: () => ({key: 'stack-report'})};
         mockIsInSidePanel = false;
     });
 
@@ -250,70 +250,12 @@ describe('useReportActionsNewActionLiveTail', () => {
 
         // When openReport finishes and the newest actions arrive
         rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}));
-        rerender(
-            buildParams({
-                markNewestActionAsRead,
-                prevIsLoadingInitialReportActions: false,
-                reportLoadingState: {isLoadingInitialReportActions: false},
-                hasNewestReportAction: true,
-                hasNewerActions: false,
-            }),
-        );
+        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: false, reportLoadingState: {isLoadingInitialReportActions: false}, hasNewestReportAction: true}));
 
         // Then the report is marked as read once, alongside hiding the pill
         expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
     });
 
-    it('does not mark the report as read when the user sends a comment offline while newer actions are not loaded', () => {
-        // Given an offline report with a gap of newer actions on the server. The optimistic comment still sits at the
-        // top of the newest chain, so hasNewestReportAction is true even though newer actions are missing.
-        const markNewestActionAsRead = jest.fn();
-        renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
-            initialProps: buildParams({isOffline: true, hasNewerActions: true, hasNewestReportAction: true, markNewestActionAsRead}),
-        });
-
-        // When the current user sends a comment, which scrolls directly because the live-tail jump can't run offline
-        act(() => {
-            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
-        });
-
-        // Then the list still scrolls, but nothing is marked as read, so the unloaded actions stay unread
-        expect(reportScrollManager.scrollToBottom).toHaveBeenCalledTimes(1);
-        expect(markNewestActionAsRead).not.toHaveBeenCalled();
-    });
-
-    it('does not mark the report as read when the live-tail jump finishes after the user switched to another report', () => {
-        // Given a live-tail jump started by the user's comment
-        const markNewestActionAsRead = jest.fn();
-        const setIsFloatingMessageCounterVisible = jest.fn();
-        const {rerender} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
-            initialProps: buildParams({markNewestActionAsRead, setIsFloatingMessageCounterVisible}),
-        });
-        act(() => {
-            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
-        });
-
-        // When the user switches to another report, leaving this screen mounted in the background on web, and openReport then finishes
-        mockNavigation = {...mockNavigation, isFocused: () => false};
-        rerender(
-            buildParams({markNewestActionAsRead, setIsFloatingMessageCounterVisible, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}),
-        );
-        rerender(
-            buildParams({
-                markNewestActionAsRead,
-                setIsFloatingMessageCounterVisible,
-                prevIsLoadingInitialReportActions: false,
-                reportLoadingState: {isLoadingInitialReportActions: false},
-                hasNewestReportAction: true,
-                hasNewerActions: false,
-            }),
-        );
-
-        // Then the jump still completes, but the background report is not marked as read
-        expect(setIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
-        expect(markNewestActionAsRead).not.toHaveBeenCalled();
-    });
-
     it('still loads the live tail when an unread marker is set and the newest actions are not loaded', () => {
         // Given an unread marker and a report whose newest actions are not loaded yet
         renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {

From 9c7b785f207ea132bb384682ec17f07fc1ab224b Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 15:17:23 +0000
Subject: [PATCH 572/781] Revert "Mark the report as read after scrolling to
 the user's own comment"

This reverts commit 654e67a28494ed4d76e72e5667fa9a2b618e2203.
---
 src/hooks/useReportActionsScroll.ts           |  1 -
 .../useReportActionsNewActionLiveTail.ts      | 10 -------
 .../useReportActionsNewActionLiveTailTest.ts  | 29 +------------------
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index 43ea47df16d4..eef062777d87 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -242,7 +242,6 @@ function useReportActionsScroll({
         reportScrollManager,
         setIsFloatingMessageCounterVisible,
         setActionIdToHighlight,
-        markNewestActionAsRead,
         unreadMarkerReportActionID,
         hasNewerActions,
         linkedReportActionID,
diff --git a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
index 3b930e3e4e52..c99fe489b71e 100644
--- a/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
+++ b/src/pages/inbox/report/useReportActionsNewActionLiveTail.ts
@@ -43,7 +43,6 @@ type UseReportActionsNewActionLiveTailParams = {
     reportScrollManager: ReportScrollManager;
     setIsFloatingMessageCounterVisible: (visible: boolean) => void;
     setActionIdToHighlight: (actionID: string) => void;
-    markNewestActionAsRead: () => void;
     unreadMarkerReportActionID: string | null;
     hasNewerActions: boolean;
     linkedReportActionID: string | undefined;
@@ -75,7 +74,6 @@ function useReportActionsNewActionLiveTail({
     reportScrollManager,
     setIsFloatingMessageCounterVisible,
     setActionIdToHighlight,
-    markNewestActionAsRead,
     unreadMarkerReportActionID,
     hasNewerActions,
     linkedReportActionID,
@@ -94,12 +92,6 @@ function useReportActionsNewActionLiveTail({
     const liveTailJumpRef = useRef<{stage: LiveTailJumpStage}>({stage: 'idle'});
     const [isScrollToBottomEnabled, setIsScrollToBottomEnabled] = useState(false);
 
-    // Scrolling to the user's own comment must also mark the report as read. Otherwise the "New" divider stays, and the
-    // unread marker it leaves behind turns the "New messages" pill back on. An effect event keeps it out of effect deps.
-    const markAsReadAfterScroll = useEffectEvent(() => {
-        markNewestActionAsRead();
-    });
-
     const scrollToBottomForCurrentUserAction = useEffectEvent((isFromCurrentUser: boolean, action?: OnyxTypes.ReportAction) => {
         TransitionTracker.runAfterTransitions({
             callback: () => {
@@ -148,7 +140,6 @@ function useReportActionsNewActionLiveTail({
                 } else {
                     setIsFloatingMessageCounterVisible(false);
                     reportScrollManager.scrollToBottom();
-                    markAsReadAfterScroll();
                 }
 
                 setIsScrollToBottomEnabled(true);
@@ -206,7 +197,6 @@ function useReportActionsNewActionLiveTail({
 
         liveTailJumpRef.current = {stage: 'await_prune'};
         setIsFloatingMessageCounterVisible(false);
-        markAsReadAfterScroll();
         // Defer so this effect does not synchronously chain a second render from setState (eslint react-hooks/set-state-in-effect).
         queueMicrotask(() => {
             setIsScrollToBottomEnabled(true);
diff --git a/tests/unit/useReportActionsNewActionLiveTailTest.ts b/tests/unit/useReportActionsNewActionLiveTailTest.ts
index faeaff36742e..3b2f63e6df8b 100644
--- a/tests/unit/useReportActionsNewActionLiveTailTest.ts
+++ b/tests/unit/useReportActionsNewActionLiveTailTest.ts
@@ -99,7 +99,6 @@ function buildParams(overrides: Partial<HookParams> = {}): HookParams {
         reportScrollManager,
         setIsFloatingMessageCounterVisible: jest.fn(),
         setActionIdToHighlight: jest.fn(),
-        markNewestActionAsRead: jest.fn(),
         unreadMarkerReportActionID: null,
         hasNewerActions: true,
         linkedReportActionID: undefined,
@@ -214,9 +213,8 @@ describe('useReportActionsNewActionLiveTail', () => {
     it('scrolls straight to the bottom when an unread marker is set but the newest actions are already loaded', () => {
         // Given a report scrolled up with an unread marker from another user's comment, and the newest actions already loaded
         const setIsFloatingMessageCounterVisible = jest.fn();
-        const markNewestActionAsRead = jest.fn();
         const {result} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {
-            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: true, setIsFloatingMessageCounterVisible, markNewestActionAsRead}),
+            initialProps: buildParams({unreadMarkerReportActionID: '2', hasNewerActions: false, hasNewestReportAction: true, setIsFloatingMessageCounterVisible}),
         });
 
         // When the current user sends a comment
@@ -229,31 +227,6 @@ describe('useReportActionsNewActionLiveTail', () => {
         expect(setIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
         expect(reportScrollManager.scrollToBottom).toHaveBeenCalledTimes(1);
         expect(result.current.isScrollToBottomEnabled).toBe(true);
-
-        // And the report is marked as read, so the "New" divider clears and the pill doesn't come back
-        expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
-    });
-
-    it('marks the report as read once openReport has loaded the newest actions after the user sends a comment', () => {
-        // Given a report whose newest actions are not loaded yet
-        const markNewestActionAsRead = jest.fn();
-        const {rerender} = renderHook((props: HookParams) => useReportActionsNewActionLiveTail(props), {initialProps: buildParams({markNewestActionAsRead})});
-
-        // When the current user sends a comment, which starts the live-tail jump through openReport
-        act(() => {
-            newActionHandler?.(true, getFakeReportAction(1, {actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT}));
-        });
-
-        // Then nothing is marked as read while the newest actions are still loading
-        expect(mockOpenReport).toHaveBeenCalledTimes(1);
-        expect(markNewestActionAsRead).not.toHaveBeenCalled();
-
-        // When openReport finishes and the newest actions arrive
-        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: true, reportLoadingState: {isLoadingInitialReportActions: false}}));
-        rerender(buildParams({markNewestActionAsRead, prevIsLoadingInitialReportActions: false, reportLoadingState: {isLoadingInitialReportActions: false}, hasNewestReportAction: true}));
-
-        // Then the report is marked as read once, alongside hiding the pill
-        expect(markNewestActionAsRead).toHaveBeenCalledTimes(1);
     });
 
     it('still loads the live tail when an unread marker is set and the newest actions are not loaded', () => {

From c1f4be9805b8489d5f1c2a9996c9d35c7fe0f25a Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Tue, 13 Oct 2026 16:30:38 +0100
Subject: [PATCH 573/781] fix typo

---
 patches/victory-native/details.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md
index 745fbd8ef8f2..ad919a91a15c 100644
--- a/patches/victory-native/details.md
+++ b/patches/victory-native/details.md
@@ -19,8 +19,8 @@
   
     ```
     After updating to v42 the tickCount broke.
-    This was was caused by this commit https://github.com/FormidableLabs/victory-native-xl/pull/664/changes/fcd8affe655878d0bf95ab87c087eab428d4f62d
-    which fixed some bug but caused us another bug. This small patch reverts it. This is a temporarily solution not a real fix.
+    This was caused by this commit https://github.com/FormidableLabs/victory-native-xl/pull/664/changes/fcd8affe655878d0bf95ab87c087eab428d4f62d
+    which fixed some bug but caused us another bug. This small patch reverts it. This is a temporary solution not a real fix.
     The fix should address both bugs.
     ```
   

From 9debe9edc7137b92fe70f9b478e581c344ef890c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Poche=C4=87?= <mikolaj.pochec@swmansion.com>
Date: Tue, 13 Oct 2026 17:37:35 +0200
Subject: [PATCH 574/781] [batch 4/4] Add DynamicForm list fields

---
 .storybook/mockPaths.ts                       |   5 +-
 .storybook/mocks/navigationStoryLoader.cjs    |  11 +
 .storybook/mocks/react-navigation-native.ts   |  86 +++
 .storybook/mocks/react-navigation-stack.ts    |  27 +
 .storybook/mocks/storyRouter.tsx              | 106 ++++
 .storybook/preview.tsx                        |   8 +
 .storybook/rsbuild.config.ts                  |  13 +
 contributingGuides/DYNAMIC_FORMS.md           | 141 +++++
 contributingGuides/FORMS.md                   |   2 +
 src/CONST/index.ts                            |   3 +
 src/ONYXKEYS.ts                               |   3 +
 .../DynamicForm/adapters/ListFieldAdapter.tsx | 161 ++++++
 .../DynamicFormConfirmationPage.tsx           |   4 +-
 .../components/DynamicFormFieldRow.tsx        |  31 +-
 .../components/DynamicFormFields.tsx          |  24 +-
 .../components/DynamicFormFieldsPage.tsx      |   2 +
 .../components/DynamicFormListItemModal.tsx   |  94 +++
 .../components/DynamicFormListItemPage.tsx    |  89 +++
 src/components/DynamicForm/index.tsx          |  80 ++-
 .../DynamicForm/renderDynamicField.tsx        |   2 +
 .../DynamicForm/renderers/listRenderer.tsx    |  36 ++
 src/components/DynamicForm/renderers/types.ts |  11 +-
 src/components/DynamicForm/types.ts           |   5 +
 .../DynamicForm/utils/getConfirmationItems.ts |  56 +-
 .../utils/getDynamicFieldErrors.ts            |  22 +
 .../DynamicForm/utils/getSubmittedAnswers.ts  |   9 +-
 .../DynamicForm/utils/isSupportedField.ts     |   1 +
 src/components/DynamicForm/utils/listItems.ts |  59 ++
 src/components/DynamicForm/utils/paginate.ts  |   4 +-
 .../DynamicForm/utils/summarizeListItem.ts    |  37 ++
 .../DynamicForm/utils/toDynamicFormValues.ts  |   5 +-
 src/components/Form/FormProvider.tsx          |   1 +
 src/components/Form/types.ts                  |   8 +-
 src/components/ListField.tsx                  | 126 ++++
 .../SubStepForms/ConfirmationStep.tsx         |  75 ++-
 src/languages/de.ts                           |   9 +
 src/languages/el.ts                           |   9 +
 src/languages/en.ts                           |   9 +
 src/languages/es.ts                           |   9 +
 src/languages/fr.ts                           |   9 +
 src/languages/it.ts                           |   9 +
 src/languages/ja.ts                           |   9 +
 src/languages/nl.ts                           |   9 +
 src/languages/pl.ts                           |   9 +
 src/languages/pt-BR.ts                        |   9 +
 src/languages/zh-hans.ts                      |   9 +
 src/libs/UserAvatarUtils.ts                   |   8 +
 src/libs/actions/DynamicForm.ts               |  17 +-
 src/stories/DynamicForm.stories.tsx           | 545 ++++++++++++++++++
 src/types/form/DynamicFormListItemForm.ts     |   9 +
 src/types/form/index.ts                       |   1 +
 src/types/onyx/DynamicFormField.ts            |  30 +
 src/types/onyx/index.ts                       |   4 +
 .../DynamicForm/DynamicFormFieldsTest.tsx     |  25 +-
 .../DynamicForm/DynamicFormFlowTest.tsx       | 164 +++++-
 .../adapters/ListFieldAdapterTest.tsx         | 150 +++++
 .../DynamicForm/getConfirmationItemsTest.ts   |  59 +-
 .../DynamicForm/getDynamicFieldErrorsTest.ts  |  45 ++
 .../DynamicForm/getSubmittedAnswersTest.ts    |  21 +
 .../DynamicForm/summarizeListItemTest.ts      |  38 ++
 .../DynamicForm/toDynamicFormValuesTest.ts    |   3 +-
 61 files changed, 2492 insertions(+), 73 deletions(-)
 create mode 100644 .storybook/mocks/navigationStoryLoader.cjs
 create mode 100644 .storybook/mocks/react-navigation-native.ts
 create mode 100644 .storybook/mocks/react-navigation-stack.ts
 create mode 100644 .storybook/mocks/storyRouter.tsx
 create mode 100644 contributingGuides/DYNAMIC_FORMS.md
 create mode 100644 src/components/DynamicForm/adapters/ListFieldAdapter.tsx
 create mode 100644 src/components/DynamicForm/components/DynamicFormListItemModal.tsx
 create mode 100644 src/components/DynamicForm/components/DynamicFormListItemPage.tsx
 create mode 100644 src/components/DynamicForm/renderers/listRenderer.tsx
 create mode 100644 src/components/DynamicForm/utils/listItems.ts
 create mode 100644 src/components/DynamicForm/utils/summarizeListItem.ts
 create mode 100644 src/components/ListField.tsx
 create mode 100644 src/stories/DynamicForm.stories.tsx
 create mode 100644 src/types/form/DynamicFormListItemForm.ts
 create mode 100644 tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
 create mode 100644 tests/unit/components/DynamicForm/summarizeListItemTest.ts

diff --git a/.storybook/mockPaths.ts b/.storybook/mockPaths.ts
index 2d97ca447146..960802b0d25d 100644
--- a/.storybook/mockPaths.ts
+++ b/.storybook/mockPaths.ts
@@ -8,6 +8,9 @@ const dirname = path.dirname(filename);
 /* eslint-disable @typescript-eslint/naming-convention */
 export default {
     '@react-native-community/netinfo': path.resolve(dirname, '../__mocks__/@react-native-community/netinfo.ts'),
-    '@react-navigation/native': path.resolve(dirname, '../__mocks__/@react-navigation/native'),
+    // The static mock, plus a story-owned route stack so a whole flow can mount
+    '@react-navigation/native': path.resolve(dirname, './mocks/react-navigation-native.ts'),
+    // Modal backdrops read the stack card animation, which no story mounts
+    '@react-navigation/stack': path.resolve(dirname, './mocks/react-navigation-stack.ts'),
 };
 /* eslint-enable @typescript-eslint/naming-convention */
diff --git a/.storybook/mocks/navigationStoryLoader.cjs b/.storybook/mocks/navigationStoryLoader.cjs
new file mode 100644
index 000000000000..6e7bfe49cd2c
--- /dev/null
+++ b/.storybook/mocks/navigationStoryLoader.cjs
@@ -0,0 +1,11 @@
+const path = require('path');
+
+/**
+ * Rewrites the App's Navigation module for Storybook so navigate and goBack land on the story's route stack.
+ * A loader is used because `@libs` is a prefix alias that no alias entry for a single module can outrank.
+ */
+module.exports = function navigationStoryLoader(source) {
+    const routerPath = JSON.stringify(path.resolve(__dirname, './storyRouter.tsx'));
+    const renamed = source.replace(/export default \{/, 'const navigationForStorybook = {');
+    return `import {withStoryRouter} from ${routerPath};\n${renamed}\nexport default withStoryRouter(navigationForStorybook);\n`;
+};
diff --git a/.storybook/mocks/react-navigation-native.ts b/.storybook/mocks/react-navigation-native.ts
new file mode 100644
index 000000000000..097840b9f798
--- /dev/null
+++ b/.storybook/mocks/react-navigation-native.ts
@@ -0,0 +1,86 @@
+import {useEffect} from 'react';
+
+import {useStoryRouter} from './storyRouter';
+
+const noop = () => {};
+
+const staticRoute = {key: 'story', name: 'StoryFlow', params: {}};
+const staticNavigation = {
+    navigate: noop,
+    goBack: noop,
+    setParams: noop,
+    canGoBack: () => false,
+    getState: () => ({routes: []}),
+    isFocused: () => true,
+    addListener: () => noop,
+};
+
+/** Inside a StoryRouterProvider the route comes from the story's stack. Elsewhere no story mounts a navigator. */
+function useRoute() {
+    const router = useStoryRouter();
+    return router ? {...staticRoute, params: router.current} : staticRoute;
+}
+
+function useNavigation() {
+    const router = useStoryRouter();
+    if (!router) {
+        return staticNavigation;
+    }
+    return {...staticNavigation, setParams: router.setParams, goBack: router.pop, canGoBack: () => true};
+}
+
+const useIsFocused = () => true;
+const useTheme = () => ({});
+const useLocale = () => ({});
+const useNavigationState = () => undefined;
+const usePreventRemove = noop;
+const triggerTransitionEnd = noop;
+const useFocusEffect = (callback: () => (() => void) | void) => {
+    useEffect(() => callback(), [callback]);
+};
+function Link() {
+    return null;
+}
+function LinkingContext() {
+    return null;
+}
+function NavigationContainer() {
+    return null;
+}
+function ServerContainer() {
+    return null;
+}
+function ThemeProvider() {
+    return null;
+}
+const DarkTheme = {};
+const DefaultTheme = {};
+const useLinkBuilder = () => null;
+const useLinkProps = () => null;
+const useLinkTo = () => null;
+const useScrollToTop = () => null;
+
+// Everything a story does not override comes from the navigation core
+export * from '@react-navigation/core';
+export {
+    useRoute,
+    useNavigation,
+    useIsFocused,
+    useTheme,
+    useLocale,
+    useNavigationState,
+    usePreventRemove,
+    triggerTransitionEnd,
+    useFocusEffect,
+    Link,
+    LinkingContext,
+    NavigationContainer,
+    ServerContainer,
+    ThemeProvider,
+    DarkTheme,
+    DefaultTheme,
+    useLinkBuilder,
+    useLinkProps,
+    useLinkTo,
+    useScrollToTop,
+};
diff --git a/.storybook/mocks/react-navigation-stack.ts b/.storybook/mocks/react-navigation-stack.ts
new file mode 100644
index 000000000000..6ef3f6ec056f
--- /dev/null
+++ b/.storybook/mocks/react-navigation-stack.ts
@@ -0,0 +1,27 @@
+// useCardAnimation returns React Native Animated values, not Reanimated ones
+// eslint-disable-next-line no-restricted-imports
+import {Animated} from 'react-native';
+
+// The alias points the package name at this file, so the real module has to be reached by path, which has no declaration
+// @ts-expect-error -- see above
+// eslint-disable-next-line import/no-relative-packages
+export * from '../../node_modules/@react-navigation/stack/lib/module/index.js';
+
+const presented = new Animated.Value(1);
+const idle = new Animated.Value(0);
+
+/** No story mounts a stack screen, so every modal is treated as fully presented */
+function useCardAnimation() {
+    return {
+        current: {progress: presented},
+        next: undefined,
+        closing: idle,
+        swiping: idle,
+        inverted: presented,
+        index: 0,
+        layouts: {screen: {width: 0, height: 0}},
+        insets: {top: 0, right: 0, bottom: 0, left: 0},
+    };
+}
+
+export {useCardAnimation};
diff --git a/.storybook/mocks/storyRouter.tsx b/.storybook/mocks/storyRouter.tsx
new file mode 100644
index 000000000000..41b38a883706
--- /dev/null
+++ b/.storybook/mocks/storyRouter.tsx
@@ -0,0 +1,106 @@
+import type {ReactNode} from 'react';
+
+import React, {createContext, useContext, useEffect, useMemo, useRef, useState} from 'react';
+
+type StoryRouteParams = {subPage?: string; action?: 'edit'};
+
+type StoryRouter = {
+    current: StoryRouteParams;
+    push: (params: StoryRouteParams) => void;
+    replace: (params: StoryRouteParams) => void;
+    pop: () => boolean;
+    setParams: (params: StoryRouteParams) => void;
+};
+
+type ActiveStoryRouter = {routePrefix: string; api: StoryRouter};
+
+const StoryRouterContext = createContext<StoryRouter | undefined>(undefined);
+
+let activeStoryRouter: ActiveStoryRouter | undefined;
+
+/** A one-screen stack for stories: the App's navigation hooks and helpers read and write it while a story is mounted */
+function StoryRouterProvider({routePrefix, initialParams = {}, children}: {routePrefix: string; initialParams?: StoryRouteParams; children: ReactNode}) {
+    const [stack, setStack] = useState<StoryRouteParams[]>([initialParams]);
+    const stackRef = useRef(stack);
+    useEffect(() => {
+        stackRef.current = stack;
+    }, [stack]);
+
+    const api = useMemo<StoryRouter>(
+        () => ({
+            current: stack.at(-1) ?? {},
+            push: (params) => setStack((previous) => [...previous, params]),
+            replace: (params) => setStack((previous) => [...previous.slice(0, -1), params]),
+            pop: () => {
+                if (stackRef.current.length <= 1) {
+                    return false;
+                }
+                setStack((previous) => previous.slice(0, -1));
+                return true;
+            },
+            setParams: (params) => setStack((previous) => [...previous.slice(0, -1), {...previous.at(-1), ...params}]),
+        }),
+        [stack],
+    );
+
+    useEffect(() => {
+        activeStoryRouter = {routePrefix, api};
+        return () => {
+            activeStoryRouter = undefined;
+        };
+    }, [routePrefix, api]);
+
+    return <StoryRouterContext.Provider value={api}>{children}</StoryRouterContext.Provider>;
+}
+
+function useStoryRouter(): StoryRouter | undefined {
+    return useContext(StoryRouterContext);
+}
+
+function getActiveStoryRouter(): ActiveStoryRouter | undefined {
+    return activeStoryRouter;
+}
+
+/** Reads `subPage` and `action` back out of a route the story's route builder produced */
+function parseStoryRoute(routePrefix: string, route: string): StoryRouteParams {
+    const path = route.split('?').at(0) ?? '';
+    const rest = path.startsWith(routePrefix) ? path.slice(routePrefix.length) : path;
+    const [subPage, action] = rest.split('/').filter(Boolean);
+    return {subPage, action: action === 'edit' ? 'edit' : undefined};
+}
+
+type NavigationLike = {
+    navigate: (route: string, options?: {forceReplace?: boolean}) => void;
+    goBack: (backToRoute?: string, options?: unknown) => void;
+};
+
+/** Wraps the App's Navigation object so that, while a story router is mounted, navigation lands on its stack */
+function withStoryRouter<T extends NavigationLike>(navigation: T): T {
+    const navigate: NavigationLike['navigate'] = (route, options) => {
+        const router = getActiveStoryRouter();
+        if (!router) {
+            navigation.navigate(route, options);
+            return;
+        }
+        const params = parseStoryRoute(router.routePrefix, route);
+        if (options?.forceReplace) {
+            router.api.replace(params);
+            return;
+        }
+        router.api.push(params);
+    };
+    const goBack: NavigationLike['goBack'] = (backToRoute, options) => {
+        const router = getActiveStoryRouter();
+        if (!router) {
+            navigation.goBack(backToRoute, options);
+            return;
+        }
+        if (!router.api.pop() && backToRoute) {
+            router.api.replace(parseStoryRoute(router.routePrefix, backToRoute));
+        }
+    };
+    return {...navigation, navigate, goBack};
+}
+
+export {StoryRouterProvider, useStoryRouter, getActiveStoryRouter, parseStoryRoute, withStoryRouter};
+export type {StoryRouteParams};
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 8730a9acda24..da8a0da4930b 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -1,3 +1,4 @@
+import {CurrencyListContextProvider} from '@components/CurrencyListContextProvider';
 import EnvironmentProvider from '@components/EnvironmentContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import ScreenWrapperStatusContext from '@components/ScreenWrapper/ScreenWrapperStatusContext';
@@ -9,7 +10,9 @@ import colors from '@styles/theme/colors';
 
 import ComposeProviders from '@src/components/ComposeProviders';
 import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
+import KeyboardProvider from '@src/components/KeyboardProvider';
 import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
+import {ModalProvider} from '@src/components/Modal/Global/ModalContext';
 import {KeyboardStateProvider} from '@src/components/withKeyboardState';
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
@@ -22,12 +25,14 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 
+import currencyList from '../tests/unit/currencyList.json';
 import './fonts.css';
 
 registerMiddlewares();
 
 Onyx.init({
     keys: ONYXKEYS,
+    initialKeyStates: {[ONYXKEYS.CURRENCY_LIST]: currencyList},
 });
 
 IntlStore.load(CONST.LOCALES.EN);
@@ -38,9 +43,12 @@ const decorators = [
             components={[
                 OnyxListItemProvider,
                 LocaleContextProvider,
+                CurrencyListContextProvider,
                 HTMLEngineProvider,
                 SafeAreaProvider,
                 PortalProvider,
+                KeyboardProvider,
+                ModalProvider,
                 EnvironmentProvider,
                 KeyboardStateProvider,
                 SearchContextProvider,
diff --git a/.storybook/rsbuild.config.ts b/.storybook/rsbuild.config.ts
index 5f7bae2e98ad..4f7bdb02b54a 100644
--- a/.storybook/rsbuild.config.ts
+++ b/.storybook/rsbuild.config.ts
@@ -1,11 +1,15 @@
 import type {RsbuildConfig} from '@rsbuild/core';
 
 import {mergeRsbuildConfig} from '@rsbuild/core';
+import path from 'path';
+import {fileURLToPath} from 'url';
 
 // Storybook 10 loads TS files directly and requires .ts extension for ESM imports
 // @ts-expect-error -- Can't use .ts extensions without allowImportingTsExtensions in tsconfig
 import mockPaths from './mockPaths.ts';
 
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
 let envFile: string;
 switch (process.env.ENV) {
     case 'production':
@@ -30,6 +34,15 @@ const rsbuildFinal = async (config: RsbuildConfig): Promise<RsbuildConfig> => {
             // they're already set in `shared.resolve.alias` and `mergeRsbuildConfig` keeps both.
             alias: mockPaths,
         },
+        tools: {
+            rspack: (rspackConfig) => {
+                // `@libs` is a prefix alias no single-module alias can outrank, so the module is rewritten by a loader instead
+                rspackConfig.module?.rules?.push({
+                    test: /src\/libs\/Navigation\/Navigation\.ts$/,
+                    use: [{loader: path.resolve(dirname, './mocks/navigationStoryLoader.cjs')}],
+                });
+            },
+        },
     });
 };
 
diff --git a/contributingGuides/DYNAMIC_FORMS.md b/contributingGuides/DYNAMIC_FORMS.md
new file mode 100644
index 000000000000..fe606a2be608
--- /dev/null
+++ b/contributingGuides/DYNAMIC_FORMS.md
@@ -0,0 +1,141 @@
+# Dynamic Forms
+
+Some forms are described by data instead of JSX: the fields a Wise bank account needs depend on the country and currency, and the server sends them as a schema. `DynamicForm` renders such a schema with the regular form components, so these forms look and behave like every other form in the App.
+
+## Usage
+
+There are two ways in.
+
+### A whole flow: `DynamicFormFlow`
+
+`DynamicFormFlow` turns a schema into a multi-page flow, followed by a confirmation page with every answer.
+
+```tsx
+import DynamicFormFlow from "@components/DynamicForm";
+
+<DynamicFormFlow
+  schema={schema}
+  formID={ONYXKEYS.FORMS.SOME_FORM}
+  headerTitle={translate("someFlow.title")}
+  confirmationTitle={translate("someFlow.confirmTitle")}
+  testID="SomeFlow"
+  buildRoute={(pageName, action) => ROUTES.SOME_FLOW.getRoute(pageName, action)}
+  onSubmit={(answers) => submitSomeFlow(answers)}
+  onBack={() => Navigation.goBack()}
+/>;
+```
+
+- `schema` is either `{pages}`, the pages as the server groups them, or `{fields}`, a flat list the App splits into pages (see [Pages](#pages)).
+- The current page is kept in the route, through `useSubPage`. Pass `shouldReplaceRoute` for flows on dynamic routes.
+- A new visit resumes on the first page its draft leaves incomplete, or on the last page when nothing is missing.
+- `hasConfirmation` decides whether a confirmation page follows the last page. It is on by default; without it the last page's Confirm button submits.
+- `layout` decides the step indicator: `auto` shows it at three or more shown pages, `stepper` always, `pages` never.
+- Answers are saved to the form draft as the user types, and again, cleaned, when they leave a page with Next.
+- `onPageSubmit` receives each page and its drafted answers, list entries included, when the user leaves it with Next, for flows that save page by page. Sensitive answers are not passed.
+- `onSubmit` receives the answers to every visible field, sensitive ones included. Answers left on fields that were hidden later are not sent.
+- `isSubmitting` and `submitError` show the confirmation page's Confirm button loading and the error from sending the answers.
+- `onRefreshRequirements` is called when a field marked `refreshOnChange` changes, so the screen can fetch the schema again. Typed fields call it when the user leaves the input, not on every keystroke.
+- `currency` is the currency of amount fields that let the user pick none. `maxFileSize` is the largest size of one file, in bytes, for file fields that set none.
+
+### One page: `DynamicFormFields`
+
+Render `DynamicFormFields` inside a `FormProvider` and validate the same content with `getDynamicFieldErrors`:
+
+```tsx
+import DynamicFormFields from "@components/DynamicForm/components/DynamicFormFields";
+import getContentFields from "@components/DynamicForm/utils/getContentFields";
+import getDynamicFieldErrors from "@components/DynamicForm/utils/getDynamicFieldErrors";
+
+<FormProvider
+  formID={ONYXKEYS.FORMS.SOME_FORM}
+  submitButtonText={translate("common.save")}
+  validate={(values) => getDynamicFieldErrors(getContentFields(content), values, translate)}
+  onSubmit={onSubmit}
+>
+  {({ inputValues }) => <DynamicFormFields content={content} values={inputValues} />}
+</FormProvider>;
+```
+
+Pass `inputValues` from the render prop, so `showWhen` and `dependsOn` react to the user's answers as they type. When `content` is one page of a bigger form, pass the whole form as `allFields`, since a field can depend on an answer asked on another page. Outside `DynamicFormFlow`, list entries are edited in a modal.
+
+## Pages
+
+A page is a heading with its own `content`: `key`, `title` or `titleKey`, `description` or `descriptionKey`, and an optional `showWhen`. Its `content` holds headings and fields in screen order. An item without a `type` is a heading; a heading shows only while its `showWhen` matches and a visible field follows it before the next heading.
+
+When the schema is a flat `{fields}` list, the App builds the pages:
+
+- Addresses, files, multi-selects, lists, dependent selects and selects with more than 10 options get a page of their own.
+- Other fields share a page, up to 4 in a row.
+- A field with `showWhen` joins the page of its controller and does not count toward that limit.
+
+A page is shown while its own `showWhen` matches and it has a visible field; a page that is not shown is skipped, and its fields are neither asked nor submitted. A page without a title is named after its only question, else after its first visible field. Page keys become route segments, so they are made URL-safe and unique, and `confirm` is reserved for the confirmation page.
+
+## The field format
+
+`DynamicFormField` in `src/types/onyx/DynamicFormField.ts` is the contract with the server. Each `type` has its own variant, so a property such as `rule` or `currencyKey` only exists on the types that use it.
+
+| Type                 | Input                                                                                                                                     | Type-specific properties                                                                              |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `text`               | `TextInput`                                                                                                                               | `regex`, `minLength`, `maxLength`, `example`, `keyboard`, `multiline`, `rule: 'legalName' \| 'phone'` |
+| `number`             | `TextInput` with the numeric keyboard                                                                                                     | `regex`, `minLength`, `maxLength`, `example`                                                          |
+| `select`             | `ValuePicker`, or `PushRowWithModal` above 8 options                                                                                      | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
+| `radio`              | `RadioButtons`                                                                                                                            | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
+| `multiselect`        | `PushRowWithModal` with checkboxes and a Save button                                                                                      | `values`, `dependsOn`                                                                                 |
+| `date`               | `DatePicker`                                                                                                                              | `rule: 'dateOfBirth'`                                                                                 |
+| `boolean`            | `CheckboxWithLabel`, which must be ticked when required. Alone on its page, Yes and No radio buttons, where No is an answer.              |                                                                                                       |
+| `country`            | `CountryPicker`                                                                                                                           |                                                                                                       |
+| `countryMultiselect` | `PushRowWithModal` with every country                                                                                                     |                                                                                                       |
+| `currency`           | `CurrencyPicker`                                                                                                                          |                                                                                                       |
+| `address`            | The standard address form. The street is the field's value; the other parts are stored under `<key>.city`, `<key>.zipCode` and so on.     | `rule: 'zipCode'`                                                                                     |
+| `file`               | `UploadFile` for PDF, JPG and PNG files, taking one file unless `maxFiles` allows more                                                    | `maxFiles`, `maxFileSize`                                                                             |
+| `amount`             | `AmountForm`. With `currencyKey`, a `CurrencyPicker` above it saves the currency under that key.                                          | `currencyKey`                                                                                         |
+| `percent`            | `PercentageForm`, from 1 to 100                                                                                                           |                                                                                                       |
+| `list`               | Rows with Add, Edit and Remove. Each entry is edited on its own page in the flow, or in a modal outside it.                               | `itemFields`, `itemLabel`, `addItemDescription`, `minItems`, `maxItems`                               |
+
+Every type also takes:
+
+- `key`: unique within the form, and the field's draft key. A field without one is left out and logged.
+- `label` or `labelKey`, and the same pair for `description`. A `*Key` is our translation and wins over the server's wording.
+- `required`. An optional address the user has started filling in is checked like a required one, so it is never sent in part.
+- `readonly`: shown as a row with its value, never edited or validated
+- `sensitive`: kept out of the form draft, see below
+- `showWhen`: shown only while another answer is one of the listed values. A list answer counts when any chosen value matches. A field whose controlling field is hidden stays hidden.
+- `refreshOnChange`: see `onRefreshRequirements` above
+
+A choice or list field that is the only question on its page is drawn as the page itself, as an inline list, and the page title asks the question in place of its label. Fields it reveals, such as an "Other" description, do not count, so the layout stays put when they appear. On a page with several questions, every choice, tabs included, shows its question above it.
+
+`maxFileSize` comes from the field when the schema sets it, else from the `maxFileSize` the screen passes. With neither, files of any size are taken.
+
+The server can send a type this App version does not know. The schema is typed `DynamicFormSchemaField` for that reason: such a field is left out and logged once, so a newer schema never blocks the form.
+
+## Privacy and accessibility
+
+- Every field row, read-only rows included, every confirmation row and the list entry editor are masked in session recordings. The mask sits on the row's `View`, so it also covers inputs that do not pass a FullStory class on, such as `CountryPicker`.
+- The confirmation before removing a list entry names the entry only in its masked prompt, since the modal title cannot be masked.
+- Radio buttons, Yes/No questions and tabs are named after their question for screen readers, and the bold labels above addresses, files and lists are headings.
+
+## Sensitive answers
+
+`sensitive` answers, such as SSNs, never reach the form draft. `DynamicFormFlow` keeps them in memory, in the RAM-only `ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS`, for one visit:
+
+- They are cleared when a new visit opens without a page in the route, and when the user leaves from the first page.
+- They are cleared once `isSubmitting` turns false without `submitError`, or right after `onSubmit` when the screen passes no `isSubmitting`.
+- They are never passed to `onPageSubmit`, since a page save would persist them in the request queue.
+- The confirmation page shows only their last four characters, as in `•••-••-6789` for an SSN.
+
+## List fields
+
+A `list` field holds repeated entries, such as a company's owners. Its value is an array of entries, each holding its answers keyed by item field key and an `id` made on the device.
+
+- In the flow each entry is edited on its own page, using the `dynamicFormListItemForm` form, which the page fills with the entry's answers when it opens and empties when it closes. The modal outside the flow does the same. These pages come after the confirmation page and Next and Back skip them, so only Add, Edit or an entry's row opens them.
+- Saving an entry drafts the list right away. Leaving the list page with Next drops the sensitive answers of entries the user removed.
+- Sensitive entry answers are kept in memory per entry and are sent back with their entry on submit. They are checked with their entry, so one lost with the memory, such as after a restart, is asked for again.
+- A list marked `sensitive` is kept in memory whole and never drafted.
+- On the confirmation page each entry is a row of its own, with a letter avatar, that opens the entry. An empty list is a plain row that opens its page.
+- `minItems`, `maxItems` and the first entry with a problem show as the list's error.
+
+## Adding a field type
+
+1. Add a variant to `DynamicFormField`.
+2. Typecheck then points at every place that has to handle it: the renderers in `renderers/`, the validators in `utils/getDynamicFieldErrors.ts`, the supported types in `utils/isSupportedField.ts` and the input map in `DynamicFormFieldsTest.tsx`.
+3. Map the field onto an existing input component. If the component's props do not fit a form input, add a thin adapter in `adapters/`: it takes `value`, `onInputChange` and `errorText`, renders one existing component, reads no Onyx and navigates nowhere, and passes `forwardedFSClass` on so the answer stays masked. If no component fits, add the input outside `DynamicForm` first, so other forms can use it too.
diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
index 0880ce415641..478b1245f47b 100644
--- a/contributingGuides/FORMS.md
+++ b/contributingGuides/FORMS.md
@@ -341,6 +341,8 @@ InputWrapper component will automatically provide the following props to any inp
 
 ## Dynamic Form Inputs
 
+For forms whose fields are described by data rather than JSX, use the schema-driven renderer in [DYNAMIC_FORMS.md](DYNAMIC_FORMS.md).
+
 It's possible to conditionally render inputs (or more complex components with multiple inputs) inside a form. For example, an IdentityForm might be nested as input for a Form component.
 In order for Form to track the nested values properly, each field must have a unique identifier. It's not safe to use an index because adding or removing fields from the child Form component will not update these internal keys. Therefore, we will need to define keys and dynamically access the correlating child form data for validation/submission.
 
diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index d987c6808dac..510105895e1a 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -10319,6 +10319,9 @@ const CONST = {
         UPLOAD_FILE: {
             REMOVE_BUTTON: 'UploadFile-RemoveButton',
         },
+        LIST_FIELD: {
+            REMOVE_BUTTON: 'ListField-RemoveButton',
+        },
         BANK_ACCOUNT: {
             DATA_SECURE_LINK: 'BankAccount-DataSecureLink',
         },
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 55dd5da845a8..7d67a543d38f 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1219,6 +1219,8 @@ const ONYXKEYS = {
         COLLECT_DEPOSIT_ACCOUNT_FORM_DRAFT: 'collectDepositAccountFormDraft',
         INTERNATIONAL_BANK_ACCOUNT_FORM: 'internationalBankAccountForm',
         INTERNATIONAL_BANK_ACCOUNT_FORM_DRAFT: 'internationalBankAccountFormDraft',
+        DYNAMIC_FORM_LIST_ITEM_FORM: 'dynamicFormListItemForm',
+        DYNAMIC_FORM_LIST_ITEM_FORM_DRAFT: 'dynamicFormListItemFormDraft',
         NEW_ROOM_FORM: 'newRoomForm',
         NEW_ROOM_FORM_DRAFT: 'newRoomFormDraft',
         NEW_TASK_FORM: 'newTaskForm',
@@ -1558,6 +1560,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.MERGE_ACCOUNT_DETAILS_FORM]: FormTypes.MergeAccountDetailsForm;
     [ONYXKEYS.FORMS.COLLECT_DEPOSIT_ACCOUNT_FORM]: FormTypes.CollectDepositAccountForm;
     [ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM]: FormTypes.InternationalBankAccountForm;
+    [ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM]: FormTypes.DynamicFormListItemForm;
     [ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM]: FormTypes.WorkspacePerDiemForm;
     [ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS]: FormTypes.EnableGlobalReimbursementsForm;
     [ONYXKEYS.FORMS.SEARCH_EDIT_MULTIPLE_DESCRIPTION_FORM]: FormTypes.SearchEditMultipleDescriptionForm;
diff --git a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
new file mode 100644
index 000000000000..9d498dec7637
--- /dev/null
+++ b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
@@ -0,0 +1,161 @@
+import DynamicFormListItemModal from '@components/DynamicForm/components/DynamicFormListItemModal';
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
+import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
+import ListField from '@components/ListField';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+import Text from '@components/Text';
+
+import useConfirmModal from '@hooks/useConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+
+import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
+
+import {clearListItemEdit, startListItemEdit} from '@userActions/DynamicForm';
+
+import CONST from '@src/CONST';
+import type {DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
+
+import type {ComponentProps, ReactNode} from 'react';
+
+import {Str} from 'expensify-common';
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' | 'addDescription'> &
+    ForwardedFSClassProps & {
+        /** Entries added so far */
+        value?: DynamicFormListItem[];
+
+        /** Called with every entry after one is added, edited or removed */
+        onInputChange?: (value: DynamicFormListItem[]) => void;
+
+        /** Validation error shown under the list */
+        errorText?: string;
+
+        /** Titles the modal editor of an entry whose answers give it no name */
+        label: string;
+
+        /** What one entry is, such as "owner", for the remove confirmation */
+        itemLabel?: string;
+
+        /** The fields of one entry, which name and describe its row */
+        itemFields: DynamicFormField[];
+
+        /** Hides the add row once the list holds this many entries */
+        maxItems?: number;
+
+        /** Opens the flow's editor page for a new entry. Without it, entries are edited in a modal on this page. */
+        onAdd?: () => void;
+
+        /** Opens the flow's editor page of an entry */
+        onEdit?: (itemID: string) => void;
+
+        /** Draws the entry's fields inside the modal editor */
+        renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
+    };
+
+/** The entries of a list field as rows. Removing one updates FormProvider's value; adding and editing open the flow's editor page, or a modal outside the flow. */
+function ListFieldAdapter({
+    value,
+    onInputChange = () => {},
+    errorText,
+    label,
+    itemLabel,
+    itemFields,
+    maxItems,
+    addTitle,
+    addDescription,
+    onAdd,
+    onEdit,
+    renderFields,
+    forwardedFSClass,
+}: ListFieldAdapterProps) {
+    const {translate} = useLocalize();
+    const {showConfirmModal} = useConfirmModal();
+    const [editingID, setEditingID] = useState<string>();
+    const items = Array.isArray(value) ? value : [];
+    const editingItem = items.find((item) => item.id === editingID);
+    const editingTitle = editingItem ? summarizeListItem(editingItem, itemFields, translate).title : '';
+    let modalTitle = addTitle;
+    if (editingItem) {
+        modalTitle = editingTitle === '' ? label : editingTitle;
+    }
+    const sensitiveKeys = new Set(itemFields.filter(isSensitiveField).map((field) => field.key));
+
+    // Sensitive answers are not drafted, so the modal shows them blank and a blank one keeps the stored answer
+    const openModal = (item?: DynamicFormListItem) => {
+        const answers = Object.fromEntries(Object.entries(item ?? {}).filter(([key]) => key !== 'id' && !sensitiveKeys.has(key)));
+        startListItemEdit(answers).then(() => setEditingID(item?.id ?? Str.guid()));
+    };
+
+    const closeModal = () => {
+        setEditingID(undefined);
+        clearListItemEdit();
+    };
+
+    const saveItem = (answers: DynamicFormValues) => {
+        if (!editingID) {
+            return;
+        }
+        const item: DynamicFormListItem = {...answers, id: editingID};
+        onInputChange(editingItem ? items.map((existing) => (existing.id === editingID ? item : existing)) : [...items, item]);
+        closeModal();
+    };
+
+    // The modal title takes no FullStory class, so only the masked prompt names the entry
+    const confirmRemoval = (id: string) => {
+        const item = items.find((candidate) => candidate.id === id);
+        if (!item) {
+            return;
+        }
+        showConfirmModal({
+            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+            title: itemLabel ? translate('dynamicForm.removeItemTitle', {item: itemLabel}) : translate('common.remove'),
+            prompt: (
+                <View fsClass={forwardedFSClass}>
+                    <Text>{translate('dynamicForm.removeItemPrompt', {name: summarizeListItem(item, itemFields, translate).title})}</Text>
+                </View>
+            ),
+            confirmText: translate('common.remove'),
+            cancelText: translate('common.cancel'),
+        }).then(({action}) => {
+            if (action !== ModalActions.CONFIRM) {
+                return;
+            }
+            onInputChange(items.filter((candidate) => candidate.id !== id));
+        });
+    };
+
+    // ListField takes no FullStory class, so the mask goes on a View around it
+    return (
+        <>
+            <View fsClass={forwardedFSClass}>
+                <ListField
+                    addTitle={addTitle}
+                    addDescription={addDescription}
+                    rows={items.map((item) => ({id: item.id, ...summarizeListItem(item, itemFields, translate)}))}
+                    canAddMore={maxItems === undefined || items.length < maxItems}
+                    errorText={errorText}
+                    onAdd={onAdd ?? (() => openModal())}
+                    onEdit={onEdit ?? ((id) => openModal(items.find((item) => item.id === id)))}
+                    onRemove={confirmRemoval}
+                />
+            </View>
+            {!onAdd && (
+                <DynamicFormListItemModal
+                    isVisible={!!editingID}
+                    title={modalTitle}
+                    itemFields={itemFields}
+                    forwardedFSClass={forwardedFSClass}
+                    keptAnswers={Object.fromEntries(Object.entries(editingItem ?? {}).filter(([key]) => sensitiveKeys.has(key)))}
+                    renderFields={renderFields}
+                    onSave={saveItem}
+                    onClose={closeModal}
+                />
+            )}
+        </>
+    );
+}
+
+export default ListFieldAdapter;
diff --git a/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx b/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
index 5680ea397ca3..063feebcbe28 100644
--- a/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormConfirmationPage.tsx
@@ -9,7 +9,7 @@ import CONST from '@src/CONST';
 import React from 'react';
 
 /** The last page of a dynamic form flow: every answer as a row the user can tap to edit, and a Confirm button */
-function DynamicFormConfirmationPage({isEditing, onNext, onMove, pages, allFields, values, confirmationTitle, isSubmitting, submitError}: DynamicFormSubPageProps) {
+function DynamicFormConfirmationPage({isEditing, onNext, onMove, pages, allFields, values, confirmationTitle, isSubmitting, submitError, onOpenListItemEditor}: DynamicFormSubPageProps) {
     const {translate} = useLocalize();
 
     return (
@@ -19,7 +19,7 @@ function DynamicFormConfirmationPage({isEditing, onNext, onMove, pages, allField
             onNext={() => onNext()}
             onMove={onMove}
             pageTitle={confirmationTitle}
-            groups={getConfirmationItems(pages, allFields, values, translate, onMove)}
+            groups={getConfirmationItems(pages, allFields, values, translate, onMove, onOpenListItemEditor)}
             showOnfidoLinks={false}
             isLoading={isSubmitting}
             error={submitError}
diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index 2bfe99ec849f..06b51f2842f6 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -1,4 +1,5 @@
 import renderDynamicField from '@components/DynamicForm/renderDynamicField';
+import type {DynamicFieldContext} from '@components/DynamicForm/renderers/types';
 import formatDynamicFieldValue from '@components/DynamicForm/utils/formatDynamicFieldValue';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
@@ -16,8 +17,9 @@ import {View} from 'react-native';
 
 import type {DynamicFormFieldsProps} from './DynamicFormFields';
 
-type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onRefreshRequirements'> &
-    Required<Pick<DynamicFormFieldsProps, 'currency'>> & {
+type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onRefreshRequirements' | 'onOpenListItemEditor'> &
+    Required<Pick<DynamicFormFieldsProps, 'currency'>> &
+    Pick<DynamicFieldContext, 'renderFields'> & {
         field: DynamicFormField;
 
         /** The field is the page's only question, so a choice is drawn as the page itself instead of as a row */
@@ -31,14 +33,27 @@ type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFile
 const TYPED_FIELD_TYPES = new Set<DynamicFormFieldType>(['text', 'number', 'amount', 'percent']);
 
 /** One field of a schema-driven form: its input, or its value when the field is readonly */
-function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField, shouldHideLabel = false, onRefreshRequirements}: DynamicFormFieldRowProps) {
+function DynamicFormFieldRow({
+    field,
+    values,
+    currency,
+    maxFileSize,
+    isLoneField,
+    shouldHideLabel = false,
+    onRefreshRequirements,
+    onOpenListItemEditor,
+    renderFields,
+}: DynamicFormFieldRowProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const label = getFieldLabel(field, translate);
 
     if (field.readonly) {
         return (
-            <View style={[styles.mhn5, styles.pv1]}>
+            <View
+                style={[styles.mhn5, styles.pv1]}
+                fsClass={CONST.FULLSTORY.CLASS.MASK}
+            >
                 <MenuItemWithTopDescription
                     interactive={false}
                     description={label}
@@ -60,7 +75,7 @@ function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField,
     const shouldRefreshOnChange = !!field.refreshOnChange && !isTypedField;
     const {input, isMenuRow, labelAbove, showsDescription} = renderDynamicField(
         field,
-        {values, translate, styles, currency, maxFileSize, isLoneField},
+        {values, translate, styles, currency, maxFileSize, isLoneField, onOpenListItemEditor, renderFields},
         {
             inputID: field.key,
             shouldSaveDraft: !isSensitiveField(field),
@@ -71,8 +86,12 @@ function DynamicFormFieldRow({field, values, currency, maxFileSize, isLoneField,
     );
     const description = showsDescription ? undefined : getLocalizedText(translate, field.descriptionKey, field.description);
 
+    // Some inputs, such as CountryPicker, do not pass the FullStory class on, so the whole row is masked
     return (
-        <View style={isMenuRow ? [styles.mhn5, styles.pv1] : styles.pv2}>
+        <View
+            style={isMenuRow ? [styles.mhn5, styles.pv1] : styles.pv2}
+            fsClass={CONST.FULLSTORY.CLASS.MASK}
+        >
             {!!labelAbove && !shouldHideLabel && (
                 <Text
                     style={[labelAbove === 'prompt' ? styles.mt3 : [styles.textStrong, styles.mb3], isMenuRow && styles.ph5]}
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index 4f237e25865b..ab640e9bf146 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -33,12 +33,32 @@ type DynamicFormFieldsProps = {
 
     /** Called when the user changes a field marked `refreshOnChange`, with the draft key that changed, so the screen can fetch the schema again */
     onRefreshRequirements?: (inputID: string, value: FormValue) => void;
+
+    /** Opens the editor page of a list entry, or of a new one without `itemID`. DynamicFormFlow passes it; without it list entries are edited in a modal. */
+    onOpenListItemEditor?: (listKey: string, itemID?: string) => void;
 };
 
 /** The inputs of a schema-driven form. Render it inside a FormProvider and validate the fields of the same content with getDynamicFieldErrors. */
-function DynamicFormFields({content, values, allFields, isTitledByPage = false, currency = CONST.CURRENCY.USD, maxFileSize, onRefreshRequirements}: DynamicFormFieldsProps) {
+function DynamicFormFields({
+    content,
+    values,
+    allFields,
+    isTitledByPage = false,
+    currency = CONST.CURRENCY.USD,
+    maxFileSize,
+    onRefreshRequirements,
+    onOpenListItemEditor,
+}: DynamicFormFieldsProps) {
     const visibleContent = getVisibleContent(content, values, allFields);
     const loneField = getLoneField(getContentFields(visibleContent));
+    const renderFields = (itemFields: DynamicFormField[], itemValues: DynamicFormValues) => (
+        <DynamicFormFields
+            content={itemFields}
+            values={itemValues}
+            currency={currency}
+            maxFileSize={maxFileSize}
+        />
+    );
 
     return visibleContent.map((item, index) =>
         isHeading(item) ? (
@@ -57,6 +77,8 @@ function DynamicFormFields({content, values, allFields, isTitledByPage = false,
                 isLoneField={item === loneField}
                 shouldHideLabel={isTitledByPage && item === loneField}
                 onRefreshRequirements={onRefreshRequirements}
+                onOpenListItemEditor={onOpenListItemEditor}
+                renderFields={renderFields}
             />
         ),
     );
diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
index 4b0cd5549e65..edcf86faecee 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -30,6 +30,7 @@ function DynamicFormFieldsPage({
     maxFileSize,
     onRefreshRequirements,
     onPageSubmit,
+    onOpenListItemEditor,
 }: DynamicFormSubPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -78,6 +79,7 @@ function DynamicFormFieldsPage({
                             currency={currency}
                             maxFileSize={maxFileSize}
                             onRefreshRequirements={onRefreshRequirements}
+                            onOpenListItemEditor={onOpenListItemEditor}
                         />
                     </>
                 );
diff --git a/src/components/DynamicForm/components/DynamicFormListItemModal.tsx b/src/components/DynamicForm/components/DynamicFormListItemModal.tsx
new file mode 100644
index 000000000000..b13b450d76f4
--- /dev/null
+++ b/src/components/DynamicForm/components/DynamicFormListItemModal.tsx
@@ -0,0 +1,94 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
+import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
+import FormProvider from '@components/Form/FormProvider';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {DynamicFormField} from '@src/types/onyx';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+import type {ReactNode} from 'react';
+
+import React from 'react';
+
+type DynamicFormListItemModalProps = ForwardedFSClassProps & {
+    /** Whether the modal is open */
+    isVisible: boolean;
+
+    /** Header title: the entry's name, or the add title for a new entry */
+    title: string;
+
+    /** The fields of one entry */
+    itemFields: DynamicFormField[];
+
+    /** Answers the form cannot show, such as stored sensitive ones, used when the user leaves them blank */
+    keptAnswers: DynamicFormValues;
+
+    /** Draws the entry's fields inside the modal's form */
+    renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
+
+    /** Called with the entry's answers when the user saves */
+    onSave: (answers: DynamicFormValues) => void;
+
+    /** Called when the user closes the modal without saving */
+    onClose: () => void;
+};
+
+/** The editor of one list entry outside DynamicFormFlow, as a modal over the page holding the list */
+function DynamicFormListItemModal({isVisible, title, itemFields, keptAnswers, renderFields, onSave, onClose, forwardedFSClass}: DynamicFormListItemModalProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [, itemDraftMetadata] = useOnyx(ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM_DRAFT);
+    const withKeptAnswers = (inputValues: unknown): DynamicFormValues => {
+        const answers = toDynamicFormValues(inputValues);
+        const keptBlankAnswers = Object.entries(keptAnswers).filter(([key]) => (answers[key] ?? '') === '');
+        return {...answers, ...Object.fromEntries(keptBlankAnswers)};
+    };
+
+    return (
+        <Modal
+            onClose={onClose}
+            isVisible={isVisible}
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            shouldUseCustomBackdrop
+            shouldHandleNavigationBack
+        >
+            <ScreenWrapper
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID="DynamicFormListItemModal"
+                forwardedFSClass={forwardedFSClass}
+            >
+                <HeaderWithBackButtonAndTitle
+                    title={title}
+                    onBackButtonPress={onClose}
+                />
+                {isVisible && !isLoadingOnyxValue(itemDraftMetadata) && (
+                    <FormProvider
+                        formID={ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM}
+                        submitButtonText={translate('common.save')}
+                        validate={(inputValues) => getDynamicFieldErrors(itemFields, withKeptAnswers(inputValues), translate)}
+                        onSubmit={(inputValues) => onSave(withKeptAnswers(inputValues))}
+                        style={[styles.mh5, styles.flexGrow1]}
+                        submitButtonStyles={styles.mb0}
+                        enabledWhenOffline
+                    >
+                        {({inputValues}) => renderFields(itemFields, toDynamicFormValues(inputValues))}
+                    </FormProvider>
+                )}
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+export default DynamicFormListItemModal;
diff --git a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
new file mode 100644
index 000000000000..c3d829edad41
--- /dev/null
+++ b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
@@ -0,0 +1,89 @@
+import type {DynamicFormSubPageProps} from '@components/DynamicForm/types';
+import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
+import getLocalizedText from '@components/DynamicForm/utils/getLocalizedText';
+import {getListItems, getListItemSensitiveAnswers, parseListItemPageName} from '@components/DynamicForm/utils/listItems';
+import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
+import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
+import FormProvider from '@components/Form/FormProvider';
+import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearListItemEdit, startListItemEdit} from '@userActions/DynamicForm';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {DynamicFormListField} from '@src/types/onyx';
+
+import React, {useEffect, useState} from 'react';
+
+import DynamicFormFields from './DynamicFormFields';
+
+/** The editor of one list entry, or of a new one: the entry's fields and a Save button */
+function DynamicFormListItemPage({currentPageName, allFields, values, currency, maxFileSize, onListItemSave}: DynamicFormSubPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const page = parseListItemPageName(currentPageName);
+    const listField = allFields.find((field): field is DynamicFormListField => field.type === 'list' && field.key === page?.listKey);
+    const item = listField ? getListItems(values[listField.key]).find((candidate) => candidate.id === page?.itemID) : undefined;
+    const [filledPageName, setFilledPageName] = useState<string>();
+
+    // The editor form is shared by every entry, so it is filled with this entry's answers before its inputs mount
+    useEffect(() => {
+        let isCancelled = false;
+        startListItemEdit(item ?? {}).then(() => {
+            if (isCancelled) {
+                return;
+            }
+            setFilledPageName(currentPageName);
+        });
+        return () => {
+            isCancelled = true;
+        };
+    }, [currentPageName, item]);
+
+    useEffect(() => clearListItemEdit, []);
+
+    if (!page || !listField) {
+        return null;
+    }
+    if (filledPageName !== currentPageName) {
+        return <FullscreenLoadingIndicator />;
+    }
+    const sensitiveAnswers = item ? getListItemSensitiveAnswers(listField, item.id, values) : {};
+    const withInputValues = (inputValues: unknown) => ({...sensitiveAnswers, ...toDynamicFormValues(inputValues)});
+    const itemLabel = getLocalizedText(translate, listField.itemLabelKey, listField.itemLabel);
+    const addTitle = itemLabel ? translate('dynamicForm.addItem', {item: itemLabel}) : translate('common.add');
+    const itemTitle = item ? summarizeListItem(item, listField.itemFields, translate).title : '';
+    const title = itemTitle === '' ? addTitle : itemTitle;
+
+    return (
+        <FormProvider
+            formID={ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM}
+            forwardedFSClass={CONST.FULLSTORY.CLASS.MASK}
+            submitButtonText={translate('common.save')}
+            validate={(inputValues) => getDynamicFieldErrors(listField.itemFields, withInputValues(inputValues), translate)}
+            onSubmit={(inputValues) => onListItemSave(listField.key, item?.id, withInputValues(inputValues))}
+            style={[styles.mh5, styles.flexGrow1]}
+            submitButtonStyles={styles.mb0}
+            keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}
+            enabledWhenOffline
+        >
+            {({inputValues}) => (
+                <>
+                    <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{title}</Text>
+                    <DynamicFormFields
+                        content={listField.itemFields}
+                        values={withInputValues(inputValues)}
+                        currency={currency}
+                        maxFileSize={maxFileSize}
+                    />
+                </>
+            )}
+        </FormProvider>
+    );
+}
+
+export default DynamicFormListItemPage;
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index db49583655f3..901aae2671ca 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -7,19 +7,21 @@ import useSubPage from '@hooks/useSubPage';
 import Navigation from '@libs/Navigation/Navigation';
 import {findLastPageIndex} from '@libs/SubPageUtils';
 
-import {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
+import {clearSensitiveAnswers, forgetSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {DynamicFormPage} from '@src/types/onyx';
+import type {DynamicFormListField, DynamicFormListItem, DynamicFormPage} from '@src/types/onyx';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
+import {Str} from 'expensify-common';
 import React, {useEffect, useRef, useState} from 'react';
 
 import type {DynamicFormFlowProps, DynamicFormSubPageProps, DynamicFormValues} from './types';
 
 import DynamicFormConfirmationPage from './components/DynamicFormConfirmationPage';
 import DynamicFormFieldsPage from './components/DynamicFormFieldsPage';
+import DynamicFormListItemPage from './components/DynamicFormListItemPage';
 import DynamicFormShell from './components/DynamicFormShell';
 import getContentFields from './utils/getContentFields';
 import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
@@ -27,6 +29,7 @@ import getPageTitle, {isPageShown} from './utils/getPageTitle';
 import getSubmittedAnswers, {getAnswerKeys} from './utils/getSubmittedAnswers';
 import isSensitiveField from './utils/isSensitiveField';
 import isSupportedField from './utils/isSupportedField';
+import {getListItemPageName, getListItems, getListItemSensitiveKey, getRemovedListItemSensitiveKeys, parseListItemPageName} from './utils/listItems';
 import {getAllFields, getPages} from './utils/paginate';
 import toDynamicFormValues from './utils/toDynamicFormValues';
 
@@ -64,17 +67,22 @@ function DynamicFormFlow({
 
     const pages = getPages(schema);
     const allFields = getAllFields(pages);
+    const listFields = allFields.filter((field): field is DynamicFormListField => field.type === 'list');
     const shownPages = pages.filter((page) => isPageShown(page, values, allFields));
     const hasPageToShow = shownPages.length > 0;
 
     // useSubPage needs at least one page, so a form without pages gets the confirmation page
     const hasConfirmationPage = pages.length === 0 || hasConfirmation;
+    // Entry editors come after the confirmation page and are skipped by Next and Back, so only an entry's Add, Edit or row opens them
+    const listItemPageNames = listFields.flatMap((field) => [getListItemPageName(field.key), ...getListItems(values[field.key]).map((item) => getListItemPageName(field.key, item.id))]);
     const subPages = [
         ...pages.map((page) => ({pageName: page.key, component: DynamicFormFieldsPage})),
         ...(hasConfirmationPage ? [{pageName: CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY, component: DynamicFormConfirmationPage}] : []),
+        ...listItemPageNames.map((pageName) => ({pageName, component: DynamicFormListItemPage})),
     ];
     // While nothing is shown no page is skipped, since useSubPage needs a page that is not skipped
-    const skipPages = hasPageToShow ? pages.filter((page) => !shownPages.includes(page)).map((page) => page.key) : [];
+    const skippedPages = hasPageToShow ? pages.filter((page) => !shownPages.includes(page)) : [];
+    const skipPages = [...skippedPages.map((page) => page.key), ...listItemPageNames];
     const firstShownPageIndex = subPages.findIndex((page) => !skipPages.includes(page.pageName));
     const lastShownPageIndex = findLastPageIndex<DynamicFormSubPageProps>(subPages, skipPages);
 
@@ -127,7 +135,9 @@ function DynamicFormFlow({
         onSubmit(submittedAnswers);
     }
 
-    const isOnSkippedPage = !!currentPageName && skipPages.includes(currentPageName);
+    const listItemPage = parseListItemPageName(currentPageName);
+    const findListPage = (listKey: string) => pages.find((page) => getContentFields(page.content).some((field) => field.key === listKey));
+    const isOnSkippedPage = !listItemPage && !!currentPageName && skipPages.includes(currentPageName);
     const isOnUnavailablePage = !isDraftLoading && !isRedirecting && (!subPages.some((page) => page.pageName === currentPageName) || isOnSkippedPage);
 
     useEffect(() => {
@@ -164,17 +174,21 @@ function DynamicFormFlow({
         Navigation.navigate(buildRoute(unavailablePageTarget), {forceReplace: true});
     }, [isOnUnavailablePage, buildRoute, unavailablePageTarget]);
 
-    /** Typed answers are drafted as FormProvider cleaned them and inputs left untouched are drafted with their defaults, so the draft matches what the page validated. Sensitive answers go to memory only, and only the draft ones reach the screen. */
+    /** Typed answers are drafted as FormProvider cleaned them and inputs left untouched are drafted with their defaults, so the draft matches what the page validated. Sensitive answers go to memory only, and only the draft ones reach the screen. Lists are drafted as they change, so the screen gets their drafted entries, which hold no sensitive answers. */
     const handlePageSubmit = (page: DynamicFormPage, pageValues: DynamicFormValues) => {
         const currentValues = {...values, ...pageValues};
         const pageFields = getContentFields(page.content).filter(isSupportedField);
         const answers = getSubmittedAnswers(pageFields, currentValues, allFields);
         const sensitiveKeys = new Set(pageFields.filter((field) => isSensitiveField(field)).flatMap((field) => getAnswerKeys(field)));
+        const listKeys = new Set(listFields.map((field) => field.key));
         const draftAnswers: DynamicFormValues = {};
+        const listAnswers: DynamicFormValues = {};
         const sensitiveAnswers: DynamicFormValues = {};
         for (const [key, answer] of Object.entries(answers)) {
             if (sensitiveKeys.has(key)) {
                 sensitiveAnswers[key] = answer;
+            } else if (listKeys.has(key)) {
+                listAnswers[key] = getListItems(currentValues[key]);
             } else {
                 draftAnswers[key] = answer;
             }
@@ -183,10 +197,55 @@ function DynamicFormFlow({
         if (Object.keys(sensitiveAnswers).length > 0) {
             saveSensitiveAnswers(formID, sensitiveAnswers);
         }
-        onPageSubmit?.(page, draftAnswers);
+        const removedSensitiveKeys = listFields.filter((field) => pageFields.includes(field)).flatMap((field) => getRemovedListItemSensitiveKeys(field, currentValues));
+        if (removedSensitiveKeys.length > 0) {
+            forgetSensitiveAnswers(formID, removedSensitiveKeys);
+        }
+        onPageSubmit?.(page, {...draftAnswers, ...listAnswers});
+    };
+
+    /** An entry opened from the confirmation page, or from a page edited from it, returns there */
+    const closeListItemEditor = (listKey: string) => {
+        const listPage = findListPage(listKey);
+        returnTo(isEditing || !listPage ? CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY : listPage.key);
+    };
+
+    const openListItemEditor = (listKey: string, itemID?: string) => {
+        const editorIndex = subPages.findIndex((page) => page.pageName === getListItemPageName(listKey, itemID));
+        moveTo(editorIndex, isEditing || currentPageName === CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY);
+    };
+
+    /** The entry is drafted with the form, except its sensitive answers, which are kept in memory under the entry. A sensitive list is kept in memory whole. */
+    const saveListItem = (listKey: string, itemID: string | undefined, itemValues: DynamicFormValues) => {
+        const listField = listFields.find((field) => field.key === listKey);
+        if (!listField) {
+            return;
+        }
+        const id = itemID ?? Str.guid();
+        const sensitiveKeys = new Set(listField.itemFields.filter(isSensitiveField).map((field) => field.key));
+        const item: DynamicFormListItem = {id};
+        const sensitiveAnswers: DynamicFormValues = {};
+        for (const [key, answer] of Object.entries(getSubmittedAnswers(listField.itemFields, itemValues))) {
+            if (sensitiveKeys.has(key)) {
+                sensitiveAnswers[getListItemSensitiveKey(listKey, id, key)] = answer;
+            } else {
+                item[key] = answer;
+            }
+        }
+        const items = getListItems(values[listKey]);
+        const saveListAnswer = isSensitiveField(listField) ? saveSensitiveAnswers : saveDraftAnswers;
+        saveListAnswer(formID, {[listKey]: itemID ? items.map((existing) => (existing.id === id ? item : existing)) : [...items, item]});
+        if (Object.keys(sensitiveAnswers).length > 0) {
+            saveSensitiveAnswers(formID, sensitiveAnswers);
+        }
+        closeListItemEditor(listKey);
     };
 
     const goBack = () => {
+        if (listItemPage) {
+            closeListItemEditor(listItemPage.listKey);
+            return;
+        }
         if (isEditing) {
             returnTo(CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY);
             return;
@@ -199,10 +258,11 @@ function DynamicFormFlow({
         prevPage();
     };
 
-    // The confirmation page highlights the last step
+    // An entry editor highlights its list's step, and the confirmation page the last one
+    const stepPage = shownPages.find((page) => page.key === currentPageName) ?? (listItemPage && findListPage(listItemPage.listKey));
     const stepNames = [...shownPages.map((page) => getPageTitle(page, values, translate, allFields)), ...(hasConfirmationPage ? [translate('common.confirm')] : [])];
-    const currentShownPageIndex = shownPages.findIndex((page) => page.key === currentPageName);
-    const stepIndex = currentShownPageIndex === -1 ? stepNames.length - 1 : currentShownPageIndex;
+    const stepPageIndex = stepPage ? shownPages.indexOf(stepPage) : -1;
+    const stepIndex = stepPageIndex === -1 ? stepNames.length - 1 : stepPageIndex;
     // The shell swaps its root when the indicator toggles, which remounts the page. So `auto` decides once, from the answers the draft held on arrival, and keeps it while the user types.
     const [isAutoStepIndicatorAsked, setIsAutoStepIndicatorAsked] = useState<boolean>();
     if (!isDraftLoading && isAutoStepIndicatorAsked === undefined) {
@@ -237,6 +297,8 @@ function DynamicFormFlow({
                     maxFileSize={maxFileSize}
                     onRefreshRequirements={onRefreshRequirements}
                     onPageSubmit={handlePageSubmit}
+                    onOpenListItemEditor={openListItemEditor}
+                    onListItemSave={saveListItem}
                     confirmationTitle={confirmationTitle}
                     isSubmitting={isSubmitting}
                     submitError={submitError}
diff --git a/src/components/DynamicForm/renderDynamicField.tsx b/src/components/DynamicForm/renderDynamicField.tsx
index 63d45bd53110..4517582173b3 100644
--- a/src/components/DynamicForm/renderDynamicField.tsx
+++ b/src/components/DynamicForm/renderDynamicField.tsx
@@ -6,6 +6,7 @@ import type {DynamicFormFieldOfType} from './types';
 import renderAddress from './renderers/addressRenderer';
 import CHOICE_RENDERERS from './renderers/choiceRenderers';
 import renderFile from './renderers/fileRenderer';
+import renderList from './renderers/listRenderer';
 import TEXT_RENDERERS from './renderers/textRenderers';
 
 const RENDERERS: DynamicFieldRendererMap = {
@@ -13,6 +14,7 @@ const RENDERERS: DynamicFieldRendererMap = {
     ...CHOICE_RENDERERS,
     address: renderAddress,
     file: renderFile,
+    list: renderList,
 };
 
 /** The input for one field, and how the renderer lays it out */
diff --git a/src/components/DynamicForm/renderers/listRenderer.tsx b/src/components/DynamicForm/renderers/listRenderer.tsx
new file mode 100644
index 000000000000..b62da9833ac3
--- /dev/null
+++ b/src/components/DynamicForm/renderers/listRenderer.tsx
@@ -0,0 +1,36 @@
+import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
+import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
+import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
+import InputWrapper from '@components/Form/InputWrapper';
+
+import React from 'react';
+
+import type {DynamicFieldRenderer} from './types';
+
+const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField, onOpenListItemEditor, renderFields}, inputProps) => {
+    const itemLabel = getLocalizedText(translate, field.itemLabelKey, field.itemLabel);
+    return {
+        isMenuRow: true,
+        labelAbove: isLoneField ? undefined : 'heading',
+        input: (
+            <InputWrapper
+                InputComponent={ListFieldAdapter}
+                {...inputProps}
+                // Outside the flow sensitive entry answers stay in the list value, which must not reach the draft
+                shouldSaveDraft={inputProps.shouldSaveDraft && (!!onOpenListItemEditor || !field.itemFields.some(isSensitiveField))}
+                valueType="listItems"
+                label={getFieldLabel(field, translate)}
+                itemLabel={itemLabel}
+                itemFields={field.itemFields}
+                maxItems={field.maxItems}
+                addTitle={itemLabel ? translate('dynamicForm.addItem', {item: itemLabel}) : translate('common.add')}
+                addDescription={getLocalizedText(translate, field.addItemDescriptionKey, field.addItemDescription)}
+                onAdd={onOpenListItemEditor && (() => onOpenListItemEditor(field.key))}
+                onEdit={onOpenListItemEditor && ((itemID) => onOpenListItemEditor(field.key, itemID))}
+                renderFields={renderFields}
+            />
+        ),
+    };
+};
+
+export default renderList;
diff --git a/src/components/DynamicForm/renderers/types.ts b/src/components/DynamicForm/renderers/types.ts
index 89825a0825b7..24a1bf72ef88 100644
--- a/src/components/DynamicForm/renderers/types.ts
+++ b/src/components/DynamicForm/renderers/types.ts
@@ -1,22 +1,25 @@
 import type {DynamicFormFieldsProps} from '@components/DynamicForm/components/DynamicFormFields';
-import type {DynamicFormFieldOfType} from '@components/DynamicForm/types';
+import type {DynamicFormFieldOfType, DynamicFormValues} from '@components/DynamicForm/types';
 import type {InputComponentBaseProps} from '@components/Form/types';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 
 import type {ThemeStyles} from '@src/styles';
-import type {DynamicFormFieldType} from '@src/types/onyx';
+import type {DynamicFormField, DynamicFormFieldType} from '@src/types/onyx';
 
-import type {ReactElement} from 'react';
+import type {ReactElement, ReactNode} from 'react';
 
-type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize'> &
+type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onOpenListItemEditor'> &
     Required<Pick<DynamicFormFieldsProps, 'currency'>> & {
         translate: LocalizedTranslate;
         styles: ThemeStyles;
 
         /** The field is the page's only question, so a choice is drawn as the page itself instead of as a row */
         isLoneField: boolean;
+
+        /** Draws a list entry's fields in the modal editor used outside DynamicFormFlow */
+        renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
     };
 
 /** Props every input gets from the renderer */
diff --git a/src/components/DynamicForm/types.ts b/src/components/DynamicForm/types.ts
index c322aede7758..f695504b62ce 100644
--- a/src/components/DynamicForm/types.ts
+++ b/src/components/DynamicForm/types.ts
@@ -73,8 +73,13 @@ type DynamicFormSubPageProps = SubPageProps &
 
         onPageSubmit: (page: DynamicFormPage, pageValues: DynamicFormValues) => void;
 
+        onOpenListItemEditor: NonNullable<DynamicFormFieldsProps['onOpenListItemEditor']>;
+
         /** The last page submits the form, since no confirmation page follows */
         isLastPage: boolean;
+
+        /** Saves a list entry from its editor page. Without `itemID` it adds a new entry. */
+        onListItemSave: (listKey: string, itemID: string | undefined, answers: DynamicFormValues) => void;
     };
 
 export type {DynamicFormFieldOfType, DynamicFormFlowProps, DynamicFormLayout, DynamicFormSubPageProps, DynamicFormValues};
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index a1d2f74782c0..d12307c59348 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -1,8 +1,10 @@
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
-import type {SummaryGroup} from '@components/SubStepForms/ConfirmationStep';
+import type {SummaryGroup, SummaryGroupRow} from '@components/SubStepForms/ConfirmationStep';
 
-import type {DynamicFormField, DynamicFormPage} from '@src/types/onyx';
+import {getLetterAvatarURLForName} from '@libs/UserAvatarUtils';
+
+import type {DynamicFormField, DynamicFormListField, DynamicFormPage} from '@src/types/onyx';
 
 import noop from 'lodash/noop';
 
@@ -13,15 +15,38 @@ import getPageTitle, {isPageShown} from './getPageTitle';
 import getVisibleFields from './getVisibleFields';
 import isSensitiveField from './isSensitiveField';
 import isSupportedField from './isSupportedField';
+import {getListItems} from './listItems';
 import maskSensitiveValue from './maskSensitiveValue';
+import summarizeListItem from './summarizeListItem';
 
-/** One section per shown page holding its visible answers. Tapping a row opens the page to edit; readonly rows open nothing. */
+/** One avatar row per list entry, which opens the entry */
+function getListItemRows(
+    field: DynamicFormListField,
+    values: DynamicFormValues,
+    translate: LocalizedTranslate,
+    onEditListItem: (listKey: string, itemID: string) => void,
+): SummaryGroupRow[] {
+    return getListItems(values[field.key]).map((item) => {
+        const {title, description} = summarizeListItem(item, field.itemFields, translate);
+        return {
+            kind: 'avatar',
+            id: `${field.key}-${item.id}`,
+            title,
+            description,
+            avatarSource: getLetterAvatarURLForName(title),
+            onPress: () => onEditListItem(field.key, item.id),
+        };
+    });
+}
+
+/** One section per shown page holding its visible answers, with each list entry as an avatar row and an empty list as a plain row. Tapping a row opens the page or entry to edit; readonly rows open nothing. */
 function getConfirmationItems(
     pages: DynamicFormPage[],
     allFields: DynamicFormField[],
     values: DynamicFormValues,
     translate: LocalizedTranslate,
     onEditPage: (pageIndex: number) => void,
+    onEditListItem: (listKey: string, itemID: string) => void,
 ): SummaryGroup[] {
     return pages.flatMap((page, pageIndex): SummaryGroup[] => {
         if (!isPageShown(page, values, allFields)) {
@@ -40,18 +65,25 @@ function getConfirmationItems(
             {
                 id: page.key,
                 name: getPageTitle(page, values, translate, allFields),
-                rows: fields.map((field) => {
+                rows: fields.flatMap((field): SummaryGroupRow[] => {
+                    const listItemRows = field.type === 'list' ? getListItemRows(field, values, translate, onEditListItem) : [];
+                    if (listItemRows.length > 0) {
+                        return listItemRows;
+                    }
+
                     const answer = formatDynamicFieldValue(field, values, translate);
                     const isEditable = !field.readonly;
 
-                    return {
-                        id: field.key,
-                        description: getFieldLabel(field, translate),
-                        title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
-                        shouldShowRightIcon: isEditable,
-                        onPress: isEditable ? handleEdit : noop,
-                        interactive: isEditable,
-                    };
+                    return [
+                        {
+                            id: field.key,
+                            description: getFieldLabel(field, translate),
+                            title: isSensitiveField(field) ? maskSensitiveValue(answer) : answer,
+                            shouldShowRightIcon: isEditable,
+                            onPress: isEditable ? handleEdit : noop,
+                            interactive: isEditable,
+                        },
+                    ];
                 }),
             },
         ];
diff --git a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
index 440bf07e6bfc..ba2fc6cc5362 100644
--- a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
+++ b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
@@ -19,6 +19,7 @@ import type {
     DynamicFormChoiceField,
     DynamicFormField,
     DynamicFormFieldType,
+    DynamicFormListField,
     DynamicFormNumberField,
     DynamicFormSchemaField,
     DynamicFormTextField,
@@ -28,6 +29,7 @@ import getAddressInputKeys, {getAddressCountry, isStateAsked} from './getAddress
 import getFieldOptions from './getFieldOptions';
 import getVisibleFields, {getLoneField} from './getVisibleFields';
 import isSupportedField from './isSupportedField';
+import {getListItems, getListItemSensitiveAnswers} from './listItems';
 import logSchemaProblem from './logSchemaProblem';
 
 /** Checks a field the user has answered. Unanswered fields only get the required check. */
@@ -100,6 +102,25 @@ function getMultiChoiceErrors(field: DynamicFormFieldOfType<'multiselect' | 'cou
     return !hasNonStringEntry && keys.every((key) => offeredKeys.has(key)) ? [] : [translate('dynamicForm.error.invalidOption')];
 }
 
+/** The list shows one error, so the first entry with a problem names it. The flow keeps sensitive answers in memory apart from their entry, so one lost with the memory is asked for again. */
+function getListErrors(field: DynamicFormListField, values: DynamicFormValues, translate: LocalizedTranslate): string[] {
+    const items = getListItems(values[field.key]);
+    const messages: string[] = [];
+    if (field.minItems !== undefined && items.length < field.minItems) {
+        messages.push(translate('dynamicForm.error.tooFewItems', {min: field.minItems}));
+    }
+    if (field.maxItems !== undefined && items.length > field.maxItems) {
+        messages.push(translate('dynamicForm.error.tooManyItems', {max: field.maxItems}));
+    }
+    const firstItemError = items
+        .map((item) => Object.values(getDynamicFieldErrors(field.itemFields, {...item, ...getListItemSensitiveAnswers(field, item.id, values)}, translate)).at(0))
+        .find(Boolean);
+    if (firstItemError) {
+        messages.push(firstItemError);
+    }
+    return messages;
+}
+
 /** For inputs that only accept valid answers: UploadFile checks type and count, AmountForm rejects invalid typing */
 const noChecks = () => [];
 
@@ -153,6 +174,7 @@ const VALIDATORS: {[TType in DynamicFormFieldType]: FieldValidator<TType>} = {
         const percent = Number(getStringAnswer(field, values));
         return Number.isFinite(percent) && percent >= PERCENT_MIN && percent <= PERCENT_MAX ? [] : [translate('dynamicForm.error.outOfRange', {min: PERCENT_MIN, max: PERCENT_MAX})];
     },
+    list: getListErrors,
 };
 
 /** An optional address the user has started filling in is checked like a required one, so it is never submitted in part */
diff --git a/src/components/DynamicForm/utils/getSubmittedAnswers.ts b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
index 73cd33252f26..932f2c88ea88 100644
--- a/src/components/DynamicForm/utils/getSubmittedAnswers.ts
+++ b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
@@ -4,6 +4,7 @@ import type {DynamicFormField} from '@src/types/onyx';
 
 import getAddressInputKeys from './getAddressInputKeys';
 import getVisibleFields from './getVisibleFields';
+import {getListItems, getListItemSensitiveAnswers} from './listItems';
 
 /** The draft keys a field writes to: its own, plus its address parts or its chosen currency */
 function getAnswerKeys(field: DynamicFormField): string[] {
@@ -17,7 +18,7 @@ function getAnswerKeys(field: DynamicFormField): string[] {
     }
 }
 
-/** The answers to the fields the user can see, so answers left on fields hidden later are not submitted. Pass the whole form as `allFields` when `fields` is one page of it. */
+/** The answers to the fields the user can see, so answers left on fields hidden later are not submitted. List entries get their sensitive answers back from memory. Pass the whole form as `allFields` when `fields` is one page of it. */
 function getSubmittedAnswers(fields: DynamicFormField[], values: DynamicFormValues, allFields = fields): DynamicFormValues {
     const answers: DynamicFormValues = {};
     for (const field of getVisibleFields(fields, values, allFields)) {
@@ -26,6 +27,12 @@ function getSubmittedAnswers(fields: DynamicFormField[], values: DynamicFormValu
                 answers[key] = values[key];
             }
         }
+        if (field.type === 'list' && values[field.key] !== undefined) {
+            answers[field.key] = getListItems(values[field.key]).map((item) => ({
+                id: item.id,
+                ...getSubmittedAnswers(field.itemFields, {...item, ...getListItemSensitiveAnswers(field, item.id, values)}),
+            }));
+        }
     }
     return answers;
 }
diff --git a/src/components/DynamicForm/utils/isSupportedField.ts b/src/components/DynamicForm/utils/isSupportedField.ts
index 13f3c55328bc..935a777668c9 100644
--- a/src/components/DynamicForm/utils/isSupportedField.ts
+++ b/src/components/DynamicForm/utils/isSupportedField.ts
@@ -17,6 +17,7 @@ const SUPPORTED_FIELD_TYPES: Record<DynamicFormFieldType, true> = {
     file: true,
     amount: true,
     percent: true,
+    list: true,
 };
 
 /** A field of a type this App version does not know, or with no key to store its answer under, is left out, so it neither renders nor blocks submission */
diff --git a/src/components/DynamicForm/utils/listItems.ts b/src/components/DynamicForm/utils/listItems.ts
new file mode 100644
index 000000000000..a4ad3e2fe381
--- /dev/null
+++ b/src/components/DynamicForm/utils/listItems.ts
@@ -0,0 +1,59 @@
+import type {DynamicFormValues} from '@components/DynamicForm/types';
+
+import type {DynamicFormListField, DynamicFormListItem} from '@src/types/onyx';
+
+import isSensitiveField from './isSensitiveField';
+
+const PAGE_NAME_SEPARATOR = '~';
+const NEW_ITEM_ID = 'new';
+
+/** Route segment of a list entry's editor page, or of the page that adds one */
+function getListItemPageName(listKey: string, itemID = NEW_ITEM_ID): string {
+    return `${listKey}${PAGE_NAME_SEPARATOR}${itemID}`;
+}
+
+/** The list key and entry ID an editor page name points at, or undefined for any other page */
+function parseListItemPageName(pageName: string | undefined): {listKey: string; itemID: string | undefined} | undefined {
+    if (!pageName?.includes(PAGE_NAME_SEPARATOR)) {
+        return undefined;
+    }
+    const [listKey = '', itemID] = pageName.split(PAGE_NAME_SEPARATOR);
+    return {listKey, itemID: itemID === NEW_ITEM_ID ? undefined : itemID};
+}
+
+/** Memory key of one sensitive answer of a list entry, since sensitive answers never reach the draft */
+function getListItemSensitiveKey(listKey: string, itemID: string, fieldKey: string): string {
+    return [listKey, itemID, fieldKey].join(PAGE_NAME_SEPARATOR);
+}
+
+function isListItem(value: unknown): value is DynamicFormListItem {
+    return typeof value === 'object' && value !== null && 'id' in value && typeof value.id === 'string';
+}
+
+/** The entries stored under a list field's key, ignoring anything malformed */
+function getListItems(value: unknown): DynamicFormListItem[] {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    const items: unknown[] = value;
+    return items.filter(isListItem);
+}
+
+/** An entry's sensitive answers, keyed by field key, from the answers kept in memory */
+function getListItemSensitiveAnswers(field: DynamicFormListField, itemID: string, values: DynamicFormValues): DynamicFormValues {
+    return Object.fromEntries(
+        field.itemFields.filter(isSensitiveField).flatMap((itemField) => {
+            const answer = values[getListItemSensitiveKey(field.key, itemID, itemField.key)];
+            return answer === undefined ? [] : [[itemField.key, answer]];
+        }),
+    );
+}
+
+/** Memory keys of sensitive answers whose entry the user has removed from the list */
+function getRemovedListItemSensitiveKeys(field: DynamicFormListField, values: DynamicFormValues): string[] {
+    const sensitiveFields = field.itemFields.filter(isSensitiveField);
+    const keptKeys = new Set(getListItems(values[field.key]).flatMap((item) => sensitiveFields.map((itemField) => getListItemSensitiveKey(field.key, item.id, itemField.key))));
+    return Object.keys(values).filter((key) => key.startsWith(`${field.key}${PAGE_NAME_SEPARATOR}`) && !keptKeys.has(key));
+}
+
+export {getListItemPageName, getListItemSensitiveAnswers, getListItemSensitiveKey, getListItems, getRemovedListItemSensitiveKeys, isListItem, parseListItemPageName};
diff --git a/src/components/DynamicForm/utils/paginate.ts b/src/components/DynamicForm/utils/paginate.ts
index 34a1132b2680..986f0d565ad3 100644
--- a/src/components/DynamicForm/utils/paginate.ts
+++ b/src/components/DynamicForm/utils/paginate.ts
@@ -4,7 +4,7 @@ import type {DynamicFormField, DynamicFormPage, DynamicFormSchema, DynamicFormSc
 import getContentFields from './getContentFields';
 import isSupportedField from './isSupportedField';
 
-const OWN_PAGE_TYPES = new Set<DynamicFormField['type']>(['address', 'file', 'multiselect', 'countryMultiselect']);
+const OWN_PAGE_TYPES = new Set<DynamicFormField['type']>(['address', 'file', 'multiselect', 'countryMultiselect', 'list']);
 
 function needsOwnPage(field: DynamicFormField): boolean {
     if (OWN_PAGE_TYPES.has(field.type)) {
@@ -24,7 +24,7 @@ function toSlug(key: string): string {
 }
 
 /**
- * Groups a flat list of fields into pages. Fields that need room (addresses, files, multi-selects, dependent or large selects) get a page of their own,
+ * Groups a flat list of fields into pages. Fields that need room (addresses, files, multi-selects, lists, dependent or large selects) get a page of their own,
  * and the rest share a page up to `MAX_FIELDS_PER_PAGE` in a row. A field with `showWhen` joins the page of its controller and does not count toward that limit.
  * The pages have no title and no key, `getPages` names them.
  */
diff --git a/src/components/DynamicForm/utils/summarizeListItem.ts b/src/components/DynamicForm/utils/summarizeListItem.ts
new file mode 100644
index 000000000000..0074166bbe60
--- /dev/null
+++ b/src/components/DynamicForm/utils/summarizeListItem.ts
@@ -0,0 +1,37 @@
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+import type {DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
+
+import formatDynamicFieldValue from './formatDynamicFieldValue';
+import isSensitiveField from './isSensitiveField';
+
+const DESCRIPTION_ANSWER_LIMIT = 2;
+
+/** Long answers, such as a full address, would crowd the row, so they are left out of its description */
+const TYPES_LEFT_OUT_OF_DESCRIPTION = new Set<DynamicFormField['type']>(['date', 'address', 'country', 'file']);
+
+/** The leading run of text answers names the row, as first and last name do. Up to two short remaining answers describe it. */
+function summarizeListItem(item: DynamicFormListItem, itemFields: DynamicFormField[], translate: LocalizedTranslate): {title: string; description: string} {
+    const shownFields = itemFields.filter((field) => !isSensitiveField(field) && formatDynamicFieldValue(field, item, translate) !== '');
+    const firstTextIndex = shownFields.findIndex((field) => field.type === 'text');
+    const titleFields: DynamicFormField[] = [];
+    for (const field of shownFields.slice(Math.max(firstTextIndex, 0))) {
+        if (field.type !== 'text') {
+            break;
+        }
+        titleFields.push(field);
+    }
+    const firstShownField = shownFields.at(0);
+    if (titleFields.length === 0 && firstShownField) {
+        titleFields.push(firstShownField);
+    }
+    const title = titleFields.map((field) => formatDynamicFieldValue(field, item, translate)).join(' ');
+    const description = shownFields
+        .filter((field) => !titleFields.includes(field) && !TYPES_LEFT_OUT_OF_DESCRIPTION.has(field.type))
+        .slice(0, DESCRIPTION_ANSWER_LIMIT)
+        .map((field) => formatDynamicFieldValue(field, item, translate))
+        .join(', ');
+    return {title, description};
+}
+
+export default summarizeListItem;
diff --git a/src/components/DynamicForm/utils/toDynamicFormValues.ts b/src/components/DynamicForm/utils/toDynamicFormValues.ts
index 2d25c264db05..fa24cb81af08 100644
--- a/src/components/DynamicForm/utils/toDynamicFormValues.ts
+++ b/src/components/DynamicForm/utils/toDynamicFormValues.ts
@@ -1,6 +1,8 @@
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import type {FormValue} from '@components/Form/types';
 
+import {isListItem} from './listItems';
+
 function isFormValue(value: unknown): value is FormValue {
     if (typeof value === 'string' || typeof value === 'boolean' || value instanceof Date) {
         return true;
@@ -12,7 +14,8 @@ function isFormValue(value: unknown): value is FormValue {
     return (
         items.every((item) => typeof item === 'string') ||
         items.every((item) => typeof item === 'boolean') ||
-        items.every((item) => typeof item === 'object' && item !== null && ('name' in item || 'uri' in item))
+        items.every((item) => typeof item === 'object' && item !== null && ('name' in item || 'uri' in item)) ||
+        items.every(isListItem)
     );
 }
 
diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx
index 1ea8c40129dd..09aa12866c1d 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -58,6 +58,7 @@ function getInitialValueByType(valueType?: ValueTypeKey): InitialDefaultValue {
             return new Date();
         case 'stringList':
         case 'files':
+        case 'listItems':
             return [];
         default:
             return '';
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index 2d79dc256398..9f8687cdfdc3 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -11,6 +11,7 @@ import type DatePicker from '@components/DatePicker';
 import type CurrencyInlineListAdapter from '@components/DynamicForm/adapters/CurrencyInlineListAdapter';
 import type FileUploadAdapter from '@components/DynamicForm/adapters/FileUploadAdapter';
 import type InlineSelectionListAdapter from '@components/DynamicForm/adapters/InlineSelectionListAdapter';
+import type ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
 import type TabsAdapter from '@components/DynamicForm/adapters/TabsAdapter';
 import type YesNoAdapter from '@components/DynamicForm/adapters/YesNoAdapter';
 import type EmojiPickerButtonDropdown from '@components/EmojiPicker/EmojiPickerButtonDropdown';
@@ -48,6 +49,7 @@ import type {Country} from '@src/CONST';
 import type {OnyxFormKey, OnyxValues} from '@src/ONYXKEYS';
 import type {Form} from '@src/types/form';
 import type {BaseForm} from '@src/types/form/Form';
+import type {DynamicFormListItem} from '@src/types/onyx';
 import type {FileObject} from '@src/types/utils/Attachment';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
@@ -98,9 +100,10 @@ type ValidInputs =
     | typeof InlineSelectionListAdapter
     | typeof CurrencyInlineListAdapter
     | typeof YesNoAdapter
-    | typeof TabsAdapter;
+    | typeof TabsAdapter
+    | typeof ListFieldAdapter;
 
-type ValueTypeKey = 'string' | 'boolean' | 'date' | 'country' | 'stringList' | 'disabledListValues' | 'files';
+type ValueTypeKey = 'string' | 'boolean' | 'date' | 'country' | 'stringList' | 'disabledListValues' | 'files' | 'listItems';
 type ValueTypeMap = {
     string: string;
     boolean: boolean;
@@ -109,6 +112,7 @@ type ValueTypeMap = {
     stringList: string[];
     disabledListValues: boolean[];
     files: FileObject[];
+    listItems: DynamicFormListItem[];
 };
 type FormValue = ValueOf<ValueTypeMap>;
 
diff --git a/src/components/ListField.tsx b/src/components/ListField.tsx
new file mode 100644
index 000000000000..a56eeb6a1bf4
--- /dev/null
+++ b/src/components/ListField.tsx
@@ -0,0 +1,126 @@
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getLetterAvatarURLForName} from '@libs/UserAvatarUtils';
+
+import CONST from '@src/CONST';
+import variables from '@src/styles/variables';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import UserAvatar from './Avatar/UserAvatar';
+import Button from './Button';
+import FormHelpMessage from './FormHelpMessage';
+import Icon from './Icon';
+import MenuItem from './MenuItem';
+import PressableWithFeedback from './Pressable/PressableWithFeedback';
+
+type ListFieldRow = {
+    /** ID of the entry the row shows */
+    id: string;
+
+    /** Names the row and its buttons for screen readers, and the letter avatar is built from it */
+    title: string;
+
+    /** Second line of the row */
+    description?: string;
+};
+
+type ListFieldProps = {
+    /** Entries, one row each */
+    rows: ListFieldRow[];
+
+    /** Title of the add row, such as "Add owner" */
+    addTitle: string;
+
+    /** Hint shown under the add row */
+    addDescription?: string;
+
+    /** Hides the add row once the list is full */
+    canAddMore?: boolean;
+
+    /** Validation error shown under the list */
+    errorText?: string;
+
+    /** Called when the user taps the add row */
+    onAdd: () => void;
+
+    /** Called when the user taps Edit on a row */
+    onEdit: (id: string) => void;
+
+    /** Called when the user taps a row's remove button, so the caller can confirm before removing */
+    onRemove: (id: string) => void;
+};
+
+/** A list of named items on a page, each with an avatar, an Edit button and a remove button, followed by an add row */
+function ListField({rows, addTitle, addDescription, canAddMore = true, errorText = '', onAdd, onEdit, onRemove}: ListFieldProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Close']);
+
+    return (
+        <>
+            {rows.map((row) => (
+                <MenuItem.Root key={row.id}>
+                    <MenuItem.Row>
+                        <MenuItem.Leading>
+                            <UserAvatar
+                                source={getLetterAvatarURLForName(row.title)}
+                                accountID={CONST.DEFAULT_NUMBER_ID}
+                            />
+                        </MenuItem.Leading>
+                        <MenuItem.Content>
+                            <MenuItem.Title>{row.title}</MenuItem.Title>
+                            {!!row.description && <MenuItem.Description>{row.description}</MenuItem.Description>}
+                        </MenuItem.Content>
+                        <MenuItem.Trailing>
+                            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
+                                <Button
+                                    size={CONST.BUTTON_SIZE.SMALL}
+                                    accessibilityLabel={translate('listField.editItem', {name: row.title})}
+                                    onPress={() => onEdit(row.id)}
+                                >
+                                    <Button.Text>{translate('common.edit')}</Button.Text>
+                                </Button>
+                                <PressableWithFeedback
+                                    sentryLabel={CONST.SENTRY_LABEL.LIST_FIELD.REMOVE_BUTTON}
+                                    accessibilityLabel={translate('listField.removeItem', {name: row.title})}
+                                    role={CONST.ROLE.BUTTON}
+                                    style={styles.touchableButtonImage}
+                                    onPress={() => onRemove(row.id)}
+                                >
+                                    <Icon
+                                        src={icons.Close}
+                                        fill={theme.icon}
+                                        width={variables.iconSizeSmall}
+                                        height={variables.iconSizeSmall}
+                                    />
+                                </PressableWithFeedback>
+                            </View>
+                        </MenuItem.Trailing>
+                    </MenuItem.Row>
+                </MenuItem.Root>
+            ))}
+            {canAddMore && (
+                <MenuItem
+                    icon={icons.Plus}
+                    title={addTitle}
+                    description={addDescription}
+                    onPress={onAdd}
+                />
+            )}
+            {!!errorText && (
+                <View style={styles.ph5}>
+                    <FormHelpMessage message={errorText} />
+                </View>
+            )}
+        </>
+    );
+}
+
+export default ListField;
+export type {ListFieldRow};
diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index c5de26d7c618..130955099405 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -1,6 +1,7 @@
 import Button from '@components/Button';
 import ButtonDisabledWhenOffline from '@components/Button/composed/ButtonDisabledWhenOffline';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
+import MenuItemAvatarNavigation from '@components/MenuItem/presets/MenuItemAvatarNavigation';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import RenderHTML from '@components/RenderHTML';
 import ScrollView from '@components/ScrollView';
@@ -47,8 +48,29 @@ type SummaryItem = {
     testID?: string;
 };
 
-/** One row of a group. A single kind for now, so groups can grow other row kinds without touching their callers. */
-type SummaryGroupRow = SummaryItem;
+/** A row for one entry of a repeated group, such as an owner, led by an avatar */
+type SummaryAvatarRow = {
+    /** Tells the row apart from an answer row */
+    kind: 'avatar';
+
+    /** Unique key of the row */
+    id: string;
+
+    /** The entry's name */
+    title: string;
+
+    /** The line under the name */
+    description: string;
+
+    /** The avatar shown on the left */
+    avatarSource?: string;
+
+    /** Called when the row is pressed */
+    onPress: () => void;
+};
+
+/** One row of a group: an answer, or an entry of a repeated group */
+type SummaryGroupRow = SummaryItem | SummaryAvatarRow;
 
 /** Answers under one heading. Used instead of `summaryItems` when the confirmation is split by section. */
 type SummaryGroup = {
@@ -67,7 +89,7 @@ type ConfirmationStepProps = SubPageProps &
         pageTitle: string;
         summaryItems?: SummaryItem[];
 
-        /** Sections with their own heading, each holding field rows */
+        /** Sections with their own heading, each holding field rows and avatar rows for repeated entries */
         groups?: SummaryGroup[];
 
         /** Whether show additional section with Onfido terms etc. */
@@ -133,20 +155,37 @@ function ConfirmationStep({
                             {group.name}
                         </Text>
                     )}
-                    {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
-                        <MenuItemWithTopDescription
-                            key={id}
-                            pressableTestID={testID ?? id}
-                            description={description}
-                            title={title}
-                            shouldShowRightIcon={shouldShowRightIcon}
-                            onPress={onPress}
-                            interactive={interactive}
-                            brickRoadIndicator={brickRoadIndicator}
-                            errorText={errorText}
-                            forwardedFSClass={forwardedFSClass}
-                        />
-                    ))}
+                    {group.rows.map((row) =>
+                        'kind' in row ? (
+                            // MenuItemAvatarNavigation takes no FullStory class, so the mask goes on a View around it
+                            <View
+                                key={row.id}
+                                fsClass={forwardedFSClass}
+                            >
+                                <MenuItemAvatarNavigation
+                                    testID={row.id}
+                                    title={row.title}
+                                    description={row.description}
+                                    accountID={CONST.DEFAULT_NUMBER_ID}
+                                    avatarSource={row.avatarSource}
+                                    onPress={row.onPress}
+                                />
+                            </View>
+                        ) : (
+                            <MenuItemWithTopDescription
+                                key={row.id}
+                                pressableTestID={row.testID ?? row.id}
+                                description={row.description}
+                                title={row.title}
+                                shouldShowRightIcon={row.shouldShowRightIcon}
+                                onPress={row.onPress}
+                                interactive={row.interactive}
+                                brickRoadIndicator={row.brickRoadIndicator}
+                                errorText={row.errorText}
+                                forwardedFSClass={forwardedFSClass}
+                            />
+                        ),
+                    )}
                 </View>
             ))}
 
@@ -179,4 +218,4 @@ function ConfirmationStep({
 }
 
 export default ConfirmationStep;
-export type {SummaryGroup};
+export type {SummaryGroup, SummaryGroupRow};
diff --git a/src/languages/de.ts b/src/languages/de.ts
index b4a17862a32e..d5c32ccf28d3 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -3990,6 +3990,10 @@ ${amount} für ${merchant} – ${date}`,
         unlockAlreadyRequestedTitle: 'Anfrage bereits eingereicht',
         unlockAlreadyRequestedDescription: 'Ihre Anfrage zur Entsperrung dieses Bankkontos wurde bereits gesendet. Concierge meldet sich bei Ihnen, falls noch etwas benötigt wird.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `${name} bearbeiten`,
+        removeItem: ({name}: {name: string}) => `${name} entfernen`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Beispiel: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -4001,7 +4005,12 @@ ${amount} für ${merchant} – ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Ungültiges Format. Beispiel: ${example}` : 'Ungültiges Format'),
             invalidOption: 'Wähle eine der verfügbaren Optionen',
             outOfRange: ({min, max}: {min: number; max: number}) => `Gib einen Wert zwischen ${min} und ${max} ein`,
+            tooFewItems: ({min}: {min: number}) => `Füge mindestens ${min} hinzu`,
+            tooManyItems: ({max}: {max: number}) => `Füge höchstens ${max} hinzu`,
         },
+        addItem: ({item}: {item: string}) => `${item} hinzufügen`,
+        removeItemTitle: ({item}: {item: string}) => `${item} entfernen?`,
+        removeItemPrompt: ({name}: {name: string}) => `Möchtest du ${name} wirklich entfernen?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'Der SWIFT/BIC muss 8 oder 11 Zeichen lang sein, mit 6 Buchstaben gefolgt von 2 oder 5 Buchstaben oder Ziffern.',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 83a2b4ceca05..cad02262aad0 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -4038,6 +4038,10 @@ ${amount} για ${merchant} - ${date}`,
         unlockAlreadyRequestedDescription:
             'Το αίτημά σας για ξεκλείδωμα αυτού του τραπεζικού λογαριασμού έχει ήδη αποσταλεί. Το Concierge θα επικοινωνήσει μαζί σας αν χρειαστεί οτιδήποτε άλλο.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Επεξεργασία ${name}`,
+        removeItem: ({name}: {name: string}) => `Αφαίρεση ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Παράδειγμα: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -4049,7 +4053,12 @@ ${amount} για ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Μη έγκυρη μορφή. Παράδειγμα: ${example}` : 'Μη έγκυρη μορφή'),
             invalidOption: 'Επιλέξτε μία από τις διαθέσιμες επιλογές',
             outOfRange: ({min, max}: {min: number; max: number}) => `Εισαγάγετε μια τιμή μεταξύ ${min} και ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Προσθέστε τουλάχιστον ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Προσθέστε το πολύ ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Προσθήκη ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Αφαίρεση ${item};`,
+        removeItemPrompt: ({name}: {name: string}) => `Θέλετε σίγουρα να αφαιρέσετε ${name};`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'Το SWIFT/BIC πρέπει να έχει μήκος 8 ή 11 χαρακτήρες, με 6 γράμματα ακολουθούμενα από 2 ή 5 γράμματα ή αριθμούς.',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 8838db29e77e..c55ca34289d4 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4155,6 +4155,10 @@ const translations = {
             sameDepositAndWithdrawalAccount: 'The deposit and withdrawal accounts are the same.',
         },
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Edit ${name}`,
+        removeItem: ({name}: {name: string}) => `Remove ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Example: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -4166,7 +4170,12 @@ const translations = {
             invalidFormat: ({example}: {example?: string}) => (example ? `Invalid format. Example: ${example}` : 'Invalid format'),
             invalidOption: 'Choose one of the available options',
             outOfRange: ({min, max}: {min: number; max: number}) => `Enter a value between ${min} and ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Add at least ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Add at most ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Add ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Remove ${item}?`,
+        removeItemPrompt: ({name}: {name: string}) => `Are you sure you want to remove ${name}?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'SWIFT/BIC must be 8 or 11 characters long, with 6 letters followed by 2 or 5 letters or numbers.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 66400f4418b7..4613ee8c8aaf 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3901,6 +3901,10 @@ ${amount} para ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Solicitud ya enviada',
         unlockAlreadyRequestedDescription: 'Tu solicitud para desbloquear esta cuenta bancaria ya ha sido enviada. Concierge se pondrá en contacto contigo si se necesita algo más.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Editar ${name}`,
+        removeItem: ({name}: {name: string}) => `Eliminar ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Ejemplo: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3912,7 +3916,12 @@ ${amount} para ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Formato inválido. Ejemplo: ${example}` : 'Formato inválido'),
             invalidOption: 'Elige una de las opciones disponibles',
             outOfRange: ({min, max}: {min: number; max: number}) => `Introduce un valor entre ${min} y ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Añade al menos ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Añade como máximo ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Añadir ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `¿Eliminar ${item}?`,
+        removeItemPrompt: ({name}: {name: string}) => `¿Seguro que quieres eliminar a ${name}?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'El SWIFT/BIC debe tener 8 u 11 caracteres, con 6 letras seguidas de 2 o 5 letras o números.',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 71a9a044e6c9..fb711d6b9947 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -3997,6 +3997,10 @@ ${amount} pour ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Demande déjà soumise',
         unlockAlreadyRequestedDescription: 'Votre demande de déverrouillage de ce compte bancaire a déjà été envoyée. Concierge vous contactera si autre chose est nécessaire.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Modifier ${name}`,
+        removeItem: ({name}: {name: string}) => `Supprimer ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Exemple : ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -4008,7 +4012,12 @@ ${amount} pour ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Format invalide. Exemple : ${example}` : 'Format invalide'),
             invalidOption: "Choisissez l'une des options disponibles",
             outOfRange: ({min, max}: {min: number; max: number}) => `Saisissez une valeur entre ${min} et ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Ajoutez au moins ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Ajoutez au plus ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Ajouter ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Supprimer ${item} ?`,
+        removeItemPrompt: ({name}: {name: string}) => `Voulez-vous vraiment supprimer ${name} ?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'Le code SWIFT/BIC doit comporter 8 ou 11 caractères, avec 6 lettres suivies de 2 ou 5 lettres ou chiffres.',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3bacfb1da4db..323e225f70d0 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -3968,6 +3968,10 @@ ${amount} per ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Richiesta già inviata',
         unlockAlreadyRequestedDescription: 'La tua richiesta di sblocco di questo conto bancario è già stata inviata. Concierge ti contatterà se servirà altro.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Modifica ${name}`,
+        removeItem: ({name}: {name: string}) => `Rimuovi ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Esempio: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3979,7 +3983,12 @@ ${amount} per ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Formato non valido. Esempio: ${example}` : 'Formato non valido'),
             invalidOption: 'Scegli una delle opzioni disponibili',
             outOfRange: ({min, max}: {min: number; max: number}) => `Inserisci un valore tra ${min} e ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Aggiungi almeno ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Aggiungi al massimo ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Aggiungi ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Rimuovere ${item}?`,
+        removeItemPrompt: ({name}: {name: string}) => `Vuoi davvero rimuovere ${name}?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'Lo SWIFT/BIC deve essere lungo 8 o 11 caratteri, con 6 lettere seguite da 2 oppure 5 lettere o numeri.',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 1cce695164c0..78886f6d6f77 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -3937,6 +3937,10 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
         unlockAlreadyRequestedTitle: 'リクエストは既に送信されています',
         unlockAlreadyRequestedDescription: 'この銀行口座のロック解除リクエストは既に送信されています。追加で必要なことがある場合は、Concierge からご連絡します。',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `${name}を編集`,
+        removeItem: ({name}: {name: string}) => `${name}を削除`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `例：${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3948,7 +3952,12 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             invalidFormat: ({example}: {example?: string}) => (example ? `形式が正しくありません。例：${example}` : '形式が正しくありません'),
             invalidOption: '利用可能な選択肢から選んでください',
             outOfRange: ({min, max}: {min: number; max: number}) => `${min}から${max}の間の値を入力してください`,
+            tooFewItems: ({min}: {min: number}) => `${min}件以上追加してください`,
+            tooManyItems: ({max}: {max: number}) => `${max}件以内で追加してください`,
         },
+        addItem: ({item}: {item: string}) => `${item}を追加`,
+        removeItemTitle: ({item}: {item: string}) => `${item}を削除しますか？`,
+        removeItemPrompt: ({name}: {name: string}) => `本当に${name}を削除しますか？`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'SWIFT/BIC は 8 文字または 11 文字で、最初の 6 文字はアルファベット、続く 2 文字または 5 文字はアルファベットまたは数字である必要があります。',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 837344c66576..7b19a3af677d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -3970,6 +3970,10 @@ ${amount} voor ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Verzoek al ingediend',
         unlockAlreadyRequestedDescription: 'Je verzoek om deze bankrekening te deblokkeren is al verzonden. Concierge neemt contact met je op als er nog iets anders nodig is.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `${name} bewerken`,
+        removeItem: ({name}: {name: string}) => `${name} verwijderen`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Voorbeeld: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3981,7 +3985,12 @@ ${amount} voor ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Ongeldige indeling. Voorbeeld: ${example}` : 'Ongeldige indeling'),
             invalidOption: 'Kies een van de beschikbare opties',
             outOfRange: ({min, max}: {min: number; max: number}) => `Voer een waarde in tussen ${min} en ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Voeg er minimaal ${min} toe`,
+            tooManyItems: ({max}: {max: number}) => `Voeg er maximaal ${max} toe`,
         },
+        addItem: ({item}: {item: string}) => `${item} toevoegen`,
+        removeItemTitle: ({item}: {item: string}) => `${item} verwijderen?`,
+        removeItemPrompt: ({name}: {name: string}) => `Weet je zeker dat je ${name} wilt verwijderen?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'SWIFT/BIC moet 8 of 11 tekens lang zijn, met 6 letters gevolgd door 2 of 5 letters of cijfers.',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 0729b77939fb..f3b61a44f913 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -4000,6 +4000,10 @@ ${amount} dla ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Wniosek został już złożony',
         unlockAlreadyRequestedDescription: 'Twoja prośba o odblokowanie tego konta bankowego została już wysłana. Concierge skontaktuje się z tobą, jeśli będzie potrzebne coś jeszcze.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Edytuj ${name}`,
+        removeItem: ({name}: {name: string}) => `Usuń ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Przykład: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -4013,7 +4017,12 @@ ${amount} dla ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Nieprawidłowy format. Przykład: ${example}` : 'Nieprawidłowy format'),
             invalidOption: 'Wybierz jedną z dostępnych opcji',
             outOfRange: ({min, max}: {min: number; max: number}) => `Wprowadź wartość od ${min} do ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Dodaj co najmniej ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Dodaj maksymalnie ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Dodaj ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Usunąć ${item}?`,
+        removeItemPrompt: ({name}: {name: string}) => `Czy na pewno chcesz usunąć ${name}?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'Kod SWIFT/BIC musi mieć długość 8 lub 11 znaków, z 6 literami, po których następują 2 lub 5 liter lub cyfr.',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 0ccd6cd242ac..9b41842f9f89 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -3957,6 +3957,10 @@ ${amount} para ${merchant} - ${date}`,
         unlockAlreadyRequestedTitle: 'Solicitação já enviada',
         unlockAlreadyRequestedDescription: 'Sua solicitação para desbloquear esta conta bancária já foi enviada. O Concierge vai entrar em contato se for necessário mais alguma coisa.',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `Editar ${name}`,
+        removeItem: ({name}: {name: string}) => `Remover ${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `Exemplo: ${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3968,7 +3972,12 @@ ${amount} para ${merchant} - ${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `Formato inválido. Exemplo: ${example}` : 'Formato inválido'),
             invalidOption: 'Escolha uma das opções disponíveis',
             outOfRange: ({min, max}: {min: number; max: number}) => `Insira um valor entre ${min} e ${max}`,
+            tooFewItems: ({min}: {min: number}) => `Adicione pelo menos ${min}`,
+            tooManyItems: ({max}: {max: number}) => `Adicione no máximo ${max}`,
         },
+        addItem: ({item}: {item: string}) => `Adicionar ${item}`,
+        removeItemTitle: ({item}: {item: string}) => `Remover ${item}?`,
+        removeItemPrompt: ({name}: {name: string}) => `Tem certeza de que deseja remover ${name}?`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'O SWIFT/BIC deve ter 8 ou 11 caracteres, com 6 letras seguidas de 2 ou 5 letras ou números.',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a2e4e693b885..78f4a4cdc330 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -3846,6 +3846,10 @@ ${amount}，商户：${merchant} - 日期：${date}`,
         unlockAlreadyRequestedTitle: '请求已提交',
         unlockAlreadyRequestedDescription: '您解锁此银行账户的请求已发送。如需其他信息，Concierge 会与您联系。',
     },
+    listField: {
+        editItem: ({name}: {name: string}) => `编辑${name}`,
+        removeItem: ({name}: {name: string}) => `移除${name}`,
+    },
     dynamicForm: {
         exampleHint: ({example}: {example: string}) => `示例：${example}`,
         fileCount: ({count}: {count: number}) => ({
@@ -3857,7 +3861,12 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             invalidFormat: ({example}: {example?: string}) => (example ? `格式无效。示例：${example}` : '格式无效'),
             invalidOption: '请从可用选项中选择',
             outOfRange: ({min, max}: {min: number; max: number}) => `请输入 ${min} 到 ${max} 之间的值`,
+            tooFewItems: ({min}: {min: number}) => `至少添加 ${min} 项`,
+            tooManyItems: ({max}: {max: number}) => `最多添加 ${max} 项`,
         },
+        addItem: ({item}: {item: string}) => `添加${item}`,
+        removeItemTitle: ({item}: {item: string}) => `移除${item}？`,
+        removeItemPrompt: ({name}: {name: string}) => `确定要移除${name}吗？`,
     },
     addPersonalBankAccount: {
         swiftBicFormatError: 'SWIFT/BIC 必须为 8 或 11 个字符长度，由 6 个字母后接 2 或 5 个字母或数字组成。',
diff --git a/src/libs/UserAvatarUtils.ts b/src/libs/UserAvatarUtils.ts
index 370a0370fed7..87b51d8d30c3 100644
--- a/src/libs/UserAvatarUtils.ts
+++ b/src/libs/UserAvatarUtils.ts
@@ -544,6 +544,13 @@ function optimizeAvatarSource(source?: AvatarSource): AvatarSource | undefined {
     return findLocalAvatarForURL(source) ?? source;
 }
 
+/** Letter avatar for a free-text name, such as a list row title, seeded by the name so the color is stable */
+function getLetterAvatarURLForName(name: string): string | undefined {
+    const [firstName = '', ...otherNames] = name.trim().split(/\s+/);
+    const colorSeed = [...name].reduce((sum, character) => sum + character.charCodeAt(0), 0);
+    return getLetterAvatarURL(colorSeed, firstName, otherNames.at(-1) ?? '', '') || undefined;
+}
+
 export {
     buildUserIcon,
     getAccountIDFromAvatarID,
@@ -557,6 +564,7 @@ export {
     getSmallSizeAvatar,
     getLetterAvatarInitials,
     getLetterAvatarURL,
+    getLetterAvatarURLForName,
     getUpdatedLetterAvatarURL,
     parseLetterAvatarURL,
     isCatalogAvatar,
diff --git a/src/libs/actions/DynamicForm.ts b/src/libs/actions/DynamicForm.ts
index ded7b0030193..a328c508cbd1 100644
--- a/src/libs/actions/DynamicForm.ts
+++ b/src/libs/actions/DynamicForm.ts
@@ -15,9 +15,24 @@ function saveSensitiveAnswers(formID: OnyxFormKey, answers: DynamicFormValues) {
     Onyx.merge(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[formID]: answers});
 }
 
+/** Drops some sensitive answers, such as those of a list entry the user removed */
+function forgetSensitiveAnswers(formID: OnyxFormKey, keys: string[]) {
+    Onyx.merge(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[formID]: Object.fromEntries(keys.map((key) => [key, null]))});
+}
+
+/** Fills the list entry editor with the entry's answers, or empties it for a new entry */
+function startListItemEdit(answers: DynamicFormValues): Promise<void> {
+    return Onyx.set(ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM_DRAFT, answers);
+}
+
+/** Empties the list entry editor once it closes, so an entry's answers are not left in its draft */
+function clearListItemEdit() {
+    Onyx.set(ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM_DRAFT, null);
+}
+
 /** Call once the form is submitted or abandoned, so sensitive answers do not outlive the visit */
 function clearSensitiveAnswers(formID: OnyxFormKey) {
     Onyx.merge(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[formID]: null});
 }
 
-export {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers};
+export {clearListItemEdit, clearSensitiveAnswers, forgetSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers, startListItemEdit};
diff --git a/src/stories/DynamicForm.stories.tsx b/src/stories/DynamicForm.stories.tsx
new file mode 100644
index 000000000000..e9c170793bce
--- /dev/null
+++ b/src/stories/DynamicForm.stories.tsx
@@ -0,0 +1,545 @@
+import DynamicFormFlow from '@components/DynamicForm';
+import DynamicFormFields from '@components/DynamicForm/components/DynamicFormFields';
+import type {DynamicFormLayout} from '@components/DynamicForm/types';
+import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
+import getPageTitle from '@components/DynamicForm/utils/getPageTitle';
+import {getAllFields, getPages} from '@components/DynamicForm/utils/paginate';
+import FormProvider from '@components/Form/FormProvider';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {clearDraftValues, setDraftValues} from '@userActions/FormActions';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import styles from '@src/styles';
+import {defaultTheme} from '@src/styles/theme';
+import type {DynamicFormListItem, DynamicFormPage, DynamicFormSchema, DynamicFormSchemaField} from '@src/types/onyx';
+
+import type {Meta, StoryFn} from 'storybook-react-rsbuild';
+
+import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useArgs} from 'storybook/preview-api';
+
+import {StoryRouterProvider} from '../../.storybook/mocks/storyRouter';
+
+const defaultStyles = styles(defaultTheme);
+
+const STORYBOOK_FORM_ID = ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM;
+
+const FLOW_ROUTE_PREFIX = 'settings/wallet/add-bank-account';
+
+/** A fixture field with the title of the page it is asked on */
+type GroupedField = DynamicFormSchemaField & {group: string};
+
+/** Each run of fields sharing a group becomes one page titled by it, as the server sends pages */
+function toSchema(fields: GroupedField[]): DynamicFormSchema {
+    const pages: DynamicFormPage[] = [];
+    for (const {group, ...field} of fields) {
+        const lastPage = pages.at(-1);
+        if (lastPage?.title === group) {
+            lastPage.content.push(field);
+            continue;
+        }
+        pages.push({key: group, title: group, content: [field]});
+    }
+    return {pages};
+}
+
+type Preset = {
+    /** Fields in page order, each naming its page in `group` */
+    fields: GroupedField[];
+
+    /** Answers seeded into the form draft before the first render */
+    draftValues: Record<string, string | boolean | string[] | DynamicFormListItem[]>;
+};
+
+/** A bank account form spread over several pages */
+const originalBankAccountFields: GroupedField[] = [
+    {
+        key: 'accountNumber',
+        label: 'Account number',
+        labelKey: 'bankAccount.accountNumber',
+        group: 'Account details',
+        type: 'text',
+        required: true,
+        regex: '^\\d{8}$',
+        minLength: 8,
+        maxLength: 8,
+        example: '12345678',
+    },
+    {
+        key: 'legalType',
+        label: 'Recipient type',
+        group: 'Account details',
+        type: 'radio',
+        required: true,
+        values: [
+            {key: 'PRIVATE', label: 'Person'},
+            {key: 'BUSINESS', label: 'Business'},
+        ],
+        refreshOnChange: true,
+    },
+    {
+        key: 'accountType',
+        label: 'Account type',
+        group: 'Account details',
+        type: 'select',
+        required: true,
+        dependsOn: {
+            key: 'legalType',
+            valuesBy: {
+                PRIVATE: [
+                    {key: 'CHECKING', label: 'Checking'},
+                    {key: 'SAVINGS', label: 'Savings'},
+                ],
+                BUSINESS: [
+                    {key: 'CHECKING', label: 'Checking'},
+                    {key: 'SAVINGS', label: 'Savings'},
+                    {key: 'BUSINESS_CHECKING', label: 'Business checking'},
+                ],
+            },
+        },
+    },
+    {
+        key: 'businessRegistrationDocument',
+        label: 'Business registration document',
+        group: 'Account details',
+        type: 'file',
+        required: true,
+        maxFiles: 2,
+        showWhen: {key: 'legalType', equals: ['BUSINESS']},
+    },
+    {key: 'annualVolume', label: 'Annual volume', group: 'Account details', type: 'amount', required: true, currencyKey: 'annualVolumeCurrency'},
+    {key: 'numberOfEmployees', label: 'Number of employees', group: 'Account details', type: 'number', required: true, example: '25'},
+    {key: 'settlementCurrency', label: 'Settlement currency', group: 'Account details', type: 'currency', required: true},
+    {key: 'operatingCountries', label: 'Countries you operate in', group: 'Account holder details', type: 'countryMultiselect', required: true},
+    {key: 'dateOfBirth', label: 'Date of birth', labelKey: 'common.dob', group: 'Account holder details', type: 'date', rule: 'dateOfBirth', required: true},
+    {key: 'country', label: 'Country', labelKey: 'common.country', group: 'Account holder details', type: 'country', required: true, refreshOnChange: true},
+    {key: 'address', label: 'Address', labelKey: 'common.address', group: 'Account holder details', type: 'address', required: true},
+    {
+        key: 'useCases',
+        label: 'How will you use this account?',
+        group: 'Account holder details',
+        type: 'multiselect',
+        required: true,
+        values: [
+            {key: 'PAYING_SUPPLIERS_CONTRACTORS_EMPLOYEES', label: 'Paying suppliers, contractors or employees'},
+            {key: 'RECEIVING_MONEY_FOR_SERVICES', label: 'Receiving money for services'},
+            {key: 'TRANSFER_WITHIN_COMPANY_OR_GROUP', label: 'Transfers within the company or group'},
+        ],
+    },
+    {key: 'isSourceOfFund', label: 'This source funds the account', group: 'Account holder details', type: 'boolean', required: false},
+];
+
+const accountDetails: GroupedField[] = [
+    {key: 'accountNumber', label: 'Account number', group: 'Account details', type: 'text', required: true, regex: '^\\d{8}$', minLength: 8, maxLength: 8, example: '12345678'},
+    {
+        key: 'legalType',
+        label: 'Recipient type',
+        group: 'Account details',
+        type: 'radio',
+        required: true,
+        presentation: 'tabs',
+        values: [
+            {key: 'PRIVATE', label: 'Person'},
+            {key: 'BUSINESS', label: 'Business'},
+        ],
+    },
+    {
+        key: 'accountType',
+        label: 'Account type',
+        group: 'Account details',
+        type: 'select',
+        required: true,
+        dependsOn: {
+            key: 'legalType',
+            valuesBy: {
+                PRIVATE: [
+                    {key: 'CHECKING', label: 'Checking'},
+                    {key: 'SAVINGS', label: 'Savings'},
+                ],
+                BUSINESS: [
+                    {key: 'CHECKING', label: 'Checking'},
+                    {key: 'BUSINESS_CHECKING', label: 'Business checking'},
+                ],
+            },
+        },
+    },
+    {
+        key: 'registrationDocument',
+        label: 'Business registration document',
+        group: 'Account details',
+        type: 'file',
+        required: true,
+        maxFiles: 2,
+        showWhen: {key: 'legalType', equals: ['BUSINESS']},
+    },
+    {key: 'annualVolume', label: 'Annual volume', group: 'Account details', type: 'amount', required: true, currencyKey: 'annualVolumeCurrency'},
+    {key: 'numberOfEmployees', label: 'Number of employees', group: 'Account details', type: 'number', required: true, example: '25'},
+    {key: 'settlementCurrency', label: 'Settlement currency', group: 'Account details', type: 'currency', required: true},
+];
+
+const accountHolder: GroupedField[] = [
+    {key: 'legalName', label: 'Legal name', group: 'Account holder', type: 'text', required: true, rule: 'legalName'},
+    {key: 'phone', label: 'Phone number', group: 'Account holder', type: 'text', required: true, rule: 'phone'},
+    {key: 'dateOfBirth', label: 'Date of birth', group: 'Account holder', type: 'date', required: true, rule: 'dateOfBirth'},
+    {
+        key: 'ssn',
+        label: 'Social security number or ITIN',
+        group: 'Account holder',
+        type: 'text',
+        required: true,
+        sensitive: true,
+        keyboard: 'numeric',
+        regex: '^\\d{9}$',
+        example: '123456789',
+    },
+    {key: 'address', label: 'Address', group: 'Account holder', type: 'address', required: true, rule: 'zipCode'},
+    {key: 'operatingCountries', label: 'Countries you operate in', group: 'Account holder', type: 'countryMultiselect', required: true},
+    {key: 'ownershipPercentage', label: 'Your ownership percentage', group: 'Account holder', type: 'percent', required: true},
+    {key: 'acceptTerms', label: 'I confirm the details above are correct', group: 'Account holder', type: 'boolean', required: true},
+];
+
+const businessInfo: GroupedField[] = [
+    {key: 'legalBusinessName', label: 'Legal business name', group: 'Business info', type: 'text', required: true, readonly: true},
+    {
+        key: 'companyRole',
+        label: 'Your role at the company',
+        group: 'Business info',
+        type: 'select',
+        required: true,
+        values: [
+            {key: 'OWNER', label: 'Owner'},
+            {key: 'DIRECTOR', label: 'Director'},
+            {key: 'OTHER', label: 'Other'},
+        ],
+    },
+    {
+        key: 'industries',
+        label: 'Industry category',
+        group: 'Business info',
+        type: 'multiselect',
+        required: true,
+        values: [
+            {key: 'SOFTWARE', label: 'Software'},
+            {key: 'RETAIL', label: 'Retail'},
+            {key: 'CRYPTO', label: 'Crypto (high risk)'},
+            {key: 'GAMBLING', label: 'Gambling (high risk)'},
+        ],
+    },
+    {key: 'businessDescription', label: 'Business description', group: 'Business info', type: 'text', required: true, multiline: true, maxLength: 500},
+];
+
+/** The design doc's enhanced due diligence: a source of funds asked only for high-risk industries, then a proof for it, each on its own page */
+const dueDiligence: GroupedField[] = [
+    {
+        key: 'sourceOfFunds',
+        label: 'Source of funds',
+        group: 'Source of funds',
+        type: 'select',
+        required: true,
+        showWhen: {key: 'industries', equals: ['CRYPTO', 'GAMBLING']},
+        values: [
+            {key: 'SALES', label: 'Sales revenue'},
+            {key: 'INVESTMENT', label: 'Investment'},
+            {key: 'LOAN', label: 'Loan'},
+        ],
+    },
+    {key: 'sourceOfFundsProof', label: 'Source of funds document', group: 'Proof', type: 'file', required: true, showWhen: {key: 'sourceOfFunds', equals: ['SALES', 'INVESTMENT', 'LOAN']}},
+];
+
+const owners: GroupedField = {
+    key: 'owners',
+    label: 'Owners',
+    itemLabel: 'owner',
+    addItemDescription: 'Only applies if 25% ownership or more',
+    group: 'Owners',
+    type: 'list',
+    required: true,
+    minItems: 1,
+    maxItems: 4,
+    itemFields: [
+        {
+            key: 'ownerType',
+            label: 'Owner type',
+            type: 'radio',
+            presentation: 'tabs',
+            required: true,
+            values: [
+                {key: 'INDIVIDUAL', label: 'Individual'},
+                {key: 'COMPANY', label: 'Company/Fund'},
+            ],
+        },
+        {key: 'firstName', label: 'Legal first name', type: 'text', required: true, rule: 'legalName', showWhen: {key: 'ownerType', equals: ['INDIVIDUAL']}},
+        {key: 'lastName', label: 'Legal last name', type: 'text', required: true, rule: 'legalName', showWhen: {key: 'ownerType', equals: ['INDIVIDUAL']}},
+        {key: 'ssn', label: 'SSN', type: 'text', required: false, sensitive: true, showWhen: {key: 'ownerType', equals: ['INDIVIDUAL']}},
+        {key: 'companyName', label: 'Legal business name', type: 'text', required: true, showWhen: {key: 'ownerType', equals: ['COMPANY']}},
+        {key: 'countryOfResidence', label: 'Country of residence', type: 'country', required: true},
+        {key: 'ownership', label: 'Ownership percentage', type: 'percent', required: true},
+    ],
+};
+
+/** Every case Storybook shows, each usable in the Flow, the Playground and as its own sidebar entry */
+const PRESETS = {
+    originalBankAccount: {
+        fields: originalBankAccountFields,
+        draftValues: {
+            numberOfEmployees: '25',
+            settlementCurrency: 'USD',
+            operatingCountries: ['GB'],
+            legalType: 'PRIVATE',
+            accountNumber: '12345678',
+            accountType: 'CHECKING',
+            annualVolume: '1000',
+            annualVolumeCurrency: 'USD',
+            dateOfBirth: '1990-01-31',
+            country: 'GB',
+            address: '1 High Street',
+        },
+    },
+    bankAccount: {
+        fields: [...accountDetails, ...accountHolder],
+        draftValues: {legalType: 'PRIVATE', numberOfEmployees: '25'},
+    },
+    businessOnboarding: {
+        fields: [...businessInfo, ...dueDiligence, owners],
+        draftValues: {legalBusinessName: 'Boulder Development Inc.'},
+    },
+    owners: {
+        fields: [owners],
+        draftValues: {
+            owners: [
+                {id: 'alice', ownerType: 'INDIVIDUAL', firstName: 'Alice', lastName: 'Nguyen', countryOfResidence: 'US', ownership: '25'},
+                {id: 'acme', ownerType: 'COMPANY', companyName: 'Acme Holdings', countryOfResidence: 'GB', ownership: '40'},
+            ],
+        },
+    },
+    loneMultiselect: {
+        fields: businessInfo.filter((field) => field.key === 'industries'),
+        draftValues: {},
+    },
+    yesNoQuestion: {
+        fields: [{key: 'hasOtherOwners', label: 'Does anyone else own 25% or more?', group: 'Ownership', type: 'boolean', required: true}],
+        draftValues: {},
+    },
+    loneCountry: {
+        fields: [{key: 'country', label: 'Where is your bank account?', group: 'Country', type: 'country', required: true}],
+        draftValues: {},
+    },
+    loneCurrency: {
+        fields: [{key: 'currency', label: 'Which currency?', group: 'Currency', type: 'currency', required: true}],
+        draftValues: {},
+    },
+    amountWithCurrency: {
+        fields: accountDetails.filter((field) => field.key === 'annualVolume' || field.key === 'accountNumber'),
+        draftValues: {annualVolume: '25000'},
+    },
+    unknownType: {
+        fields: [{key: 'signature', label: 'Signature', group: 'Sign', type: 'signature', required: true}, ...accountDetails.slice(0, 1).map((field) => ({...field, group: 'Sign'}))],
+        draftValues: {},
+    },
+} satisfies Record<string, Preset>;
+
+type PresetName = keyof typeof PRESETS;
+
+const PRESET_NAMES = Object.keys(PRESETS).filter((name): name is PresetName => name in PRESETS);
+
+/** Seeds the draft after mount and reports once the write has landed, so the form mounts with the draft as a real page would */
+function useSeededDraft(draftValues: Preset['draftValues']): boolean {
+    const [isSeeded, setIsSeeded] = useState(false);
+    useEffect(() => {
+        clearDraftValues(STORYBOOK_FORM_ID);
+        setDraftValues(STORYBOOK_FORM_ID, draftValues).then(() => setIsSeeded(true));
+    }, [draftValues]);
+    return isSeeded;
+}
+
+/** Every page on one screen, for looking at the renderer rather than the flow */
+function SinglePage({fields, draftValues}: Preset) {
+    const {translate} = useLocalize();
+    const isDraftReady = useSeededDraft(draftValues);
+    // List entries are edited on flow pages, so this screen leaves lists out
+    const pages = getPages(toSchema(fields.filter((field) => field.type !== 'list')));
+    const allFields = getAllFields(pages);
+
+    if (!isDraftReady) {
+        return <View />;
+    }
+
+    return (
+        <FormProvider
+            formID={STORYBOOK_FORM_ID}
+            submitButtonText="Submit"
+            validate={(values) => getDynamicFieldErrors(allFields, values, translate)}
+            onSubmit={(values) => alert(JSON.stringify(values, null, 4))}
+            style={defaultStyles.ph5}
+        >
+            {({inputValues}) =>
+                pages.map((page) => (
+                    <View key={page.key}>
+                        <Text style={[defaultStyles.textHeadlineLineHeightXXL, defaultStyles.mt5, defaultStyles.mb3]}>{getPageTitle(page, inputValues, translate, allFields)}</Text>
+                        <DynamicFormFields
+                            content={page.content}
+                            allFields={allFields}
+                            values={inputValues}
+                        />
+                    </View>
+                ))
+            }
+        </FormProvider>
+    );
+}
+
+type FlowProps = Preset & {
+    layout: DynamicFormLayout;
+    confirmation: 'auto' | 'yes' | 'no';
+
+    /** Remounts the route stack when it changes, so a new schema starts from its first page */
+    resetKey: string;
+};
+
+/** The whole flow on a story-owned route stack: pages, resume, the entry editor pages and the confirmation are all clickable */
+function Flow({fields, draftValues, layout, confirmation, resetKey}: FlowProps) {
+    const isDraftReady = useSeededDraft(draftValues);
+    if (!isDraftReady) {
+        return <View />;
+    }
+    let hasConfirmation: boolean | undefined;
+    if (confirmation !== 'auto') {
+        hasConfirmation = confirmation === 'yes';
+    }
+    return (
+        <StoryRouterProvider
+            key={resetKey}
+            routePrefix={FLOW_ROUTE_PREFIX}
+        >
+            <DynamicFormFlow
+                schema={toSchema(fields)}
+                formID={STORYBOOK_FORM_ID}
+                headerTitle="Add bank account"
+                confirmationTitle="Let’s double check that everything looks right"
+                testID="DynamicFormFlowStory"
+                buildRoute={(pageName, action) => ROUTES.SETTINGS_ADD_BANK_ACCOUNT.getRoute(undefined, pageName, action)}
+                onSubmit={(values) => alert(JSON.stringify(values, null, 4))}
+                onBack={() => alert('Left the flow')}
+                onRefreshRequirements={(inputID, value) => console.debug('Refresh requirements', inputID, value)}
+                layout={layout}
+                hasConfirmation={hasConfirmation}
+            />
+        </StoryRouterProvider>
+    );
+}
+
+type FlowStoryProps = Pick<FlowProps, 'layout' | 'confirmation'> & {
+    preset: PresetName;
+};
+
+function FlowFromPreset({preset, layout, confirmation}: FlowStoryProps) {
+    const {fields, draftValues} = PRESETS[preset];
+    return (
+        <Flow
+            resetKey={preset}
+            fields={fields}
+            draftValues={draftValues}
+            layout={layout}
+            confirmation={confirmation}
+        />
+    );
+}
+
+const flowArgTypes = {
+    preset: {options: PRESET_NAMES, control: {type: 'select'}},
+    layout: {options: ['auto', 'stepper', 'pages'], control: {type: 'radio'}},
+    confirmation: {options: ['auto', 'yes', 'no'], control: {type: 'radio'}},
+} as const;
+
+function presetFlowStory(preset: PresetName): StoryFn<FlowStoryProps> {
+    const flowStory: StoryFn<FlowStoryProps> = FlowFromPreset.bind({});
+    flowStory.args = {preset, layout: 'auto', confirmation: 'auto'};
+    flowStory.argTypes = flowArgTypes;
+    return flowStory;
+}
+
+const STORY_FRAME_INSET = '2rem';
+
+const story: Meta<FlowStoryProps> = {
+    title: 'Components/DynamicForm',
+    component: FlowFromPreset,
+    decorators: [
+        (Story) => (
+            // Screens size to their window, so these stories get the viewport as their frame
+            <div style={{display: 'flex', flexDirection: 'column', height: `calc(100vh - ${STORY_FRAME_INSET})`}}>
+                <Story />
+            </div>
+        ),
+    ],
+};
+
+type PlaygroundProps = Preset & {
+    /** Loads a starting schema and draft into the editable `fields` and `draftValues` controls */
+    preset: PresetName;
+
+    /** The real flow, or every group on one screen */
+    layout: 'flow' | 'single';
+};
+
+/** Editable schema: pick a preset, then change the field JSON in the Controls panel and watch the form follow */
+function Playground({preset, fields, draftValues, layout}: PlaygroundProps) {
+    const [, updateArgs] = useArgs();
+    useEffect(() => {
+        updateArgs(PRESETS[preset]);
+    }, [preset, updateArgs]);
+
+    const schema = Array.isArray(fields) ? fields : [];
+    const resetKey = `${preset}-${JSON.stringify(draftValues)}-${JSON.stringify(schema)}`;
+    if (layout === 'single') {
+        return (
+            <SinglePage
+                key={resetKey}
+                fields={schema}
+                draftValues={draftValues ?? {}}
+            />
+        );
+    }
+    return (
+        <Flow
+            resetKey={resetKey}
+            fields={schema}
+            draftValues={draftValues ?? {}}
+            layout="auto"
+            confirmation="auto"
+        />
+    );
+}
+
+const FlowStory = presetFlowStory('originalBankAccount');
+FlowStory.storyName = 'Flow';
+
+const PlaygroundStory: StoryFn<PlaygroundProps> = Playground.bind({});
+PlaygroundStory.storyName = 'Playground';
+PlaygroundStory.args = {preset: 'originalBankAccount', ...PRESETS.originalBankAccount, layout: 'flow'};
+PlaygroundStory.argTypes = {
+    preset: {options: PRESET_NAMES, control: {type: 'select'}},
+    fields: {control: {type: 'object'}},
+    draftValues: {control: {type: 'object'}},
+    layout: {options: ['flow', 'single'], control: {type: 'radio'}},
+};
+
+const AllFieldTypes: StoryFn<Preset> = SinglePage.bind({});
+AllFieldTypes.args = {fields: [...accountDetails, ...accountHolder, ...businessInfo], draftValues: {legalType: 'BUSINESS', legalBusinessName: 'Boulder Development Inc.'}};
+
+const BankAccount = presetFlowStory('bankAccount');
+const BusinessOnboarding = presetFlowStory('businessOnboarding');
+const OwnersList = presetFlowStory('owners');
+const LoneMultiselect = presetFlowStory('loneMultiselect');
+const YesNoQuestion = presetFlowStory('yesNoQuestion');
+const LoneCountry = presetFlowStory('loneCountry');
+const LoneCurrency = presetFlowStory('loneCurrency');
+const AmountWithCurrency = presetFlowStory('amountWithCurrency');
+const UnknownType = presetFlowStory('unknownType');
+
+export default story;
+export {FlowStory, PlaygroundStory, AllFieldTypes, BankAccount, BusinessOnboarding, OwnersList, LoneMultiselect, YesNoQuestion, LoneCountry, LoneCurrency, AmountWithCurrency, UnknownType};
diff --git a/src/types/form/DynamicFormListItemForm.ts b/src/types/form/DynamicFormListItemForm.ts
new file mode 100644
index 000000000000..26fb0bcc45e0
--- /dev/null
+++ b/src/types/form/DynamicFormListItemForm.ts
@@ -0,0 +1,9 @@
+import type {FormValue} from '@components/Form/types';
+
+import type {BaseForm} from './Form';
+
+/** The list item being added or edited. Its keys are the item schema's field keys. */
+type DynamicFormListItemForm = BaseForm & Record<string, FormValue>;
+
+// eslint-disable-next-line import/prefer-default-export
+export type {DynamicFormListItemForm};
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index dd91169079fe..cbeed7e04ae8 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -100,6 +100,7 @@ export type {MoneyRequestTimeForm} from './MoneyRequestTimeForm';
 export type {MoneyRequestSubrateForm} from './MoneyRequestSubrateForm';
 export type {CollectDepositAccountForm} from './CollectDepositAccountForm';
 export type {InternationalBankAccountForm} from './InternationalBankAccountForm';
+export type {DynamicFormListItemForm} from './DynamicFormListItemForm';
 export type {WorkspacePerDiemForm} from './WorkspacePerDiemForm';
 export type {MoneyRequestRejectReasonForm} from './MoneyRequestRejectReasonForm';
 export type {ReportRejectForm} from './ReportRejectForm';
diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index e2b62282bba2..6e1141ff8251 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -148,6 +148,27 @@ type DynamicFormBooleanField = DynamicFormFieldBase & {
     type: 'boolean';
 };
 
+/** Repeated entries, such as a company's owners, each answered with its own fields on an editor page */
+type DynamicFormListField = DynamicFormFieldBase & {
+    type: 'list';
+
+    /** The fields of one entry */
+    itemFields: DynamicFormField[];
+
+    /** The noun for one entry, such as "owner", for the add row and the editor title */
+    itemLabel?: string;
+
+    itemLabelKey?: TranslationPaths;
+
+    /** Hint shown under the add row */
+    addItemDescription?: string;
+
+    addItemDescriptionKey?: TranslationPaths;
+
+    minItems?: number;
+    maxItems?: number;
+};
+
 /** Types that need nothing beyond the common properties */
 type DynamicFormPlainField = DynamicFormFieldBase & {
     type: 'currency' | 'percent';
@@ -165,8 +186,15 @@ type DynamicFormField =
     | DynamicFormAmountField
     | DynamicFormCountryField
     | DynamicFormBooleanField
+    | DynamicFormListField
     | DynamicFormPlainField;
 
+/** One entry of a list field: its answers keyed by item field key, and an `id` made on the device to key the entry's row and editor page */
+type DynamicFormListItem = {
+    id: string;
+    [fieldKey: string]: FormValue | undefined;
+};
+
 /** A field as the schema sends it, which can be of a type this App version does not know */
 type DynamicFormSchemaField = DynamicFormField | (DynamicFormFieldBase & {type: string});
 
@@ -197,6 +225,8 @@ export type {
     DynamicFormFieldOption,
     DynamicFormFieldType,
     DynamicFormHeading,
+    DynamicFormListField,
+    DynamicFormListItem,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
     DynamicFormPage,
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index a86e9d85adb5..95f6f7474ba5 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -91,6 +91,8 @@ import type {
     DynamicFormFieldOption,
     DynamicFormFieldType,
     DynamicFormHeading,
+    DynamicFormListField,
+    DynamicFormListItem,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
     DynamicFormPage,
@@ -478,6 +480,8 @@ export type {
     DynamicFormFieldOption,
     DynamicFormFieldType,
     DynamicFormHeading,
+    DynamicFormListField,
+    DynamicFormListItem,
     DynamicFormMultiChoiceField,
     DynamicFormNumberField,
     DynamicFormPage,
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index eb27f45c4136..bbc7f0c922f5 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -9,11 +9,13 @@ import DatePicker from '@components/DatePicker';
 import CurrencyInlineListAdapter from '@components/DynamicForm/adapters/CurrencyInlineListAdapter';
 import FileUploadAdapter from '@components/DynamicForm/adapters/FileUploadAdapter';
 import InlineSelectionListAdapter from '@components/DynamicForm/adapters/InlineSelectionListAdapter';
+import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
 import TabsAdapter from '@components/DynamicForm/adapters/TabsAdapter';
 import YesNoAdapter from '@components/DynamicForm/adapters/YesNoAdapter';
 import DynamicFormFields from '@components/DynamicForm/components/DynamicFormFields';
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import PercentageForm from '@components/PercentageForm';
 import PushRowWithModal from '@components/PushRowWithModal';
 import RadioButtons from '@components/RadioButtons';
@@ -69,6 +71,20 @@ jest.mock('@hooks/useLocalize', () =>
 
 jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
 
+type TestInstance = ReturnType<typeof screen.UNSAFE_getByProps>;
+
+/** Whether a view around the element masks it in session recordings */
+function isMasked(element: TestInstance): boolean {
+    let ancestor: TestInstance | null = element;
+    while (ancestor) {
+        if (ancestor.props.fsClass === CONST.FULLSTORY.CLASS.MASK) {
+            return true;
+        }
+        ancestor = ancestor.parent;
+    }
+    return false;
+}
+
 type RenderFieldsOptions = {
     currency?: string;
     maxFileSize?: number;
@@ -107,6 +123,7 @@ const EXPECTED_INPUT_BY_TYPE: Record<DynamicFormFieldType, ComponentType<never>>
     file: FileUploadAdapter,
     amount: AmountForm,
     percent: PercentageForm,
+    list: ListFieldAdapter,
 };
 
 const FIELD_TYPES = Object.keys(EXPECTED_INPUT_BY_TYPE).filter((type): type is DynamicFormFieldType => Object.hasOwn(EXPECTED_INPUT_BY_TYPE, type));
@@ -114,14 +131,15 @@ const FIELD_TYPES = Object.keys(EXPECTED_INPUT_BY_TYPE).filter((type): type is D
 describe('DynamicFormFields', () => {
     it.each(FIELD_TYPES)('renders a %s field with its input', (type) => {
         // Given a field of one type with nothing but the required properties, next to another question so it is drawn as a row
-        const field: DynamicFormField = {key: 'answer', type, required: false};
+        const field: DynamicFormField = type === 'list' ? {key: 'answer', type, required: false, itemFields: []} : {key: 'answer', type, required: false};
 
         // When it renders
         const rendered = renderFields([field, otherQuestion]);
 
-        // Then it is drawn by the input its type maps to, which is what a schema without layout hints gets, and its answer is masked in session recordings
+        // Then it is drawn by the input its type maps to, which is what a schema without layout hints gets, and its answer is masked in session recordings, including by inputs that do not pass the FullStory class on
         expect(rendered.get('answer')?.InputComponent).toBe(EXPECTED_INPUT_BY_TYPE[type]);
         expect(rendered.get('answer')?.forwardedFSClass).toBe(CONST.FULLSTORY.CLASS.MASK);
+        expect(isMasked(screen.UNSAFE_getByProps({inputID: 'answer'}))).toBe(true);
     });
 
     it('keeps sensitive answers out of the draft', () => {
@@ -232,9 +250,10 @@ describe('DynamicFormFields', () => {
         // When the fields render
         const rendered = renderFields([readonlyCountry], {nationality: 'GB'});
 
-        // Then no input is drawn, and the row shows the translated country
+        // Then no input is drawn, and the row shows the translated country, masked in session recordings since a prefilled answer is still personal
         expect(rendered.size).toBe(0);
         expect(screen.getByText('allCountries.GB')).toBeOnTheScreen();
+        expect(isMasked(screen.UNSAFE_getByType(MenuItemWithTopDescription))).toBe(true);
     });
 
     it('draws a heading with its description above the fields that follow it', () => {
diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 5f44cc6016dc..2cca3cbbec1a 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -2,14 +2,17 @@ import {render} from '@testing-library/react-native';
 
 import DynamicFormFlow from '@components/DynamicForm';
 import type {DynamicFormLayout, DynamicFormSubPageProps} from '@components/DynamicForm/types';
+import {getListItems, getListItemSensitiveKey} from '@components/DynamicForm/utils/listItems';
+import type {FormValue} from '@components/Form/types';
 
 import useSubPage from '@hooks/useSubPage';
 import type {SubPageProps} from '@hooks/useSubPage/types';
 
 import Navigation from '@libs/Navigation/Navigation';
 
-import {clearSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
+import {clearSensitiveAnswers, forgetSensitiveAnswers, saveDraftAnswers, saveSensitiveAnswers} from '@userActions/DynamicForm';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {DynamicFormPage, DynamicFormSchema} from '@src/types/onyx';
@@ -37,6 +40,7 @@ jest.mock('@userActions/DynamicForm', () => ({
     saveDraftAnswers: jest.fn(),
     saveSensitiveAnswers: jest.fn(),
     clearSensitiveAnswers: jest.fn(),
+    forgetSensitiveAnswers: jest.fn(),
 }));
 jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn(), goBack: jest.fn()}));
 jest.mock('@components/ScreenWrapper', () => jest.fn(({children}: {children: React.ReactNode}) => children));
@@ -49,8 +53,8 @@ jest.mock('@components/Header/composed/HeaderWithBackButtonAndTitle', () =>
     }),
 );
 
-// Any form key works, since the draft is read as plain values
-const FORM_ID = ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM;
+// Any form key works, since the draft is read as plain values. This one types its draft as any answers, list entries included.
+const FORM_ID = ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM;
 
 const personalDetails: DynamicFormPage = {
     key: 'personal-details',
@@ -78,8 +82,8 @@ const buildRoute = (pageName: string, action?: 'edit') => ROUTES.BANK_ACCOUNT_PE
 
 type RenderFlowOptions = {
     flowSchema?: DynamicFormSchema;
-    draft?: Record<string, string>;
-    sensitiveAnswers?: Record<string, string>;
+    draft?: Record<string, FormValue>;
+    sensitiveAnswers?: Record<string, FormValue>;
     pageIndex?: number;
     currentPageName?: string;
     isRedirecting?: boolean;
@@ -475,4 +479,154 @@ describe('DynamicFormFlow', () => {
         // Then the page gets it, so file fields can enforce it
         expect(pageProps?.maxFileSize).toBe(2097152);
     });
+
+    describe('with a list field', () => {
+        const directorsSchema: DynamicFormSchema = {
+            pages: [
+                {
+                    key: 'directors',
+                    title: 'Directors',
+                    content: [
+                        {
+                            key: 'directors',
+                            type: 'list',
+                            required: true,
+                            itemLabel: 'director',
+                            itemFields: [
+                                {key: 'firstName', type: 'text', required: true},
+                                {key: 'ssn', type: 'text', required: false, sensitive: true},
+                            ],
+                        },
+                    ],
+                },
+            ],
+        };
+        const jane = {id: 'jane', firstName: 'Jane'};
+
+        it('keeps the entry editors out of Next and Back', async () => {
+            // Given a list with one entry
+            // When the flow renders
+            const {subPageOptions} = await renderFlow({flowSchema: directorsSchema, draft: {directors: [jane]}, currentPageName: 'directors'});
+
+            // Then the editors of a new and of the existing entry are pages that only Add, Edit or a row can open
+            expect(subPageOptions.skipPages).toEqual(expect.arrayContaining(['directors~new', 'directors~jane']));
+        });
+
+        it('opens the entry editor page when the user edits an entry', async () => {
+            // Given the list page with one entry
+            const {pageProps, subPageOptions} = await renderFlow({flowSchema: directorsSchema, draft: {directors: [jane]}, currentPageName: 'directors'});
+
+            // When the user edits the entry
+            pageProps?.onOpenListItemEditor('directors', 'jane');
+
+            // Then the entry's editor page opens, outside edit mode since the list page was not opened from the confirmation page
+            expect(mockMoveTo).toHaveBeenCalledWith(
+                subPageOptions.pages.findIndex((page) => page.pageName === 'directors~jane'),
+                false,
+            );
+        });
+
+        it('drafts a new entry, keeps its SSN in memory, and returns to the list page', async () => {
+            // Given the editor of a new director
+            const {pageProps} = await renderFlow({flowSchema: directorsSchema, currentPageName: 'directors~new'});
+
+            // When the user saves it
+            pageProps?.onListItemSave('directors', undefined, {firstName: 'John', ssn: '123456789'});
+
+            // Then the entry is added to the draft without its SSN, the SSN is kept in memory under the entry, and the list page opens again
+            const draftedItems = getListItems(jest.mocked(saveDraftAnswers).mock.lastCall?.[1].directors);
+            expect(draftedItems.map((item) => item.firstName)).toEqual(['John']);
+            expect(draftedItems.at(0)?.ssn).toBeUndefined();
+            expect(jest.mocked(saveSensitiveAnswers).mock.lastCall).toEqual([
+                FORM_ID,
+                Object.fromEntries(draftedItems.map((item) => [getListItemSensitiveKey('directors', item.id, 'ssn'), '123456789'])),
+            ]);
+            expect(Navigation.goBack).toHaveBeenCalledWith(buildRoute('directors'));
+        });
+
+        it('forgets the SSN of a removed entry when the user leaves the list page', async () => {
+            // Given a director whose SSN is kept in memory, removed from the list on its page
+            const {pageProps} = await renderFlow({
+                flowSchema: directorsSchema,
+                draft: {directors: [jane]},
+                sensitiveAnswers: {[getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'},
+                currentPageName: 'directors',
+            });
+            const page = pageProps?.pages.at(0);
+            if (!pageProps || !page) {
+                throw new Error('No list page');
+            }
+
+            // When the user leaves the page with Next
+            pageProps.onPageSubmit(page, {directors: []});
+
+            // Then the removed director's SSN is dropped from memory instead of lasting the whole visit
+            expect(forgetSensitiveAnswers).toHaveBeenCalledWith(FORM_ID, [getListItemSensitiveKey('directors', 'jane', 'ssn')]);
+        });
+
+        it('gives the screen the list entries when the user leaves the list page, without their SSNs', async () => {
+            // Given a director whose SSN is kept in memory, on the list page
+            const {pageProps, onPageSubmit} = await renderFlow({
+                flowSchema: directorsSchema,
+                draft: {directors: [jane]},
+                sensitiveAnswers: {[getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'},
+                currentPageName: 'directors',
+            });
+            const page = pageProps?.pages.at(0);
+            if (!pageProps || !page) {
+                throw new Error('No list page');
+            }
+
+            // When the user leaves the page with Next
+            pageProps.onPageSubmit(page, {directors: [jane]});
+
+            // Then a screen saving page by page gets the director, while the SSN stays in memory, out of the request queue
+            expect(onPageSubmit).toHaveBeenCalledWith(page, {directors: [jane]});
+        });
+
+        it('keeps a sensitive list in memory instead of the draft', async () => {
+            // Given the editor of a new director, in a list marked sensitive as a whole
+            const sensitiveSchema: DynamicFormSchema = {
+                pages: [{key: 'directors', content: [{key: 'directors', type: 'list', required: true, sensitive: true, itemFields: [{key: 'firstName', type: 'text', required: true}]}]}],
+            };
+            const {pageProps} = await renderFlow({flowSchema: sensitiveSchema, currentPageName: 'directors~new'});
+            jest.mocked(saveDraftAnswers).mockClear();
+
+            // When the user saves the director
+            pageProps?.onListItemSave('directors', undefined, {firstName: 'John'});
+
+            // Then the list goes to memory only, so no director reaches the device's storage
+            expect(saveDraftAnswers).not.toHaveBeenCalled();
+            expect(getListItems(jest.mocked(saveSensitiveAnswers).mock.lastCall?.[1].directors).map((item) => item.firstName)).toEqual(['John']);
+        });
+
+        it('returns from an entry editor to its list page on back', async () => {
+            // Given the editor of an existing entry
+            const {onBack} = await renderFlow({flowSchema: directorsSchema, draft: {directors: [jane]}, currentPageName: 'directors~jane', pageIndex: 2});
+
+            // When the user presses back
+            mockOnBackButtonPress?.();
+
+            // Then the list page opens, rather than the page before the editor or the screen before the flow
+            expect(Navigation.goBack).toHaveBeenCalledWith(buildRoute('directors'));
+            expect(onBack).not.toHaveBeenCalled();
+        });
+
+        it('submits each entry with its sensitive answers', async () => {
+            // Given a director whose SSN is kept in memory
+            const {subPageOptions, onSubmit} = await renderFlow({
+                flowSchema: directorsSchema,
+                draft: {directors: [jane]},
+                sensitiveAnswers: {[getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'},
+                currentPageName: CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY,
+                hasConfirmation: true,
+            });
+
+            // When the user confirms
+            subPageOptions.onFinished();
+
+            // Then the entry is submitted with its SSN back in place
+            expect(onSubmit).toHaveBeenCalledWith({directors: [{id: 'jane', firstName: 'Jane', ssn: '123456789'}]});
+        });
+    });
 });
diff --git a/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
new file mode 100644
index 000000000000..51108c4b0ec4
--- /dev/null
+++ b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
@@ -0,0 +1,150 @@
+import {act, render} from '@testing-library/react-native';
+
+import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
+import type {ListFieldRow} from '@components/ListField';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+
+import {clearListItemEdit} from '@userActions/DynamicForm';
+
+import type {DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
+
+import React from 'react';
+
+type CapturedListFieldProps = {
+    rows: ListFieldRow[];
+    canAddMore?: boolean;
+    onAdd: () => void;
+    onEdit: (id: string) => void;
+    onRemove: (id: string) => void;
+};
+
+type CapturedModalProps = {
+    isVisible: boolean;
+    keptAnswers: Record<string, unknown>;
+    onSave: (answers: Record<string, string>) => void;
+    onClose: () => void;
+};
+
+type ConfirmModalOptions = {
+    title: string;
+};
+
+const mockShowConfirmModal = jest.fn<Promise<{action: string}>, [ConfirmModalOptions]>(() => Promise.resolve({action: ModalActions.CONFIRM}));
+
+const mockListField = jest.fn<null, [CapturedListFieldProps]>(() => null);
+const mockModal = jest.fn<null, [CapturedModalProps]>(() => null);
+
+jest.mock('@components/ListField', () => ({
+    __esModule: true,
+    default: (props: CapturedListFieldProps) => mockListField(props),
+}));
+jest.mock('@components/DynamicForm/components/DynamicFormListItemModal', () => ({
+    __esModule: true,
+    default: (props: CapturedModalProps) => mockModal(props),
+}));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useConfirmModal', () => jest.fn(() => ({showConfirmModal: mockShowConfirmModal})));
+jest.mock('@userActions/DynamicForm', () => ({startListItemEdit: jest.fn(() => Promise.resolve()), clearListItemEdit: jest.fn()}));
+
+const itemFields: DynamicFormField[] = [{key: 'fullName', type: 'text', required: true}];
+const jane: DynamicFormListItem = {id: 'jane', fullName: 'Jane Doe'};
+const john: DynamicFormListItem = {id: 'john', fullName: 'John Roe'};
+
+function renderAdapter(value: DynamicFormListItem[], onInputChange: (items: DynamicFormListItem[]) => void, maxItems?: number, isInFlow = true) {
+    render(
+        <ListFieldAdapter
+            value={value}
+            onInputChange={onInputChange}
+            itemFields={isInFlow ? itemFields : [...itemFields, {key: 'ssn', type: 'text', required: false, sensitive: true}]}
+            maxItems={maxItems}
+            label="Directors"
+            itemLabel="director"
+            addTitle="Add director"
+            onAdd={isInFlow ? jest.fn() : undefined}
+            onEdit={isInFlow ? jest.fn() : undefined}
+            renderFields={jest.fn()}
+        />,
+    );
+    const props = mockListField.mock.lastCall?.[0];
+    if (!props) {
+        throw new Error('ListField did not render');
+    }
+    return props;
+}
+
+describe('ListFieldAdapter', () => {
+    it('shows each entry as a row named by its answers', () => {
+        // Given two directors
+        // When the list renders
+        const {rows} = renderAdapter([jane, john], jest.fn());
+
+        // Then each director is a row titled with their name, so the user can tell them apart
+        expect(rows.map((row) => [row.id, row.title])).toEqual([
+            ['jane', 'Jane Doe'],
+            ['john', 'John Roe'],
+        ]);
+    });
+
+    it('gives FormProvider the list without the removed entry once the user confirms', async () => {
+        // Given two directors
+        const onInputChange = jest.fn();
+        const {onRemove} = renderAdapter([jane, john], onInputChange);
+
+        // When the user removes one and confirms
+        await act(async () => onRemove('jane'));
+
+        // Then the form value is the whole list minus that director, and the unmasked modal title names no one, since the name is personal
+        expect(onInputChange).toHaveBeenCalledWith([john]);
+        expect(mockShowConfirmModal.mock.lastCall?.[0].title).not.toContain('Jane');
+    });
+
+    it('keeps the entry when the user cancels the removal', async () => {
+        // Given two directors, and a user who will cancel the confirmation
+        const onInputChange = jest.fn();
+        const {onRemove} = renderAdapter([jane, john], onInputChange);
+        mockShowConfirmModal.mockResolvedValueOnce({action: ModalActions.CLOSE});
+
+        // When the user taps remove on one
+        await act(async () => onRemove('jane'));
+
+        // Then the list is left as it was
+        expect(onInputChange).not.toHaveBeenCalled();
+    });
+
+    it('edits an entry in a modal outside the flow, keeping a stored sensitive answer the user leaves blank', async () => {
+        // Given a director with a stored SSN, in a list that no flow opens editor pages for
+        const onInputChange = jest.fn();
+        const {onEdit} = renderAdapter([{...jane, ssn: '123456789'}], onInputChange, undefined, false);
+
+        // When the user edits the director, renames them and saves with the SSN left blank
+        await act(async () => onEdit('jane'));
+        const modal = mockModal.mock.lastCall?.[0];
+        act(() => modal?.onSave({fullName: 'Jane Smith', ...modal.keptAnswers}));
+
+        // Then the modal opened over the page, and the list holds the renamed director with the SSN still in place
+        expect(modal?.isVisible).toBe(true);
+        expect(onInputChange).toHaveBeenCalledWith([{id: 'jane', fullName: 'Jane Smith', ssn: '123456789'}]);
+    });
+
+    it('empties the editor draft when the modal closes', async () => {
+        // Given a director open in the modal editor outside the flow
+        const {onEdit} = renderAdapter([jane], jest.fn(), undefined, false);
+        await act(async () => onEdit('jane'));
+        jest.mocked(clearListItemEdit).mockClear();
+
+        // When the user closes the modal without saving
+        act(() => mockModal.mock.lastCall?.[0].onClose());
+
+        // Then the editor draft is emptied, so the director's answers do not stay on the device
+        expect(clearListItemEdit).toHaveBeenCalledTimes(1);
+    });
+
+    it('stops offering to add entries once the list is full', () => {
+        // Given a list allowing two directors, with two
+        // When it renders
+        const {canAddMore} = renderAdapter([jane, john], jest.fn(), 2);
+
+        // Then the add row is hidden, as a third director could not be submitted
+        expect(canAddMore).toBe(false);
+    });
+});
diff --git a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
index 4a4585a2f71a..168e4d5d8354 100644
--- a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
+++ b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
@@ -22,7 +22,7 @@ describe('getConfirmationItems', () => {
     it('masks sensitive answers and opens the page of an editable row', () => {
         // Given answers with an SSN
         const onEditPage = jest.fn();
-        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage);
+        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage, jest.fn());
 
         // When the user taps the SSN row
         const ssnRow = group.rows.find((row) => row.id === 'ssn');
@@ -36,22 +36,73 @@ describe('getConfirmationItems', () => {
     it('shows a readonly row with no chevron and no action', () => {
         // Given a readonly field
         const onEditPage = jest.fn();
-        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage);
+        const [group] = getConfirmationItems(pages, getAllFields(pages), {name: 'Ada', ssn: '123451234', country: 'US'}, translateLocal, onEditPage, jest.fn());
 
         // When its row is tapped
         const row = group.rows.find((candidate) => candidate.id === 'country');
         row?.onPress();
 
         // Then it is not editable
-        expect(row?.shouldShowRightIcon).toBe(false);
+        expect(row).toMatchObject({shouldShowRightIcon: false});
         expect(onEditPage).not.toHaveBeenCalled();
     });
 
     it('has no group for a page that is not shown', () => {
         // Given a private recipient, so the business page is skipped
-        const groups = getConfirmationItems(pages, getAllFields(pages), {type: 'PRIVATE', name: 'Ada', ein: '1'}, translateLocal, jest.fn());
+        const groups = getConfirmationItems(pages, getAllFields(pages), {type: 'PRIVATE', name: 'Ada', ein: '1'}, translateLocal, jest.fn(), jest.fn());
 
         // Then only the identity page is summarized
         expect(groups.map((group) => group.id)).toEqual(['identity']);
     });
+
+    it('shows each list entry as its own row that opens the entry', () => {
+        // Given a page with a list of directors holding one entry
+        const directorsPages: DynamicFormPage[] = [
+            {
+                key: 'directors',
+                content: [
+                    {
+                        key: 'directors',
+                        type: 'list',
+                        required: true,
+                        itemFields: [
+                            {key: 'firstName', type: 'text', required: true},
+                            {key: 'lastName', type: 'text', required: true},
+                        ],
+                    },
+                ],
+            },
+        ];
+        const values = {directors: [{id: 'jane', firstName: 'Jane', lastName: 'Doe'}]};
+        const onEditListItem = jest.fn();
+
+        // When the confirmation sections are built and the entry row is tapped
+        const row = getConfirmationItems(directorsPages, getAllFields(directorsPages), values, translateLocal, jest.fn(), onEditListItem).at(0)?.rows.at(0);
+        row?.onPress();
+
+        // Then the entry is an avatar row named by its leading text answers, and tapping it opens that entry rather than the page
+        expect(row).toMatchObject({kind: 'avatar', title: 'Jane Doe'});
+        expect(onEditListItem).toHaveBeenCalledWith('directors', 'jane');
+    });
+
+    it('shows an empty list as a row that opens its page', () => {
+        // Given a page with an optional list of directors that holds no entry
+        const directorsPages: DynamicFormPage[] = [
+            {
+                key: 'directors',
+                content: [{key: 'directors', label: 'Directors', type: 'list', required: false, itemFields: [{key: 'firstName', type: 'text', required: true}]}],
+            },
+        ];
+        const onEditPage = jest.fn();
+        const onEditListItem = jest.fn();
+
+        // When the confirmation sections are built and the list row is tapped
+        const row = getConfirmationItems(directorsPages, getAllFields(directorsPages), {directors: []}, translateLocal, onEditPage, onEditListItem).at(0)?.rows.at(0);
+        row?.onPress();
+
+        // Then the list still has a row, so the user can go back and add a director from the confirmation page
+        expect(row).toMatchObject({description: 'Directors', title: ''});
+        expect(onEditPage).toHaveBeenCalledWith(0);
+        expect(onEditListItem).not.toHaveBeenCalled();
+    });
 });
diff --git a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
index 979dbd31801a..d2ea0e75f030 100644
--- a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
+++ b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
@@ -1,5 +1,6 @@
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
 import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
+import {getListItemSensitiveKey} from '@components/DynamicForm/utils/listItems';
 
 import Log from '@libs/Log';
 import {getCountryZipRegexDetails} from '@libs/ValidationUtils';
@@ -369,4 +370,48 @@ describe('getDynamicFieldErrors', () => {
         expect(unansweredErrors).toEqual({hasOtherOwners: translateLocal('common.error.fieldRequired')});
         expect(consentErrors).toEqual({acceptTerms: translateLocal('common.error.fieldRequired')});
     });
+
+    it('checks a list for its size and for the first entry with a problem', () => {
+        // Given a list of at least two directors, whose entries need a first name and may hold a sensitive SSN
+        const directors: DynamicFormField = {
+            key: 'directors',
+            type: 'list',
+            required: true,
+            minItems: 2,
+            itemFields: [
+                {key: 'firstName', type: 'text', required: true},
+                {key: 'ssn', type: 'text', required: true, sensitive: true},
+            ],
+        };
+
+        // When it holds no entry, and when it holds one entry without a first name
+        const emptyErrors = getDynamicFieldErrors([directors], {directors: []}, translateLocal);
+        const shortErrors = getDynamicFieldErrors([directors], {directors: [{id: 'jane', firstName: ''}]}, translateLocal);
+
+        // Then the empty list is required, and the short list shows both the size and the entry's first problem, its missing name
+        expect(emptyErrors).toEqual({directors: translateLocal('common.error.fieldRequired')});
+        expect(shortErrors).toEqual({directors: `${translateLocal('dynamicForm.error.tooFewItems', {min: 2})}\n${translateLocal('common.error.fieldRequired')}`});
+    });
+
+    it('asks again for a sensitive entry answer the memory no longer holds', () => {
+        // Given a director whose required SSN is kept in memory apart from the drafted entry
+        const directors: DynamicFormField = {
+            key: 'directors',
+            type: 'list',
+            required: true,
+            itemFields: [
+                {key: 'firstName', type: 'text', required: true},
+                {key: 'ssn', type: 'text', required: true, sensitive: true},
+            ],
+        };
+        const draftValues = {directors: [{id: 'jane', firstName: 'Jane'}]};
+
+        // When the SSN is in memory, and when the memory was lost, as after the app restarts
+        const keptErrors = getDynamicFieldErrors([directors], {...draftValues, [getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'}, translateLocal);
+        const lostErrors = getDynamicFieldErrors([directors], draftValues, translateLocal);
+
+        // Then the list passes while the SSN is kept, and asks for it once it is lost, so a director is never submitted without one
+        expect(keptErrors).toEqual({});
+        expect(lostErrors).toEqual({directors: translateLocal('common.error.fieldRequired')});
+    });
 });
diff --git a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
index fe7bd009fd79..f8f25c655a7c 100644
--- a/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
+++ b/tests/unit/components/DynamicForm/getSubmittedAnswersTest.ts
@@ -1,5 +1,6 @@
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
 import getSubmittedAnswers, {getAnswerKeys} from '@components/DynamicForm/utils/getSubmittedAnswers';
+import {getListItemSensitiveKey} from '@components/DynamicForm/utils/listItems';
 
 import type {DynamicFormField} from '@src/types/onyx';
 
@@ -57,4 +58,24 @@ describe('getSubmittedAnswers', () => {
         expect(keys).toContain('home');
         expect(keys).toContain(cityKey);
     });
+
+    it('submits each list entry with its sensitive answers kept in memory', () => {
+        // Given a list of directors whose SSN is sensitive, so it is kept in memory under the entry instead of in the drafted entry
+        const directors: DynamicFormField = {
+            key: 'directors',
+            type: 'list',
+            required: true,
+            itemFields: [
+                {key: 'firstName', type: 'text', required: true},
+                {key: 'ssn', type: 'text', required: true, sensitive: true},
+            ],
+        };
+        const values = {directors: [{id: 'jane', firstName: 'Jane'}], [getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'};
+
+        // When the answers are collected
+        const answers = getSubmittedAnswers([directors], values);
+
+        // Then the entry is sent whole, SSN included, without the memory key it was kept under
+        expect(answers).toEqual({directors: [{id: 'jane', firstName: 'Jane', ssn: '123456789'}]});
+    });
 });
diff --git a/tests/unit/components/DynamicForm/summarizeListItemTest.ts b/tests/unit/components/DynamicForm/summarizeListItemTest.ts
new file mode 100644
index 000000000000..3bb3b79bc226
--- /dev/null
+++ b/tests/unit/components/DynamicForm/summarizeListItemTest.ts
@@ -0,0 +1,38 @@
+import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
+
+import type {DynamicFormField} from '@src/types/onyx';
+
+import {translateLocal} from '../../../utils/TestHelper';
+
+describe('summarizeListItem', () => {
+    it('names an entry by its leading text answers and describes it with up to two short ones', () => {
+        // Given an owner with a name, an SSN, a date of birth and three short answers
+        const itemFields: DynamicFormField[] = [
+            {key: 'firstName', type: 'text', required: true},
+            {key: 'lastName', type: 'text', required: true},
+            {key: 'ssn', type: 'text', required: true, sensitive: true},
+            {key: 'dateOfBirth', type: 'date', required: true},
+            {key: 'ownership', type: 'percent', required: true},
+            {key: 'role', type: 'select', required: true, values: [{key: 'CEO', label: 'Chief executive'}]},
+            {key: 'title', type: 'text', required: false},
+        ];
+        const owner = {id: 'jane', firstName: 'Jane', lastName: 'Doe', ssn: '123456789', dateOfBirth: '1980-04-19', ownership: '40', role: 'CEO', title: 'Founder'};
+
+        // When the entry is summarized
+        const summary = summarizeListItem(owner, itemFields, translateLocal);
+
+        // Then the name is the title, and the description holds the first two short answers, leaving out the SSN and the long date
+        expect(summary).toEqual({title: 'Jane Doe', description: '40%, Chief executive'});
+    });
+
+    it('names an entry without text answers by its first answer', () => {
+        // Given an entry holding only a choice
+        const itemFields: DynamicFormField[] = [{key: 'role', type: 'select', required: true, values: [{key: 'CEO', label: 'Chief executive'}]}];
+
+        // When it is summarized
+        const summary = summarizeListItem({id: 'one', role: 'CEO'}, itemFields, translateLocal);
+
+        // Then the choice names the row, so it is never left without a title
+        expect(summary).toEqual({title: 'Chief executive', description: ''});
+    });
+});
diff --git a/tests/unit/components/DynamicForm/toDynamicFormValuesTest.ts b/tests/unit/components/DynamicForm/toDynamicFormValuesTest.ts
index 373681ef6f2a..ea5f5453bfe9 100644
--- a/tests/unit/components/DynamicForm/toDynamicFormValuesTest.ts
+++ b/tests/unit/components/DynamicForm/toDynamicFormValuesTest.ts
@@ -8,6 +8,7 @@ describe('toDynamicFormValues', () => {
             accepted: true,
             countries: ['GB', 'US'],
             files: [{name: 'passport.pdf'}],
+            directors: [{id: 'jane', firstName: 'Jane'}],
             errors: {name: 'Required'},
             errorList: [{message: 'Required'}],
             mixedList: ['GB', 1],
@@ -18,7 +19,7 @@ describe('toDynamicFormValues', () => {
         const values = toDynamicFormValues(draft);
 
         // Then only the answers remain
-        expect(values).toEqual({name: 'Jane', accepted: true, countries: ['GB', 'US'], files: [{name: 'passport.pdf'}]});
+        expect(values).toEqual({name: 'Jane', accepted: true, countries: ['GB', 'US'], files: [{name: 'passport.pdf'}], directors: [{id: 'jane', firstName: 'Jane'}]});
     });
 
     it('returns no answers for a missing draft', () => {

From 56f5dc67c38ff979bbf11509cf3d30aaf075da4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Poche=C4=87?= <mikolaj.pochec@swmansion.com>
Date: Tue, 13 Oct 2026 18:18:50 +0200
Subject: [PATCH 575/781] Submit the last DynamicForm page only while online

---
 .../components/DynamicFormFieldsPage.tsx      |  3 +-
 .../DynamicForm/DynamicFormFieldsPageTest.tsx | 54 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx

diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
index 4b0cd5549e65..a56e039b1b84 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -52,7 +52,8 @@ function DynamicFormFieldsPage({
             style={[styles.mh5, styles.flexGrow1]}
             submitButtonStyles={styles.mb0}
             keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}
-            enabledWhenOffline
+            // An offline request is saved to disk, so the last page submits only online, as the confirmation page does
+            enabledWhenOffline={!isLastPage}
         >
             {({inputValues}) => {
                 const currentValues = withInputValues(inputValues);
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx
new file mode 100644
index 000000000000..56b54c189679
--- /dev/null
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx
@@ -0,0 +1,54 @@
+import {render} from '@testing-library/react-native';
+
+import DynamicFormFieldsPage from '@components/DynamicForm/components/DynamicFormFieldsPage';
+import FormProvider from '@components/Form/FormProvider';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {DynamicFormPage} from '@src/types/onyx';
+
+import React from 'react';
+
+jest.mock('@components/Form/FormProvider', () => jest.fn(() => null));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
+
+const page: DynamicFormPage = {key: 'identity', title: 'Identity', content: [{key: 'ssn', type: 'text', required: true, sensitive: true}]};
+
+function renderPage(isLastPage: boolean) {
+    render(
+        <DynamicFormFieldsPage
+            isEditing={false}
+            isLastPage={isLastPage}
+            currentPageName={page.key}
+            onNext={jest.fn()}
+            onMove={jest.fn()}
+            formID={ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM}
+            pages={[page]}
+            allFields={[]}
+            values={{}}
+            onPageSubmit={jest.fn()}
+            confirmationTitle="Confirm"
+        />,
+    );
+    return jest.mocked(FormProvider).mock.lastCall?.[0];
+}
+
+describe('DynamicFormFieldsPage', () => {
+    it('lets the user move on to the next page while offline', () => {
+        // Given a page that a later page or a confirmation page follows
+        // When it renders
+        const formProps = renderPage(false);
+
+        // Then its button works offline, since moving between pages sends nothing
+        expect(formProps?.enabledWhenOffline).toBe(true);
+    });
+
+    it('submits the last page only while online', () => {
+        // Given the last page of a flow without a confirmation page, so its button submits the form
+        // When it renders
+        const formProps = renderPage(true);
+
+        // Then its button is disabled offline, since an offline request is saved to disk with the sensitive answers it carries
+        expect(formProps?.enabledWhenOffline).toBe(false);
+    });
+});

From d2571faeb53917b4019bfa9e37de764a5866e634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Poche=C4=87?= <mikolaj.pochec@swmansion.com>
Date: Tue, 13 Oct 2026 18:18:52 +0200
Subject: [PATCH 576/781] Refill every sensitive DynamicForm input from memory

---
 .../DynamicForm/renderDynamicField.tsx        |  3 +-
 .../DynamicForm/renderers/addressRenderer.tsx | 16 ++++-
 .../DynamicForm/renderers/choiceRenderers.tsx |  9 ++-
 .../DynamicForm/renderers/textRenderers.tsx   | 18 ++---
 src/components/DynamicForm/renderers/types.ts | 34 +++++++--
 .../utils/getSensitiveDefaultValue.ts         | 52 ++++++++++++++
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 72 ++++++++++++++++++-
 7 files changed, 182 insertions(+), 22 deletions(-)
 create mode 100644 src/components/DynamicForm/utils/getSensitiveDefaultValue.ts

diff --git a/src/components/DynamicForm/renderDynamicField.tsx b/src/components/DynamicForm/renderDynamicField.tsx
index 63d45bd53110..e4f38a8da5b4 100644
--- a/src/components/DynamicForm/renderDynamicField.tsx
+++ b/src/components/DynamicForm/renderDynamicField.tsx
@@ -7,6 +7,7 @@ import renderAddress from './renderers/addressRenderer';
 import CHOICE_RENDERERS from './renderers/choiceRenderers';
 import renderFile from './renderers/fileRenderer';
 import TEXT_RENDERERS from './renderers/textRenderers';
+import getSensitiveDefaultValue from './utils/getSensitiveDefaultValue';
 
 const RENDERERS: DynamicFieldRendererMap = {
     ...TEXT_RENDERERS,
@@ -18,7 +19,7 @@ const RENDERERS: DynamicFieldRendererMap = {
 /** The input for one field, and how the renderer lays it out */
 function renderDynamicField<TType extends DynamicFormFieldType>(field: DynamicFormFieldOfType<TType>, context: DynamicFieldContext, inputProps: DynamicFieldInputProps): DynamicFieldInput {
     const render: DynamicFieldRenderer<TType> = RENDERERS[field.type];
-    return render(field, context, inputProps);
+    return render(field, context, {...inputProps, defaultValue: getSensitiveDefaultValue(field, context.values)});
 }
 
 export default renderDynamicField;
diff --git a/src/components/DynamicForm/renderers/addressRenderer.tsx b/src/components/DynamicForm/renderers/addressRenderer.tsx
index e4bfe3ffb426..2b178ba0ac90 100644
--- a/src/components/DynamicForm/renderers/addressRenderer.tsx
+++ b/src/components/DynamicForm/renderers/addressRenderer.tsx
@@ -1,4 +1,5 @@
 import getAddressInputKeys, {getAddressCountry, isStateAsked} from '@components/DynamicForm/utils/getAddressInputKeys';
+import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 
 import AddressFormFields from '@pages/ReimbursementAccount/AddressFormFields';
 
@@ -7,9 +8,14 @@ import React from 'react';
 import type {DynamicFieldRenderer} from './types';
 
 /** An address drawn as one input per part, each under its own draft key */
-const renderAddress: DynamicFieldRenderer<'address'> = (field, {values}, {shouldSaveDraft, forwardedFSClass, onValueChange}) => {
+const renderAddress: DynamicFieldRenderer<'address'> = (field, {values}, {shouldSaveDraft, forwardedFSClass, onValueChange, defaultValue}) => {
     const addressKeys = getAddressInputKeys(field.key);
     const country = getAddressCountry(field.key, values);
+    // The street arrives as the field's answer. The other parts of a sensitive address are not drafted either, so they start from memory too.
+    const getSensitivePart = (key: string) => {
+        const part = values[key];
+        return isSensitiveField(field) && typeof part === 'string' ? part : undefined;
+    };
     return {
         isMenuRow: false,
         labelAbove: 'heading',
@@ -17,7 +23,13 @@ const renderAddress: DynamicFieldRenderer<'address'> = (field, {values}, {should
             <AddressFormFields
                 inputKeys={addressKeys}
                 // AddressFormFields lists the states of the default country, and assumes the US without one
-                defaultValues={{street: '', country}}
+                defaultValues={{
+                    street: defaultValue ?? '',
+                    city: getSensitivePart(addressKeys.city),
+                    state: getSensitivePart(addressKeys.state),
+                    zipCode: getSensitivePart(addressKeys.zipCode),
+                    country,
+                }}
                 streetTranslationKey="common.streetAddress"
                 shouldSaveDraft={shouldSaveDraft}
                 shouldDisplayCountrySelector
diff --git a/src/components/DynamicForm/renderers/choiceRenderers.tsx b/src/components/DynamicForm/renderers/choiceRenderers.tsx
index ca402864678c..757b60eef3f3 100644
--- a/src/components/DynamicForm/renderers/choiceRenderers.tsx
+++ b/src/components/DynamicForm/renderers/choiceRenderers.tsx
@@ -30,7 +30,12 @@ function getChoiceOptionsList(choices: Choice[]): Record<string, string> {
 }
 
 /** A lone choice field is the page itself: its options are listed inline, and the page title asks the question */
-function renderInlineChoice(label: string, choices: Choice[], inputProps: DynamicFieldInputProps, {canSelectMultiple, isSearchable}: InlineChoiceOptions): DynamicFieldInput {
+function renderInlineChoice(
+    label: string,
+    choices: Choice[],
+    inputProps: DynamicFieldInputProps<string | string[]>,
+    {canSelectMultiple, isSearchable}: InlineChoiceOptions,
+): DynamicFieldInput {
     const listProps = {items: choices, isSearchable, searchInputLabel: label};
     return {
         isMenuRow: true,
@@ -46,7 +51,7 @@ function renderInlineChoice(label: string, choices: Choice[], inputProps: Dynami
     };
 }
 
-function renderTabs(label: string, choices: Choice[], inputProps: DynamicFieldInputProps, isLoneField: boolean): DynamicFieldInput {
+function renderTabs(label: string, choices: Choice[], inputProps: DynamicFieldInputProps<string>, isLoneField: boolean): DynamicFieldInput {
     return {
         isMenuRow: false,
         labelAbove: isLoneField ? undefined : 'prompt',
diff --git a/src/components/DynamicForm/renderers/textRenderers.tsx b/src/components/DynamicForm/renderers/textRenderers.tsx
index 5033688a9dd3..9e7167883672 100644
--- a/src/components/DynamicForm/renderers/textRenderers.tsx
+++ b/src/components/DynamicForm/renderers/textRenderers.tsx
@@ -1,7 +1,6 @@
 import AmountForm from '@components/AmountForm';
 import CurrencyPicker from '@components/CurrencyPicker';
 import DatePicker from '@components/DatePicker';
-import type {DynamicFormValues} from '@components/DynamicForm/types';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
@@ -41,16 +40,10 @@ function getTextHint(field: DynamicFormTextField | DynamicFormNumberField, trans
     return translate('dynamicForm.exampleHint', {example: field.example});
 }
 
-/** Sensitive answers are not drafted, so a page the user comes back to is refilled from the answers kept in memory */
-function getSensitiveDefaultValue(field: DynamicFormTextField | DynamicFormNumberField, values: DynamicFormValues): string | undefined {
-    const value = values[field.key];
-    return field.sensitive && typeof value === 'string' ? value : undefined;
-}
-
 function renderTextInput(
     field: DynamicFormTextField | DynamicFormNumberField,
-    {values, translate}: DynamicFieldContext,
-    inputProps: DynamicFieldInputProps,
+    {translate}: DynamicFieldContext,
+    inputProps: DynamicFieldInputProps<string>,
     inputMode: InputModeOptions | undefined,
     isMultiline = false,
 ): DynamicFieldInput {
@@ -61,7 +54,6 @@ function renderTextInput(
             <InputWrapper
                 InputComponent={TextInput}
                 {...inputProps}
-                defaultValue={getSensitiveDefaultValue(field, values)}
                 label={getFieldLabel(field, translate)}
                 hint={getTextHint(field, translate)}
                 maxLength={field.maxLength}
@@ -91,6 +83,7 @@ const TEXT_RENDERERS: Pick<DynamicFieldRendererMap, 'text' | 'number' | 'date' |
     }),
     amount: (field, {values, translate, styles, currency}, inputProps) => {
         const chosenCurrency = field.currencyKey ? values[field.currencyKey] : undefined;
+        const amountCurrency = typeof chosenCurrency === 'string' && chosenCurrency !== '' ? chosenCurrency : currency;
         // AmountForm takes no FullStory class, so the mask goes on a View around it
         const amountInput = (
             <View fsClass={inputProps.forwardedFSClass}>
@@ -98,7 +91,7 @@ const TEXT_RENDERERS: Pick<DynamicFieldRendererMap, 'text' | 'number' | 'date' |
                     InputComponent={AmountForm}
                     {...inputProps}
                     label={getFieldLabel(field, translate)}
-                    currency={typeof chosenCurrency === 'string' && chosenCurrency !== '' ? chosenCurrency : currency}
+                    currency={amountCurrency}
                     displayAsTextInput
                     isCurrencyPressable={false}
                 />
@@ -117,7 +110,8 @@ const TEXT_RENDERERS: Pick<DynamicFieldRendererMap, 'text' | 'number' | 'date' |
                             inputID={field.currencyKey}
                             shouldSaveDraft={inputProps.shouldSaveDraft}
                             forwardedFSClass={inputProps.forwardedFSClass}
-                            defaultValue={currency}
+                            // A sensitive currency is not drafted, so the picker starts from the one kept in memory
+                            defaultValue={amountCurrency}
                             label={translate('common.currency')}
                         />
                     </View>
diff --git a/src/components/DynamicForm/renderers/types.ts b/src/components/DynamicForm/renderers/types.ts
index 89825a0825b7..59d198f9d43b 100644
--- a/src/components/DynamicForm/renderers/types.ts
+++ b/src/components/DynamicForm/renderers/types.ts
@@ -1,12 +1,13 @@
 import type {DynamicFormFieldsProps} from '@components/DynamicForm/components/DynamicFormFields';
 import type {DynamicFormFieldOfType} from '@components/DynamicForm/types';
-import type {InputComponentBaseProps} from '@components/Form/types';
+import type {FormValue, InputComponentBaseProps} from '@components/Form/types';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 
 import type {ThemeStyles} from '@src/styles';
 import type {DynamicFormFieldType} from '@src/types/onyx';
+import type {FileObject} from '@src/types/utils/Attachment';
 
 import type {ReactElement} from 'react';
 
@@ -19,11 +20,32 @@ type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize'
         isLoneField: boolean;
     };
 
+/** The answer each field type's input holds. An address holds its street, and its other parts sit under their own keys. */
+type DynamicFieldAnswerMap = {
+    text: string;
+    number: string;
+    select: string;
+    radio: string;
+    multiselect: string[];
+    date: string;
+    address: string;
+    file: FileObject[];
+    amount: string;
+    country: string;
+    countryMultiselect: string[];
+    boolean: boolean;
+    currency: string;
+    percent: string;
+};
+
 /** Props every input gets from the renderer */
-type DynamicFieldInputProps = Required<ForwardedFSClassProps> &
+type DynamicFieldInputProps<TAnswer extends FormValue = FormValue> = Required<ForwardedFSClassProps> &
     Required<Pick<InputComponentBaseProps, 'inputID' | 'shouldSaveDraft'>> &
     Pick<InputComponentBaseProps, 'onValueChange'> & {
         onBlur?: () => void;
+
+        /** A sensitive answer is not drafted, so the input starts from the answer the flow keeps in memory */
+        defaultValue?: TAnswer;
     };
 
 type DynamicFieldInput = {
@@ -40,9 +62,13 @@ type DynamicFieldInput = {
     showsDescription?: boolean;
 };
 
-type DynamicFieldRenderer<TType extends DynamicFormFieldType> = (field: DynamicFormFieldOfType<TType>, context: DynamicFieldContext, inputProps: DynamicFieldInputProps) => DynamicFieldInput;
+type DynamicFieldRenderer<TType extends DynamicFormFieldType> = (
+    field: DynamicFormFieldOfType<TType>,
+    context: DynamicFieldContext,
+    inputProps: DynamicFieldInputProps<DynamicFieldAnswerMap[TType]>,
+) => DynamicFieldInput;
 
 /** One renderer per field type, so typecheck fails when a type has none */
 type DynamicFieldRendererMap = {[TType in DynamicFormFieldType]: DynamicFieldRenderer<TType>};
 
-export type {DynamicFieldContext, DynamicFieldInput, DynamicFieldInputProps, DynamicFieldRenderer, DynamicFieldRendererMap};
+export type {DynamicFieldAnswerMap, DynamicFieldContext, DynamicFieldInput, DynamicFieldInputProps, DynamicFieldRenderer, DynamicFieldRendererMap};
diff --git a/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
new file mode 100644
index 000000000000..6d2e998e0951
--- /dev/null
+++ b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
@@ -0,0 +1,52 @@
+import type {DynamicFieldAnswerMap} from '@components/DynamicForm/renderers/types';
+import type {DynamicFormFieldOfType, DynamicFormValues} from '@components/DynamicForm/types';
+import type {FormValue} from '@components/Form/types';
+
+import type {DynamicFormFieldType} from '@src/types/onyx';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+import isSensitiveField from './isSensitiveField';
+
+type AnswerGuards = {[TType in DynamicFormFieldType]: (answer: FormValue) => answer is DynamicFieldAnswerMap[TType]};
+
+function isString(answer: FormValue): answer is string {
+    return typeof answer === 'string';
+}
+
+function isStringList(answer: FormValue): answer is string[] {
+    return Array.isArray(answer) && answer.every((item) => typeof item === 'string');
+}
+
+function isBoolean(answer: FormValue): answer is boolean {
+    return typeof answer === 'boolean';
+}
+
+function isFileList(answer: FormValue): answer is FileObject[] {
+    return Array.isArray(answer) && answer.every((item) => typeof item === 'object');
+}
+
+const ANSWER_GUARDS: AnswerGuards = {
+    text: isString,
+    number: isString,
+    select: isString,
+    radio: isString,
+    multiselect: isStringList,
+    date: isString,
+    address: isString,
+    file: isFileList,
+    amount: isString,
+    country: isString,
+    countryMultiselect: isStringList,
+    boolean: isBoolean,
+    currency: isString,
+    percent: isString,
+};
+
+/** Sensitive answers are not drafted, so a page the user comes back to is refilled from the answers kept in memory */
+function getSensitiveDefaultValue<TType extends DynamicFormFieldType>(field: DynamicFormFieldOfType<TType>, values: DynamicFormValues): DynamicFieldAnswerMap[TType] | undefined {
+    const answer = values[field.key];
+    const isAnswer: AnswerGuards[TType] = ANSWER_GUARDS[field.type];
+    return isSensitiveField(field) && answer !== undefined && isAnswer(answer) ? answer : undefined;
+}
+
+export default getSensitiveDefaultValue;
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index eb27f45c4136..d031f0d203a4 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -14,6 +14,7 @@ import YesNoAdapter from '@components/DynamicForm/adapters/YesNoAdapter';
 import DynamicFormFields from '@components/DynamicForm/components/DynamicFormFields';
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
+import type {FormValue} from '@components/Form/types';
 import PercentageForm from '@components/PercentageForm';
 import PushRowWithModal from '@components/PushRowWithModal';
 import RadioButtons from '@components/RadioButtons';
@@ -44,7 +45,7 @@ type CapturedInputProps = {
     maxFileSize?: number;
     accessibilityLabel?: string;
     currency?: string;
-    defaultValue?: string;
+    defaultValue?: unknown;
     onValueChange?: (value: string, key: string) => void;
     onBlur?: () => void;
 };
@@ -111,6 +112,23 @@ const EXPECTED_INPUT_BY_TYPE: Record<DynamicFormFieldType, ComponentType<never>>
 
 const FIELD_TYPES = Object.keys(EXPECTED_INPUT_BY_TYPE).filter((type): type is DynamicFormFieldType => Object.hasOwn(EXPECTED_INPUT_BY_TYPE, type));
 
+const SENSITIVE_ANSWER_BY_TYPE: Record<DynamicFormFieldType, FormValue> = {
+    text: 'Jane',
+    number: '123456789',
+    select: 'SAVINGS',
+    radio: 'SAVINGS',
+    multiselect: ['RETAIL'],
+    date: '1990-05-01',
+    address: '1 Main St',
+    file: [{name: 'passport.pdf', uri: 'file://passport.pdf'}],
+    amount: '1000',
+    country: 'PL',
+    countryMultiselect: ['PL', 'DE'],
+    boolean: true,
+    currency: 'EUR',
+    percent: '25',
+};
+
 describe('DynamicFormFields', () => {
     it.each(FIELD_TYPES)('renders a %s field with its input', (type) => {
         // Given a field of one type with nothing but the required properties, next to another question so it is drawn as a row
@@ -142,6 +160,58 @@ describe('DynamicFormFields', () => {
         expect(rendered.get('nationality')?.shouldSaveDraft).toBe(true);
     });
 
+    it.each(FIELD_TYPES)('refills a sensitive %s field from the answer kept in memory', (type) => {
+        // Given a sensitive field of one type, whose answer is kept in memory instead of in the draft
+        const field: DynamicFormField = {key: 'answer', type, required: true, sensitive: true};
+        const answer = SENSITIVE_ANSWER_BY_TYPE[type];
+
+        // When the user comes back to its page
+        const rendered = renderFields([field, otherQuestion], {answer});
+
+        // Then the input starts from that answer, so the user does not have to give it again
+        expect(rendered.get('answer')?.defaultValue).toEqual(answer);
+    });
+
+    it('leaves a regular field to its draft when the user comes back to its page', () => {
+        // Given a regular field with an answer, which FormProvider refills from the draft
+        const nationality: DynamicFormField = {key: 'nationality', type: 'country', required: true};
+
+        // When its page renders
+        const rendered = renderFields([nationality, otherQuestion], {nationality: 'PL'});
+
+        // Then the input gets no default of its own, so the draft stays the one source of its answer
+        expect(rendered.get('nationality')?.defaultValue).toBeUndefined();
+    });
+
+    it('refills every part of a sensitive address from memory', () => {
+        // Given a sensitive address whose parts are kept in memory
+        const homeAddress: DynamicFormField = {key: 'homeAddress', type: 'address', required: true, sensitive: true};
+        const keys = getAddressInputKeys('homeAddress');
+        const values = {homeAddress: '1 Main St', [keys.city]: 'Austin', [keys.state]: 'TX', [keys.zipCode]: '78701', [keys.country]: CONST.COUNTRY.US};
+
+        // When the user comes back to its page
+        const rendered = renderFields([homeAddress], values);
+
+        // Then every part starts from its answer, so none of them is asked again
+        expect(rendered.get(keys.street)?.defaultValue).toBe('1 Main St');
+        expect(rendered.get(keys.city)?.defaultValue).toBe('Austin');
+        expect(rendered.get(keys.state)?.defaultValue).toBe('TX');
+        expect(rendered.get(keys.zipCode)?.defaultValue).toBe('78701');
+        expect(rendered.get(keys.country)?.defaultValue).toBe(CONST.COUNTRY.US);
+    });
+
+    it('refills the currency of a sensitive amount from memory', () => {
+        // Given a sensitive amount whose currency the user picked, both kept in memory
+        const expectedVolume: DynamicFormField = {key: 'expectedVolume', type: 'amount', required: true, sensitive: true, currencyKey: 'expectedVolumeCurrency'};
+
+        // When the user comes back to its page
+        const rendered = renderFields([expectedVolume], {expectedVolume: '1000', expectedVolumeCurrency: CONST.CURRENCY.EUR}, {currency: CONST.CURRENCY.GBP});
+
+        // Then the picker starts from the picked currency rather than the screen currency
+        expect(rendered.get('expectedVolumeCurrency')?.defaultValue).toBe(CONST.CURRENCY.EUR);
+        expect(rendered.get('expectedVolume')?.defaultValue).toBe('1000');
+    });
+
     it('offers the options picked by the answer a select depends on', () => {
         // Given an account type whose options depend on the recipient type
         const accountType: DynamicFormField = {

From f2e717309b64320e1ae8f7681202a7e786d14ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Poche=C4=87?= <mikolaj.pochec@swmansion.com>
Date: Tue, 13 Oct 2026 18:18:52 +0200
Subject: [PATCH 577/781] Add When steps to DynamicForm tests

---
 .../DynamicForm/DynamicFormFlowTest.tsx       |  3 +-
 .../DynamicForm/getConfirmationItemsTest.ts   |  5 +-
 .../components/DynamicForm/paginateTest.ts    | 52 +++++++++++++------
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 5f44cc6016dc..ad705291438a 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -174,7 +174,8 @@ describe('DynamicFormFlow', () => {
     });
 
     it('asks for a confirmation page unless the screen turns it off', async () => {
-        // Given the same schema rendered with the default and with the confirmation page turned off
+        // Given the same schema, once with the default and once with the confirmation page turned off
+        // When each flow renders
         const defaultFlow = await renderFlow({hasConfirmation: 'default'});
         const withoutConfirmation = await renderFlow({hasConfirmation: false});
 
diff --git a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
index 4a4585a2f71a..28cda94ecf5c 100644
--- a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
+++ b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
@@ -49,7 +49,10 @@ describe('getConfirmationItems', () => {
 
     it('has no group for a page that is not shown', () => {
         // Given a private recipient, so the business page is skipped
-        const groups = getConfirmationItems(pages, getAllFields(pages), {type: 'PRIVATE', name: 'Ada', ein: '1'}, translateLocal, jest.fn());
+        const values = {type: 'PRIVATE', name: 'Ada', ein: '1'};
+
+        // When the confirmation page lists the answers
+        const groups = getConfirmationItems(pages, getAllFields(pages), values, translateLocal, jest.fn());
 
         // Then only the identity page is summarized
         expect(groups.map((group) => group.id)).toEqual(['identity']);
diff --git a/tests/unit/components/DynamicForm/paginateTest.ts b/tests/unit/components/DynamicForm/paginateTest.ts
index 2a12e4f0b5ba..c690adc3eae6 100644
--- a/tests/unit/components/DynamicForm/paginateTest.ts
+++ b/tests/unit/components/DynamicForm/paginateTest.ts
@@ -1,7 +1,7 @@
 import getPageTitle, {isPageShown} from '@components/DynamicForm/utils/getPageTitle';
 import paginate, {getAllFields, getPages} from '@components/DynamicForm/utils/paginate';
 
-import type {DynamicFormField, DynamicFormPage, DynamicFormTextField} from '@src/types/onyx';
+import type {DynamicFormField, DynamicFormPage, DynamicFormSchemaField, DynamicFormTextField} from '@src/types/onyx';
 
 import {translateLocal} from '../../../utils/TestHelper';
 
@@ -49,7 +49,10 @@ describe('paginate', () => {
 
     it('starts a new page after four questions in a row', () => {
         // Given five short questions
-        const pages = paginate([text('a'), text('b'), text('c'), text('d'), text('e')]);
+        const fields = [text('a'), text('b'), text('c'), text('d'), text('e')];
+
+        // When they are split into pages
+        const pages = paginate(fields);
 
         // Then the fifth does not fit the shared page
         expect(keysOf(pages)).toEqual([['a', 'b', 'c', 'd'], ['e']]);
@@ -92,7 +95,10 @@ describe('paginate', () => {
 describe('getPages', () => {
     it('names pages built from fields page-N', () => {
         // Given a flat schema
-        const pages = getPages({fields: [text('a'), {key: 'address', type: 'address', required: true}]});
+        const fields: DynamicFormSchemaField[] = [text('a'), {key: 'address', type: 'address', required: true}];
+
+        // When its pages are built
+        const pages = getPages({fields});
 
         // Then the pages get stable keys
         expect(pages.map((page) => page.key)).toEqual(['page-1', 'page-2']);
@@ -101,14 +107,15 @@ describe('getPages', () => {
     it('turns keys into URL-safe slugs, reserves confirm and makes keys unique', () => {
         // Given pages whose keys are not URL-safe, collide, or take the confirmation route
         const content = [text('a')];
-        const pages = getPages({
-            pages: [
-                {key: 'Bank Info', content},
-                {key: 'bank-info', content},
-                {key: 'confirm', content},
-                {key: '###', content},
-            ],
-        });
+        const schemaPages: DynamicFormPage[] = [
+            {key: 'Bank Info', content},
+            {key: 'bank-info', content},
+            {key: 'confirm', content},
+            {key: '###', content},
+        ];
+
+        // When the schema's pages are read
+        const pages = getPages({pages: schemaPages});
 
         // Then each is a unique route segment
         expect(pages.map((page) => page.key)).toEqual(['bank-info', 'bank-info-2', 'confirm-2', 'page-4']);
@@ -120,8 +127,11 @@ describe('getPageTitle', () => {
         // Given a page with a titleKey
         const page = {key: 'p', titleKey: 'common.next', content: [text('a')]} as DynamicFormPage;
 
+        // When its title is read
+        const title = getPageTitle(page, {}, translateLocal);
+
         // Then the translation is used
-        expect(getPageTitle(page, {}, translateLocal)).toBe(translateLocal('common.next'));
+        expect(title).toBe(translateLocal('common.next'));
     });
 
     it('falls back to the label of the lone question, ignoring a field it reveals', () => {
@@ -139,8 +149,11 @@ describe('getPageTitle', () => {
         // Given an untitled page whose first field is hidden
         const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Alpha', showWhen: {key: 'z', equals: ['1']}}), text('b', {label: 'Beta'}), text('c', {label: 'Gamma'})]};
 
+        // When its title is read
+        const title = getPageTitle(page, {}, translateLocal);
+
         // Then the title is the first field the user sees
-        expect(getPageTitle(page, {}, translateLocal)).toBe('Beta');
+        expect(title).toBe('Beta');
     });
 });
 
@@ -151,16 +164,23 @@ describe('isPageShown', () => {
         const page: DynamicFormPage = {key: 'biz', showWhen: {key: 'type', equals: ['BUSINESS']}, content: [text('ein')]};
         const allFields = getAllFields([{key: 'first', content: [type]}, page]);
 
+        // When the user answers private, and then business
+        const isShownForPrivate = isPageShown(page, {type: 'PRIVATE'}, allFields);
+        const isShownForBusiness = isPageShown(page, {type: 'BUSINESS'}, allFields);
+
         // Then it follows the answer
-        expect(isPageShown(page, {type: 'PRIVATE'}, allFields)).toBe(false);
-        expect(isPageShown(page, {type: 'BUSINESS'}, allFields)).toBe(true);
+        expect(isShownForPrivate).toBe(false);
+        expect(isShownForBusiness).toBe(true);
     });
 
     it('hides a page with no visible field', () => {
         // Given a page whose only field is hidden
         const page: DynamicFormPage = {key: 'p', content: [text('a', {showWhen: {key: 'z', equals: ['1']}})]};
 
+        // When the flow checks whether to show it
+        const isShown = isPageShown(page, {}, getAllFields([page]));
+
         // Then the page is skipped
-        expect(isPageShown(page, {}, getAllFields([page]))).toBe(false);
+        expect(isShown).toBe(false);
     });
 });

From d915f48f51c8ff7e92fbefde02f3ab7267b00138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Poche=C4=87?= <mikolaj.pochec@swmansion.com>
Date: Tue, 13 Oct 2026 18:18:53 +0200
Subject: [PATCH 578/781] Split a getConfirmationItems comment into two
 sentences

---
 src/components/DynamicForm/utils/getConfirmationItems.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index a1d2f74782c0..f082f03d817f 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -15,7 +15,7 @@ import isSensitiveField from './isSensitiveField';
 import isSupportedField from './isSupportedField';
 import maskSensitiveValue from './maskSensitiveValue';
 
-/** One section per shown page holding its visible answers. Tapping a row opens the page to edit; readonly rows open nothing. */
+/** One section per shown page holding its visible answers. Tapping a row opens the page to edit. Readonly rows open nothing. */
 function getConfirmationItems(
     pages: DynamicFormPage[],
     allFields: DynamicFormField[],

From f10366a8f5670798ec7d070b0e03932283e3bbb9 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 13 Oct 2026 19:52:19 +0000
Subject: [PATCH 579/781] Guard search snapshot data reads that crash while a
 search is loading

A new search's snapshot has only `search` until its results arrive, so `currentSearchResults?.data[...]` throws. Guard the remaining unguarded reads and cover the bulk actions case with a test.

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 .../ReportActionItem/MoneyRequestView.tsx     |  2 +-
 src/hooks/useMergeTransactions.ts             |  2 +-
 .../Search/SearchReportsMergeReports.tsx      |  2 +-
 tests/unit/hooks/useSearchBulkActionsTest.ts  | 31 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index fa9f09ab9d60..a9063417711a 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -229,7 +229,7 @@ function MoneyRequestView({
 
     // When this component is used when merging from the search page, we might not have the parent report stored in the main collection
     const [parentReportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
-    const parentReport = parentReportFromOnyx ?? currentSearchResults?.data[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
+    const parentReport = parentReportFromOnyx ?? currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
     const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
 
diff --git a/src/hooks/useMergeTransactions.ts b/src/hooks/useMergeTransactions.ts
index 51d4230c0875..50c1b2d00af5 100644
--- a/src/hooks/useMergeTransactions.ts
+++ b/src/hooks/useMergeTransactions.ts
@@ -56,7 +56,7 @@ function getTransaction(
         return transaction;
     }
 
-    return currentSearchResults?.data[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? onyxTransaction;
+    return currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? onyxTransaction;
 }
 
 function useMergeTransactions({mergeTransaction}: UseMergeTransactionsProps): UseMergeTransactionsReturn {
diff --git a/src/pages/Search/SearchReportsMergeReports.tsx b/src/pages/Search/SearchReportsMergeReports.tsx
index 1f7fff4c4167..33cb628dbf47 100644
--- a/src/pages/Search/SearchReportsMergeReports.tsx
+++ b/src/pages/Search/SearchReportsMergeReports.tsx
@@ -223,7 +223,7 @@ function SearchMergeReports() {
         isLoadingOnyxData ||
         selectedReportIDs?.some((reportID) => {
             const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
-            return !allReports?.[reportKey] && !!currentSearchResults?.data[reportKey];
+            return !allReports?.[reportKey] && !!currentSearchResults?.data?.[reportKey];
         });
 
     if (!isReportMergeBetaEnabled) {
diff --git a/tests/unit/hooks/useSearchBulkActionsTest.ts b/tests/unit/hooks/useSearchBulkActionsTest.ts
index 369ca3dfc0d2..441409888e8e 100644
--- a/tests/unit/hooks/useSearchBulkActionsTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsTest.ts
@@ -168,7 +168,7 @@ let mockSelectedTransactions: SelectedTransactions = {};
 let mockExcludedTransactions: SelectedTransactions = {};
 let mockSelectedReports: SelectedReports[] = [];
 let mockAreAllMatchingItemsSelected = false;
-let mockCurrentSearchResults: {search: {type: string}; data: Record<string, unknown>} | undefined;
+let mockCurrentSearchResults: {search: {type: string}; data?: Record<string, unknown>} | undefined;
 
 jest.mock('@components/Search/SearchContext', () => ({
     useSearchSelectionContext: () => ({
@@ -515,6 +515,35 @@ describe('useSearchBulkActions - CSV export flow', () => {
         });
     });
 
+    it('does not crash when selected reports remain while the snapshot has no data', async () => {
+        // Given a report is still selected while a new search's snapshot only has `search` (its optimistic loading state),
+        // because the selection is cleared from an effect that runs after this render
+        mockSelectedTransactions = {tx1: makeSelectedTransaction({reportID: 'report1'})};
+        mockSelectedReports = [
+            {
+                reportID: 'report1',
+                policyID: 'policy1',
+                action: CONST.SEARCH.ACTION_TYPES.VIEW,
+                canPay: false,
+                canApprove: false,
+                canSubmit: false,
+                canChangeApprover: false,
+                total: 100,
+                chatReportID: undefined,
+            },
+        ];
+        mockCurrentSearchResults = {search: {type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT}};
+
+        // When the bulk actions are created for an expense-report search
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        // Then the hook renders its options instead of throwing, and Merge stays hidden until the results load
+        await waitFor(() => {
+            expect(result.current.headerButtonsOptions.length).toBeGreaterThan(0);
+        });
+        expect(result.current.headerButtonsOptions.some((option) => option.value === CONST.SEARCH.BULK_ACTION_TYPES.MERGE_REPORTS)).toBe(false);
+    });
+
     it('handleBasicExport with manual selection does not track any export', async () => {
         mockAreAllMatchingItemsSelected = false;
         mockSelectedTransactions = {tx1: makeSelectedTransaction()};

From 05211672507f72445946f5c4090ba7c2de98f54b Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 13 Oct 2026 22:08:09 +0200
Subject: [PATCH 580/781] Refactor copyable touch tracking into shared row
 press hook

---
 src/components/MenuItem/MenuItem.tsx          | 23 ++++++++++---------
 .../MenuItem/layout/MenuItemRoot.tsx          | 23 ++++++++++---------
 .../useCopyableTextRowPress/index.native.ts   |  3 +++
 src/hooks/useCopyableTextRowPress/index.ts    | 22 ++++++++++++++++--
 .../components/MenuItem/MenuItemCopyTest.tsx  | 20 ++++++++++------
 .../hooks/useCopyableTextRowPress.test.ts     | 21 ++++++++++++++++-
 6 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 100e4a1bc15b..851e177f5b4f 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -65,7 +65,7 @@ import type {GestureResponderEvent, ImageStyle, Role, StyleProp, TextStyle, View
 import type {AnimatedStyle} from 'react-native-reanimated';
 import type {ValueOf} from 'type-fest';
 
-import React, {useMemo, useRef, useState} from 'react';
+import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 
 import useRemoveNonInteractiveClickHandler from './hooks/useRemoveNonInteractiveClickHandler';
@@ -591,10 +591,15 @@ function MenuItem({
     const {singleExecution, waitForNavigate} = useMenuItemGroupActions() ?? {};
     const popoverAnchor = useRef<ComponentRef<typeof View>>(null);
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
-    const didTouchStartOnCopyableTextRef = useRef(false);
-    const [didTouchStartOnCopyableText, setDidTouchStartOnCopyableText] = useState(false);
-    const {isPressStartOnCopyableText, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
-        useCopyableTextRowPress();
+    const {
+        didTouchStartOnCopyableText,
+        isPressStartOnCopyableText,
+        markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
+        shouldPreserveNativeTextSelection,
+        shouldSuppressCopyableTextRowLongPress,
+        shouldSuppressCopyableTextRowPress,
+    } = useCopyableTextRowPress({shouldTrackTouchStart: true});
     useRemoveNonInteractiveClickHandler(pressableRef, interactive);
     const deviceHasHoverSupport = hasHoverSupport();
     const isCompactMenu = useIsCompactMenu();
@@ -803,7 +808,7 @@ function MenuItem({
     const secondaryInteractionHandler = copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction;
 
     const handlePressIn = () => {
-        if (shouldEnableTextSelection && didTouchStartOnCopyableTextRef.current) {
+        if (shouldEnableTextSelection && shouldPreserveNativeTextSelection()) {
             return;
         }
         if (shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen()) {
@@ -847,14 +852,10 @@ function MenuItem({
                             <PressableWithSecondaryInteraction
                                 onPress={shouldCheckActionAllowedOnPress ? callFunctionIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
                                 onMouseDown={(event) => {
-                                    didTouchStartOnCopyableTextRef.current = false;
-                                    setDidTouchStartOnCopyableText(false);
                                     markMouseDownOnCopyableText(event?.target, isTitleSelectable);
                                 }}
                                 onTouchStart={(event) => {
-                                    const isCopyableTarget = markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
-                                    didTouchStartOnCopyableTextRef.current = isCopyableTarget;
-                                    setDidTouchStartOnCopyableText(isCopyableTarget);
+                                    markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
                                 }}
                                 shouldAllowTextSelection={isTitleSelectable}
                                 preventDefaultContextMenu={(event) => deviceHasHoverSupport || !isTitleSelectable || !isPressStartOnCopyableText(event)}
diff --git a/src/components/MenuItem/layout/MenuItemRoot.tsx b/src/components/MenuItem/layout/MenuItemRoot.tsx
index 0d4aceb606a3..4ac44215d566 100644
--- a/src/components/MenuItem/layout/MenuItemRoot.tsx
+++ b/src/components/MenuItem/layout/MenuItemRoot.tsx
@@ -25,7 +25,7 @@ import type WithTestID from '@src/types/utils/TestID';
 import type {ComponentRef, PropsWithChildren} from 'react';
 import type {AccessibilityState, GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 
-import React, {useRef, useState} from 'react';
+import React, {useRef} from 'react';
 import {View} from 'react-native';
 
 type MenuItemRootProps = PropsWithChildren &
@@ -60,14 +60,19 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
-    const didTouchStartOnCopyableTextRef = useRef(false);
-    const [didTouchStartOnCopyableText, setDidTouchStartOnCopyableText] = useState(false);
     const isCompactPopover = useIsCompactPopover();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isInteractive = !!onPress;
     const shouldEnableTextSelection = shouldAllowTextSelection && getPlatform() === CONST.PLATFORM.WEB;
-    const {isPressStartOnCopyableText, markMouseDownOnCopyableText, markTouchStartOnCopyableText, shouldSuppressCopyableTextRowLongPress, shouldSuppressCopyableTextRowPress} =
-        useCopyableTextRowPress();
+    const {
+        didTouchStartOnCopyableText,
+        isPressStartOnCopyableText,
+        markMouseDownOnCopyableText,
+        markTouchStartOnCopyableText,
+        shouldPreserveNativeTextSelection,
+        shouldSuppressCopyableTextRowLongPress,
+        shouldSuppressCopyableTextRowPress,
+    } = useCopyableTextRowPress({shouldTrackTouchStart: true});
 
     const {accessibilityLabel: rowAccessibilityLabel, accessibilityHint, registries: accessibilityRegistries} = useMenuItemAccessibility(accessibilityLabel);
     const {handler: registeredSecondaryInteraction, register: registerSecondaryInteraction} = useMenuItemSecondaryInteractionRegistry();
@@ -106,7 +111,7 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
 
     const handlePressIn = () => {
         // RN Web responder events omit client coordinates, so reuse the original touch hit-test.
-        if (shouldEnableTextSelection && didTouchStartOnCopyableTextRef.current) {
+        if (shouldEnableTextSelection && shouldPreserveNativeTextSelection()) {
             return;
         }
 
@@ -122,14 +127,10 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
                     <PressableWithSecondaryInteraction
                         onPress={onPressAction}
                         onMouseDown={(event) => {
-                            didTouchStartOnCopyableTextRef.current = false;
-                            setDidTouchStartOnCopyableText(false);
                             markMouseDownOnCopyableText(event?.target, shouldEnableTextSelection);
                         }}
                         onTouchStart={(event) => {
-                            const isCopyableTarget = markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
-                            didTouchStartOnCopyableTextRef.current = isCopyableTarget;
-                            setDidTouchStartOnCopyableText(isCopyableTarget);
+                            markTouchStartOnCopyableText(event, shouldEnableTextSelection && isPressStartOnCopyableText(event));
                         }}
                         shouldAllowTextSelection={shouldEnableTextSelection}
                         preventDefaultContextMenu={(event) => !shouldEnableTextSelection || !isPressStartOnCopyableText(event)}
diff --git a/src/hooks/useCopyableTextRowPress/index.native.ts b/src/hooks/useCopyableTextRowPress/index.native.ts
index 572a1854a6b4..38833ef42b05 100644
--- a/src/hooks/useCopyableTextRowPress/index.native.ts
+++ b/src/hooks/useCopyableTextRowPress/index.native.ts
@@ -12,16 +12,19 @@ function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
     const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean, options?: MarkCopyableTextMouseDownOptions) => boolean = () => false;
     const markTouchStartOnCopyableText: (event: unknown, shouldCheck?: boolean) => boolean = () => false;
+    const shouldPreserveNativeTextSelection = () => false;
     const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowLongPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
     const handleCopyableTextRowPress: (onPress: () => void, options?: HandleCopyableTextRowPressOptions) => void = (onPress) => onPress();
 
     return {
+        didTouchStartOnCopyableText: false,
         handleCopyableTextRowPress,
         isPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
+        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowFocus,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
index 9bcb0c37d762..6e9cb9fcef5b 100644
--- a/src/hooks/useCopyableTextRowPress/index.ts
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-import {useRef} from 'react';
+import {useRef, useState} from 'react';
 
 const COPYABLE_TEXT_SELECTOR = `[data-${CONST.COPYABLE_TEXT_ELEMENT}=true]`;
 
@@ -12,6 +12,10 @@ type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
 };
 
+type UseCopyableTextRowPressOptions = {
+    shouldTrackTouchStart?: boolean;
+};
+
 type PressStartOnCopyableTextCache = {
     clientX: number | undefined;
     clientY: number | undefined;
@@ -144,11 +148,13 @@ function shouldSuppressCopyableTextPress(didMouseDownStartOnCopyableText: boolea
     return !!anchorCopyableElement || !!focusCopyableElement;
 }
 
-function useCopyableTextRowPress() {
+function useCopyableTextRowPress({shouldTrackTouchStart = false}: UseCopyableTextRowPressOptions = {}) {
     const wasMouseDownOnCopyableTextRef = useRef(false);
     const wasTouchStartOnCopyableTextRef = useRef(false);
+    const didTouchStartOnCopyableTextRef = useRef(false);
     const shouldSuppressNextPressRef = useRef(false);
     const pressStartOnCopyableTextCacheRef = useRef<PressStartOnCopyableTextCache | null>(null);
+    const [didTouchStartOnCopyableText, setDidTouchStartOnCopyableText] = useState(false);
 
     const getCachedIsPressStartOnCopyableText = (event: unknown, shouldCheck = true): boolean => {
         if (!shouldCheck) {
@@ -177,7 +183,11 @@ function useCopyableTextRowPress() {
         pressStartOnCopyableTextCacheRef.current = null;
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(target);
         wasMouseDownOnCopyableTextRef.current = isCopyableTarget;
+        didTouchStartOnCopyableTextRef.current = false;
         shouldSuppressNextPressRef.current = isCopyableTarget && shouldSuppressNextPress;
+        if (shouldTrackTouchStart) {
+            setDidTouchStartOnCopyableText(false);
+        }
         return isCopyableTarget;
     };
 
@@ -186,10 +196,16 @@ function useCopyableTextRowPress() {
         const isCopyableTarget = shouldCheck && isCopyableTextTarget(getPressStartTarget(event));
         wasMouseDownOnCopyableTextRef.current = false;
         wasTouchStartOnCopyableTextRef.current = isCopyableTarget;
+        didTouchStartOnCopyableTextRef.current = isCopyableTarget;
         shouldSuppressNextPressRef.current = false;
+        if (shouldTrackTouchStart) {
+            setDidTouchStartOnCopyableText(isCopyableTarget);
+        }
         return isCopyableTarget;
     };
 
+    const shouldPreserveNativeTextSelection = () => didTouchStartOnCopyableTextRef.current;
+
     const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
         const didPressStartOnCopyableText = wasMouseDownOnCopyableTextRef.current || wasTouchStartOnCopyableTextRef.current;
         const shouldSuppressPress = shouldCheck && (shouldSuppressNextPressRef.current || shouldSuppressCopyableTextPress(didPressStartOnCopyableText));
@@ -218,10 +234,12 @@ function useCopyableTextRowPress() {
     const shouldSuppressCopyableTextRowFocus = () => wasMouseDownOnCopyableTextRef.current;
 
     return {
+        didTouchStartOnCopyableText,
         handleCopyableTextRowPress,
         isPressStartOnCopyableText: getCachedIsPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
+        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowFocus,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
diff --git a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
index e8f626d88c88..d8ec55fd11fd 100644
--- a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
@@ -69,11 +69,11 @@ jest.mock('@hooks/useResponsiveLayout', () => ({
 jest.mock('@libs/getPlatform', () => jest.fn());
 
 jest.mock('@hooks/useCopyableTextRowPress', () => {
-    const actual = jest.requireActual<typeof CopyableTextRowPress>('@hooks/useCopyableTextRowPress');
+    const actual = jest.requireActual<typeof CopyableTextRowPress>('../../../../src/hooks/useCopyableTextRowPress/index.ts');
     return {...actual, __esModule: true, default: jest.fn(actual.default)};
 });
 
-const actualUseCopyableTextRowPress = jest.requireActual<typeof CopyableTextRowPress>('@hooks/useCopyableTextRowPress').default;
+const actualUseCopyableTextRowPress = jest.requireActual<typeof CopyableTextRowPress>('../../../../src/hooks/useCopyableTextRowPress/index.ts').default;
 const mockedUseCopyableTextRowPress = jest.mocked(useCopyableTextRowPress);
 const mockedGetPlatform = jest.mocked(getPlatform);
 const mockedHasHoverSupport = jest.mocked(hasHoverSupport);
@@ -121,11 +121,17 @@ function LegacyRow({isTitleSelectable = false}: {isTitleSelectable?: boolean}) {
 }
 
 function mockCopyableTextHitTest(isPressStartOnCopyableText: (event: unknown) => boolean) {
-    mockedUseCopyableTextRowPress.mockImplementation(() => ({
-        ...actualUseCopyableTextRowPress(),
-        isPressStartOnCopyableText,
-        markTouchStartOnCopyableText: (_event, shouldCheck = true) => shouldCheck,
-    }));
+    mockedUseCopyableTextRowPress.mockImplementation((options) => {
+        const hook = actualUseCopyableTextRowPress(options);
+        const copyableTextElement = document.createElement('span');
+        copyableTextElement.setAttribute(`data-${CONST.COPYABLE_TEXT_ELEMENT}`, 'true');
+
+        return {
+            ...hook,
+            isPressStartOnCopyableText,
+            markTouchStartOnCopyableText: (_event, shouldCheck = true) => hook.markTouchStartOnCopyableText({target: copyableTextElement}, shouldCheck),
+        };
+    });
 }
 
 /** A long press reaches the row's handler through `PressableWithSecondaryInteraction`. */
diff --git a/tests/unit/hooks/useCopyableTextRowPress.test.ts b/tests/unit/hooks/useCopyableTextRowPress.test.ts
index 4ba68ed38366..6aa1891a553f 100644
--- a/tests/unit/hooks/useCopyableTextRowPress.test.ts
+++ b/tests/unit/hooks/useCopyableTextRowPress.test.ts
@@ -1,4 +1,4 @@
-import {renderHook} from '@testing-library/react-native';
+import {act, renderHook} from '@testing-library/react-native';
 
 import type useCopyableTextRowPressModule from '../../../src/hooks/useCopyableTextRowPress/index';
 import type {isPressStartOnCopyableText as isPressStartOnCopyableTextModule} from '../../../src/hooks/useCopyableTextRowPress/index';
@@ -69,6 +69,25 @@ describe('useCopyableTextRowPress', () => {
         expect(result.current.shouldSuppressCopyableTextRowLongPress()).toBe(true);
     });
 
+    it('tracks copyable touch starts for consumers that need to preserve native text selection', () => {
+        const {result} = renderHook(() => useCopyableTextRowPress({shouldTrackTouchStart: true}));
+        const copyableTextElement = getCopyableTextElement();
+
+        act(() => {
+            result.current.markTouchStartOnCopyableText({target: copyableTextElement});
+        });
+
+        expect(result.current.didTouchStartOnCopyableText).toBe(true);
+        expect(result.current.shouldPreserveNativeTextSelection()).toBe(true);
+
+        act(() => {
+            result.current.markMouseDownOnCopyableText(copyableTextElement);
+        });
+
+        expect(result.current.didTouchStartOnCopyableText).toBe(false);
+        expect(result.current.shouldPreserveNativeTextSelection()).toBe(false);
+    });
+
     it('does not suppress row press when the press starts outside copyable text', () => {
         document.body.innerHTML = '<span id="regularText">Regular text</span>';
         const regularTextElement = document.getElementById('regularText');

From aa88d580ac74f1d31444c40519cd1f19b08db87d Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Tue, 13 Oct 2026 16:35:13 -0400
Subject: [PATCH 581/781] Let Rock read AWS credentials from the SDK default
 chain

Passing only the access key and secret drops AWS_SESSION_TOKEN, so temporary STS credentials from OIDC sessions fail.
---
 rock.config.mjs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rock.config.mjs b/rock.config.mjs
index b6f00dbe3970..42b54180ee2d 100644
--- a/rock.config.mjs
+++ b/rock.config.mjs
@@ -22,8 +22,7 @@ export default {
         bucket: 'ad-hoc-expensify-cash',
         region: 'us-east-1',
         acl: 'public-read',
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        // Credentials come from the AWS SDK default chain so AWS_SESSION_TOKEN from OIDC sessions is used
         publicAccess: isPublicAccess,
     }),
     bundler: useMetro ? pluginMetro() : pluginRepack(),

From fc7fe894bbbc980ed3e9b9af08de226609d5814d Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 13:36:08 -0700
Subject: [PATCH 582/781] fix(app): hide replaced support ticket surveys

---
 .../configs/visibleReportActions.ts           | 31 +++++++++++---
 .../OnyxDerived/visibleReportActionsTest.ts   | 40 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
index c475b058144d..4641d55907a9 100644
--- a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
+++ b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
@@ -5,7 +5,7 @@ import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDer
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportAction, ReportActions} from '@src/types/onyx';
+import type {Report, ReportAction, ReportActions, ReportNameValuePairs} from '@src/types/onyx';
 import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 
 /**
@@ -21,7 +21,12 @@ function shouldSkipCachingAction(action: ReportAction): boolean {
  * actions. Rebuilding the whole map rather than updating individual entries keeps deletions correct:
  * a removed action is absent from `reportActions`, so it drops out of the result.
  */
-function computeReportVisibility(reportActions: ReportActions, currentUserAccountID: number | undefined, report: Report | undefined): Record<string, boolean> {
+function computeReportVisibility(
+    reportActions: ReportActions,
+    currentUserAccountID: number | undefined,
+    report: Report | undefined,
+    reportNameValuePairs: ReportNameValuePairs | undefined,
+): Record<string, boolean> {
     const reportVisibility: Record<string, boolean> = {};
     const isSupportTicketReport = isSupportTicket(report);
 
@@ -37,6 +42,10 @@ function computeReportVisibility(reportActions: ReportActions, currentUserAccoun
         if (shouldSkipCachingAction(action)) {
             continue;
         }
+        if (isSupportTicketReport && reportNameValuePairs?.reopenedAsReportID && isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUPPORT_SURVEY)) {
+            reportVisibility[action.reportActionID] = false;
+            continue;
+        }
         reportVisibility[action.reportActionID] = shouldReportActionBeVisible(action, actionID, undefined, currentUserAccountID, undefined, isSupportTicketReport);
     }
 
@@ -49,8 +58,8 @@ export default createOnyxDerivedValueConfig({
     // (for UNREPORTED_TRANSACTION/MOVED_TRANSACTION visibility) AND to provide the current
     // report collection to the visibility check, avoiding stale data from global connections.
     // SESSION dependency is needed for whisper targeting when user changes.
-    dependencies: [ONYXKEYS.COLLECTION.REPORT_ACTIONS, ONYXKEYS.SESSION, ONYXKEYS.COLLECTION.REPORT],
-    compute: ([allReportActions, session, allReports], {sourceValues, currentValue, triggeredKeys}): VisibleReportActionsDerivedValue => {
+    dependencies: [ONYXKEYS.COLLECTION.REPORT_ACTIONS, ONYXKEYS.SESSION, ONYXKEYS.COLLECTION.REPORT, ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS],
+    compute: ([allReportActions, session, allReports, allReportNameValuePairs], {sourceValues, currentValue, triggeredKeys}): VisibleReportActionsDerivedValue => {
         if (!allReportActions) {
             return {};
         }
@@ -62,7 +71,12 @@ export default createOnyxDerivedValueConfig({
         // recompute everything: on first load, when there's no delta, or on a SESSION change (the
         // user changed, which affects whisper targeting for every report). SESSION is checked via
         // triggeredKeys, not sourceValues, so a session cleared to `undefined` still forces the full recompute.
-        const isIncremental = !!reportActionsUpdates && !triggeredKeys?.has(ONYXKEYS.SESSION) && !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT) && !!currentValue;
+        const isIncremental =
+            !!reportActionsUpdates &&
+            !triggeredKeys?.has(ONYXKEYS.SESSION) &&
+            !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT) &&
+            !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS) &&
+            !!currentValue;
 
         const result: VisibleReportActionsDerivedValue = isIncremental ? {...currentValue} : {};
         const reportActionsKeysToProcess = isIncremental ? Object.keys(reportActionsUpdates) : Object.keys(allReportActions);
@@ -77,7 +91,12 @@ export default createOnyxDerivedValueConfig({
                 continue;
             }
 
-            result[reportID] = computeReportVisibility(reportActions, currentUserAccountID, allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]);
+            result[reportID] = computeReportVisibility(
+                reportActions,
+                currentUserAccountID,
+                allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`],
+                allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`],
+            );
         }
 
         return result;
diff --git a/tests/unit/OnyxDerived/visibleReportActionsTest.ts b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
index 2c4ddc916dc1..342894aa5573 100644
--- a/tests/unit/OnyxDerived/visibleReportActionsTest.ts
+++ b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
@@ -1,8 +1,9 @@
 import visibleReportActionsConfig from '@libs/actions/OnyxDerived/configs/visibleReportActions';
 
+import CONST from '@src/CONST';
 import type {OnyxKey} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportActions} from '@src/types/onyx';
+import type {Report, ReportActions, ReportNameValuePairs} from '@src/types/onyx';
 import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 
 import type {OnyxCollection} from 'react-native-onyx';
@@ -12,7 +13,7 @@ describe('visibleReportActions', () => {
         const reportActionsKeyA = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}A`;
         // Only report A has report actions now; report B exists only in the previous derived value (currentValue).
         const allReportActions: OnyxCollection<ReportActions> = {[reportActionsKeyA]: {}};
-        const args: Parameters<typeof visibleReportActionsConfig.compute>[0] = [allReportActions, undefined, {} as OnyxCollection<Report>];
+        const args: Parameters<typeof visibleReportActionsConfig.compute>[0] = [allReportActions, undefined, {} as OnyxCollection<Report>, {} as OnyxCollection<ReportNameValuePairs>];
         const currentValue: VisibleReportActionsDerivedValue = {A: {}, B: {}};
         const sourceValues: Parameters<typeof visibleReportActionsConfig.compute>[1]['sourceValues'] = {[ONYXKEYS.COLLECTION.REPORT_ACTIONS]: {[reportActionsKeyA]: {}}};
 
@@ -31,4 +32,39 @@ describe('visibleReportActions', () => {
             expect(result.A).toBeDefined();
         });
     });
+
+    it('hides a support survey when the ticket has been replaced', () => {
+        // Given a cached support survey that was visible before the replacement ticket arrived
+        const reportID = 'supportTicketReportID';
+        const surveyActionID = 'surveyActionID';
+        const reportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`;
+        const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+        const reportNameValuePairsKey = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`;
+        const allReportActions: OnyxCollection<ReportActions> = {
+            [reportActionsKey]: {
+                [surveyActionID]: {
+                    reportActionID: surveyActionID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.SUPPORT_SURVEY,
+                    created: '2026-10-13 12:00:00.000',
+                },
+            },
+        };
+        const args: Parameters<typeof visibleReportActionsConfig.compute>[0] = [
+            allReportActions,
+            undefined,
+            {[reportKey]: {reportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET}},
+            {[reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'}},
+        ];
+        const currentValue: VisibleReportActionsDerivedValue = {[reportID]: {[surveyActionID]: true}};
+
+        // When the replacement report NVP triggers a recompute
+        const result = visibleReportActionsConfig.compute(args, {
+            currentValue,
+            sourceValues: {[ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]: {[reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'}}},
+            triggeredKeys: new Set<OnyxKey>([ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]),
+        });
+
+        // Then the shared visibility cache hides the stale survey
+        expect(result[reportID]?.[surveyActionID]).toBe(false);
+    });
 });

From b0ce55196fe94fad45b955dc10a1d9fa80ab6702 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 13:36:10 -0700
Subject: [PATCH 583/781] fix(app): seed pending support ticket titles

---
 src/libs/actions/Report/index.ts   | 28 +++++++++++++++++++++++++---
 tests/actions/SupportTicketTest.ts | 28 +++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 263fe23a33f3..ffe1d64a502f 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4881,13 +4881,35 @@ function isNoSupportRepAvailableResponse(response: {jsonCode?: number | string;
 function openSupportTicket(resolvedSupportTicketReportID?: string) {
     const newSupportTicketReportID = resolvedSupportTicketReportID ? undefined : generateReportID();
     const parameters: CreateSupportTicketParams = resolvedSupportTicketReportID ? {resolvedSupportTicketReportID, idempotencyKey: Str.guid()} : {newSupportTicketReportID};
+    const onyxData: {
+        optimisticData?: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT>>;
+        failureData?: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT>>;
+    } = newSupportTicketReportID
+        ? {
+              optimisticData: [
+                  {
+                      onyxMethod: Onyx.METHOD.SET,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                      value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                  },
+              ],
+              failureData: [
+                  {
+                      onyxMethod: Onyx.METHOD.SET,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                      value: null,
+                  },
+              ],
+          }
+        : {};
 
-    if (!resolvedSupportTicketReportID) {
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method -- reopening must wait for the server-selected report ID before navigating.
+    const request = API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.CREATE_SUPPORT_TICKET, parameters, onyxData);
+    if (newSupportTicketReportID) {
         Navigation.navigate(getReportRouteForCurrentContext({reportID: newSupportTicketReportID, isPendingCreation: true}));
     }
 
-    // eslint-disable-next-line rulesdir/no-api-side-effects-method -- reopening must wait for the server-selected report ID before navigating.
-    return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.CREATE_SUPPORT_TICKET, parameters).then((response) => {
+    return request.then((response) => {
         if (resolvedSupportTicketReportID && response?.reportID) {
             Navigation.navigate(getReportRouteForCurrentContext({reportID: response.reportID}));
         }
diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 970fbcb05c62..29ac8ed333b1 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -7,6 +7,9 @@ import {generateReportID} from '@libs/ReportUtils';
 import {isNoSupportRepAvailableResponse, openSupportTicket} from '@userActions/Report';
 
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
 
 jest.mock('@libs/API');
 jest.mock('@libs/Navigation/helpers/getReportRouteForCurrentContext');
@@ -42,7 +45,29 @@ describe('actions/Report', () => {
         expect(mockGenerateReportID).toHaveBeenCalled();
         expect(mockGetReportRouteForCurrentContext).toHaveBeenCalledWith({reportID: newSupportTicketReportID, isPendingCreation: true});
         expect(mockNavigate).toHaveBeenCalledWith(`r/${newSupportTicketReportID}`);
-        expect(mockMakeRequestWithSideEffects).toHaveBeenCalledWith(SIDE_EFFECT_REQUEST_COMMANDS.CREATE_SUPPORT_TICKET, {newSupportTicketReportID});
+        expect(mockMakeRequestWithSideEffects).toHaveBeenCalledWith(
+            SIDE_EFFECT_REQUEST_COMMANDS.CREATE_SUPPORT_TICKET,
+            {newSupportTicketReportID},
+            {
+                optimisticData: [
+                    {
+                        onyxMethod: Onyx.METHOD.SET,
+                        key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                        value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                    },
+                ],
+                failureData: [
+                    {
+                        onyxMethod: Onyx.METHOD.SET,
+                        key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                        value: null,
+                    },
+                ],
+            },
+        );
+        const requestCallOrder = mockMakeRequestWithSideEffects.mock.invocationCallOrder.at(0) ?? Number.MAX_SAFE_INTEGER;
+        const navigationCallOrder = mockNavigate.mock.invocationCallOrder.at(0) ?? Number.MIN_SAFE_INTEGER;
+        expect(requestCallOrder).toBeLessThan(navigationCallOrder);
 
         await request;
 
@@ -67,6 +92,7 @@ describe('actions/Report', () => {
             expect.objectContaining({
                 resolvedSupportTicketReportID,
             }),
+            {},
         );
         expect(mockMakeRequestWithSideEffects.mock.calls.at(0)?.[1]).not.toHaveProperty('newSupportTicketReportID');
         expect(mockGenerateReportID).not.toHaveBeenCalled();

From c93b7bceebb8936675a8c4387bdebf6628fc4ed4 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Tue, 13 Oct 2026 16:36:55 -0400
Subject: [PATCH 584/781] Use OIDC for the Rock remote build cache

Native build jobs assume app-rock-cache-gh-actions instead of using the static AWS keys. Callers grant id-token: write; write-all keeps every scope the repository default already gave them.
---
 .github/workflows/buildAndroid.yml         | 5 +++--
 .github/workflows/buildIOS.yml             | 5 +++--
 .github/workflows/deploy.yml               | 2 ++
 .github/workflows/remote-build-android.yml | 6 ++++--
 .github/workflows/remote-build-ios.yml     | 6 ++++--
 .github/workflows/testBuild.yml            | 1 +
 .github/workflows/testBuildOnPush.yml      | 1 +
 .github/workflows/verifyHybridApp.yml      | 8 ++++++++
 8 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index de8b5ff08840..86c960c67b3d 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -156,8 +156,9 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          role-duration-seconds: 10800
           aws-region: us-east-1
 
       - name: Rock Remote Build - Android
diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml
index 7cdb09c2d8a1..4276b2020ffb 100644
--- a/.github/workflows/buildIOS.yml
+++ b/.github/workflows/buildIOS.yml
@@ -237,8 +237,9 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          role-duration-seconds: 10800
           aws-region: us-east-1
 
       - name: Prepare provisioning profiles JSON
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index eeb9592a36f2..c8bc2f77966f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -201,6 +201,7 @@ jobs:
   androidBuild:
     name: Build Android HybridApp
     needs: [prep]
+    permissions: write-all
     if: ${{ fromJSON(needs.prep.outputs.SHOULD_BUILD_NATIVE) }}
     uses: ./.github/workflows/buildAndroid.yml
     with:
@@ -429,6 +430,7 @@ jobs:
   iosBuild:
     name: Build iOS HybridApp
     needs: [prep]
+    permissions: write-all
     if: ${{ fromJSON(needs.prep.outputs.SHOULD_BUILD_NATIVE) }}
     uses: ./.github/workflows/buildIOS.yml
     with:
diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml
index 7462d1498d15..d48e77add8fa 100644
--- a/.github/workflows/remote-build-android.yml
+++ b/.github/workflows/remote-build-android.yml
@@ -47,6 +47,7 @@ jobs:
 
   build:
     needs: [prep, resolveRefs]
+    permissions: write-all
     runs-on: ${{ github.repository_owner == 'Expensify' && 'blacksmith-16vcpu-ubuntu-2404' || 'blacksmith-2vcpu-ubuntu-2404' }}
     strategy:
       fail-fast: false
@@ -82,8 +83,9 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          role-duration-seconds: 10800
           aws-region: us-east-1
 
       - name: Rock Remote Build - Android
diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 482f8a1d32f6..32083380cc47 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -47,6 +47,7 @@ jobs:
 
   build:
     needs: [prep, resolveRefs]
+    permissions: write-all
     runs-on: ${{ github.repository_owner == 'Expensify' && 'blacksmith-12vcpu-macos-latest' || 'macos-latest' }}
     strategy:
       fail-fast: false
@@ -94,8 +95,9 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          role-duration-seconds: 10800
           aws-region: us-east-1
 
       - name: Rock Remote Build - iOS
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index c58bffcfb075..b42d6fa5ad35 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -63,6 +63,7 @@ jobs:
 
   buildApps:
     needs: [prep, resolveRefs]
+    permissions: write-all
     uses: ./.github/workflows/buildAdHoc.yml
     with:
       # Fall back to App main when nothing is resolved (test builds default to the latest NewDot).
diff --git a/.github/workflows/testBuildOnPush.yml b/.github/workflows/testBuildOnPush.yml
index b7f3d20e3d0b..068960e457b4 100644
--- a/.github/workflows/testBuildOnPush.yml
+++ b/.github/workflows/testBuildOnPush.yml
@@ -70,6 +70,7 @@ jobs:
 
   buildApps:
     needs: [prep]
+    permissions: write-all
     uses: ./.github/workflows/buildAdHoc.yml
     with:
       APP_REF: ${{ needs.prep.outputs.APP_REF }}
diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index f16b9f77ac5d..762f08d95427 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -75,6 +75,10 @@ jobs:
 
   verify_android:
     name: Verify Android HybridApp builds on main
+    permissions:
+      contents: read
+      id-token: write
+      pull-requests: write
     if: ${{ !github.event.pull_request.head.repo.fork && github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
     cache-mode: read
     uses: ./.github/workflows/buildAndroid.yml
@@ -85,6 +89,10 @@ jobs:
 
   verify_ios:
     name: Verify iOS HybridApp builds on main
+    permissions:
+      contents: read
+      id-token: write
+      pull-requests: write
     if: ${{ !github.event.pull_request.head.repo.fork && github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
     cache-mode: read
     uses: ./.github/workflows/buildIOS.yml

From 1a39317b8f54fc4b5da297a8074e9dcb0b2c90ad Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Tue, 13 Oct 2026 16:37:13 -0400
Subject: [PATCH 585/781] Use OIDC for ad-hoc web deploys

---
 .github/workflows/buildAdHoc.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml
index 3633c87fb9cb..9aa04f3f7089 100644
--- a/.github/workflows/buildAdHoc.yml
+++ b/.github/workflows/buildAdHoc.yml
@@ -127,8 +127,8 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-adhoc-web-deploy-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
           aws-region: us-east-1
 
       - name: Deploy to S3

From 2964a8006d8a102b6479495c560aacf8a20820aa Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Tue, 13 Oct 2026 16:38:15 -0400
Subject: [PATCH 586/781] Use OIDC for staging and production web deploys

---
 .github/workflows/deploy.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c8bc2f77966f..63ace45e33ef 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -705,6 +705,7 @@ jobs:
     name: Deploy Web to S3
     needs: [prep, webBuild, buildStorybook]
     if: ${{ always() && needs.webBuild.result == 'success' }}
+    permissions: write-all
     runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Checkout
@@ -737,8 +738,8 @@ jobs:
         # v6
         uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::949552126497:role/app-${{ env.DEPLOY_ENV }}-web-deploy-gh-actions
+          role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
           aws-region: us-east-1
 
       - name: Deploy to S3

From c6d33043b40e18c9de366973e5e99c74f7f0313b Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 13:45:33 -0700
Subject: [PATCH 587/781] docs(app): explain replaced survey visibility

---
 src/libs/actions/OnyxDerived/configs/visibleReportActions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
index 4641d55907a9..724cebe60221 100644
--- a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
+++ b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
@@ -42,6 +42,7 @@ function computeReportVisibility(
         if (shouldSkipCachingAction(action)) {
             continue;
         }
+        // A replacement ticket has its own active survey, so the original ticket's survey is stale.
         if (isSupportTicketReport && reportNameValuePairs?.reopenedAsReportID && isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUPPORT_SURVEY)) {
             reportVisibility[action.reportActionID] = false;
             continue;

From 47f6780feae71a334420fec5a224815fd71e2759 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 13:45:34 -0700
Subject: [PATCH 588/781] docs(app): explain support ticket request ordering

---
 src/libs/actions/Report/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index ffe1d64a502f..9d7f3d658bda 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4903,7 +4903,8 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
           }
         : {};
 
-    // eslint-disable-next-line rulesdir/no-api-side-effects-method -- reopening must wait for the server-selected report ID before navigating.
+    // Start the request before navigating so the optimistic support-ticket metadata is available for the pending LHN title.
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method -- Reopening must wait for the server-selected report ID before navigating.
     const request = API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.CREATE_SUPPORT_TICKET, parameters, onyxData);
     if (newSupportTicketReportID) {
         Navigation.navigate(getReportRouteForCurrentContext({reportID: newSupportTicketReportID, isPendingCreation: true}));

From 339d25e4fd14cf19fb63ef3bb6f43f9ab3066d61 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 22:55:41 +0200
Subject: [PATCH 589/781] Adjust tests

---
 tests/ui/WeekListItemHeaderTest.tsx        | 1 +
 tests/unit/getInProgressBucketLabelTest.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tests/ui/WeekListItemHeaderTest.tsx b/tests/ui/WeekListItemHeaderTest.tsx
index 85eba37f157a..6588f4b61781 100644
--- a/tests/ui/WeekListItemHeaderTest.tsx
+++ b/tests/ui/WeekListItemHeaderTest.tsx
@@ -75,6 +75,7 @@ const createWeekListItem = (week: string, options: Partial<TransactionWeekGroupL
     week,
     formattedWeek: options.formattedWeek ?? 'Jan 25 - Jan 31, 2026',
     shortFormattedWeek: options.shortFormattedWeek ?? 'Jan 25 - 31, ’26',
+    compactFormattedWeek: options.compactFormattedWeek ?? 'Jan 25',
     count: options.count ?? 5,
     currency: options.currency ?? 'USD',
     total: options.total ?? 250,
diff --git a/tests/unit/getInProgressBucketLabelTest.ts b/tests/unit/getInProgressBucketLabelTest.ts
index db47340bef9c..6b5c44ee0ba5 100644
--- a/tests/unit/getInProgressBucketLabelTest.ts
+++ b/tests/unit/getInProgressBucketLabelTest.ts
@@ -29,6 +29,7 @@ const weekGroup = (week: string): GroupedItem => {
         week,
         formattedWeek: DateUtils.getFormattedDateRangeForSearch(start, end, undefined),
         shortFormattedWeek: DateUtils.getShortFormattedDateRangeForSearch(start, end, undefined),
+        compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch(start, undefined),
     };
 };
 const quarterGroup = (year: number, quarter: number): GroupedItem => ({
@@ -47,6 +48,7 @@ const dayGroup = (day: string): GroupedItem => ({
     day,
     formattedDay: DateUtils.formatToReadableString(day, undefined),
     shortFormattedDay: DateUtils.getShortFormattedDayForSearch(day, undefined),
+    compactFormattedDay: DateUtils.getCompactFormattedDateForSearch(day, undefined),
 });
 const merchantGroup = (merchant: string): GroupedItem => ({...BASE, groupedBy: CONST.SEARCH.GROUP_BY.MERCHANT, merchant, formattedMerchant: merchant});
 

From 5ef360059c71955cf84d44fa8a1603e9e0beba0e Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 14:18:20 -0700
Subject: [PATCH 590/781] fix(app): keep visibility recomputation incremental

---
 .../configs/visibleReportActions.ts           | 26 ++++++++++---------
 .../OnyxDerived/visibleReportActionsTest.ts   |  8 +++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
index 724cebe60221..6507142a463c 100644
--- a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
+++ b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
@@ -67,23 +67,25 @@ export default createOnyxDerivedValueConfig({
 
         const currentUserAccountID = session?.accountID;
         const reportActionsUpdates = sourceValues?.[ONYXKEYS.COLLECTION.REPORT_ACTIONS];
+        const reportNameValuePairsUpdates = sourceValues?.[ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS];
 
-        // Recompute only the reports whose actions changed when we have a usable delta. Otherwise
-        // recompute everything: on first load, when there's no delta, or on a SESSION change (the
-        // user changed, which affects whisper targeting for every report). SESSION is checked via
-        // triggeredKeys, not sourceValues, so a session cleared to `undefined` still forces the full recompute.
+        // Recompute only the reports whose actions or NVPs changed when we have a usable delta.
+        // Otherwise recompute everything: on first load, when there's no delta, or on a SESSION or
+        // REPORT change. SESSION is checked via triggeredKeys, not sourceValues, so a session cleared
+        // to `undefined` still forces the full recompute.
         const isIncremental =
-            !!reportActionsUpdates &&
-            !triggeredKeys?.has(ONYXKEYS.SESSION) &&
-            !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT) &&
-            !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS) &&
-            !!currentValue;
+            !!(reportActionsUpdates ?? reportNameValuePairsUpdates) && !triggeredKeys?.has(ONYXKEYS.SESSION) && !triggeredKeys?.has(ONYXKEYS.COLLECTION.REPORT) && !!currentValue;
 
         const result: VisibleReportActionsDerivedValue = isIncremental ? {...currentValue} : {};
-        const reportActionsKeysToProcess = isIncremental ? Object.keys(reportActionsUpdates) : Object.keys(allReportActions);
+        const reportIDsToProcess = isIncremental
+            ? new Set([
+                  ...Object.keys(reportActionsUpdates ?? {}).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')),
+                  ...Object.keys(reportNameValuePairsUpdates ?? {}).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, '')),
+              ])
+            : new Set(Object.keys(allReportActions).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')));
 
-        for (const reportActionsKey of reportActionsKeysToProcess) {
-            const reportID = reportActionsKey.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '');
+        for (const reportID of reportIDsToProcess) {
+            const reportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`;
             const reportActions = allReportActions[reportActionsKey];
 
             // The member was removed entirely — drop the report from the result.
diff --git a/tests/unit/OnyxDerived/visibleReportActionsTest.ts b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
index 342894aa5573..8af546c90fef 100644
--- a/tests/unit/OnyxDerived/visibleReportActionsTest.ts
+++ b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
@@ -40,6 +40,8 @@ describe('visibleReportActions', () => {
         const reportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`;
         const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
         const reportNameValuePairsKey = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`;
+        const unrelatedReportID = 'unrelatedReportID';
+        const unrelatedActionID = 'unrelatedActionID';
         const allReportActions: OnyxCollection<ReportActions> = {
             [reportActionsKey]: {
                 [surveyActionID]: {
@@ -55,7 +57,10 @@ describe('visibleReportActions', () => {
             {[reportKey]: {reportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET}},
             {[reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'}},
         ];
-        const currentValue: VisibleReportActionsDerivedValue = {[reportID]: {[surveyActionID]: true}};
+        const currentValue: VisibleReportActionsDerivedValue = {
+            [reportID]: {[surveyActionID]: true},
+            [unrelatedReportID]: {[unrelatedActionID]: true},
+        };
 
         // When the replacement report NVP triggers a recompute
         const result = visibleReportActionsConfig.compute(args, {
@@ -66,5 +71,6 @@ describe('visibleReportActions', () => {
 
         // Then the shared visibility cache hides the stale survey
         expect(result[reportID]?.[surveyActionID]).toBe(false);
+        expect(result[unrelatedReportID]?.[unrelatedActionID]).toBe(true);
     });
 });

From 39896144e8945cbac5669a8bb780fce1782ab035 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 14:18:28 -0700
Subject: [PATCH 591/781] fix(app): keep pending support tickets local

---
 src/libs/actions/Report/index.ts   | 23 +++++++++++++++--------
 tests/actions/SupportTicketTest.ts | 28 ++++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 9d7f3d658bda..32d6b959b634 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4888,9 +4888,9 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
         ? {
               optimisticData: [
                   {
-                      onyxMethod: Onyx.METHOD.SET,
+                      onyxMethod: Onyx.METHOD.MERGE,
                       key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                      value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                      value: {type: CONST.REPORT.TYPE.SUPPORT_TICKET},
                   },
               ],
               failureData: [
@@ -4910,12 +4910,19 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
         Navigation.navigate(getReportRouteForCurrentContext({reportID: newSupportTicketReportID, isPendingCreation: true}));
     }
 
-    return request.then((response) => {
-        if (resolvedSupportTicketReportID && response?.reportID) {
-            Navigation.navigate(getReportRouteForCurrentContext({reportID: response.reportID}));
-        }
-        return response;
-    });
+    return request
+        .then((response) => {
+            if (resolvedSupportTicketReportID && response?.reportID) {
+                Navigation.navigate(getReportRouteForCurrentContext({reportID: response.reportID}));
+            }
+            return response;
+        })
+        .catch(async (error: unknown) => {
+            if (onyxData.failureData) {
+                await Onyx.update(onyxData.failureData);
+            }
+            throw error;
+        });
 }
 
 function dismissFailedSupportTicket(supportTicketReportID: string, parentReportID: string, parentReportActionID: string) {
diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 29ac8ed333b1..08544cd8adf2 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -36,6 +36,10 @@ describe('actions/Report', () => {
         mockNavigate.mockClear();
     });
 
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
     it('opens a pending report and sends the expected payload for a new support ticket', async () => {
         // Given a request for a new support ticket
         // When the customer asks to talk to a human
@@ -51,9 +55,9 @@ describe('actions/Report', () => {
             {
                 optimisticData: [
                     {
-                        onyxMethod: Onyx.METHOD.SET,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                        value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                        value: {type: CONST.REPORT.TYPE.SUPPORT_TICKET},
                     },
                 ],
                 failureData: [
@@ -75,6 +79,26 @@ describe('actions/Report', () => {
         expect(mockNavigate).toHaveBeenCalledTimes(1);
     });
 
+    it('removes the pending report when the request fails before receiving a response', async () => {
+        // Given a request that fails before the API can apply its failure data
+        const networkError = new Error('Network request failed');
+        const onyxUpdateSpy = jest.spyOn(Onyx, 'update').mockResolvedValue(undefined);
+        mockMakeRequestWithSideEffects.mockRejectedValueOnce(networkError);
+
+        // When the customer asks to talk to a human
+        const request = openSupportTicket();
+
+        // Then the App removes the pending report and preserves the request failure
+        await expect(request).rejects.toBe(networkError);
+        expect(onyxUpdateSpy).toHaveBeenCalledWith([
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                value: null,
+            },
+        ]);
+    });
+
     it('navigates to a newly reassigned support ticket', async () => {
         // Given a resolved support ticket and a server response for its reassignment
         const resolvedSupportTicketReportID = 'resolvedSupportTicketReportID';

From 866cbbf1bc1669b8d816a0953802117f4c5bb98f Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Tue, 13 Oct 2026 23:25:07 +0200
Subject: [PATCH 592/781] Centralize copyable row press-in handling

---
 src/components/MenuItem/MenuItem.tsx          | 18 +++++++----------
 .../MenuItem/layout/MenuItemRoot.tsx          | 20 +++++++------------
 .../useCopyableTextRowPress/index.native.ts   |  9 +++++++--
 src/hooks/useCopyableTextRowPress/index.ts    | 20 +++++++++++++++++--
 .../hooks/useCopyableTextRowPress.test.ts     |  9 +++++++--
 5 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/components/MenuItem/MenuItem.tsx b/src/components/MenuItem/MenuItem.tsx
index 851e177f5b4f..289ab898edcc 100644
--- a/src/components/MenuItem/MenuItem.tsx
+++ b/src/components/MenuItem/MenuItem.tsx
@@ -593,10 +593,10 @@ function MenuItem({
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
     const {
         didTouchStartOnCopyableText,
+        handleCopyableTextRowPressIn,
         isPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
-        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
     } = useCopyableTextRowPress({shouldTrackTouchStart: true});
@@ -807,15 +807,6 @@ function MenuItem({
     };
     const secondaryInteractionHandler = copyable && !deviceHasHoverSupport ? secondaryInteraction : onSecondaryInteraction;
 
-    const handlePressIn = () => {
-        if (shouldEnableTextSelection && shouldPreserveNativeTextSelection()) {
-            return;
-        }
-        if (shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen()) {
-            ControlSelection.block();
-        }
-    };
-
     const isIDPassed = !!iconReportID || !!iconAccountID || iconAccountID === CONST.DEFAULT_NUMBER_ID;
 
     // A known account renders straight from the personal-details context. Only the report-derived avatars need `ReportAvatar`.
@@ -859,7 +850,12 @@ function MenuItem({
                                 }}
                                 shouldAllowTextSelection={isTitleSelectable}
                                 preventDefaultContextMenu={(event) => deviceHasHoverSupport || !isTitleSelectable || !isPressStartOnCopyableText(event)}
-                                onPressIn={handlePressIn}
+                                onPressIn={() =>
+                                    handleCopyableTextRowPressIn({
+                                        shouldEnableTextSelection,
+                                        shouldBlockSelection: shouldBlockSelection && shouldUseNarrowLayout && canUseTouchScreen(),
+                                    })
+                                }
                                 onPressOut={ControlSelection.unblock}
                                 // Keep the native selection menu available through press-out; reset on the next pointer start.
                                 onSecondaryInteraction={shouldEnableTextSelection && didTouchStartOnCopyableText ? undefined : secondaryInteractionHandler}
diff --git a/src/components/MenuItem/layout/MenuItemRoot.tsx b/src/components/MenuItem/layout/MenuItemRoot.tsx
index 4ac44215d566..f0edb3e0b507 100644
--- a/src/components/MenuItem/layout/MenuItemRoot.tsx
+++ b/src/components/MenuItem/layout/MenuItemRoot.tsx
@@ -66,10 +66,10 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
     const shouldEnableTextSelection = shouldAllowTextSelection && getPlatform() === CONST.PLATFORM.WEB;
     const {
         didTouchStartOnCopyableText,
+        handleCopyableTextRowPressIn,
         isPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
-        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
     } = useCopyableTextRowPress({shouldTrackTouchStart: true});
@@ -109,17 +109,6 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
           }
         : undefined;
 
-    const handlePressIn = () => {
-        // RN Web responder events omit client coordinates, so reuse the original touch hit-test.
-        if (shouldEnableTextSelection && shouldPreserveNativeTextSelection()) {
-            return;
-        }
-
-        if (onSecondaryInteractionAction && shouldUseNarrowLayout && canUseTouchScreen()) {
-            ControlSelection.block();
-        }
-    };
-
     return (
         <MenuItemConfigContext.Provider value={{isDisabled, isInteractive, shouldAllowTextSelection: shouldEnableTextSelection}}>
             <Hoverable>
@@ -134,7 +123,12 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
                         }}
                         shouldAllowTextSelection={shouldEnableTextSelection}
                         preventDefaultContextMenu={(event) => !shouldEnableTextSelection || !isPressStartOnCopyableText(event)}
-                        onPressIn={handlePressIn}
+                        onPressIn={() =>
+                            handleCopyableTextRowPressIn({
+                                shouldEnableTextSelection,
+                                shouldBlockSelection: !!onSecondaryInteractionAction && shouldUseNarrowLayout && canUseTouchScreen(),
+                            })
+                        }
                         onPressOut={ControlSelection.unblock}
                         // RN Web prevents the native context menu whenever an onLongPress handler is attached.
                         // Reset on the next pointer start, since press-out can precede the browser's selection menu.
diff --git a/src/hooks/useCopyableTextRowPress/index.native.ts b/src/hooks/useCopyableTextRowPress/index.native.ts
index 38833ef42b05..0ed3d818b772 100644
--- a/src/hooks/useCopyableTextRowPress/index.native.ts
+++ b/src/hooks/useCopyableTextRowPress/index.native.ts
@@ -6,25 +6,30 @@ type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
 };
 
+type HandleCopyableTextRowPressInOptions = {
+    shouldEnableTextSelection?: boolean;
+    shouldBlockSelection?: boolean;
+};
+
 const isPressStartOnCopyableText = () => false;
 
 function useCopyableTextRowPress() {
     // Native does not expose browser selection APIs, so copyable text never suppresses row interactions here.
     const markMouseDownOnCopyableText: (target: EventTarget | null | undefined, shouldCheck?: boolean, options?: MarkCopyableTextMouseDownOptions) => boolean = () => false;
     const markTouchStartOnCopyableText: (event: unknown, shouldCheck?: boolean) => boolean = () => false;
-    const shouldPreserveNativeTextSelection = () => false;
     const shouldSuppressCopyableTextRowPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowLongPress: (shouldCheck?: boolean) => boolean = () => false;
     const shouldSuppressCopyableTextRowFocus = () => false;
     const handleCopyableTextRowPress: (onPress: () => void, options?: HandleCopyableTextRowPressOptions) => void = (onPress) => onPress();
+    const handleCopyableTextRowPressIn: (options?: HandleCopyableTextRowPressInOptions) => void = () => {};
 
     return {
         didTouchStartOnCopyableText: false,
         handleCopyableTextRowPress,
+        handleCopyableTextRowPressIn,
         isPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
-        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowFocus,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
diff --git a/src/hooks/useCopyableTextRowPress/index.ts b/src/hooks/useCopyableTextRowPress/index.ts
index 6e9cb9fcef5b..d42d6a3762e8 100644
--- a/src/hooks/useCopyableTextRowPress/index.ts
+++ b/src/hooks/useCopyableTextRowPress/index.ts
@@ -1,3 +1,5 @@
+import ControlSelection from '@libs/ControlSelection';
+
 import CONST from '@src/CONST';
 
 import {useRef, useState} from 'react';
@@ -12,6 +14,11 @@ type HandleCopyableTextRowPressOptions = {
     shouldCheck?: boolean;
 };
 
+type HandleCopyableTextRowPressInOptions = {
+    shouldEnableTextSelection?: boolean;
+    shouldBlockSelection?: boolean;
+};
+
 type UseCopyableTextRowPressOptions = {
     shouldTrackTouchStart?: boolean;
 };
@@ -204,7 +211,16 @@ function useCopyableTextRowPress({shouldTrackTouchStart = false}: UseCopyableTex
         return isCopyableTarget;
     };
 
-    const shouldPreserveNativeTextSelection = () => didTouchStartOnCopyableTextRef.current;
+    // RN Web press-in events omit client coordinates, so reuse the original touch hit-test before blocking selection.
+    const handleCopyableTextRowPressIn = ({shouldEnableTextSelection = false, shouldBlockSelection = false}: HandleCopyableTextRowPressInOptions = {}) => {
+        if (shouldEnableTextSelection && didTouchStartOnCopyableTextRef.current) {
+            return;
+        }
+
+        if (shouldBlockSelection) {
+            ControlSelection.block();
+        }
+    };
 
     const shouldSuppressCopyableTextRowPress = (shouldCheck = true): boolean => {
         const didPressStartOnCopyableText = wasMouseDownOnCopyableTextRef.current || wasTouchStartOnCopyableTextRef.current;
@@ -236,10 +252,10 @@ function useCopyableTextRowPress({shouldTrackTouchStart = false}: UseCopyableTex
     return {
         didTouchStartOnCopyableText,
         handleCopyableTextRowPress,
+        handleCopyableTextRowPressIn,
         isPressStartOnCopyableText: getCachedIsPressStartOnCopyableText,
         markMouseDownOnCopyableText,
         markTouchStartOnCopyableText,
-        shouldPreserveNativeTextSelection,
         shouldSuppressCopyableTextRowFocus,
         shouldSuppressCopyableTextRowLongPress,
         shouldSuppressCopyableTextRowPress,
diff --git a/tests/unit/hooks/useCopyableTextRowPress.test.ts b/tests/unit/hooks/useCopyableTextRowPress.test.ts
index 6aa1891a553f..fd8510e5cc62 100644
--- a/tests/unit/hooks/useCopyableTextRowPress.test.ts
+++ b/tests/unit/hooks/useCopyableTextRowPress.test.ts
@@ -1,5 +1,7 @@
 import {act, renderHook} from '@testing-library/react-native';
 
+import ControlSelection from '@libs/ControlSelection';
+
 import type useCopyableTextRowPressModule from '../../../src/hooks/useCopyableTextRowPress/index';
 import type {isPressStartOnCopyableText as isPressStartOnCopyableTextModule} from '../../../src/hooks/useCopyableTextRowPress/index';
 
@@ -72,20 +74,23 @@ describe('useCopyableTextRowPress', () => {
     it('tracks copyable touch starts for consumers that need to preserve native text selection', () => {
         const {result} = renderHook(() => useCopyableTextRowPress({shouldTrackTouchStart: true}));
         const copyableTextElement = getCopyableTextElement();
+        const blockSelectionSpy = jest.spyOn(ControlSelection, 'block').mockImplementation();
 
         act(() => {
             result.current.markTouchStartOnCopyableText({target: copyableTextElement});
         });
 
         expect(result.current.didTouchStartOnCopyableText).toBe(true);
-        expect(result.current.shouldPreserveNativeTextSelection()).toBe(true);
+        result.current.handleCopyableTextRowPressIn({shouldEnableTextSelection: true, shouldBlockSelection: true});
+        expect(blockSelectionSpy).not.toHaveBeenCalled();
 
         act(() => {
             result.current.markMouseDownOnCopyableText(copyableTextElement);
         });
 
         expect(result.current.didTouchStartOnCopyableText).toBe(false);
-        expect(result.current.shouldPreserveNativeTextSelection()).toBe(false);
+        result.current.handleCopyableTextRowPressIn({shouldEnableTextSelection: true, shouldBlockSelection: true});
+        expect(blockSelectionSpy).toHaveBeenCalledTimes(1);
     });
 
     it('does not suppress row press when the press starts outside copyable text', () => {

From 36f3b2982e6a87b9a5deb4f310e6db6acf514f0a Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 13 Oct 2026 23:35:14 +0200
Subject: [PATCH 593/781] On mobile Spend over time labels only the first and
 last x-axis buckets

---
 src/components/Search/SearchChartView.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/SearchChartView.tsx b/src/components/Search/SearchChartView.tsx
index 4f54fa1a892b..b9e76bd8a2eb 100644
--- a/src/components/Search/SearchChartView.tsx
+++ b/src/components/Search/SearchChartView.tsx
@@ -3,6 +3,7 @@ import type {ChartDataPoint} from '@components/Charts';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import {sanitizeCurrencyCode} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -74,6 +75,7 @@ function SearchChartView({
     chartContainerStyle,
 }: SearchChartViewProps) {
     const {preferredLocale, translate, dateFnsLocale} = useLocalize();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {getCurrencySymbol, getCurrencyDecimals} = useCurrencyListActions();
     const {currentSearchKey} = useSearchQueryContext();
 
@@ -91,6 +93,8 @@ function SearchChartView({
     });
     const points = rows.map((row) => row.point);
 
+    const labelSteps = shouldUseNarrowLayout && axisLabelSteps ? [Math.max(1, points.length - 1)] : axisLabelSteps;
+
     const handleItemPress = (dataPoint: ChartDataPoint, index: number) => {
         const item = rows.at(index)?.item;
         if (!item || !queryJSON) {
@@ -144,7 +148,7 @@ function SearchChartView({
                     series={series}
                     isLoading={isLoading}
                     onPointPress={onItemPress}
-                    labelSteps={axisLabelSteps}
+                    labelSteps={labelSteps}
                     yAxisUnit={unit}
                     yAxisUnitPosition={unitPosition}
                 />

From a25192600794653fbaff61d14f1f4932f883eba1 Mon Sep 17 00:00:00 2001
From: aimane-chnaif <aiman.chnaif@gmail.com>
Date: Tue, 13 Oct 2026 23:05:30 +0100
Subject: [PATCH 594/781] Restore Latest messages pill after collapsing
 composer

---
 src/hooks/useReportActionsScroll.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index fb35636a4f6d..2ac0dbee8415 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -241,6 +241,18 @@ function useReportActionsScroll({
         shouldBeAlignedToTop,
     });
 
+    const prevIsComposerFullSize = usePrevious(isComposerFullSize);
+    // Scroll events skipped pill tracking while expanded, so sync the Latest messages pill with the current offset
+    const syncPillAfterComposerCollapse = useEffectEvent(() => {
+        if (!prevIsComposerFullSize || isComposerFullSize || shouldDisablePillTracking) {
+            return;
+        }
+        updatePillVisibility();
+    });
+    useEffect(() => {
+        syncPillAfterComposerCollapse();
+    }, [isComposerFullSize]);
+
     const {isScrollToBottomEnabled, setIsScrollToBottomEnabled, completeLiveTailPruneAfterScrollToBottom} = useReportActionsNewActionLiveTail({
         conciergeChat,
         reportID,

From 8098a6a235d3001f286bf198caaf2be2b97d9a96 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 15:21:41 -0700
Subject: [PATCH 595/781] fix(support): acknowledge support survey reactions

---
 .../ConciergeFeedbackPrompt.tsx               | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index 237a2ed3adf7..fe680a432b8c 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -136,10 +136,12 @@ function ConciergeFeedbackPrompt({
     const thumbsDown = findEmojiByName('-1');
 
     const thumbsUpReactedAt = getReactedAtTimestamp(thumbsUp, reactions, currentUserAccountID);
+    const thumbsDownReactedAt = getReactedAtTimestamp(thumbsDown, reactions, currentUserAccountID);
+    const latestReactionTimestamp = Math.max(thumbsUpReactedAt ?? 0, thumbsDownReactedAt ?? 0) || undefined;
 
     // The reaction that was already there when this row mounted is an old rating, so only a reaction that lands while the row is open is acknowledged
-    const [mountedWithThumbsUpReactedAt] = useState(thumbsUpReactedAt);
-    const hasJustReacted = thumbsUpReactedAt !== undefined && thumbsUpReactedAt !== mountedWithThumbsUpReactedAt;
+    const [mountedWithLatestReactionTimestamp] = useState(latestReactionTimestamp);
+    const hasJustReacted = latestReactionTimestamp !== undefined && latestReactionTimestamp !== mountedWithLatestReactionTimestamp;
 
     // The debounced copy catches up once the window has passed, which is what takes the acknowledgement back down
     const hasSettledAfterReacting = useDebouncedValue(hasJustReacted, THANKS_VISIBLE_DURATION_MS);
@@ -152,15 +154,6 @@ function ConciergeFeedbackPrompt({
 
     const hasRated = hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID) || hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID);
 
-    // The acknowledgement comes from the reaction, so removing it from the reaction row brings the prompt back right away
-    if (!shouldPersistAfterRating && isDisplayedThankMessage) {
-        return <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('concierge.feedback.thanks')}</Text>;
-    }
-
-    if (!shouldPersistAfterRating && hasRated) {
-        return null;
-    }
-
     const feedbackThumbs = (
         <View style={styles.flexRow}>
             <ConciergeFeedbackThumb
@@ -182,6 +175,36 @@ function ConciergeFeedbackPrompt({
         </View>
     );
 
+    const selectedEmoji = thumbsUpReactedAt ? thumbsUp : thumbsDown;
+    const selectedFeedbackThumb = (
+        <ConciergeFeedbackThumb
+            emoji={selectedEmoji}
+            label={translate(selectedEmoji.name === thumbsUp.name ? 'common.yes' : 'common.no')}
+            accessibilityLabel={translate(selectedEmoji.name === thumbsUp.name ? 'concierge.feedback.useful' : 'concierge.feedback.notUseful')}
+            onPress={callFunctionIfActionIsAllowed(() => rate(selectedEmoji))}
+            shouldShowTooltip={shouldShowTooltips}
+            isSelected
+        />
+    );
+
+    // The acknowledgement comes from the reaction, so removing it from the reaction row brings the prompt back right away
+    if (!shouldPersistAfterRating && isDisplayedThankMessage) {
+        return <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('concierge.feedback.thanks')}</Text>;
+    }
+
+    if (!shouldPersistAfterRating && hasRated) {
+        return null;
+    }
+
+    if (shouldPersistAfterRating && hasRated) {
+        return (
+            <View style={styles.flexRow}>
+                {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
+                {selectedFeedbackThumb}
+            </View>
+        );
+    }
+
     if (shouldRenderInline) {
         return feedbackThumbs;
     }

From 57fbb502885eee87740526bf17c8e4139fc0ab51 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 15:29:03 -0700
Subject: [PATCH 596/781] refactor(support): share survey feedback thumbs

---
 .../ConciergeFeedbackPrompt.tsx               | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index fe680a432b8c..c65269ae59c5 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -137,6 +137,8 @@ function ConciergeFeedbackPrompt({
 
     const thumbsUpReactedAt = getReactedAtTimestamp(thumbsUp, reactions, currentUserAccountID);
     const thumbsDownReactedAt = getReactedAtTimestamp(thumbsDown, reactions, currentUserAccountID);
+
+    // Either rating starts the acknowledgement window, and the zero fallback keeps an unanswered survey undefined.
     const latestReactionTimestamp = Math.max(thumbsUpReactedAt ?? 0, thumbsDownReactedAt ?? 0) || undefined;
 
     // The reaction that was already there when this row mounted is an old rating, so only a reaction that lands while the row is open is acknowledged
@@ -154,38 +156,26 @@ function ConciergeFeedbackPrompt({
 
     const hasRated = hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID) || hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID);
 
+    const getFeedbackThumb = (emoji: Emoji, isSelected: boolean) => (
+        <ConciergeFeedbackThumb
+            emoji={emoji}
+            label={translate(emoji.name === thumbsUp.name ? 'common.yes' : 'common.no')}
+            accessibilityLabel={translate(emoji.name === thumbsUp.name ? 'concierge.feedback.useful' : 'concierge.feedback.notUseful')}
+            onPress={callFunctionIfActionIsAllowed(() => rate(emoji))}
+            shouldShowTooltip={shouldShowTooltips}
+            isSelected={isSelected}
+        />
+    );
+
     const feedbackThumbs = (
         <View style={styles.flexRow}>
-            <ConciergeFeedbackThumb
-                emoji={thumbsUp}
-                label={translate('common.yes')}
-                accessibilityLabel={translate('concierge.feedback.useful')}
-                onPress={callFunctionIfActionIsAllowed(() => rate(thumbsUp))}
-                shouldShowTooltip={shouldShowTooltips}
-                isSelected={hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID)}
-            />
-            <ConciergeFeedbackThumb
-                emoji={thumbsDown}
-                label={translate('common.no')}
-                accessibilityLabel={translate('concierge.feedback.notUseful')}
-                onPress={callFunctionIfActionIsAllowed(() => rate(thumbsDown))}
-                shouldShowTooltip={shouldShowTooltips}
-                isSelected={hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID)}
-            />
+            {getFeedbackThumb(thumbsUp, hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID))}
+            {getFeedbackThumb(thumbsDown, hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID))}
         </View>
     );
 
     const selectedEmoji = thumbsUpReactedAt ? thumbsUp : thumbsDown;
-    const selectedFeedbackThumb = (
-        <ConciergeFeedbackThumb
-            emoji={selectedEmoji}
-            label={translate(selectedEmoji.name === thumbsUp.name ? 'common.yes' : 'common.no')}
-            accessibilityLabel={translate(selectedEmoji.name === thumbsUp.name ? 'concierge.feedback.useful' : 'concierge.feedback.notUseful')}
-            onPress={callFunctionIfActionIsAllowed(() => rate(selectedEmoji))}
-            shouldShowTooltip={shouldShowTooltips}
-            isSelected
-        />
-    );
+    const selectedFeedbackThumb = getFeedbackThumb(selectedEmoji, true);
 
     // The acknowledgement comes from the reaction, so removing it from the reaction row brings the prompt back right away
     if (!shouldPersistAfterRating && isDisplayedThankMessage) {

From 71d4f2874671b9dafed4a1420ced9a5c3d2e3251 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 14 Oct 2026 00:31:31 +0200
Subject: [PATCH 597/781] Preserve formatting in multi-field copied selections

---
 src/libs/SelectionScraper/index.ts | 110 ++++++++++++++++++++++++-----
 tests/unit/SelectionScraperTest.ts |  26 +++++++
 2 files changed, 117 insertions(+), 19 deletions(-)

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 01d7ec6c5c29..d1f84cc46845 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -22,10 +22,50 @@ const COPYABLE_ROW_DATA_SET = {[CONST.COPYABLE_ROW_ELEMENT]: true} as const;
 const copyableRowContinuationAttribute = `data-${CONST.COPYABLE_ROW_CONTINUATION_ELEMENT}`;
 const COPYABLE_ROW_CONTINUATION_DATA_SET = {...COPYABLE_ROW_DATA_SET, [CONST.COPYABLE_ROW_CONTINUATION_ELEMENT]: true} as const;
 
-function getCopyableElementText(element: globalThis.Element, selection: Selection): string {
+function normalizeSelectedContent(content: globalThis.DocumentFragment) {
+    const walker = document.createTreeWalker(content, NodeFilter.SHOW_TEXT);
+    const textNodes: globalThis.Text[] = [];
+    let textNode = walker.nextNode();
+    let hasText = false;
+    let previousTextEndsWithSpace = false;
+
+    while (textNode) {
+        if (textNode instanceof globalThis.Text) {
+            textNode.data = textNode.data.replaceAll(/[\t\n\r ]+/g, ' ');
+            if (!hasText || previousTextEndsWithSpace) {
+                textNode.data = textNode.data.trimStart();
+            }
+            if (textNode.data) {
+                hasText = true;
+                previousTextEndsWithSpace = textNode.data.endsWith(' ');
+            }
+            textNodes.push(textNode);
+        }
+        textNode = walker.nextNode();
+    }
+
+    const lastTextNode = textNodes.findLast((node) => !!node.data);
+    if (lastTextNode) {
+        lastTextNode.data = lastTextNode.data.trimEnd();
+    }
+}
+
+function unwrapNonSemanticElements(content: globalThis.DocumentFragment) {
+    for (const element of content.querySelectorAll('*')) {
+        const renderedTag = element.getAttribute(tagAttribute);
+        const nativeTag = element.tagName.toLowerCase();
+        if ((renderedTag && markdownElements.has(renderedTag)) || markdownElements.has(nativeTag)) {
+            continue;
+        }
+
+        element.replaceWith(...Array.from(element.childNodes));
+    }
+}
+
+function getCopyableElementContent(element: globalThis.Element, selection: Selection): globalThis.DocumentFragment {
     const elementRange = document.createRange();
     elementRange.selectNodeContents(element);
-    const selectedText: string[] = [];
+    const selectedContent = document.createDocumentFragment();
 
     for (let i = 0; i < selection.rangeCount; i++) {
         const intersectionRange = selection.getRangeAt(i).cloneRange();
@@ -39,23 +79,44 @@ function getCopyableElementText(element: globalThis.Element, selection: Selectio
         if (intersectionRange.compareBoundaryPoints(globalThis.Range.END_TO_END, elementRange) > 0) {
             intersectionRange.setEnd(elementRange.endContainer, elementRange.endOffset);
         }
-        selectedText.push(intersectionRange.toString());
+
+        let content: globalThis.Node = intersectionRange.cloneContents();
+        let parent = getElementFromNode(intersectionRange.commonAncestorContainer)?.closest(`[${tagAttribute}]`) ?? null;
+        while (parent && element.contains(parent)) {
+            const clonedParent = parent.cloneNode();
+            clonedParent.appendChild(content);
+            content = clonedParent;
+            parent = parent.parentElement?.closest(`[${tagAttribute}]`) ?? null;
+        }
+
+        const fragment = document.createDocumentFragment();
+        fragment.appendChild(content);
+        for (const hiddenElement of fragment.querySelectorAll(hiddenElementSelector)) {
+            hiddenElement.remove();
+        }
+        unwrapNonSemanticElements(fragment);
+        normalizeSelectedContent(fragment);
+        if (!fragment.textContent?.trim()) {
+            continue;
+        }
+
+        if (selectedContent.textContent) {
+            selectedContent.appendChild(document.createTextNode(' '));
+        }
+        selectedContent.appendChild(fragment);
     }
 
-    return selectedText
-        .join(' ')
-        .trim()
-        .replaceAll(/[\t\n\r ]+/g, ' ');
+    return selectedContent;
 }
 
-function replaceElementContentWithLines(element: globalThis.Element, lines: Array<{row: globalThis.Element; text: string}>) {
-    for (const [index, {text}] of lines.entries()) {
+function replaceElementContentWithLines(element: globalThis.Element, lines: Array<{row: globalThis.Element; content: globalThis.DocumentFragment}>) {
+    for (const [index, {content}] of lines.entries()) {
         if (index > 0) {
             const previousRow = lines.at(index - 1)?.row;
             const separator = previousRow?.getAttribute(copyableRowContinuationAttribute) === 'true' ? document.createTextNode(' ') : document.createElement('br');
             element.appendChild(separator);
         }
-        element.appendChild(document.createTextNode(text));
+        element.appendChild(content);
     }
 }
 
@@ -171,15 +232,26 @@ function getHTMLOfSelectedCopyableRows(selection: Selection): string {
     }
 
     const lines = selectedRows
-        .map((row) => ({
-            row,
-            text: [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]
-                .filter((copyableElement) => selectedCopyableElementsByRow.get(row)?.has(copyableElement))
-                .map((copyableElement) => getCopyableElementText(copyableElement, selection))
-                .filter((text) => !!text)
-                .join(' '),
-        }))
-        .filter(({text}) => !!text);
+        .map((row) => {
+            const content = document.createDocumentFragment();
+            for (const copyableElement of [row, ...Array.from(row.querySelectorAll(COPYABLE_TEXT_SELECTOR))]) {
+                if (!selectedCopyableElementsByRow.get(row)?.has(copyableElement)) {
+                    continue;
+                }
+
+                const copyableContent = getCopyableElementContent(copyableElement, selection);
+                if (!copyableContent.textContent) {
+                    continue;
+                }
+
+                if (content.textContent) {
+                    content.appendChild(document.createTextNode(' '));
+                }
+                content.appendChild(copyableContent);
+            }
+            return {row, content};
+        })
+        .filter(({content}) => !!content.textContent);
 
     if (lines.length === 0) {
         return '';
diff --git a/tests/unit/SelectionScraperTest.ts b/tests/unit/SelectionScraperTest.ts
index d77e1a728cda..7926d01ba9d1 100644
--- a/tests/unit/SelectionScraperTest.ts
+++ b/tests/unit/SelectionScraperTest.ts
@@ -84,6 +84,32 @@ describe('SelectionScraper', () => {
         expect(SelectionScraper.getCurrentSelection()).toBe('Aug 26 Paid<br>Aug 27 Draft');
     });
 
+    it('preserves semantic formatting without layout wrappers in a multi-field selection', () => {
+        createFixture(`
+            <div ${copyableRowAttribute}="true">
+                <span id="amount" ${copyableTextAttribute}="true">TJS 10.00</span>
+                <span id="description" ${copyableTextAttribute}="true">
+                    <div>
+                        <div data-testid="p">
+                            <span><span id="formatted-description" data-testid="strong">Test is</span></span>
+                            <span data-testid="code">good</span>
+                        </div>
+                    </div>
+                </span>
+                <span id="merchant" ${copyableTextAttribute}="true">Merchant</span>
+            </div>
+        `);
+
+        selectText(getTextNode('amount'), 0, getTextNode('merchant'), 'Merchant'.length);
+
+        const selectionHTML = SelectionScraper.getCurrentSelection();
+        expect(selectionHTML).toBe('TJS 10.00 <strong>Test is</strong> <code>good</code> Merchant');
+        expect(getClipboardText(selectionHTML)).toBe('TJS 10.00 Test is good Merchant');
+
+        selectText(getTextNode('formatted-description'), 'Test '.length, getTextNode('merchant'), 'Merchant'.length);
+        expect(SelectionScraper.getCurrentSelection()).toBe('<strong>is</strong> <code>good</code> Merchant');
+    });
+
     it('joins a continuation row to the next row with a space', () => {
         // Given report fields followed by expense details in separate copyable rows
         createFixture(`

From 34a360322b98f0bb7b51069fa7a49a37180c3e90 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 15:34:39 -0700
Subject: [PATCH 598/781] fix(support): wrap survey acknowledgement

---
 src/components/ReportActionItem/SupportTicketSurvey.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/SupportTicketSurvey.tsx b/src/components/ReportActionItem/SupportTicketSurvey.tsx
index 3105062b8fa5..4af75ac2c326 100644
--- a/src/components/ReportActionItem/SupportTicketSurvey.tsx
+++ b/src/components/ReportActionItem/SupportTicketSurvey.tsx
@@ -59,8 +59,8 @@ function SupportTicketSurvey({action, report, reportID}: SupportTicketSurveyProp
     }
 
     return (
-        <View style={[styles.chatItemMessage, styles.flexRow, styles.alignItemsCenter]}>
-            <Text style={styles.textSupporting}>{translate('supportTicket.surveyPrompt')}</Text>
+        <View style={[styles.chatItemMessage, styles.flexRow, styles.flexWrap, styles.alignItemsCenter]}>
+            <Text style={[styles.textSupporting, styles.flexShrink1]}>{translate('supportTicket.surveyPrompt')}</Text>
             {canRateSurvey && (
                 <View style={styles.ml1}>
                     <ConciergeFeedbackPrompt

From 3a8661bb0113419e0c6f87b8cd781b9a010f87e4 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 14 Oct 2026 01:38:29 +0200
Subject: [PATCH 599/781] Standardize selectable prop naming across copyable
 text components

---
 src/components/AvatarWithDisplayName.tsx           | 14 +++++++-------
 .../DisplayNames/DisplayNamesTooltipItem.tsx       | 10 +++++-----
 .../DisplayNames/DisplayNamesWithTooltip.tsx       |  8 ++++----
 .../DisplayNames/DisplayNamesWithoutTooltip.tsx    | 10 +++++-----
 src/components/DisplayNames/index.native.tsx       |  4 ++--
 src/components/DisplayNames/index.tsx              |  8 ++++----
 src/components/DisplayNames/types.ts               |  4 ++--
 .../ReportActionItem/MoneyRequestView.tsx          |  2 +-
 src/components/ReportSearchHeader/index.tsx        |  6 +++---
 src/components/ReportSearchHeader/types.ts         |  4 ++--
 .../SearchList/ListItem/AvatarWithTextCell.tsx     | 10 +++++-----
 .../SearchList/ListItem/BaseListItemHeader.tsx     |  4 ++--
 .../SearchList/ListItem/CardListItemHeader.tsx     |  8 ++++----
 .../Search/SearchList/ListItem/DateCell.tsx        |  2 +-
 .../SearchList/ListItem/MemberListItemHeader.tsx   |  8 ++++----
 .../SearchList/ListItem/ReportListItemHeader.tsx   |  4 ++--
 .../Search/SearchList/ListItem/TaskListItemRow.tsx |  8 ++++----
 .../Search/SearchList/ListItem/TextCell.tsx        |  2 +-
 .../SearchList/ListItem/TextWithIconCell.tsx       |  2 +-
 .../Search/SearchList/ListItem/TotalCell.tsx       |  2 +-
 .../ListItem/WithdrawalIDListItemHeader.tsx        | 10 +++++-----
 .../Search/SearchList/ListItem/WorkspaceCell.tsx   |  2 +-
 .../WorkspaceMembersTableRow.tsx                   |  8 ++++----
 src/components/TextWithTooltip/index.tsx           |  6 +++---
 src/components/TextWithTooltip/types.ts            |  4 ++--
 .../TransactionItemRow/DataCells/CategoryCell.tsx  |  2 +-
 .../TransactionItemRow/DataCells/MerchantCell.tsx  |  2 +-
 .../TransactionItemRow/DataCells/TagCell.tsx       |  2 +-
 .../TransactionItemRow/DataCells/TaxCell.tsx       |  2 +-
 .../TransactionItemRow/DataCells/TotalCell.tsx     |  2 +-
 .../TransactionItemRow/DataCells/TypeCell.tsx      |  2 +-
 src/components/UserPill.tsx                        | 12 ++++++------
 src/components/UserPills.tsx                       |  6 +++---
 tests/ui/components/AvatarWithTextCellTest.tsx     |  2 +-
 tests/ui/components/TaskListItemSelectionTest.tsx  |  6 +++---
 35 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 063090cac215..3ec898ae2a38 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -89,8 +89,8 @@ type AvatarWithDisplayNameProps = {
 
     customDisplayNameStyle?: TextStyle;
 
-    /** Whether the displayed report title should be directly selectable/copyable */
-    isDisplayNameCopyable?: boolean;
+    /** Whether the displayed report title should be directly selectable */
+    isDisplayNameSelectable?: boolean;
 
     /** The style of the parent navigation subtitle text */
     parentNavigationSubtitleTextStyles?: StyleProp<TextStyle>;
@@ -108,7 +108,7 @@ type CustomDisplayNameOptions = {
     regularStyle: TextStyle[];
     isAnonymous: boolean;
     isMoneyRequestOrReport: boolean;
-    isCopyable: boolean;
+    isSelectable: boolean;
 };
 
 function getCustomDisplayName({
@@ -122,7 +122,7 @@ function getCustomDisplayName({
     regularStyle,
     isAnonymous,
     isMoneyRequestOrReport,
-    isCopyable,
+    isSelectable,
 }: CustomDisplayNameOptions): React.ReactNode {
     const reportName = report?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME;
     const isIOUOrInvoice = report?.type === CONST.REPORT.TYPE.IOU || report?.type === CONST.REPORT.TYPE.INVOICE;
@@ -184,7 +184,7 @@ function getCustomDisplayName({
             numberOfLines={numberOfLines}
             textStyles={textStyles}
             shouldUseFullTitle={shouldUseFullTitleProp}
-            isCopyable={isCopyable}
+            isSelectable={isSelectable}
         />
     );
 }
@@ -201,7 +201,7 @@ function AvatarWithDisplayName({
     avatarBorderColor: avatarBorderColorProp,
     shouldDisplayStatus = false,
     customDisplayNameStyle = {},
-    isDisplayNameCopyable = false,
+    isDisplayNameSelectable = false,
     parentNavigationSubtitleTextStyles,
     parentNavigationStatusContainerStyles = {},
 }: AvatarWithDisplayNameProps) {
@@ -305,7 +305,7 @@ function AvatarWithDisplayName({
         regularStyle: [isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre],
         isAnonymous,
         isMoneyRequestOrReport,
-        isCopyable: isDisplayNameCopyable,
+        isSelectable: isDisplayNameSelectable,
     });
 
     const multipleAvatars = (
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 2507415f08fc..12e99fdf4b84 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -36,8 +36,8 @@ type DisplayNamesTooltipItemProps = ForwardedFSClassProps & {
     /** Refs to all the names which will be used to correct the horizontal position of the tooltip */
     childRefs: RefObject<Array<ComponentRef<typeof RNText>>>;
 
-    /** Whether this display name should be directly selectable/copyable inside pressable rows */
-    isCopyable?: boolean;
+    /** Whether this display name should be directly selectable inside pressable rows */
+    isSelectable?: boolean;
 };
 
 function DisplayNamesTooltipItem({
@@ -50,7 +50,7 @@ function DisplayNamesTooltipItem({
     textStyles = [],
     childRefs = {current: []},
     forwardedFSClass,
-    isCopyable = false,
+    isSelectable = false,
 }: DisplayNamesTooltipItemProps) {
     const styles = useThemeStyles();
     const tooltipIndexBridge = useCallback(() => getTooltipShiftX(index), [getTooltipShiftX, index]);
@@ -77,8 +77,8 @@ function DisplayNamesTooltipItem({
                 }}
                 style={[textStyles, styles.pre]}
                 fsClass={forwardedFSClass}
-                selectable={isCopyable}
-                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                selectable={isSelectable}
+                dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
             >
                 {displayName}
             </Text>
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index 9dcd47a50c60..274774ed863d 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -29,7 +29,7 @@ function DisplayNamesWithToolTip({
     renderAdditionalText,
     forwardedFSClass,
     accessibilityLabel,
-    isCopyable = false,
+    isSelectable = false,
 }: DisplayNamesProps) {
     const styles = useThemeStyles();
     const containerRef = useRef<HTMLElementWithText>(null);
@@ -75,8 +75,8 @@ function DisplayNamesWithToolTip({
             ref={containerRef}
             testID="DisplayNamesWithToolTip"
             fsClass={forwardedFSClass}
-            selectable={isCopyable}
-            dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+            selectable={isSelectable}
+            dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
         >
             {shouldUseFullTitle
                 ? formatReportLastMessageText(fullTitle)
@@ -93,7 +93,7 @@ function DisplayNamesWithToolTip({
                               textStyles={textStyles}
                               childRefs={childRefs}
                               forwardedFSClass={forwardedFSClass}
-                              isCopyable={isCopyable}
+                              isSelectable={isSelectable}
                           />
                           {index < displayNamesWithTooltips.length - 1 && <Text style={textStyles}>,&nbsp;</Text>}
                           {shouldAddEllipsis && index === displayNamesWithTooltips.length - 1 && <Text style={textStyles}>...</Text>}
diff --git a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
index dc92a77122bc..7dd8e0f7649e 100644
--- a/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithoutTooltip.tsx
@@ -24,8 +24,8 @@ type DisplayNamesWithoutTooltipProps = ForwardedFSClassProps & {
     /** Overrides the text read by screen readers. */
     accessibilityLabel?: string;
 
-    /** Whether this display name should be directly selectable/copyable inside pressable rows */
-    isCopyable?: boolean;
+    /** Whether this display name should be directly selectable inside pressable rows */
+    isSelectable?: boolean;
 };
 
 function DisplayNamesWithoutTooltip({
@@ -35,7 +35,7 @@ function DisplayNamesWithoutTooltip({
     renderAdditionalText,
     forwardedFSClass,
     accessibilityLabel,
-    isCopyable = false,
+    isSelectable = false,
 }: DisplayNamesWithoutTooltipProps) {
     const styles = useThemeStyles();
     return (
@@ -44,8 +44,8 @@ function DisplayNamesWithoutTooltip({
             style={[textStyles, numberOfLines === 1 ? styles.pre : styles.preWrap]}
             numberOfLines={numberOfLines}
             fsClass={forwardedFSClass}
-            selectable={isCopyable}
-            dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+            selectable={isSelectable}
+            dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
         >
             {fullTitle}
             {renderAdditionalText?.()}
diff --git a/src/components/DisplayNames/index.native.tsx b/src/components/DisplayNames/index.native.tsx
index 5e57ecfd9fed..b07d4578867e 100644
--- a/src/components/DisplayNames/index.native.tsx
+++ b/src/components/DisplayNames/index.native.tsx
@@ -22,7 +22,7 @@ function DisplayNames({
     forwardedFSClass,
     testID,
     shouldParseFullTitle = true,
-    isCopyable = false,
+    isSelectable = false,
 }: DisplayNamesProps) {
     const {translate} = useLocalize();
     const titleContainsTextAndCustomEmoji = useMemo(() => containsCustomEmoji(fullTitle) && !containsOnlyCustomEmoji(fullTitle), [fullTitle]);
@@ -38,7 +38,7 @@ function DisplayNames({
             numberOfLines={numberOfLines}
             testID={`DisplayNames${testID !== undefined ? `-${testID}` : ''}`}
             fsClass={forwardedFSClass}
-            selectable={isCopyable}
+            selectable={isSelectable}
         >
             {titleContainsTextAndCustomEmoji ? (
                 <TextWithEmojiFragment
diff --git a/src/components/DisplayNames/index.tsx b/src/components/DisplayNames/index.tsx
index 291170f346d4..81ac5eecdae2 100644
--- a/src/components/DisplayNames/index.tsx
+++ b/src/components/DisplayNames/index.tsx
@@ -22,7 +22,7 @@ function DisplayNames({
     forwardedFSClass,
     shouldParseFullTitle = true,
     accessibilityLabel,
-    isCopyable = false,
+    isSelectable = false,
 }: DisplayNamesProps) {
     const {translate} = useLocalize();
     const title = useMemo(() => {
@@ -39,7 +39,7 @@ function DisplayNames({
                 renderAdditionalText={renderAdditionalText}
                 forwardedFSClass={forwardedFSClass}
                 accessibilityLabel={accessibilityLabel}
-                isCopyable={isCopyable}
+                isSelectable={isSelectable}
             />
         );
     }
@@ -54,7 +54,7 @@ function DisplayNames({
                 renderAdditionalText={renderAdditionalText}
                 forwardedFSClass={forwardedFSClass}
                 accessibilityLabel={accessibilityLabel}
-                isCopyable={isCopyable}
+                isSelectable={isSelectable}
             />
         );
     }
@@ -69,7 +69,7 @@ function DisplayNames({
             renderAdditionalText={renderAdditionalText}
             forwardedFSClass={forwardedFSClass}
             accessibilityLabel={accessibilityLabel}
-            isCopyable={isCopyable}
+            isSelectable={isSelectable}
         />
     );
 }
diff --git a/src/components/DisplayNames/types.ts b/src/components/DisplayNames/types.ts
index ad54a2ecb0ea..89faf6d4b350 100644
--- a/src/components/DisplayNames/types.ts
+++ b/src/components/DisplayNames/types.ts
@@ -49,8 +49,8 @@ type DisplayNamesProps = ForwardedFSClassProps & {
     /** If we should add an ellipsis after the participants list */
     shouldAddEllipsis?: boolean;
 
-    /** Whether this display name should be directly selectable/copyable inside pressable rows */
-    isCopyable?: boolean;
+    /** Whether this display name should be directly selectable inside pressable rows */
+    isSelectable?: boolean;
 
     /** Whether to parse HTML in the title */
     shouldParseHtml?: boolean;
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 3ba808b4927e..fb30e81b2aba 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1691,7 +1691,7 @@ function MoneyRequestView({
                                             email: a?.email,
                                         }))}
                                         maxVisible={canEdit ? undefined : actualAttendees.length}
-                                        isCopyable={areAttendeesCopyable}
+                                        isSelectable={areAttendeesCopyable}
                                     />
                                 ) : undefined
                             }
diff --git a/src/components/ReportSearchHeader/index.tsx b/src/components/ReportSearchHeader/index.tsx
index 8c5b83c439e8..ca6aada11ab3 100755
--- a/src/components/ReportSearchHeader/index.tsx
+++ b/src/components/ReportSearchHeader/index.tsx
@@ -10,7 +10,7 @@ import {View} from 'react-native';
 
 import type ReportSearchHeaderProps from './types';
 
-function ReportSearchHeader({report, style, transactions, avatarBorderColor, isTitleCopyable = false}: ReportSearchHeaderProps) {
+function ReportSearchHeader({report, style, transactions, avatarBorderColor, isTitleSelectable = false}: ReportSearchHeaderProps) {
     const styles = useThemeStyles();
     const {isLargeScreenWidth} = useResponsiveLayout();
 
@@ -28,7 +28,7 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor, isT
                 shouldEnableDetailPageNavigation={false}
                 shouldEnableAvatarNavigation={false}
                 avatarBorderColor={avatarBorderColor}
-                isDisplayNameCopyable={isTitleCopyable}
+                isDisplayNameSelectable={isTitleSelectable}
                 size={isLargeScreenWidth ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                 customDisplayNameStyle={styles.fontWeightNormal}
                 parentNavigationSubtitleTextStyles={[styles.textLineHeightNormal, styles.minHeight4, styles.mt1, !isLargeScreenWidth && styles.textMicro]}
@@ -39,7 +39,7 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor, isT
         report,
         transactions,
         avatarBorderColor,
-        isTitleCopyable,
+        isTitleSelectable,
         styles.fontWeightNormal,
         styles.textLineHeightNormal,
         styles.minHeight4,
diff --git a/src/components/ReportSearchHeader/types.ts b/src/components/ReportSearchHeader/types.ts
index e8aa9697289c..47a777b5d03f 100644
--- a/src/components/ReportSearchHeader/types.ts
+++ b/src/components/ReportSearchHeader/types.ts
@@ -14,8 +14,8 @@ type ReportSearchHeaderProps = {
     /** Color of the secondary avatar border, usually should match the container background */
     avatarBorderColor?: ColorValue;
 
-    /** Whether the displayed report title should be directly selectable/copyable */
-    isTitleCopyable?: boolean;
+    /** Whether the displayed report title should be directly selectable */
+    isTitleSelectable?: boolean;
 };
 
 export default ReportSearchHeaderProps;
diff --git a/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx b/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
index 074e3f42ad7b..5dc42926e26c 100644
--- a/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
+++ b/src/components/Search/SearchList/ListItem/AvatarWithTextCell.tsx
@@ -20,10 +20,10 @@ type AvatarWithTextCellProps = {
     textStyle?: StyleProp<TextStyle>;
 
     /** Whether the text can be selected inside a copyable row */
-    isCopyable?: boolean;
+    isSelectable?: boolean;
 };
 
-function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle, isCopyable = false}: AvatarWithTextCellProps) {
+function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle, isSelectable = false}: AvatarWithTextCellProps) {
     const styles = useThemeStyles();
 
     if (!reportName || !icon) {
@@ -40,7 +40,7 @@ function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle, is
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter]}>
-            {isCopyable ? (
+            {isSelectable ? (
                 <View
                     style={styles.userSelectNone}
                     dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
@@ -54,8 +54,8 @@ function AvatarWithTextCell({reportName, icon, isLargeScreenWidth, textStyle, is
             <Text
                 numberOfLines={1}
                 style={[textStyle ?? (isLargeScreenWidth ? styles.themeTextColor : styles.textMicroBold), styles.flexShrink1]}
-                selectable={isCopyable ? true : undefined}
-                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                selectable={isSelectable ? true : undefined}
+                dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
             >
                 {reportName}
             </Text>
diff --git a/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx b/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
index b213f7d2d631..524194411de8 100644
--- a/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx
@@ -121,7 +121,7 @@ function BaseListItemHeaderImpl({
                     <TextWithTooltip
                         text={displayName}
                         style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                        isCopyable
+                        isSelectable
                     />
                 </View>
             </View>
@@ -168,7 +168,7 @@ function BaseListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={displayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                                    isCopyable
+                                    isSelectable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx b/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
index 778ebfc21a5e..0df830787f92 100644
--- a/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/CardListItemHeader.tsx
@@ -106,7 +106,7 @@ function CardListItemHeaderImpl({
                         text={cardItem.formattedCardName ?? ''}
                         numberOfLines={2}
                         style={[styles.preWrap]}
-                        isCopyable
+                        isSelectable
                     />
                 </View>
             </View>
@@ -120,7 +120,7 @@ function CardListItemHeaderImpl({
                     text={cardItem.formattedFeedName ?? ''}
                     numberOfLines={2}
                     style={[styles.lineHeightLarge, styles.preWrap]}
-                    isCopyable
+                    isSelectable
                 />
             </View>
         ),
@@ -171,13 +171,13 @@ function CardListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={formattedDisplayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                                    isCopyable
+                                    isSelectable
                                 />
                                 <TextWithTooltip
                                     text={cardItem.formattedCardName ?? ''}
                                     numberOfLines={2}
                                     style={[styles.textLabelSupporting, styles.lh16, styles.preWrap]}
-                                    isCopyable
+                                    isSelectable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/DateCell.tsx b/src/components/Search/SearchList/ListItem/DateCell.tsx
index 1f0125976fe0..0e0d1046306d 100644
--- a/src/components/Search/SearchList/ListItem/DateCell.tsx
+++ b/src/components/Search/SearchList/ListItem/DateCell.tsx
@@ -57,7 +57,7 @@ function DateCell({date, showTooltip, isLargeScreenWidth, suffixText, shouldUseL
             text={displayText}
             shouldShowTooltip={showTooltip}
             style={[styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.mutedNormalTextLabel, !!suffixText && styles.flexShrink1]}
-            isCopyable
+            isSelectable
         />
     );
 
diff --git a/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx b/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
index d6567bc58192..c2906dce4d3d 100644
--- a/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx
@@ -97,12 +97,12 @@ function MemberListItemHeaderImpl({
                     <TextWithTooltip
                         text={formattedDisplayName}
                         style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                        isCopyable
+                        isSelectable
                     />
                     <TextWithTooltip
                         text={formattedLogin || formattedDisplayName}
                         style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
-                        isCopyable
+                        isSelectable
                     />
                 </View>
             </View>
@@ -156,12 +156,12 @@ function MemberListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={formattedDisplayName}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                                    isCopyable
+                                    isSelectable
                                 />
                                 <TextWithTooltip
                                     text={formattedLogin || formattedDisplayName}
                                     style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
-                                    isCopyable
+                                    isSelectable
                                 />
                             </View>
                         </View>
diff --git a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
index bdb8cbdc1725..820e1f56d584 100644
--- a/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx
@@ -175,8 +175,8 @@ function HeaderFirstRow<TItem extends ListItem>({
                         style={[{maxWidth: 700}]}
                         transactions={reportItem.transactions}
                         avatarBorderColor={avatarBorderColor}
-                        // Grouped report headers sit inside pressable rows, so their title needs the copyable marker too.
-                        isTitleCopyable
+                        // Grouped report headers sit inside pressable rows, so their title needs the selection marker too.
+                        isTitleSelectable
                     />
                 </View>
             </View>
diff --git a/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx b/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
index db956e74ddba..92c4ef690c37 100644
--- a/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
+++ b/src/components/Search/SearchList/ListItem/TaskListItemRow.tsx
@@ -63,7 +63,7 @@ function TitleCell({taskItem, showTooltip, isLargeScreenWidth}: TaskCellProps) {
             shouldShowTooltip={showTooltip}
             numberOfLines={2}
             style={[isLargeScreenWidth ? styles.lineHeightLarge : styles.lh20, styles.preWrap, styles.justifyContentCenter]}
-            isCopyable
+            isSelectable
         />
     );
 }
@@ -77,7 +77,7 @@ function DescriptionCell({taskItem, showTooltip, isLargeScreenWidth}: TaskCellPr
             text={taskItem.description}
             numberOfLines={2}
             style={[styles.lineHeightLarge, styles.preWrap, styles.justifyContentCenter, isLargeScreenWidth ? undefined : [styles.textMicro, styles.textSupporting]]}
-            isCopyable
+            isSelectable
         />
     );
 }
@@ -167,7 +167,7 @@ function TaskListItemRow({item, containerStyle, showTooltip}: TaskListItemRowPro
                                 reportName={item?.parentReportName}
                                 icon={item?.parentReportIcon}
                                 isLargeScreenWidth={isLargeScreenWidth}
-                                isCopyable
+                                isSelectable
                             />
                         </View>
                     </View>
@@ -258,7 +258,7 @@ function TaskListItemRow({item, containerStyle, showTooltip}: TaskListItemRowPro
                         reportName={item?.parentReportName}
                         icon={item?.parentReportIcon}
                         isLargeScreenWidth={isLargeScreenWidth}
-                        isCopyable
+                        isSelectable
                     />
                 </View>
                 <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ASSIGNEE)]}>
diff --git a/src/components/Search/SearchList/ListItem/TextCell.tsx b/src/components/Search/SearchList/ListItem/TextCell.tsx
index 6c92f8c34ca1..f6a5d37bde6a 100644
--- a/src/components/Search/SearchList/ListItem/TextCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TextCell.tsx
@@ -18,7 +18,7 @@ function TextCell({text = '', isLargeScreenWidth = true}: TextCellProps) {
             shouldShowTooltip
             numberOfLines={isLargeScreenWidth ? 1 : 2}
             style={[isLargeScreenWidth ? styles.lineHeightLarge : styles.lh20, !isLargeScreenWidth && styles.preWrap, styles.justifyContentCenter]}
-            isCopyable
+            isSelectable
         />
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx b/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
index 7818a274752c..1c28df93eaca 100644
--- a/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TextWithIconCell.tsx
@@ -41,7 +41,7 @@ export default function TextWithIconCell({icon, iconSize = 12, text, showTooltip
                 shouldShowTooltip={showTooltip}
                 numberOfLines={numberOfLines}
                 style={[styles.label, numberOfLines > 1 ? styles.preWrap : styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
-                isCopyable
+                isSelectable
             />
         </View>
     );
diff --git a/src/components/Search/SearchList/ListItem/TotalCell.tsx b/src/components/Search/SearchList/ListItem/TotalCell.tsx
index 7b76e7cbe397..f1c49e841950 100644
--- a/src/components/Search/SearchList/ListItem/TotalCell.tsx
+++ b/src/components/Search/SearchList/ListItem/TotalCell.tsx
@@ -23,7 +23,7 @@ function TotalCell({total, currency, isScanning = false}: TotalCellProps) {
             shouldShowTooltip
             text={displayText}
             style={[styles.optionDisplayName, styles.pre, styles.justifyContentCenter, styles.textBold, styles.textAlignRight, styles.fontWeightNormal]}
-            isCopyable
+            isSelectable
         />
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx b/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
index 42e98381e8ad..6e30ed6b3020 100644
--- a/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/WithdrawalIDListItemHeader.tsx
@@ -134,7 +134,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={accountLabel}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
-                    isCopyable
+                    isSelectable
                 />
             </View>
         ),
@@ -148,7 +148,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={formattedWithdrawalDate}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
-                    isCopyable
+                    isSelectable
                 />
             </View>
         ),
@@ -168,7 +168,7 @@ function WithdrawalIDListItemHeaderImpl({
                 <TextWithTooltip
                     text={withdrawalIDItem.entryID?.toString() ?? ''}
                     style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre]}
-                    isCopyable
+                    isSelectable
                 />
             </View>
         ),
@@ -246,14 +246,14 @@ function WithdrawalIDListItemHeaderImpl({
                                 <TextWithTooltip
                                     text={`${formattedBankName} xx${withdrawalIDItem.accountNumber.slice(-4)}`}
                                     style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre, styles.fontWeightNormal]}
-                                    isCopyable
+                                    isSelectable
                                 />
                                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}>
                                     {statusBadge}
                                     <TextWithTooltip
                                         text={withdrawalInfoText}
                                         style={[styles.textLabelSupporting, styles.lh16, styles.pre, styles.flexShrink1]}
-                                        isCopyable
+                                        isSelectable
                                     />
                                 </View>
                             </View>
diff --git a/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx b/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
index 82b4982c8a94..2f0f347dccd2 100644
--- a/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
+++ b/src/components/Search/SearchList/ListItem/WorkspaceCell.tsx
@@ -44,7 +44,7 @@ function WorkspaceCell({policyID, report}: WorkspaceCellProps) {
                 text={name ?? ''}
                 shouldShowTooltip
                 style={[styles.flex1, styles.flexGrow1]}
-                isCopyable
+                isSelectable
             />
         </View>
     );
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index 231af265aafb..bd2eff903e7f 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -96,14 +96,14 @@ export default function WorkspaceMembersTableRow({
                                 text={item.name}
                                 style={[styles.optionDisplayName, styles.pre]}
                                 numberOfLines={1}
-                                isCopyable
+                                isSelectable
                             />
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={memberSubtitle}
                                 style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
                                 numberOfLines={1}
-                                isCopyable
+                                isSelectable
                             />
                         </View>
                     </View>
@@ -119,7 +119,7 @@ export default function WorkspaceMembersTableRow({
                                     numberOfLines={1}
                                     text={item.employeeUserID}
                                     style={[styles.lh16, styles.optionDisplayName, styles.pre]}
-                                    isCopyable
+                                    isSelectable
                                 />
                             )}
                         </View>
@@ -136,7 +136,7 @@ export default function WorkspaceMembersTableRow({
                                     numberOfLines={1}
                                     text={item.employeePayrollID}
                                     style={[styles.lh16, styles.optionDisplayName, styles.pre]}
-                                    isCopyable
+                                    isSelectable
                                 />
                             )}
                         </View>
diff --git a/src/components/TextWithTooltip/index.tsx b/src/components/TextWithTooltip/index.tsx
index c077d054649b..dee02f1f7d41 100644
--- a/src/components/TextWithTooltip/index.tsx
+++ b/src/components/TextWithTooltip/index.tsx
@@ -11,7 +11,7 @@ type LayoutChangeEvent = {
     target: HTMLElement;
 };
 
-function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isCopyable = false}: TextWithTooltipProps) {
+function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass, isSelectable = false}: TextWithTooltipProps) {
     const [showTooltip, setShowTooltip] = useState(false);
 
     return (
@@ -23,7 +23,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
                 testID={testID}
                 style={style}
                 numberOfLines={numberOfLines}
-                selectable={isCopyable}
+                selectable={isSelectable}
                 onLayout={(e) => {
                     const target = (e.nativeEvent as unknown as LayoutChangeEvent).target;
                     if (!shouldShowTooltip) {
@@ -36,7 +36,7 @@ function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines
                     setShowTooltip(false);
                 }}
                 fsClass={forwardedFSClass}
-                dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
             >
                 {text}
             </Text>
diff --git a/src/components/TextWithTooltip/types.ts b/src/components/TextWithTooltip/types.ts
index ae57d3c1a40c..365b9bf6cbd5 100644
--- a/src/components/TextWithTooltip/types.ts
+++ b/src/components/TextWithTooltip/types.ts
@@ -12,8 +12,8 @@ type TextWithTooltipProps = ForwardedFSClassProps & {
 
     testID?: string;
 
-    /** Whether this value should be directly selectable/copyable inside pressable rows */
-    isCopyable?: boolean;
+    /** Whether this value should be directly selectable inside pressable rows */
+    isSelectable?: boolean;
 };
 
 export default TextWithTooltipProps;
diff --git a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
index b6de3fa697ba..5d1514dfbecb 100644
--- a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
@@ -52,7 +52,7 @@ function CategoryCell({shouldUseNarrowLayout, shouldShowTooltip, transactionItem
             text={categoryForDisplay}
             numberOfLines={1}
             style={[styles.lineHeightLarge, styles.justifyContentCenter]}
-            isCopyable
+            isSelectable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
index 2b4a6900e8f0..e24ff67ef2b1 100644
--- a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
@@ -113,7 +113,7 @@ function MerchantOrDescriptionCell({merchantOrDescription, shouldShowTooltip, sh
                 text={localValue}
                 numberOfLines={1}
                 style={shouldUseNarrowLayout ? [styles.lh20, styles.pre, styles.justifyContentCenter, styles.flex1] : [styles.lineHeightXLarge]}
-                isCopyable
+                isSelectable
             />
         </EditableCell>
     );
diff --git a/src/components/TransactionItemRow/DataCells/TagCell.tsx b/src/components/TransactionItemRow/DataCells/TagCell.tsx
index 9e87bb6376ad..5e9f20b65823 100644
--- a/src/components/TransactionItemRow/DataCells/TagCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TagCell.tsx
@@ -58,7 +58,7 @@ function TagCell({canEdit, onSave, shouldUseNarrowLayout, shouldShowTooltip, tra
             text={tagForDisplay}
             numberOfLines={1}
             style={[styles.lineHeightLarge, styles.justifyContentCenter]}
-            isCopyable
+            isSelectable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/TaxCell.tsx b/src/components/TransactionItemRow/DataCells/TaxCell.tsx
index 037d785ffa47..2133500677b8 100644
--- a/src/components/TransactionItemRow/DataCells/TaxCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TaxCell.tsx
@@ -21,7 +21,7 @@ function TaxCell({transactionItem, shouldShowTooltip}: TransactionDataCellProps)
             shouldShowTooltip={shouldShowTooltip}
             text={convertToDisplayString(taxAmount, currency)}
             style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, styles.textAlignRight]}
-            isCopyable
+            isSelectable
         />
     );
 }
diff --git a/src/components/TransactionItemRow/DataCells/TotalCell.tsx b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
index 261d2e96da0b..a123e6f23183 100644
--- a/src/components/TransactionItemRow/DataCells/TotalCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
@@ -147,7 +147,7 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
             shouldShowTooltip={shouldShowTooltip}
             text={amountToDisplay}
             style={[styles.optionDisplayName, styles.justifyContentCenter, styles.flexShrink1, styles.textAlignRight]}
-            isCopyable
+            isSelectable
         />
     );
 
diff --git a/src/components/TransactionItemRow/DataCells/TypeCell.tsx b/src/components/TransactionItemRow/DataCells/TypeCell.tsx
index 8007151a554d..f1162f227e21 100644
--- a/src/components/TransactionItemRow/DataCells/TypeCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TypeCell.tsx
@@ -102,7 +102,7 @@ function TypeCell({transactionItem, shouldUseNarrowLayout, shouldShowTooltip}: T
             shouldShowTooltip={shouldShowTooltip}
             text={translate(typeText)}
             style={[styles.mutedNormalTextLabel, styles.pre, styles.justifyContentCenter, styles.flexShrink0]}
-            isCopyable
+            isSelectable
         />
     ) : (
         <Tooltip text={translate(getDetailedExpenseTypeTranslationKey(transactionItem, card))}>
diff --git a/src/components/UserPill.tsx b/src/components/UserPill.tsx
index e0042eac9639..df54fa5ebe63 100644
--- a/src/components/UserPill.tsx
+++ b/src/components/UserPill.tsx
@@ -23,10 +23,10 @@ type UserPillProps = {
     accountID?: number;
     email?: string;
     style?: StyleProp<ViewStyle>;
-    isCopyable?: boolean;
+    isSelectable?: boolean;
 };
 
-function UserPill({avatar, displayName, accountID, email, style, isCopyable = false}: UserPillProps) {
+function UserPill({avatar, displayName, accountID, email, style, isSelectable = false}: UserPillProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {formatPhoneNumber} = useLocalize();
@@ -45,8 +45,8 @@ function UserPill({avatar, displayName, accountID, email, style, isCopyable = fa
         >
             <View style={[styles.flexRow, styles.alignItemsCenter, styles.alignSelfStart, styles.userPill, shouldUseNarrowLayout && styles.mw100, style]}>
                 <View
-                    style={isCopyable && styles.userSelectNone}
-                    dataSet={isCopyable ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
+                    style={isSelectable && styles.userSelectNone}
+                    dataSet={isSelectable ? {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true} : undefined}
                 >
                     <UserAvatar
                         source={avatar}
@@ -57,8 +57,8 @@ function UserPill({avatar, displayName, accountID, email, style, isCopyable = fa
                 <Text
                     style={styles.userPillText}
                     numberOfLines={1}
-                    selectable={isCopyable || undefined}
-                    dataSet={isCopyable ? COPYABLE_TEXT_DATA_SET : undefined}
+                    selectable={isSelectable || undefined}
+                    dataSet={isSelectable ? COPYABLE_TEXT_DATA_SET : undefined}
                 >
                     {formattedDisplayName}
                 </Text>
diff --git a/src/components/UserPills.tsx b/src/components/UserPills.tsx
index b0ab6074cc05..c3faa654e815 100644
--- a/src/components/UserPills.tsx
+++ b/src/components/UserPills.tsx
@@ -24,7 +24,7 @@ type UserPillData = {
 type UserPillsProps = {
     users: UserPillData[];
     maxVisible?: number;
-    isCopyable?: boolean;
+    isSelectable?: boolean;
 } & (
     | {onShowAllPress?: undefined; showAllSentryLabel?: undefined}
     | {
@@ -37,7 +37,7 @@ type UserPillsProps = {
 
 const DEFAULT_MAX_VISIBLE = 6;
 
-function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, showAllSentryLabel, isCopyable = false}: UserPillsProps) {
+function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, showAllSentryLabel, isSelectable = false}: UserPillsProps) {
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber} = useLocalize();
 
@@ -63,7 +63,7 @@ function UserPills({users, maxVisible = DEFAULT_MAX_VISIBLE, onShowAllPress, sho
                         displayName={user.displayName}
                         accountID={user.accountID}
                         email={user.email}
-                        isCopyable={isCopyable}
+                        isSelectable={isSelectable}
                     />
                 );
             })}
diff --git a/tests/ui/components/AvatarWithTextCellTest.tsx b/tests/ui/components/AvatarWithTextCellTest.tsx
index d3bf429ce467..78fb289f379e 100644
--- a/tests/ui/components/AvatarWithTextCellTest.tsx
+++ b/tests/ui/components/AvatarWithTextCellTest.tsx
@@ -36,7 +36,7 @@ describe('AvatarWithTextCell', () => {
                 reportName="Shared chat"
                 icon={ICON}
                 isLargeScreenWidth
-                isCopyable
+                isSelectable
             />,
         );
 
diff --git a/tests/ui/components/TaskListItemSelectionTest.tsx b/tests/ui/components/TaskListItemSelectionTest.tsx
index 19a591c0e86a..82849277d5f9 100644
--- a/tests/ui/components/TaskListItemSelectionTest.tsx
+++ b/tests/ui/components/TaskListItemSelectionTest.tsx
@@ -88,9 +88,9 @@ describe('TaskListItem text selection', () => {
 
         // When the row is rendered, then its press handling allows native selection for each copyable value.
         expect(mockedListItemComposed).toHaveBeenCalledWith(expect.objectContaining({shouldAllowTextSelection: true}), undefined);
-        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review expense', isCopyable: true}), undefined);
-        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review the expense', isCopyable: true}), undefined);
-        expect(mockedAvatarWithTextCell).toHaveBeenCalledWith(expect.objectContaining({reportName: 'Shared chat', isCopyable: true}), undefined);
+        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review expense', isSelectable: true}), undefined);
+        expect(mockedTextWithTooltip).toHaveBeenCalledWith(expect.objectContaining({text: 'Review the expense', isSelectable: true}), undefined);
+        expect(mockedAvatarWithTextCell).toHaveBeenCalledWith(expect.objectContaining({reportName: 'Shared chat', isSelectable: true}), undefined);
     });
 
     it('excludes the compact assignee avatar from copied content', () => {

From a999a407640a66ce6e3c11b6a7cca72f55ff23bb Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Tue, 13 Oct 2026 19:41:09 -0400
Subject: [PATCH 600/781] Request 6h Rock cache sessions

Matches the role's maximum and the default 6h job timeout.
---
 .github/workflows/buildAndroid.yml         | 2 +-
 .github/workflows/buildIOS.yml             | 2 +-
 .github/workflows/remote-build-android.yml | 2 +-
 .github/workflows/remote-build-ios.yml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index 86c960c67b3d..6a50c5be23b5 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -158,7 +158,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
-          role-duration-seconds: 10800
+          role-duration-seconds: 21600
           aws-region: us-east-1
 
       - name: Rock Remote Build - Android
diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml
index 4276b2020ffb..327fe6a75434 100644
--- a/.github/workflows/buildIOS.yml
+++ b/.github/workflows/buildIOS.yml
@@ -239,7 +239,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
-          role-duration-seconds: 10800
+          role-duration-seconds: 21600
           aws-region: us-east-1
 
       - name: Prepare provisioning profiles JSON
diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml
index d48e77add8fa..34af4119761e 100644
--- a/.github/workflows/remote-build-android.yml
+++ b/.github/workflows/remote-build-android.yml
@@ -85,7 +85,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
-          role-duration-seconds: 10800
+          role-duration-seconds: 21600
           aws-region: us-east-1
 
       - name: Rock Remote Build - Android
diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 32083380cc47..1bd31521e7d8 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -97,7 +97,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
-          role-duration-seconds: 10800
+          role-duration-seconds: 21600
           aws-region: us-east-1
 
       - name: Rock Remote Build - iOS

From a88db7bea985cba42f0a93c003009f4cba469939 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 16:46:30 -0700
Subject: [PATCH 601/781] fix(support): preserve concierge feedback behavior

---
 .../inbox/report/actionContents/ConciergeFeedbackPrompt.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index c65269ae59c5..52f08a093c82 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -140,10 +140,12 @@ function ConciergeFeedbackPrompt({
 
     // Either rating starts the acknowledgement window, and the zero fallback keeps an unanswered survey undefined.
     const latestReactionTimestamp = Math.max(thumbsUpReactedAt ?? 0, thumbsDownReactedAt ?? 0) || undefined;
+    // Regular Concierge feedback keeps its existing thumbs-up-only acknowledgement, while surveys acknowledge either rating.
+    const acknowledgementTimestamp = shouldPersistAfterRating ? latestReactionTimestamp : thumbsUpReactedAt;
 
     // The reaction that was already there when this row mounted is an old rating, so only a reaction that lands while the row is open is acknowledged
-    const [mountedWithLatestReactionTimestamp] = useState(latestReactionTimestamp);
-    const hasJustReacted = latestReactionTimestamp !== undefined && latestReactionTimestamp !== mountedWithLatestReactionTimestamp;
+    const [mountedWithAcknowledgementTimestamp] = useState(acknowledgementTimestamp);
+    const hasJustReacted = acknowledgementTimestamp !== undefined && acknowledgementTimestamp !== mountedWithAcknowledgementTimestamp;
 
     // The debounced copy catches up once the window has passed, which is what takes the acknowledgement back down
     const hasSettledAfterReacting = useDebouncedValue(hasJustReacted, THANKS_VISIBLE_DURATION_MS);

From 3473126d9ac51e25b65d57b44e4efe3f01c1fd75 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 16:58:59 -0700
Subject: [PATCH 602/781] fix(support): keep survey rating options visible

---
 .../report/actionContents/ConciergeFeedbackPrompt.tsx      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index 52f08a093c82..ee39ff97a883 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -176,9 +176,6 @@ function ConciergeFeedbackPrompt({
         </View>
     );
 
-    const selectedEmoji = thumbsUpReactedAt ? thumbsUp : thumbsDown;
-    const selectedFeedbackThumb = getFeedbackThumb(selectedEmoji, true);
-
     // The acknowledgement comes from the reaction, so removing it from the reaction row brings the prompt back right away
     if (!shouldPersistAfterRating && isDisplayedThankMessage) {
         return <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('concierge.feedback.thanks')}</Text>;
@@ -190,9 +187,9 @@ function ConciergeFeedbackPrompt({
 
     if (shouldPersistAfterRating && hasRated) {
         return (
-            <View style={styles.flexRow}>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
                 {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
-                {selectedFeedbackThumb}
+                {feedbackThumbs}
             </View>
         );
     }

From 163708efad1838c764647e6380dddce5e25611b6 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 14 Oct 2026 02:03:06 +0200
Subject: [PATCH 603/781] Limit DotIndicatorMessage selection override to web

---
 src/components/DotIndicatorMessage.tsx        | 10 ++-
 .../ui/components/DotIndicatorMessageTest.tsx | 85 +++++++++++++++++++
 2 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 tests/ui/components/DotIndicatorMessageTest.tsx

diff --git a/src/components/DotIndicatorMessage.tsx b/src/components/DotIndicatorMessage.tsx
index 51f2946c6611..eb4a2bec6e91 100644
--- a/src/components/DotIndicatorMessage.tsx
+++ b/src/components/DotIndicatorMessage.tsx
@@ -8,6 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import {isReceiptError, isTranslationKeyError} from '@libs/ErrorUtils';
 import fileDownload from '@libs/fileDownload';
+import getPlatform from '@libs/getPlatform';
 
 import CONST from '@src/CONST';
 import type {TranslationKeyError} from '@src/types/onyx/OnyxCommon';
@@ -76,9 +77,12 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectab
     const isErrorMessage = type === 'error';
     const receiptError = uniqueMessages.find(isReceiptError);
 
-    const isTextSelectable = isSelectable ?? (!canUseTouchScreen() || !shouldUseNarrowLayout);
+    const isWeb = getPlatform() === CONST.PLATFORM.WEB;
+    const defaultTextSelectable = !canUseTouchScreen() || !shouldUseNarrowLayout;
+    const isTextSelectable = isWeb ? (isSelectable ?? defaultTextSelectable) : defaultTextSelectable;
+    const shouldDisableTextSelection = isWeb && isSelectable === false;
     const selectionDataSet = isTextSelectable ? undefined : {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true};
-    const receiptSelectionDataSet = isSelectable === false ? selectionDataSet : undefined;
+    const receiptSelectionDataSet = shouldDisableTextSelection ? selectionDataSet : undefined;
 
     const renderMessage = (message: string | ReceiptError | ReactElement, index: number) => {
         if (isReceiptError(message)) {
@@ -129,7 +133,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, isSelectab
         const messageRow = (
             <View style={[styles.dotIndicatorMessage, isStackedLayout && styles.alignItemsStart, styles.flex1]}>
                 <Text
-                    style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, styles.flex1, isSelectable === false && styles.userSelectNone]}
+                    style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, styles.flex1, shouldDisableTextSelection && styles.userSelectNone]}
                     accessibilityRole={isErrorMessage ? CONST.ROLE.ALERT : undefined}
                     accessibilityLiveRegion={isErrorMessage ? 'assertive' : undefined}
                 >
diff --git a/tests/ui/components/DotIndicatorMessageTest.tsx b/tests/ui/components/DotIndicatorMessageTest.tsx
new file mode 100644
index 000000000000..cf35f99881a9
--- /dev/null
+++ b/tests/ui/components/DotIndicatorMessageTest.tsx
@@ -0,0 +1,85 @@
+import {render, screen} from '@testing-library/react-native';
+
+import DotIndicatorMessage from '@components/DotIndicatorMessage';
+
+import type * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import {canUseTouchScreen} from '@libs/DeviceCapabilities';
+import getPlatform from '@libs/getPlatform';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+let mockShouldUseNarrowLayout = false;
+
+jest.mock('@components/Icon', () => jest.fn(() => null));
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: jest.fn(() => ({DotIndicator: () => null})),
+}));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useResponsiveLayout', () =>
+    jest.fn(() => ({
+        shouldUseNarrowLayout: mockShouldUseNarrowLayout,
+        isSmallScreenWidth: false,
+        isInNarrowPaneModal: false,
+    })),
+);
+jest.mock('@hooks/useStyleUtils', () => jest.fn(() => ({getDotIndicatorTextStyles: jest.fn(() => ({}))})));
+jest.mock('@hooks/useTheme', () => jest.fn(() => ({danger: '', success: '', text: ''})));
+jest.mock('@hooks/useThemeStyles', () =>
+    jest.fn(() => ({
+        userSelectText: {userSelect: 'text'},
+        userSelectNone: {userSelect: 'none'},
+        dotIndicatorMessage: {},
+        offlineFeedbackErrorDot: {},
+        offlineFeedbackTextContainer: {},
+    })),
+);
+jest.mock('@libs/DeviceCapabilities', () => ({
+    ...jest.requireActual<typeof DeviceCapabilities>('@libs/DeviceCapabilities'),
+    canUseTouchScreen: jest.fn(),
+}));
+jest.mock('@libs/getPlatform', () => jest.fn());
+
+const mockedCanUseTouchScreen = jest.mocked(canUseTouchScreen);
+const mockedGetPlatform = jest.mocked(getPlatform);
+const MESSAGE = 'Company card required';
+
+function renderMessage() {
+    return render(
+        <DotIndicatorMessage
+            messages={{error: MESSAGE}}
+            type="error"
+            isSelectable={false}
+        />,
+    );
+}
+
+describe('DotIndicatorMessage selection override', () => {
+    beforeEach(() => {
+        mockShouldUseNarrowLayout = false;
+        mockedCanUseTouchScreen.mockReturnValue(false);
+    });
+
+    it('disables text selection on web when explicitly requested', () => {
+        // Given a web layout whose default behavior allows text selection.
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+
+        // When the caller explicitly disables selection.
+        renderMessage();
+
+        // Then the web-specific override prevents text selection.
+        expect(screen.getByText(MESSAGE)).toHaveStyle({userSelect: 'none'});
+    });
+
+    it('preserves the default text selection behavior on native', () => {
+        // Given a native layout whose default behavior allows text selection.
+        mockedGetPlatform.mockReturnValue(CONST.PLATFORM.IOS);
+
+        // When the caller passes the web-specific selection override.
+        renderMessage();
+
+        // Then native ignores the override and keeps its existing selection behavior.
+        expect(screen.getByText(MESSAGE)).toHaveStyle({userSelect: 'text'});
+    });
+});

From 694df076ea8c5d7eac11659051b13da044c4d5e2 Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Wed, 14 Oct 2026 07:52:08 +0700
Subject: [PATCH 604/781] Drop unreachable fallback for required
 transactionsOfDeletableReportCollection

---
 src/libs/actions/MergeTransaction.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index a53bf0cc059f..e76d42f4e2a9 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -555,7 +555,7 @@ function mergeTransactionRequest({
         };
 
         const transactionToDelete = mergeTransaction.reportID === targetTransaction.reportID ? sourceTransaction : targetTransaction;
-        const transactionsOfDeletableReport = Object.values(transactionsOfDeletableReportCollection ?? {});
+        const transactionsOfDeletableReport = Object.values(transactionsOfDeletableReportCollection);
         const deletableReport = getReportOrDraftReport(transactionToDelete.reportID);
         const reportPreviewActionIDOfDeletableReport = deletableReport?.parentReportActionID;
         const optimisticReportDeletionData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> =

From 22b3b8c1242929e99bad9cfddca33bbe18815141 Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 14 Oct 2026 03:11:15 +0200
Subject: [PATCH 605/781] Fix deprecated MenuItem lint errors in selection
 tests

---
 .../components/MenuItem/MenuItemCopyTest.tsx  | 31 ++++++++++---------
 tests/ui/components/MenuItemTest.tsx          | 28 ++++++++---------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
index d8ec55fd11fd..957901c93c35 100644
--- a/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemCopyTest.tsx
@@ -102,22 +102,23 @@ function Row({isValueSelectable = false}: {isValueSelectable?: boolean}) {
 }
 
 function LegacyRow({isTitleSelectable = false}: {isTitleSelectable?: boolean}) {
-    return (
-        <LocaleContextProvider>
-            <MenuItem
-                title={VALUE}
-                description="Report"
-                copyValue={VALUE}
-                pressableTestID={ROW_TEST_ID}
-                interactive={false}
-                shouldShowRightIcon={false}
-                shouldRenderAsHTML
-                shouldBlockSelection
-                copyable
-                isTitleSelectable={isTitleSelectable}
-            />
-        </LocaleContextProvider>
+    const legacyMenuItem = (
+        // eslint-disable-next-line @typescript-eslint/no-deprecated -- This verifies backward-compatible selection behavior in the legacy MenuItem implementation.
+        <MenuItem
+            title={VALUE}
+            description="Report"
+            copyValue={VALUE}
+            pressableTestID={ROW_TEST_ID}
+            interactive={false}
+            shouldShowRightIcon={false}
+            shouldRenderAsHTML
+            shouldBlockSelection
+            copyable
+            isTitleSelectable={isTitleSelectable}
+        />
     );
+
+    return <LocaleContextProvider>{legacyMenuItem}</LocaleContextProvider>;
 }
 
 function mockCopyableTextHitTest(isPressStartOnCopyableText: (event: unknown) => boolean) {
diff --git a/tests/ui/components/MenuItemTest.tsx b/tests/ui/components/MenuItemTest.tsx
index b3343d88ecae..22eeefce6652 100644
--- a/tests/ui/components/MenuItemTest.tsx
+++ b/tests/ui/components/MenuItemTest.tsx
@@ -41,6 +41,17 @@ function Wrapper({children}: {children: React.ReactNode}) {
     return <LocaleContextProvider>{children}</LocaleContextProvider>;
 }
 
+function SelectableHTMLMenuItem({isTitleSelectable = false}: {isTitleSelectable?: boolean}) {
+    return (
+        // eslint-disable-next-line @typescript-eslint/no-deprecated -- This test file verifies behavior that remains supported by the legacy MenuItem implementation.
+        <MenuItem
+            title="<strong>Formatted description</strong>"
+            shouldRenderAsHTML
+            isTitleSelectable={isTitleSelectable}
+        />
+    );
+}
+
 describe('MenuItem', () => {
     beforeEach(() => {
         mockRenderHTML.mockClear();
@@ -53,11 +64,7 @@ describe('MenuItem', () => {
 
         render(
             <Wrapper>
-                <MenuItem
-                    title="<strong>Formatted description</strong>"
-                    shouldRenderAsHTML
-                    isTitleSelectable
-                />
+                <SelectableHTMLMenuItem isTitleSelectable />
             </Wrapper>,
         );
 
@@ -69,10 +76,7 @@ describe('MenuItem', () => {
 
         render(
             <Wrapper>
-                <MenuItem
-                    title="<strong>Formatted description</strong>"
-                    shouldRenderAsHTML
-                />
+                <SelectableHTMLMenuItem />
             </Wrapper>,
         );
 
@@ -82,11 +86,7 @@ describe('MenuItem', () => {
     it('does not override HTML title selection on native', () => {
         render(
             <Wrapper>
-                <MenuItem
-                    title="<strong>Formatted description</strong>"
-                    shouldRenderAsHTML
-                    isTitleSelectable
-                />
+                <SelectableHTMLMenuItem isTitleSelectable />
             </Wrapper>,
         );
 

From 8ac5bc239b648df3e194e568c1bcd24b65677e32 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 18:15:08 -0700
Subject: [PATCH 606/781] fix(support): restart survey acknowledgement timer

---
 .../report/actionContents/ConciergeFeedbackPrompt.tsx     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index ee39ff97a883..ffa5b4e2724a 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -145,11 +145,11 @@ function ConciergeFeedbackPrompt({
 
     // The reaction that was already there when this row mounted is an old rating, so only a reaction that lands while the row is open is acknowledged
     const [mountedWithAcknowledgementTimestamp] = useState(acknowledgementTimestamp);
-    const hasJustReacted = acknowledgementTimestamp !== undefined && acknowledgementTimestamp !== mountedWithAcknowledgementTimestamp;
 
-    // The debounced copy catches up once the window has passed, which is what takes the acknowledgement back down
-    const hasSettledAfterReacting = useDebouncedValue(hasJustReacted, THANKS_VISIBLE_DURATION_MS);
-    const isDisplayedThankMessage = hasJustReacted && !hasSettledAfterReacting;
+    // The debounced timestamp catches up once the window has passed, and a new reaction restarts that window.
+    const debouncedAcknowledgementTimestamp = useDebouncedValue(acknowledgementTimestamp, THANKS_VISIBLE_DURATION_MS);
+    const isDisplayedThankMessage =
+        acknowledgementTimestamp !== undefined && acknowledgementTimestamp !== mountedWithAcknowledgementTimestamp && acknowledgementTimestamp !== debouncedAcknowledgementTimestamp;
 
     const rate = (emoji: Emoji) => {
         // Skin tone is ignored on compare so a user whose preferred tone changed toggles their existing reaction instead of adding a second one

From 5559922d186185ff6c90bfa060650881912346cf Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 18:20:04 -0700
Subject: [PATCH 607/781] docs(app): clarify survey test wording

---
 tests/unit/OnyxDerived/visibleReportActionsTest.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/OnyxDerived/visibleReportActionsTest.ts b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
index 8af546c90fef..86af1538fc7d 100644
--- a/tests/unit/OnyxDerived/visibleReportActionsTest.ts
+++ b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
@@ -34,7 +34,7 @@ describe('visibleReportActions', () => {
     });
 
     it('hides a support survey when the ticket has been replaced', () => {
-        // Given a cached support survey that was visible before the replacement ticket arrived
+        // Given a support survey that was visible before the replacement ticket arrived
         const reportID = 'supportTicketReportID';
         const surveyActionID = 'surveyActionID';
         const reportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`;
@@ -69,7 +69,7 @@ describe('visibleReportActions', () => {
             triggeredKeys: new Set<OnyxKey>([ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]),
         });
 
-        // Then the shared visibility cache hides the stale survey
+        // Then the shared visibility state hides the stale survey
         expect(result[reportID]?.[surveyActionID]).toBe(false);
         expect(result[unrelatedReportID]?.[unrelatedActionID]).toBe(true);
     });

From 014eafbea646f3f5f9a41cdf81a0e817a42cae54 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 02:17:08 +0000
Subject: [PATCH 608/781] Let ArrowUp and pressing the search input clear the
 focused row on the workspace invite list

ArrowUp from the first row now moves to the search input instead of wrapping to the last row, and pressing the search input clears the highlighted row. With no highlighted row, Enter in the search input goes to the Next button instead of toggling a member.

Co-authored-by: huult <huult@users.noreply.github.com>
---
 .../BaseSelectionListWithSections.tsx         |  3 ++
 .../SelectionListWithSections/types.ts        |  6 +++
 .../SelectionList/components/TextInput.tsx    |  5 ++
 .../hooks/useSelectionListKeyboardFocus.ts    |  7 +++
 .../workspace/DynamicWorkspaceInvitePage.tsx  |  1 +
 .../SelectionListEnterConfirmGateTest.tsx     | 51 +++++++++++++++++++
 tests/unit/useArrowKeyFocusManagerTest.ts     | 35 +++++++++++++
 7 files changed, 108 insertions(+)

diff --git a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
index 5d360090ab17..6c993d361991 100644
--- a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -87,6 +87,7 @@ function BaseSelectionListWithSectionsImpl({
     shouldSingleExecuteRowSelect = false,
     shouldPreventDefaultFocusOnSelectRow = false,
     shouldPreventAutoScrollOnSelect = false,
+    shouldAllowArrowUpToSearchInput = false,
     titleNumberOfLines,
     shouldDisableHoverStyle,
     selectionButtonPosition,
@@ -123,6 +124,7 @@ function BaseSelectionListWithSectionsImpl({
         debouncedScrollToIndex,
         announceProgrammaticScroll: () => listRef.current?.announceProgrammaticScroll(),
         setShouldDisableHoverStyle,
+        shouldAllowArrowUpToSearchInput,
     });
 
     const {innerTextInputRef, isTextInputFocusedRef, focusTextInput, textInputKeyPress} = useSelectionListTextInput(setHasKeyBeenPressed);
@@ -268,6 +270,7 @@ function BaseSelectionListWithSectionsImpl({
                 accessibilityLabel={textInputOptions?.label}
                 options={textInputOptions}
                 onSubmit={selectFocusedItem}
+                onPress={shouldAllowArrowUpToSearchInput ? () => setFocusedIndex(-1) : undefined}
                 dataLength={itemsCount}
                 isLoading={isLoadingNewOptions}
                 onFocusChange={(v: boolean) => (isTextInputFocusedRef.current = v)}
diff --git a/src/components/SelectionList/SelectionListWithSections/types.ts b/src/components/SelectionList/SelectionListWithSections/types.ts
index f89012a01848..f522382b5f47 100644
--- a/src/components/SelectionList/SelectionListWithSections/types.ts
+++ b/src/components/SelectionList/SelectionListWithSections/types.ts
@@ -39,6 +39,12 @@ type SelectionListWithSectionsProps<TItem extends ListItem> = BaseSelectionListP
     /** Whether to prevent auto-scrolling to the first index when selecting an item in multi-select mode */
     shouldPreventAutoScrollOnSelect?: boolean;
 
+    /**
+     * Whether ArrowUp from the first row, or pressing the search input, clears the focused row so focus returns to the search input.
+     * With no focused row, plain Enter in the search input reaches the confirm button instead of toggling a row.
+     */
+    shouldAllowArrowUpToSearchInput?: boolean;
+
     /**
      * Passed straight to the underlying list. Defaults to `always`, which a list whose own text input drives its
      * rows needs: a row press has to land while that input still holds focus. A list whose rows are inputs of their
diff --git a/src/components/SelectionList/components/TextInput.tsx b/src/components/SelectionList/components/TextInput.tsx
index 39db41b44844..d6cf0864a713 100644
--- a/src/components/SelectionList/components/TextInput.tsx
+++ b/src/components/SelectionList/components/TextInput.tsx
@@ -38,6 +38,9 @@ type TextInputProps = {
     /** Callback function called when the text input is submitted */
     onSubmit?: () => void;
 
+    /** Callback function called when the text input is pressed */
+    onPress?: () => void;
+
     onKeyPress?: (event: TextInputKeyPressEvent) => void;
 
     /** Function called when the text input focus changes */
@@ -59,6 +62,7 @@ function TextInput({
     isLoading = false,
     dataLength,
     onSubmit,
+    onPress,
     onKeyPress,
     onFocusChange,
     shouldShowLoadingPlaceholder,
@@ -170,6 +174,7 @@ function TextInput({
                     selectTextOnFocus
                     spellCheck={false}
                     onSubmitEditing={onSubmit}
+                    onPress={onPress}
                     submitBehavior={dataLength ? 'blurAndSubmit' : 'submit'}
                     isLoading={isLoading}
                     shouldHideClearButton={false}
diff --git a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
index 176ed6162cba..4212d475e512 100644
--- a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
+++ b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
@@ -20,6 +20,9 @@ type UseSelectionListKeyboardFocusParams = {
     debouncedScrollToIndex: ScrollToIndex;
     announceProgrammaticScroll: () => void;
     setShouldDisableHoverStyle: (shouldDisableHoverStyle: boolean) => void;
+
+    /** Whether ArrowUp from the first row moves to index -1 (the search input) instead of wrapping to the last row */
+    shouldAllowArrowUpToSearchInput?: boolean;
 };
 
 type UseSelectionListKeyboardFocusResult = {
@@ -42,6 +45,7 @@ function useSelectionListKeyboardFocus({
     debouncedScrollToIndex,
     announceProgrammaticScroll,
     setShouldDisableHoverStyle,
+    shouldAllowArrowUpToSearchInput = false,
 }: UseSelectionListKeyboardFocusParams): UseSelectionListKeyboardFocusResult {
     const hasKeyBeenPressed = useRef(false);
     const [isKeyboardNavigating, setIsKeyboardNavigating] = useState(false);
@@ -80,6 +84,9 @@ function useSelectionListKeyboardFocus({
         },
         setHasKeyBeenPressed,
         isFocused,
+        // Negative indexes let ArrowUp break out past a disabled section header at index 0
+        disableCyclicTraversal: shouldAllowArrowUpToSearchInput,
+        allowNegativeIndexes: shouldAllowArrowUpToSearchInput,
         onArrowUpDownCallback: () => {
             setShouldDisableHoverStyle(true);
             announceProgrammaticScroll();
diff --git a/src/pages/workspace/DynamicWorkspaceInvitePage.tsx b/src/pages/workspace/DynamicWorkspaceInvitePage.tsx
index 2d04d942b0ac..bfd1449dc5c3 100644
--- a/src/pages/workspace/DynamicWorkspaceInvitePage.tsx
+++ b/src/pages/workspace/DynamicWorkspaceInvitePage.tsx
@@ -278,6 +278,7 @@ function DynamicWorkspaceInvitePageContent({route, policy, invitedEmailsToAccoun
                     textInputOptions={textInputOptions}
                     shouldUpdateFocusedIndex
                     shouldPreventAutoScrollOnSelect
+                    shouldAllowArrowUpToSearchInput
                     confirmButtonOptions={{
                         onConfirm: inviteUser,
                         isDisabled: !selectedOptions.length,
diff --git a/tests/unit/SelectionListEnterConfirmGateTest.tsx b/tests/unit/SelectionListEnterConfirmGateTest.tsx
index d96521425426..b5954dbb0a3b 100644
--- a/tests/unit/SelectionListEnterConfirmGateTest.tsx
+++ b/tests/unit/SelectionListEnterConfirmGateTest.tsx
@@ -262,3 +262,54 @@ describe.each([
         expect(getGatedFocusedIndex()).toBeGreaterThanOrEqual(0);
     });
 });
+
+describe('BaseSelectionListWithSections search input press', () => {
+    beforeEach(() => {
+        mockUseSelectionListShortcuts.mockClear();
+        jest.mocked(NativeNavigation.useIsFocused).mockReturnValue(true);
+    });
+
+    function renderInviteLikeList(shouldAllowArrowUpToSearchInput: boolean) {
+        return render(
+            <OnyxListItemProvider>
+                <BaseSelectionListWithSections
+                    sections={[{data: mouseSelectedItems, sectionIndex: 0}]}
+                    ListItem={MultiSelectListItem}
+                    onSelectRow={jest.fn()}
+                    canSelectMultiple
+                    initiallyFocusedItemKey="0"
+                    shouldShowTextInput
+                    textInputOptions={{label: 'common.search', value: '', onChangeText: jest.fn()}}
+                    confirmButtonOptions={{onConfirm: jest.fn()}}
+                    footerContent={footerContent}
+                    shouldAllowArrowUpToSearchInput={shouldAllowArrowUpToSearchInput}
+                />
+            </OnyxListItemProvider>,
+        );
+    }
+
+    it('clears the focused row when the search input is pressed, so plain Enter reaches the confirm button again', () => {
+        // Given the invite list after keyboard navigation, where Enter would toggle the focused row
+        renderInviteLikeList(true);
+        fireEvent(screen.getByTestId('selection-list-text-input'), 'keyPress', {nativeEvent: {key: 'Tab'}});
+        expect(getGatedFocusedIndex()).toBeGreaterThanOrEqual(0);
+
+        // When the user presses the search input with the mouse
+        fireEvent.press(screen.getByTestId('selection-list-text-input'));
+
+        // Then no row is focused, so Enter in the search input goes to the confirm button
+        expect(getGatedFocusedIndex()).toBe(-1);
+    });
+
+    it('keeps the focused row when the search input is pressed and the list does not opt in', () => {
+        // Given a list that has not opted in, after keyboard navigation
+        renderInviteLikeList(false);
+        fireEvent(screen.getByTestId('selection-list-text-input'), 'keyPress', {nativeEvent: {key: 'Tab'}});
+
+        // When the user presses the search input
+        fireEvent.press(screen.getByTestId('selection-list-text-input'));
+
+        // Then the focused row still owns Enter, preserving existing behavior for other lists
+        expect(getGatedFocusedIndex()).toBeGreaterThanOrEqual(0);
+    });
+});
diff --git a/tests/unit/useArrowKeyFocusManagerTest.ts b/tests/unit/useArrowKeyFocusManagerTest.ts
index ecd2d989a32f..c4e75c13a550 100644
--- a/tests/unit/useArrowKeyFocusManagerTest.ts
+++ b/tests/unit/useArrowKeyFocusManagerTest.ts
@@ -20,6 +20,15 @@ function pressArrowDown() {
     });
 }
 
+function pressArrowUp() {
+    act(() => {
+        if (!shortcuts.ArrowUp?.isActive) {
+            return;
+        }
+        shortcuts.ArrowUp.callback();
+    });
+}
+
 describe('useArrowKeyFocusManager', () => {
     afterEach(() => {
         for (const key of Object.keys(shortcuts)) {
@@ -174,4 +183,30 @@ describe('useArrowKeyFocusManager', () => {
 
         expect(onFocusedIndexChange).toHaveBeenCalledTimes(1);
     });
+
+    it('moves ArrowUp past a disabled header at index 0 to -1 when cyclic traversal is off and negative indexes are allowed', () => {
+        // Given a sectioned list (header at index 0) that lets ArrowUp leave the list for the search input
+        const {result} = renderHook(() =>
+            useArrowKeyFocusManager({
+                maxIndex: 3,
+                initialFocusedIndex: 1,
+                disabledIndexes: [0],
+                disableCyclicTraversal: true,
+                allowNegativeIndexes: true,
+                isActive: true,
+            }),
+        );
+
+        // When ArrowUp is pressed on the first row
+        pressArrowUp();
+
+        // Then focus leaves the rows instead of wrapping to the last row
+        expect(result.current[0]).toBe(-1);
+
+        // When ArrowDown is pressed from the search input
+        pressArrowDown();
+
+        // Then focus returns to the first row, skipping the header
+        expect(result.current[0]).toBe(1);
+    });
 });

From 9268036cdcdfe40e8841828d3c3ffbd16e0dfc6f Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:50:16 +0530
Subject: [PATCH 609/781] let the share code route show only the QR code

---
 src/ROUTES.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ec209e089488..8dba378b951d 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -1583,6 +1583,8 @@ const DYNAMIC_ROUTES = {
             SCREENS.SEARCH.ROOT,
             SCREENS.REPORT_DETAILS.DYNAMIC_ROOT,
         ],
+        getRoute: (shouldShowQRCodeOnly?: boolean) => getUrlWithParams('share-code', {shouldShowQRCodeOnly: shouldShowQRCodeOnly ? 'true' : undefined}),
+        queryParams: ['shouldShowQRCodeOnly'],
     },
     REFERRAL_DETAILS: {
         path: 'referral/:contentType',

From 2f31ee074b7867161b69636ffa7677df92fe07e1 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:50:19 +0530
Subject: [PATCH 610/781] add shouldShowQRCodeOnly to the share code params

---
 src/libs/Navigation/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 687fb00d9697..dc907a06eb84 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -2285,6 +2285,7 @@ type ReportDetailsNavigatorParamList = {
     };
     [SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_CODE]: {
         reportID: string;
+        shouldShowQRCodeOnly?: string;
     };
     [SCREENS.REPORT_DETAILS.DYNAMIC_EXPORT]: {
         reportID: string;

From a6f7e36f6f53ccac8ea4b6445137a37448a628dd Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:50:20 +0530
Subject: [PATCH 611/781] hide the rows under the QR code when asked

---
 src/pages/ShareCodePage.tsx | 75 ++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/pages/ShareCodePage.tsx b/src/pages/ShareCodePage.tsx
index da1ab57c8f81..5e7fb738b008 100644
--- a/src/pages/ShareCodePage.tsx
+++ b/src/pages/ShareCodePage.tsx
@@ -58,6 +58,9 @@ type ShareCodePageOnyxProps = {
 
     /** The policy for the report currently being looked at */
     policy?: OnyxEntry<Policy>;
+
+    /** Whether to show only the QR code, without the rows under it */
+    shouldShowQRCodeOnly?: boolean;
 };
 
 type ShareCodePageProps = ShareCodePageOnyxProps & BackToParams;
@@ -98,7 +101,7 @@ function createAvatarQRLogo(LocalAvatarLogo: React.FC<SvgProps>): React.FC<SvgPr
     return AvatarQRLogo;
 }
 
-function ShareCodePage({report, policy, backTo}: ShareCodePageProps) {
+function ShareCodePage({report, policy, backTo, shouldShowQRCodeOnly = false}: ShareCodePageProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Cash', 'Checkmark', 'Copy', 'Download', 'FallbackAvatar']);
     const themeStyles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -212,40 +215,42 @@ function ShareCodePage({report, policy, backTo}: ShareCodePageProps) {
                     />
                 </View>
 
-                <View style={themeStyles.mt9}>
-                    <ContextMenuItem
-                        isAnonymousAction
-                        text={translate('qrCodes.copy')}
-                        icon={icons.Copy}
-                        successIcon={icons.Checkmark}
-                        successText={translate('qrCodes.copied')}
-                        onPress={() => Clipboard.setString(url)}
-                        shouldLimitWidth={false}
-                    />
-                    {/* Remove this platform specific condition once https://github.com/Expensify/App/issues/19834 is done.
-                    We shouldn't introduce platform specific code in our codebase.
-                    This is a temporary solution while Web is not supported for the QR code download feature */}
-                    {shouldAllowDownloadQRCode && (
-                        <MenuItem.Root onPress={() => qrCodeRef.current?.download?.()}>
-                            <MenuItem.Row>
-                                <MenuItem.Leading>
-                                    <MenuItem.Icon src={icons.Download} />
-                                </MenuItem.Leading>
-                                <MenuItem.Content>
-                                    <MenuItem.Title>{translate('common.download')}</MenuItem.Title>
-                                </MenuItem.Content>
-                            </MenuItem.Row>
-                        </MenuItem.Root>
-                    )}
-
-                    <MenuItemNavigation
-                        title={translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE}.buttonText`)}
-                        icon={icons.Cash}
-                        onPress={() => {
-                            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REFERRAL_DETAILS.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE)));
-                        }}
-                    />
-                </View>
+                {!shouldShowQRCodeOnly && (
+                    <View style={themeStyles.mt9}>
+                        <ContextMenuItem
+                            isAnonymousAction
+                            text={translate('qrCodes.copy')}
+                            icon={icons.Copy}
+                            successIcon={icons.Checkmark}
+                            successText={translate('qrCodes.copied')}
+                            onPress={() => Clipboard.setString(url)}
+                            shouldLimitWidth={false}
+                        />
+                        {/* Remove this platform specific condition once https://github.com/Expensify/App/issues/19834 is done.
+                        We shouldn't introduce platform specific code in our codebase.
+                        This is a temporary solution while Web is not supported for the QR code download feature */}
+                        {shouldAllowDownloadQRCode && (
+                            <MenuItem.Root onPress={() => qrCodeRef.current?.download?.()}>
+                                <MenuItem.Row>
+                                    <MenuItem.Leading>
+                                        <MenuItem.Icon src={icons.Download} />
+                                    </MenuItem.Leading>
+                                    <MenuItem.Content>
+                                        <MenuItem.Title>{translate('common.download')}</MenuItem.Title>
+                                    </MenuItem.Content>
+                                </MenuItem.Row>
+                            </MenuItem.Root>
+                        )}
+
+                        <MenuItemNavigation
+                            title={translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE}.buttonText`)}
+                            icon={icons.Cash}
+                            onPress={() => {
+                                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REFERRAL_DETAILS.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE)));
+                            }}
+                        />
+                    </View>
+                )}
             </ScrollView>
         </ScreenWrapper>
     );

From 7a3a1a38dbbf55ae4b9d71753bc0f53b83e891cd Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:50:36 +0530
Subject: [PATCH 612/781] pass shouldShowQRCodeOnly to the share code page

---
 src/pages/inbox/report/DynamicReportDetailsShareCodePage.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/inbox/report/DynamicReportDetailsShareCodePage.tsx b/src/pages/inbox/report/DynamicReportDetailsShareCodePage.tsx
index 11c5d7b12c95..f77da2477a38 100644
--- a/src/pages/inbox/report/DynamicReportDetailsShareCodePage.tsx
+++ b/src/pages/inbox/report/DynamicReportDetailsShareCodePage.tsx
@@ -18,7 +18,7 @@ import withReportOrNotFound from './withReportOrNotFound';
 
 type DynamicReportDetailsShareCodePageProps = WithReportOrNotFoundProps & PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_SHARE_CODE>;
 
-function DynamicReportDetailsShareCodePage({report, policy}: DynamicReportDetailsShareCodePageProps) {
+function DynamicReportDetailsShareCodePage({report, policy, route}: DynamicReportDetailsShareCodePageProps) {
     const navigateBackRoute = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.path);
 
     if (isSelfDM(report)) {
@@ -30,6 +30,7 @@ function DynamicReportDetailsShareCodePage({report, policy}: DynamicReportDetail
             backTo={navigateBackRoute}
             report={report}
             policy={policy}
+            shouldShowQRCodeOnly={route.params?.shouldShowQRCodeOnly === 'true'}
         />
     );
 }

From e8abfb6f4dbac81a867fe4a9bea09ad317059d10 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:50:37 +0530
Subject: [PATCH 613/781] open share code with only the QR code from the share
 menu

---
 src/hooks/useShareActions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useShareActions.ts b/src/hooks/useShareActions.ts
index d6ba794730ca..1781f7c85b8f 100644
--- a/src/hooks/useShareActions.ts
+++ b/src/hooks/useShareActions.ts
@@ -45,7 +45,7 @@ function useShareActions({reportID, policy}: UseShareActionsParams): UseShareAct
             text: translate('common.shareCode'),
             icon: expensifyIcons.QrCode,
             sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.SHARE_CODE,
-            onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.path)),
+            onSelected: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_CODE.getRoute(true))),
         },
         {
             text: translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND}.header`),

From 41198bfd1827f90f7a45a366ad0ce9276acc5291 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:51:09 +0530
Subject: [PATCH 614/781] test share code opens with only the QR code

---
 tests/unit/hooks/useShareActionsTest.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/unit/hooks/useShareActionsTest.ts b/tests/unit/hooks/useShareActionsTest.ts
index 2e6fe9647776..d92ded15706d 100644
--- a/tests/unit/hooks/useShareActionsTest.ts
+++ b/tests/unit/hooks/useShareActionsTest.ts
@@ -119,6 +119,17 @@ describe('useShareActions', () => {
         expect(Navigation.navigate).toHaveBeenCalledWith(DYNAMIC_ROUTES.REPORT_DETAILS_SHARE_REPORT.path);
     });
 
+    it('opens share code with only the QR code', () => {
+        // Given the share options of a report
+        const options = getShareOptions();
+
+        // When share code is selected
+        options.at(1)?.onSelected?.();
+
+        // Then the share code page opens without the copy and referral rows the share menu already has
+        expect(Navigation.navigate).toHaveBeenCalledWith('share-code?shouldShowQRCodeOnly=true');
+    });
+
     it('copies the report URL', () => {
         // Given the share options of a report
         const options = getShareOptions();

From 125ca02caed859fca7ddb4691e2fb5d0dfc21efe Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 14 Oct 2026 10:21:21 +0700
Subject: [PATCH 615/781] Update main's Spend footer tests for the merchant
 contains operator

---
 tests/unit/Search/SearchQueryUtilsTest.ts | 3 ++-
 tests/unit/SearchParserTest.ts            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index f856517af60a..f94025165124 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2791,7 +2791,8 @@ describe('SearchQueryUtils', () => {
             // Captured before the footer keys existed. These hashes key saved searches and snapshots, so they must not drift.
             expect(buildSearchQueryJSON('type:expense')?.hash).toEqual(959171759);
             expect(buildSearchQueryJSON('type:expense-report')?.hash).toEqual(1657503970);
-            expect(buildSearchQueryJSON('type:expense merchant:Amazon')?.hash).toEqual(1692688529);
+            // `merchant:` parses as contains and hashes as `merchant*:`, so this hash differs from the one before the match type existed.
+            expect(buildSearchQueryJSON('type:expense merchant:Amazon')?.hash).toEqual(1712664595);
         });
     });
 
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index 5b3f0ed2e5cc..96b4cdc35431 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1711,7 +1711,7 @@ const footerSelectionTests = [
                     right: 'USD',
                 },
                 right: {
-                    operator: 'eq',
+                    operator: 'contains',
                     left: 'merchant',
                     right: 'Amazon',
                 },

From e0450911e0ead96cc8697377079d1d98d2871e96 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:51:48 +0530
Subject: [PATCH 616/781] test the share code page with only the QR code

---
 tests/unit/ShareCodePageTranslateTest.tsx | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/unit/ShareCodePageTranslateTest.tsx b/tests/unit/ShareCodePageTranslateTest.tsx
index 94d9f446909c..07299510fa6c 100644
--- a/tests/unit/ShareCodePageTranslateTest.tsx
+++ b/tests/unit/ShareCodePageTranslateTest.tsx
@@ -1,5 +1,6 @@
 import {render} from '@testing-library/react-native';
 
+import ContextMenuItem from '@components/ContextMenuItem';
 import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import QRShareWithDownload from '@components/QRShare/QRShareWithDownload';
@@ -54,6 +55,7 @@ jest.mock('@libs/ReportUtils', () => {
 const mockGetDisplayNameForParticipant = jest.mocked(getDisplayNameForParticipant);
 const mockFindLocalAvatarForURL = jest.mocked(findLocalAvatarForURL);
 const mockQRShareWithDownload = jest.mocked(QRShareWithDownload);
+const mockContextMenuItem = jest.mocked(ContextMenuItem);
 
 const PARTICIPANT_A = 717001;
 const PARTICIPANT_B = 717002;
@@ -90,6 +92,34 @@ describe('ShareCodePage', () => {
         expect(mockGetDisplayNameForParticipant).toHaveBeenCalledWith(expect.objectContaining({hiddenTranslation: 'common.hidden'}));
     });
 
+    it('hides the rows under the QR code when only the QR code is asked for', async () => {
+        // Given a report, whose share code page normally lists Copy URL under the QR code
+        const report: Report = {reportID: '717200', type: CONST.REPORT.TYPE.EXPENSE};
+        mockContextMenuItem.mockClear();
+        render(
+            <OnyxListItemProvider>
+                <ShareCodePage report={report} />
+            </OnyxListItemProvider>,
+        );
+        await waitForBatchedUpdates();
+        expect(mockContextMenuItem).toHaveBeenCalled();
+
+        // When the page opens from the Share menu, which already has Copy URL and Refer a friend
+        mockContextMenuItem.mockClear();
+        render(
+            <OnyxListItemProvider>
+                <ShareCodePage
+                    report={report}
+                    shouldShowQRCodeOnly
+                />
+            </OnyxListItemProvider>,
+        );
+        await waitForBatchedUpdates();
+
+        // Then only the QR code shows
+        expect(mockContextMenuItem).not.toHaveBeenCalled();
+    });
+
     describe('profile QR code avatar logo', () => {
         it('wraps catalog-backed avatars in an SVG logo that only forwards an explicitly set fill', async () => {
             const localAvatar: React.FC<SvgProps> = jest.fn(() => null);

From 4e48cfb53f40dcaf8e58dedde12929e294df6f5d Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:56:23 +0530
Subject: [PATCH 617/781] keep the display name whisper after reacting to it

---
 src/libs/ReportActionsUtils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index e1c7a05acba0..72fd4507f0e7 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -463,6 +463,7 @@ function isDeletedAction(reportAction: OnyxInputOrEntry<ReportAction | Optimisti
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED_REPORT_FOR_UNAPPROVED_TRANSACTIONS ||
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER ||
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES ||
+        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE_DISPLAY_NAME ||
         isCardIssuedAction(reportAction) ||
         isPolicyCopyReportAction(reportAction)
     ) {

From 937f7b7de4b09ea3625b809d0a44c3de32c4ff6a Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 14 Oct 2026 08:56:24 +0530
Subject: [PATCH 618/781] add a test for the display name whisper with an empty
 message

---
 tests/unit/ReportActionsUtilsTest.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 3cc99fa60b54..daf8cbd2ccb3 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -2157,6 +2157,23 @@ describe('ReportActionsUtils', () => {
             expect(ReportActionsUtils.isDeletedAction(reportAction)).toBe(false);
         });
 
+        it('should return false for POLICY_CHANGE_LOG.UPDATE_EMPLOYEE_DISPLAY_NAME action with an empty message html', () => {
+            // Given the display name whisper as the backend sends it after a reaction, with an empty message html
+            const reportAction: ReportAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE_DISPLAY_NAME,
+                reportActionID: '1',
+                created: '2026-10-13 12:00:03.573',
+                message: [{html: '', text: '', type: CONST.REPORT.MESSAGE.TYPE.COMMENT, whisperedTo: [590]}],
+                originalMessage: {oldValue: 'cathy@boulderdev.com', newValue: 'Cathy Miller', whisperedTo: [590]},
+            };
+
+            // When checking whether it is deleted
+            const isDeleted = ReportActionsUtils.isDeletedAction(reportAction);
+
+            // Then it is not, because its text comes from originalMessage
+            expect(isDeleted).toBe(false);
+        });
+
         it('should return false for CARDFROZEN action with a backend-provided message fragment', () => {
             const reportAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CARD_FROZEN> = {
                 actionName: CONST.REPORT.ACTIONS.TYPE.CARD_FROZEN,

From c30a0625d080a00f912bb836403aa17e7c3582b3 Mon Sep 17 00:00:00 2001
From: "Kevin Brian Bader (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 04:07:02 +0000
Subject: [PATCH 619/781] Add useMergeTransactions test for a snapshot that has
 no data yet

Co-authored-by: Kevin Brian Bader <ikevin127@users.noreply.github.com>
---
 tests/unit/hooks/useMergeTransactionsTest.ts | 59 ++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 tests/unit/hooks/useMergeTransactionsTest.ts

diff --git a/tests/unit/hooks/useMergeTransactionsTest.ts b/tests/unit/hooks/useMergeTransactionsTest.ts
new file mode 100644
index 000000000000..b5fc82f4d9d0
--- /dev/null
+++ b/tests/unit/hooks/useMergeTransactionsTest.ts
@@ -0,0 +1,59 @@
+import {renderHook, waitFor} from '@testing-library/react-native';
+
+import useMergeTransactions from '@hooks/useMergeTransactions';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {MergeTransaction, SearchResults} from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+import createRandomTransaction from '../../utils/collections/transaction';
+import createMock from '../../utils/createMock';
+
+let mockCurrentSearchResults: SearchResults | undefined;
+
+jest.mock('@components/Search/SearchContext', () => ({
+    useSearchQueryContext: () => ({
+        currentSearchHash: 12345,
+    }),
+    useSearchResultsContext: () => ({
+        currentSearchResults: mockCurrentSearchResults,
+    }),
+}));
+
+jest.mock('@hooks/usePolicyForMovingExpenses', () => ({
+    __esModule: true,
+    default: () => ({policyForMovingExpensesID: undefined}),
+}));
+
+describe('useMergeTransactions', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        mockCurrentSearchResults = undefined;
+    });
+
+    it('falls back to the Onyx transactions while the search snapshot has no data yet', async () => {
+        // Given a merge started from search while the new search's snapshot only has `search` (optimistic loading state),
+        // with transactions that exist in Onyx but not in the merge draft, so the hook looks them up in the snapshot first
+        mockCurrentSearchResults = createMock<SearchResults>({search: {type: CONST.SEARCH.DATA_TYPES.EXPENSE}});
+        const onyxTransaction1 = createRandomTransaction(1);
+        const onyxTransaction2 = createRandomTransaction(2);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, onyxTransaction1);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}2`, onyxTransaction2);
+        const mergeTransaction = createMock<MergeTransaction>({targetTransactionID: '1', sourceTransactionID: '2'});
+
+        // When the hook resolves the target and source transactions
+        const {result} = renderHook(() => useMergeTransactions({mergeTransaction}));
+
+        // Then it falls back to the Onyx transactions instead of throwing on the missing snapshot data
+        await waitFor(() => {
+            expect(result.current.targetTransaction).toEqual(onyxTransaction1);
+            expect(result.current.sourceTransaction).toEqual(onyxTransaction2);
+        });
+    });
+});

From 83b05f4f61011aa575552bc44e31d73168b733c9 Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 04:34:43 +0000
Subject: [PATCH 620/781] Move PolicyUtils rules, feature, workflow, and error
 helpers into rules.ts, features.ts, workflows.ts, and errors.ts

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 src/libs/PolicyUtils/errors.ts    | 144 ++++++++++
 src/libs/PolicyUtils/features.ts  | 106 +++++++
 src/libs/PolicyUtils/index.ts     | 448 +-----------------------------
 src/libs/PolicyUtils/rules.ts     | 147 ++++++++++
 src/libs/PolicyUtils/workflows.ts |  73 +++++
 5 files changed, 482 insertions(+), 436 deletions(-)
 create mode 100644 src/libs/PolicyUtils/errors.ts
 create mode 100644 src/libs/PolicyUtils/features.ts
 create mode 100644 src/libs/PolicyUtils/rules.ts
 create mode 100644 src/libs/PolicyUtils/workflows.ts

diff --git a/src/libs/PolicyUtils/errors.ts b/src/libs/PolicyUtils/errors.ts
new file mode 100644
index 000000000000..19eb0be7e415
--- /dev/null
+++ b/src/libs/PolicyUtils/errors.ts
@@ -0,0 +1,144 @@
+/**
+ * Policy error flags, the brick-road indicator, and settings error and pending-action helpers.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import {isQBORefreshTokenExpiringSoon} from '@libs/AccountingUtils';
+import {hasSynchronizationErrorMessage} from '@libs/actions/connections';
+import {shouldShowQBOReimbursableExportDestinationAccountError} from '@libs/actions/connections/QuickbooksOnline';
+import {isMergeHRCompleteSetupNeeded, shouldShowHRConnectionError} from '@libs/merge/HRUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, PolicyCategories} from '@src/types/onyx';
+import type {ErrorFields, PendingAction, PendingFields} from '@src/types/onyx/OnyxCommon';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {getAccountingConnectionNames} from './connections';
+import {isPolicyAdmin} from './permissions';
+
+/**
+ * Checks if we have any errors stored within the policy?.employeeList. Determines whether we should show a red brick road error or not.
+ */
+function shouldShowEmployeeListError(policy: OnyxEntry<Policy>): boolean {
+    return isPolicyAdmin(policy) && Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
+}
+
+/**
+ *  Check if the policy has any tax rate errors.
+ */
+function shouldShowTaxRateError(policy: OnyxEntry<Policy>): boolean {
+    return (
+        isPolicyAdmin(policy) &&
+        Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0 || Object.values(taxRate?.errorFields ?? {}).some(Boolean))
+    );
+}
+
+/**
+ * Check if the policy has any errors within the categories.
+ */
+function hasPolicyCategoriesError(policyCategories: OnyxEntry<PolicyCategories>): boolean {
+    return Object.keys(policyCategories ?? {}).some((categoryName) => Object.keys(policyCategories?.[categoryName]?.errors ?? {}).length > 0);
+}
+
+/**
+ * Check if the policy has any errors within the rules.
+ */
+function hasPolicyRulesError(policy: OnyxEntry<Policy>, hasMerchantRuleErrors: boolean): boolean {
+    const agentRules = Object.values(policy?.rules?.agentRules ?? {});
+
+    return hasMerchantRuleErrors || agentRules.some((rule) => rule && Object.keys(rule.errors ?? {}).length > 0);
+}
+
+/**
+ * Checks if the policy had a sync error.
+ */
+function shouldShowSyncError(policy: OnyxEntry<Policy>, isSyncInProgress: boolean, connectionNames?: readonly ConnectionName[]): boolean {
+    const connectionsToCheck = connectionNames ?? (Object.keys(policy?.connections ?? {}) as ConnectionName[]);
+    return isPolicyAdmin(policy) && connectionsToCheck.some((connection) => !!hasSynchronizationErrorMessage(policy, connection, isSyncInProgress));
+}
+
+/**
+ * Check if the policy has any error fields.
+ */
+function shouldShowPolicyErrorFields(policy: OnyxEntry<Policy>): boolean {
+    return isPolicyAdmin(policy) && Object.values(policy?.errorFields ?? {}).some((fieldErrors) => Object.keys(fieldErrors ?? {}).length > 0);
+}
+
+/**
+ * Check if the policy has any errors, and if it doesn't, then check if it has any error fields.
+ */
+function shouldShowPolicyError(policy: OnyxEntry<Policy>): boolean {
+    return Object.keys(policy?.errors ?? {}).length > 0 ? isPolicyAdmin(policy) : shouldShowPolicyErrorFields(policy);
+}
+
+/**
+ * Checks if we have any errors stored within the policy custom units.
+ */
+function shouldShowCustomUnitsError(policy: OnyxEntry<Policy>): boolean {
+    return isPolicyAdmin(policy) && Object.keys(policy?.customUnits?.errors ?? {}).length > 0;
+}
+
+/**
+ * Get the brick road indicator status for a policy. The policy has an error status if there is a policy member error, a custom unit error or a field error.
+ */
+function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>, isConnectionInProgress: boolean): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
+    if (
+        shouldShowEmployeeListError(policy) ||
+        shouldShowCustomUnitsError(policy) ||
+        shouldShowPolicyErrorFields(policy) ||
+        shouldShowSyncError(policy, isConnectionInProgress, getAccountingConnectionNames()) ||
+        shouldShowQBOReimbursableExportDestinationAccountError(policy) ||
+        shouldShowHRConnectionError(policy, isConnectionInProgress, isPolicyAdmin(policy))
+    ) {
+        return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+    }
+    return undefined;
+}
+
+/**
+ * Returns whether the Merge HR setup still needs to be completed for a policy.
+ */
+const isMergeHRCompleteSetupNeededSelector = (policy: OnyxEntry<Policy>) => isMergeHRCompleteSetupNeeded(policy);
+
+/**
+ * Returns whether an admin should be warned that the workspace's QuickBooks Online connection is about to expire.
+ */
+const isQBORefreshTokenExpiringSoonSelector = (policy: OnyxEntry<Policy>) => isPolicyAdmin(policy) && isQBORefreshTokenExpiringSoon(policy);
+
+function areSettingsInErrorFields(settings?: string[], errorFields?: ErrorFields) {
+    if (settings === undefined || errorFields === undefined) {
+        return false;
+    }
+
+    const keys = Object.keys(errorFields);
+    return settings.some((setting) => keys.includes(setting));
+}
+
+function settingsPendingAction(settings?: string[], pendingFields?: PendingFields<string>): PendingAction | undefined {
+    if (settings === undefined || pendingFields === undefined) {
+        return null;
+    }
+
+    const key = Object.keys(pendingFields).find((setting) => settings.includes(setting));
+    if (!key) {
+        return;
+    }
+    return pendingFields[key];
+}
+
+export {
+    shouldShowEmployeeListError,
+    shouldShowTaxRateError,
+    hasPolicyCategoriesError,
+    hasPolicyRulesError,
+    shouldShowSyncError,
+    shouldShowPolicyError,
+    shouldShowCustomUnitsError,
+    getPolicyBrickRoadIndicatorStatus,
+    isMergeHRCompleteSetupNeededSelector,
+    isQBORefreshTokenExpiringSoonSelector,
+    areSettingsInErrorFields,
+    settingsPendingAction,
+};
diff --git a/src/libs/PolicyUtils/features.ts b/src/libs/PolicyUtils/features.ts
new file mode 100644
index 000000000000..ef57eeeaa58c
--- /dev/null
+++ b/src/libs/PolicyUtils/features.ts
@@ -0,0 +1,106 @@
+/**
+ * Whether a workspace feature is enabled, including rules, invoice fields, attendee tracking, time tracking, and MCP.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import {hasAnyCategoryRules} from '@libs/CategoryUtils';
+import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import {isAnyHRConnected} from '@libs/merge/HRUtils';
+import {isAnyRecruitingConnected} from '@libs/merge/RecruitingUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, PolicyCategories} from '@src/types/onyx';
+import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {hasAccountingFeatureConnection} from './connections';
+import {canPolicyAccessFeature, isControlPolicy, isPaidGroupPolicy} from './policyType';
+
+/**
+ * For backwards compatibility with Expensify Classic, attendee tracking defaults to enabled
+ * on Control policies when the property is undefined.
+ */
+function isAttendeeTrackingEnabled(policy: OnyxEntry<Policy>): boolean {
+    return (isControlPolicy(policy) && policy?.isAttendeeTrackingEnabled) ?? true;
+}
+
+function arePolicyRulesEnabled(policy: OnyxEntry<Policy>, policyCategories?: PolicyCategories | null): boolean {
+    if (!isPaidGroupPolicy(policy)) {
+        return false;
+    }
+    if (policy?.areRulesEnabled === true) {
+        return true;
+    }
+    if (policy?.areRulesEnabled === false) {
+        return false;
+    }
+    // areRulesEnabled is undefined - this can happen in case of migrated old Control policies, in such case users might have set up category rules in Classic and we should show Rules as enabled
+    if (!isControlPolicy(policy)) {
+        return false;
+    }
+    return hasAnyCategoryRules(policyCategories ?? undefined);
+}
+
+/**
+ * Whether Invoice Fields is enabled for the policy.
+ * Respects the `areInvoiceFieldsEnabled` toggle and verifies the policy has access to the feature (Control only).
+ */
+function isInvoiceFieldsEnabled(policy: OnyxEntry<Policy> | null): boolean {
+    return !!policy?.areInvoiceFieldsEnabled && canPolicyAccessFeature(policy ?? undefined, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED);
+}
+
+function isPolicyFeatureEnabled(policy: OnyxEntry<Policy>, featureName: PolicyFeatureName, policyCategories?: PolicyCategories | null): boolean {
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED) {
+        return arePolicyRulesEnabled(policy, policyCategories);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED) {
+        return isInvoiceFieldsEnabled(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
+        return !!policy?.tax?.trackingEnabled;
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED) {
+        return policy?.[featureName] ? !!policy?.[featureName] : hasAccountingFeatureConnection(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.IS_MCP_ENABLED) {
+        return isMCPEnabled(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.IS_HR_ENABLED) {
+        return policy?.isHREnabled === true || isAnyHRConnected(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.IS_RECRUITING_ENABLED) {
+        return policy?.isRecruitingEnabled === true || isAnyRecruitingConnected(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED) {
+        return policy?.receiptPartners?.enabled ?? false;
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.IS_TIME_TRACKING_ENABLED) {
+        return isTimeTrackingEnabled(policy);
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.IS_ATTENDEE_TRACKING_ENABLED) {
+        return isAttendeeTrackingEnabled(policy);
+    }
+
+    return !!policy?.[featureName];
+}
+
+/**
+ * Returns if the policy has the Time Tracking feature enabled.
+ */
+function isTimeTrackingEnabled(policy: OnyxEntry<Policy>): boolean {
+    return !!policy?.units?.time?.enabled;
+}
+
+/** MCP is on for every workspace unless an admin has explicitly turned it off, so an absent flag reads as enabled. */
+function isMCPEnabled(policy: OnyxEntry<Policy>): boolean {
+    return policy?.isMCPEnabled ?? true;
+}
+
+/**
+ * Returns the policy's default hourly rate for the Time Tracking feature.
+ */
+function getDefaultTimeTrackingRate(policy: Partial<OnyxEntry<Policy>>): number | undefined {
+    return policy?.units?.time?.rate !== undefined ? convertToBackendAmount(policy.units.time.rate) : undefined;
+}
+
+export {isAttendeeTrackingEnabled, arePolicyRulesEnabled, isInvoiceFieldsEnabled, isPolicyFeatureEnabled, isTimeTrackingEnabled, isMCPEnabled, getDefaultTimeTrackingRate};
diff --git a/src/libs/PolicyUtils/index.ts b/src/libs/PolicyUtils/index.ts
index c1d8e3fecc80..02bbd994fdab 100644
--- a/src/libs/PolicyUtils/index.ts
+++ b/src/libs/PolicyUtils/index.ts
@@ -1,17 +1,10 @@
 import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider';
 import type {PersonalDetailsByLogin} from '@components/PersonalDetailsByLoginProvider';
 
-import {isQBORefreshTokenExpiringSoon} from '@libs/AccountingUtils';
 import {getBankAccountFromID} from '@libs/actions/BankAccounts';
-import {hasSynchronizationErrorMessage} from '@libs/actions/connections';
-import {shouldShowQBOReimbursableExportDestinationAccountError} from '@libs/actions/connections/QuickbooksOnline';
-import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
-import {getApiRoot} from '@libs/ApiUtils';
-import {getCategoryApproverRule, hasAnyCategoryRules} from '@libs/CategoryUtils';
-import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import {getCategoryApproverRule} from '@libs/CategoryUtils';
 import isTeachersUnitePolicyID from '@libs/isTeachersUnitePolicyID';
-import {getHRAdvancedModeFinalApprover, isAnyHRConnected, isMergeHRCompleteSetupNeeded, shouldShowHRConnectionError} from '@libs/merge/HRUtils';
-import {isAnyRecruitingConnected} from '@libs/merge/RecruitingUtils';
+import {getHRAdvancedModeFinalApprover} from '@libs/merge/HRUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getIsOffline} from '@libs/NetworkState';
 import {getAccountIDsByLogins} from '@libs/PersonalDetailsUtils';
@@ -25,10 +18,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PolicyType} from '@src/types/form/WorkspaceConfirmationForm';
-import type {Card, OnyxInputOrEntry, PersonalDetailsList, Policy, PolicyCategories, PolicyEmployeeList, Report, TravelSettings} from '@src/types/onyx';
+import type {Card, OnyxInputOrEntry, PersonalDetailsList, Policy, PolicyEmployeeList, Report, TravelSettings} from '@src/types/onyx';
 import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
-import type {ErrorFields, PendingAction, PendingFields} from '@src/types/onyx/OnyxCommon';
-import type {ApprovalRule, CommuterExclusions, ConnectionName, PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {ApprovalRule, CommuterExclusions} from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type Rule from '@src/types/onyx/Rule';
 import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
@@ -40,10 +32,12 @@ import type {ValueOf} from 'type-fest';
 
 import {Str} from 'expensify-common';
 
-import {getAccountingConnectionNames, hasAccountingFeatureConnection} from './connections';
 import {getPerDiemCustomUnit, isPerDiemEligiblePolicy} from './customUnits';
+import {isTimeTrackingEnabled} from './features';
 import {canMemberWrite, getPolicyRole, isPolicyAdmin, isPolicyApprover, isPolicyOwner, isPolicyUser} from './permissions';
-import {canPolicyAccessFeature, isArchivedPolicy, isCollectPolicy, isControlPolicy, isGroupPolicy, isPaidGroupPolicy, isSubmitPolicy} from './policyType';
+import {isArchivedPolicy, isCollectPolicy, isControlPolicy, isGroupPolicy, isPaidGroupPolicy, isSubmitPolicy} from './policyType';
+import {getTagApproverRule} from './rules';
+import {isSubmitAndClose} from './workflows';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
@@ -131,68 +125,6 @@ function getActivePoliciesWithExpenseChatAndTimeEnabled(policies: OnyxCollection
     return getActivePoliciesWithExpenseChat(policies, currentUserLogin).filter(isTimeTrackingEnabled);
 }
 
-/**
- * Checks if we have any errors stored within the policy?.employeeList. Determines whether we should show a red brick road error or not.
- */
-function shouldShowEmployeeListError(policy: OnyxEntry<Policy>): boolean {
-    return isPolicyAdmin(policy) && Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
-}
-
-/**
- *  Check if the policy has any tax rate errors.
- */
-function shouldShowTaxRateError(policy: OnyxEntry<Policy>): boolean {
-    return (
-        isPolicyAdmin(policy) &&
-        Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0 || Object.values(taxRate?.errorFields ?? {}).some(Boolean))
-    );
-}
-
-/**
- * Check if the policy has any errors within the categories.
- */
-function hasPolicyCategoriesError(policyCategories: OnyxEntry<PolicyCategories>): boolean {
-    return Object.keys(policyCategories ?? {}).some((categoryName) => Object.keys(policyCategories?.[categoryName]?.errors ?? {}).length > 0);
-}
-
-/**
- * Check if the policy has any errors within the rules.
- */
-function hasPolicyRulesError(policy: OnyxEntry<Policy>, hasMerchantRuleErrors: boolean): boolean {
-    const agentRules = Object.values(policy?.rules?.agentRules ?? {});
-
-    return hasMerchantRuleErrors || agentRules.some((rule) => rule && Object.keys(rule.errors ?? {}).length > 0);
-}
-
-/**
- * Checks if the policy had a sync error.
- */
-function shouldShowSyncError(policy: OnyxEntry<Policy>, isSyncInProgress: boolean, connectionNames?: readonly ConnectionName[]): boolean {
-    const connectionsToCheck = connectionNames ?? (Object.keys(policy?.connections ?? {}) as ConnectionName[]);
-    return isPolicyAdmin(policy) && connectionsToCheck.some((connection) => !!hasSynchronizationErrorMessage(policy, connection, isSyncInProgress));
-}
-
-/**
- * Check if the policy has any error fields.
- */
-function shouldShowPolicyErrorFields(policy: OnyxEntry<Policy>): boolean {
-    return isPolicyAdmin(policy) && Object.values(policy?.errorFields ?? {}).some((fieldErrors) => Object.keys(fieldErrors ?? {}).length > 0);
-}
-
-/**
- * Check if the policy has any errors, and if it doesn't, then check if it has any error fields.
- */
-function shouldShowPolicyError(policy: OnyxEntry<Policy>): boolean {
-    return Object.keys(policy?.errors ?? {}).length > 0 ? isPolicyAdmin(policy) : shouldShowPolicyErrorFields(policy);
-}
-
-/**
- * Checks if we have any errors stored within the policy custom units.
- */
-function shouldShowCustomUnitsError(policy: OnyxEntry<Policy>): boolean {
-    return isPolicyAdmin(policy) && Object.keys(policy?.customUnits?.errors ?? {}).length > 0;
-}
-
 /**
  * The workspace-wide work arrangement, which members follow unless they were given one of their own.
  */
@@ -247,33 +179,6 @@ function hasEligibleBankAccountShareRecipient(policies: OnyxCollection<Policy> |
     return getEligibleBankAccountShareRecipientEmails(policies, currentUserLogin, bankAccountID).length > 0;
 }
 
-/**
- * Get the brick road indicator status for a policy. The policy has an error status if there is a policy member error, a custom unit error or a field error.
- */
-function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>, isConnectionInProgress: boolean): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
-    if (
-        shouldShowEmployeeListError(policy) ||
-        shouldShowCustomUnitsError(policy) ||
-        shouldShowPolicyErrorFields(policy) ||
-        shouldShowSyncError(policy, isConnectionInProgress, getAccountingConnectionNames()) ||
-        shouldShowQBOReimbursableExportDestinationAccountError(policy) ||
-        shouldShowHRConnectionError(policy, isConnectionInProgress, isPolicyAdmin(policy))
-    ) {
-        return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-    }
-    return undefined;
-}
-
-/**
- * Returns whether the Merge HR setup still needs to be completed for a policy.
- */
-const isMergeHRCompleteSetupNeededSelector = (policy: OnyxEntry<Policy>) => isMergeHRCompleteSetupNeeded(policy);
-
-/**
- * Returns whether an admin should be warned that the workspace's QuickBooks Online connection is about to expire.
- */
-const isQBORefreshTokenExpiringSoonSelector = (policy: OnyxEntry<Policy>) => isPolicyAdmin(policy) && isQBORefreshTokenExpiringSoon(policy);
-
 /**
  * Check if the policy can be displayed
  * If shouldShowPendingDeletePolicy is true, show the policy pending deletion.
@@ -687,100 +592,6 @@ function filterGuideAndAccountManager<T extends {login?: string | null; alternat
     });
 }
 
-/**
- * Checks if a policy has any custom categories (categories not in the default list)
- */
-function hasCustomCategories(policyCategories: OnyxEntry<PolicyCategories>): boolean {
-    if (!policyCategories) {
-        return false;
-    }
-
-    const defaultCategoryNames = new Set<string>(Object.values(CONST.POLICY.DEFAULT_CATEGORIES));
-
-    return Object.values(policyCategories).some((category) => category && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !defaultCategoryNames.has(category.name));
-}
-
-/**
- * Checks whether a policy max expense amount (e.g. `maxExpenseAmountNoReceipt`) is actually configured.
- *
- * `0` is a valid limit meaning "always required", so a falsy check would wrongly treat an explicit $0.00 as unset.
- * Only `undefined` and `CONST.DISABLED_MAX_EXPENSE_VALUE` mean the amount is not set.
- */
-function isMaxExpenseAmountSet(value: number | undefined): value is number {
-    return value !== undefined && value !== CONST.DISABLED_MAX_EXPENSE_VALUE;
-}
-
-/**
- * Checks if a policy has any rules configured (structured rules, individual expense limits, or prohibited expenses).
- */
-function hasConfiguredRules(policy: OnyxEntry<Policy>, policyCategories: PolicyCategories | null | undefined, hasExpenseDefaultRules: boolean): boolean {
-    if (!policy) {
-        return false;
-    }
-
-    if (hasExpenseDefaultRules) {
-        return true;
-    }
-
-    if (!!policy.customRules && policy.customRules.trim().length > 0) {
-        return true;
-    }
-
-    const {rules: policyRules} = policy;
-    if (!!policyRules?.approvalRules && policyRules.approvalRules.length > 0) {
-        return true;
-    }
-    if (!!policyRules?.expenseRules && policyRules.expenseRules.length > 0) {
-        return true;
-    }
-    if (!!policy.maxExpenseAmount && policy.maxExpenseAmount !== CONST.DISABLED_MAX_EXPENSE_VALUE && policy.maxExpenseAmount !== CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT) {
-        return true;
-    }
-    if (!!policy.maxExpenseAge && policy.maxExpenseAge !== CONST.DISABLED_MAX_EXPENSE_VALUE && policy.maxExpenseAge !== CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE) {
-        return true;
-    }
-    if (
-        !!policy.maxExpenseAmountNoReceipt &&
-        policy.maxExpenseAmountNoReceipt !== CONST.DISABLED_MAX_EXPENSE_VALUE &&
-        policy.maxExpenseAmountNoReceipt !== CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT
-    ) {
-        return true;
-    }
-    if (
-        !!policy.maxExpenseAmountNoItemizedReceipt &&
-        policy.maxExpenseAmountNoItemizedReceipt !== CONST.DISABLED_MAX_EXPENSE_VALUE &&
-        policy.maxExpenseAmountNoItemizedReceipt !== CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT
-    ) {
-        return true;
-    }
-
-    if (policy.defaultBillable) {
-        return true;
-    }
-    if (policy.defaultReimbursable === false) {
-        return true;
-    }
-    if (policy.eReceipts) {
-        return true;
-    }
-    if (policy.requireCompanyCardsEnabled) {
-        return true;
-    }
-
-    const {prohibitedExpenses} = policy;
-    if (
-        !!prohibitedExpenses &&
-        Object.entries(CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES).some(([key, defaultValue]) => {
-            const value = prohibitedExpenses[key as keyof typeof CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES];
-            return value !== undefined && value !== defaultValue;
-        })
-    ) {
-        return true;
-    }
-
-    return hasAnyCategoryRules(policyCategories ?? undefined);
-}
-
 function getOwnedPaidPolicies(policies: OnyxCollection<Policy> | null, currentUserAccountID: number | undefined): Policy[] {
     return Object.values(policies ?? {}).filter((policy): policy is Policy => isPolicyOwner(policy, currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID) && isPaidGroupPolicy(policy));
 }
@@ -800,14 +611,6 @@ function tryNavigateToSubmitWorkspaceUpgrade(policy: OnyxEntry<Policy>, isEnabli
     return true;
 }
 
-/**
- * For backwards compatibility with Expensify Classic, attendee tracking defaults to enabled
- * on Control policies when the property is undefined.
- */
-function isAttendeeTrackingEnabled(policy: OnyxEntry<Policy>): boolean {
-    return (isControlPolicy(policy) && policy?.isAttendeeTrackingEnabled) ?? true;
-}
-
 /**
  * Collect workspaces can access a limited subset of Rules features. When a Collect admin tries to
  * access a Control-only Rules feature, navigate to the upgrade flow and return true.
@@ -825,51 +628,6 @@ function tryNavigateToControlPolicyUpgrade(policy: OnyxEntry<Policy>, upgradeFea
     return true;
 }
 
-/**
- * Checks if policy's scheduled submit / auto reporting frequency is "instant".
- * Note: Free policies have "instant" submit always enabled.
- */
-function isInstantSubmitEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
-    return policy?.autoReporting === true && policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT;
-}
-
-/**
- * Checks if policy's scheduled submit / auto reporting frequency is not "instant".
- */
-function isDelayedSubmissionEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
-    return policy?.autoReporting === true && policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT;
-}
-
-/**
- * This gets a "corrected" value for autoReportingFrequency. The purpose of this function is to encapsulate some logic around the "immediate" frequency.
- *
- * - "immediate" is actually not immediate. For that you want "instant".
- * - (immediate && harvesting.enabled) === daily
- * - (immediate && !harvesting.enabled) === manual
- *
- * Note that "daily" and "manual" only exist as options for the API, not in the database or Onyx.
- */
-function getCorrectedAutoReportingFrequency(policy: OnyxInputOrEntry<Policy>): ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES> | undefined {
-    if (policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE) {
-        return policy?.autoReportingFrequency;
-    }
-
-    if (policy?.harvesting?.enabled) {
-        // This is actually not really "immediate". It's "daily". Surprise!
-        return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE;
-    }
-
-    // "manual" is really just "immediate" (aka "daily") with harvesting disabled
-    return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
-}
-
-/**
- * Checks if policy's approval mode is "optional", a.k.a. "Submit & Close"
- */
-function isSubmitAndClose(policy: OnyxInputOrEntry<Policy>): boolean {
-    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL;
-}
-
 /**
  * Resolves a workspace's reimbursement choice to one of the three values in `CONST.POLICY.REIMBURSEMENT_CHOICES`.
  * Comparing the raw field instead makes a workspace reporting a deprecated value look like it has reimbursement
@@ -926,87 +684,10 @@ function isControlOnAdvancedApprovalMode(policy: OnyxInputOrEntry<Policy>): bool
     return policy?.type === CONST.POLICY.TYPE.CORPORATE && getApprovalWorkflow(policy) === CONST.POLICY.APPROVAL_MODE.ADVANCED;
 }
 
-/**
- * Checks if policy has Dynamic External Workflow enabled
- */
-function hasDynamicExternalWorkflow(policy: OnyxEntry<Policy>): boolean {
-    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL;
-}
-
-/**
- * Checks if the approval workflow configuration must stay hidden because the workspace's Dynamic External Workflow has
- * "Hide People Table Columns" set. The backend only returns `dynamicExternalWorkflowHidePeople` when it is `true`, so an
- * absent flag means "show". The approval mode is checked too, so a stale flag can't hide workflows on a policy that no
- * longer uses a Dynamic External Workflow.
- */
-function shouldHideDynamicExternalWorkflowPeople(policy: OnyxEntry<Policy>): boolean {
-    return hasDynamicExternalWorkflow(policy) && !!policy?.dynamicExternalWorkflowHidePeople;
-}
-
 function goBackFromInvalidPolicy() {
     Navigation.goBack(ROUTES.WORKSPACES_LIST.route);
 }
 
-function arePolicyRulesEnabled(policy: OnyxEntry<Policy>, policyCategories?: PolicyCategories | null): boolean {
-    if (!isPaidGroupPolicy(policy)) {
-        return false;
-    }
-    if (policy?.areRulesEnabled === true) {
-        return true;
-    }
-    if (policy?.areRulesEnabled === false) {
-        return false;
-    }
-    // areRulesEnabled is undefined - this can happen in case of migrated old Control policies, in such case users might have set up category rules in Classic and we should show Rules as enabled
-    if (!isControlPolicy(policy)) {
-        return false;
-    }
-    return hasAnyCategoryRules(policyCategories ?? undefined);
-}
-
-/**
- * Whether Invoice Fields is enabled for the policy.
- * Respects the `areInvoiceFieldsEnabled` toggle and verifies the policy has access to the feature (Control only).
- */
-function isInvoiceFieldsEnabled(policy: OnyxEntry<Policy> | null): boolean {
-    return !!policy?.areInvoiceFieldsEnabled && canPolicyAccessFeature(policy ?? undefined, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED);
-}
-
-function isPolicyFeatureEnabled(policy: OnyxEntry<Policy>, featureName: PolicyFeatureName, policyCategories?: PolicyCategories | null): boolean {
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED) {
-        return arePolicyRulesEnabled(policy, policyCategories);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED) {
-        return isInvoiceFieldsEnabled(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
-        return !!policy?.tax?.trackingEnabled;
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED) {
-        return policy?.[featureName] ? !!policy?.[featureName] : hasAccountingFeatureConnection(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.IS_MCP_ENABLED) {
-        return isMCPEnabled(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.IS_HR_ENABLED) {
-        return policy?.isHREnabled === true || isAnyHRConnected(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.IS_RECRUITING_ENABLED) {
-        return policy?.isRecruitingEnabled === true || isAnyRecruitingConnected(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED) {
-        return policy?.receiptPartners?.enabled ?? false;
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.IS_TIME_TRACKING_ENABLED) {
-        return isTimeTrackingEnabled(policy);
-    }
-    if (featureName === CONST.POLICY.MORE_FEATURES.IS_ATTENDEE_TRACKING_ENABLED) {
-        return isAttendeeTrackingEnabled(policy);
-    }
-
-    return !!policy?.[featureName];
-}
-
 function getApprovalWorkflow(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
     if (policy?.type === CONST.POLICY.TYPE.PERSONAL) {
         return CONST.POLICY.APPROVAL_MODE.OPTIONAL;
@@ -1423,27 +1104,6 @@ function canSendInvoice(policies: OnyxCollection<Policy> | null, currentUserLogi
     return getActiveAdminWorkspaces(policies, currentUserLogin).some((policy) => canSendInvoiceFromWorkspace(policy));
 }
 
-function areSettingsInErrorFields(settings?: string[], errorFields?: ErrorFields) {
-    if (settings === undefined || errorFields === undefined) {
-        return false;
-    }
-
-    const keys = Object.keys(errorFields);
-    return settings.some((setting) => keys.includes(setting));
-}
-
-function settingsPendingAction(settings?: string[], pendingFields?: PendingFields<string>): PendingAction | undefined {
-    if (settings === undefined || pendingFields === undefined) {
-        return null;
-    }
-
-    const key = Object.keys(pendingFields).find((setting) => settings.includes(setting));
-    if (!key) {
-        return;
-    }
-    return pendingFields[key];
-}
-
 /**
  * Sort the workspaces by their name, while keeping the selected one at the beginning.
  * @param workspace1 Details of the first workspace to be compared.
@@ -1491,19 +1151,6 @@ function hasOnlyPersonalPolicies(policies: OnyxCollection<Policy>) {
     return !Object.values(policies ?? {}).some((policy) => policy && policy.type !== CONST.POLICY.TYPE.PERSONAL && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
-function getTagApproverRule(policy: OnyxEntry<Policy>, tagName: string) {
-    if (!policy) {
-        return;
-    }
-
-    const approvalRules = policy.rules?.approvalRules ?? [];
-    const approverRule = approvalRules.find((rule) =>
-        rule.applyWhen.find(({condition, field, value}) => condition === CONST.POLICY.RULE_CONDITIONS.MATCHES && field === CONST.POLICY.FIELDS.TAG && value === tagName),
-    );
-
-    return approverRule;
-}
-
 function getDomainNameForPolicy(policyID?: string): string {
     if (!policyID) {
         return '';
@@ -1805,56 +1452,11 @@ function getTravelStep(
     return CONST.TRAVEL.STEPS.GET_STARTED_TRAVEL;
 }
 
-/**
- * Returns if the policy has the Time Tracking feature enabled.
- */
-function isTimeTrackingEnabled(policy: OnyxEntry<Policy>): boolean {
-    return !!policy?.units?.time?.enabled;
-}
-
-/** MCP is on for every workspace unless an admin has explicitly turned it off, so an absent flag reads as enabled. */
-function isMCPEnabled(policy: OnyxEntry<Policy>): boolean {
-    return policy?.isMCPEnabled ?? true;
-}
-
-/**
- * Returns the policy's default hourly rate for the Time Tracking feature.
- */
-function getDefaultTimeTrackingRate(policy: Partial<OnyxEntry<Policy>>): number | undefined {
-    return policy?.units?.time?.rate !== undefined ? convertToBackendAmount(policy.units.time.rate) : undefined;
-}
-
 function sortPoliciesByName(policies: Policy[], localeCompare: (a: string, b: string) => number): Policy[] {
     // copy first: callers pass memoized selector output, sorting it in place makes the next deepEqual report a change
     return [...policies].sort((a, b) => localeCompare(a.name || '', b.name || ''));
 }
 
-/**
- * Builds a source URL for rendering a policy document PDF.
- * Local blob/file URIs (from optimistic uploads) are returned directly.
- * Remote URLs are routed through the authenticated GetPolicyRulesDocument streaming endpoint.
- * The stored URL (which contains a unique timestamp per upload) is appended as a version
- * parameter so the browser treats each replacement as a distinct resource.
- */
-function getRulesDocumentSourceURL(rulesDocumentURL: string | undefined, policyID: string | undefined, encryptedAuthToken: string): string {
-    if (!rulesDocumentURL || !policyID) {
-        return '';
-    }
-
-    const isLocalFile = rulesDocumentURL.startsWith('blob:') || rulesDocumentURL.startsWith('file:');
-    if (isLocalFile) {
-        return rulesDocumentURL;
-    }
-
-    return addEncryptedAuthTokenToURL(
-        // Each PDF upload gets a unique S3 key, so rulesDocumentURL changes on every replacement.
-        // Encoding it as cacheBuster ensures the full streaming URL is also unique, preventing stale browser/pdfjs cache.
-        `${getApiRoot({shouldUseSecure: false})}api/GetPolicyRulesDocument?policyID=${policyID}&cacheBuster=${encodeURIComponent(rulesDocumentURL)}`,
-        encryptedAuthToken,
-        true,
-    );
-}
-
 export {
     getActivePolicies,
     getActivePoliciesWithExpenseChat,
@@ -1867,29 +1469,13 @@ export {
     getSoftExclusionsForGuideAndAccountManager,
     getExpensifyTeamExclusions,
     filterGuideAndAccountManager,
-    getPolicyBrickRoadIndicatorStatus,
-    hasCustomCategories,
-    hasConfiguredRules,
-    isMaxExpenseAmountSet,
     goBackFromInvalidPolicy,
-    shouldShowSyncError,
-    shouldShowCustomUnitsError,
-    shouldShowEmployeeListError,
-    hasPolicyCategoriesError,
-    hasPolicyRulesError,
-    shouldShowPolicyError,
-    shouldShowTaxRateError,
     isExpensifyTeam,
     shouldFilterExpensifyTeam,
     createFilteredMemberCountSelector,
     createInvoiceConfigurationTextSelector,
     isDeletedPolicyEmployee,
-    isInstantSubmitEnabled,
-    isDelayedSubmissionEnabled,
-    getCorrectedAutoReportingFrequency,
     hasEligibleBankAccountShareRecipient,
-    arePolicyRulesEnabled,
-    isPolicyFeatureEnabled,
     isPolicyFieldListEmpty,
     canUnarchivePolicy,
     isPolicyMember,
@@ -1901,7 +1487,6 @@ export {
     isAutoPayApprovedReportsAvailable,
     getReimbursementChoice,
     isSubmitterAndApprover,
-    isSubmitAndClose,
     shouldShowPolicy,
     getActiveAdminWorkspaces,
     hasActiveAdminWorkspaces,
@@ -1920,10 +1505,7 @@ export {
     hasCustomApprovalWorkflow,
     getApprovalWorkflow,
     getReimburserAccountID,
-    isAttendeeTrackingEnabled,
     hasOnlyPersonalPolicies,
-    areSettingsInErrorFields,
-    settingsPendingAction,
     getGroupPaidPolicies,
     getGroupPoliciesWhereReportCanBeCreated,
     getDefaultChatEnabledPolicy,
@@ -1933,7 +1515,6 @@ export {
     evaluateApprovalWorkflowRule,
     getSubmitToAccountID,
     getSubmitReportManagerAccountID,
-    getTagApproverRule,
     getDomainNameForPolicy,
     getWorkflowApprovalsUnavailable,
     getUserFriendlyWorkspaceType,
@@ -1953,27 +1534,18 @@ export {
     getManagerAccountID,
     getActiveEmployeeWorkspaces,
     isPolicyMemberWithoutPendingDelete,
-    hasDynamicExternalWorkflow,
-    shouldHideDynamicExternalWorkflowPeople,
     getActivePoliciesWithExpenseChatAndPerDiemEnabled,
     getPoliciesForRoomCreation,
-    isInvoiceFieldsEnabled,
     getTravelStep,
     isWorkspaceProvisionedForTravel,
     hasAcceptedTravelTerms,
     isNonUSDPolicy,
-    isTimeTrackingEnabled,
-    isMCPEnabled,
-    getDefaultTimeTrackingRate,
     getActivePoliciesWithExpenseChatAndTimeEnabled,
     sortPoliciesByName,
     hasActiveExpensifyCard,
     tryNavigateToSubmitWorkspaceUpgrade,
     tryNavigateToControlPolicyUpgrade,
-    getRulesDocumentSourceURL,
     hasAnyPaidPolicy,
-    isMergeHRCompleteSetupNeededSelector,
-    isQBORefreshTokenExpiringSoonSelector,
 };
 
 // Re-exported with `export *` rather than through the block above: a named re-export becomes a getter that throws
@@ -1988,5 +1560,9 @@ export * from './xero';
 export * from './sageIntacct';
 export * from './customUnits';
 export * from './tax';
+export * from './rules';
+export * from './features';
+export * from './workflows';
+export * from './errors';
 
 export type {MemberEmailsToAccountIDs};
diff --git a/src/libs/PolicyUtils/rules.ts b/src/libs/PolicyUtils/rules.ts
new file mode 100644
index 000000000000..6bc7d617f519
--- /dev/null
+++ b/src/libs/PolicyUtils/rules.ts
@@ -0,0 +1,147 @@
+/**
+ * Custom categories, max expense limits, configured-rule checks, tag approver rules, and the rules document URL.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import {getApiRoot} from '@libs/ApiUtils';
+import {hasAnyCategoryRules} from '@libs/CategoryUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, PolicyCategories} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+/**
+ * Checks if a policy has any custom categories (categories not in the default list)
+ */
+function hasCustomCategories(policyCategories: OnyxEntry<PolicyCategories>): boolean {
+    if (!policyCategories) {
+        return false;
+    }
+
+    const defaultCategoryNames = new Set<string>(Object.values(CONST.POLICY.DEFAULT_CATEGORIES));
+
+    return Object.values(policyCategories).some((category) => category && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !defaultCategoryNames.has(category.name));
+}
+
+/**
+ * Checks whether a policy max expense amount (e.g. `maxExpenseAmountNoReceipt`) is actually configured.
+ *
+ * `0` is a valid limit meaning "always required", so a falsy check would wrongly treat an explicit $0.00 as unset.
+ * Only `undefined` and `CONST.DISABLED_MAX_EXPENSE_VALUE` mean the amount is not set.
+ */
+function isMaxExpenseAmountSet(value: number | undefined): value is number {
+    return value !== undefined && value !== CONST.DISABLED_MAX_EXPENSE_VALUE;
+}
+
+/**
+ * Checks if a policy has any rules configured (structured rules, individual expense limits, or prohibited expenses).
+ */
+function hasConfiguredRules(policy: OnyxEntry<Policy>, policyCategories: PolicyCategories | null | undefined, hasExpenseDefaultRules: boolean): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    if (hasExpenseDefaultRules) {
+        return true;
+    }
+
+    if (!!policy.customRules && policy.customRules.trim().length > 0) {
+        return true;
+    }
+
+    const {rules: policyRules} = policy;
+    if (!!policyRules?.approvalRules && policyRules.approvalRules.length > 0) {
+        return true;
+    }
+    if (!!policyRules?.expenseRules && policyRules.expenseRules.length > 0) {
+        return true;
+    }
+    if (!!policy.maxExpenseAmount && policy.maxExpenseAmount !== CONST.DISABLED_MAX_EXPENSE_VALUE && policy.maxExpenseAmount !== CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT) {
+        return true;
+    }
+    if (!!policy.maxExpenseAge && policy.maxExpenseAge !== CONST.DISABLED_MAX_EXPENSE_VALUE && policy.maxExpenseAge !== CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE) {
+        return true;
+    }
+    if (
+        !!policy.maxExpenseAmountNoReceipt &&
+        policy.maxExpenseAmountNoReceipt !== CONST.DISABLED_MAX_EXPENSE_VALUE &&
+        policy.maxExpenseAmountNoReceipt !== CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT
+    ) {
+        return true;
+    }
+    if (
+        !!policy.maxExpenseAmountNoItemizedReceipt &&
+        policy.maxExpenseAmountNoItemizedReceipt !== CONST.DISABLED_MAX_EXPENSE_VALUE &&
+        policy.maxExpenseAmountNoItemizedReceipt !== CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT
+    ) {
+        return true;
+    }
+
+    if (policy.defaultBillable) {
+        return true;
+    }
+    if (policy.defaultReimbursable === false) {
+        return true;
+    }
+    if (policy.eReceipts) {
+        return true;
+    }
+    if (policy.requireCompanyCardsEnabled) {
+        return true;
+    }
+
+    const {prohibitedExpenses} = policy;
+    if (
+        !!prohibitedExpenses &&
+        Object.entries(CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES).some(([key, defaultValue]) => {
+            const value = prohibitedExpenses[key as keyof typeof CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES];
+            return value !== undefined && value !== defaultValue;
+        })
+    ) {
+        return true;
+    }
+
+    return hasAnyCategoryRules(policyCategories ?? undefined);
+}
+
+function getTagApproverRule(policy: OnyxEntry<Policy>, tagName: string) {
+    if (!policy) {
+        return;
+    }
+
+    const approvalRules = policy.rules?.approvalRules ?? [];
+    const approverRule = approvalRules.find((rule) =>
+        rule.applyWhen.find(({condition, field, value}) => condition === CONST.POLICY.RULE_CONDITIONS.MATCHES && field === CONST.POLICY.FIELDS.TAG && value === tagName),
+    );
+
+    return approverRule;
+}
+
+/**
+ * Builds a source URL for rendering a policy document PDF.
+ * Local blob/file URIs (from optimistic uploads) are returned directly.
+ * Remote URLs are routed through the authenticated GetPolicyRulesDocument streaming endpoint.
+ * The stored URL (which contains a unique timestamp per upload) is appended as a version
+ * parameter so the browser treats each replacement as a distinct resource.
+ */
+function getRulesDocumentSourceURL(rulesDocumentURL: string | undefined, policyID: string | undefined, encryptedAuthToken: string): string {
+    if (!rulesDocumentURL || !policyID) {
+        return '';
+    }
+
+    const isLocalFile = rulesDocumentURL.startsWith('blob:') || rulesDocumentURL.startsWith('file:');
+    if (isLocalFile) {
+        return rulesDocumentURL;
+    }
+
+    return addEncryptedAuthTokenToURL(
+        // Each PDF upload gets a unique S3 key, so rulesDocumentURL changes on every replacement.
+        // Encoding it as cacheBuster ensures the full streaming URL is also unique, preventing stale browser/pdfjs cache.
+        `${getApiRoot({shouldUseSecure: false})}api/GetPolicyRulesDocument?policyID=${policyID}&cacheBuster=${encodeURIComponent(rulesDocumentURL)}`,
+        encryptedAuthToken,
+        true,
+    );
+}
+
+export {hasCustomCategories, isMaxExpenseAmountSet, hasConfiguredRules, getTagApproverRule, getRulesDocumentSourceURL};
diff --git a/src/libs/PolicyUtils/workflows.ts b/src/libs/PolicyUtils/workflows.ts
new file mode 100644
index 000000000000..c144e0bf5388
--- /dev/null
+++ b/src/libs/PolicyUtils/workflows.ts
@@ -0,0 +1,73 @@
+/**
+ * Auto-reporting (scheduled submit) frequency, Submit & Close, and Dynamic External Workflow.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import CONST from '@src/CONST';
+import type {OnyxInputOrEntry, Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+/**
+ * Checks if policy's scheduled submit / auto reporting frequency is "instant".
+ * Note: Free policies have "instant" submit always enabled.
+ */
+function isInstantSubmitEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
+    return policy?.autoReporting === true && policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT;
+}
+
+/**
+ * Checks if policy's scheduled submit / auto reporting frequency is not "instant".
+ */
+function isDelayedSubmissionEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
+    return policy?.autoReporting === true && policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT;
+}
+
+/**
+ * This gets a "corrected" value for autoReportingFrequency. The purpose of this function is to encapsulate some logic around the "immediate" frequency.
+ *
+ * - "immediate" is actually not immediate. For that you want "instant".
+ * - (immediate && harvesting.enabled) === daily
+ * - (immediate && !harvesting.enabled) === manual
+ *
+ * Note that "daily" and "manual" only exist as options for the API, not in the database or Onyx.
+ */
+function getCorrectedAutoReportingFrequency(policy: OnyxInputOrEntry<Policy>): ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES> | undefined {
+    if (policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE) {
+        return policy?.autoReportingFrequency;
+    }
+
+    if (policy?.harvesting?.enabled) {
+        // This is actually not really "immediate". It's "daily". Surprise!
+        return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE;
+    }
+
+    // "manual" is really just "immediate" (aka "daily") with harvesting disabled
+    return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
+}
+
+/**
+ * Checks if policy's approval mode is "optional", a.k.a. "Submit & Close"
+ */
+function isSubmitAndClose(policy: OnyxInputOrEntry<Policy>): boolean {
+    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+}
+
+/**
+ * Checks if policy has Dynamic External Workflow enabled
+ */
+function hasDynamicExternalWorkflow(policy: OnyxEntry<Policy>): boolean {
+    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL;
+}
+
+/**
+ * Checks if the approval workflow configuration must stay hidden because the workspace's Dynamic External Workflow has
+ * "Hide People Table Columns" set. The backend only returns `dynamicExternalWorkflowHidePeople` when it is `true`, so an
+ * absent flag means "show". The approval mode is checked too, so a stale flag can't hide workflows on a policy that no
+ * longer uses a Dynamic External Workflow.
+ */
+function shouldHideDynamicExternalWorkflowPeople(policy: OnyxEntry<Policy>): boolean {
+    return hasDynamicExternalWorkflow(policy) && !!policy?.dynamicExternalWorkflowHidePeople;
+}
+
+export {isInstantSubmitEnabled, isDelayedSubmissionEnabled, getCorrectedAutoReportingFrequency, isSubmitAndClose, hasDynamicExternalWorkflow, shouldHideDynamicExternalWorkflowPeople};

From 4c51bdc71992d8fcd58a852b503167940357ae3c Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 04:35:31 +0000
Subject: [PATCH 621/781] Move the PolicyUtils seatbelt entries to errors.ts
 and rules.ts

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 config/eslint/eslint.seatbelt.tsv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 968073a518b3..62d495e48b87 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -897,7 +897,8 @@
 "../../src/libs/PersonalDetailsUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/PhoneNumber.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/PolicyUtils/connections.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
-"../../src/libs/PolicyUtils/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/libs/PolicyUtils/errors.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/libs/PolicyUtils/rules.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/prepareRequestPayload/index.native.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/libs/prepareRequestPayload/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Pusher/index.native.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6

From 8ee92fa2a1324537ad638d55ee93c4a17f32824f Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 04:37:22 +0000
Subject: [PATCH 622/781] Spread workflows into PolicyUtils mocks that load
 inside an import cycle

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 tests/actions/IOU/SplitReportTotalsTest.ts   | 1 +
 tests/unit/ReportSecondaryActionUtilsTest.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/actions/IOU/SplitReportTotalsTest.ts b/tests/actions/IOU/SplitReportTotalsTest.ts
index d7bbd958b9f3..765dd9eb4c60 100644
--- a/tests/actions/IOU/SplitReportTotalsTest.ts
+++ b/tests/actions/IOU/SplitReportTotalsTest.ts
@@ -95,6 +95,7 @@ jest.mock('@libs/PolicyUtils', () => ({
     // aren't on it yet. Spread them from their own modules, which load fully.
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/policyType'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/permissions'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/workflows'),
     isPaidGroupPolicy: jest.fn().mockReturnValue(true),
     isPolicyOwner: jest.fn().mockImplementation((policy?: OnyxEntry<Policy>, currentUserAccountID?: number) => !!currentUserAccountID && policy?.ownerAccountID === currentUserAccountID),
 }));
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 16471032dbf1..0e214ffb5b74 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -114,6 +114,7 @@ jest.mock('@libs/PolicyUtils', () => ({
     // aren't on it yet. Spread them from their own modules, which load fully.
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/policyType'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/permissions'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/workflows'),
     isPreferredExporter: jest.fn().mockReturnValue(true),
     hasAccountingConnections: jest.fn().mockReturnValue(true),
     isPolicyAdmin: jest.fn().mockReturnValue(true),

From 1bb6487bf535165115b6e197b5a5f43e17007e6b Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 13 Oct 2026 22:35:20 -0700
Subject: [PATCH 623/781] fix(app): limit NVP visibility updates to support
 tickets

---
 .../configs/visibleReportActions.ts           | 23 +++++++++----------
 .../OnyxDerived/visibleReportActionsTest.ts   | 17 ++++++++++----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
index 6507142a463c..9d6173058431 100644
--- a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
+++ b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts
@@ -5,7 +5,7 @@ import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDer
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportAction, ReportActions, ReportNameValuePairs} from '@src/types/onyx';
+import type {ReportAction, ReportActions} from '@src/types/onyx';
 import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 
 /**
@@ -24,11 +24,10 @@ function shouldSkipCachingAction(action: ReportAction): boolean {
 function computeReportVisibility(
     reportActions: ReportActions,
     currentUserAccountID: number | undefined,
-    report: Report | undefined,
-    reportNameValuePairs: ReportNameValuePairs | undefined,
+    isSupportTicketReport: boolean,
+    isReplacedSupportTicket: boolean,
 ): Record<string, boolean> {
     const reportVisibility: Record<string, boolean> = {};
-    const isSupportTicketReport = isSupportTicket(report);
 
     for (const [actionID, action] of Object.entries(reportActions)) {
         if (!action) {
@@ -43,7 +42,7 @@ function computeReportVisibility(
             continue;
         }
         // A replacement ticket has its own active survey, so the original ticket's survey is stale.
-        if (isSupportTicketReport && reportNameValuePairs?.reopenedAsReportID && isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUPPORT_SURVEY)) {
+        if (isReplacedSupportTicket && isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUPPORT_SURVEY)) {
             reportVisibility[action.reportActionID] = false;
             continue;
         }
@@ -80,7 +79,9 @@ export default createOnyxDerivedValueConfig({
         const reportIDsToProcess = isIncremental
             ? new Set([
                   ...Object.keys(reportActionsUpdates ?? {}).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')),
-                  ...Object.keys(reportNameValuePairsUpdates ?? {}).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, '')),
+                  ...Object.keys(reportNameValuePairsUpdates ?? {})
+                      .map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, ''))
+                      .filter((reportID) => isSupportTicket(allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`])),
               ])
             : new Set(Object.keys(allReportActions).map((key) => key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')));
 
@@ -94,12 +95,10 @@ export default createOnyxDerivedValueConfig({
                 continue;
             }
 
-            result[reportID] = computeReportVisibility(
-                reportActions,
-                currentUserAccountID,
-                allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`],
-                allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`],
-            );
+            const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+            const isSupportTicketReport = isSupportTicket(report);
+            const isReplacedSupportTicket = isSupportTicketReport && !!allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`]?.reopenedAsReportID;
+            result[reportID] = computeReportVisibility(reportActions, currentUserAccountID, isSupportTicketReport, isReplacedSupportTicket);
         }
 
         return result;
diff --git a/tests/unit/OnyxDerived/visibleReportActionsTest.ts b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
index 86af1538fc7d..0539db5c40c4 100644
--- a/tests/unit/OnyxDerived/visibleReportActionsTest.ts
+++ b/tests/unit/OnyxDerived/visibleReportActionsTest.ts
@@ -42,6 +42,8 @@ describe('visibleReportActions', () => {
         const reportNameValuePairsKey = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`;
         const unrelatedReportID = 'unrelatedReportID';
         const unrelatedActionID = 'unrelatedActionID';
+        const unrelatedReportKey = `${ONYXKEYS.COLLECTION.REPORT}${unrelatedReportID}`;
+        const unrelatedReportNameValuePairsKey = `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${unrelatedReportID}`;
         const allReportActions: OnyxCollection<ReportActions> = {
             [reportActionsKey]: {
                 [surveyActionID]: {
@@ -54,7 +56,7 @@ describe('visibleReportActions', () => {
         const args: Parameters<typeof visibleReportActionsConfig.compute>[0] = [
             allReportActions,
             undefined,
-            {[reportKey]: {reportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET}},
+            {[reportKey]: {reportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET}, [unrelatedReportKey]: {reportID: unrelatedReportID, type: CONST.REPORT.TYPE.CHAT}},
             {[reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'}},
         ];
         const currentValue: VisibleReportActionsDerivedValue = {
@@ -62,15 +64,20 @@ describe('visibleReportActions', () => {
             [unrelatedReportID]: {[unrelatedActionID]: true},
         };
 
-        // When the replacement report NVP triggers a recompute
+        // When the replacement and an unrelated report NVP trigger a recompute
         const result = visibleReportActionsConfig.compute(args, {
             currentValue,
-            sourceValues: {[ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]: {[reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'}}},
+            sourceValues: {
+                [ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]: {
+                    [reportNameValuePairsKey]: {reopenedAsReportID: 'replacementReportID'},
+                    [unrelatedReportNameValuePairsKey]: {agentZeroProcessingRequestIndicator: 'processing'},
+                },
+            },
             triggeredKeys: new Set<OnyxKey>([ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]),
         });
 
-        // Then the shared visibility state hides the stale survey
+        // Then the shared visibility state hides the stale survey without recomputing unrelated reports
         expect(result[reportID]?.[surveyActionID]).toBe(false);
-        expect(result[unrelatedReportID]?.[unrelatedActionID]).toBe(true);
+        expect(result[unrelatedReportID]).toBe(currentValue[unrelatedReportID]);
     });
 });

From 0e420f0cfca6ebbd4fe36706e603f34db4031861 Mon Sep 17 00:00:00 2001
From: Jakub Korytko <jakub@korytko.me>
Date: Wed, 14 Oct 2026 07:42:02 +0200
Subject: [PATCH 624/781] fix: address review on wide pre-mount reveal

---
 .../GetStateForActionHandlers.ts              | 101 +++++++++---------
 .../handleReplaceFullscreenUnderRHP.test.ts   |  34 ++++++
 2 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
index dc0bedae4209..b9f2385d3be7 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
@@ -122,7 +122,7 @@ type TabNavigatorPushPayloadParams = {
 };
 
 type TabRouteForReplacement = NavigationState['routes'][number] | NavigationPartialRoute;
-type TabStateForReplacement = Omit<NavigationState, 'routes' | 'stale'> & {routes: TabRouteForReplacement[]; stale?: true | false};
+type TabStateForReplacement = Omit<NavigationState, 'routes' | 'stale'> & {routes: TabRouteForReplacement[]; stale?: true | false; preloadedRouteKeys?: string[]};
 type StaleTabStateOverrides = {routes: TabRouteForReplacement[]; index: number; routeNames?: string[]};
 
 function toStaleTabState(existingTabState: NavigationState | PartialState<NavigationState> | undefined, overrides: StaleTabStateOverrides): TabStateForReplacement {
@@ -496,6 +496,52 @@ function withFocusedTabInHistory(tabState: TabStateForReplacement): TabStateForR
     return {...tabState, history: [...tabState.history, {type: 'route', key: focusedRoute.key, params: focusedRoute.params}]};
 }
 
+/**
+ * Puts the wide pre-mounted destination screen in place of the freshly built one, so the reveal shows the mounted instance.
+ * Everything else comes from the regular replace, so the stack, tab history and back navigation end up the same as without it.
+ */
+function withPreMountedDestination(builtTabState: TabStateForReplacement, existingTabState: NavigationState | undefined, preMountedRouteKey: string): TabStateForReplacement {
+    const targetTabRoute = builtTabState.routes[builtTabState.index];
+    const existingTargetTabRoute = existingTabState?.routes.find((route) => route.name === targetTabRoute?.name);
+    const existingNestedState = isNavigationStateWithRoutes(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
+    const preMountedRoute = existingNestedState?.routes.find((route) => route.key === preMountedRouteKey);
+    const builtNestedState = isNavigationStateWithRoutes(targetTabRoute?.state) ? targetTabRoute.state : undefined;
+    const builtDestination = builtNestedState?.routes.at(-1);
+    if (!targetTabRoute || !preMountedRoute || !builtNestedState || builtDestination?.name !== preMountedRoute.name) {
+        Log.hmmm('[Navigation] Wide pre-mount does not match the revealed destination, replacing without it', {preMountedRouteKey});
+        return withoutFocusedTabPreload(builtTabState);
+    }
+
+    // Native keeps the focused report's history, which holds the pre-mount under it, so that copy is dropped to keep keys unique.
+    const backRoutes = builtNestedState.routes.slice(0, -1).filter((route) => !('key' in route) || route.key !== preMountedRouteKey);
+    const nestedRoutes = [...backRoutes, {...builtDestination, key: preMountedRouteKey}];
+    // When every screen of the built stack is already mounted, the mounted stack state is kept with only its routes changed.
+    // A partial state would be rehydrated under a new key, which makes the navigator re-render all of its screens.
+    const mountedNestedState = isRealizedNavigationState(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
+    // Params still come from the built routes, so both branches reveal the destination the action asked for.
+    const mountedRoutes = nestedRoutes.map((route) => {
+        const existing = mountedNestedState?.routes.find((mountedRoute) => 'key' in route && mountedRoute.key === route.key);
+        return existing ? {...existing, params: route.params} : undefined;
+    });
+    const routes = [...builtTabState.routes];
+    if (mountedNestedState && mountedRoutes.every((route): route is NonNullable<typeof route> => !!route) && 'key' in targetTabRoute && typeof targetTabRoute.key === 'string') {
+        // Route snapshots added by addPushParamsRouterExtension are rebuilt from the routes, the same as a rehydrated stack gets them.
+        const history = mountedNestedState.history ? {history: mountedRoutes.map((route) => ({...route}))} : {};
+        routes[builtTabState.index] = {...targetTabRoute, key: targetTabRoute.key, state: {...mountedNestedState, routes: mountedRoutes, index: mountedRoutes.length - 1, ...history}};
+    } else {
+        routes[builtTabState.index] = {...targetTabRoute, state: {...builtNestedState, routes: nestedRoutes, index: nestedRoutes.length - 1}};
+    }
+    return withoutFocusedTabPreload({...builtTabState, routes});
+}
+
+/** The pre-mount kept a covered tab unfrozen. It is focused from here, so it no longer needs that. */
+function withoutFocusedTabPreload(tabState: TabStateForReplacement): TabStateForReplacement {
+    const {preloadedRouteKeys} = tabState;
+    const focusedTabRoute = tabState.routes[tabState.index];
+    const focusedTabRouteKey = focusedTabRoute && 'key' in focusedTabRoute ? focusedTabRoute.key : undefined;
+    return {...tabState, ...(preloadedRouteKeys ? {preloadedRouteKeys: preloadedRouteKeys.filter((key) => key !== focusedTabRouteKey)} : {})};
+}
+
 /**
  * Handles the REPLACE_FULLSCREEN_UNDER_RHP action.
  *
@@ -571,15 +617,15 @@ function handleReplaceFullscreenUnderRHP(
         const updatedTabState = preMountedRouteKey ? withPreMountedDestination(builtTabState, existingTabState, preMountedRouteKey) : builtTabState;
         // The remount guards against a push-transition flash on narrow layout (#90985). A wide pre-mount reveal keeps the key,
         // because a remount would drop the pre-mounted screen. Wide renders split screens without a push animation.
-        let staleTabState = updatedTabState;
+        let tabStateForReplace = updatedTabState;
         if (preMountedRouteKey && !getIsNarrowLayout()) {
-            staleTabState = withFocusedTabInHistory(updatedTabState);
+            tabStateForReplace = withFocusedTabInHistory(updatedTabState);
         } else if (existingTabState) {
-            staleTabState = markFocusedTabRouteForRemount(updatedTabState, existingTabState);
+            tabStateForReplace = markFocusedTabRouteForRemount(updatedTabState, existingTabState);
         }
 
         // Drop consumed deep-link hints before remounting, or React Navigation can replay the old target over the new state.
-        const updatedTabRoute = {...withSanitizedDeepLinkParams(existingTabRoute, undefined), state: staleTabState} as StackNavigationState<ParamListBase>['routes'][number];
+        const updatedTabRoute = {...withSanitizedDeepLinkParams(existingTabRoute, undefined), state: tabStateForReplace} as StackNavigationState<ParamListBase>['routes'][number];
         // Save original route so handleRemoveFullscreenUnderRHP can fully restore it on cancel.
         // In the cold-start fallback the tab navigator has no nested state yet, so saving the raw
         // route would leave it stateless and the dismiss-restore path (removePreInsertedFullscreenIfNeeded)
@@ -840,51 +886,6 @@ function removeStalePreMountsFromResetAction(action: RootStackNavigatorAction):
     return payload === action.payload ? action : ({...action, payload} as RootStackNavigatorAction);
 }
 
-/**
- * Puts the wide pre-mounted destination screen in place of the freshly built one, so the reveal shows the mounted instance.
- * Everything else comes from the regular replace, so the stack, tab history and back navigation end up the same as without it.
- */
-function withPreMountedDestination(builtTabState: TabStateForReplacement, existingTabState: NavigationState | undefined, preMountedRouteKey: string): TabStateForReplacement {
-    const targetTabRoute = builtTabState.routes[builtTabState.index];
-    const existingTargetTabRoute = existingTabState?.routes.find((route) => route.name === targetTabRoute?.name);
-    const existingNestedState = isNavigationStateWithRoutes(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
-    const preMountedRoute = existingNestedState?.routes.find((route) => route.key === preMountedRouteKey);
-    const builtNestedState = isNavigationStateWithRoutes(targetTabRoute?.state) ? targetTabRoute.state : undefined;
-    const builtDestination = builtNestedState?.routes.at(-1);
-    if (!targetTabRoute || !preMountedRoute || !builtNestedState || builtDestination?.name !== preMountedRoute.name) {
-        Log.hmmm('[Navigation] Wide pre-mount does not match the revealed destination, replacing without it', {preMountedRouteKey});
-        return withoutFocusedTabPreload(builtTabState);
-    }
-
-    // Native keeps the focused report's history, which holds the pre-mount under it, so that copy is dropped to keep keys unique.
-    const backRoutes = builtNestedState.routes.slice(0, -1).filter((route) => !('key' in route) || route.key !== preMountedRouteKey);
-    const nestedRoutes = [...backRoutes, {...builtDestination, key: preMountedRouteKey}];
-    // When every screen of the built stack is already mounted, the mounted stack state is kept with only its routes changed.
-    // A partial state would be rehydrated under a new key, which makes the navigator re-render all of its screens.
-    const mountedNestedState = isRealizedNavigationState(existingTargetTabRoute?.state) ? existingTargetTabRoute.state : undefined;
-    // Params still come from the built routes, so both branches reveal the destination the action asked for.
-    const mountedRoutes = mountedNestedState
-        ? nestedRoutes.flatMap((route) =>
-              mountedNestedState.routes.filter((existing) => 'key' in route && existing.key === route.key).map((existing) => ({...existing, params: route.params})),
-          )
-        : [];
-    const routes = [...builtTabState.routes];
-    if (mountedNestedState && mountedRoutes.length === nestedRoutes.length && 'key' in targetTabRoute && typeof targetTabRoute.key === 'string') {
-        routes[builtTabState.index] = {...targetTabRoute, key: targetTabRoute.key, state: {...mountedNestedState, routes: mountedRoutes, index: mountedRoutes.length - 1}};
-    } else {
-        routes[builtTabState.index] = {...targetTabRoute, state: {...builtNestedState, routes: nestedRoutes, index: nestedRoutes.length - 1}};
-    }
-    return withoutFocusedTabPreload({...builtTabState, routes});
-}
-
-/** The pre-mount kept a covered tab unfrozen. It is focused from here, so it no longer needs that. */
-function withoutFocusedTabPreload(tabState: TabStateForReplacement): TabStateForReplacement {
-    const {preloadedRouteKeys} = tabState as TabStateForReplacement & {preloadedRouteKeys?: string[]};
-    const focusedTabRoute = tabState.routes[tabState.index];
-    const focusedTabRouteKey = focusedTabRoute && 'key' in focusedTabRoute ? focusedTabRoute.key : undefined;
-    return {...tabState, ...(preloadedRouteKeys ? {preloadedRouteKeys: preloadedRouteKeys.filter((key) => key !== focusedTabRouteKey)} : {})};
-}
-
 export {
     handleDismissModalAction,
     handleNavigatingToModalFromModal,
diff --git a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
index 5969927230d6..ea326074fc21 100644
--- a/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
+++ b/tests/unit/Navigation/createRootStackNavigator/handleReplaceFullscreenUnderRHP.test.ts
@@ -425,6 +425,40 @@ describe('handleReplaceFullscreenUnderRHP — focused Reports stack preservation
         expect(getReportsSplitState(result)?.routes.at(-1)?.params).toEqual({reportID: 'B'});
     });
 
+    it('rebuilds the route snapshot history of the mounted stack from the revealed routes', () => {
+        // Given a wide layout with a mounted stack whose route snapshot history still holds report A and an older params snapshot
+        mockGetPlatform.mockReturnValue(CONST.PLATFORM.WEB);
+        mockStubbedParsedState = makeReportsParsedState('B');
+        const state = makeExistingReportsState(
+            [
+                makeRoute(SCREENS.INBOX, undefined, undefined, 'inbox-key'),
+                makeRoute(SCREENS.REPORT, {reportID: 'B', reportActionID: 'old-action'}, undefined, 'Report-wide-pre-mount-7'),
+                makeRoute(SCREENS.REPORT, {reportID: 'A'}, undefined, 'report-a-key'),
+            ],
+            2,
+        );
+        const reportsSplitState = getReportsSplitState(state);
+        if (reportsSplitState) {
+            Object.assign(reportsSplitState, {
+                stale: false,
+                key: 'reports-split-state-key',
+                history: [
+                    {key: 'inbox-key', name: SCREENS.INBOX},
+                    {key: 'Report-wide-pre-mount-7', name: SCREENS.REPORT, params: {reportID: 'B', reportActionID: 'old-action'}},
+                    {key: 'report-a-key', name: SCREENS.REPORT, params: {reportID: 'A'}},
+                ],
+            });
+        }
+        const action: ReplaceFullscreenUnderRHPActionType = {...makeReportsAction('B'), payload: {...makeReportsAction('B').payload, preMountedRouteKey: 'Report-wide-pre-mount-7'}};
+
+        // When report B is revealed under the RHP
+        const result = handleReplaceFullscreenUnderRHP(state, action, CONFIG_OPTIONS, stackRouter);
+
+        // Then the history matches the revealed routes one to one, like a rehydrated stack, so back cannot land on the dropped report A
+        const resultHistory: unknown[] = getReportsSplitState(result)?.history ?? [];
+        expect(resultHistory).toEqual([expect.objectContaining({key: 'inbox-key'}), expect.objectContaining({key: 'Report-wide-pre-mount-7', params: {reportID: 'B'}})]);
+    });
+
     it('drops the pre-mount kept in the preserved native history, so the revealed destination is its only copy', () => {
         // Given a wide native layout with the Reports tab focused on report A and report B pre-mounted under it
         mockGetPlatform.mockReturnValue(CONST.PLATFORM.IOS);

From 7f23a3bd67b83c475292127f173a9ed9c6842f5d Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 05:46:49 +0000
Subject: [PATCH 625/781] Group moved PolicyUtils tests by module and cover the
 settings error and pending helpers

Wrap the tests for helpers moved into rules.ts, features.ts, workflows.ts, and errors.ts in matching describe blocks, and add tests for areSettingsInErrorFields and settingsPendingAction.

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 tests/unit/PolicyUtilsTest.ts | 1510 +++++++++++++++++----------------
 1 file changed, 794 insertions(+), 716 deletions(-)

diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index 081dce3dacf4..b594cc4e348b 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -9,6 +9,7 @@ import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {
     arePolicyRulesEnabled,
+    areSettingsInErrorFields,
     canEditWorkspaceSettings,
     canMemberAssignRole,
     canMemberManageMemberWithRole,
@@ -115,6 +116,7 @@ import {
     isTaxCodeCustomized,
     isXeroActiveMatchingSource,
     isXeroVendorMatchingActive,
+    settingsPendingAction,
     shouldHideDynamicExternalWorkflowPeople,
     shouldShowPolicy,
     sortPoliciesByName,
@@ -3222,148 +3224,40 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('getPolicyBrickRoadIndicatorStatus', () => {
-        const baseAdminPolicy: OnyxEntry<Policy> = createMock<OnyxEntry<Policy>>({
-            id: 'ABC123',
-            name: 'Test Workspace',
-            type: CONST.POLICY.TYPE.TEAM,
-            role: CONST.POLICY.ROLE.ADMIN,
-            employeeList: {},
-            connections: {},
-            errors: {},
-            errorFields: {},
-        });
-
-        const baseUserPolicy: OnyxEntry<Policy> = createMock<OnyxEntry<Policy>>({
-            id: 'DEF456',
-            name: 'User Workspace',
-            type: CONST.POLICY.TYPE.TEAM,
-            role: CONST.POLICY.ROLE.USER,
-            employeeList: {},
-            connections: {},
-            errors: {},
-            errorFields: {},
-        });
-
-        it('does return an ERROR RBR when a sync error exists for an admin', () => {
-            const policyWithConnectionFailures = createMock<OnyxEntry<Policy>>({
-                ...baseAdminPolicy,
-                // Failed sync
-                connections: createMock<Connections>({
-                    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
-                        verified: false,
-                        lastSync: {
-                            errorDate: new Date().toISOString(),
-                            errorMessage: 'Error',
-                            isAuthenticationError: true,
-                            isConnected: false,
-                            isSuccessful: false,
-                            source: 'NEWEXPENSIFY',
-                            successfulDate: '',
-                        },
-                    },
-                }),
-            });
-
-            const result = getPolicyBrickRoadIndicatorStatus(policyWithConnectionFailures, false);
-            expect(result).toEqual(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
-        });
-
-        it('does not return an ERROR RBR when a sync error exists for a user', () => {
-            const policyWithConnectionFailures = createMock<OnyxEntry<Policy>>({
-                ...baseUserPolicy,
-                // Failed sync
-                connections: createMock<Connections>({
-                    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
-                        verified: false,
-                        lastSync: {
-                            errorDate: new Date().toISOString(),
-                            errorMessage: 'Error',
-                            isAuthenticationError: true,
-                            isConnected: false,
-                            isSuccessful: false,
-                            source: 'NEWEXPENSIFY',
-                            successfulDate: '',
-                        },
-                    },
-                }),
-            });
-
-            const result = getPolicyBrickRoadIndicatorStatus(policyWithConnectionFailures, false);
-            expect(result).toBeUndefined();
-        });
-
-        it('does not return an ERROR RBR when no sync errors exist for an admin', () => {
-            const policyWithoutConnections = createMock<OnyxEntry<Policy>>({
-                ...baseAdminPolicy,
-                connections: createMock<Connections>({}),
-            });
-
-            const policyWithoutConnectionFailures = createMock<OnyxEntry<Policy>>({
-                ...baseAdminPolicy,
-                connections: createMock<Connections>({
-                    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
-                        verified: true,
-                        lastSync: {
-                            errorDate: '',
-                            errorMessage: '',
-                            isAuthenticationError: false,
-                            isConnected: true,
-                            isSuccessful: true,
-                            source: 'NEWEXPENSIFY',
-                            successfulDate: '',
-                        },
-                    },
-                }),
-            });
-
-            const result = getPolicyBrickRoadIndicatorStatus(policyWithoutConnectionFailures, false);
-            expect(result).toBeUndefined();
-
-            const result2 = getPolicyBrickRoadIndicatorStatus(policyWithoutConnections, false);
-            expect(result2).toBeUndefined();
-        });
-
-        it('does not return an ERROR RBR when no sync error exists for a user', () => {
-            const policyWithoutConnections = createMock<OnyxEntry<Policy>>({
-                ...baseUserPolicy,
-                connections: createMock<Connections>({}),
+    describe('errors', () => {
+        describe('getPolicyBrickRoadIndicatorStatus', () => {
+            const baseAdminPolicy: OnyxEntry<Policy> = createMock<OnyxEntry<Policy>>({
+                id: 'ABC123',
+                name: 'Test Workspace',
+                type: CONST.POLICY.TYPE.TEAM,
+                role: CONST.POLICY.ROLE.ADMIN,
+                employeeList: {},
+                connections: {},
+                errors: {},
+                errorFields: {},
             });
 
-            const policyWithoutConnectionFailures = createMock<OnyxEntry<Policy>>({
-                ...baseUserPolicy,
-                connections: createMock<Connections>({
-                    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
-                        verified: true,
-                        lastSync: {
-                            errorDate: '',
-                            errorMessage: '',
-                            isAuthenticationError: false,
-                            isConnected: true,
-                            isSuccessful: true,
-                            source: 'NEWEXPENSIFY',
-                            successfulDate: '',
-                        },
-                    },
-                }),
+            const baseUserPolicy: OnyxEntry<Policy> = createMock<OnyxEntry<Policy>>({
+                id: 'DEF456',
+                name: 'User Workspace',
+                type: CONST.POLICY.TYPE.TEAM,
+                role: CONST.POLICY.ROLE.USER,
+                employeeList: {},
+                connections: {},
+                errors: {},
+                errorFields: {},
             });
 
-            const result = getPolicyBrickRoadIndicatorStatus(policyWithoutConnections, false);
-            expect(result).toBeUndefined();
-
-            const result2 = getPolicyBrickRoadIndicatorStatus(policyWithoutConnectionFailures, false);
-            expect(result2).toBeUndefined();
-        });
-
-        describe('QBO Export Errors', () => {
-            it('does return an ERROR RBR when a QBO sync error exists for an admin', () => {
-                const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
+            it('does return an ERROR RBR when a sync error exists for an admin', () => {
+                const policyWithConnectionFailures = createMock<OnyxEntry<Policy>>({
                     ...baseAdminPolicy,
+                    // Failed sync
                     connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                            verified: false,
                             lastSync: {
                                 errorDate: new Date().toISOString(),
-                                errorMessage: 'QBO sync failed',
+                                errorMessage: 'Error',
                                 isAuthenticationError: true,
                                 isConnected: false,
                                 isSuccessful: false,
@@ -3374,18 +3268,20 @@ describe('PolicyUtils', () => {
                     }),
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, false);
+                const result = getPolicyBrickRoadIndicatorStatus(policyWithConnectionFailures, false);
                 expect(result).toEqual(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
             });
 
-            it('does not return an ERROR RBR when a QBO sync error exists for a user', () => {
-                const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
+            it('does not return an ERROR RBR when a sync error exists for a user', () => {
+                const policyWithConnectionFailures = createMock<OnyxEntry<Policy>>({
                     ...baseUserPolicy,
+                    // Failed sync
                     connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                            verified: false,
                             lastSync: {
                                 errorDate: new Date().toISOString(),
-                                errorMessage: 'QBO sync failed',
+                                errorMessage: 'Error',
                                 isAuthenticationError: true,
                                 isConnected: false,
                                 isSuccessful: false,
@@ -3396,15 +3292,21 @@ describe('PolicyUtils', () => {
                     }),
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, false);
+                const result = getPolicyBrickRoadIndicatorStatus(policyWithConnectionFailures, false);
                 expect(result).toBeUndefined();
             });
 
-            it('does not return an ERROR RBR when no QBO sync errors exist for an admin', () => {
-                const policyWithSuccessfulQBOSync = createMock<OnyxEntry<Policy>>({
+            it('does not return an ERROR RBR when no sync errors exist for an admin', () => {
+                const policyWithoutConnections = createMock<OnyxEntry<Policy>>({
+                    ...baseAdminPolicy,
+                    connections: createMock<Connections>({}),
+                });
+
+                const policyWithoutConnectionFailures = createMock<OnyxEntry<Policy>>({
                     ...baseAdminPolicy,
                     connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                            verified: true,
                             lastSync: {
                                 errorDate: '',
                                 errorMessage: '',
@@ -3412,27 +3314,36 @@ describe('PolicyUtils', () => {
                                 isConnected: true,
                                 isSuccessful: true,
                                 source: 'NEWEXPENSIFY',
-                                successfulDate: new Date().toISOString(),
+                                successfulDate: '',
                             },
                         },
                     }),
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithSuccessfulQBOSync, false);
+                const result = getPolicyBrickRoadIndicatorStatus(policyWithoutConnectionFailures, false);
                 expect(result).toBeUndefined();
+
+                const result2 = getPolicyBrickRoadIndicatorStatus(policyWithoutConnections, false);
+                expect(result2).toBeUndefined();
             });
 
-            it('does not return an ERROR RBR when QBO sync is in progress for an admin', () => {
-                const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
-                    ...baseAdminPolicy,
+            it('does not return an ERROR RBR when no sync error exists for a user', () => {
+                const policyWithoutConnections = createMock<OnyxEntry<Policy>>({
+                    ...baseUserPolicy,
+                    connections: createMock<Connections>({}),
+                });
+
+                const policyWithoutConnectionFailures = createMock<OnyxEntry<Policy>>({
+                    ...baseUserPolicy,
                     connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                            verified: true,
                             lastSync: {
-                                errorDate: new Date().toISOString(),
-                                errorMessage: 'QBO sync failed',
-                                isAuthenticationError: true,
-                                isConnected: false,
-                                isSuccessful: false,
+                                errorDate: '',
+                                errorMessage: '',
+                                isAuthenticationError: false,
+                                isConnected: true,
+                                isSuccessful: true,
                                 source: 'NEWEXPENSIFY',
                                 successfulDate: '',
                             },
@@ -3440,140 +3351,431 @@ describe('PolicyUtils', () => {
                     }),
                 });
 
-                // When sync is in progress (second parameter is true), should not show error
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, true);
+                const result = getPolicyBrickRoadIndicatorStatus(policyWithoutConnections, false);
                 expect(result).toBeUndefined();
+
+                const result2 = getPolicyBrickRoadIndicatorStatus(policyWithoutConnectionFailures, false);
+                expect(result2).toBeUndefined();
             });
 
-            it('does return an ERROR RBR when QBO reimbursable export destination account is missing for an admin', () => {
-                const policyWithMissingQBOAccount = createMock<OnyxEntry<Policy>>({
-                    ...baseAdminPolicy,
-                    connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
-                            config: {
-                                reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
-                                reimbursableExpensesAccount: undefined,
+            describe('QBO Export Errors', () => {
+                it('does return an ERROR RBR when a QBO sync error exists for an admin', () => {
+                    const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                lastSync: {
+                                    errorDate: new Date().toISOString(),
+                                    errorMessage: 'QBO sync failed',
+                                    isAuthenticationError: true,
+                                    isConnected: false,
+                                    isSuccessful: false,
+                                    source: 'NEWEXPENSIFY',
+                                    successfulDate: '',
+                                },
                             },
-                        },
-                    }),
+                        }),
+                    });
+
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, false);
+                    expect(result).toEqual(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithMissingQBOAccount, false);
-                expect(result).toEqual(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
-            });
+                it('does not return an ERROR RBR when a QBO sync error exists for a user', () => {
+                    const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
+                        ...baseUserPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                lastSync: {
+                                    errorDate: new Date().toISOString(),
+                                    errorMessage: 'QBO sync failed',
+                                    isAuthenticationError: true,
+                                    isConnected: false,
+                                    isSuccessful: false,
+                                    source: 'NEWEXPENSIFY',
+                                    successfulDate: '',
+                                },
+                            },
+                        }),
+                    });
 
-            it('does not return an ERROR RBR when QBO reimbursable export destination account is missing for a user', () => {
-                const policyWithMissingQBOAccount = createMock<OnyxEntry<Policy>>({
-                    ...baseUserPolicy,
-                    connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
-                            config: {
-                                reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
-                                reimbursableExpensesAccount: undefined,
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, false);
+                    expect(result).toBeUndefined();
+                });
+
+                it('does not return an ERROR RBR when no QBO sync errors exist for an admin', () => {
+                    const policyWithSuccessfulQBOSync = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                lastSync: {
+                                    errorDate: '',
+                                    errorMessage: '',
+                                    isAuthenticationError: false,
+                                    isConnected: true,
+                                    isSuccessful: true,
+                                    source: 'NEWEXPENSIFY',
+                                    successfulDate: new Date().toISOString(),
+                                },
                             },
-                        },
-                    }),
+                        }),
+                    });
+
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithSuccessfulQBOSync, false);
+                    expect(result).toBeUndefined();
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithMissingQBOAccount, false);
-                expect(result).toBeUndefined();
-            });
+                it('does not return an ERROR RBR when QBO sync is in progress for an admin', () => {
+                    const policyWithQBOSyncError = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                lastSync: {
+                                    errorDate: new Date().toISOString(),
+                                    errorMessage: 'QBO sync failed',
+                                    isAuthenticationError: true,
+                                    isConnected: false,
+                                    isSuccessful: false,
+                                    source: 'NEWEXPENSIFY',
+                                    successfulDate: '',
+                                },
+                            },
+                        }),
+                    });
 
-            it('does not return an ERROR RBR when QBO reimbursable export destination account is configured for an admin', () => {
-                const policyWithQBOConfigured = createMock<OnyxEntry<Policy>>({
-                    ...baseAdminPolicy,
-                    connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
-                            config: {
-                                reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
-                                reimbursableExpensesAccount: {id: '123', name: 'Test Account'},
+                    // When sync is in progress (second parameter is true), should not show error
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOSyncError, true);
+                    expect(result).toBeUndefined();
+                });
+
+                it('does return an ERROR RBR when QBO reimbursable export destination account is missing for an admin', () => {
+                    const policyWithMissingQBOAccount = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                config: {
+                                    reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
+                                    reimbursableExpensesAccount: undefined,
+                                },
                             },
-                        },
-                    }),
+                        }),
+                    });
+
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithMissingQBOAccount, false);
+                    expect(result).toEqual(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOConfigured, false);
-                expect(result).toBeUndefined();
-            });
+                it('does not return an ERROR RBR when QBO reimbursable export destination account is missing for a user', () => {
+                    const policyWithMissingQBOAccount = createMock<OnyxEntry<Policy>>({
+                        ...baseUserPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                config: {
+                                    reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
+                                    reimbursableExpensesAccount: undefined,
+                                },
+                            },
+                        }),
+                    });
 
-            it('does not return an ERROR RBR when QBO connection does not exist for an admin', () => {
-                const policyWithoutQBOConnection = createMock<OnyxEntry<Policy>>({
-                    ...baseAdminPolicy,
-                    connections: {},
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithMissingQBOAccount, false);
+                    expect(result).toBeUndefined();
                 });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithoutQBOConnection, false);
-                expect(result).toBeUndefined();
-            });
+                it('does not return an ERROR RBR when QBO reimbursable export destination account is configured for an admin', () => {
+                    const policyWithQBOConfigured = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                config: {
+                                    reimbursableExpensesExportDestination: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
+                                    reimbursableExpensesAccount: {id: '123', name: 'Test Account'},
+                                },
+                            },
+                        }),
+                    });
 
-            it('does not return an ERROR RBR when QBO reimbursable export destination is not set for an admin', () => {
-                const policyWithQBONoExportDestination = createMock<OnyxEntry<Policy>>({
-                    ...baseAdminPolicy,
-                    connections: createMock<Connections>({
-                        [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
-                            config: {
-                                reimbursableExpensesExportDestination: undefined,
-                                reimbursableExpensesAccount: undefined,
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithQBOConfigured, false);
+                    expect(result).toBeUndefined();
+                });
+
+                it('does not return an ERROR RBR when QBO connection does not exist for an admin', () => {
+                    const policyWithoutQBOConnection = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: {},
+                    });
+
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithoutQBOConnection, false);
+                    expect(result).toBeUndefined();
+                });
+
+                it('does not return an ERROR RBR when QBO reimbursable export destination is not set for an admin', () => {
+                    const policyWithQBONoExportDestination = createMock<OnyxEntry<Policy>>({
+                        ...baseAdminPolicy,
+                        connections: createMock<Connections>({
+                            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                                config: {
+                                    reimbursableExpensesExportDestination: undefined,
+                                    reimbursableExpensesAccount: undefined,
+                                },
                             },
-                        },
-                    }),
+                        }),
+                    });
+
+                    const result = getPolicyBrickRoadIndicatorStatus(policyWithQBONoExportDestination, false);
+                    expect(result).toBeUndefined();
                 });
+            });
+        });
 
-                const result = getPolicyBrickRoadIndicatorStatus(policyWithQBONoExportDestination, false);
-                expect(result).toBeUndefined();
+        describe('hasPolicyRulesError', () => {
+            // Whether a merchant rule failed is reduced by the caller's selector and covered in
+            // ExpenseDefaultRuleUtilsTest, so only the agent rules and the pass-through are checked here.
+            const POLICY_ID = 'policy-with-rules';
+
+            it('returns false for an undefined policy', () => {
+                expect(hasPolicyRulesError(undefined, false)).toBe(false);
+            });
+
+            it('returns false when no merchant or agent rules exist', () => {
+                const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
+                expect(hasPolicyRulesError(policy, false)).toBe(false);
+            });
+
+            it('returns false when agent rules exist but none have errors', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    id: POLICY_ID,
+                    rules: {agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08'}}},
+                };
+                expect(hasPolicyRulesError(policy, false)).toBe(false);
+            });
+
+            it('returns true when a merchant rule has errors', () => {
+                const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
+                expect(hasPolicyRulesError(policy, true)).toBe(true);
+            });
+
+            it('returns true when an agent rule has errors', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    id: POLICY_ID,
+                    rules: {
+                        agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08', errors: {123: 'boom'}}},
+                    },
+                };
+                expect(hasPolicyRulesError(policy, false)).toBe(true);
             });
         });
-    });
 
-    describe('hasDynamicExternalWorkflow', () => {
-        it('should return true when policy has DYNAMICEXTERNAL approval mode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL,
-            };
-            const result = hasDynamicExternalWorkflow(policy);
-            expect(result).toBe(true);
+        describe('isQBORefreshTokenExpiringSoonSelector', () => {
+            const buildQBOPolicy = (role: string, refreshTokenExpiresAt: number): Policy =>
+                Object.assign(createRandomPolicy(1), {
+                    role,
+                    connections: {quickbooksOnline: {config: {credentials: {companyID: '12345', refreshTokenExpiresAt}}, lastSync: {isAuthenticationError: false}}},
+                });
+            const expiringSoon = Math.floor(Date.now() / 1000) + 3 * 86400;
+
+            it('returns true for an admin whose QBO refresh token expires within the warning window', () => {
+                expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, expiringSoon))).toBe(true);
+            });
+
+            it('returns false for a member, since only admins can reconnect', () => {
+                expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.USER, expiringSoon))).toBe(false);
+            });
+
+            it('returns false when the token is still far from expiring or the policy is undefined', () => {
+                expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, Math.floor(Date.now() / 1000) + 60 * 86400))).toBe(false);
+                expect(isQBORefreshTokenExpiringSoonSelector(undefined)).toBe(false);
+            });
         });
 
-        it('should return false when policy has BASIC approval mode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+        describe('isMergeHRCompleteSetupNeededSelector', () => {
+            // Only the fields read by the selector are modeled here; `Object.assign` attaches the connection
+            // to a real policy without an unsafe cast.
+            type MergeHRTestConnection = {
+                lastSync?: {syncStatus?: string};
+                data?: {groups?: unknown[]};
+                config?: {groups?: unknown[] | null};
             };
-            const result = hasDynamicExternalWorkflow(policy);
-            expect(result).toBe(false);
+            const buildMergeHRPolicy = (seed: number, mergeHR: MergeHRTestConnection): Policy => Object.assign(createRandomPolicy(seed), {connections: {merge_hris: mergeHR}});
+            const mergeHRBase = {
+                lastSync: {syncStatus: CONST.MERGE.SYNC_STATUS.DONE},
+                data: {groups: [{id: 'g1', name: 'Engineering'}]},
+            };
+
+            it('returns false when policy is undefined', () => {
+                expect(isMergeHRCompleteSetupNeededSelector(undefined)).toBe(false);
+            });
+
+            it('returns false when policy has no merge_hris connection', () => {
+                const policy = createRandomPolicy(1);
+                expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
+            });
+
+            it('returns false when sync is not done', () => {
+                const policy = buildMergeHRPolicy(2, {...mergeHRBase, lastSync: {syncStatus: CONST.MERGE.SYNC_STATUS.SYNCING}});
+                expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
+            });
+
+            it('returns false when sync is done but there are no groups', () => {
+                const policy = buildMergeHRPolicy(3, {...mergeHRBase, data: {groups: []}});
+                expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
+            });
+
+            it('returns false when setup is already complete (groups configured)', () => {
+                const policy = buildMergeHRPolicy(4, {...mergeHRBase, config: {groups: ['g1']}});
+                expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
+            });
+
+            it('returns true when sync is done, groups exist, and setup is not yet complete', () => {
+                const policy = buildMergeHRPolicy(5, mergeHRBase);
+                expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(true);
+            });
         });
 
-        it('should return false when policy has ADVANCED approval mode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const result = hasDynamicExternalWorkflow(policy);
-            expect(result).toBe(false);
+        describe('areSettingsInErrorFields', () => {
+            it('returns false when the settings or the error fields are undefined', () => {
+                // Given settings without error fields, and error fields without settings
+                const errorFields = {autoSync: {error: 'Sync failed'}};
+
+                // When checking either incomplete input
+                // Then there is nothing to match, so no error is reported
+                expect(areSettingsInErrorFields(undefined, errorFields)).toBe(false);
+                expect(areSettingsInErrorFields(['autoSync'], undefined)).toBe(false);
+            });
+
+            it('returns true when one of the settings has an error field', () => {
+                // Given error fields where only one of the requested settings has an error
+                const errorFields = {exporter: {error: 'Invalid exporter'}};
+
+                // When checking a list of settings that includes it
+                const result = areSettingsInErrorFields(['autoSync', 'exporter'], errorFields);
+
+                // Then the error is reported because a single matching setting is enough
+                expect(result).toBe(true);
+            });
+
+            it('returns false when none of the settings has an error field', () => {
+                // Given error fields for a setting that was not requested
+                const errorFields = {exporter: {error: 'Invalid exporter'}};
+
+                // When checking unrelated settings
+                const result = areSettingsInErrorFields(['autoSync', 'syncReimbursedReports'], errorFields);
+
+                // Then no error is reported for those settings
+                expect(result).toBe(false);
+            });
         });
 
-        it('should return false when policy has OPTIONAL approval mode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-            };
-            const result = hasDynamicExternalWorkflow(policy);
-            expect(result).toBe(false);
+        describe('settingsPendingAction', () => {
+            it('returns null when the settings or the pending fields are undefined', () => {
+                // Given settings without pending fields, and pending fields without settings
+                const pendingFields = {autoSync: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+
+                // When reading the pending action from either incomplete input
+                // Then null is returned to signal there is no pending action to show
+                expect(settingsPendingAction(undefined, pendingFields)).toBeNull();
+                expect(settingsPendingAction(['autoSync'], undefined)).toBeNull();
+            });
+
+            it('returns the pending action of the setting that has one', () => {
+                // Given pending fields where one of the requested settings is being updated
+                const pendingFields = {exporter: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+
+                // When reading the pending action for a list of settings that includes it
+                const result = settingsPendingAction(['autoSync', 'exporter'], pendingFields);
+
+                // Then that setting's pending action is returned so the UI can show it as pending
+                expect(result).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+            });
+
+            it('returns undefined when none of the settings has a pending field', () => {
+                // Given pending fields for a setting that was not requested
+                const pendingFields = {exporter: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+
+                // When reading the pending action for unrelated settings
+                const result = settingsPendingAction(['autoSync', 'syncReimbursedReports'], pendingFields);
+
+                // Then no pending action is returned
+                expect(result).toBeUndefined();
+            });
         });
+    });
 
-        it('should return false when policy is undefined', () => {
-            const result = hasDynamicExternalWorkflow(undefined);
-            expect(result).toBe(false);
+    describe('workflows', () => {
+        describe('hasDynamicExternalWorkflow', () => {
+            it('should return true when policy has DYNAMICEXTERNAL approval mode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL,
+                };
+                const result = hasDynamicExternalWorkflow(policy);
+                expect(result).toBe(true);
+            });
+
+            it('should return false when policy has BASIC approval mode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+                };
+                const result = hasDynamicExternalWorkflow(policy);
+                expect(result).toBe(false);
+            });
+
+            it('should return false when policy has ADVANCED approval mode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const result = hasDynamicExternalWorkflow(policy);
+                expect(result).toBe(false);
+            });
+
+            it('should return false when policy has OPTIONAL approval mode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                };
+                const result = hasDynamicExternalWorkflow(policy);
+                expect(result).toBe(false);
+            });
+
+            it('should return false when policy is undefined', () => {
+                const result = hasDynamicExternalWorkflow(undefined);
+                expect(result).toBe(false);
+            });
+
+            it('should return false when policy has no approvalMode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    approvalMode: undefined,
+                };
+                const result = hasDynamicExternalWorkflow(policy);
+                expect(result).toBe(false);
+            });
         });
 
-        it('should return false when policy has no approvalMode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                approvalMode: undefined,
-            };
-            const result = hasDynamicExternalWorkflow(policy);
-            expect(result).toBe(false);
+        describe('shouldHideDynamicExternalWorkflowPeople', () => {
+            it('returns false when the policy is undefined', () => {
+                expect(shouldHideDynamicExternalWorkflowPeople(undefined)).toBe(false);
+            });
+
+            it('returns true for a Dynamic External Workflow policy with the flag set', () => {
+                const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL, dynamicExternalWorkflowHidePeople: true};
+                expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(true);
+            });
+
+            // The backend only returns the flag when it is `true`, so an absent flag is the normal DEW case.
+            it('returns false for a Dynamic External Workflow policy without the flag', () => {
+                const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL};
+                expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(false);
+            });
+
+            it('returns false when a stale flag is left on a policy that no longer uses a Dynamic External Workflow', () => {
+                const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED, dynamicExternalWorkflowHidePeople: true};
+                expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(false);
+            });
         });
     });
 
@@ -3978,19 +4180,6 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('getTagApproverRule', () => {
-        it('should return undefined when no approval rules are present', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-                rules: {
-                    approvalRules: [],
-                },
-            };
-            const result = getTagApproverRule(policy, '');
-            expect(result).toBeUndefined();
-        });
-    });
-
     describe('tax', () => {
         describe('getAllTaxRatesNamesAndValues', () => {
             it('returns empty object when there are no policies or no tax rates', () => {
@@ -4305,93 +4494,130 @@ describe('PolicyUtils', () => {
         });
     });
 
-    it('should return undefined when no tag approver rule is present', () => {
-        const policy: Policy = {
-            ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-            rules: {
-                approvalRules: [
-                    {
-                        id: 'rule-1',
-                        applyWhen: [
-                            {
-                                field: CONST.POLICY.FIELDS.TAG,
-                                condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
-                                value: 'Fake tag',
-                            },
-                        ],
-                        approver: 'lol@hhh.com',
+    describe('features', () => {
+        describe('getDefaultTimeTrackingRate', () => {
+            it('should return rate in subunits', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1),
+                    units: {
+                        time: {
+                            enabled: true,
+                            rate: 20,
+                        },
                     },
-                ],
-            },
-        };
-        const result = getTagApproverRule(policy, 'NonExistentTag');
-        expect(result).toBeUndefined();
-    });
+                };
+                expect(getDefaultTimeTrackingRate(policy)).toBe(2000);
+            });
 
-    it('should return the tag approver rule when present', () => {
-        const tagName = 'ImportantTag';
-        const policy: Policy = {
-            ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
-            rules: {
-                approvalRules: [
-                    {
-                        id: 'rule-1',
-                        applyWhen: [
-                            {
-                                field: CONST.POLICY.FIELDS.TAG,
-                                condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
-                                value: tagName,
-                            },
-                        ],
-                        approver: 'approver@example.com',
+            it('should return 0 when the rate is 0, not undefined', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1),
+                    units: {
+                        time: {
+                            enabled: true,
+                            rate: 0,
+                        },
                     },
-                ],
-            },
-        };
-        const result = getTagApproverRule(policy, tagName);
-        expect(result).toEqual({
-            id: 'rule-1',
-            applyWhen: [
-                {
-                    field: CONST.POLICY.FIELDS.TAG,
-                    condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
-                    value: tagName,
-                },
-            ],
-            approver: 'approver@example.com',
+                };
+                expect(getDefaultTimeTrackingRate(policy)).toBe(0);
+            });
+
+            it('should return undefined when the rate is not defined on the policy', () => {
+                const policy = createRandomPolicy(1);
+                expect(getDefaultTimeTrackingRate(policy)).toBeUndefined();
+            });
         });
-    });
 
-    describe('getDefaultTimeTrackingRate', () => {
-        it('should return rate in subunits', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1),
-                units: {
-                    time: {
-                        enabled: true,
-                        rate: 20,
-                    },
-                },
-            };
-            expect(getDefaultTimeTrackingRate(policy)).toBe(2000);
-        });
+        describe('isInvoiceFieldsEnabled', () => {
+            it('returns true for a control policy with areInvoiceFieldsEnabled explicitly true', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: true};
+                expect(isInvoiceFieldsEnabled(policy)).toBe(true);
+            });
+
+            it('returns false for a control policy with areInvoiceFieldsEnabled explicitly false', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: false};
+                expect(isInvoiceFieldsEnabled(policy)).toBe(false);
+            });
+
+            it('returns false for a collect policy even when areInvoiceFieldsEnabled is true', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), areInvoiceFieldsEnabled: true};
+                expect(isInvoiceFieldsEnabled(policy)).toBe(false);
+            });
+
+            it('returns false for an undefined policy', () => {
+                expect(isInvoiceFieldsEnabled(undefined)).toBe(false);
+            });
+        });
+
+        describe('isPolicyFeatureEnabled for ARE_INVOICE_FIELDS_ENABLED', () => {
+            it('returns true for a control policy with invoice fields enabled', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: true};
+                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(true);
+            });
+
+            it('returns false for a collect policy even with areInvoiceFieldsEnabled true', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), areInvoiceFieldsEnabled: true};
+                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(false);
+            });
+
+            it('returns false for a control policy with invoice fields disabled', () => {
+                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: false};
+                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(false);
+            });
+        });
+
+        describe('arePolicyRulesEnabled', () => {
+            const corporateBase = createMock<Policy>({id: 'policy1', type: CONST.POLICY.TYPE.CORPORATE});
+            const teamBase = createMock<Policy>({id: 'policy2', type: CONST.POLICY.TYPE.TEAM});
+
+            it('returns true for a corporate policy with areRulesEnabled explicitly true', () => {
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: true})).toBe(true);
+            });
+
+            it('returns false for a corporate policy with areRulesEnabled explicitly false', () => {
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: false})).toBe(false);
+            });
+
+            it('returns false for a corporate policy with areRulesEnabled undefined and no categories', () => {
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined})).toBe(false);
+            });
+
+            it('returns false for a corporate policy with areRulesEnabled undefined and categories with no rule fields', () => {
+                const categories = {Advertising: {name: 'Advertising', enabled: true, 'GL Code': '1234'}};
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(false);
+            });
+
+            it('returns true for a corporate policy with areRulesEnabled undefined and a category with maxExpenseAmount set', () => {
+                const categories = {Advertising: {name: 'Advertising', enabled: true, maxExpenseAmount: 50000}};
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
+            });
 
-        it('should return 0 when the rate is 0, not undefined', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(1),
-                units: {
-                    time: {
-                        enabled: true,
-                        rate: 0,
-                    },
-                },
-            };
-            expect(getDefaultTimeTrackingRate(policy)).toBe(0);
-        });
+            it('returns true for a corporate policy with areRulesEnabled undefined and a category with maxAmountNoReceipt = 0', () => {
+                const categories = {Travel: {name: 'Travel', enabled: true, maxAmountNoReceipt: 0}};
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
+            });
+
+            it('returns true for a corporate policy with areRulesEnabled undefined and a category with areCommentsRequired = true', () => {
+                const categories = {Meals: {name: 'Meals', enabled: true, areCommentsRequired: true}};
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
+            });
+
+            it('returns true for a corporate policy with areRulesEnabled undefined and a category with commentHint set', () => {
+                const categories = {Car: {name: 'Car', enabled: true, commentHint: 'Enter purpose'}};
+                expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
+            });
+
+            it('returns false for a team policy with areRulesEnabled undefined', () => {
+                expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: undefined})).toBe(false);
+            });
+
+            it('returns true for a team policy with areRulesEnabled explicitly true', () => {
+                expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: true}, undefined)).toBe(true);
+            });
 
-        it('should return undefined when the rate is not defined on the policy', () => {
-            const policy = createRandomPolicy(1);
-            expect(getDefaultTimeTrackingRate(policy)).toBeUndefined();
+            it('returns false for a team policy with areRulesEnabled explicitly false', () => {
+                expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: false})).toBe(false);
+            });
         });
     });
 
@@ -4506,44 +4732,6 @@ describe('PolicyUtils', () => {
 
             expect(getActivePoliciesWithExpenseChatAndPerDiemEnabled(policies, undefined)).toHaveLength(0);
         });
-
-        describe('isInvoiceFieldsEnabled', () => {
-            it('returns true for a control policy with areInvoiceFieldsEnabled explicitly true', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: true};
-                expect(isInvoiceFieldsEnabled(policy)).toBe(true);
-            });
-
-            it('returns false for a control policy with areInvoiceFieldsEnabled explicitly false', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: false};
-                expect(isInvoiceFieldsEnabled(policy)).toBe(false);
-            });
-
-            it('returns false for a collect policy even when areInvoiceFieldsEnabled is true', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), areInvoiceFieldsEnabled: true};
-                expect(isInvoiceFieldsEnabled(policy)).toBe(false);
-            });
-
-            it('returns false for an undefined policy', () => {
-                expect(isInvoiceFieldsEnabled(undefined)).toBe(false);
-            });
-        });
-
-        describe('isPolicyFeatureEnabled for ARE_INVOICE_FIELDS_ENABLED', () => {
-            it('returns true for a control policy with invoice fields enabled', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: true};
-                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(true);
-            });
-
-            it('returns false for a collect policy even with areInvoiceFieldsEnabled true', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), areInvoiceFieldsEnabled: true};
-                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(false);
-            });
-
-            it('returns false for a control policy with invoice fields disabled', () => {
-                const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), areInvoiceFieldsEnabled: false};
-                expect(isPolicyFeatureEnabled(policy, CONST.POLICY.MORE_FEATURES.ARE_INVOICE_FIELDS_ENABLED)).toBe(false);
-            });
-        });
     });
 
     describe('sortPoliciesByName', () => {
@@ -4595,199 +4783,289 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('hasConfiguredRules', () => {
-        it('returns false when policy is undefined', () => {
-            expect(hasConfiguredRules(undefined, undefined, false)).toBe(false);
-        });
-
-        it('returns false when policy has no rules configured', () => {
-            expect(hasConfiguredRules(createMock<Policy>({}), undefined, false)).toBe(false);
-        });
-
-        describe('customRules', () => {
-            it('returns true when customRules is non-empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: 'some rule'}), undefined, false)).toBe(true);
-            });
-
-            it('returns false when customRules is an empty string', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: ''}), undefined, false)).toBe(false);
-            });
-
-            it('returns false when customRules is only whitespace', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: '   '}), undefined, false)).toBe(false);
-            });
-        });
-
-        describe('rules.approvalRules', () => {
-            it('returns true when approvalRules has items', () => {
-                const policy = createMock<Policy>({rules: {approvalRules: [{id: '1', applyWhen: [], approver: 'approver@test.com'}]}});
-                expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
+    describe('rules', () => {
+        describe('getTagApproverRule', () => {
+            it('should return undefined when no approval rules are present', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    rules: {
+                        approvalRules: [],
+                    },
+                };
+                const result = getTagApproverRule(policy, '');
+                expect(result).toBeUndefined();
             });
 
-            it('returns false when approvalRules is empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({rules: {approvalRules: []}}), undefined, false)).toBe(false);
+            it('should return undefined when no tag approver rule is present', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+                    rules: {
+                        approvalRules: [
+                            {
+                                id: 'rule-1',
+                                applyWhen: [
+                                    {
+                                        field: CONST.POLICY.FIELDS.TAG,
+                                        condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
+                                        value: 'Fake tag',
+                                    },
+                                ],
+                                approver: 'lol@hhh.com',
+                            },
+                        ],
+                    },
+                };
+                const result = getTagApproverRule(policy, 'NonExistentTag');
+                expect(result).toBeUndefined();
             });
-        });
 
-        describe('rules.expenseRules', () => {
-            it('returns true when expenseRules has items', () => {
-                const policy = createMock<Policy>({
+            it('should return the tag approver rule when present', () => {
+                const tagName = 'ImportantTag';
+                const policy: Policy = {
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
                     rules: {
-                        expenseRules: [
+                        approvalRules: [
                             {
-                                id: '1',
-                                applyWhen: [],
-                                tax: {field_id_TAX: {externalID: 'TAX_US'}},
+                                id: 'rule-1',
+                                applyWhen: [
+                                    {
+                                        field: CONST.POLICY.FIELDS.TAG,
+                                        condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
+                                        value: tagName,
+                                    },
+                                ],
+                                approver: 'approver@example.com',
                             },
                         ],
                     },
+                };
+                const result = getTagApproverRule(policy, tagName);
+                expect(result).toEqual({
+                    id: 'rule-1',
+                    applyWhen: [
+                        {
+                            field: CONST.POLICY.FIELDS.TAG,
+                            condition: CONST.POLICY.RULE_CONDITIONS.MATCHES,
+                            value: tagName,
+                        },
+                    ],
+                    approver: 'approver@example.com',
                 });
-                expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
-            });
-
-            it('returns false when expenseRules is empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({rules: {expenseRules: []}}), undefined, false)).toBe(false);
             });
         });
 
-        describe('merchant rules', () => {
-            // Which rules count towards this is decided by the caller's selector and covered in
-            // ExpenseDefaultRuleUtilsTest, so only the pass-through is checked here.
-            const policy = createMock<Policy>({id: 'policy1', rules: {}});
-
-            it('returns true when the policy has a merchant rule', () => {
-                expect(hasConfiguredRules(policy, undefined, true)).toBe(true);
+        describe('hasConfiguredRules', () => {
+            it('returns false when policy is undefined', () => {
+                expect(hasConfiguredRules(undefined, undefined, false)).toBe(false);
             });
 
-            it('returns false when it has none', () => {
-                expect(hasConfiguredRules(policy, undefined, false)).toBe(false);
+            it('returns false when policy has no rules configured', () => {
+                expect(hasConfiguredRules(createMock<Policy>({}), undefined, false)).toBe(false);
             });
-        });
 
-        describe('maxExpenseAmount', () => {
-            it('returns true when maxExpenseAmount is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: 500000}), undefined, false)).toBe(true);
-            });
+            describe('customRules', () => {
+                it('returns true when customRules is non-empty', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({customRules: 'some rule'}), undefined, false)).toBe(true);
+                });
 
-            it('returns false when maxExpenseAmount is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT}), undefined, false)).toBe(false);
-            });
+                it('returns false when customRules is an empty string', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({customRules: ''}), undefined, false)).toBe(false);
+                });
 
-            it('returns false when maxExpenseAmount is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                it('returns false when customRules is only whitespace', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({customRules: '   '}), undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('maxExpenseAge', () => {
-            it('returns true when maxExpenseAge is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: 30}), undefined, false)).toBe(true);
-            });
+            describe('rules.approvalRules', () => {
+                it('returns true when approvalRules has items', () => {
+                    const policy = createMock<Policy>({rules: {approvalRules: [{id: '1', applyWhen: [], approver: 'approver@test.com'}]}});
+                    expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
+                });
 
-            it('returns false when maxExpenseAge is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE}), undefined, false)).toBe(false);
+                it('returns false when approvalRules is empty', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({rules: {approvalRules: []}}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when maxExpenseAge is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
-            });
-        });
+            describe('rules.expenseRules', () => {
+                it('returns true when expenseRules has items', () => {
+                    const policy = createMock<Policy>({
+                        rules: {
+                            expenseRules: [
+                                {
+                                    id: '1',
+                                    applyWhen: [],
+                                    tax: {field_id_TAX: {externalID: 'TAX_US'}},
+                                },
+                            ],
+                        },
+                    });
+                    expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
+                });
 
-        describe('maxExpenseAmountNoReceipt', () => {
-            it('returns true when maxExpenseAmountNoReceipt is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: 5000}), undefined, false)).toBe(true);
+                it('returns false when expenseRules is empty', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({rules: {expenseRules: []}}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when maxExpenseAmountNoReceipt is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT}), undefined, false)).toBe(false);
-            });
+            describe('merchant rules', () => {
+                // Which rules count towards this is decided by the caller's selector and covered in
+                // ExpenseDefaultRuleUtilsTest, so only the pass-through is checked here.
+                const policy = createMock<Policy>({id: 'policy1', rules: {}});
+
+                it('returns true when the policy has a merchant rule', () => {
+                    expect(hasConfiguredRules(policy, undefined, true)).toBe(true);
+                });
 
-            it('returns false when maxExpenseAmountNoReceipt is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                it('returns false when it has none', () => {
+                    expect(hasConfiguredRules(policy, undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('maxExpenseAmountNoItemizedReceipt', () => {
-            it('returns true when maxExpenseAmountNoItemizedReceipt is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: 10000}), undefined, false)).toBe(true);
+            describe('maxExpenseAmount', () => {
+                it('returns true when maxExpenseAmount is set to a non-default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: 500000}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when maxExpenseAmount is the default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT}), undefined, false)).toBe(false);
+                });
+
+                it('returns false when maxExpenseAmount is the disabled value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when maxExpenseAmountNoItemizedReceipt is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT}), undefined, false)).toBe(false);
+            describe('maxExpenseAge', () => {
+                it('returns true when maxExpenseAge is set to a non-default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: 30}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when maxExpenseAge is the default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE}), undefined, false)).toBe(false);
+                });
+
+                it('returns false when maxExpenseAge is the disabled value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when maxExpenseAmountNoItemizedReceipt is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+            describe('maxExpenseAmountNoReceipt', () => {
+                it('returns true when maxExpenseAmountNoReceipt is set to a non-default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: 5000}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when maxExpenseAmountNoReceipt is the default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT}), undefined, false)).toBe(false);
+                });
+
+                it('returns false when maxExpenseAmountNoReceipt is the disabled value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('defaultBillable', () => {
-            it('returns true when defaultBillable is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: true}), undefined, false)).toBe(true);
+            describe('maxExpenseAmountNoItemizedReceipt', () => {
+                it('returns true when maxExpenseAmountNoItemizedReceipt is set to a non-default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: 10000}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when maxExpenseAmountNoItemizedReceipt is the default value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT}), undefined, false)).toBe(false);
+                });
+
+                it('returns false when maxExpenseAmountNoItemizedReceipt is the disabled value', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when defaultBillable is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: false}), undefined, false)).toBe(false);
+            describe('defaultBillable', () => {
+                it('returns true when defaultBillable is true', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({defaultBillable: true}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when defaultBillable is false', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({defaultBillable: false}), undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('defaultReimbursable', () => {
-            it('returns true when defaultReimbursable is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: false}), undefined, false)).toBe(true);
+            describe('defaultReimbursable', () => {
+                it('returns true when defaultReimbursable is false', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: false}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when defaultReimbursable is true', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: true}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when defaultReimbursable is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: true}), undefined, false)).toBe(false);
+            describe('eReceipts', () => {
+                it('returns true when eReceipts is true', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({eReceipts: true}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when eReceipts is false', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({eReceipts: false}), undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('eReceipts', () => {
-            it('returns true when eReceipts is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({eReceipts: true}), undefined, false)).toBe(true);
+            describe('requireCompanyCardsEnabled', () => {
+                it('returns true when requireCompanyCardsEnabled is true', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: true}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when requireCompanyCardsEnabled is false', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: false}), undefined, false)).toBe(false);
+                });
             });
 
-            it('returns false when eReceipts is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({eReceipts: false}), undefined, false)).toBe(false);
+            describe('prohibitedExpenses', () => {
+                it('returns true when a prohibitedExpenses value differs from its default', () => {
+                    // alcohol defaults to false — setting it to true triggers the rule
+                    expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {alcohol: true}}), undefined, false)).toBe(true);
+                });
+
+                it('returns true when gambling is disabled (differs from default true)', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {gambling: false}}), undefined, false)).toBe(true);
+                });
+
+                it('returns false when prohibitedExpenses matches all defaults', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {...CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES}}), undefined, false)).toBe(false);
+                });
+
+                it('returns false when prohibitedExpenses is an empty object', () => {
+                    expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {}}), undefined, false)).toBe(false);
+                });
             });
-        });
 
-        describe('requireCompanyCardsEnabled', () => {
-            it('returns true when requireCompanyCardsEnabled is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: true}), undefined, false)).toBe(true);
+            it('returns true when only Classic category rules exist', () => {
+                const categories = {Travel: {name: 'Travel', enabled: true, maxAmountNoReceipt: 0}};
+                expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(true);
             });
 
-            it('returns false when requireCompanyCardsEnabled is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: false}), undefined, false)).toBe(false);
+            it('returns false when categories have no active rule fields', () => {
+                const categories = {Advertising: {name: 'Advertising', enabled: true, 'GL Code': '1234'}};
+                expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(false);
             });
         });
 
-        describe('prohibitedExpenses', () => {
-            it('returns true when a prohibitedExpenses value differs from its default', () => {
-                // alcohol defaults to false — setting it to true triggers the rule
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {alcohol: true}}), undefined, false)).toBe(true);
+        describe('isMaxExpenseAmountSet', () => {
+            it('returns false when the amount was never set', () => {
+                expect(isMaxExpenseAmountSet(undefined)).toBe(false);
             });
 
-            it('returns true when gambling is disabled (differs from default true)', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {gambling: false}}), undefined, false)).toBe(true);
+            it('returns false when the amount is explicitly disabled', () => {
+                expect(isMaxExpenseAmountSet(CONST.DISABLED_MAX_EXPENSE_VALUE)).toBe(false);
             });
 
-            it('returns false when prohibitedExpenses matches all defaults', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {...CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES}}), undefined, false)).toBe(false);
+            it('returns true for an explicit 0, which means the receipt is always required', () => {
+                expect(isMaxExpenseAmountSet(0)).toBe(true);
             });
 
-            it('returns false when prohibitedExpenses is an empty object', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {}}), undefined, false)).toBe(false);
+            it('returns true for a positive amount', () => {
+                expect(isMaxExpenseAmountSet(5000)).toBe(true);
             });
         });
-
-        it('returns true when only Classic category rules exist', () => {
-            const categories = {Travel: {name: 'Travel', enabled: true, maxAmountNoReceipt: 0}};
-            expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(true);
-        });
-
-        it('returns false when categories have no active rule fields', () => {
-            const categories = {Advertising: {name: 'Advertising', enabled: true, 'GL Code': '1234'}};
-            expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(false);
-        });
     });
 
     describe('getExpensifyTeamExclusions', () => {
@@ -6186,46 +6464,6 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('hasPolicyRulesError', () => {
-        // Whether a merchant rule failed is reduced by the caller's selector and covered in
-        // ExpenseDefaultRuleUtilsTest, so only the agent rules and the pass-through are checked here.
-        const POLICY_ID = 'policy-with-rules';
-
-        it('returns false for an undefined policy', () => {
-            expect(hasPolicyRulesError(undefined, false)).toBe(false);
-        });
-
-        it('returns false when no merchant or agent rules exist', () => {
-            const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
-            expect(hasPolicyRulesError(policy, false)).toBe(false);
-        });
-
-        it('returns false when agent rules exist but none have errors', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                id: POLICY_ID,
-                rules: {agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08'}}},
-            };
-            expect(hasPolicyRulesError(policy, false)).toBe(false);
-        });
-
-        it('returns true when a merchant rule has errors', () => {
-            const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
-            expect(hasPolicyRulesError(policy, true)).toBe(true);
-        });
-
-        it('returns true when an agent rule has errors', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                id: POLICY_ID,
-                rules: {
-                    agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08', errors: {123: 'boom'}}},
-                },
-            };
-            expect(hasPolicyRulesError(policy, false)).toBe(true);
-        });
-    });
-
     describe('getExcludedUsers', () => {
         it('marks every active policy member as excluded', () => {
             const result = getExcludedUsers(employeeList);
@@ -6263,72 +6501,6 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('isQBORefreshTokenExpiringSoonSelector', () => {
-        const buildQBOPolicy = (role: string, refreshTokenExpiresAt: number): Policy =>
-            Object.assign(createRandomPolicy(1), {
-                role,
-                connections: {quickbooksOnline: {config: {credentials: {companyID: '12345', refreshTokenExpiresAt}}, lastSync: {isAuthenticationError: false}}},
-            });
-        const expiringSoon = Math.floor(Date.now() / 1000) + 3 * 86400;
-
-        it('returns true for an admin whose QBO refresh token expires within the warning window', () => {
-            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, expiringSoon))).toBe(true);
-        });
-
-        it('returns false for a member, since only admins can reconnect', () => {
-            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.USER, expiringSoon))).toBe(false);
-        });
-
-        it('returns false when the token is still far from expiring or the policy is undefined', () => {
-            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, Math.floor(Date.now() / 1000) + 60 * 86400))).toBe(false);
-            expect(isQBORefreshTokenExpiringSoonSelector(undefined)).toBe(false);
-        });
-    });
-
-    describe('isMergeHRCompleteSetupNeededSelector', () => {
-        // Only the fields read by the selector are modeled here; `Object.assign` attaches the connection
-        // to a real policy without an unsafe cast.
-        type MergeHRTestConnection = {
-            lastSync?: {syncStatus?: string};
-            data?: {groups?: unknown[]};
-            config?: {groups?: unknown[] | null};
-        };
-        const buildMergeHRPolicy = (seed: number, mergeHR: MergeHRTestConnection): Policy => Object.assign(createRandomPolicy(seed), {connections: {merge_hris: mergeHR}});
-        const mergeHRBase = {
-            lastSync: {syncStatus: CONST.MERGE.SYNC_STATUS.DONE},
-            data: {groups: [{id: 'g1', name: 'Engineering'}]},
-        };
-
-        it('returns false when policy is undefined', () => {
-            expect(isMergeHRCompleteSetupNeededSelector(undefined)).toBe(false);
-        });
-
-        it('returns false when policy has no merge_hris connection', () => {
-            const policy = createRandomPolicy(1);
-            expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
-        });
-
-        it('returns false when sync is not done', () => {
-            const policy = buildMergeHRPolicy(2, {...mergeHRBase, lastSync: {syncStatus: CONST.MERGE.SYNC_STATUS.SYNCING}});
-            expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
-        });
-
-        it('returns false when sync is done but there are no groups', () => {
-            const policy = buildMergeHRPolicy(3, {...mergeHRBase, data: {groups: []}});
-            expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
-        });
-
-        it('returns false when setup is already complete (groups configured)', () => {
-            const policy = buildMergeHRPolicy(4, {...mergeHRBase, config: {groups: ['g1']}});
-            expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(false);
-        });
-
-        it('returns true when sync is done, groups exist, and setup is not yet complete', () => {
-            const policy = buildMergeHRPolicy(5, mergeHRBase);
-            expect(isMergeHRCompleteSetupNeededSelector(policy)).toBe(true);
-        });
-    });
-
     describe('connections', () => {
         describe('getUberConnectionErrorDirectlyFromPolicy', () => {
             it('should return true if Uber connection is enabled and has an error', () => {
@@ -6710,78 +6882,6 @@ describe('PolicyUtils', () => {
     });
 });
 
-describe('isMaxExpenseAmountSet', () => {
-    it('returns false when the amount was never set', () => {
-        expect(isMaxExpenseAmountSet(undefined)).toBe(false);
-    });
-
-    it('returns false when the amount is explicitly disabled', () => {
-        expect(isMaxExpenseAmountSet(CONST.DISABLED_MAX_EXPENSE_VALUE)).toBe(false);
-    });
-
-    it('returns true for an explicit 0, which means the receipt is always required', () => {
-        expect(isMaxExpenseAmountSet(0)).toBe(true);
-    });
-
-    it('returns true for a positive amount', () => {
-        expect(isMaxExpenseAmountSet(5000)).toBe(true);
-    });
-});
-
-describe('arePolicyRulesEnabled', () => {
-    const corporateBase = createMock<Policy>({id: 'policy1', type: CONST.POLICY.TYPE.CORPORATE});
-    const teamBase = createMock<Policy>({id: 'policy2', type: CONST.POLICY.TYPE.TEAM});
-
-    it('returns true for a corporate policy with areRulesEnabled explicitly true', () => {
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: true})).toBe(true);
-    });
-
-    it('returns false for a corporate policy with areRulesEnabled explicitly false', () => {
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: false})).toBe(false);
-    });
-
-    it('returns false for a corporate policy with areRulesEnabled undefined and no categories', () => {
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined})).toBe(false);
-    });
-
-    it('returns false for a corporate policy with areRulesEnabled undefined and categories with no rule fields', () => {
-        const categories = {Advertising: {name: 'Advertising', enabled: true, 'GL Code': '1234'}};
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(false);
-    });
-
-    it('returns true for a corporate policy with areRulesEnabled undefined and a category with maxExpenseAmount set', () => {
-        const categories = {Advertising: {name: 'Advertising', enabled: true, maxExpenseAmount: 50000}};
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
-    });
-
-    it('returns true for a corporate policy with areRulesEnabled undefined and a category with maxAmountNoReceipt = 0', () => {
-        const categories = {Travel: {name: 'Travel', enabled: true, maxAmountNoReceipt: 0}};
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
-    });
-
-    it('returns true for a corporate policy with areRulesEnabled undefined and a category with areCommentsRequired = true', () => {
-        const categories = {Meals: {name: 'Meals', enabled: true, areCommentsRequired: true}};
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
-    });
-
-    it('returns true for a corporate policy with areRulesEnabled undefined and a category with commentHint set', () => {
-        const categories = {Car: {name: 'Car', enabled: true, commentHint: 'Enter purpose'}};
-        expect(arePolicyRulesEnabled({...corporateBase, areRulesEnabled: undefined}, categories)).toBe(true);
-    });
-
-    it('returns false for a team policy with areRulesEnabled undefined', () => {
-        expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: undefined})).toBe(false);
-    });
-
-    it('returns true for a team policy with areRulesEnabled explicitly true', () => {
-        expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: true}, undefined)).toBe(true);
-    });
-
-    it('returns false for a team policy with areRulesEnabled explicitly false', () => {
-        expect(arePolicyRulesEnabled({...teamBase, areRulesEnabled: false})).toBe(false);
-    });
-});
-
 describe('getDefaultChatEnabledPolicy', () => {
     const submitPolicy = {...createRandomPolicy(1, CONST.POLICY.TYPE.SUBMIT), id: 'submit1'};
     const teamPolicy = {...createRandomPolicy(2, CONST.POLICY.TYPE.TEAM), id: 'team1'};
@@ -7010,25 +7110,3 @@ describe('isMemberInHomeAndOfficeWorkspace', () => {
         expect(isEligibleForUnknownMember).toBe(false);
     });
 });
-
-describe('shouldHideDynamicExternalWorkflowPeople', () => {
-    it('returns false when the policy is undefined', () => {
-        expect(shouldHideDynamicExternalWorkflowPeople(undefined)).toBe(false);
-    });
-
-    it('returns true for a Dynamic External Workflow policy with the flag set', () => {
-        const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL, dynamicExternalWorkflowHidePeople: true};
-        expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(true);
-    });
-
-    // The backend only returns the flag when it is `true`, so an absent flag is the normal DEW case.
-    it('returns false for a Dynamic External Workflow policy without the flag', () => {
-        const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL};
-        expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(false);
-    });
-
-    it('returns false when a stale flag is left on a policy that no longer uses a Dynamic External Workflow', () => {
-        const policy: Policy = {...createRandomPolicy(0), approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED, dynamicExternalWorkflowHidePeople: true};
-        expect(shouldHideDynamicExternalWorkflowPeople(policy)).toBe(false);
-    });
-});

From c41c003264333813ce700d628a795131d40d341f Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 09:08:04 +0200
Subject: [PATCH 626/781] fix: limit dynamic form date of birth picker to
 accepted ages

---
 .../DynamicForm/renderers/textRenderers.tsx   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/DynamicForm/renderers/textRenderers.tsx b/src/components/DynamicForm/renderers/textRenderers.tsx
index 9e7167883672..7a240126b953 100644
--- a/src/components/DynamicForm/renderers/textRenderers.tsx
+++ b/src/components/DynamicForm/renderers/textRenderers.tsx
@@ -14,6 +14,7 @@ import type {DynamicFormNumberField, DynamicFormTextField} from '@src/types/onyx
 
 import type {InputModeOptions} from 'react-native';
 
+import {subYears} from 'date-fns';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -70,17 +71,23 @@ function renderTextInput(
 const TEXT_RENDERERS: Pick<DynamicFieldRendererMap, 'text' | 'number' | 'date' | 'amount' | 'percent'> = {
     text: (field, context, inputProps) => renderTextInput(field, context, inputProps, getTextInputMode(field), field.multiline),
     number: (field, context, inputProps) => renderTextInput(field, context, inputProps, CONST.INPUT_MODE.NUMERIC),
-    date: (field, {translate}, inputProps) => ({
-        isMenuRow: false,
-        input: (
-            <InputWrapper
-                InputComponent={DatePicker}
-                {...inputProps}
-                label={getFieldLabel(field, translate)}
-                placeholder={translate('common.dateFormat')}
-            />
-        ),
-    }),
+    date: (field, {translate}, inputProps) => {
+        const isDateOfBirth = field.rule === 'dateOfBirth';
+        return {
+            isMenuRow: false,
+            input: (
+                <InputWrapper
+                    InputComponent={DatePicker}
+                    {...inputProps}
+                    label={getFieldLabel(field, translate)}
+                    placeholder={translate('common.dateFormat')}
+                    // A date of birth can only be picked within the ages getDynamicFieldErrors accepts
+                    minDate={isDateOfBirth ? subYears(new Date(), CONST.DATE_BIRTH.MAX_AGE) : undefined}
+                    maxDate={isDateOfBirth ? subYears(new Date(), CONST.DATE_BIRTH.MIN_AGE_FOR_PAYMENT) : undefined}
+                />
+            ),
+        };
+    },
     amount: (field, {values, translate, styles, currency}, inputProps) => {
         const chosenCurrency = field.currencyKey ? values[field.currencyKey] : undefined;
         const amountCurrency = typeof chosenCurrency === 'string' && chosenCurrency !== '' ? chosenCurrency : currency;

From 228ed2798b135553d9f4d9d48d591102f069dc67 Mon Sep 17 00:00:00 2001
From: "ahmedGaber93 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 07:26:00 +0000
Subject: [PATCH 627/781] Send complete wallet details after the phone
 validateCode and show failures

The validateCode screen rebuilt the personal details from the form draft, which only
holds fields the user edited, so pre-filled values like the legal name were sent empty
and the request failed with no Onyx data. The screen then treated the failure as success
and looped back to the form. Save all submitted details to the draft before opening the
screen, and set a generic error on failure so it is never treated as success.

Co-authored-by: ahmedGaber93 <ahmedGaber93@users.noreply.github.com>
---
 src/libs/actions/Wallet.ts                    | 14 ++++++++
 .../shared/useWalletPhoneValidateCode.ts      | 14 ++++++++
 tests/unit/useWalletPhoneMagicCodeTest.tsx    | 33 +++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index 2102aa1cece2..9731f39a7092 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -1,6 +1,7 @@
 import * as API from '@libs/API';
 import type {AcceptWalletTermsParams, AnswerQuestionsForWalletParams, UpdatePersonalDetailsForWalletParams, VerifyIdentityParams} from '@libs/API/parameters';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import Log from '@libs/Log';
 
 import CONST from '@src/CONST';
@@ -86,6 +87,18 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
         },
     ];
 
+    // Some failures (e.g. a missing field) come back without any Onyx data, so set an error here to keep the flow from
+    // treating the request as successful.
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.WALLET_ADDITIONAL_DETAILS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
+            value: {
+                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+            },
+        },
+    ];
+
     const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -98,6 +111,7 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
 
     API.write(WRITE_COMMANDS.UPDATE_PERSONAL_DETAILS_FOR_WALLET, personalDetails, {
         optimisticData,
+        failureData,
         finallyData,
     });
 }
diff --git a/src/pages/EnablePayments/shared/useWalletPhoneValidateCode.ts b/src/pages/EnablePayments/shared/useWalletPhoneValidateCode.ts
index 5c266c0cb7c3..a77744673f13 100644
--- a/src/pages/EnablePayments/shared/useWalletPhoneValidateCode.ts
+++ b/src/pages/EnablePayments/shared/useWalletPhoneValidateCode.ts
@@ -4,6 +4,7 @@ import type {UpdatePersonalDetailsForWalletParams} from '@libs/API/parameters';
 import Navigation from '@libs/Navigation/Navigation';
 import {parsePhoneNumber} from '@libs/PhoneNumber';
 
+import {setDraftValues} from '@userActions/FormActions';
 import {updatePersonalDetails} from '@userActions/Wallet';
 
 import CONST from '@src/CONST';
@@ -32,6 +33,19 @@ function useWalletPhoneValidateCode(getValidateCodeRoute: () => Route = ROUTES.S
         const normalizedStoredPhoneNumber = (storedPhoneNumber && parsePhoneNumber(storedPhoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '';
         const isSettingPhoneNumber = !!personalDetails.phoneNumber && personalDetails.phoneNumber !== normalizedStoredPhoneNumber;
         if (isSettingPhoneNumber) {
+            // The validateCode screen rebuilds the details from the form draft, which only holds the fields the user
+            // edited. Save everything being submitted so pre-filled values (e.g. the legal name) are not sent empty.
+            setDraftValues(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS, {
+                legalFirstName: personalDetails.legalFirstName,
+                legalLastName: personalDetails.legalLastName,
+                addressStreet: personalDetails.addressStreet,
+                addressCity: personalDetails.addressCity,
+                addressState: personalDetails.addressState,
+                addressZipCode: personalDetails.addressZip,
+                dob: personalDetails.dob,
+                ssn: personalDetails.ssn,
+                phoneNumber: personalDetails.phoneNumber,
+            });
             Navigation.navigate(getValidateCodeRoute());
             return;
         }
diff --git a/tests/unit/useWalletPhoneMagicCodeTest.tsx b/tests/unit/useWalletPhoneMagicCodeTest.tsx
index 64ad7464f514..cea56914cb2b 100644
--- a/tests/unit/useWalletPhoneMagicCodeTest.tsx
+++ b/tests/unit/useWalletPhoneMagicCodeTest.tsx
@@ -10,6 +10,7 @@ import ROUTES from '@src/ROUTES';
 
 import Onyx from 'react-native-onyx';
 
+import getOnyxValue from '../utils/getOnyxValue';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const mockUpdatePersonalDetails = jest.fn();
@@ -110,6 +111,38 @@ describe('useWalletPhoneValidateCode', () => {
         expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SETTINGS_ENABLE_PAYMENTS_CONFIRM_VALIDATE_CODE.getRoute());
     });
 
+    it('saves every submitted detail to the form draft before routing to the validateCode screen', async () => {
+        // Given a stored phone number and a form draft that only holds the field the user edited, since pre-filled
+        // values (e.g. the legal name) are never drafted
+        await act(async () => {
+            await setStoredPhoneNumber(STORED_PHONE_NUMBER_WITH_COUNTRY_CODE);
+            await Onyx.set(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT, {phoneNumber: CHANGED_PHONE_NUMBER});
+            await waitForBatchedUpdates();
+        });
+        const {result} = await renderWalletPhoneValidateCode();
+
+        // When the phone number is changed, which holds the submission until the validateCode is entered
+        await act(async () => {
+            result.current.submitPersonalDetails(buildParams({phoneNumber: CHANGED_PHONE_NUMBER}));
+            await waitForBatchedUpdates();
+        });
+
+        // Then the draft holds every submitted detail, so the validateCode screen sends the complete request
+        const draft = await getOnyxValue(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT);
+        expect(draft).toEqual({
+            legalFirstName: 'Alberta',
+            legalLastName: 'Charleson',
+            addressStreet: '123 Main St',
+            addressCity: 'City',
+            addressState: 'CA',
+            addressZipCode: '90001',
+            dob: '2000-08-08',
+            ssn: '123456789',
+            phoneNumber: CHANGED_PHONE_NUMBER,
+        });
+        expect(mockUpdatePersonalDetails).not.toHaveBeenCalled();
+    });
+
     it('routes to the validateCode screen of the calling flow when it provides its own route', async () => {
         // Given the IOU pay flow, which must open the validateCode screen on top of itself rather than the Settings wallet one
         const payFlowRoute: Route = ROUTES.ENABLE_PAYMENTS;

From 92e25c6f4f81b8cfcab395ae8dbf9775f50c8dd3 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 09:35:01 +0200
Subject: [PATCH 628/781] fix: share one row renderer in ConfirmationStep to
 satisfy lint seatbelt

---
 .../SubStepForms/ConfirmationStep.tsx         | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/components/SubStepForms/ConfirmationStep.tsx b/src/components/SubStepForms/ConfirmationStep.tsx
index 922f6de62617..84e10a568e2a 100644
--- a/src/components/SubStepForms/ConfirmationStep.tsx
+++ b/src/components/SubStepForms/ConfirmationStep.tsx
@@ -106,6 +106,21 @@ function ConfirmationStep({
 
     const {paddingBottom: safeAreaInsetPaddingBottom} = useSafeAreaPaddings();
 
+    const renderRow = ({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}: SummaryItem) => (
+        <MenuItemWithTopDescription
+            key={id}
+            pressableTestID={testID ?? id}
+            description={description}
+            title={title}
+            shouldShowRightIcon={shouldShowRightIcon}
+            onPress={onPress}
+            interactive={interactive}
+            brickRoadIndicator={brickRoadIndicator}
+            errorText={errorText}
+            forwardedFSClass={forwardedFSClass}
+        />
+    );
+
     return (
         <ScrollView
             style={styles.flex1}
@@ -113,20 +128,7 @@ function ConfirmationStep({
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{pageTitle}</Text>
             {!!pageSubtitle && <Text style={[styles.textSupporting, styles.ph5, styles.mb5]}>{pageSubtitle}</Text>}
-            {summaryItems.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
-                <MenuItemWithTopDescription
-                    key={id}
-                    pressableTestID={testID ?? id}
-                    description={description}
-                    title={title}
-                    shouldShowRightIcon={shouldShowRightIcon}
-                    onPress={onPress}
-                    interactive={interactive}
-                    brickRoadIndicator={brickRoadIndicator}
-                    errorText={errorText}
-                    forwardedFSClass={forwardedFSClass}
-                />
-            ))}
+            {summaryItems.map(renderRow)}
 
             {groups.map((group, index) => (
                 <View key={group.id}>
@@ -139,20 +141,7 @@ function ConfirmationStep({
                             {group.name}
                         </Text>
                     )}
-                    {group.rows.map(({id, description, title, shouldShowRightIcon, onPress, interactive, brickRoadIndicator, errorText, testID}) => (
-                        <MenuItemWithTopDescription
-                            key={id}
-                            pressableTestID={testID ?? id}
-                            description={description}
-                            title={title}
-                            shouldShowRightIcon={shouldShowRightIcon}
-                            onPress={onPress}
-                            interactive={interactive}
-                            brickRoadIndicator={brickRoadIndicator}
-                            errorText={errorText}
-                            forwardedFSClass={forwardedFSClass}
-                        />
-                    ))}
+                    {group.rows.map(renderRow)}
                 </View>
             ))}
 

From 7c6cc2276526d689afba2a6015ee54f2634ca812 Mon Sep 17 00:00:00 2001
From: "ahmedGaber93 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 08:36:32 +0000
Subject: [PATCH 629/781] Remove generic failureData from updatePersonalDetails
 and rely on the backend WALLET_ADDITIONAL_DETAILS error

Co-authored-by: ahmedGaber93 <ahmedGaber93@users.noreply.github.com>
---
 src/libs/actions/Wallet.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index 9731f39a7092..2102aa1cece2 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -1,7 +1,6 @@
 import * as API from '@libs/API';
 import type {AcceptWalletTermsParams, AnswerQuestionsForWalletParams, UpdatePersonalDetailsForWalletParams, VerifyIdentityParams} from '@libs/API/parameters';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
-import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import Log from '@libs/Log';
 
 import CONST from '@src/CONST';
@@ -87,18 +86,6 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
         },
     ];
 
-    // Some failures (e.g. a missing field) come back without any Onyx data, so set an error here to keep the flow from
-    // treating the request as successful.
-    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.WALLET_ADDITIONAL_DETAILS>> = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
-            value: {
-                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
-            },
-        },
-    ];
-
     const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -111,7 +98,6 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
 
     API.write(WRITE_COMMANDS.UPDATE_PERSONAL_DETAILS_FOR_WALLET, personalDetails, {
         optimisticData,
-        failureData,
         finallyData,
     });
 }

From c84fd57f2466e6ea09caed6fb354024dab18a41f Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 14 Oct 2026 10:37:10 +0200
Subject: [PATCH 630/781] fix: mWeb offline indicator sits on the tab bar like
 iOS, footer and indicator clear the bottom safe area

---
 .../useTabBarCoveredHeight/index.ts            |  6 ++++--
 .../useTabRootScreenWrapperProps/index.ios.tsx |  2 +-
 .../useTabRootScreenWrapperProps/index.tsx     |  3 ++-
 src/pages/Search/SearchPageNarrow/index.tsx    |  2 +-
 src/styles/index.ts                            | 18 +++++++++---------
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts
index 1c05afaa8f8e..02febb16d947 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabBarCoveredHeight/index.ts
@@ -1,12 +1,14 @@
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 
 import variables from '@styles/variables';
 
-/** The floating tab bar and the gap under it cover the bottom of a narrow tab root screen. */
+/** The floating tab bar, the gap under it and the bottom safe area it sits on cover the bottom of a narrow tab root screen. */
 function useTabBarCoveredHeight(): number {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {paddingBottom: safeAreaPaddingBottom} = useSafeAreaPaddings(true);
 
-    return shouldUseNarrowLayout ? variables.floatingTabBarHeight + variables.floatingTabBarBottomInset : 0;
+    return shouldUseNarrowLayout ? variables.floatingTabBarHeight + variables.floatingTabBarBottomInset + safeAreaPaddingBottom : 0;
 }
 
 export default useTabBarCoveredHeight;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
index 1f4249c73266..c7176d66e24b 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.ios.tsx
@@ -26,7 +26,7 @@ function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['sel
 
     return {
         enableEdgeToEdgeBottomSafeAreaPadding: false,
-        offlineIndicatorStyle: styles.nativeTabBarOfflineIndicator(tabBarCoveredHeight),
+        offlineIndicatorStyle: styles.tabBarOfflineIndicator(tabBarCoveredHeight),
     };
 }
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
index 009834598c06..7826ebaec323 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps/index.tsx
@@ -12,7 +12,8 @@ import TabBarBottomContent from '..';
 
 /**
  * On narrow layouts the floating tab bar is laid over the bottom of a tab root screen, so the content runs under it
- * down to the bottom edge of the screen. Each tab root's list and the offline indicator end with room for the bar.
+ * down to the bottom edge of the screen. Each tab root's list ends with room for the bar, and the offline indicator sits
+ * on the bar with its background running down to the bottom edge.
  */
 function useTabRootScreenWrapperProps(selectedTab: TabBarBottomContentProps['selectedTab']): TabRootScreenWrapperProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 4bf250fba847..28e04ea561cf 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -275,7 +275,7 @@ function SearchPageNarrow({
                     shouldEnableMaxHeight
                     shouldShowOfflineIndicator={!!searchResults}
                     {...tabRootScreenWrapperProps}
-                    offlineIndicatorStyle={[styles.mtAuto, footerHeight > 0 ? styles.tabBarOfflineIndicator(footerHeight) : tabRootScreenWrapperProps.offlineIndicatorStyle]}
+                    offlineIndicatorStyle={[styles.mtAuto, footerHeight > 0 ? styles.offlineIndicatorAboveFooter(footerHeight) : tabRootScreenWrapperProps.offlineIndicatorStyle]}
                 >
                     <View style={[styles.flex1, styles.overflowHidden]}>
                         {!isMobileSelectionModeEnabled ? (
diff --git a/src/styles/index.ts b/src/styles/index.ts
index fbdb95751f34..26130b914413 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -7096,27 +7096,27 @@ const staticStyles = (theme: ThemeColors) =>
 
 const dynamicStyles = (theme: ThemeColors) =>
     ({
-        // The tab bar is laid over the bottom of a tab root screen, so the offline indicator floats above it without
-        // shrinking the content that runs under the bar.
-        tabBarOfflineIndicator: (bottom: number) =>
+        // Floats the offline indicator above a footer laid over the bottom of a tab root screen, without shrinking the
+        // content that runs under the footer.
+        offlineIndicatorAboveFooter: (footerHeight: number) =>
             ({
                 position: 'absolute',
                 right: 0,
-                bottom,
+                bottom: footerHeight,
                 left: 0,
                 backgroundColor: theme.appBG,
             }) satisfies ViewStyle,
 
-        // Fills the screen from the top of the native tab bar down to the bottom edge, so no content shows between
-        // the offline indicator and the bar.
-        nativeTabBarOfflineIndicator: (tabBarHeight: number) =>
+        // Fills the screen from the top of the tab bar down to the bottom edge, so no content shows between the
+        // offline indicator and the bar.
+        tabBarOfflineIndicator: (tabBarCoveredHeight: number) =>
             ({
                 position: 'absolute',
                 right: 0,
                 bottom: 0,
                 left: 0,
-                height: CONST.OFFLINE_INDICATOR_HEIGHT + tabBarHeight,
-                paddingBottom: tabBarHeight,
+                height: CONST.OFFLINE_INDICATOR_HEIGHT + tabBarCoveredHeight,
+                paddingBottom: tabBarCoveredHeight,
                 backgroundColor: theme.appBG,
             }) satisfies ViewStyle,
 

From e1e532912c9322bff965b559e539bfe362472818 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 08:54:44 +0000
Subject: [PATCH 631/781] Keep ArrowDown wrapping on the invite list while
 ArrowUp from the first row still reaches the search input

Co-authored-by: huult <huult@users.noreply.github.com>
---
 .../hooks/useSelectionListKeyboardFocus.ts    |  3 +-
 src/hooks/useArrowKeyFocusManager.ts          | 12 ++++---
 tests/unit/useArrowKeyFocusManagerTest.ts     | 31 +++++++++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
index 4212d475e512..62b8561cc370 100644
--- a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
+++ b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
@@ -84,8 +84,7 @@ function useSelectionListKeyboardFocus({
         },
         setHasKeyBeenPressed,
         isFocused,
-        // Negative indexes let ArrowUp break out past a disabled section header at index 0
-        disableCyclicTraversal: shouldAllowArrowUpToSearchInput,
+        // Negative indexes let ArrowUp leave the first row (even past a disabled section header at index 0) while ArrowDown still wraps
         allowNegativeIndexes: shouldAllowArrowUpToSearchInput,
         onArrowUpDownCallback: () => {
             setShouldDisableHoverStyle(true);
diff --git a/src/hooks/useArrowKeyFocusManager.ts b/src/hooks/useArrowKeyFocusManager.ts
index ce414d7a5831..cc5dc846b085 100644
--- a/src/hooks/useArrowKeyFocusManager.ts
+++ b/src/hooks/useArrowKeyFocusManager.ts
@@ -49,6 +49,7 @@ type UseArrowKeyFocusManager = [number, (index: number, shouldScrollHint?: boole
  * @param [config.itemsPerRow] – The number of items per row. If provided, the arrow keys will move focus horizontally as well as vertically
  * @param [config.disableCyclicTraversal] – Whether to disable cyclic traversal of the list. If true, the arrow keys will have no effect when the first or last item is focused
  * @param [config.allowHorizontalArrowKeys] – Whether to enable the right/left keys
+ * @param [config.allowNegativeIndexes] – Whether ArrowUp from the first enabled item moves focus to -1 (for example, back to a search input), even when cyclic traversal is on
  * @param [config.isFocused] Whether navigation is focused
  */
 export default function useArrowKeyFocusManager({
@@ -114,7 +115,8 @@ export default function useArrowKeyFocusManager({
         if (maxIndex < 0 || !isFocused) {
             return;
         }
-        const nextIndex = disableCyclicTraversal ? -1 : maxIndex;
+        // With negative indexes allowed, ArrowUp from the first item moves to -1 even when ArrowDown still wraps
+        const nextIndex = disableCyclicTraversal || allowNegativeIndexes ? -1 : maxIndex;
         setHasKeyBeenPressed?.();
         setFocusedIndexInternal((actualIndex) => {
             const currentFocusedIndex = actualIndex > 0 ? actualIndex - (itemsPerRow ?? 1) : nextIndex;
@@ -123,12 +125,12 @@ export default function useArrowKeyFocusManager({
             while (disabledIndexes.includes(newFocusedIndex)) {
                 newFocusedIndex -= itemsPerRow ?? 1;
                 if (newFocusedIndex < 0) {
-                    if (disableCyclicTraversal) {
-                        if (!allowNegativeIndexes) {
-                            return actualIndex;
-                        }
+                    if (allowNegativeIndexes) {
                         break;
                     }
+                    if (disableCyclicTraversal) {
+                        return actualIndex;
+                    }
                     newFocusedIndex = maxIndex;
                 }
                 if (newFocusedIndex === currentFocusedIndex) {
diff --git a/tests/unit/useArrowKeyFocusManagerTest.ts b/tests/unit/useArrowKeyFocusManagerTest.ts
index c4e75c13a550..386d76cc0155 100644
--- a/tests/unit/useArrowKeyFocusManagerTest.ts
+++ b/tests/unit/useArrowKeyFocusManagerTest.ts
@@ -209,4 +209,35 @@ describe('useArrowKeyFocusManager', () => {
         // Then focus returns to the first row, skipping the header
         expect(result.current[0]).toBe(1);
     });
+
+    it('moves ArrowUp from the first row to -1 but still wraps ArrowDown from the last row when only negative indexes are allowed', () => {
+        // Given a sectioned list (header at index 0) that lets ArrowUp leave the list but keeps cyclic traversal on
+        const {result} = renderHook(() =>
+            useArrowKeyFocusManager({
+                maxIndex: 3,
+                initialFocusedIndex: 3,
+                disabledIndexes: [0],
+                allowNegativeIndexes: true,
+                isActive: true,
+            }),
+        );
+
+        // When ArrowDown is pressed on the last row
+        pressArrowDown();
+
+        // Then focus wraps to the first row, skipping the header
+        expect(result.current[0]).toBe(1);
+
+        // When ArrowUp is pressed on the first row
+        pressArrowUp();
+
+        // Then focus leaves the rows for the search input instead of wrapping to the last row
+        expect(result.current[0]).toBe(-1);
+
+        // When ArrowDown is pressed from the search input
+        pressArrowDown();
+
+        // Then focus returns to the first row
+        expect(result.current[0]).toBe(1);
+    });
 });

From 75ff5c8c15ac9db859b34de5423dfcfa0aec12c6 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 09:07:38 +0000
Subject: [PATCH 632/781] Update version to 9.5.8-5

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 85d4aee072a0..908595d69be6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050804
-        versionName "9.5.8-4"
+        versionCode 1009050805
+        versionName "9.5.8-5"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index e09fb2b24b29..c7dac0e9bdaa 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.4</string>
+	<string>9.5.8.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 22acf7c996d6..0327d387b87a 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.8</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.4</string>
+	<string>9.5.8.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index b8b01434878f..91e619206302 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.8</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.4</string>
+	<string>9.5.8.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 17a308b5253d..96ae4a79dd75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.8-4",
+  "version": "9.5.8-5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.8-4",
+      "version": "9.5.8-5",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 5203b34d11ed..ed417b921076 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.8-4",
+  "version": "9.5.8-5",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From efd02d70fb44efe1a7cdca52e1b5d7ee5c949311 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 09:07:38 +0000
Subject: [PATCH 633/781] Update Mobile-Expensify submodule version to 9.5.8-5

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 903b4645c4e9..1fe3f8d3c912 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 903b4645c4e95b2a637d496db39b940292b84804
+Subproject commit 1fe3f8d3c91279fb6c94d1313e9777a442d17caa

From 8a8489523537726075159102717e4dc02a051da9 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 14 Oct 2026 10:24:14 +0100
Subject: [PATCH 634/781] show unmanagable agents as disabled rows

---
 src/components/Tables/AgentsTable/AgentsTableRow.tsx | 2 +-
 src/hooks/useWorkspaceAgents.ts                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 5f0c7a4b02fb..30004e39e081 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -52,7 +52,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
 
     return (
         <Table.Row
-            interactive={item.canManage}
+            interactive
             rowIndex={rowIndex}
             disabled={item.disabled}
             accessibilityLabel={accessibilityLabel}
diff --git a/src/hooks/useWorkspaceAgents.ts b/src/hooks/useWorkspaceAgents.ts
index d247008981a1..c1499f969b9f 100644
--- a/src/hooks/useWorkspaceAgents.ts
+++ b/src/hooks/useWorkspaceAgents.ts
@@ -55,7 +55,7 @@ function useWorkspaceAgents(policy: OnyxEntry<Policy>) {
             login: details.login ?? '',
             role: policyRoles.find((policyRole) => policyRole === policyEmployee.role),
             pendingAction,
-            disabled: isPendingDeletion,
+            disabled: true,
             isSelectionDisabled: true,
             canManage: false,
             action: () => {},

From c81984535bf998e71506a51e230107c68657a1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Jasikowski?= <michal@expensify.com>
Date: Wed, 14 Oct 2026 11:40:44 +0200
Subject: [PATCH 635/781] Fix missing onboarding argument in LinkTest

---
 tests/unit/LinkTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/LinkTest.ts b/tests/unit/LinkTest.ts
index 033e62271aa7..0e7843f23a7a 100644
--- a/tests/unit/LinkTest.ts
+++ b/tests/unit/LinkTest.ts
@@ -421,7 +421,7 @@ describe('Link.openReportFromDeepLink', () => {
     it('does not show an unfinished-setup error for a completed user on an onboarding task screen', async () => {
         await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: true});
 
-        openReportFromDeepLink(`${CONST.NEW_EXPENSIFY_URL}/onboarding/work-email-validation?isJoinWorkspaceTask=true`, {}, true, undefined, undefined, false, 1, {}, {});
+        openReportFromDeepLink(`${CONST.NEW_EXPENSIFY_URL}/onboarding/work-email-validation?isJoinWorkspaceTask=true`, {}, true, undefined, undefined, false, true, 1, {}, {});
         await waitForBatchedUpdates();
 
         expect(mockedNavigation.waitForProtectedRoutes).toHaveBeenCalled();

From 948245891271b457baf685beaab996727f7ed9d2 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 11:43:51 +0200
Subject: [PATCH 636/781] refactor: replace deprecated MenuItem usages in
 ListField and readonly dynamic form row

---
 .../components/DynamicFormFieldRow.tsx        |  9 ++++----
 src/components/ListField.tsx                  | 22 ++++++++++++++-----
 .../DynamicForm/DynamicFormFieldsTest.tsx     |  4 ++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index 06b51f2842f6..1c710810ea13 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -3,7 +3,7 @@ import type {DynamicFieldContext} from '@components/DynamicForm/renderers/types'
 import formatDynamicFieldValue from '@components/DynamicForm/utils/formatDynamicFieldValue';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
@@ -54,10 +54,9 @@ function DynamicFormFieldRow({
                 style={[styles.mhn5, styles.pv1]}
                 fsClass={CONST.FULLSTORY.CLASS.MASK}
             >
-                <MenuItemWithTopDescription
-                    interactive={false}
-                    description={label}
-                    title={formatDynamicFieldValue(field, values, translate)}
+                <MenuItemField
+                    name={label}
+                    value={formatDynamicFieldValue(field, values, translate)}
                 />
             </View>
         );
diff --git a/src/components/ListField.tsx b/src/components/ListField.tsx
index a56eeb6a1bf4..d849c25735cc 100644
--- a/src/components/ListField.tsx
+++ b/src/components/ListField.tsx
@@ -5,6 +5,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getLetterAvatarURLForName} from '@libs/UserAvatarUtils';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import variables from '@src/styles/variables';
 
@@ -106,12 +108,20 @@ function ListField({rows, addTitle, addDescription, canAddMore = true, errorText
                 </MenuItem.Root>
             ))}
             {canAddMore && (
-                <MenuItem
-                    icon={icons.Plus}
-                    title={addTitle}
-                    description={addDescription}
-                    onPress={onAdd}
-                />
+                <MenuItem.Root
+                    onPress={callFunctionIfActionIsAllowed(onAdd)}
+                    accessibilityLabel={addTitle}
+                >
+                    <MenuItem.Row>
+                        <MenuItem.Leading>
+                            <MenuItem.Icon src={icons.Plus} />
+                        </MenuItem.Leading>
+                        <MenuItem.Content>
+                            <MenuItem.Title>{addTitle}</MenuItem.Title>
+                            {!!addDescription && <MenuItem.Description>{addDescription}</MenuItem.Description>}
+                        </MenuItem.Content>
+                    </MenuItem.Row>
+                </MenuItem.Root>
             )}
             {!!errorText && (
                 <View style={styles.ph5}>
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index 47169b94d3d1..8ddaa3f0cc96 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -16,7 +16,7 @@ import DynamicFormFields from '@components/DynamicForm/components/DynamicFormFie
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import getAddressInputKeys from '@components/DynamicForm/utils/getAddressInputKeys';
 import type {FormValue} from '@components/Form/types';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import PercentageForm from '@components/PercentageForm';
 import PushRowWithModal from '@components/PushRowWithModal';
 import RadioButtons from '@components/RadioButtons';
@@ -324,7 +324,7 @@ describe('DynamicFormFields', () => {
         // Then no input is drawn, and the row shows the translated country, masked in session recordings since a prefilled answer is still personal
         expect(rendered.size).toBe(0);
         expect(screen.getByText('allCountries.GB')).toBeOnTheScreen();
-        expect(isMasked(screen.UNSAFE_getByType(MenuItemWithTopDescription))).toBe(true);
+        expect(isMasked(screen.UNSAFE_getByType(MenuItemField))).toBe(true);
     });
 
     it('draws a heading with its description above the fields that follow it', () => {

From 3bf1ea73cd7452a4f5b3ab2b6a4e54a6ca447cb0 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Wed, 14 Oct 2026 10:47:08 +0100
Subject: [PATCH 637/781] ts

---
 tests/unit/LinkTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/LinkTest.ts b/tests/unit/LinkTest.ts
index 033e62271aa7..b22359973c28 100644
--- a/tests/unit/LinkTest.ts
+++ b/tests/unit/LinkTest.ts
@@ -421,7 +421,7 @@ describe('Link.openReportFromDeepLink', () => {
     it('does not show an unfinished-setup error for a completed user on an onboarding task screen', async () => {
         await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: true});
 
-        openReportFromDeepLink(`${CONST.NEW_EXPENSIFY_URL}/onboarding/work-email-validation?isJoinWorkspaceTask=true`, {}, true, undefined, undefined, false, 1, {}, {});
+        openReportFromDeepLink(`${CONST.NEW_EXPENSIFY_URL}/onboarding/work-email-validation?isJoinWorkspaceTask=true`, {}, true, undefined, undefined, undefined, false, 1, {}, {});
         await waitForBatchedUpdates();
 
         expect(mockedNavigation.waitForProtectedRoutes).toHaveBeenCalled();

From d11c4b1d5df81ec28718546578815fd4e79997a4 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 09:52:52 +0000
Subject: [PATCH 638/781] Show workspace name in per diem empty state for
 members

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/languages/de.ts                                         | 2 +-
 src/languages/el.ts                                         | 2 +-
 src/languages/en.ts                                         | 2 +-
 src/languages/es.ts                                         | 2 +-
 src/languages/fr.ts                                         | 2 +-
 src/languages/it.ts                                         | 2 +-
 src/languages/ja.ts                                         | 2 +-
 src/languages/nl.ts                                         | 2 +-
 src/languages/pl.ts                                         | 2 +-
 src/languages/pt-BR.ts                                      | 2 +-
 src/languages/zh-hans.ts                                    | 6 +++++-
 .../iou/request/step/DynamicIOURequestStepDestination.tsx   | 6 +++++-
 12 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 9443b7ef5276..6977ac0d07e6 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5102,7 +5102,7 @@ ${amount} für ${merchant} – ${date}`,
             },
             requestEmptyList: {
                 title: 'Noch keine Pauschalbeträge',
-                subtitle: 'In diesem Workspace sind keine Pauschalen hinterlegt, bitten Sie Ihre Admin, welche hinzuzufügen.',
+                subtitle: (workspaceName: string) => `In ${workspaceName} sind keine Pauschalen hinterlegt. Bitten Sie einen Admin, welche hinzuzufügen.`,
                 adminSubtitle: 'Fügen Sie Pauschalen hinzu, um Ihre Ausgaben zu organisieren.',
             },
             importPerDiemRates: 'Tagespauschalen importieren',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 45c848e2985e..1f0035116c39 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -5178,7 +5178,7 @@ ${amount} για ${merchant} - ${date}`,
             editCurrencySubtitle: (destination: string) => `Η ενημέρωση αυτού του νομίσματος θα το αλλάξει για όλες τις υποτιμές ημερήσιας αποζημίωσης ${destination}.`,
             requestEmptyList: {
                 title: 'Δεν υπάρχουν ακόμη ημερήσια επιδόματα',
-                subtitle: 'Αυτός ο χώρος εργασίας δεν έχει ημερήσια επιδόματα· ζητήστε από τον διαχειριστή σας να προσθέσει κάποια.',
+                subtitle: (workspaceName: string) => `Ο χώρος εργασίας ${workspaceName} δεν έχει ημερήσια επιδόματα. Ζητήστε από έναν διαχειριστή να προσθέσει κάποια.`,
                 adminSubtitle: 'Προσθέστε ημερήσια επιδόματα για να οργανώσετε τις δαπάνες σας.',
             },
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 082a4aed7b8d..187bf3e78651 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5283,7 +5283,7 @@ const translations = {
             },
             requestEmptyList: {
                 title: 'No per diem rates yet',
-                subtitle: "This workspace doesn't have any per diem rates, ask your Admin to add some.",
+                subtitle: (workspaceName: string) => `${workspaceName} doesn't have any per diem rates. Ask an admin to add some.`,
                 adminSubtitle: 'Add per diem rates to organize your spend.',
             },
             importPerDiemRates: 'Import per diem rates',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 5a4f6962d2ca..c18bf5f9c1ef 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5024,7 +5024,7 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Aún no hay tasas de Per diem',
-                subtitle: 'Este espacio de trabajo no tiene ninguna tasa de per diem, pide a tu administrador que añada algunas.',
+                subtitle: (workspaceName: string) => `${workspaceName} no tiene ninguna tasa de per diem. Pide a un administrador que añada algunas.`,
                 adminSubtitle: 'Añade tasas de per diem para organizar tus gastos.',
             },
             importPerDiemRates: 'Importar tasas de per diem',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1397788a7159..7290c8da420b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5108,7 +5108,7 @@ ${amount} pour ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Aucun taux de per diem pour le moment',
-                subtitle: 'Cet espace de travail n’a aucun taux de per diem, demandez à votre Administrateur d’en ajouter.',
+                subtitle: (workspaceName: string) => `${workspaceName} n’a aucun taux de per diem. Demandez à un administrateur d’en ajouter.`,
                 adminSubtitle: 'Ajoutez des taux de per diem pour organiser vos dépenses.',
             },
             importPerDiemRates: 'Importer des taux de per diem',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 9b5a9461ab45..a65598777d79 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5070,7 +5070,7 @@ ${amount} per ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ancuna nessuna tariffa di diaria',
-                subtitle: 'Questo spazio di lavoro non ha nessuna diaria, chiedi al tuo amministratore di aggiungerne.',
+                subtitle: (workspaceName: string) => `${workspaceName} non ha nessuna diaria. Chiedi a un amministratore di aggiungerne.`,
                 adminSubtitle: 'Aggiungi le tariffe giornaliere per organizzare le tue spese.',
             },
             importPerDiemRates: 'Importa tariffe di diaria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index d4b6395a03d0..f69033f53987 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5033,7 +5033,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             },
             requestEmptyList: {
                 title: '日当レートがまだありません',
-                subtitle: 'このワークスペースには日当レートがありません。管理者に追加してもらってください。',
+                subtitle: (workspaceName: string) => `${workspaceName}には日当レートがありません。管理者に追加してもらってください。`,
                 adminSubtitle: '日当額を追加して、支出を整理しましょう。',
             },
             importPerDiemRates: '日当レートをインポート',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 4fd0023754ec..bb58da78cc90 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5070,7 +5070,7 @@ ${amount} voor ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nog geen dagvergoedingen',
-                subtitle: 'Deze workspace heeft geen dagvergoedingen, vraag je admin om er een paar toe te voegen.',
+                subtitle: (workspaceName: string) => `${workspaceName} heeft geen dagvergoedingen. Vraag een admin om er een paar toe te voegen.`,
                 adminSubtitle: 'Voeg dagvergoedingen toe om je uitgaven te organiseren.',
             },
             importPerDiemRates: 'Daggeldtarieven importeren',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 829cfa260527..846113b145d5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5102,7 +5102,7 @@ ${amount} dla ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nie ma jeszcze stawek diet',
-                subtitle: 'W tym obszarze roboczym nie ma żadnych stawek diet, poproś swojego administratora o dodanie kilku.',
+                subtitle: (workspaceName: string) => `W ${workspaceName} nie ma żadnych stawek diet. Poproś administratora o dodanie kilku.`,
                 adminSubtitle: 'Dodaj stawki diet, żeby uporządkować swoje wydatki.',
             },
             importPerDiemRates: 'Zaimportuj stawki diet',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index c48f53b822ab..ff169ca455ff 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5062,7 +5062,7 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ainda não há diárias',
-                subtitle: 'Este espaço de trabalho não tem nenhuma diária definida, peça para o seu administrador adicionar algumas.',
+                subtitle: (workspaceName: string) => `${workspaceName} não tem nenhuma diária definida. Peça a um administrador para adicionar algumas.`,
                 adminSubtitle: 'Adicione diárias para organizar seus gastos.',
             },
             importPerDiemRates: 'Importar tarifas de diária',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 80c14fa5170f..c37a361088d2 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4917,7 +4917,11 @@ ${amount}，商户：${merchant} - 日期：${date}`,
                 title: '每日津贴',
                 subtitle: '设置每日津贴标准以控制员工每日支出。可从电子表格导入标准以开始使用。',
             },
-            requestEmptyList: {title: '尚未设置每日津贴费率', subtitle: '此工作区尚未设置任何每日津贴费率，请联系管理员添加。', adminSubtitle: '添加每日津贴标准，以整理您的支出。'},
+            requestEmptyList: {
+                title: '尚未设置每日津贴费率',
+                subtitle: (workspaceName: string) => `${workspaceName}尚未设置任何每日津贴费率，请联系管理员添加。`,
+                adminSubtitle: '添加每日津贴标准，以整理您的支出。',
+            },
             importPerDiemRates: '导入每日津贴费率',
             editPerDiemRate: '编辑每日补贴费率',
             editPerDiemRates: '编辑每日津贴费率',
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
index 0a572f2b8d7b..de9515f33d06 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
@@ -253,7 +253,11 @@ function DynamicIOURequestStepDestination({
                             shouldStyleAsCard={false}
                             icon={illustrations.EmptyStateExpenses}
                             title={translate('workspace.perDiem.requestEmptyList.title')}
-                            subtitle={translate(isPolicyAdmin(policy) ? 'workspace.perDiem.requestEmptyList.adminSubtitle' : 'workspace.perDiem.requestEmptyList.subtitle')}
+                            subtitle={
+                                isPolicyAdmin(policy)
+                                    ? translate('workspace.perDiem.requestEmptyList.adminSubtitle')
+                                    : translate('workspace.perDiem.requestEmptyList.subtitle', policy?.name ?? '')
+                            }
                             containerStyle={[styles.flex1, styles.justifyContentCenter]}
                         />
                         {isPolicyAdmin(policy) && (

From 72d4ea62ec4b026468eca7089dab2b3190be91c8 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 14 Oct 2026 12:01:41 +0200
Subject: [PATCH 639/781] rephrasing

---
 src/languages/de.ts      | 4 ++--
 src/languages/el.ts      | 4 ++--
 src/languages/en.ts      | 4 ++--
 src/languages/es.ts      | 4 ++--
 src/languages/fr.ts      | 4 ++--
 src/languages/it.ts      | 4 ++--
 src/languages/ja.ts      | 4 ++--
 src/languages/nl.ts      | 4 ++--
 src/languages/pl.ts      | 4 ++--
 src/languages/pt-BR.ts   | 4 ++--
 src/languages/zh-hans.ts | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2a1f9b25279d..13b8433da443 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7820,8 +7820,8 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Bürostandort ${officeNumber}`,
             setAsPrimary: 'Als primär festlegen',
             primary: 'Primär',
-            deleteOfficeLocation: 'Bürostandort löschen',
-            deleteOfficeLocationConfirmation: 'Sind Sie sicher, dass Sie diesen Bürostandort löschen möchten?',
+            deleteOfficeLocation: 'Bürostandort löschen?',
+            deleteOfficeLocationConfirmation: 'Möchten Sie diesen Bürostandort wirklich löschen? Mitglieder werden dem primären Büro neu zugewiesen.',
             existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen ist bereits vorhanden',
             setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptbüro festlegen?',
         },
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 01675e13f7d2..41b3d458e731 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8120,8 +8120,8 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             defaultName: ({officeNumber}: {officeNumber: number}) => `Τοποθεσία γραφείου ${officeNumber}`,
             setAsPrimary: 'Ορισμός ως κύριο',
             primary: 'Κύριο',
-            deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου',
-            deleteOfficeLocationConfirmation: 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τοποθεσία γραφείου;',
+            deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου;',
+            deleteOfficeLocationConfirmation: 'Θέλετε πραγματικά να διαγράψετε αυτήν την τοποθεσία γραφείου; Τα μέλη θα ανατεθούν ξανά στο κύριο γραφείο.',
             existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
             setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η εταιρική διεύθυνση ως κύριο γραφείο;',
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 90bfe219fd04..2ed1cc241942 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8337,8 +8337,8 @@ const translations = {
             defaultName: ({officeNumber}: {officeNumber: number}) => `Office location ${officeNumber}`,
             setAsPrimary: 'Set as primary',
             primary: 'Primary',
-            deleteOfficeLocation: 'Delete office location',
-            deleteOfficeLocationConfirmation: 'Are you sure you want to delete this office location?',
+            deleteOfficeLocation: 'Delete office location?',
+            deleteOfficeLocationConfirmation: 'Do you really want to delete this office location? Members will be reassigned to the primary office.',
             existingOfficeLocationError: 'An office location with this name already exists',
             setCompanyAddressAsPrimaryConfirmation: 'Set the company address as primary office?',
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index d4f890c9d509..acbce8b44bc2 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7842,8 +7842,8 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de la oficina ${officeNumber}`,
             setAsPrimary: 'Establecer como principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Eliminar ubicación de oficina',
-            deleteOfficeLocationConfirmation: '¿Seguro que quieres eliminar esta oficina?',
+            deleteOfficeLocation: '¿Eliminar ubicación de oficina?',
+            deleteOfficeLocationConfirmation: '¿De verdad quieres eliminar esta ubicación de oficina? Los miembros se reasignarán a la oficina principal.',
             existingOfficeLocationError: 'Ya existe una ubicación de oficina con este nombre',
             setCompanyAddressAsPrimaryConfirmation: '¿Establecer la dirección de la empresa como oficina principal?',
         },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index cc9682be0706..026920094467 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7841,8 +7841,8 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Emplacement du bureau ${officeNumber}`,
             setAsPrimary: 'Définir comme principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Supprimer le bureau',
-            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ?',
+            deleteOfficeLocation: 'Supprimer le bureau ?',
+            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ? Les membres seront réaffectés au bureau principal.',
             existingOfficeLocationError: 'Un site de bureau portant ce nom existe déjà',
             setCompanyAddressAsPrimaryConfirmation: "Définir l'adresse de l'entreprise comme bureau principal ?",
         },
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 2a80903f1b18..a10b2c2e5713 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7775,8 +7775,8 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ufficio ${officeNumber}`,
             setAsPrimary: 'Imposta come principale',
             primary: 'Primario',
-            deleteOfficeLocation: 'Elimina sede ufficio',
-            deleteOfficeLocationConfirmation: 'Sei sicuro di voler eliminare questa sede?',
+            deleteOfficeLocation: 'Eliminare sede ufficio?',
+            deleteOfficeLocationConfirmation: 'Vuoi davvero eliminare questa sede? I membri verranno riassegnati alla sede principale.',
             existingOfficeLocationError: 'Esiste già una sede con questo nome',
             setCompanyAddressAsPrimaryConfirmation: 'Impostare l’indirizzo dell’azienda come sede principale?',
         },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index fca099eac4a8..053c2de52a22 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7680,8 +7680,8 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             defaultName: ({officeNumber}: {officeNumber: number}) => `オフィス所在地 ${officeNumber}`,
             setAsPrimary: '主要に設定',
             primary: 'メイン',
-            deleteOfficeLocation: 'オフィス所在地を削除',
-            deleteOfficeLocationConfirmation: 'このオフィス所在地を削除してもよろしいですか？',
+            deleteOfficeLocation: 'オフィス所在地を削除しますか？',
+            deleteOfficeLocationConfirmation: 'このオフィス所在地を本当に削除しますか？メンバーはメインのオフィスに再割り当てされます。',
             existingOfficeLocationError: 'この名前のオフィス所在地はすでに存在します',
             setCompanyAddressAsPrimaryConfirmation: '会社の住所を主なオフィスとして設定しますか？',
         },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index ee89ccc57a4c..e1971403cdb5 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7755,8 +7755,8 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Kantoorlocatie ${officeNumber}`,
             setAsPrimary: 'Instellen als primair',
             primary: 'Primair',
-            deleteOfficeLocation: 'Locatie kantoor verwijderen',
-            deleteOfficeLocationConfirmation: 'Weet je zeker dat je deze kantoorlocatie wilt verwijderen?',
+            deleteOfficeLocation: 'Locatie kantoor verwijderen?',
+            deleteOfficeLocationConfirmation: 'Wil je deze kantoorlocatie echt verwijderen? Leden worden opnieuw toegewezen aan het primaire kantoor.',
             existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
             setCompanyAddressAsPrimaryConfirmation: 'Het bedrijfsadres instellen als hoofdvestiging?',
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 22450bd66bf6..2d819b6b35ac 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7779,8 +7779,8 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Lokalizacja biura ${officeNumber}`,
             setAsPrimary: 'Ustaw jako główny',
             primary: 'Podstawowe',
-            deleteOfficeLocation: 'Usuń lokalizację biura',
-            deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura?',
+            deleteOfficeLocation: 'Usunąć lokalizację biura?',
+            deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura? Członkowie zostaną przypisani do głównego biura.',
             existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
             setCompanyAddressAsPrimaryConfirmation: 'Ustawić adres firmy jako główne biuro?',
         },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 85ad99731b4e..04e6eadd3591 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7760,8 +7760,8 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             defaultName: ({officeNumber}: {officeNumber: number}) => `Local do escritório ${officeNumber}`,
             setAsPrimary: 'Definir como principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Excluir local do escritório',
-            deleteOfficeLocationConfirmation: 'Tem certeza de que quer excluir este escritório?',
+            deleteOfficeLocation: 'Excluir local do escritório?',
+            deleteOfficeLocationConfirmation: 'Deseja realmente excluir este escritório? Os membros serão reatribuídos ao escritório principal.',
             existingOfficeLocationError: 'Já existe um local de escritório com esse nome',
             setCompanyAddressAsPrimaryConfirmation: 'Definir o endereço da empresa como escritório principal?',
         },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 75c08ddcab9b..77ce1a23d282 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7489,8 +7489,8 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             defaultName: ({officeNumber}: {officeNumber: number}) => `办公室位置 ${officeNumber}`,
             setAsPrimary: '设为主要',
             primary: '主要',
-            deleteOfficeLocation: '删除办公地点',
-            deleteOfficeLocationConfirmation: '确定要删除此办公室地点吗？',
+            deleteOfficeLocation: '删除办公地点？',
+            deleteOfficeLocationConfirmation: '确定要删除此办公室地点吗？成员将被重新分配到主要办公地点。',
             existingOfficeLocationError: '已存在同名的办公地点',
             setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公地点？',
         },

From f33e6176a85b4f4ffb7ed0661961a5db7b24b78a Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 14 Oct 2026 12:05:32 +0200
Subject: [PATCH 640/781] translated logs

---
 src/libs/ReportAlternateTextUtils.ts          | 12 +++++
 .../report/ContextMenu/ContextMenuActions.tsx |  9 ++++
 .../unit/ContextMenuActionsCopyMessageTest.ts | 38 +++++++++++++++
 tests/unit/ReportAlternateTextUtilsTest.ts    | 48 +++++++++++++++++++
 4 files changed, 107 insertions(+)

diff --git a/src/libs/ReportAlternateTextUtils.ts b/src/libs/ReportAlternateTextUtils.ts
index 8f01c40407f9..2a1def437e41 100644
--- a/src/libs/ReportAlternateTextUtils.ts
+++ b/src/libs/ReportAlternateTextUtils.ts
@@ -48,6 +48,7 @@ import {
     getAddedBudgetMessage,
     getAddedCardFeedMessage,
     getAddedConnectionMessage,
+    getAddedOfficeLocationMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
     getAutoCategorizeNewExpensesMessage,
@@ -69,6 +70,7 @@ import {
     getDelegateSubmitMessage,
     getDeletedApprovalRuleMessage,
     getDeletedBudgetMessage,
+    getDeletedOfficeLocationMessage,
     getDynamicExternalWorkflowRoutedMessage,
     getExportIntegrationLastMessageText,
     getForeignCurrencyDefaultTaxUpdateMessage,
@@ -136,6 +138,7 @@ import {
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
     getUpdatedMemberWorkArrangementMessage,
+    getUpdatedOfficeLocationMessage,
     getUpdatedOwnershipMessage,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedReimbursementChoiceMessage,
@@ -860,6 +863,15 @@ function getLastMessageTextForReport({
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT)) {
         lastMessageTextFromReport = getUpdatedMemberWorkArrangementMessage(translate, lastReportAction);
     }
+    if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION)) {
+        lastMessageTextFromReport = getAddedOfficeLocationMessage(translate, lastReportAction);
+    }
+    if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION)) {
+        lastMessageTextFromReport = getUpdatedOfficeLocationMessage(translate, lastReportAction);
+    }
+    if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION)) {
+        lastMessageTextFromReport = getDeletedOfficeLocationMessage(translate, lastReportAction);
+    }
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REIMBURSEMENT)) {
         lastMessageTextFromReport = getAutoReimbursementMessage(translate, lastReportAction, convertToDisplayString);
     }
diff --git a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
index e96364ae4c88..be41bd9b9378 100644
--- a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
@@ -35,6 +35,7 @@ import {
     getAddedBudgetMessage,
     getAddedCardFeedMessage,
     getAddedConnectionMessage,
+    getAddedOfficeLocationMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
     getAutoCategorizeNewExpensesMessage,
@@ -56,6 +57,7 @@ import {
     getDelegateSubmitMessage,
     getDeletedApprovalRuleMessage,
     getDeletedBudgetMessage,
+    getDeletedOfficeLocationMessage,
     getDismissedViolationMessageText,
     getDynamicExternalWorkflowApproveFailedActionMessage,
     getDynamicExternalWorkflowRoutedMessage,
@@ -118,6 +120,7 @@ import {
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
     getUpdatedMemberWorkArrangementMessage,
+    getUpdatedOfficeLocationMessage,
     getUpdatedOwnershipMessage,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedReimbursementChoiceMessage,
@@ -1483,6 +1486,12 @@ const ContextMenuActions: ContextMenuAction[] = [
                     setClipboardMessage(getUpdatedAutoHarvestingMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT)) {
                     setClipboardMessage(getUpdatedMemberWorkArrangementMessage(translate, reportAction));
+                } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION)) {
+                    setClipboardMessage(getAddedOfficeLocationMessage(translate, reportAction));
+                } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION)) {
+                    setClipboardMessage(getUpdatedOfficeLocationMessage(translate, reportAction));
+                } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION)) {
+                    setClipboardMessage(getDeletedOfficeLocationMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INDIVIDUAL_BUDGET_NOTIFICATION)) {
                     setClipboardMessage(getUpdatedIndividualBudgetNotificationMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SHARED_BUDGET_NOTIFICATION)) {
diff --git a/tests/unit/ContextMenuActionsCopyMessageTest.ts b/tests/unit/ContextMenuActionsCopyMessageTest.ts
index 1d8a6f6f14e9..7e824a53eff5 100644
--- a/tests/unit/ContextMenuActionsCopyMessageTest.ts
+++ b/tests/unit/ContextMenuActionsCopyMessageTest.ts
@@ -260,6 +260,44 @@ describe('ContextMenuActions copy message', () => {
         expect(mockSetString).toHaveBeenCalledWith('updated work arrangement');
     });
 
+    it.each([
+        [
+            CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION,
+            {officeID: 'OFFICE1', name: 'Headquarters', address: {addressStreet: '88 Kearny St', city: 'San Francisco', state: 'CA', zipCode: '94108', country: 'US'}},
+            'workspaceActions.officeLocation.added',
+        ],
+        [
+            CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION,
+            {officeID: 'OFFICE1', name: 'HQ', updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.NAME, newValue: 'HQ', oldValue: 'Headquarters'},
+            'workspaceActions.officeLocation.renamed',
+        ],
+        [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION, {officeID: 'OFFICE1', name: 'Headquarters'}, 'workspaceActions.officeLocation.removed'],
+    ] as const)('copies the localized message for a %s action', (actionName, originalMessage, translationKey) => {
+        // Given an office location change log, whose stored text is Auth's English message
+        mockCanSetHtml.mockReturnValue(false);
+        mockGetClipboardText.mockReturnValue('office change');
+
+        if (!copyMessageAction?.onPress) {
+            throw new Error('Copy message context menu action was not found');
+        }
+
+        // When its message is copied
+        copyMessageAction.onPress(
+            false,
+            createReportActionPayload(
+                createMock<CopyMessagePayload['reportAction']>({
+                    actionName,
+                    message: [{text: 'stored message', html: 'stored message'}],
+                    originalMessage,
+                }),
+            ),
+        );
+
+        // Then the translated change log text is copied instead of the stored text
+        expect(mockGetClipboardText).toHaveBeenCalledWith(translationKey, undefined);
+        expect(mockSetString).toHaveBeenCalledWith('office change');
+    });
+
     it('copies the localized member work arrangement message as html when supported', () => {
         // Given the clipboard supports HTML, when the member arrangement message is copied, then the shared rich clipboard path is used.
         mockCanSetHtml.mockReturnValue(true);
diff --git a/tests/unit/ReportAlternateTextUtilsTest.ts b/tests/unit/ReportAlternateTextUtilsTest.ts
index ba0a8fab9eff..787d62d14ef2 100644
--- a/tests/unit/ReportAlternateTextUtilsTest.ts
+++ b/tests/unit/ReportAlternateTextUtilsTest.ts
@@ -24,6 +24,9 @@ import {
     getRequiresCategoryMessage,
     getRequiresTagMessage,
     getPolicyWorkArrangementMessage,
+    getAddedOfficeLocationMessage,
+    getUpdatedOfficeLocationMessage,
+    getDeletedOfficeLocationMessage,
     getUnassignedCompanyCardMessage,
     getUpdatedAutoHarvestingMessage,
     getUpdatedCardFeedLiabilityMessage,
@@ -1597,6 +1600,51 @@ describe('ReportAlternateTextUtils', () => {
             // Then the preview reads the same as the in-chat change log rather than the raw stored text
             expect(lastMessage).toBe(getPolicyWorkArrangementMessage(translateLocal, action));
         });
+        it.each([
+            [
+                CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_OFFICE_LOCATION,
+                {officeID: 'OFFICE1', name: 'Headquarters', address: {addressStreet: '88 Kearny St', city: 'San Francisco', state: 'CA', zipCode: '94108', country: 'US'}},
+                getAddedOfficeLocationMessage,
+            ],
+            [
+                CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OFFICE_LOCATION,
+                {officeID: 'OFFICE1', name: 'HQ', updatedField: CONST.POLICY.OFFICE_LOCATION_FIELD.NAME, newValue: 'HQ', oldValue: 'Headquarters'},
+                getUpdatedOfficeLocationMessage,
+            ],
+            [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_OFFICE_LOCATION, {officeID: 'OFFICE1', name: 'Headquarters'}, getDeletedOfficeLocationMessage],
+        ] as const)('%s action', async (actionName, originalMessage, getMessage) => {
+            // Given an office location change log, whose stored text is Auth's English message
+            const report: Report = createRandomReport(0, undefined);
+            const action: ReportAction = {
+                ...createRandomReportAction(1),
+                actionName,
+                message: [{type: 'COMMENT', text: 'stored message'}],
+                originalMessage,
+            };
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, {
+                [action.reportActionID]: action,
+            });
+
+            // When the sidebar resolves the report's last message
+            const lastMessage = getLastMessageTextForReport({
+                rules: undefined,
+                dateFnsLocale: undefined,
+                convertToDisplayString,
+                conciergeReportID: undefined,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: undefined,
+                translate: translateLocal,
+                report,
+                lastActorDetails: null,
+                policy: undefined,
+                isReportArchived: false,
+
+                currentUserLogin: CURRENT_USER_LOGIN,
+            });
+
+            // Then the preview reads the same translated text as the in-chat change log rather than the stored text
+            expect(lastMessage).toBe(getMessage(translateLocal, action));
+        });
         it('UPDATE_AUTO_HARVESTING action', async () => {
             const report: Report = createRandomReport(0, undefined);
             const action: ReportAction = {

From 748a27947182486d54c47a668dcd306ae71900cd Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 14 Oct 2026 12:06:26 +0200
Subject: [PATCH 641/781] old comments

---
 src/components/AddressForm.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/AddressForm.tsx b/src/components/AddressForm.tsx
index e3a3a5994643..a707afe9f413 100644
--- a/src/components/AddressForm.tsx
+++ b/src/components/AddressForm.tsx
@@ -258,13 +258,6 @@ function AddressForm<TFormID extends AddressFormID>({
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    /**
-     * @param translate - translate function
-     * @param isUSAForm - selected country ISO code is US
-     * @param values - form input values
-     * @returns - An object containing the errors for each inputID
-     */
-
     const validator = useCallback(
         (rawValues: FormOnyxValues<TFormID>): FormInputErrors<TFormID> => {
             // Every form rendered here has the home address fields, so they are validated the same way

From 931c484e75146a0addd6d35a5222851db7e6dd5f Mon Sep 17 00:00:00 2001
From: "Yauheni Horbach (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 10:09:08 +0000
Subject: [PATCH 642/781] Run export template actions after the popover menu
 hides

Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>
---
 src/hooks/useSelectedTransactionsActions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts
index bd88e40df03f..904ab27f5107 100644
--- a/src/hooks/useSelectedTransactionsActions.ts
+++ b/src/hooks/useSelectedTransactionsActions.ts
@@ -466,6 +466,7 @@ function useSelectedTransactionsActions({
                               clearSelectedTransactions(true);
                           }
                         : () => beginExportWithTemplate(template.templateName, template.type, selectedTransactionIDs, template.name, template.policyID),
+                    shouldCallAfterModalHide: true,
                     addSeparatorBefore,
                 };
             };

From bceda13622eb5c2f02c59e608d6d93cb79007b03 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 12:19:26 +0200
Subject: [PATCH 643/781] fix: keep sensitive dynamic form list entries out of
 drafts and readonly lists uneditable

---
 .../DynamicForm/adapters/ListFieldAdapter.tsx |  8 +++++++-
 .../components/DynamicFormFieldRow.tsx        |  8 +++++---
 .../components/DynamicFormFields.tsx          | 12 +++++++++++-
 .../components/DynamicFormFieldsPage.tsx      | 10 +++++++++-
 .../components/DynamicFormListItemPage.tsx    | 11 ++++++++---
 src/components/DynamicForm/index.tsx          | 19 +++++++++++++++++--
 .../DynamicForm/renderDynamicField.tsx        |  2 +-
 .../DynamicForm/renderers/listRenderer.tsx    |  9 ++++++++-
 src/components/DynamicForm/renderers/types.ts |  2 +-
 src/components/DynamicForm/types.ts           |  2 ++
 .../DynamicForm/utils/getAnswerKeys.ts        | 17 +++++++++++++++++
 .../DynamicForm/utils/getConfirmationItems.ts |  7 +++++--
 .../utils/getSensitiveDefaultValue.ts         | 10 +++++++---
 .../DynamicForm/utils/getSubmittedAnswers.ts  | 14 +-------------
 src/components/DynamicForm/utils/listItems.ts | 16 ++++++++++------
 .../DynamicForm/DynamicFormFieldsPageTest.tsx |  1 +
 .../adapters/ListFieldAdapterTest.tsx         |  2 +-
 17 files changed, 111 insertions(+), 39 deletions(-)
 create mode 100644 src/components/DynamicForm/utils/getAnswerKeys.ts

diff --git a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
index 9d498dec7637..239a01b4232f 100644
--- a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
+++ b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
@@ -30,6 +30,9 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
         /** Called with every entry after one is added, edited or removed */
         onInputChange?: (value: DynamicFormListItem[]) => void;
 
+        /** Called with the remaining entries after one is removed, for a list the flow keeps in memory */
+        onItemsChange?: (value: DynamicFormListItem[]) => void;
+
         /** Validation error shown under the list */
         errorText?: string;
 
@@ -59,6 +62,7 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
 function ListFieldAdapter({
     value,
     onInputChange = () => {},
+    onItemsChange,
     errorText,
     label,
     itemLabel,
@@ -123,7 +127,9 @@ function ListFieldAdapter({
             if (action !== ModalActions.CONFIRM) {
                 return;
             }
-            onInputChange(items.filter((candidate) => candidate.id !== id));
+            const remainingItems = items.filter((candidate) => candidate.id !== id);
+            onInputChange(remainingItems);
+            onItemsChange?.(remainingItems);
         });
     };
 
diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index 1c710810ea13..2b0f1b0b0048 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -17,7 +17,7 @@ import {View} from 'react-native';
 
 import type {DynamicFormFieldsProps} from './DynamicFormFields';
 
-type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onRefreshRequirements' | 'onOpenListItemEditor'> &
+type DynamicFormFieldRowProps = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onRefreshRequirements' | 'onOpenListItemEditor' | 'onListItemsChange' | 'isSensitive'> &
     Required<Pick<DynamicFormFieldsProps, 'currency'>> &
     Pick<DynamicFieldContext, 'renderFields'> & {
         field: DynamicFormField;
@@ -42,6 +42,8 @@ function DynamicFormFieldRow({
     shouldHideLabel = false,
     onRefreshRequirements,
     onOpenListItemEditor,
+    onListItemsChange,
+    isSensitive = false,
     renderFields,
 }: DynamicFormFieldRowProps) {
     const {translate} = useLocalize();
@@ -74,10 +76,10 @@ function DynamicFormFieldRow({
     const shouldRefreshOnChange = !!field.refreshOnChange && !isTypedField;
     const {input, isMenuRow, labelAbove, showsDescription} = renderDynamicField(
         field,
-        {values, translate, styles, currency, maxFileSize, isLoneField, onOpenListItemEditor, renderFields},
+        {values, translate, styles, currency, maxFileSize, isLoneField, onOpenListItemEditor, onListItemsChange, isSensitive, renderFields},
         {
             inputID: field.key,
-            shouldSaveDraft: !isSensitiveField(field),
+            shouldSaveDraft: !isSensitive && !isSensitiveField(field),
             forwardedFSClass: CONST.FULLSTORY.CLASS.MASK,
             onValueChange: shouldRefreshOnChange ? (value, key) => onRefreshRequirements?.(key, value) : undefined,
             onBlur: shouldRefreshOnBlur ? refreshRequirements : undefined,
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index ab640e9bf146..f056bc678a7d 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -5,7 +5,7 @@ import isHeading from '@components/DynamicForm/utils/isHeading';
 import type {FormValue} from '@components/Form/types';
 
 import CONST from '@src/CONST';
-import type {DynamicFormContentItem, DynamicFormField} from '@src/types/onyx';
+import type {DynamicFormContentItem, DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
 
 import React from 'react';
 
@@ -36,6 +36,12 @@ type DynamicFormFieldsProps = {
 
     /** Opens the editor page of a list entry, or of a new one without `itemID`. DynamicFormFlow passes it; without it list entries are edited in a modal. */
     onOpenListItemEditor?: (listKey: string, itemID?: string) => void;
+
+    /** Called with a list's entries after the user removes one, so the flow can keep a sensitive list in memory up to date */
+    onListItemsChange?: (listKey: string, items: DynamicFormListItem[]) => void;
+
+    /** Every answer here is sensitive, as in the editor of an entry of a sensitive list: none is drafted, and each starts from the answer in `values` */
+    isSensitive?: boolean;
 };
 
 /** The inputs of a schema-driven form. Render it inside a FormProvider and validate the fields of the same content with getDynamicFieldErrors. */
@@ -48,6 +54,8 @@ function DynamicFormFields({
     maxFileSize,
     onRefreshRequirements,
     onOpenListItemEditor,
+    onListItemsChange,
+    isSensitive = false,
 }: DynamicFormFieldsProps) {
     const visibleContent = getVisibleContent(content, values, allFields);
     const loneField = getLoneField(getContentFields(visibleContent));
@@ -78,6 +86,8 @@ function DynamicFormFields({
                 shouldHideLabel={isTitledByPage && item === loneField}
                 onRefreshRequirements={onRefreshRequirements}
                 onOpenListItemEditor={onOpenListItemEditor}
+                onListItemsChange={onListItemsChange}
+                isSensitive={isSensitive}
                 renderFields={renderFields}
             />
         ),
diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
index 7c47351c6e5d..0c9db40f63e6 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -3,6 +3,7 @@ import getContentFields from '@components/DynamicForm/utils/getContentFields';
 import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
 import getLocalizedText from '@components/DynamicForm/utils/getLocalizedText';
 import getPageTitle from '@components/DynamicForm/utils/getPageTitle';
+import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
 import FormProvider from '@components/Form/FormProvider';
 import Text from '@components/Text';
@@ -31,6 +32,7 @@ function DynamicFormFieldsPage({
     onRefreshRequirements,
     onPageSubmit,
     onOpenListItemEditor,
+    onListItemsChange,
 }: DynamicFormSubPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -38,7 +40,12 @@ function DynamicFormFieldsPage({
     if (!page) {
         return null;
     }
-    const withInputValues = (inputValues: unknown) => ({...values, ...toDynamicFormValues(inputValues)});
+    // A sensitive list lives in memory, which the editor page and a removal update, so the form's own copy of it may be stale
+    const pageKeys = new Set(getContentFields(page.content).map((field) => field.key));
+    const memoryListValues = Object.fromEntries(
+        allFields.filter((field) => field.type === 'list' && isSensitiveField(field) && pageKeys.has(field.key)).map((field) => [field.key, values[field.key]]),
+    );
+    const withInputValues = (inputValues: unknown) => ({...values, ...toDynamicFormValues(inputValues), ...memoryListValues});
 
     return (
         <FormProvider
@@ -81,6 +88,7 @@ function DynamicFormFieldsPage({
                             maxFileSize={maxFileSize}
                             onRefreshRequirements={onRefreshRequirements}
                             onOpenListItemEditor={onOpenListItemEditor}
+                            onListItemsChange={onListItemsChange}
                         />
                     </>
                 );
diff --git a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
index c3d829edad41..52a3d4d0fd1f 100644
--- a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
@@ -1,6 +1,7 @@
 import type {DynamicFormSubPageProps} from '@components/DynamicForm/types';
 import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
 import getLocalizedText from '@components/DynamicForm/utils/getLocalizedText';
+import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import {getListItems, getListItemSensitiveAnswers, parseListItemPageName} from '@components/DynamicForm/utils/listItems';
 import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
 import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
@@ -29,11 +30,13 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
     const listField = allFields.find((field): field is DynamicFormListField => field.type === 'list' && field.key === page?.listKey);
     const item = listField ? getListItems(values[listField.key]).find((candidate) => candidate.id === page?.itemID) : undefined;
     const [filledPageName, setFilledPageName] = useState<string>();
+    // The entries of a sensitive list are never drafted, so the editor starts empty and its inputs take the entry's answers from memory
+    const isSensitiveList = !!listField && isSensitiveField(listField);
 
     // The editor form is shared by every entry, so it is filled with this entry's answers before its inputs mount
     useEffect(() => {
         let isCancelled = false;
-        startListItemEdit(item ?? {}).then(() => {
+        startListItemEdit(isSensitiveList ? {} : (item ?? {})).then(() => {
             if (isCancelled) {
                 return;
             }
@@ -42,7 +45,7 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
         return () => {
             isCancelled = true;
         };
-    }, [currentPageName, item]);
+    }, [currentPageName, item, isSensitiveList]);
 
     useEffect(() => clearListItemEdit, []);
 
@@ -53,7 +56,8 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
         return <FullscreenLoadingIndicator />;
     }
     const sensitiveAnswers = item ? getListItemSensitiveAnswers(listField, item.id, values) : {};
-    const withInputValues = (inputValues: unknown) => ({...sensitiveAnswers, ...toDynamicFormValues(inputValues)});
+    const keptAnswers = isSensitiveList ? {...item, ...sensitiveAnswers} : sensitiveAnswers;
+    const withInputValues = (inputValues: unknown) => ({...keptAnswers, ...toDynamicFormValues(inputValues)});
     const itemLabel = getLocalizedText(translate, listField.itemLabelKey, listField.itemLabel);
     const addTitle = itemLabel ? translate('dynamicForm.addItem', {item: itemLabel}) : translate('common.add');
     const itemTitle = item ? summarizeListItem(item, listField.itemFields, translate).title : '';
@@ -77,6 +81,7 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
                     <DynamicFormFields
                         content={listField.itemFields}
                         values={withInputValues(inputValues)}
+                        isSensitive={isSensitiveList}
                         currency={currency}
                         maxFileSize={maxFileSize}
                     />
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 901aae2671ca..f6a15af66bb6 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -23,10 +23,11 @@ import DynamicFormConfirmationPage from './components/DynamicFormConfirmationPag
 import DynamicFormFieldsPage from './components/DynamicFormFieldsPage';
 import DynamicFormListItemPage from './components/DynamicFormListItemPage';
 import DynamicFormShell from './components/DynamicFormShell';
+import getAnswerKeys from './utils/getAnswerKeys';
 import getContentFields from './utils/getContentFields';
 import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
 import getPageTitle, {isPageShown} from './utils/getPageTitle';
-import getSubmittedAnswers, {getAnswerKeys} from './utils/getSubmittedAnswers';
+import getSubmittedAnswers from './utils/getSubmittedAnswers';
 import isSensitiveField from './utils/isSensitiveField';
 import isSupportedField from './utils/isSupportedField';
 import {getListItemPageName, getListItems, getListItemSensitiveKey, getRemovedListItemSensitiveKeys, parseListItemPageName} from './utils/listItems';
@@ -222,7 +223,7 @@ function DynamicFormFlow({
             return;
         }
         const id = itemID ?? Str.guid();
-        const sensitiveKeys = new Set(listField.itemFields.filter(isSensitiveField).map((field) => field.key));
+        const sensitiveKeys = new Set(listField.itemFields.filter(isSensitiveField).flatMap(getAnswerKeys));
         const item: DynamicFormListItem = {id};
         const sensitiveAnswers: DynamicFormValues = {};
         for (const [key, answer] of Object.entries(getSubmittedAnswers(listField.itemFields, itemValues))) {
@@ -241,6 +242,19 @@ function DynamicFormFlow({
         closeListItemEditor(listKey);
     };
 
+    /** A sensitive list is kept in memory, so removing an entry is saved right away for the next entry added to build on. A drafted list is saved as it changes. */
+    const changeListItems = (listKey: string, items: DynamicFormListItem[]) => {
+        const listField = listFields.find((field) => field.key === listKey);
+        if (!listField || !isSensitiveField(listField)) {
+            return;
+        }
+        saveSensitiveAnswers(formID, {[listKey]: items});
+        const removedSensitiveKeys = getRemovedListItemSensitiveKeys(listField, {...values, [listKey]: items});
+        if (removedSensitiveKeys.length > 0) {
+            forgetSensitiveAnswers(formID, removedSensitiveKeys);
+        }
+    };
+
     const goBack = () => {
         if (listItemPage) {
             closeListItemEditor(listItemPage.listKey);
@@ -299,6 +313,7 @@ function DynamicFormFlow({
                     onPageSubmit={handlePageSubmit}
                     onOpenListItemEditor={openListItemEditor}
                     onListItemSave={saveListItem}
+                    onListItemsChange={changeListItems}
                     confirmationTitle={confirmationTitle}
                     isSubmitting={isSubmitting}
                     submitError={submitError}
diff --git a/src/components/DynamicForm/renderDynamicField.tsx b/src/components/DynamicForm/renderDynamicField.tsx
index 660bea6794b1..6933b55ced95 100644
--- a/src/components/DynamicForm/renderDynamicField.tsx
+++ b/src/components/DynamicForm/renderDynamicField.tsx
@@ -21,7 +21,7 @@ const RENDERERS: DynamicFieldRendererMap = {
 /** The input for one field, and how the renderer lays it out */
 function renderDynamicField<TType extends DynamicFormFieldType>(field: DynamicFormFieldOfType<TType>, context: DynamicFieldContext, inputProps: DynamicFieldInputProps): DynamicFieldInput {
     const render: DynamicFieldRenderer<TType> = RENDERERS[field.type];
-    return render(field, context, {...inputProps, defaultValue: getSensitiveDefaultValue(field, context.values)});
+    return render(field, context, {...inputProps, defaultValue: getSensitiveDefaultValue(field, context.values, context.isSensitive)});
 }
 
 export default renderDynamicField;
diff --git a/src/components/DynamicForm/renderers/listRenderer.tsx b/src/components/DynamicForm/renderers/listRenderer.tsx
index b62da9833ac3..2106f6e37942 100644
--- a/src/components/DynamicForm/renderers/listRenderer.tsx
+++ b/src/components/DynamicForm/renderers/listRenderer.tsx
@@ -1,14 +1,19 @@
 import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
+import {getListItems} from '@components/DynamicForm/utils/listItems';
 import InputWrapper from '@components/Form/InputWrapper';
 
+import type {DynamicFormListItem} from '@src/types/onyx';
+
 import React from 'react';
 
 import type {DynamicFieldRenderer} from './types';
 
-const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField, onOpenListItemEditor, renderFields}, inputProps) => {
+const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField, values, onOpenListItemEditor, onListItemsChange, renderFields}, inputProps) => {
     const itemLabel = getLocalizedText(translate, field.itemLabelKey, field.itemLabel);
+    // A sensitive list is not drafted, so inside the flow its entries come from memory, which the editor page and a removal both update
+    const isMemoryList = !!onOpenListItemEditor && isSensitiveField(field);
     return {
         isMenuRow: true,
         labelAbove: isLoneField ? undefined : 'heading',
@@ -19,6 +24,8 @@ const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField
                 // Outside the flow sensitive entry answers stay in the list value, which must not reach the draft
                 shouldSaveDraft={inputProps.shouldSaveDraft && (!!onOpenListItemEditor || !field.itemFields.some(isSensitiveField))}
                 valueType="listItems"
+                value={isMemoryList ? getListItems(values[field.key]) : undefined}
+                onItemsChange={isMemoryList ? (items: DynamicFormListItem[]) => onListItemsChange?.(field.key, items) : undefined}
                 label={getFieldLabel(field, translate)}
                 itemLabel={itemLabel}
                 itemFields={field.itemFields}
diff --git a/src/components/DynamicForm/renderers/types.ts b/src/components/DynamicForm/renderers/types.ts
index 470a3babc1d5..298d393a4ed3 100644
--- a/src/components/DynamicForm/renderers/types.ts
+++ b/src/components/DynamicForm/renderers/types.ts
@@ -11,7 +11,7 @@ import type {FileObject} from '@src/types/utils/Attachment';
 
 import type {ReactElement, ReactNode} from 'react';
 
-type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onOpenListItemEditor'> &
+type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize' | 'onOpenListItemEditor' | 'onListItemsChange' | 'isSensitive'> &
     Required<Pick<DynamicFormFieldsProps, 'currency'>> & {
         translate: LocalizedTranslate;
         styles: ThemeStyles;
diff --git a/src/components/DynamicForm/types.ts b/src/components/DynamicForm/types.ts
index f695504b62ce..596f229297fd 100644
--- a/src/components/DynamicForm/types.ts
+++ b/src/components/DynamicForm/types.ts
@@ -75,6 +75,8 @@ type DynamicFormSubPageProps = SubPageProps &
 
         onOpenListItemEditor: NonNullable<DynamicFormFieldsProps['onOpenListItemEditor']>;
 
+        onListItemsChange: NonNullable<DynamicFormFieldsProps['onListItemsChange']>;
+
         /** The last page submits the form, since no confirmation page follows */
         isLastPage: boolean;
 
diff --git a/src/components/DynamicForm/utils/getAnswerKeys.ts b/src/components/DynamicForm/utils/getAnswerKeys.ts
new file mode 100644
index 000000000000..ff3ee4717b1e
--- /dev/null
+++ b/src/components/DynamicForm/utils/getAnswerKeys.ts
@@ -0,0 +1,17 @@
+import type {DynamicFormField} from '@src/types/onyx';
+
+import getAddressInputKeys from './getAddressInputKeys';
+
+/** The draft keys a field writes to: its own, plus its address parts or its chosen currency */
+function getAnswerKeys(field: DynamicFormField): string[] {
+    switch (field.type) {
+        case 'address':
+            return Object.values(getAddressInputKeys(field.key)).filter(Boolean);
+        case 'amount':
+            return field.currencyKey ? [field.key, field.currencyKey] : [field.key];
+        default:
+            return [field.key];
+    }
+}
+
+export default getAnswerKeys;
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index d12307c59348..b7819f33cce1 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -19,15 +19,18 @@ import {getListItems} from './listItems';
 import maskSensitiveValue from './maskSensitiveValue';
 import summarizeListItem from './summarizeListItem';
 
-/** One avatar row per list entry, which opens the entry */
+/** One avatar row per list entry, which opens the entry. A readonly list gets plain rows that open nothing. */
 function getListItemRows(
     field: DynamicFormListField,
     values: DynamicFormValues,
     translate: LocalizedTranslate,
     onEditListItem: (listKey: string, itemID: string) => void,
 ): SummaryGroupRow[] {
-    return getListItems(values[field.key]).map((item) => {
+    return getListItems(values[field.key]).map((item): SummaryGroupRow => {
         const {title, description} = summarizeListItem(item, field.itemFields, translate);
+        if (field.readonly) {
+            return {id: `${field.key}-${item.id}`, title, description, shouldShowRightIcon: false, onPress: noop, interactive: false};
+        }
         return {
             kind: 'avatar',
             id: `${field.key}-${item.id}`,
diff --git a/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
index 8f1fd6ac5d4e..0f78ddf4e6a5 100644
--- a/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
+++ b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
@@ -47,11 +47,15 @@ const ANSWER_GUARDS: AnswerGuards = {
     list: isListItems,
 };
 
-/** Sensitive answers are not drafted, so a page the user comes back to is refilled from the answers kept in memory */
-function getSensitiveDefaultValue<TType extends DynamicFormFieldType>(field: DynamicFormFieldOfType<TType>, values: DynamicFormValues): DynamicFieldAnswerMap[TType] | undefined {
+/** Sensitive answers are not drafted, so a page the user comes back to is refilled from the answers kept in memory. `isInSensitiveForm` treats every field as sensitive. */
+function getSensitiveDefaultValue<TType extends DynamicFormFieldType>(
+    field: DynamicFormFieldOfType<TType>,
+    values: DynamicFormValues,
+    isInSensitiveForm = false,
+): DynamicFieldAnswerMap[TType] | undefined {
     const answer = values[field.key];
     const isAnswer: AnswerGuards[TType] = ANSWER_GUARDS[field.type];
-    return isSensitiveField(field) && answer !== undefined && isAnswer(answer) ? answer : undefined;
+    return (isInSensitiveForm || isSensitiveField(field)) && answer !== undefined && isAnswer(answer) ? answer : undefined;
 }
 
 export default getSensitiveDefaultValue;
diff --git a/src/components/DynamicForm/utils/getSubmittedAnswers.ts b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
index 932f2c88ea88..47463db3d78c 100644
--- a/src/components/DynamicForm/utils/getSubmittedAnswers.ts
+++ b/src/components/DynamicForm/utils/getSubmittedAnswers.ts
@@ -2,22 +2,10 @@ import type {DynamicFormValues} from '@components/DynamicForm/types';
 
 import type {DynamicFormField} from '@src/types/onyx';
 
-import getAddressInputKeys from './getAddressInputKeys';
+import getAnswerKeys from './getAnswerKeys';
 import getVisibleFields from './getVisibleFields';
 import {getListItems, getListItemSensitiveAnswers} from './listItems';
 
-/** The draft keys a field writes to: its own, plus its address parts or its chosen currency */
-function getAnswerKeys(field: DynamicFormField): string[] {
-    switch (field.type) {
-        case 'address':
-            return Object.values(getAddressInputKeys(field.key)).filter(Boolean);
-        case 'amount':
-            return field.currencyKey ? [field.key, field.currencyKey] : [field.key];
-        default:
-            return [field.key];
-    }
-}
-
 /** The answers to the fields the user can see, so answers left on fields hidden later are not submitted. List entries get their sensitive answers back from memory. Pass the whole form as `allFields` when `fields` is one page of it. */
 function getSubmittedAnswers(fields: DynamicFormField[], values: DynamicFormValues, allFields = fields): DynamicFormValues {
     const answers: DynamicFormValues = {};
diff --git a/src/components/DynamicForm/utils/listItems.ts b/src/components/DynamicForm/utils/listItems.ts
index a4ad3e2fe381..a3d1b8bb87d4 100644
--- a/src/components/DynamicForm/utils/listItems.ts
+++ b/src/components/DynamicForm/utils/listItems.ts
@@ -2,6 +2,7 @@ import type {DynamicFormValues} from '@components/DynamicForm/types';
 
 import type {DynamicFormListField, DynamicFormListItem} from '@src/types/onyx';
 
+import getAnswerKeys from './getAnswerKeys';
 import isSensitiveField from './isSensitiveField';
 
 const PAGE_NAME_SEPARATOR = '~';
@@ -42,17 +43,20 @@ function getListItems(value: unknown): DynamicFormListItem[] {
 /** An entry's sensitive answers, keyed by field key, from the answers kept in memory */
 function getListItemSensitiveAnswers(field: DynamicFormListField, itemID: string, values: DynamicFormValues): DynamicFormValues {
     return Object.fromEntries(
-        field.itemFields.filter(isSensitiveField).flatMap((itemField) => {
-            const answer = values[getListItemSensitiveKey(field.key, itemID, itemField.key)];
-            return answer === undefined ? [] : [[itemField.key, answer]];
-        }),
+        field.itemFields
+            .filter(isSensitiveField)
+            .flatMap(getAnswerKeys)
+            .flatMap((answerKey) => {
+                const answer = values[getListItemSensitiveKey(field.key, itemID, answerKey)];
+                return answer === undefined ? [] : [[answerKey, answer]];
+            }),
     );
 }
 
 /** Memory keys of sensitive answers whose entry the user has removed from the list */
 function getRemovedListItemSensitiveKeys(field: DynamicFormListField, values: DynamicFormValues): string[] {
-    const sensitiveFields = field.itemFields.filter(isSensitiveField);
-    const keptKeys = new Set(getListItems(values[field.key]).flatMap((item) => sensitiveFields.map((itemField) => getListItemSensitiveKey(field.key, item.id, itemField.key))));
+    const sensitiveKeys = field.itemFields.filter(isSensitiveField).flatMap(getAnswerKeys);
+    const keptKeys = new Set(getListItems(values[field.key]).flatMap((item) => sensitiveKeys.map((answerKey) => getListItemSensitiveKey(field.key, item.id, answerKey))));
     return Object.keys(values).filter((key) => key.startsWith(`${field.key}${PAGE_NAME_SEPARATOR}`) && !keptKeys.has(key));
 }
 
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx
index b1670db5b7ce..22ef5a621c0c 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsPageTest.tsx
@@ -28,6 +28,7 @@ function renderPage(isLastPage: boolean) {
             values={{}}
             onPageSubmit={jest.fn()}
             onOpenListItemEditor={jest.fn()}
+            onListItemsChange={jest.fn()}
             onListItemSave={jest.fn()}
             confirmationTitle="Confirm"
         />,
diff --git a/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
index 51108c4b0ec4..444752448001 100644
--- a/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
+++ b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
@@ -42,7 +42,7 @@ jest.mock('@components/DynamicForm/components/DynamicFormListItemModal', () => (
     __esModule: true,
     default: (props: CapturedModalProps) => mockModal(props),
 }));
-jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string, params?: unknown) => (params === undefined ? key : `${key} ${JSON.stringify(params)}`)})));
 jest.mock('@hooks/useConfirmModal', () => jest.fn(() => ({showConfirmModal: mockShowConfirmModal})));
 jest.mock('@userActions/DynamicForm', () => ({startListItemEdit: jest.fn(() => Promise.resolve()), clearListItemEdit: jest.fn()}));
 

From 33380e45399876ab3fd1cb122288906b543f3151 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Wed, 14 Oct 2026 12:22:01 +0200
Subject: [PATCH 644/781] fix: hide the grip when pointer capture is lost off
 the heading

---
 .../columnResize/useColumnResize/index.ts     | 16 ++++++++------
 .../components/Table/useColumnResizeTest.ts   | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/components/Table/columnResize/useColumnResize/index.ts b/src/components/Table/columnResize/useColumnResize/index.ts
index 0742b265f914..d7fe4ff77e31 100644
--- a/src/components/Table/columnResize/useColumnResize/index.ts
+++ b/src/components/Table/columnResize/useColumnResize/index.ts
@@ -70,6 +70,13 @@ function useColumnResize({columnResizingID, resizableColumnKeys, resolvedColumnW
         setTableColumnWidth(columnResizingID, drag.columnKey, width);
     };
 
+    // Releasing or losing capture doesn't reliably fire boundary events, so hit-test the heading, including the handle overhanging it.
+    const syncGripHover = (event: React.PointerEvent<HTMLDivElement>) => {
+        const isPointerOnHeading = !!event.currentTarget.parentElement?.contains(document.elementFromPoint(event.clientX, event.clientY));
+
+        setGripHovered(event.currentTarget, isPointerOnHeading);
+    };
+
     const handlePointerDown = (columnKey: string, event: React.PointerEvent<HTMLDivElement>) => {
         // Secondary buttons open context menus rather than dragging.
         if (event.button !== 0) {
@@ -117,15 +124,11 @@ function useColumnResize({columnResizingID, resizableColumnKeys, resolvedColumnW
         }
 
         endDrag(drag);
-
-        // Releasing capture doesn't reliably fire boundary events, so hit-test the heading, including the handle overhanging it.
-        const isPointerOnHeading = !!event.currentTarget.parentElement?.contains(document.elementFromPoint(event.clientX, event.clientY));
-
-        setGripHovered(event.currentTarget, isPointerOnHeading);
+        syncGripHover(event);
     };
 
     /** Ends a drag whose pointer capture the browser reclaimed. Also fires after a normal pointerup, when it's a no-op. */
-    const handleLostPointerCapture = () => {
+    const handleLostPointerCapture = (event: React.PointerEvent<HTMLDivElement>) => {
         const drag = dragRef.current;
 
         if (!drag) {
@@ -133,6 +136,7 @@ function useColumnResize({columnResizingID, resizableColumnKeys, resolvedColumnW
         }
 
         endDrag(drag);
+        syncGripHover(event);
     };
 
     // Unmounting mid-drag would otherwise leave the resize cursor on the document and a dangling drag.
diff --git a/tests/unit/components/Table/useColumnResizeTest.ts b/tests/unit/components/Table/useColumnResizeTest.ts
index 7d72541db0b0..27b83d796596 100644
--- a/tests/unit/components/Table/useColumnResizeTest.ts
+++ b/tests/unit/components/Table/useColumnResizeTest.ts
@@ -275,6 +275,27 @@ describe('useColumnResize', () => {
         expect(readGripHover()).toBe('0');
     });
 
+    it('hides the grip when the pointer capture is lost off the heading', () => {
+        // Given a hovered heading whose edge is being dragged off the heading
+        const {headingElement, handleElement, getHandleProps, readGripHover, mountHandle} = renderColumnResize();
+
+        mountHandle();
+        headingElement.dispatchEvent(new Event('pointerenter'));
+
+        act(() => {
+            getHandleProps().onPointerDown?.(createPointerEvent(handleElement, {clientX: 190, clientY: 20}));
+            getHandleProps().onPointerMove?.(createPointerEvent(handleElement, {clientX: 400, clientY: 300}));
+        });
+
+        // When the browser takes the pointer capture back there, e.g. because the window lost focus
+        act(() => {
+            getHandleProps().onLostPointerCapture?.(createPointerEvent(handleElement, {clientX: 400, clientY: 300}));
+        });
+
+        // Then the grip hides, the same as a release there, rather than lingering on a heading the pointer isn't over
+        expect(readGripHover()).toBe('0');
+    });
+
     it('keeps the grip when a drag is released on the heading', () => {
         // Given a hovered heading whose edge is being dragged
         const {headingElement, handleElement, getHandleProps, readGripHover, mountHandle} = renderColumnResize();

From 7b166e05245ae9a0de525d33fe5b55004d79120d Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 12:25:42 +0200
Subject: [PATCH 645/781] fix: refresh requirements on list item save and lock
 readonly list editors

---
 .../DynamicForm/adapters/ListFieldAdapter.tsx |  3 +-
 .../components/DynamicFormListItemPage.tsx    |  3 +-
 src/components/DynamicForm/index.tsx          | 13 +++++--
 .../DynamicForm/DynamicFormFlowTest.tsx       | 38 +++++++++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
index 239a01b4232f..5398c6f14e3e 100644
--- a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
+++ b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
@@ -1,5 +1,6 @@
 import DynamicFormListItemModal from '@components/DynamicForm/components/DynamicFormListItemModal';
 import type {DynamicFormValues} from '@components/DynamicForm/types';
+import getAnswerKeys from '@components/DynamicForm/utils/getAnswerKeys';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
 import ListField from '@components/ListField';
@@ -85,7 +86,7 @@ function ListFieldAdapter({
     if (editingItem) {
         modalTitle = editingTitle === '' ? label : editingTitle;
     }
-    const sensitiveKeys = new Set(itemFields.filter(isSensitiveField).map((field) => field.key));
+    const sensitiveKeys = new Set(itemFields.filter(isSensitiveField).flatMap(getAnswerKeys));
 
     // Sensitive answers are not drafted, so the modal shows them blank and a blank one keeps the stored answer
     const openModal = (item?: DynamicFormListItem) => {
diff --git a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
index 52a3d4d0fd1f..0fa4b279813d 100644
--- a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
@@ -23,7 +23,7 @@ import React, {useEffect, useState} from 'react';
 import DynamicFormFields from './DynamicFormFields';
 
 /** The editor of one list entry, or of a new one: the entry's fields and a Save button */
-function DynamicFormListItemPage({currentPageName, allFields, values, currency, maxFileSize, onListItemSave}: DynamicFormSubPageProps) {
+function DynamicFormListItemPage({currentPageName, allFields, values, currency, maxFileSize, onRefreshRequirements, onListItemSave}: DynamicFormSubPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const page = parseListItemPageName(currentPageName);
@@ -84,6 +84,7 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
                         isSensitive={isSensitiveList}
                         currency={currency}
                         maxFileSize={maxFileSize}
+                        onRefreshRequirements={onRefreshRequirements}
                     />
                 </>
             )}
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index f6a15af66bb6..516ce17da001 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -74,8 +74,10 @@ function DynamicFormFlow({
 
     // useSubPage needs at least one page, so a form without pages gets the confirmation page
     const hasConfirmationPage = pages.length === 0 || hasConfirmation;
-    // Entry editors come after the confirmation page and are skipped by Next and Back, so only an entry's Add, Edit or row opens them
-    const listItemPageNames = listFields.flatMap((field) => [getListItemPageName(field.key), ...getListItems(values[field.key]).map((item) => getListItemPageName(field.key, item.id))]);
+    // Entry editors come after the confirmation page and are skipped by Next and Back, so only an entry's Add, Edit or row opens them. A readonly list has no editors.
+    const listItemPageNames = listFields
+        .filter((field) => !field.readonly)
+        .flatMap((field) => [getListItemPageName(field.key), ...getListItems(values[field.key]).map((item) => getListItemPageName(field.key, item.id))]);
     const subPages = [
         ...pages.map((page) => ({pageName: page.key, component: DynamicFormFieldsPage})),
         ...(hasConfirmationPage ? [{pageName: CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY, component: DynamicFormConfirmationPage}] : []),
@@ -234,11 +236,16 @@ function DynamicFormFlow({
             }
         }
         const items = getListItems(values[listKey]);
+        const savedItems = itemID ? items.map((existing) => (existing.id === id ? item : existing)) : [...items, item];
         const saveListAnswer = isSensitiveField(listField) ? saveSensitiveAnswers : saveDraftAnswers;
-        saveListAnswer(formID, {[listKey]: itemID ? items.map((existing) => (existing.id === id ? item : existing)) : [...items, item]});
+        saveListAnswer(formID, {[listKey]: savedItems});
         if (Object.keys(sensitiveAnswers).length > 0) {
             saveSensitiveAnswers(formID, sensitiveAnswers);
         }
+        // The editor saves outside the list's input, so a list that asks for fresh requirements on change asks here, as a removal does through its input
+        if (listField.refreshOnChange) {
+            onRefreshRequirements?.(listKey, savedItems);
+        }
         closeListItemEditor(listKey);
     };
 
diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index ed08c1fe9493..0ac0d69d6b7a 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -93,6 +93,7 @@ type RenderFlowOptions = {
     isSubmitting?: boolean;
     shouldReplaceRoute?: boolean;
     maxFileSize?: number;
+    onRefreshRequirements?: (inputID: string, value: FormValue) => void;
 };
 
 async function renderFlow({
@@ -107,6 +108,7 @@ async function renderFlow({
     isSubmitting,
     shouldReplaceRoute,
     maxFileSize,
+    onRefreshRequirements,
 }: RenderFlowOptions = {}) {
     await Onyx.set(`${FORM_ID}Draft`, draft);
     await Onyx.set(ONYXKEYS.RAM_ONLY_DYNAMIC_FORM_SENSITIVE_ANSWERS, {[FORM_ID]: sensitiveAnswers});
@@ -140,6 +142,7 @@ async function renderFlow({
             hasConfirmation={hasConfirmation === 'default' ? undefined : hasConfirmation}
             layout={layout}
             maxFileSize={maxFileSize}
+            onRefreshRequirements={onRefreshRequirements}
             isSubmitting={submitting}
         />
     );
@@ -601,6 +604,41 @@ describe('DynamicFormFlow', () => {
             expect(getListItems(jest.mocked(saveSensitiveAnswers).mock.lastCall?.[1].directors).map((item) => item.firstName)).toEqual(['John']);
         });
 
+        it('asks for fresh requirements when the user saves an entry of a list that refreshes them on change', async () => {
+            // Given the editor of a new director, in a list whose entries decide which questions come next
+            const refreshingSchema: DynamicFormSchema = {
+                pages: [
+                    {key: 'directors', content: [{key: 'directors', type: 'list', required: true, refreshOnChange: true, itemFields: [{key: 'firstName', type: 'text', required: true}]}]},
+                ],
+            };
+            const onRefreshRequirements = jest.fn<void, [string, FormValue]>();
+            const {pageProps} = await renderFlow({flowSchema: refreshingSchema, draft: {directors: [jane]}, currentPageName: 'directors~new', onRefreshRequirements});
+
+            // When the user saves the director
+            pageProps?.onListItemSave('directors', undefined, {firstName: 'John'});
+
+            // Then the screen gets the updated list, as it does when an entry is removed, so the requirements match the entries
+            expect(onRefreshRequirements).toHaveBeenCalledTimes(1);
+            const refreshedItems = getListItems(onRefreshRequirements.mock.lastCall?.[1]);
+            expect(onRefreshRequirements.mock.lastCall?.[0]).toBe('directors');
+            expect(refreshedItems.map((item) => item.firstName)).toEqual(['Jane', 'John']);
+        });
+
+        it('gives a readonly list no entry editors', async () => {
+            // Given a readonly list with one entry
+            const readonlySchema: DynamicFormSchema = {
+                pages: [{key: 'directors', content: [{key: 'directors', type: 'list', required: true, readonly: true, itemFields: [{key: 'firstName', type: 'text', required: true}]}]}],
+            };
+
+            // When the flow renders
+            const {subPageOptions} = await renderFlow({flowSchema: readonlySchema, draft: {directors: [jane]}, currentPageName: 'directors'});
+
+            // Then no editor page exists, so a link to one cannot edit an answer the schema locks
+            const pageNames = subPageOptions.pages.map((page) => page.pageName);
+            expect(pageNames).not.toContain('directors~new');
+            expect(pageNames).not.toContain('directors~jane');
+        });
+
         it('returns from an entry editor to its list page on back', async () => {
             // Given the editor of an existing entry
             const {onBack} = await renderFlow({flowSchema: directorsSchema, draft: {directors: [jane]}, currentPageName: 'directors~jane', pageIndex: 2});

From 393473a976bd5f45ca7c91a31b228ba9933d6118 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 10:38:30 +0000
Subject: [PATCH 646/781] Apply Polyglot translations for per diem empty state
 subtitle

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/languages/de.ts      | 2 +-
 src/languages/el.ts      | 2 +-
 src/languages/es.ts      | 2 +-
 src/languages/it.ts      | 2 +-
 src/languages/ja.ts      | 2 +-
 src/languages/nl.ts      | 2 +-
 src/languages/pl.ts      | 2 +-
 src/languages/pt-BR.ts   | 2 +-
 src/languages/zh-hans.ts | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 6977ac0d07e6..f2dd5c1e4d06 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5102,7 +5102,7 @@ ${amount} für ${merchant} – ${date}`,
             },
             requestEmptyList: {
                 title: 'Noch keine Pauschalbeträge',
-                subtitle: (workspaceName: string) => `In ${workspaceName} sind keine Pauschalen hinterlegt. Bitten Sie einen Admin, welche hinzuzufügen.`,
+                subtitle: (workspaceName: string) => `${workspaceName} hat keine Pauschalspesensätze. Bitten Sie eine Adminperson, einige hinzuzufügen.`,
                 adminSubtitle: 'Fügen Sie Pauschalen hinzu, um Ihre Ausgaben zu organisieren.',
             },
             importPerDiemRates: 'Tagespauschalen importieren',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 1f0035116c39..0eca4dfef941 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -5178,7 +5178,7 @@ ${amount} για ${merchant} - ${date}`,
             editCurrencySubtitle: (destination: string) => `Η ενημέρωση αυτού του νομίσματος θα το αλλάξει για όλες τις υποτιμές ημερήσιας αποζημίωσης ${destination}.`,
             requestEmptyList: {
                 title: 'Δεν υπάρχουν ακόμη ημερήσια επιδόματα',
-                subtitle: (workspaceName: string) => `Ο χώρος εργασίας ${workspaceName} δεν έχει ημερήσια επιδόματα. Ζητήστε από έναν διαχειριστή να προσθέσει κάποια.`,
+                subtitle: (workspaceName: string) => `Το ${workspaceName} δεν έχει ημερήσιες αποζημιώσεις. Ζητήστε από έναν διαχειριστή να προσθέσει μερικές.`,
                 adminSubtitle: 'Προσθέστε ημερήσια επιδόματα για να οργανώσετε τις δαπάνες σας.',
             },
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index c18bf5f9c1ef..fdb3b1140623 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5024,7 +5024,7 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Aún no hay tasas de Per diem',
-                subtitle: (workspaceName: string) => `${workspaceName} no tiene ninguna tasa de per diem. Pide a un administrador que añada algunas.`,
+                subtitle: (workspaceName: string) => `${workspaceName} no tiene ninguna tasa de per diem. Pídele a un administrador que añada alguna.`,
                 adminSubtitle: 'Añade tasas de per diem para organizar tus gastos.',
             },
             importPerDiemRates: 'Importar tasas de per diem',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index a65598777d79..0e76212246a1 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5070,7 +5070,7 @@ ${amount} per ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ancuna nessuna tariffa di diaria',
-                subtitle: (workspaceName: string) => `${workspaceName} non ha nessuna diaria. Chiedi a un amministratore di aggiungerne.`,
+                subtitle: (workspaceName: string) => `${workspaceName} non ha nessuna tariffa di diaria. Chiedi a un amministratore di aggiungerne.`,
                 adminSubtitle: 'Aggiungi le tariffe giornaliere per organizzare le tue spese.',
             },
             importPerDiemRates: 'Importa tariffe di diaria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index f69033f53987..2f1aaaca7679 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5033,7 +5033,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             },
             requestEmptyList: {
                 title: '日当レートがまだありません',
-                subtitle: (workspaceName: string) => `${workspaceName}には日当レートがありません。管理者に追加してもらってください。`,
+                subtitle: (workspaceName: string) => `${workspaceName} には日当レートがありません。管理者に追加してもらってください。`,
                 adminSubtitle: '日当額を追加して、支出を整理しましょう。',
             },
             importPerDiemRates: '日当レートをインポート',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index bb58da78cc90..489b0b6e0a64 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5070,7 +5070,7 @@ ${amount} voor ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nog geen dagvergoedingen',
-                subtitle: (workspaceName: string) => `${workspaceName} heeft geen dagvergoedingen. Vraag een admin om er een paar toe te voegen.`,
+                subtitle: (workspaceName: string) => `${workspaceName} heeft geen dagvergoedingen. Vraag een beheerder om er een paar toe te voegen.`,
                 adminSubtitle: 'Voeg dagvergoedingen toe om je uitgaven te organiseren.',
             },
             importPerDiemRates: 'Daggeldtarieven importeren',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 846113b145d5..6b1bdab5f0ae 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5102,7 +5102,7 @@ ${amount} dla ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nie ma jeszcze stawek diet',
-                subtitle: (workspaceName: string) => `W ${workspaceName} nie ma żadnych stawek diet. Poproś administratora o dodanie kilku.`,
+                subtitle: (workspaceName: string) => `${workspaceName} nie ma żadnych stawek diet. Poproś administratora, żeby je dodał.`,
                 adminSubtitle: 'Dodaj stawki diet, żeby uporządkować swoje wydatki.',
             },
             importPerDiemRates: 'Zaimportuj stawki diet',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ff169ca455ff..a6faabf020fe 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5062,7 +5062,7 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ainda não há diárias',
-                subtitle: (workspaceName: string) => `${workspaceName} não tem nenhuma diária definida. Peça a um administrador para adicionar algumas.`,
+                subtitle: (workspaceName: string) => `${workspaceName} não tem nenhuma taxa de diária. Peça para um administrador adicionar algumas.`,
                 adminSubtitle: 'Adicione diárias para organizar seus gastos.',
             },
             importPerDiemRates: 'Importar tarifas de diária',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c37a361088d2..6c07c57cbb39 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4919,7 +4919,7 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             },
             requestEmptyList: {
                 title: '尚未设置每日津贴费率',
-                subtitle: (workspaceName: string) => `${workspaceName}尚未设置任何每日津贴费率，请联系管理员添加。`,
+                subtitle: (workspaceName: string) => `${workspaceName} 没有任何日津贴标准。请联系管理员添加一些。`,
                 adminSubtitle: '添加每日津贴标准，以整理您的支出。',
             },
             importPerDiemRates: '导入每日津贴费率',

From cc7cc872b0be4ae2f12713ad76ac8910692e68c4 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Wed, 14 Oct 2026 17:38:37 +0700
Subject: [PATCH 647/781] add back button

---
 src/CONST/index.ts                            |  3 +++
 .../CategoryPicker/CategoryPickerModal.tsx    | 24 ++++++++++++++++---
 .../components/CategoryPickerModalTest.tsx    | 21 +++++++++++++---
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index eb9d84449fec..94963ddbb7ab 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9966,6 +9966,9 @@ const CONST = {
             GETTING_STARTED_ROW: 'HomePage-GettingStartedRow',
             GETTING_STARTED_FOOTER_HELP: 'HomePage-GettingStartedFooterHelp',
         },
+        CATEGORY_PICKER_MODAL: {
+            BACK_BUTTON: 'CategoryPickerModal-BackButton',
+        },
         CALENDAR_PICKER: {
             YEAR_PICKER: 'CalendarPicker-YearPicker',
             MONTH_PICKER: 'CalendarPicker-MonthPicker',
diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index 0c3355070cb6..de368d0bef2d 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -63,7 +63,7 @@ type CategoryPickerModalProps = {
     /** Whether the pop-over shrinks to the height its list needs, treating `popoverHeight` as a ceiling. */
     shouldFitContentHeight?: boolean;
 
-    /** Shows a header with an add button, for users who can add a category to the workspace */
+    /** Shows a header with a back button and an add button, for users who can add a category to the workspace */
     onAddCategory?: () => void;
 
     /** Sentry label for the add button, so each caller's presses are attributed to it */
@@ -92,7 +92,7 @@ function CategoryPickerModal({
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
-    const icons = useMemoizedLazyExpensifyIcons(['Plus']);
+    const icons = useMemoizedLazyExpensifyIcons(['BackArrow', 'Plus']);
     const StyleUtils = useStyleUtils();
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth -- must match PopoverWithMeasuredContent's dock decision (bottom-docked only when isSmallScreenWidth)
     const {isSmallScreenWidth} = useResponsiveLayout();
@@ -161,7 +161,25 @@ function CategoryPickerModal({
             <View style={[StyleUtils.getHeight(popoverDimensions.height), styles.flexColumn, styles.pt4, StyleUtils.getPaddingBottom(bottomSafeAreaPadding)]}>
                 {!!onAddCategory && (
                     <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.pt1, styles.pb4, StyleUtils.getHeight(headerHeight)]}>
-                        <Text style={styles.textLabelSupporting}>{translate('common.category')}</Text>
+                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
+                            <Tooltip text={translate('common.back')}>
+                                <PressableWithFeedback
+                                    accessibilityLabel={translate('common.back')}
+                                    role={CONST.ROLE.BUTTON}
+                                    onPress={onClose}
+                                    shouldUseAutoHitSlop
+                                    sentryLabel={CONST.SENTRY_LABEL.CATEGORY_PICKER_MODAL.BACK_BUTTON}
+                                >
+                                    <Icon
+                                        src={icons.BackArrow}
+                                        fill={theme.icon}
+                                        width={variables.iconSizeNormal}
+                                        height={variables.iconSizeNormal}
+                                    />
+                                </PressableWithFeedback>
+                            </Tooltip>
+                            <Text style={styles.textLabelSupporting}>{translate('common.category')}</Text>
+                        </View>
                         <Tooltip text={translate('workspace.categories.addCategory')}>
                             <PressableWithFeedback
                                 accessibilityLabel={translate('workspace.categories.addCategory')}
diff --git a/tests/unit/components/CategoryPickerModalTest.tsx b/tests/unit/components/CategoryPickerModalTest.tsx
index 0a81d41f0ea0..50adcb8feeb3 100644
--- a/tests/unit/components/CategoryPickerModalTest.tsx
+++ b/tests/unit/components/CategoryPickerModalTest.tsx
@@ -62,11 +62,11 @@ describe('CategoryPickerModal', () => {
         mockKeyboardHeight = 0;
     });
 
-    const renderSheet = ({onAddCategory, shouldFitContentHeight = false}: {onAddCategory?: () => void; shouldFitContentHeight?: boolean} = {}) =>
+    const renderSheet = ({onAddCategory, onClose = jest.fn(), shouldFitContentHeight = false}: {onAddCategory?: () => void; onClose?: () => void; shouldFitContentHeight?: boolean} = {}) =>
         render(
             <CategoryPickerModal
                 isVisible
-                onClose={jest.fn()}
+                onClose={onClose}
                 policyID={POLICY_ID}
                 anchorPosition={{horizontal: 0, vertical: 0}}
                 onAddCategory={onAddCategory}
@@ -87,13 +87,28 @@ describe('CategoryPickerModal', () => {
         expect(onAddCategory).toHaveBeenCalledTimes(1);
     });
 
+    it('closes the pop-over from the back button in its header', () => {
+        // Given the pop-over showing its header, for a user who can add categories
+        const onClose = jest.fn();
+        const onAddCategory = jest.fn();
+        renderSheet({onAddCategory, onClose});
+
+        // When they press the back button on the top left of the header
+        fireEvent.press(screen.getByLabelText('common.back'));
+
+        // Then the pop-over closes without starting the add-category flow, like the full page's back button leaves the step
+        expect(onClose).toHaveBeenCalledTimes(1);
+        expect(onAddCategory).not.toHaveBeenCalled();
+    });
+
     it('shows no header for users who cannot create a category', () => {
         // Given a user who cannot add categories, e.g. a member or a workspace synced with an accounting integration
         // When the pop-over opens
         renderSheet();
 
-        // Then there is no add button or header, matching the full page that hides its "+" for them
+        // Then there is no back button, add button or header, matching the full page that hides its "+" for them
         expect(screen.queryByLabelText('workspace.categories.addCategory')).toBeNull();
+        expect(screen.queryByLabelText('common.back')).toBeNull();
         expect(screen.queryByText('common.category')).toBeNull();
     });
 

From dac27314ff1e7dbb8e3ebf5f0ab6d0f63a31d851 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 10:48:16 +0000
Subject: [PATCH 648/781] Fall back to "This workspace" in per diem empty state
 when the workspace name is missing

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/languages/de.ts                                          | 5 ++++-
 src/languages/el.ts                                          | 5 ++++-
 src/languages/en.ts                                          | 5 ++++-
 src/languages/es.ts                                          | 5 ++++-
 src/languages/fr.ts                                          | 5 ++++-
 src/languages/it.ts                                          | 5 ++++-
 src/languages/ja.ts                                          | 5 ++++-
 src/languages/nl.ts                                          | 5 ++++-
 src/languages/pl.ts                                          | 5 ++++-
 src/languages/pt-BR.ts                                       | 5 ++++-
 src/languages/zh-hans.ts                                     | 2 +-
 .../iou/request/step/DynamicIOURequestStepDestination.tsx    | 2 +-
 12 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index f2dd5c1e4d06..74ca7bd0b0e8 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5102,7 +5102,10 @@ ${amount} für ${merchant} – ${date}`,
             },
             requestEmptyList: {
                 title: 'Noch keine Pauschalbeträge',
-                subtitle: (workspaceName: string) => `${workspaceName} hat keine Pauschalspesensätze. Bitten Sie eine Adminperson, einige hinzuzufügen.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} hat keine Pauschalspesensätze. Bitten Sie eine Adminperson, einige hinzuzufügen.`
+                        : 'Dieser Workspace hat keine Pauschalspesensätze. Bitten Sie eine Adminperson, einige hinzuzufügen.',
                 adminSubtitle: 'Fügen Sie Pauschalen hinzu, um Ihre Ausgaben zu organisieren.',
             },
             importPerDiemRates: 'Tagespauschalen importieren',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 0eca4dfef941..103cf3c0f1d1 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -5178,7 +5178,10 @@ ${amount} για ${merchant} - ${date}`,
             editCurrencySubtitle: (destination: string) => `Η ενημέρωση αυτού του νομίσματος θα το αλλάξει για όλες τις υποτιμές ημερήσιας αποζημίωσης ${destination}.`,
             requestEmptyList: {
                 title: 'Δεν υπάρχουν ακόμη ημερήσια επιδόματα',
-                subtitle: (workspaceName: string) => `Το ${workspaceName} δεν έχει ημερήσιες αποζημιώσεις. Ζητήστε από έναν διαχειριστή να προσθέσει μερικές.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `Το ${workspaceName} δεν έχει ημερήσιες αποζημιώσεις. Ζητήστε από έναν διαχειριστή να προσθέσει μερικές.`
+                        : 'Αυτός ο χώρος εργασίας δεν έχει ημερήσιες αποζημιώσεις. Ζητήστε από έναν διαχειριστή να προσθέσει μερικές.',
                 adminSubtitle: 'Προσθέστε ημερήσια επιδόματα για να οργανώσετε τις δαπάνες σας.',
             },
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 187bf3e78651..18e0ce398a93 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5283,7 +5283,10 @@ const translations = {
             },
             requestEmptyList: {
                 title: 'No per diem rates yet',
-                subtitle: (workspaceName: string) => `${workspaceName} doesn't have any per diem rates. Ask an admin to add some.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} doesn't have any per diem rates. Ask an admin to add some.`
+                        : "This workspace doesn't have any per diem rates. Ask an admin to add some.",
                 adminSubtitle: 'Add per diem rates to organize your spend.',
             },
             importPerDiemRates: 'Import per diem rates',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fdb3b1140623..a5d4e03879a2 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5024,7 +5024,10 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Aún no hay tasas de Per diem',
-                subtitle: (workspaceName: string) => `${workspaceName} no tiene ninguna tasa de per diem. Pídele a un administrador que añada alguna.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} no tiene ninguna tasa de per diem. Pídele a un administrador que añada alguna.`
+                        : 'Este espacio de trabajo no tiene ninguna tasa de per diem. Pídele a un administrador que añada alguna.',
                 adminSubtitle: 'Añade tasas de per diem para organizar tus gastos.',
             },
             importPerDiemRates: 'Importar tasas de per diem',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 7290c8da420b..c6a852afddd0 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5108,7 +5108,10 @@ ${amount} pour ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Aucun taux de per diem pour le moment',
-                subtitle: (workspaceName: string) => `${workspaceName} n’a aucun taux de per diem. Demandez à un administrateur d’en ajouter.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} n’a aucun taux de per diem. Demandez à un administrateur d’en ajouter.`
+                        : 'Cet espace de travail n’a aucun taux de per diem. Demandez à un administrateur d’en ajouter.',
                 adminSubtitle: 'Ajoutez des taux de per diem pour organiser vos dépenses.',
             },
             importPerDiemRates: 'Importer des taux de per diem',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0e76212246a1..98ea2bfee26a 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5070,7 +5070,10 @@ ${amount} per ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ancuna nessuna tariffa di diaria',
-                subtitle: (workspaceName: string) => `${workspaceName} non ha nessuna tariffa di diaria. Chiedi a un amministratore di aggiungerne.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} non ha nessuna tariffa di diaria. Chiedi a un amministratore di aggiungerne.`
+                        : 'Questo spazio di lavoro non ha nessuna tariffa di diaria. Chiedi a un amministratore di aggiungerne.',
                 adminSubtitle: 'Aggiungi le tariffe giornaliere per organizzare le tue spese.',
             },
             importPerDiemRates: 'Importa tariffe di diaria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 2f1aaaca7679..aade9c612acc 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5033,7 +5033,10 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             },
             requestEmptyList: {
                 title: '日当レートがまだありません',
-                subtitle: (workspaceName: string) => `${workspaceName} には日当レートがありません。管理者に追加してもらってください。`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} には日当レートがありません。管理者に追加してもらってください。`
+                        : 'このワークスペースには日当レートがありません。管理者に追加してもらってください。',
                 adminSubtitle: '日当額を追加して、支出を整理しましょう。',
             },
             importPerDiemRates: '日当レートをインポート',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 489b0b6e0a64..212c24f6996a 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5070,7 +5070,10 @@ ${amount} voor ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nog geen dagvergoedingen',
-                subtitle: (workspaceName: string) => `${workspaceName} heeft geen dagvergoedingen. Vraag een beheerder om er een paar toe te voegen.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} heeft geen dagvergoedingen. Vraag een beheerder om er een paar toe te voegen.`
+                        : 'Deze workspace heeft geen dagvergoedingen. Vraag een beheerder om er een paar toe te voegen.',
                 adminSubtitle: 'Voeg dagvergoedingen toe om je uitgaven te organiseren.',
             },
             importPerDiemRates: 'Daggeldtarieven importeren',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 6b1bdab5f0ae..b5ffe2b9ff20 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5102,7 +5102,10 @@ ${amount} dla ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Nie ma jeszcze stawek diet',
-                subtitle: (workspaceName: string) => `${workspaceName} nie ma żadnych stawek diet. Poproś administratora, żeby je dodał.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} nie ma żadnych stawek diet. Poproś administratora, żeby je dodał.`
+                        : 'Ten obszar roboczy nie ma żadnych stawek diet. Poproś administratora, żeby je dodał.',
                 adminSubtitle: 'Dodaj stawki diet, żeby uporządkować swoje wydatki.',
             },
             importPerDiemRates: 'Zaimportuj stawki diet',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index a6faabf020fe..57e55a7a7b9c 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5062,7 +5062,10 @@ ${amount} para ${merchant} - ${date}`,
             },
             requestEmptyList: {
                 title: 'Ainda não há diárias',
-                subtitle: (workspaceName: string) => `${workspaceName} não tem nenhuma taxa de diária. Peça para um administrador adicionar algumas.`,
+                subtitle: (workspaceName?: string) =>
+                    workspaceName
+                        ? `${workspaceName} não tem nenhuma taxa de diária. Peça para um administrador adicionar algumas.`
+                        : 'Este espaço de trabalho não tem nenhuma taxa de diária. Peça para um administrador adicionar algumas.',
                 adminSubtitle: 'Adicione diárias para organizar seus gastos.',
             },
             importPerDiemRates: 'Importar tarifas de diária',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 6c07c57cbb39..ebf5d993329c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4919,7 +4919,7 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             },
             requestEmptyList: {
                 title: '尚未设置每日津贴费率',
-                subtitle: (workspaceName: string) => `${workspaceName} 没有任何日津贴标准。请联系管理员添加一些。`,
+                subtitle: (workspaceName?: string) => (workspaceName ? `${workspaceName} 没有任何日津贴标准。请联系管理员添加一些。` : '此工作区没有任何日津贴标准。请联系管理员添加一些。'),
                 adminSubtitle: '添加每日津贴标准，以整理您的支出。',
             },
             importPerDiemRates: '导入每日津贴费率',
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
index de9515f33d06..e62fbb6c6b76 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
@@ -256,7 +256,7 @@ function DynamicIOURequestStepDestination({
                             subtitle={
                                 isPolicyAdmin(policy)
                                     ? translate('workspace.perDiem.requestEmptyList.adminSubtitle')
-                                    : translate('workspace.perDiem.requestEmptyList.subtitle', policy?.name ?? '')
+                                    : translate('workspace.perDiem.requestEmptyList.subtitle', policy?.name)
                             }
                             containerStyle={[styles.flex1, styles.justifyContentCenter]}
                         />

From 144afd3a167cdd566e420c48091a7a5f48fbd2d7 Mon Sep 17 00:00:00 2001
From: alberto <alberto@expensify.com>
Date: Wed, 14 Oct 2026 12:48:38 +0200
Subject: [PATCH 649/781] parrot

---
 src/languages/de.ts      | 14 +++++++-------
 src/languages/el.ts      | 14 +++++++-------
 src/languages/es.ts      | 12 ++++++------
 src/languages/fr.ts      | 26 +++++++++++++-------------
 src/languages/it.ts      | 10 +++++-----
 src/languages/ja.ts      | 16 ++++++++--------
 src/languages/nl.ts      | 20 ++++++++++----------
 src/languages/pl.ts      | 12 ++++++------
 src/languages/pt-BR.ts   | 12 ++++++------
 src/languages/zh-hans.ts | 18 +++++++++---------
 10 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index fd9233fdc3d6..fc734d92f67b 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7892,18 +7892,18 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
         },
         officeLocations: {
             title: 'Bürostandorte',
-            subtitle: 'Fügen Sie Bürostandorte hinzu, um sie Mitgliedern für Dinge wie Entfernungserfassung zuzuweisen.',
+            subtitle: 'Fügen Sie Bürostandorte hinzu, die Sie Mitgliedern für Dinge wie die Entfernungserfassung zuweisen können.',
             addOfficeLocation: 'Bürostandort hinzufügen',
-            editOfficeLocation: 'Bürostandort bearbeiten',
+            editOfficeLocation: 'Standort des Büros bearbeiten',
             locationName: 'Standortname',
             locationNameHint: 'Wählen Sie einen Standort-Spitznamen, wenn Sie mehrere Bürostandorte hinzufügen',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Bürostandort ${officeNumber}`,
             setAsPrimary: 'Als primär festlegen',
             primary: 'Primär',
             deleteOfficeLocation: 'Bürostandort löschen?',
-            deleteOfficeLocationConfirmation: 'Möchten Sie diesen Bürostandort wirklich löschen? Mitglieder werden dem primären Büro neu zugewiesen.',
-            existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen ist bereits vorhanden',
-            setCompanyAddressAsPrimaryConfirmation: 'Die Firmenadresse als Hauptbüro festlegen?',
+            deleteOfficeLocationConfirmation: 'Möchten Sie diesen Bürostandort wirklich löschen? Mitglieder werden dem Hauptbüro neu zugewiesen.',
+            existingOfficeLocationError: 'Ein Bürostandort mit diesem Namen existiert bereits',
+            setCompanyAddressAsPrimaryConfirmation: 'Unternehmensadresse als Hauptbüro festlegen?',
         },
         bankAccount: {
             continueWithSetup: 'Einrichtung fortsetzen',
@@ -9734,10 +9734,10 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ aus verbotenen Ausgaben entfernt`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `hat den Bürostandort „${name}“ (${address}) hinzugefügt`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `hat den Bürostandort „${oldName}“ in „${newName}“ umbenannt`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `hat die Adresse des Bürostandorts „${name}“ in „${newAddress}“ geändert (zuvor „${oldAddress}“)`,
-            setAsPrimary: ({name}: {name: string}) => `setzen Sie den Bürostandort „${name}“ als primär`,
+            setAsPrimary: ({name}: {name: string}) => `Legen Sie den Bürositz „${name}“ als primär fest`,
             setCompanyAddressAsPrimary: 'Firmenadresse als primär festlegen',
             removed: ({name}: {name: string}) => `hat den Bürostandort „${name}“ entfernt`,
         },
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 0eb68e7f8893..203154cb82ca 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8192,18 +8192,18 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
         },
         officeLocations: {
             title: 'Τοποθεσίες γραφείων',
-            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αντιστοιχίζετε σε μέλη, π.χ. για την παρακολούθηση αποστάσεων.',
+            subtitle: 'Προσθέστε τοποθεσίες γραφείων για να τις αντιστοιχίσετε στα μέλη για λειτουργίες όπως η παρακολούθηση αποστάσεων.',
             addOfficeLocation: 'Προσθήκη τοποθεσίας γραφείου',
             editOfficeLocation: 'Επεξεργασία τοποθεσίας γραφείου',
             locationName: 'Όνομα τοποθεσίας',
-            locationNameHint: 'Επιλέξτε ένα ψευδώνυμο τοποθεσίας αν προσθέτετε πολλές τοποθεσίες γραφείων',
+            locationNameHint: 'Επιλέξτε ένα ψευδώνυμο τοποθεσίας αν προσθέτετε πολλές τοποθεσίες γραφείου',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Τοποθεσία γραφείου ${officeNumber}`,
             setAsPrimary: 'Ορισμός ως κύριο',
             primary: 'Κύριο',
-            deleteOfficeLocation: 'Διαγραφή τοποθεσίας γραφείου;',
-            deleteOfficeLocationConfirmation: 'Θέλετε πραγματικά να διαγράψετε αυτήν την τοποθεσία γραφείου; Τα μέλη θα ανατεθούν ξανά στο κύριο γραφείο.',
+            deleteOfficeLocation: 'Να διαγραφεί η τοποθεσία γραφείου;',
+            deleteOfficeLocationConfirmation: 'Θέλετε σίγουρα να διαγράψετε αυτήν την τοποθεσία γραφείου; Τα μέλη θα επαναχωριστούν στο κύριο γραφείο.',
             existingOfficeLocationError: 'Υπάρχει ήδη τοποθεσία γραφείου με αυτό το όνομα',
-            setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η εταιρική διεύθυνση ως κύριο γραφείο;',
+            setCompanyAddressAsPrimaryConfirmation: 'Να οριστεί η διεύθυνση της εταιρείας ως κύριο γραφείο;',
         },
         bankAccount: {
             continueWithSetup: 'Συνεχίστε τη ρύθμιση',
@@ -9856,11 +9856,11 @@ ${reportName}`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `αφαιρέσατε το «${prohibitedExpense}» από τις απαγορευμένες δαπάνες`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `πρόσθεσε την τοποθεσία γραφείου «${name}» (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονόμασε την τοποθεσία γραφείου «${oldName}» σε «${newName}»`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `μετονομάστηκε η τοποθεσία γραφείου «${oldName}» σε «${newName}»`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `άλλαξε τη διεύθυνση της τοποθεσίας γραφείου «${name}» σε «${newAddress}» (προηγουμένως «${oldAddress}»)`,
             setAsPrimary: ({name}: {name: string}) => `ορίστε την τοποθεσία γραφείου «${name}» ως κύρια`,
-            setCompanyAddressAsPrimary: 'ορίστε την εταιρική διεύθυνση ως κύρια',
+            setCompanyAddressAsPrimary: 'ορίστε τη διεύθυνση της εταιρείας ως κύρια',
             removed: ({name}: {name: string}) => `αφαίρεσε την τοποθεσία γραφείου «${name}»`,
         },
         workArrangement: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b52138eabe0f..fec3edf7a208 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7915,15 +7915,15 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
         officeLocations: {
             title: 'Ubicaciones de oficinas',
             subtitle: 'Añade ubicaciones de oficina para asignarlas a miembros para cosas como el seguimiento de distancias.',
-            addOfficeLocation: 'Añade ubicación de oficina',
+            addOfficeLocation: 'Añadir ubicación de la oficina',
             editOfficeLocation: 'Editar ubicación de la oficina',
             locationName: 'Nombre de la ubicación',
-            locationNameHint: 'Elige un nombre para la ubicación si estás añadiendo varias oficinas',
+            locationNameHint: 'Elige un nombre abreviado para la ubicación si estás añadiendo varias oficinas',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Ubicación de la oficina ${officeNumber}`,
             setAsPrimary: 'Establecer como principal',
             primary: 'Principal',
-            deleteOfficeLocation: '¿Eliminar ubicación de oficina?',
-            deleteOfficeLocationConfirmation: '¿De verdad quieres eliminar esta ubicación de oficina? Los miembros se reasignarán a la oficina principal.',
+            deleteOfficeLocation: '¿Eliminar la ubicación de la oficina?',
+            deleteOfficeLocationConfirmation: '¿Seguro que quieres eliminar esta ubicación de oficina? Los miembros serán reasignados a la oficina principal.',
             existingOfficeLocationError: 'Ya existe una ubicación de oficina con este nombre',
             setCompanyAddressAsPrimaryConfirmation: '¿Establecer la dirección de la empresa como oficina principal?',
         },
@@ -9502,11 +9502,11 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}) => `añadió "${prohibitedExpense}" a los gastos prohibidos`,
         removedProhibitedExpense: ({prohibitedExpense}) => `eliminó "${prohibitedExpense}" de los gastos prohibidos`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `añadió la ubicación de oficina «${name}» (${address})`,
+            added: ({name, address}: {name: string; address: string}) => `añadió la ubicación de la oficina «${name}» (${address})`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `cambió el nombre de la ubicación de la oficina de "${oldName}" a "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
                 `cambió la dirección de la oficina "${name}" a "${newAddress}" (previamente "${oldAddress}")`,
-            setAsPrimary: ({name}: {name: string}) => `establecer la ubicación de oficina "${name}" como principal`,
+            setAsPrimary: ({name}: {name: string}) => `establecer la ubicación de la oficina «${name}» como principal`,
             setCompanyAddressAsPrimary: 'establecer la dirección de la empresa como principal',
             removed: ({name}: {name: string}) => `eliminó la ubicación de la oficina «${name}»`,
         },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 2918d9f09fa4..df1829f81628 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7912,19 +7912,19 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             policy: 'Politique de dépenses',
         },
         officeLocations: {
-            title: 'Sites de bureaux',
-            subtitle: 'Ajoutez des bureaux à assigner aux membres pour des éléments comme le suivi des distances.',
+            title: 'Sites de bureau',
+            subtitle: 'Ajoutez des bureaux pour les assigner aux membres, par exemple pour le suivi des distances.',
             addOfficeLocation: 'Ajouter un lieu de travail',
-            editOfficeLocation: 'Modifier l’emplacement du bureau',
+            editOfficeLocation: 'Modifier le lieu de travail',
             locationName: 'Nom du lieu',
-            locationNameHint: 'Choisissez un nom personnalisé pour l’emplacement si vous ajoutez plusieurs bureaux',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Emplacement du bureau ${officeNumber}`,
+            locationNameHint: 'Choisissez un surnom de lieu si vous ajoutez plusieurs sites de bureau',
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Bureau ${officeNumber}`,
             setAsPrimary: 'Définir comme principal',
             primary: 'Principal',
-            deleteOfficeLocation: 'Supprimer le bureau ?',
-            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ? Les membres seront réaffectés au bureau principal.',
-            existingOfficeLocationError: 'Un site de bureau portant ce nom existe déjà',
-            setCompanyAddressAsPrimaryConfirmation: "Définir l'adresse de l'entreprise comme bureau principal ?",
+            deleteOfficeLocation: 'Supprimer le site ?',
+            deleteOfficeLocationConfirmation: 'Voulez-vous vraiment supprimer ce bureau ? Les membres seront réassignés au bureau principal.',
+            existingOfficeLocationError: 'Un bureau portant ce nom existe déjà',
+            setCompanyAddressAsPrimaryConfirmation: 'Définir l’adresse de l’entreprise comme bureau principal ?',
         },
         bankAccount: {
             continueWithSetup: 'Continuer la configuration',
@@ -9756,12 +9756,12 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a supprimé « ${prohibitedExpense} » des dépenses interdites`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `a ajouté le lieu de bureau « ${name} » (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le bureau « ${oldName} » en « ${newName} »`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `a renommé le lieu de bureau « ${oldName} » en « ${newName} »`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `a modifié l’adresse de l’emplacement de bureau « ${name} » pour « ${newAddress} » (auparavant « ${oldAddress} »)`,
+                `a modifié l’adresse du bureau « ${name} » en « ${newAddress} » (auparavant « ${oldAddress} »)`,
             setAsPrimary: ({name}: {name: string}) => `définir le lieu de travail « ${name} » comme principal`,
-            setCompanyAddressAsPrimary: "définir l'adresse de l'entreprise comme principale",
-            removed: ({name}: {name: string}) => `a supprimé le site "${name}"`,
+            setCompanyAddressAsPrimary: 'définir l’adresse de l’entreprise comme principale',
+            removed: ({name}: {name: string}) => `a supprimé le lieu de bureau « ${name} »`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `définir l’organisation de travail par défaut sur ${arrangement}`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0f28a0011e5c..4acf1be0d05a 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7847,15 +7847,15 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
         },
         officeLocations: {
             title: 'Sedi degli uffici',
-            subtitle: 'Aggiungi sedi dell’ufficio da assegnare ai membri per attività come il tracciamento delle distanze.',
+            subtitle: 'Aggiungi sedi dell’ufficio da assegnare ai membri per attività come il monitoraggio delle distanze.',
             addOfficeLocation: 'Aggiungi sede dell’ufficio',
             editOfficeLocation: 'Modifica sede ufficio',
             locationName: 'Nome località',
             locationNameHint: 'Scegli un nome abbreviato per la sede se stai aggiungendo più sedi di ufficio',
-            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ufficio ${officeNumber}`,
+            defaultName: ({officeNumber}: {officeNumber: number}) => `Sede ${officeNumber}`,
             setAsPrimary: 'Imposta come principale',
-            primary: 'Primario',
-            deleteOfficeLocation: 'Eliminare sede ufficio?',
+            primary: 'Principale',
+            deleteOfficeLocation: 'Eliminare la sede?',
             deleteOfficeLocationConfirmation: 'Vuoi davvero eliminare questa sede? I membri verranno riassegnati alla sede principale.',
             existingOfficeLocationError: 'Esiste già una sede con questo nome',
             setCompanyAddressAsPrimaryConfirmation: 'Impostare l’indirizzo dell’azienda come sede principale?',
@@ -9683,7 +9683,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             added: ({name, address}: {name: string; address: string}) => `ha aggiunto la sede "${name}" (${address})`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `ha rinominato la sede "${oldName}" in "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `ha cambiato l'indirizzo della sede "${name}" in "${newAddress}" (precedentemente "${oldAddress}")`,
+                `ha modificato l’indirizzo della sede "${name}" in "${newAddress}" (in precedenza "${oldAddress}")`,
             setAsPrimary: ({name}: {name: string}) => `imposta la sede "${name}" come principale`,
             setCompanyAddressAsPrimary: 'imposta l’indirizzo aziendale come principale',
             removed: ({name}: {name: string}) => `ha rimosso la sede "${name}"`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index ec02f89d9a95..9e3084f227ec 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7751,18 +7751,18 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
         },
         officeLocations: {
             title: 'オフィス所在地',
-            subtitle: 'オフィス所在地を追加して、距離の計測などのためにメンバーに割り当てましょう。',
+            subtitle: '距離の追跡などのためにメンバーに割り当てられるオフィス所在地を追加します。',
             addOfficeLocation: 'オフィス所在地を追加',
             editOfficeLocation: 'オフィス所在地を編集',
             locationName: '場所名',
-            locationNameHint: '複数のオフィス所在地を追加する場合は、場所のニックネームを選択してください',
+            locationNameHint: '複数のオフィス所在地を追加する場合は、所在地のニックネームを選択してください',
             defaultName: ({officeNumber}: {officeNumber: number}) => `オフィス所在地 ${officeNumber}`,
-            setAsPrimary: '主要に設定',
+            setAsPrimary: '優先に設定',
             primary: 'メイン',
             deleteOfficeLocation: 'オフィス所在地を削除しますか？',
-            deleteOfficeLocationConfirmation: 'このオフィス所在地を本当に削除しますか？メンバーはメインのオフィスに再割り当てされます。',
+            deleteOfficeLocationConfirmation: 'このオフィス所在地を本当に削除しますか？メンバーはプライマリのオフィスに再割り当てされます。',
             existingOfficeLocationError: 'この名前のオフィス所在地はすでに存在します',
-            setCompanyAddressAsPrimaryConfirmation: '会社の住所を主なオフィスとして設定しますか？',
+            setCompanyAddressAsPrimaryConfirmation: '会社住所を主なオフィス所在地として設定しますか？',
         },
         bankAccount: {
             continueWithSetup: 'セットアップを続行',
@@ -9547,9 +9547,9 @@ ${reportName}`,
             added: ({name, address}: {name: string; address: string}) => `オフィス所在地「${name}」（${address}）を追加しました`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `オフィス所在地名を「${oldName}」から「${newName}」に変更しました`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `オフィス拠点「${name}」の住所を「${newAddress}」に変更しました（以前の住所：「${oldAddress}」）`,
-            setAsPrimary: ({name}: {name: string}) => `オフィス所在地「${name}」を主な拠点に設定します`,
-            setCompanyAddressAsPrimary: '会社住所を主住所として設定する',
+                `オフィス所在地「${name}」の住所を「${newAddress}」（以前は「${oldAddress}」）に変更しました`,
+            setAsPrimary: ({name}: {name: string}) => `オフィス所在地「${name}」を主勤務地に設定します`,
+            setCompanyAddressAsPrimary: '会社の住所を主要に設定',
             removed: ({name}: {name: string}) => `オフィス所在地「${name}」を削除しました`,
         },
         workArrangement: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 1c72f0bfa439..e14b282258d4 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7826,17 +7826,17 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             policy: 'Declaratiebeleid',
         },
         officeLocations: {
-            title: 'Kantoorlocaties',
+            title: 'Kantoorlokaties',
             subtitle: 'Voeg kantoorlocaties toe om aan leden toe te wijzen voor zaken als afstandsregistratie.',
-            addOfficeLocation: 'Kantoorlocatie toevoegen',
-            editOfficeLocation: 'Kantoorlokatie bewerken',
+            addOfficeLocation: 'Kantoorlokatie toevoegen',
+            editOfficeLocation: 'Kantoorlocatie bewerken',
             locationName: 'Locatienaam',
-            locationNameHint: 'Kies een locatiebijnaam als je meerdere kantoorlocaties toevoegt',
+            locationNameHint: 'Kies een bijnaam voor de locatie als je meerdere kantoorlocaties toevoegt',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Kantoorlocatie ${officeNumber}`,
-            setAsPrimary: 'Instellen als primair',
+            setAsPrimary: 'Als primair instellen',
             primary: 'Primair',
-            deleteOfficeLocation: 'Locatie kantoor verwijderen?',
-            deleteOfficeLocationConfirmation: 'Wil je deze kantoorlocatie echt verwijderen? Leden worden opnieuw toegewezen aan het primaire kantoor.',
+            deleteOfficeLocation: 'Kantoorlocatie verwijderen?',
+            deleteOfficeLocationConfirmation: 'Wil je deze kantoorlocatie echt verwijderen? Leden worden opnieuw toegewezen aan het hoofdkantoor.',
             existingOfficeLocationError: 'Er bestaat al een kantoorlocatie met deze naam',
             setCompanyAddressAsPrimaryConfirmation: 'Het bedrijfsadres instellen als hoofdvestiging?',
         },
@@ -9652,10 +9652,10 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft „${prohibitedExpense}” verwijderd uit verboden uitgaven`,
         officeLocation: {
             added: ({name, address}: {name: string; address: string}) => `heeft de kantoorlocatie "${name}" (${address}) toegevoegd`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlocatie “${oldName}” hernoemd naar “${newName}”`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `heeft de kantoorlokatie “${oldName}” gewijzigd in “${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `heeft het adres van de kantoorlocatie ‘${name}’ gewijzigd in ‘${newAddress}’ (voorheen ‘${oldAddress}’)`,
-            setAsPrimary: ({name}: {name: string}) => `stel de kantoorlocatie ‘${name}’ in als primair`,
+                `heeft het adres van kantoorlocatie "${name}" gewijzigd naar "${newAddress}" (voorheen "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `stel de kantoorlocatie "${name}" in als primair`,
             setCompanyAddressAsPrimary: 'stel het bedrijfsadres in als primair',
             removed: ({name}: {name: string}) => `heeft de kantoorlocatie "${name}" verwijderd`,
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index c0f28240511b..9fc199440256 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7851,14 +7851,14 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
         },
         officeLocations: {
             title: 'Lokalizacje biur',
-            subtitle: 'Dodaj lokalizacje biur, żeby przypisywać je członkom, na przykład do śledzenia odległości.',
+            subtitle: 'Dodaj lokalizacje biur, aby przypisywać je członkom do rzeczy takich jak śledzenie dystansu.',
             addOfficeLocation: 'Dodaj lokalizację biura',
             editOfficeLocation: 'Edytuj lokalizację biura',
             locationName: 'Nazwa lokalizacji',
             locationNameHint: 'Wybierz nazwę lokalizacji, jeśli dodajesz wiele biur',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Lokalizacja biura ${officeNumber}`,
             setAsPrimary: 'Ustaw jako główny',
-            primary: 'Podstawowe',
+            primary: 'Główny',
             deleteOfficeLocation: 'Usunąć lokalizację biura?',
             deleteOfficeLocationConfirmation: 'Czy na pewno chcesz usunąć tę lokalizację biura? Członkowie zostaną przypisani do głównego biura.',
             existingOfficeLocationError: 'Lokalizacja biura o tej nazwie już istnieje',
@@ -9663,13 +9663,13 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `dodano „${prohibitedExpense}” do zabronionych wydatków`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `usunięto „${prohibitedExpense}” z wydatków zabronionych`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `dodał(-a) lokalizację biura „${name}” (${address})`,
+            added: ({name, address}: {name: string; address: string}) => `dodał(a) lokalizację biura „${name}” (${address})`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `zmienił(a) nazwę lokalizacji biura z „${oldName}” na „${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `zmienił adres biura „${name}” na „${newAddress}” (poprzednio „${oldAddress}”)`,
+                `zmienił(a) adres lokalizacji biura „${name}” na „${newAddress}” (wcześniej „${oldAddress}”)`,
             setAsPrimary: ({name}: {name: string}) => `ustaw lokalizację biura „${name}” jako główną`,
-            setCompanyAddressAsPrimary: 'ustaw adres firmy jako główny',
-            removed: ({name}: {name: string}) => `usunął(-ę) lokalizację biura „${name}”`,
+            setCompanyAddressAsPrimary: 'ustaw firmowy adres jako główny',
+            removed: ({name}: {name: string}) => `usunięto lokalizację biura „${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `ustaw domyślny tryb pracy na ${arrangement}`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 30b228bcb14d..82eb48cad720 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7832,16 +7832,16 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
         },
         officeLocations: {
             title: 'Locais do escritório',
-            subtitle: 'Adicione locais de escritório para atribuir a membros em coisas como rastreamento de distância.',
+            subtitle: 'Adicione locais de escritório para atribuir aos membros, por exemplo, para rastreamento de distância.',
             addOfficeLocation: 'Adicionar local do escritório',
-            editOfficeLocation: 'Editar local do escritório',
+            editOfficeLocation: 'Editar localização do escritório',
             locationName: 'Nome do local',
             locationNameHint: 'Escolha um apelido para o local se você estiver adicionando vários escritórios',
             defaultName: ({officeNumber}: {officeNumber: number}) => `Local do escritório ${officeNumber}`,
             setAsPrimary: 'Definir como principal',
             primary: 'Principal',
             deleteOfficeLocation: 'Excluir local do escritório?',
-            deleteOfficeLocationConfirmation: 'Deseja realmente excluir este escritório? Os membros serão reatribuídos ao escritório principal.',
+            deleteOfficeLocationConfirmation: 'Você realmente quer excluir este escritório? Os membros serão realocados para o escritório principal.',
             existingOfficeLocationError: 'Já existe um local de escritório com esse nome',
             setCompanyAddressAsPrimaryConfirmation: 'Definir o endereço da empresa como escritório principal?',
         },
@@ -9649,11 +9649,11 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `adicionou "${prohibitedExpense}" às despesas proibidas`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removeu "${prohibitedExpense}" das despesas proibidas`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `adicionou o local de escritório "${name}" (${address})`,
+            added: ({name, address}: {name: string; address: string}) => `adicionou a localização do escritório "${name}" (${address})`,
             renamed: ({oldName, newName}: {oldName: string; newName: string}) => `renomeou o local do escritório de "${oldName}" para "${newName}"`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `alterou o endereço da filial "${name}" para "${newAddress}" (anteriormente "${oldAddress}")`,
-            setAsPrimary: ({name}: {name: string}) => `definir o local do escritório "${name}" como principal`,
+                `alterou o endereço da localização do escritório "${name}" para "${newAddress}" (anteriormente "${oldAddress}")`,
+            setAsPrimary: ({name}: {name: string}) => `definir o local de escritório "${name}" como principal`,
             setCompanyAddressAsPrimary: 'definir o endereço da empresa como principal',
             removed: ({name}: {name: string}) => `removeu o local do escritório "${name}"`,
         },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 898b7db4f863..523b9880a753 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7559,18 +7559,18 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
         },
         officeLocations: {
             title: '办公地点',
-            subtitle: '添加办公地点，并将其分配给成员，用于距离追踪等用途。',
+            subtitle: '添加办公地点，以便为成员分配用于里程跟踪等用途。',
             addOfficeLocation: '添加办公地点',
-            editOfficeLocation: '编辑办公室地点',
+            editOfficeLocation: '编辑办公室位置',
             locationName: '位置名称',
-            locationNameHint: '如果你要添加多个办公地点，请为此地点选择一个昵称',
+            locationNameHint: '如果你要添加多个办公地点，请为每个地点选择一个昵称',
             defaultName: ({officeNumber}: {officeNumber: number}) => `办公室位置 ${officeNumber}`,
             setAsPrimary: '设为主要',
             primary: '主要',
             deleteOfficeLocation: '删除办公地点？',
-            deleteOfficeLocationConfirmation: '确定要删除此办公室地点吗？成员将被重新分配到主要办公地点。',
+            deleteOfficeLocationConfirmation: '你确定要删除此办公地点吗？成员将被重新分配到主办公地点。',
             existingOfficeLocationError: '已存在同名的办公地点',
-            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公地点？',
+            setCompanyAddressAsPrimaryConfirmation: '将公司地址设为主要办公室？',
         },
         bankAccount: {
             continueWithSetup: '继续设置',
@@ -9292,13 +9292,13 @@ ${reportName}`,
         addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已将“${prohibitedExpense}”添加到禁止报销的费用中`,
         removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已从禁用报销类别中移除“${prohibitedExpense}”`,
         officeLocation: {
-            added: ({name, address}: {name: string; address: string}) => `已添加办公地点“${name}” (${address})`,
-            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点“${oldName}”重命名为“${newName}”`,
+            added: ({name, address}: {name: string; address: string}) => `已添加办公地点“${name}”（${address}）`,
+            renamed: ({oldName, newName}: {oldName: string; newName: string}) => `已将办公地点名称从“${oldName}”重命名为“${newName}”`,
             changedAddress: ({name, newAddress, oldAddress}: {name: string; newAddress: string; oldAddress: string}) =>
-                `将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
+                `已将办公地点“${name}”的地址更改为“${newAddress}”（原为“${oldAddress}”）`,
             setAsPrimary: ({name}: {name: string}) => `将办公地点“${name}”设为主要地点`,
             setCompanyAddressAsPrimary: '将公司地址设为主要地址',
-            removed: ({name}: {name: string}) => `已移除办公地点“${name}”`,
+            removed: ({name}: {name: string}) => `已移除办公室地点“${name}”`,
         },
         workArrangement: {
             set: ({arrangement}: {arrangement: string}) => `将默认工作安排设置为 ${arrangement}`,

From 9e22880aaea0a32b014e6c90e78a6d30b02114da Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 10:52:59 +0000
Subject: [PATCH 650/781] Fix: Apply oxfmt formatting to
 DynamicIOURequestStepDestination

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 .../iou/request/step/DynamicIOURequestStepDestination.tsx     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
index e62fbb6c6b76..eaa76a092e2e 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDestination.tsx
@@ -254,9 +254,7 @@ function DynamicIOURequestStepDestination({
                             icon={illustrations.EmptyStateExpenses}
                             title={translate('workspace.perDiem.requestEmptyList.title')}
                             subtitle={
-                                isPolicyAdmin(policy)
-                                    ? translate('workspace.perDiem.requestEmptyList.adminSubtitle')
-                                    : translate('workspace.perDiem.requestEmptyList.subtitle', policy?.name)
+                                isPolicyAdmin(policy) ? translate('workspace.perDiem.requestEmptyList.adminSubtitle') : translate('workspace.perDiem.requestEmptyList.subtitle', policy?.name)
                             }
                             containerStyle={[styles.flex1, styles.justifyContentCenter]}
                         />

From ba2349c900604c1206845c528d9b634c6c790567 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 11:03:02 +0000
Subject: [PATCH 651/781] =?UTF-8?q?Use=20=E6=AF=8F=E6=97=A5=E6=B4=A5?=
 =?UTF-8?q?=E8=B4=B4=20consistently=20in=20zh-hans=20per=20diem=20empty=20?=
 =?UTF-8?q?state=20subtitle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/languages/zh-hans.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index ebf5d993329c..da1d2cc5600d 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4919,7 +4919,8 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             },
             requestEmptyList: {
                 title: '尚未设置每日津贴费率',
-                subtitle: (workspaceName?: string) => (workspaceName ? `${workspaceName} 没有任何日津贴标准。请联系管理员添加一些。` : '此工作区没有任何日津贴标准。请联系管理员添加一些。'),
+                subtitle: (workspaceName?: string) =>
+                    workspaceName ? `${workspaceName} 没有任何每日津贴标准。请联系管理员添加一些。` : '此工作区没有任何每日津贴标准。请联系管理员添加一些。',
                 adminSubtitle: '添加每日津贴标准，以整理您的支出。',
             },
             importPerDiemRates: '导入每日津贴费率',

From a03e0d24882d96eb0ae764cf04477951be15c29e Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 11:07:27 +0000
Subject: [PATCH 652/781] Remove expenses that leave a report from that
 report's carousel

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 .../actions/TransactionThreadNavigation.ts    | 33 ++++++++++++
 .../hooks/useReportSelectionActions.ts        |  3 ++
 .../TransactionThreadNavigationTest.ts        | 54 +++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/src/libs/actions/TransactionThreadNavigation.ts b/src/libs/actions/TransactionThreadNavigation.ts
index 026ec10e4d70..82fbf8c0756f 100644
--- a/src/libs/actions/TransactionThreadNavigation.ts
+++ b/src/libs/actions/TransactionThreadNavigation.ts
@@ -201,6 +201,38 @@ function clearActiveTransactionIDsForSource(source: string) {
     return clearActiveTransactionIDs();
 }
 
+/**
+ * Takes expenses that just left `reportID` out of a carousel seeded from that report.
+ *
+ * A report-scoped carousel lists the report's own expenses, so an expense moved or removed from the report no longer
+ * belongs in it. Leaving it there kept the arrows on the report's header after it dropped to one expense, and
+ * stepping to the moved expense opened it in its new home (for example the self-DM). Carousels from other screens,
+ * such as search results, legitimately span several reports and are left alone.
+ */
+function removeActiveTransactionIDsForReport(transactionIDs: string[], reportID: string | undefined) {
+    if (!lastSetIDs?.length || !transactionIDs.length || !reportID) {
+        return Promise.resolve();
+    }
+
+    const reportSources = new Set<string>([CAROUSEL_SOURCE.report(reportID), CAROUSEL_SOURCE.reportRow(reportID), CAROUSEL_SOURCE.reportPreview(reportID)]);
+    if (!lastSetSource || !reportSources.has(lastSetSource)) {
+        return Promise.resolve();
+    }
+
+    const removedIDs = new Set(transactionIDs);
+    const remainingIDs = lastSetIDs.filter((transactionID) => !removedIDs.has(transactionID));
+    if (remainingIDs.length === lastSetIDs.length) {
+        return Promise.resolve();
+    }
+
+    // One expense left is nothing to page through.
+    if (remainingIDs.length < 2) {
+        return clearActiveTransactionIDs();
+    }
+
+    return setActiveTransactionIDs(remainingIDs, {source: lastSetSource, snapshotHash: lastSetSnapshotHash ?? undefined, descriptors: lastSetDescriptors ?? undefined});
+}
+
 /**
  * Gives up ownership of the carousel without clearing it, for a writer that unmounts while the list it seeded is
  * still driving the arrows of an expense open on top of it.
@@ -221,6 +253,7 @@ export {
     setActiveTransactionIDs,
     clearActiveTransactionIDs,
     clearActiveTransactionIDsForSource,
+    removeActiveTransactionIDsForReport,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
diff --git a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
index cd18b4c2b28e..ca2835c431c9 100644
--- a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
+++ b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
@@ -10,6 +10,7 @@ import usePermissions from '@hooks/usePermissions';
 import {setCustomUnitID, setCustomUnitRateID} from '@libs/actions/IOU/MoneyRequest';
 import {clearSubrates} from '@libs/actions/IOU/PerDiem';
 import {changeTransactionsReport, setTransactionReport} from '@libs/actions/Transaction';
+import {removeActiveTransactionIDsForReport} from '@libs/actions/TransactionThreadNavigation';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -227,6 +228,7 @@ function useReportSelectionActions({
                         getCurrencyDecimals,
                         getCurrencySymbol,
                     });
+                    removeActiveTransactionIDsForReport(targetTransactionIDs, transaction.reportID);
                     removeTransaction(transaction.transactionID);
                 }
             },
@@ -260,6 +262,7 @@ function useReportSelectionActions({
                     getCurrencyDecimals,
                     getCurrencySymbol,
                 });
+                removeActiveTransactionIDsForReport(targetTransactionIDs, transaction.reportID);
                 removeTransaction(transaction.transactionID);
             },
         });
diff --git a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
index b0fabc4c81f3..3e1f8fc3b452 100644
--- a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
+++ b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
@@ -4,6 +4,7 @@ import {
     clearActiveTransactionIDsForSource,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
+    removeActiveTransactionIDsForReport,
     setActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
 } from '@libs/actions/TransactionThreadNavigation';
@@ -279,4 +280,57 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
         });
     });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/103944: removing an expense from a two-expense
+     * report left it in the report's carousel, so the report kept its arrows and stepping to the removed expense
+     * opened the self-DM.
+     */
+    describe('removeActiveTransactionIDsForReport', () => {
+        it('clears a report row carousel that drops to one expense', async () => {
+            // Given an expense opened from report B's list, seeding the carousel with both of B's expenses
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: CAROUSEL_SOURCE.reportRow('B')});
+
+            // When one of them is removed from report B
+            await removeActiveTransactionIDsForReport(['B1'], 'B');
+
+            // Then there is nothing left to page through, so the carousel is cleared and no arrows show
+            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: null, snapshotHash: null});
+            expect((await readCarouselFromOnyx()).ids).toBeUndefined();
+        });
+
+        it('keeps paging through the expenses still on the report', async () => {
+            // Given report B's own carousel with three expenses
+            await setActiveTransactionIDs(['B1', 'B2', 'B3'], {source: REPORT_SOURCE});
+
+            // When one expense moves to another report
+            await removeActiveTransactionIDsForReport(['B2'], 'B');
+
+            // Then the other two stay in the carousel under the same owner
+            expect(getActiveTransactionIDs()).toEqual({ids: ['B1', 'B3'], descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
+            expect((await readCarouselFromOnyx()).ids).toEqual(['B1', 'B3']);
+        });
+
+        it('leaves a search carousel alone, since it spans several reports', async () => {
+            // Given a carousel seeded from the Spend page, which holds expenses from reports A and B
+            await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            // When an expense is removed from report B
+            await removeActiveTransactionIDsForReport(['B1'], 'B');
+
+            // Then the search carousel is untouched, because the expense is still one of its results
+            expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+        });
+
+        it("leaves another report's carousel alone", async () => {
+            // Given report B's carousel
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+
+            // When an expense leaves a different report
+            await removeActiveTransactionIDsForReport(['B1'], 'A');
+
+            // Then report B's carousel is untouched
+            expect(getActiveTransactionIDs()).toEqual({ids: REPORT_B_IDS, descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
+        });
+    });
 });

From 0478ce75c6344b6fcd70b029c3e9b345b7221612 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 13:08:30 +0200
Subject: [PATCH 653/781] fix: keep modal list edits out of drafts and show
 readonly list entries

---
 .../DynamicForm/adapters/ListFieldAdapter.tsx | 14 +++++--
 .../components/DynamicFormFieldRow.tsx        | 11 +++++-
 .../components/DynamicFormFields.tsx          |  3 +-
 .../components/DynamicFormListItemModal.tsx   | 22 +++++------
 src/components/DynamicForm/index.tsx          |  4 ++
 .../DynamicForm/renderers/listRenderer.tsx    |  1 +
 src/components/DynamicForm/renderers/types.ts |  2 +-
 .../utils/getSensitiveDefaultValue.ts         |  3 +-
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 27 ++++++++++++++
 .../adapters/ListFieldAdapterTest.tsx         | 37 ++++++++++++++++---
 10 files changed, 100 insertions(+), 24 deletions(-)

diff --git a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
index 5398c6f14e3e..07913d5c6537 100644
--- a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
+++ b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
@@ -46,6 +46,9 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
         /** The fields of one entry, which name and describe its row */
         itemFields: DynamicFormField[];
 
+        /** The list is marked `sensitive`, so none of its entries' answers is drafted while the modal edits one */
+        isSensitive?: boolean;
+
         /** Hides the add row once the list holds this many entries */
         maxItems?: number;
 
@@ -56,7 +59,7 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
         onEdit?: (itemID: string) => void;
 
         /** Draws the entry's fields inside the modal editor */
-        renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
+        renderFields: (fields: DynamicFormField[], values: DynamicFormValues, isSensitive: boolean) => ReactNode;
     };
 
 /** The entries of a list field as rows. Removing one updates FormProvider's value; adding and editing open the flow's editor page, or a modal outside the flow. */
@@ -68,6 +71,7 @@ function ListFieldAdapter({
     label,
     itemLabel,
     itemFields,
+    isSensitive = false,
     maxItems,
     addTitle,
     addDescription,
@@ -87,10 +91,11 @@ function ListFieldAdapter({
         modalTitle = editingTitle === '' ? label : editingTitle;
     }
     const sensitiveKeys = new Set(itemFields.filter(isSensitiveField).flatMap(getAnswerKeys));
+    const isKeptOutOfDraft = (key: string) => key !== 'id' && (isSensitive || sensitiveKeys.has(key));
 
-    // Sensitive answers are not drafted, so the modal shows them blank and a blank one keeps the stored answer
+    // Sensitive answers are not drafted, so the modal's inputs start from the stored entry instead. Every answer of a sensitive list is.
     const openModal = (item?: DynamicFormListItem) => {
-        const answers = Object.fromEntries(Object.entries(item ?? {}).filter(([key]) => key !== 'id' && !sensitiveKeys.has(key)));
+        const answers = Object.fromEntries(Object.entries(item ?? {}).filter(([key]) => key !== 'id' && !isKeptOutOfDraft(key)));
         startListItemEdit(answers).then(() => setEditingID(item?.id ?? Str.guid()));
     };
 
@@ -155,7 +160,8 @@ function ListFieldAdapter({
                     title={modalTitle}
                     itemFields={itemFields}
                     forwardedFSClass={forwardedFSClass}
-                    keptAnswers={Object.fromEntries(Object.entries(editingItem ?? {}).filter(([key]) => sensitiveKeys.has(key)))}
+                    keptAnswers={Object.fromEntries(Object.entries(editingItem ?? {}).filter(([key]) => isKeptOutOfDraft(key)))}
+                    isSensitive={isSensitive}
                     renderFields={renderFields}
                     onSave={saveItem}
                     onClose={closeModal}
diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index 2b0f1b0b0048..edf9a0f07f99 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -3,6 +3,8 @@ import type {DynamicFieldContext} from '@components/DynamicForm/renderers/types'
 import formatDynamicFieldValue from '@components/DynamicForm/utils/formatDynamicFieldValue';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
+import {getListItems} from '@components/DynamicForm/utils/listItems';
+import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
 
@@ -51,6 +53,13 @@ function DynamicFormFieldRow({
     const label = getFieldLabel(field, translate);
 
     if (field.readonly) {
+        // A list's answer is its entries, which formatDynamicFieldValue cannot name, so they are listed by their titles
+        const readonlyValue =
+            field.type === 'list'
+                ? getListItems(values[field.key])
+                      .map((item) => summarizeListItem(item, field.itemFields, translate).title)
+                      .join(', ')
+                : formatDynamicFieldValue(field, values, translate);
         return (
             <View
                 style={[styles.mhn5, styles.pv1]}
@@ -58,7 +67,7 @@ function DynamicFormFieldRow({
             >
                 <MenuItemField
                     name={label}
-                    value={formatDynamicFieldValue(field, values, translate)}
+                    value={readonlyValue}
                 />
             </View>
         );
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index f056bc678a7d..ab4944ff55fb 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -59,10 +59,11 @@ function DynamicFormFields({
 }: DynamicFormFieldsProps) {
     const visibleContent = getVisibleContent(content, values, allFields);
     const loneField = getLoneField(getContentFields(visibleContent));
-    const renderFields = (itemFields: DynamicFormField[], itemValues: DynamicFormValues) => (
+    const renderFields = (itemFields: DynamicFormField[], itemValues: DynamicFormValues, isItemSensitive: boolean) => (
         <DynamicFormFields
             content={itemFields}
             values={itemValues}
+            isSensitive={isItemSensitive}
             currency={currency}
             maxFileSize={maxFileSize}
         />
diff --git a/src/components/DynamicForm/components/DynamicFormListItemModal.tsx b/src/components/DynamicForm/components/DynamicFormListItemModal.tsx
index b13b450d76f4..acd3f61b13f4 100644
--- a/src/components/DynamicForm/components/DynamicFormListItemModal.tsx
+++ b/src/components/DynamicForm/components/DynamicFormListItemModal.tsx
@@ -31,11 +31,14 @@ type DynamicFormListItemModalProps = ForwardedFSClassProps & {
     /** The fields of one entry */
     itemFields: DynamicFormField[];
 
-    /** Answers the form cannot show, such as stored sensitive ones, used when the user leaves them blank */
+    /** Stored answers that are not drafted, such as sensitive ones, which the inputs start from */
     keptAnswers: DynamicFormValues;
 
+    /** Every answer of the entry is sensitive, as in a list marked `sensitive`: none is drafted */
+    isSensitive: boolean;
+
     /** Draws the entry's fields inside the modal's form */
-    renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
+    renderFields: (fields: DynamicFormField[], values: DynamicFormValues, isSensitive: boolean) => ReactNode;
 
     /** Called with the entry's answers when the user saves */
     onSave: (answers: DynamicFormValues) => void;
@@ -45,15 +48,12 @@ type DynamicFormListItemModalProps = ForwardedFSClassProps & {
 };
 
 /** The editor of one list entry outside DynamicFormFlow, as a modal over the page holding the list */
-function DynamicFormListItemModal({isVisible, title, itemFields, keptAnswers, renderFields, onSave, onClose, forwardedFSClass}: DynamicFormListItemModalProps) {
+function DynamicFormListItemModal({isVisible, title, itemFields, keptAnswers, isSensitive, renderFields, onSave, onClose, forwardedFSClass}: DynamicFormListItemModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [, itemDraftMetadata] = useOnyx(ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM_DRAFT);
-    const withKeptAnswers = (inputValues: unknown): DynamicFormValues => {
-        const answers = toDynamicFormValues(inputValues);
-        const keptBlankAnswers = Object.entries(keptAnswers).filter(([key]) => (answers[key] ?? '') === '');
-        return {...answers, ...Object.fromEntries(keptBlankAnswers)};
-    };
+    // Kept answers fill the inputs, so clearing one in the form clears it on save, as on the flow's editor page
+    const withInputValues = (inputValues: unknown): DynamicFormValues => ({...keptAnswers, ...toDynamicFormValues(inputValues)});
 
     return (
         <Modal
@@ -77,13 +77,13 @@ function DynamicFormListItemModal({isVisible, title, itemFields, keptAnswers, re
                     <FormProvider
                         formID={ONYXKEYS.FORMS.DYNAMIC_FORM_LIST_ITEM_FORM}
                         submitButtonText={translate('common.save')}
-                        validate={(inputValues) => getDynamicFieldErrors(itemFields, withKeptAnswers(inputValues), translate)}
-                        onSubmit={(inputValues) => onSave(withKeptAnswers(inputValues))}
+                        validate={(inputValues) => getDynamicFieldErrors(itemFields, withInputValues(inputValues), translate)}
+                        onSubmit={(inputValues) => onSave(withInputValues(inputValues))}
                         style={[styles.mh5, styles.flexGrow1]}
                         submitButtonStyles={styles.mb0}
                         enabledWhenOffline
                     >
-                        {({inputValues}) => renderFields(itemFields, toDynamicFormValues(inputValues))}
+                        {({inputValues}) => renderFields(itemFields, withInputValues(inputValues), isSensitive)}
                     </FormProvider>
                 )}
             </ScreenWrapper>
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 516ce17da001..7980ef22174b 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -215,6 +215,10 @@ function DynamicFormFlow({
 
     const openListItemEditor = (listKey: string, itemID?: string) => {
         const editorIndex = subPages.findIndex((page) => page.pageName === getListItemPageName(listKey, itemID));
+        // moveTo(-1) would open the last sub-page, which is another entry's editor
+        if (editorIndex === -1) {
+            return;
+        }
         moveTo(editorIndex, isEditing || currentPageName === CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY);
     };
 
diff --git a/src/components/DynamicForm/renderers/listRenderer.tsx b/src/components/DynamicForm/renderers/listRenderer.tsx
index 2106f6e37942..1e99405f5776 100644
--- a/src/components/DynamicForm/renderers/listRenderer.tsx
+++ b/src/components/DynamicForm/renderers/listRenderer.tsx
@@ -29,6 +29,7 @@ const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField
                 label={getFieldLabel(field, translate)}
                 itemLabel={itemLabel}
                 itemFields={field.itemFields}
+                isSensitive={isSensitiveField(field)}
                 maxItems={field.maxItems}
                 addTitle={itemLabel ? translate('dynamicForm.addItem', {item: itemLabel}) : translate('common.add')}
                 addDescription={getLocalizedText(translate, field.addItemDescriptionKey, field.addItemDescription)}
diff --git a/src/components/DynamicForm/renderers/types.ts b/src/components/DynamicForm/renderers/types.ts
index 298d393a4ed3..d13ec5e7dd04 100644
--- a/src/components/DynamicForm/renderers/types.ts
+++ b/src/components/DynamicForm/renderers/types.ts
@@ -20,7 +20,7 @@ type DynamicFieldContext = Pick<DynamicFormFieldsProps, 'values' | 'maxFileSize'
         isLoneField: boolean;
 
         /** Draws a list entry's fields in the modal editor used outside DynamicFormFlow */
-        renderFields: (fields: DynamicFormField[], values: DynamicFormValues) => ReactNode;
+        renderFields: (fields: DynamicFormField[], values: DynamicFormValues, isSensitive: boolean) => ReactNode;
     };
 
 /** The answer each field type's input holds. An address holds its street, and its other parts sit under their own keys. */
diff --git a/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
index 0f78ddf4e6a5..6e799e8bb578 100644
--- a/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
+++ b/src/components/DynamicForm/utils/getSensitiveDefaultValue.ts
@@ -6,6 +6,7 @@ import type {DynamicFormFieldType, DynamicFormListItem} from '@src/types/onyx';
 import type {FileObject} from '@src/types/utils/Attachment';
 
 import isSensitiveField from './isSensitiveField';
+import {isListItem} from './listItems';
 
 type AnswerGuards = {[TType in DynamicFormFieldType]: (answer: FormValue) => answer is DynamicFieldAnswerMap[TType]};
 
@@ -26,7 +27,7 @@ function isFileList(answer: FormValue): answer is FileObject[] {
 }
 
 function isListItems(answer: FormValue): answer is DynamicFormListItem[] {
-    return Array.isArray(answer) && answer.every((item) => typeof item === 'object' && 'id' in item);
+    return Array.isArray(answer) && answer.every(isListItem);
 }
 
 const ANSWER_GUARDS: AnswerGuards = {
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index 8ddaa3f0cc96..755eca38bfca 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -566,6 +566,33 @@ describe('DynamicFormFields', () => {
         expect(screen.getByText('25%')).toBeOnTheScreen();
     });
 
+    it('shows a readonly list as the names of its entries', () => {
+        // Given a readonly list of owners holding two entries
+        const owners: DynamicFormField = {
+            key: 'owners',
+            type: 'list',
+            required: true,
+            readonly: true,
+            itemFields: [
+                {key: 'firstName', type: 'text', required: true},
+                {key: 'lastName', type: 'text', required: true},
+            ],
+        };
+        const values = {
+            owners: [
+                {id: 'jane', firstName: 'Jane', lastName: 'Doe'},
+                {id: 'john', firstName: 'John', lastName: 'Roe'},
+            ],
+        } as DynamicFormValues;
+
+        // When it renders
+        const rendered = renderFields([owners], values);
+
+        // Then no input is drawn, and the row names every owner, since a readonly list cannot be opened to see them
+        expect(rendered.size).toBe(0);
+        expect(screen.getByText('Jane Doe, John Roe')).toBeOnTheScreen();
+    });
+
     it.each([
         ['select', InlineSelectionListAdapter, {valueType: 'string'}],
         ['multiselect', InlineSelectionListAdapter, {canSelectMultiple: true, valueType: 'stringList'}],
diff --git a/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
index 444752448001..16c1da5a211c 100644
--- a/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
+++ b/tests/unit/components/DynamicForm/adapters/ListFieldAdapterTest.tsx
@@ -4,7 +4,7 @@ import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter'
 import type {ListFieldRow} from '@components/ListField';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 
-import {clearListItemEdit} from '@userActions/DynamicForm';
+import {clearListItemEdit, startListItemEdit} from '@userActions/DynamicForm';
 
 import type {DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
 
@@ -20,6 +20,7 @@ type CapturedListFieldProps = {
 
 type CapturedModalProps = {
     isVisible: boolean;
+    isSensitive: boolean;
     keptAnswers: Record<string, unknown>;
     onSave: (answers: Record<string, string>) => void;
     onClose: () => void;
@@ -111,21 +112,47 @@ describe('ListFieldAdapter', () => {
         expect(onInputChange).not.toHaveBeenCalled();
     });
 
-    it('edits an entry in a modal outside the flow, keeping a stored sensitive answer the user leaves blank', async () => {
+    it('edits an entry in a modal outside the flow, filling a stored sensitive answer from the entry instead of the draft', async () => {
         // Given a director with a stored SSN, in a list that no flow opens editor pages for
         const onInputChange = jest.fn();
         const {onEdit} = renderAdapter([{...jane, ssn: '123456789'}], onInputChange, undefined, false);
 
-        // When the user edits the director, renames them and saves with the SSN left blank
+        // When the user edits the director, renames them and saves with the SSN they were shown
         await act(async () => onEdit('jane'));
         const modal = mockModal.mock.lastCall?.[0];
-        act(() => modal?.onSave({fullName: 'Jane Smith', ...modal.keptAnswers}));
+        act(() => modal?.onSave({...modal.keptAnswers, fullName: 'Jane Smith'}));
 
-        // Then the modal opened over the page, and the list holds the renamed director with the SSN still in place
+        // Then the modal opened over the page with the SSN kept out of the editor draft, and the list holds the renamed director with the SSN still in place
         expect(modal?.isVisible).toBe(true);
+        expect(startListItemEdit).toHaveBeenLastCalledWith({fullName: 'Jane Doe'});
+        expect(modal?.keptAnswers).toEqual({ssn: '123456789'});
         expect(onInputChange).toHaveBeenCalledWith([{id: 'jane', fullName: 'Jane Smith', ssn: '123456789'}]);
     });
 
+    it('drafts none of the answers of an entry of a sensitive list edited in the modal', async () => {
+        // Given a director in a list marked sensitive, which no flow opens editor pages for
+        render(
+            <ListFieldAdapter
+                value={[jane]}
+                onInputChange={jest.fn()}
+                itemFields={itemFields}
+                isSensitive
+                label="Directors"
+                addTitle="Add director"
+                renderFields={jest.fn()}
+            />,
+        );
+
+        // When the user opens the director in the modal
+        await act(async () => mockListField.mock.lastCall?.[0].onEdit('jane'));
+        const modal = mockModal.mock.lastCall?.[0];
+
+        // Then the editor draft starts empty and the director's answers fill the inputs from the entry, so nothing of a sensitive list reaches the device
+        expect(startListItemEdit).toHaveBeenLastCalledWith({});
+        expect(modal?.keptAnswers).toEqual({fullName: 'Jane Doe'});
+        expect(modal?.isSensitive).toBe(true);
+    });
+
     it('empties the editor draft when the modal closes', async () => {
         // Given a director open in the modal editor outside the flow
         const {onEdit} = renderAdapter([jane], jest.fn(), undefined, false);

From 7df0599324977079ee38b4cf43f5722db2fbca7f Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 13:19:33 +0200
Subject: [PATCH 654/781] Introduce useTouchPinnedTooltip hook

---
 .../Charts/PieChart/PieChartContent.tsx       | 24 +++-------
 src/components/Charts/hooks/index.ts          |  1 +
 .../Charts/hooks/useChartInteractions.ts      | 33 +++++---------
 .../Charts/hooks/useTouchPinnedTooltip.ts     | 45 +++++++++++++++++++
 4 files changed, 62 insertions(+), 41 deletions(-)
 create mode 100644 src/components/Charts/hooks/useTouchPinnedTooltip.ts

diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 16cb9ec1544d..aa3ef07cd178 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -1,9 +1,8 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
-import {TOOLTIP_BAR_GAP, useChartLabelFormats} from '@components/Charts/hooks';
+import {TOOLTIP_BAR_GAP, useChartLabelFormats, useTouchPinnedTooltip} from '@components/Charts/hooks';
 import type {ChartDataPoint, ChartProps, PieSlice, UnitPosition} from '@components/Charts/types';
 import {findSliceAtPosition, getPrimaryValue, processDataIntoSlices} from '@components/Charts/utils';
-import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
 import VictoryTheme from '@components/Charts/VictoryTheme';
 import Text from '@components/Text';
 
@@ -41,9 +40,6 @@ function PieChartContent({data, series, isLoading, valueUnit, valueUnitPosition,
     const {translate} = useLocalize();
     const [canvasWidth, setCanvasWidth] = useState(0);
     const [canvasHeight, setCanvasHeight] = useState(0);
-
-    /** True while a slice tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
-    const [isTouchPinned, setIsTouchPinned] = useState(false);
     const [isHoveringOverPie, setIsHoveringOverPie] = useState(false);
 
     // Shared values for hover state
@@ -124,11 +120,10 @@ function PieChartContent({data, series, isLoading, valueUnit, valueUnitPosition,
 
     const onChartMoved = (deltaX: number, deltaY: number) => scheduleOnUI(handleChartMoved, deltaX, deltaY);
 
-    const dismissTouchedSlice = () => {
+    const {setIsTouchPinned, onTooltipDismiss, onTapFinalize, onChartTouchStart} = useTouchPinnedTooltip(() => {
         matchedIndex.set(-1);
-        setIsTouchPinned(false);
         setIsHoveringOverPie(false);
-    };
+    });
 
     // Hover gesture
     const hoverGesture = () =>
@@ -165,14 +160,7 @@ function PieChartContent({data, series, isLoading, valueUnit, valueUnitPosition,
     // Tap gesture for click/tap navigation
     const tapGesture = () =>
         Gesture.Tap()
-            .onFinalize((e, success) => {
-                'worklet';
-
-                if (success || e.pointerType !== PointerType.TOUCH || !isTouchPinned) {
-                    return;
-                }
-                scheduleOnRN(dismissTouchedSlice);
-            })
+            .onFinalize(onTapFinalize)
             .onEnd((e) => {
                 'worklet';
 
@@ -234,7 +222,7 @@ function PieChartContent({data, series, isLoading, valueUnit, valueUnitPosition,
                 <Animated.View
                     style={[styles.chartContent, isHoveringOverPie && styles.cursorPointer]}
                     onLayout={handleLayout}
-                    onTouchStart={() => markChartTouch(isTouchPinned ? dismissTouchedSlice : undefined)}
+                    onTouchStart={onChartTouchStart}
                 >
                     {processedSlices.length > 0 && (
                         <PolarChart
@@ -283,7 +271,7 @@ function PieChartContent({data, series, isLoading, valueUnit, valueUnitPosition,
                         chartWidth={canvasWidth}
                         initialTooltipPosition={tooltipPosition}
                         onChartMoved={onChartMoved}
-                        onDismiss={isTouchPinned ? dismissTouchedSlice : undefined}
+                        onDismiss={onTooltipDismiss}
                     />
                 </Animated.View>
             </GestureDetector>
diff --git a/src/components/Charts/hooks/index.ts b/src/components/Charts/hooks/index.ts
index 5fa23151604b..63f9204d5dde 100644
--- a/src/components/Charts/hooks/index.ts
+++ b/src/components/Charts/hooks/index.ts
@@ -9,3 +9,4 @@ export {default as useChartLabelFormats} from './useChartLabelFormats';
 export {default as useDynamicYDomain} from './useDynamicYDomain';
 export {default as useTooltipData} from './useTooltipData';
 export {default as useLabelHitTesting} from './useLabelHitTesting';
+export {default as useTouchPinnedTooltip} from './useTouchPinnedTooltip';
diff --git a/src/components/Charts/hooks/useChartInteractions.ts b/src/components/Charts/hooks/useChartInteractions.ts
index 6244fabd9bd0..ff0452868fad 100644
--- a/src/components/Charts/hooks/useChartInteractions.ts
+++ b/src/components/Charts/hooks/useChartInteractions.ts
@@ -1,13 +1,12 @@
-import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
-
 import type {SharedValue} from 'react-native-reanimated';
 
-import {useCallback, useState} from 'react';
+import {useCallback} from 'react';
 import {Gesture, PointerType} from 'react-native-gesture-handler';
 import {useDerivedValue, useSharedValue} from 'react-native-reanimated';
 import {scheduleOnRN, scheduleOnUI} from 'react-native-worklets';
 
 import useChartInteractionState from './useChartInteractionState';
+import useTouchPinnedTooltip from './useTouchPinnedTooltip';
 
 /** Gap between bar top and tooltip bottom */
 const TOOLTIP_BAR_GAP = 8;
@@ -196,9 +195,6 @@ function useChartInteractions({
     const isCursorOverClickable = useSharedValue(false);
     const isTooltipActive = useSharedValue(false);
 
-    /** True while a tooltip opened by a touch tap is shown, which lets a touch anywhere on the screen hide it */
-    const [isTouchPinned, setIsTouchPinned] = useState(false);
-
     /**
      * Called by chart content from handleScaleChange to populate canvas positions.
      * Must be called with the positions derived from the current d3 scale.
@@ -362,6 +358,11 @@ function useChartInteractions({
         isTooltipActive.set(false);
     };
 
+    const {setIsTouchPinned, dismissTouchTooltip, onTooltipDismiss, onTapFinalize, onChartTouchStart} = useTouchPinnedTooltip(() => {
+        hideTooltip();
+        applyTargetIndex(-1);
+    });
+
     /**
      * Hover gesture to be placed on the full-height outer container (chart + label area).
      * Clamps the y coordinate to chartBottom before passing to Victory so that hovering
@@ -403,12 +404,6 @@ function useChartInteractions({
                 hideTooltip();
             });
 
-    const dismissTouchTooltip = () => {
-        hideTooltip();
-        applyTargetIndex(-1);
-        setIsTouchPinned(false);
-    };
-
     const handleTouchTap = (cursorX: number, cursorY: number) => {
         'worklet';
 
@@ -427,15 +422,7 @@ function useChartInteractions({
      */
     const tapGesture = (onPress?: (index: number) => void) =>
         Gesture.Tap()
-            // A touch on this chart that turns into a scroll leaves the pinned tooltip to the chart, so the chart hides it
-            .onFinalize((e, success) => {
-                'worklet';
-
-                if (success || e.pointerType !== PointerType.TOUCH || !isTouchPinned) {
-                    return;
-                }
-                scheduleOnRN(dismissTouchTooltip);
-            })
+            .onFinalize(onTapFinalize)
             .onEnd((e) => {
                 'worklet';
 
@@ -516,9 +503,9 @@ function useChartInteractions({
         /** Call with how far the chart moved in the window, e.g. on page scroll, to re-check the hover under a still cursor */
         onChartMoved,
         /** Hides the tooltip pinned by a touch tap, undefined while nothing is pinned */
-        onTooltipDismiss: isTouchPinned ? dismissTouchTooltip : undefined,
+        onTooltipDismiss,
         /** Marks a touch on this chart, so the screen's touch start keeps the tooltip and lets the tap switch it */
-        onChartTouchStart: () => markChartTouch(isTouchPinned ? dismissTouchTooltip : undefined),
+        onChartTouchStart,
     };
 }
 
diff --git a/src/components/Charts/hooks/useTouchPinnedTooltip.ts b/src/components/Charts/hooks/useTouchPinnedTooltip.ts
new file mode 100644
index 000000000000..fa5efe1fe9a8
--- /dev/null
+++ b/src/components/Charts/hooks/useTouchPinnedTooltip.ts
@@ -0,0 +1,45 @@
+import {markChartTouch} from '@components/Charts/utils/pinnedChartTooltip';
+
+import {useState} from 'react';
+import {PointerType} from 'react-native-gesture-handler';
+import {scheduleOnRN} from 'react-native-worklets';
+
+/**
+ * Tracks the tooltip pinned by a touch tap, which a touch anywhere on the screen hides.
+ * @param hideTooltip - hides the chart's tooltip and clears its matched target
+ */
+function useTouchPinnedTooltip(hideTooltip: () => void) {
+    /** True while a tooltip opened by a touch tap is shown */
+    const [isTouchPinned, setIsTouchPinned] = useState(false);
+
+    const dismissTouchTooltip = () => {
+        hideTooltip();
+        setIsTouchPinned(false);
+    };
+
+    const onTooltipDismiss = isTouchPinned ? dismissTouchTooltip : undefined;
+
+    const onTapFinalize = (e: {pointerType: PointerType}, success: boolean) => {
+        'worklet';
+
+        if (success || e.pointerType !== PointerType.TOUCH || !isTouchPinned) {
+            return;
+        }
+        scheduleOnRN(dismissTouchTooltip);
+    };
+
+    return {
+        /** Sets whether the tooltip is pinned by a touch tap */
+        setIsTouchPinned,
+        /** Hides the tooltip and unpins it */
+        dismissTouchTooltip,
+        /** Hides the pinned tooltip, undefined while nothing is pinned */
+        onTooltipDismiss,
+        /** Pass to the tap gesture's onFinalize */
+        onTapFinalize,
+        /** Marks a touch on this chart, so the screen's touch start keeps the tooltip and lets the tap switch it */
+        onChartTouchStart: () => markChartTouch(onTooltipDismiss),
+    };
+}
+
+export default useTouchPinnedTooltip;

From 6672e791e514413531a4835ed78b737688790c53 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 13:31:26 +0200
Subject: [PATCH 655/781] fix: make dynamic form list rows and editor title
 accessible

---
 .../components/DynamicFormListItemPage.tsx            |  7 ++++++-
 src/components/ListField.tsx                          | 11 ++++++-----
 src/components/MenuItem/layout/MenuItemRoot.tsx       | 10 ++++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
index 0fa4b279813d..3c5d4563f2df 100644
--- a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
@@ -77,7 +77,12 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
         >
             {({inputValues}) => (
                 <>
-                    <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{title}</Text>
+                    <Text
+                        style={[styles.textHeadlineLineHeightXXL, styles.mb3]}
+                        accessibilityRole={CONST.ROLE.HEADER}
+                    >
+                        {title}
+                    </Text>
                     <DynamicFormFields
                         content={listField.itemFields}
                         values={withInputValues(inputValues)}
diff --git a/src/components/ListField.tsx b/src/components/ListField.tsx
index d849c25735cc..64a0b6aebe6f 100644
--- a/src/components/ListField.tsx
+++ b/src/components/ListField.tsx
@@ -67,7 +67,11 @@ function ListField({rows, addTitle, addDescription, canAddMore = true, errorText
     return (
         <>
             {rows.map((row) => (
-                <MenuItem.Root key={row.id}>
+                // The row itself does nothing, so it stays out of the accessibility tree and screen readers can reach its buttons
+                <MenuItem.Root
+                    key={row.id}
+                    shouldBeAccessible={false}
+                >
                     <MenuItem.Row>
                         <MenuItem.Leading>
                             <UserAvatar
@@ -108,10 +112,7 @@ function ListField({rows, addTitle, addDescription, canAddMore = true, errorText
                 </MenuItem.Root>
             ))}
             {canAddMore && (
-                <MenuItem.Root
-                    onPress={callFunctionIfActionIsAllowed(onAdd)}
-                    accessibilityLabel={addTitle}
-                >
+                <MenuItem.Root onPress={callFunctionIfActionIsAllowed(onAdd)}>
                     <MenuItem.Row>
                         <MenuItem.Leading>
                             <MenuItem.Icon src={icons.Plus} />
diff --git a/src/components/MenuItem/layout/MenuItemRoot.tsx b/src/components/MenuItem/layout/MenuItemRoot.tsx
index ce2105008840..1ae87cab583b 100644
--- a/src/components/MenuItem/layout/MenuItemRoot.tsx
+++ b/src/components/MenuItem/layout/MenuItemRoot.tsx
@@ -49,9 +49,15 @@ type MenuItemRootProps = PropsWithChildren &
 
         /** Accessibility state for the row, e.g. `{expanded}`. Lands on the pressable, which is what a screen reader focuses. */
         accessibilityState?: AccessibilityState;
+
+        /**
+         * Whether the row is one element for screen readers. Turn it off for a row without `onPress` whose
+         * buttons must stay reachable, since an accessible parent hides its children on iOS.
+         */
+        shouldBeAccessible?: boolean;
     };
 
-function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style, accessibilityState}: MenuItemRootProps) {
+function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style, accessibilityState, shouldBeAccessible = true}: MenuItemRootProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
@@ -114,7 +120,7 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
                         accessibilityLabel={rowAccessibilityLabel}
                         accessibilityHint={accessibilityHint}
                         accessibilityState={accessibilityState}
-                        accessible
+                        accessible={shouldBeAccessible}
                         tabIndex={isInteractive ? 0 : -1}
                         sentryLabel={sentryLabel}
                         testID={testID}

From 775edfaea73069864de1ac8c37185e643357a309 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 12:14:56 +0000
Subject: [PATCH 656/781] Move carousel cleanup into changeTransactionsReport
 so every move path drops moved expenses

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/libs/actions/Transaction.ts               | 28 ++++++-
 .../hooks/useReportSelectionActions.ts        |  3 -
 tests/actions/TransactionTest.ts              | 78 +++++++++++++++++++
 3 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index 524e75902e0e..ce7c21bc10ee 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -90,6 +90,7 @@ import lodashClone from 'lodash/clone';
 import Onyx from 'react-native-onyx';
 
 import {getSearchOnyxUpdate} from './IOU/SearchUpdate';
+import {removeActiveTransactionIDsForReport} from './TransactionThreadNavigation';
 
 type SaveWaypointProps = {
     transactionID: string;
@@ -1048,6 +1049,8 @@ function getChangeTransactionsReportOnyxData({
     // The transactions that are actually moved to the destination report. Transactions already in the destination are
     // skipped below, so this excludes them from the transactionList sent to the backend (which does not filter them out).
     const movedTransactionIDs: string[] = [];
+    // The moved transactions grouped by the report they leave, so a carousel seeded from that report can drop them.
+    const movedTransactionIDsByOldReportID: Record<string, string[]> = {};
     let shouldFixViolations = false;
 
     const policyHasDependentTags = hasDependentTags(policy, policyTagList);
@@ -1137,6 +1140,7 @@ function getChangeTransactionsReportOnyxData({
         movedTransactionIDs.push(transaction.transactionID);
 
         const oldReportID = isUnreportedExpense ? CONST.REPORT.UNREPORTED_REPORT_ID : transaction.reportID;
+        (movedTransactionIDsByOldReportID[oldReportID] ??= []).push(transaction.transactionID);
         const oldReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldReportID}`];
         const sourceCurrency = oldReport?.currency;
         const shouldClearAmount = shouldClearConvertedAmount(transaction, sourceCurrency, destinationCurrency);
@@ -2133,9 +2137,20 @@ function getChangeTransactionsReportOnyxData({
         updatedReportReimbursableTotals,
         updatedReportUnheldReimbursableTotals,
         movedTransactionIDs,
+        movedTransactionIDsByOldReportID,
     };
 }
 
+/**
+ * Drops moved expenses from a carousel seeded from the report they left, so its arrows stop paging to them.
+ * Every move goes through `changeTransactionsReport`, so doing it here covers all entry points at once.
+ */
+function removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID: Record<string, string[]> | undefined) {
+    for (const [oldReportID, transactionIDs] of Object.entries(movedTransactionIDsByOldReportID ?? {})) {
+        removeActiveTransactionIDsForReport(transactionIDs, oldReportID);
+    }
+}
+
 function changeTransactionsReport(props: ChangeTransactionsReportProps) {
     const reportID = props.newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID;
 
@@ -2188,6 +2203,7 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
         };
 
         API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, queryParameters, {optimisticData, successData, failureData});
+        removeMovedTransactionsFromCarousel(loadedTransactionsOnyxData?.movedTransactionIDsByOldReportID);
         return;
     }
 
@@ -2195,8 +2211,15 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
     if (!changeTransactionsReportOnyxData) {
         return;
     }
-    const {optimisticData, successData, failureData, transactionIDToReportActionAndThreadData, transactionIDToUpdatedCustomUnitRateID, movedTransactionIDs} =
-        changeTransactionsReportOnyxData;
+    const {
+        optimisticData,
+        successData,
+        failureData,
+        transactionIDToReportActionAndThreadData,
+        transactionIDToUpdatedCustomUnitRateID,
+        movedTransactionIDs,
+        movedTransactionIDsByOldReportID,
+    } = changeTransactionsReportOnyxData;
 
     // If every selected transaction is already in the destination report, there is nothing to move, so skip the API call.
     if (movedTransactionIDs.length === 0) {
@@ -2219,6 +2242,7 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
         successData,
         failureData,
     });
+    removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID);
 }
 
 /**
diff --git a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
index ca2835c431c9..cd18b4c2b28e 100644
--- a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
+++ b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
@@ -10,7 +10,6 @@ import usePermissions from '@hooks/usePermissions';
 import {setCustomUnitID, setCustomUnitRateID} from '@libs/actions/IOU/MoneyRequest';
 import {clearSubrates} from '@libs/actions/IOU/PerDiem';
 import {changeTransactionsReport, setTransactionReport} from '@libs/actions/Transaction';
-import {removeActiveTransactionIDsForReport} from '@libs/actions/TransactionThreadNavigation';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -228,7 +227,6 @@ function useReportSelectionActions({
                         getCurrencyDecimals,
                         getCurrencySymbol,
                     });
-                    removeActiveTransactionIDsForReport(targetTransactionIDs, transaction.reportID);
                     removeTransaction(transaction.transactionID);
                 }
             },
@@ -262,7 +260,6 @@ function useReportSelectionActions({
                     getCurrencyDecimals,
                     getCurrencySymbol,
                 });
-                removeActiveTransactionIDsForReport(targetTransactionIDs, transaction.reportID);
                 removeTransaction(transaction.transactionID);
             },
         });
diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts
index 3b8bccc2cc6f..a932314899fd 100644
--- a/tests/actions/TransactionTest.ts
+++ b/tests/actions/TransactionTest.ts
@@ -34,6 +34,7 @@ import {createCashCard} from 'tests/utils/collections/card';
 import createRandomReportAction from 'tests/utils/collections/reportActions';
 
 import {changeTransactionsReport as changeTransactionsReportAction, clearError} from '../../src/libs/actions/Transaction';
+import {CAROUSEL_SOURCE, clearActiveTransactionIDs, setActiveTransactionIDs} from '../../src/libs/actions/TransactionThreadNavigation';
 import currencyList from '../unit/currencyList.json';
 import createPersonalDetails from '../utils/collections/personalDetails';
 import createRandomPolicy from '../utils/collections/policies';
@@ -579,6 +580,83 @@ describe('actions/Transaction', () => {
             expect(updatedThread?.parentReportActionID).toBe(newIOUAction?.reportActionID);
         });
 
+        describe('carousel cleanup', () => {
+            const carouselPolicy: Policy = {...createRandomPolicy(90, CONST.POLICY.TYPE.TEAM, 'Carousel Workspace'), id: 'policy-for-carousel'};
+            const sourceReport: Report = {...createRandomReport(91), reportID: '91', type: CONST.REPORT.TYPE.EXPENSE, policyID: carouselPolicy.id, ownerAccountID: CARLOS_ACCOUNT_ID};
+            const destinationReport: Report = {...createRandomReport(92), reportID: '92', type: CONST.REPORT.TYPE.EXPENSE, policyID: carouselPolicy.id, ownerAccountID: CARLOS_ACCOUNT_ID};
+            const buildTransaction = (transactionID: string): Transaction => ({
+                transactionID,
+                amount: -1000,
+                currency: CONST.CURRENCY.USD,
+                merchant: 'merchant',
+                created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
+                comment: {comment: ''},
+                reportID: sourceReport.reportID,
+            });
+            const transactionIDs = ['carousel-transaction-1', 'carousel-transaction-2', 'carousel-transaction-3'];
+
+            const moveFirstTransactionToDestination = async () => {
+                await Onyx.merge(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${carouselPolicy.id}`, carouselPolicy);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${sourceReport.reportID}`, sourceReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${destinationReport.reportID}`, destinationReport);
+                for (const transactionID of transactionIDs) {
+                    await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, buildTransaction(transactionID));
+                }
+                await waitForBatchedUpdates();
+
+                let allTransactions: OnyxCollection<Transaction>;
+                let allReports: OnyxCollection<Report>;
+                await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, callback: (value) => (allTransactions = value)});
+                await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, callback: (value) => (allReports = value)});
+
+                changeTransactionsReport({
+                    isVendorMatchingBetaEnabled: false,
+                    transactionIDs: [transactionIDs.at(0) ?? ''],
+                    isASAPSubmitBetaEnabled: false,
+                    accountID: CARLOS_ACCOUNT_ID,
+                    email: CARLOS_EMAIL,
+                    newReport: destinationReport,
+                    policy: carouselPolicy,
+                    allTransactions,
+                    policyTagList: {},
+                    transactionViolations: {},
+                    reports: allReports,
+                    isTrackIntentUser: false,
+                    cardList: undefined,
+                });
+                await waitForBatchedUpdates();
+            };
+
+            beforeEach(() => clearActiveTransactionIDs().then(waitForBatchedUpdates));
+
+            it('removes a moved expense from a carousel seeded from the report it left', async () => {
+                // Given a carousel seeded by opening an expense row in the source report, which is how the report's arrows get their list
+                await setActiveTransactionIDs(transactionIDs, {source: CAROUSEL_SOURCE.reportRow(sourceReport.reportID)});
+                await waitForBatchedUpdates();
+
+                // When one of the report's expenses is moved to another report
+                await moveFirstTransactionToDestination();
+
+                // Then the moved expense is gone from the carousel, so the arrows only page through the expenses still in the report
+                const carouselTransactionIDs = await getOnyxValue(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+                expect(carouselTransactionIDs).toEqual(transactionIDs.slice(1));
+            });
+
+            it('leaves a carousel seeded from another source untouched', async () => {
+                // Given a carousel seeded from search results, which legitimately spans several reports
+                await setActiveTransactionIDs(transactionIDs, {source: CAROUSEL_SOURCE.search(12345)});
+                await waitForBatchedUpdates();
+
+                // When one of the expenses is moved to another report
+                await moveFirstTransactionToDestination();
+
+                // Then the search carousel keeps every expense, since the moved one still matches the search
+                const carouselTransactionIDs = await getOnyxValue(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+                expect(carouselTransactionIDs).toEqual(transactionIDs);
+            });
+        });
+
         it('recomputes a distance expense amount/merchant/currency from the destination workspace rate when moved', async () => {
             // Given a destination workspace whose default distance rate is defined in GBP (200/mi)
             const policyID = generatePolicyID();

From d926c496c8f2dfc70ecdb48196f106cdf2ab01c9 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 14:22:06 +0200
Subject: [PATCH 657/781] Restore label-driven domain padding and adjust
 stepped labels

---
 .../Charts/LineChart/LineChartContent.tsx     | 17 +++++++------
 .../Charts/components/ChartXAxisLabels.tsx    |  6 +----
 .../Charts/hooks/useLabelHitTesting.ts        | 12 +++-------
 src/components/Charts/utils/index.ts          | 24 ++++++-------------
 4 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index 2b21d7a95b04..d9e6f49bac28 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -16,7 +16,7 @@ import {
     useDynamicYDomain,
     useLabelHitTesting,
 } from '@components/Charts/hooks';
-import {getAxisLabelStepLayout, getDomainPaddingForEdgeSpace, getPrimaryValue, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
+import {getAxisLabelStep, getDomainPaddingForEdgeSpace, getPrimaryValue, getXAxisLabel, getYAxisLabelWidth, labelOverhang} from '@components/Charts/utils';
 import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, DASH_INTERVALS, GLYPH_PADDING, LABEL_PADDING, LABEL_ROTATIONS, SIN_45, X_AXIS_LABEL_MIN_GAP} from '@components/Charts/VictoryTheme';
 
 import useTheme from '@hooks/useTheme';
@@ -98,10 +98,11 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
     const chartPaddingRight = yAxisLabelWidth + GLYPH_PADDING;
 
     const domainPadding = (() => {
-        if (labelSteps || !firstLabelWidth || !lastLabelWidth) {
+        if (!firstLabelWidth || !lastLabelWidth) {
             return VictoryTheme.line.domainPadding;
         }
-        const labelsExceedTickSpacing = tickSpacing > 0 && maxLabelWidth + LABEL_PADDING > tickSpacing;
+        // Stepped labels are always horizontal, so they never take the diagonal overhang.
+        const labelsExceedTickSpacing = !labelSteps && tickSpacing > 0 && maxLabelWidth + LABEL_PADDING > tickSpacing;
         let leftOverhang = firstLabelWidth / 2;
         let rightOverhang = lastLabelWidth / 2;
 
@@ -136,8 +137,10 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
         if (!labelSteps || chartWidth <= 0 || plotAreaWidth <= 0) {
             return undefined;
         }
-        const pointXs = data.map((_, index) => (data.length > 1 ? boundsLeft + (index * plotAreaWidth) / (data.length - 1) : boundsLeft + plotAreaWidth / 2));
-        const {step, labelXOffsets} = getAxisLabelStepLayout({labelWidths, pointXs, canvasWidth: chartWidth, steps: labelSteps, minGap: X_AXIS_LABEL_MIN_GAP});
+        const firstPointX = boundsLeft + domainPadding.left * paddingScale;
+        const lastPointX = boundsRight - domainPadding.right * paddingScale;
+        const pointXs = data.map((_, index) => (data.length > 1 ? firstPointX + (index * (lastPointX - firstPointX)) / (data.length - 1) : (firstPointX + lastPointX) / 2));
+        const step = getAxisLabelStep({labelWidths, pointXs, steps: labelSteps, minGap: X_AXIS_LABEL_MIN_GAP});
         return {
             ...rotatingLabelLayout,
             labelRotation: LABEL_ROTATIONS.HORIZONTAL,
@@ -147,13 +150,11 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
             regularLabelMaxWidth: Infinity,
             firstLabelMaxWidth: Infinity,
             lastLabelMaxWidth: Infinity,
-            labelXOffsets,
         };
     })();
 
     const {labelRotation, labelSkipInterval, truncatedLabelWidths, xAxisLabelHeight, regularLabelMaxWidth, firstLabelMaxWidth, lastLabelMaxWidth, ellipsisWidth} =
         steppedLabelLayout ?? rotatingLabelLayout;
-    const labelXOffsets = steppedLabelLayout?.labelXOffsets;
 
     const originalLabels = data.map(getXAxisLabel);
 
@@ -163,7 +164,6 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
         truncatedLabelWidths,
         labelRotation,
         labelSkipInterval,
-        labelXOffsets,
         chartBottom,
     });
 
@@ -261,7 +261,6 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
                         ellipsisWidth={ellipsisWidth}
                         labelRotation={labelRotation}
                         labelSkipInterval={labelSkipInterval}
-                        labelXOffsets={labelXOffsets}
                         fontSize={variables.iconSizeExtraSmall}
                         fontManager={fontManager}
                         labelColor={theme.icon}
diff --git a/src/components/Charts/components/ChartXAxisLabels.tsx b/src/components/Charts/components/ChartXAxisLabels.tsx
index 5f843a817f06..e3a8a62dab02 100644
--- a/src/components/Charts/components/ChartXAxisLabels.tsx
+++ b/src/components/Charts/components/ChartXAxisLabels.tsx
@@ -33,9 +33,6 @@ type ChartXAxisLabelsProps = {
     /** Show every Nth label (1 = all, 2 = every other, etc.). */
     labelSkipInterval: number;
 
-    /** Per-label horizontal shift (px) applied to horizontal labels */
-    labelXOffsets?: number[];
-
     /** Font size used for rendering labels. */
     fontSize: number;
 
@@ -61,7 +58,6 @@ function ChartXAxisLabels({
     ellipsisWidth,
     labelRotation,
     labelSkipInterval,
-    labelXOffsets,
     fontSize,
     fontManager,
     labelColor,
@@ -108,7 +104,7 @@ function ChartXAxisLabels({
                 <Paragraph
                     key={`x-label-${label}-${tickX}`}
                     paragraph={paraData.para}
-                    x={tickX - renderWidth / 2 + (labelXOffsets?.at(i) ?? 0)}
+                    x={tickX - renderWidth / 2}
                     y={labelY - ascent}
                     width={renderWidth + GLYPH_PADDING}
                 />
diff --git a/src/components/Charts/hooks/useLabelHitTesting.ts b/src/components/Charts/hooks/useLabelHitTesting.ts
index 19fec5153e44..2517f3b66b5b 100644
--- a/src/components/Charts/hooks/useLabelHitTesting.ts
+++ b/src/components/Charts/hooks/useLabelHitTesting.ts
@@ -25,9 +25,6 @@ type LabelHitGeometry = {
     /** Per-label: labelWidth / 2 — half-extent for 0° and 90° hit bounds */
     halfWidths: number[];
 
-    /** Per-label horizontal shift of 0° labels from their tick */
-    xOffsets: number[];
-
     /** rightUpperCorner.x = targetX + cornerAnchorDX */
     cornerAnchorDX: number;
 
@@ -48,8 +45,6 @@ type UseLabelHitTestingParams = {
     truncatedLabelWidths: number[];
     labelRotation: LabelRotation;
     labelSkipInterval: number;
-    /** Per-label horizontal shift (px) of 0° labels from their tick, matching ChartXAxisLabels. */
-    labelXOffsets?: number[];
     chartBottom: SharedValue<number>;
 };
 
@@ -66,7 +61,7 @@ type UseLabelHitTestingParams = {
  * Labels are right-aligned at the tick: the 45° parallelogram's upper-right corner is
  * offset by (iconSize/3 * sinA) left and down, placing the box just below the axis line.
  */
-function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelRotation, labelSkipInterval, labelXOffsets, chartBottom}: UseLabelHitTestingParams) {
+function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelRotation, labelSkipInterval, chartBottom}: UseLabelHitTestingParams) {
     const tickXPositions = useSharedValue<number[]>([]);
 
     const angleRad = (Math.abs(labelRotation) * Math.PI) / 180;
@@ -85,7 +80,6 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
             iconSin: variables.iconSizeExtraSmall * sinA,
             labelSins: truncatedLabelWidths.map((w) => w * sinA),
             halfWidths: truncatedLabelWidths.map((w) => w / 2),
-            xOffsets: truncatedLabelWidths.map((_, i) => (angleRad === 0 ? (labelXOffsets?.at(i) ?? 0) : 0)),
             cornerAnchorDX: -iconThirdSin,
             cornerAnchorDY: iconThirdSin,
             yMin90Offset: padding,
@@ -104,7 +98,7 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
             return false;
         }
 
-        const {labelYOffset, iconSin, labelSins, halfWidths, xOffsets, cornerAnchorDX, cornerAnchorDY, yMin90Offset, yMax90Offsets} = labelHitGeometry;
+        const {labelYOffset, iconSin, labelSins, halfWidths, cornerAnchorDX, cornerAnchorDY, yMin90Offset, yMax90Offsets} = labelHitGeometry;
         const padding = variables.iconSizeExtraSmall / 2;
         const halfWidth = halfWidths.at(activeIndex) ?? 0;
         const labelY = args.chartBottom + labelYOffset;
@@ -122,7 +116,7 @@ function useLabelHitTesting({fontManager, fontSize, truncatedLabelWidths, labelR
         return isCursorOverChartLabel({
             cursorX: args.cursorX,
             cursorY: args.cursorY,
-            targetX: args.targetX + (xOffsets.at(activeIndex) ?? 0),
+            targetX: args.targetX,
             labelY,
             angleRad,
             halfWidth,
diff --git a/src/components/Charts/utils/index.ts b/src/components/Charts/utils/index.ts
index 081d5a8c6259..e2fc0e38b37a 100644
--- a/src/components/Charts/utils/index.ts
+++ b/src/components/Charts/utils/index.ts
@@ -467,16 +467,13 @@ function getDomainPaddingForEdgeSpace(edgeSpace: {left: number; right: number},
     return {left: (edgeSpace.left * plotWidth) / pointsSpan, right: (edgeSpace.right * plotWidth) / pointsSpan};
 }
 
-type AxisLabelStepLayoutParams = {
+type AxisLabelStepParams = {
     /** Pixel width of each point's label */
     labelWidths: number[];
 
     /** Canvas x position of each point */
     pointXs: number[];
 
-    /** Canvas width the labels must stay within */
-    canvasWidth: number;
-
     /** Allowed steps between labeled points, ascending */
     steps: readonly number[];
 
@@ -485,17 +482,11 @@ type AxisLabelStepLayoutParams = {
 };
 
 /**
- * Picks the smallest step whose labels (points 0, step, 2 * step, ...) don't overlap. Labels are centered under their points
- * and shifted inward at the canvas edges. When no step fits, multiples of the last step are tried, down to labeling only the first point.
+ * Picks the smallest step whose labels (points 0, step, 2 * step, ...), centered under their points, don't overlap.
+ * When no step fits, multiples of the last step are tried, down to labeling only the first point.
  */
-function getAxisLabelStepLayout({labelWidths, pointXs, canvasWidth, steps, minGap}: AxisLabelStepLayoutParams): {step: number; labelXOffsets: number[]} {
-    const labelXOffsets = pointXs.map((x, i) => {
-        const width = labelWidths.at(i) ?? 0;
-        const centeredLeft = x - width / 2;
-        const left = Math.min(Math.max(centeredLeft, 0), Math.max(0, canvasWidth - width));
-        return left - centeredLeft;
-    });
-    const getLeft = (i: number) => (pointXs.at(i) ?? 0) + (labelXOffsets.at(i) ?? 0) - (labelWidths.at(i) ?? 0) / 2;
+function getAxisLabelStep({labelWidths, pointXs, steps, minGap}: AxisLabelStepParams): number {
+    const getLeft = (i: number) => (pointXs.at(i) ?? 0) - (labelWidths.at(i) ?? 0) / 2;
     const fits = (step: number) => {
         for (let i = step; i < pointXs.length; i += step) {
             const previousRight = getLeft(i - step) + (labelWidths.at(i - step) ?? 0);
@@ -511,8 +502,7 @@ function getAxisLabelStepLayout({labelWidths, pointXs, canvasWidth, steps, minGa
     for (let step = lastStep * 2; step < pointXs.length; step += lastStep) {
         candidates.push(step);
     }
-    const step = candidates.find(fits) ?? Math.max(1, pointXs.length);
-    return {step, labelXOffsets};
+    return candidates.find(fits) ?? Math.max(1, pointXs.length);
 }
 
 /** Returns the pixel width needed for Y-axis labels given the chart data. */
@@ -564,7 +554,7 @@ export {
     getYAxisLabelWidth,
     getBarLayout,
     getDomainPaddingForEdgeSpace,
-    getAxisLabelStepLayout,
+    getAxisLabelStep,
 };
 
 export type {ChartLabelHitTestParams};

From cbe26c47ab98ff833ff902184a9eca608aeaea89 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 14:29:55 +0200
Subject: [PATCH 658/781] Add getAxisLabelStep unit tests

---
 tests/unit/components/Charts/utils.test.ts | 93 ++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/tests/unit/components/Charts/utils.test.ts b/tests/unit/components/Charts/utils.test.ts
index f645e8484962..5850ae539046 100644
--- a/tests/unit/components/Charts/utils.test.ts
+++ b/tests/unit/components/Charts/utils.test.ts
@@ -6,6 +6,7 @@ import {
     effectiveHeight,
     effectiveWidth,
     findSliceAtPosition,
+    getAxisLabelStep,
     getBarLayout,
     getAdditionalOffset,
     getDomainPaddingForEdgeSpace,
@@ -775,3 +776,95 @@ describe('getDomainPaddingForEdgeSpace', () => {
         expect(getDomainPaddingForEdgeSpace({left: 30, right: 0}, 0)).toEqual({left: 30, right: 0});
     });
 });
+
+describe('getAxisLabelStep', () => {
+    const MIN_GAP = 24;
+
+    const getEvenPointXs = (count: number, spacing: number) => Array.from({length: count}, (_, index) => index * spacing);
+
+    it('labels every point when neighboring labels keep the minimum gap', () => {
+        // Given 20px labels on points 50px apart, which leaves a 30px gap between neighbors
+        const pointXs = getEvenPointXs(5, 50);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(5).fill(20), pointXs, steps: [1, 2, 7, 14], minGap: MIN_GAP});
+
+        // Then the smallest step is used, so no label is hidden needlessly
+        expect(step).toBe(1);
+    });
+
+    it('moves to the next listed step when neighboring labels are too close', () => {
+        // Given 30px labels on points 50px apart, which leaves only a 20px gap between neighbors
+        const pointXs = getEvenPointXs(5, 50);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(5).fill(30), pointXs, steps: [1, 2, 7, 14], minGap: MIN_GAP});
+
+        // Then every other point is labeled, which widens the gap to 70px
+        expect(step).toBe(2);
+    });
+
+    it('accepts a gap exactly equal to the minimum gap', () => {
+        // Given 26px labels on points 50px apart, which leaves exactly a 24px gap between neighbors
+        const pointXs = getEvenPointXs(5, 50);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(5).fill(26), pointXs, steps: [1, 2], minGap: MIN_GAP});
+
+        // Then the minimum gap counts as enough room, so every point stays labeled
+        expect(step).toBe(1);
+    });
+
+    it('tries multiples of the last listed step when no listed step fits', () => {
+        // Given 30px labels on points 10px apart, too dense for steps 1 and 2
+        const pointXs = getEvenPointXs(10, 10);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(10).fill(30), pointXs, steps: [1, 2], minGap: MIN_GAP});
+
+        // Then 4 is still too tight (10px gap), and 6 is the first multiple of 2 that leaves a 30px gap
+        expect(step).toBe(6);
+    });
+
+    it('labels only the first point when no step fits', () => {
+        // Given 3 points 10px apart with 30px labels, where even the first and last labels overlap
+        const pointXs = getEvenPointXs(3, 10);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(3).fill(30), pointXs, steps: [1], minGap: MIN_GAP});
+
+        // Then the step reaches past the last point, so only the first label is drawn instead of overlapping ones
+        expect(step).toBe(3);
+    });
+
+    it('labels only the first and last points when the only step spans the whole axis', () => {
+        // Given 5 points and the single step the narrow layout passes, points.length - 1
+        const pointXs = getEvenPointXs(5, 50);
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: Array<number>(5).fill(30), pointXs, steps: [4], minGap: MIN_GAP});
+
+        // Then that step is used, so the first and last points are labeled
+        expect(step).toBe(4);
+    });
+
+    it("checks each label's own width", () => {
+        // Given a wide first label that reaches the second label but clears the third
+        const pointXs = [0, 50, 100];
+
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: [80, 20, 20], pointXs, steps: [1, 2], minGap: MIN_GAP});
+
+        // Then step 1 is rejected because of the first label's width, even though the narrow labels would fit
+        expect(step).toBe(2);
+    });
+
+    it('labels a single point with the smallest step', () => {
+        // Given one point, which has no neighbor its label could overlap
+        // When picking the label step
+        const step = getAxisLabelStep({labelWidths: [30], pointXs: [0], steps: [1, 2], minGap: MIN_GAP});
+
+        // Then the smallest step is used and the point stays labeled
+        expect(step).toBe(1);
+    });
+});

From 1a717921849575726e9b9794eebd44df13e93c5f Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 14:35:39 +0200
Subject: [PATCH 659/781] Remove redundant comment

---
 src/components/Charts/LineChart/LineChartContent.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index d9e6f49bac28..0f2f46d38c59 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -101,7 +101,6 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
         if (!firstLabelWidth || !lastLabelWidth) {
             return VictoryTheme.line.domainPadding;
         }
-        // Stepped labels are always horizontal, so they never take the diagonal overhang.
         const labelsExceedTickSpacing = !labelSteps && tickSpacing > 0 && maxLabelWidth + LABEL_PADDING > tickSpacing;
         let leftOverhang = firstLabelWidth / 2;
         let rightOverhang = lastLabelWidth / 2;

From 83c96ddcd40895d3480cb92813a226f6bf6ced90 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 12:51:00 +0000
Subject: [PATCH 660/781] Update version to 9.5.9-0

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 4 ++--
 ios/NotificationServiceExtension/Info.plist | 4 ++--
 ios/ShareViewController/Info.plist          | 4 ++--
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 908595d69be6..1e2ae1792635 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050805
-        versionName "9.5.8-5"
+        versionCode 1009050900
+        versionName "9.5.9-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c7dac0e9bdaa..fe48fd5b6740 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.8</string>
+	<string>9.5.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.5</string>
+	<string>9.5.9.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 0327d387b87a..cb1eb32d576d 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.8</string>
+	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.5</string>
+	<string>9.5.9.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index 91e619206302..d003273820b7 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.8</string>
+	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.8.5</string>
+	<string>9.5.9.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 96ae4a79dd75..ebb09c1e4cc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.8-5",
+  "version": "9.5.9-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.8-5",
+      "version": "9.5.9-0",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index ed417b921076..b523dd9455d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.8-5",
+  "version": "9.5.9-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 3e4911fb6f9b4de1d26d66a5cb56f951615956a1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 12:51:00 +0000
Subject: [PATCH 661/781] Update Mobile-Expensify submodule version to 9.5.9-0

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 1fe3f8d3c912..a62bb2829c36 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 1fe3f8d3c91279fb6c94d1313e9777a442d17caa
+Subproject commit a62bb2829c366ada7113e92bd29eddb8a25b4e97

From f6f98d647823588feb50ce3c31c5f9787e70fbb9 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 15:12:00 +0200
Subject: [PATCH 662/781] Reuse getShortFormattedDayForSearch for line chart
 labels and rename compact fields

---
 src/components/Search/SearchChartView.tsx          | 4 ++--
 src/components/Search/SearchList/ListItem/types.ts | 8 ++++----
 src/components/Search/chartGroupByConfig.ts        | 6 +++---
 src/libs/DateUtils.ts                              | 9 +--------
 src/libs/SearchUIUtils.ts                          | 6 ++++--
 tests/ui/WeekListItemHeaderTest.tsx                | 2 +-
 tests/unit/Search/SearchUIUtilsTest.ts             | 8 ++++----
 tests/unit/getInProgressBucketLabelTest.ts         | 4 ++--
 8 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/components/Search/SearchChartView.tsx b/src/components/Search/SearchChartView.tsx
index b9e76bd8a2eb..300ab073bc5b 100644
--- a/src/components/Search/SearchChartView.tsx
+++ b/src/components/Search/SearchChartView.tsx
@@ -79,7 +79,7 @@ function SearchChartView({
     const {getCurrencySymbol, getCurrencyDecimals} = useCurrencyListActions();
     const {currentSearchKey} = useSearchQueryContext();
 
-    const {getLabel, getShortLabel, getCompactLabel, getFilterQuery, axisLabelSteps} = CHART_GROUP_BY_CONFIG[groupBy];
+    const {getLabel, getShortLabel, getLineChartLabel, getFilterQuery, axisLabelSteps} = CHART_GROUP_BY_CONFIG[groupBy];
 
     const today = format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
     const dateFilterRange = queryJSON ? getDateFilterRange(queryJSON) : {};
@@ -87,7 +87,7 @@ function SearchChartView({
         data,
         view,
         getLabel,
-        getShortLabel: view === CONST.SEARCH.VIEW.LINE ? (getCompactLabel ?? getShortLabel) : getShortLabel,
+        getShortLabel: view === CONST.SEARCH.VIEW.LINE ? (getLineChartLabel ?? getShortLabel) : getShortLabel,
         getCurrencyDecimals,
         getInProgressLabel: (item) => getInProgressBucketLabel({groupBy, item, today, dateFnsLocale, dateFilterRange, translate}),
     });
diff --git a/src/components/Search/SearchList/ListItem/types.ts b/src/components/Search/SearchList/ListItem/types.ts
index 25bedb44c94b..69bc088aa173 100644
--- a/src/components/Search/SearchList/ListItem/types.ts
+++ b/src/components/Search/SearchList/ListItem/types.ts
@@ -428,11 +428,11 @@ type TransactionMemberGroupListItemType = TransactionGroupListItemType & {groupe
 type TransactionDayGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.DAY} & SearchDayGroup & {
         formattedDay: string;
 
-        /** Compact "day" value used where space is tight, e.g. chart axis labels */
+        /** Compact "day" value used where space is tight, e.g. bar chart axis labels, adding the year when the groups span several years */
         shortFormattedDay: string;
 
         /** Day label for line chart axes, e.g. "Aug 15", adding the year only outside the current year */
-        compactFormattedDay: string;
+        lineChartFormattedDay: string;
     };
 
 type TransactionMonthGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.MONTH} & SearchMonthGroup & {
@@ -473,11 +473,11 @@ type TransactionTagGroupListItemType = TransactionGroupListItemType & {groupedBy
 type TransactionWeekGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.WEEK} & SearchWeekGroup & {
         formattedWeek: string;
 
-        /** Compact "week" value used where space is tight, e.g. chart axis labels */
+        /** Compact week range used where space is tight, e.g. bar chart axis labels, adding the year when the groups span several years */
         shortFormattedWeek: string;
 
         /** Week start label for line chart axes, e.g. "Sep 6", adding the year only outside the current year */
-        compactFormattedWeek: string;
+        lineChartFormattedWeek: string;
     };
 
 type TransactionYearGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.YEAR} & SearchYearGroup & {
diff --git a/src/components/Search/chartGroupByConfig.ts b/src/components/Search/chartGroupByConfig.ts
index 235c958b4c14..3dd3c944e5dc 100644
--- a/src/components/Search/chartGroupByConfig.ts
+++ b/src/components/Search/chartGroupByConfig.ts
@@ -27,7 +27,7 @@ type ChartGroupByConfig = {
     getShortLabel?: (item: GroupedItem) => string | undefined;
 
     /** Returns the line chart axis label, or undefined to fall back to `getShortLabel` */
-    getCompactLabel?: (item: GroupedItem) => string | undefined;
+    getLineChartLabel?: (item: GroupedItem) => string | undefined;
 
     /** Intervals, in groups, the line chart may label its x-axis at; the smallest one that fits is used */
     axisLabelSteps?: readonly number[];
@@ -79,7 +79,7 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.formattedDay : ''),
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.shortFormattedDay : undefined),
-        getCompactLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.compactFormattedDay : undefined),
+        getLineChartLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? item.lineChartFormattedDay : undefined),
         axisLabelSteps: [1, 2, 7, 14],
         getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? `date>=${item.day} date<=${item.day}` : ''),
         getDateRange: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.DAY ? {start: item.day, end: item.day} : undefined),
@@ -100,7 +100,7 @@ const CHART_GROUP_BY_CONFIG: Record<SearchGroupBy, ChartGroupByConfig> = {
         titleIconName: 'Calendar',
         getLabel: (item: GroupedItem) => (item as TransactionWeekGroupListItemType).formattedWeek ?? '',
         getShortLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WEEK ? item.shortFormattedWeek : undefined),
-        getCompactLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WEEK ? item.compactFormattedWeek : undefined),
+        getLineChartLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WEEK ? item.lineChartFormattedWeek : undefined),
         axisLabelSteps: [1, 2, 4],
         getFilterQuery: (item: GroupedItem) => {
             const weekItem = item as TransactionWeekGroupListItemType;
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index d18243ef980b..c4a9e03bbf6e 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -1196,17 +1196,11 @@ function isDateStringInMonth(dateString: string, year: number, month: number): b
     return datePart >= monthStart && datePart <= monthEnd;
 }
 
-/** Returns a compact day label, e.g. "Sep 15, ’26". */
+/** Returns a compact date label, e.g. "Sep 15, ’26", or "Sep 15" when the year is left out. */
 function getShortFormattedDayForSearch(day: string, dateFnsLocale: DateFnsLocale | undefined, shouldShowYear = true): string {
     return format(parse(day, 'yyyy-MM-dd', new Date()), shouldShowYear ? 'MMM d, ’yy' : 'MMM d', {locale: dateFnsLocale});
 }
 
-/** Returns a compact date label that adds the year only outside the current year, e.g. "Sep 15" or "Dec 28, ’25". */
-function getCompactFormattedDateForSearch(date: string, dateFnsLocale: DateFnsLocale | undefined): string {
-    const parsedDate = parse(date, 'yyyy-MM-dd', new Date());
-    return format(parsedDate, isThisYear(parsedDate) ? 'MMM d' : 'MMM d, ’yy', {locale: dateFnsLocale});
-}
-
 /** Returns a month label, e.g. "September 2025". */
 function getFormattedMonthForSearch(year: number, month: number, dateFnsLocale: DateFnsLocale | undefined): string {
     return format(new Date(year, month - 1, 1), 'LLLL yyyy', {locale: dateFnsLocale});
@@ -1377,7 +1371,6 @@ const DateUtils = {
     getWeekDateRange,
     isDateStringInMonth,
     getShortFormattedDayForSearch,
-    getCompactFormattedDateForSearch,
     getFormattedMonthForSearch,
     getShortFormattedMonthForSearch,
     getFormattedDateRangeForSearch,
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index bb0164c71663..151991344c0f 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -3526,6 +3526,7 @@ function getDaySections(
 ): [TransactionDayGroupListItemType[], number, boolean] {
     const daySections: Record<string, TransactionDayGroupListItemType> = {};
     const shouldShowShortLabelYear = doGroupsSpanMultipleYears(data);
+    const currentYear = new Date().getFullYear();
     for (const key in data) {
         if (!isGroupEntry(key)) {
             continue;
@@ -3544,7 +3545,7 @@ function getDaySections(
             ...dayGroup,
             formattedDay: DateUtils.formatToReadableString(dayGroup.day, dateFnsLocale),
             shortFormattedDay: DateUtils.getShortFormattedDayForSearch(dayGroup.day, dateFnsLocale, shouldShowShortLabelYear),
-            compactFormattedDay: DateUtils.getCompactFormattedDateForSearch(dayGroup.day, dateFnsLocale),
+            lineChartFormattedDay: DateUtils.getShortFormattedDayForSearch(dayGroup.day, dateFnsLocale, getYearOfDate(dayGroup.day) !== currentYear),
             keyForList: key,
         };
     }
@@ -3623,6 +3624,7 @@ function getWeekSections(
 
     // Years come from the week as trimmed to the date filter, so a filter starting Jan 1 doesn't count the days before it
     const shouldShowShortLabelYear = new Set(Object.values(weeks).flatMap(({weekStart, weekEnd}) => [getYearOfDate(weekStart), getYearOfDate(weekEnd)])).size > 1;
+    const currentYear = new Date().getFullYear();
     for (const [key, {weekGroup, weekStart, weekEnd, transactionsQueryJSON}] of Object.entries(weeks)) {
         const formattedWeek = DateUtils.getFormattedDateRangeForSearch(weekStart, weekEnd, dateFnsLocale);
         const shortFormattedWeek = DateUtils.getShortFormattedDateRangeForSearch(weekStart, weekEnd, dateFnsLocale, shouldShowShortLabelYear);
@@ -3634,7 +3636,7 @@ function getWeekSections(
             ...weekGroup,
             formattedWeek,
             shortFormattedWeek,
-            compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch(weekStart, dateFnsLocale),
+            lineChartFormattedWeek: DateUtils.getShortFormattedDayForSearch(weekStart, dateFnsLocale, getYearOfDate(weekStart) !== currentYear),
             keyForList: key,
         };
     }
diff --git a/tests/ui/WeekListItemHeaderTest.tsx b/tests/ui/WeekListItemHeaderTest.tsx
index 6588f4b61781..c6c770c9c876 100644
--- a/tests/ui/WeekListItemHeaderTest.tsx
+++ b/tests/ui/WeekListItemHeaderTest.tsx
@@ -75,7 +75,7 @@ const createWeekListItem = (week: string, options: Partial<TransactionWeekGroupL
     week,
     formattedWeek: options.formattedWeek ?? 'Jan 25 - Jan 31, 2026',
     shortFormattedWeek: options.shortFormattedWeek ?? 'Jan 25 - 31, ’26',
-    compactFormattedWeek: options.compactFormattedWeek ?? 'Jan 25',
+    lineChartFormattedWeek: options.lineChartFormattedWeek ?? 'Jan 25',
     count: options.count ?? 5,
     currency: options.currency ?? 'USD',
     total: options.total ?? 250,
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 6309c171885d..c3a06529cbb9 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -4015,7 +4015,7 @@ describe('SearchUIUtils', () => {
                 groupedBy: CONST.SEARCH.GROUP_BY.DAY,
                 formattedDay: 'September 15, 2026',
                 shortFormattedDay: 'Sep 15, ’26',
-                compactFormattedDay: 'Sep 15',
+                lineChartFormattedDay: 'Sep 15',
                 transactions: [],
                 transactionsQueryJSON: undefined,
                 keyForList: 'group_2026-09-15',
@@ -4277,7 +4277,7 @@ describe('SearchUIUtils', () => {
                 groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                 formattedWeek: 'Jan 25 - Jan 31, 2026',
                 shortFormattedWeek: 'Jan 25 - 31, ’26',
-                compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2026-01-25', undefined),
+                lineChartFormattedWeek: DateUtils.getShortFormattedDayForSearch('2026-01-25', undefined, new Date().getFullYear() !== 2026),
                 transactions: [],
                 transactionsQueryJSON: undefined,
                 keyForList: '2026-01-25-01-25',
@@ -4878,7 +4878,7 @@ describe('SearchUIUtils', () => {
                     groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                     formattedWeek: 'Jan 25 - Jan 31, 2026',
                     shortFormattedWeek: 'Jan 25 - 31, ’26',
-                    compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2026-01-25', undefined),
+                    lineChartFormattedWeek: DateUtils.getShortFormattedDayForSearch('2026-01-25', undefined, new Date().getFullYear() !== 2026),
                     transactions: [],
                     transactionsQueryJSON: undefined,
                     keyForList: 'group_2026-01-25',
@@ -4891,7 +4891,7 @@ describe('SearchUIUtils', () => {
                     groupedBy: CONST.SEARCH.GROUP_BY.WEEK,
                     formattedWeek: 'Dec 21 - Dec 27, 2025',
                     shortFormattedWeek: 'Dec 21 - 27, ’25',
-                    compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch('2025-12-21', undefined),
+                    lineChartFormattedWeek: DateUtils.getShortFormattedDayForSearch('2025-12-21', undefined, new Date().getFullYear() !== 2025),
                     transactions: [],
                     transactionsQueryJSON: undefined,
                     keyForList: 'group_2025-12-21',
diff --git a/tests/unit/getInProgressBucketLabelTest.ts b/tests/unit/getInProgressBucketLabelTest.ts
index 6b5c44ee0ba5..659d11e06654 100644
--- a/tests/unit/getInProgressBucketLabelTest.ts
+++ b/tests/unit/getInProgressBucketLabelTest.ts
@@ -29,7 +29,7 @@ const weekGroup = (week: string): GroupedItem => {
         week,
         formattedWeek: DateUtils.getFormattedDateRangeForSearch(start, end, undefined),
         shortFormattedWeek: DateUtils.getShortFormattedDateRangeForSearch(start, end, undefined),
-        compactFormattedWeek: DateUtils.getCompactFormattedDateForSearch(start, undefined),
+        lineChartFormattedWeek: DateUtils.getShortFormattedDayForSearch(start, undefined, false),
     };
 };
 const quarterGroup = (year: number, quarter: number): GroupedItem => ({
@@ -48,7 +48,7 @@ const dayGroup = (day: string): GroupedItem => ({
     day,
     formattedDay: DateUtils.formatToReadableString(day, undefined),
     shortFormattedDay: DateUtils.getShortFormattedDayForSearch(day, undefined),
-    compactFormattedDay: DateUtils.getCompactFormattedDateForSearch(day, undefined),
+    lineChartFormattedDay: DateUtils.getShortFormattedDayForSearch(day, undefined, false),
 });
 const merchantGroup = (merchant: string): GroupedItem => ({...BASE, groupedBy: CONST.SEARCH.GROUP_BY.MERCHANT, merchant, formattedMerchant: merchant});
 

From 2425699972eb74f565dfa1c2b45da15f7b87e670 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 15:17:05 +0200
Subject: [PATCH 663/781] fix: name untitled dynamic form list entries and keep
 nested sensitive answers out of drafts

---
 .../DynamicForm/adapters/ListFieldAdapter.tsx | 21 +++++-----
 .../components/DynamicFormFieldRow.tsx        |  4 +-
 .../components/DynamicFormFields.tsx          |  3 +-
 .../components/DynamicFormListItemPage.tsx    | 15 +++++---
 src/components/DynamicForm/index.tsx          | 10 ++++-
 .../DynamicForm/renderers/listRenderer.tsx    |  3 +-
 .../DynamicForm/utils/getConfirmationItems.ts |  6 +--
 .../DynamicForm/utils/hasSensitiveAnswer.ts   | 10 +++++
 src/components/DynamicForm/utils/listItems.ts |  6 +--
 .../DynamicForm/utils/summarizeListItem.ts    | 18 ++++++---
 src/stories/DynamicForm.stories.tsx           | 17 +++++++--
 src/types/onyx/DynamicFormField.ts            |  5 +++
 .../DynamicForm/summarizeListItemTest.ts      | 38 ++++++++++++++++++-
 13 files changed, 116 insertions(+), 40 deletions(-)
 create mode 100644 src/components/DynamicForm/utils/hasSensitiveAnswer.ts

diff --git a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
index 07913d5c6537..b65a6c9dba15 100644
--- a/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
+++ b/src/components/DynamicForm/adapters/ListFieldAdapter.tsx
@@ -1,7 +1,7 @@
 import DynamicFormListItemModal from '@components/DynamicForm/components/DynamicFormListItemModal';
 import type {DynamicFormValues} from '@components/DynamicForm/types';
 import getAnswerKeys from '@components/DynamicForm/utils/getAnswerKeys';
-import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
+import hasSensitiveAnswer from '@components/DynamicForm/utils/hasSensitiveAnswer';
 import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
 import ListField from '@components/ListField';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
@@ -37,10 +37,10 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
         /** Validation error shown under the list */
         errorText?: string;
 
-        /** Titles the modal editor of an entry whose answers give it no name */
+        /** Names an entry whose answers give it no name, when the list has no `itemLabel` */
         label: string;
 
-        /** What one entry is, such as "owner", for the remove confirmation */
+        /** What one entry is, such as "owner", for the remove confirmation and for an entry whose answers give it no name */
         itemLabel?: string;
 
         /** The fields of one entry, which name and describe its row */
@@ -62,7 +62,7 @@ type ListFieldAdapterProps = Pick<ComponentProps<typeof ListField>, 'addTitle' |
         renderFields: (fields: DynamicFormField[], values: DynamicFormValues, isSensitive: boolean) => ReactNode;
     };
 
-/** The entries of a list field as rows. Removing one updates FormProvider's value; adding and editing open the flow's editor page, or a modal outside the flow. */
+/** The entries of a list field as rows. Removing one updates FormProvider's value. Adding and editing open the flow's editor page, or a modal outside the flow. */
 function ListFieldAdapter({
     value,
     onInputChange = () => {},
@@ -85,12 +85,9 @@ function ListFieldAdapter({
     const [editingID, setEditingID] = useState<string>();
     const items = Array.isArray(value) ? value : [];
     const editingItem = items.find((item) => item.id === editingID);
-    const editingTitle = editingItem ? summarizeListItem(editingItem, itemFields, translate).title : '';
-    let modalTitle = addTitle;
-    if (editingItem) {
-        modalTitle = editingTitle === '' ? label : editingTitle;
-    }
-    const sensitiveKeys = new Set(itemFields.filter(isSensitiveField).flatMap(getAnswerKeys));
+    const summarize = (item: DynamicFormListItem) => summarizeListItem(item, itemFields, translate, itemLabel ?? label);
+    const modalTitle = editingItem ? summarize(editingItem).title : addTitle;
+    const sensitiveKeys = new Set(itemFields.filter(hasSensitiveAnswer).flatMap(getAnswerKeys));
     const isKeptOutOfDraft = (key: string) => key !== 'id' && (isSensitive || sensitiveKeys.has(key));
 
     // Sensitive answers are not drafted, so the modal's inputs start from the stored entry instead. Every answer of a sensitive list is.
@@ -124,7 +121,7 @@ function ListFieldAdapter({
             title: itemLabel ? translate('dynamicForm.removeItemTitle', {item: itemLabel}) : translate('common.remove'),
             prompt: (
                 <View fsClass={forwardedFSClass}>
-                    <Text>{translate('dynamicForm.removeItemPrompt', {name: summarizeListItem(item, itemFields, translate).title})}</Text>
+                    <Text>{translate('dynamicForm.removeItemPrompt', {name: summarize(item).title})}</Text>
                 </View>
             ),
             confirmText: translate('common.remove'),
@@ -146,7 +143,7 @@ function ListFieldAdapter({
                 <ListField
                     addTitle={addTitle}
                     addDescription={addDescription}
-                    rows={items.map((item) => ({id: item.id, ...summarizeListItem(item, itemFields, translate)}))}
+                    rows={items.map((item) => ({id: item.id, ...summarize(item)}))}
                     canAddMore={maxItems === undefined || items.length < maxItems}
                     errorText={errorText}
                     onAdd={onAdd ?? (() => openModal())}
diff --git a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
index edf9a0f07f99..44c4a88c9f19 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldRow.tsx
@@ -4,7 +4,7 @@ import formatDynamicFieldValue from '@components/DynamicForm/utils/formatDynamic
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import {getListItems} from '@components/DynamicForm/utils/listItems';
-import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
+import summarizeListItem, {getListItemFallbackTitle} from '@components/DynamicForm/utils/summarizeListItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
 
@@ -57,7 +57,7 @@ function DynamicFormFieldRow({
         const readonlyValue =
             field.type === 'list'
                 ? getListItems(values[field.key])
-                      .map((item) => summarizeListItem(item, field.itemFields, translate).title)
+                      .map((item) => summarizeListItem(item, field.itemFields, translate, getListItemFallbackTitle(field, translate)).title)
                       .join(', ')
                 : formatDynamicFieldValue(field, values, translate);
         return (
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index ab4944ff55fb..2a68e053ef34 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -34,7 +34,7 @@ type DynamicFormFieldsProps = {
     /** Called when the user changes a field marked `refreshOnChange`, with the draft key that changed, so the screen can fetch the schema again */
     onRefreshRequirements?: (inputID: string, value: FormValue) => void;
 
-    /** Opens the editor page of a list entry, or of a new one without `itemID`. DynamicFormFlow passes it; without it list entries are edited in a modal. */
+    /** Opens the editor page of a list entry, or of a new one without `itemID`. DynamicFormFlow passes it. Without it, list entries are edited in a modal. */
     onOpenListItemEditor?: (listKey: string, itemID?: string) => void;
 
     /** Called with a list's entries after the user removes one, so the flow can keep a sensitive list in memory up to date */
@@ -66,6 +66,7 @@ function DynamicFormFields({
             isSensitive={isItemSensitive}
             currency={currency}
             maxFileSize={maxFileSize}
+            onRefreshRequirements={onRefreshRequirements}
         />
     );
 
diff --git a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
index 3c5d4563f2df..460a865eee2e 100644
--- a/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormListItemPage.tsx
@@ -1,12 +1,12 @@
+import ActivityIndicator from '@components/ActivityIndicator';
 import type {DynamicFormSubPageProps} from '@components/DynamicForm/types';
 import getDynamicFieldErrors from '@components/DynamicForm/utils/getDynamicFieldErrors';
 import getLocalizedText from '@components/DynamicForm/utils/getLocalizedText';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import {getListItems, getListItemSensitiveAnswers, parseListItemPageName} from '@components/DynamicForm/utils/listItems';
-import summarizeListItem from '@components/DynamicForm/utils/summarizeListItem';
+import summarizeListItem, {getListItemFallbackTitle} from '@components/DynamicForm/utils/summarizeListItem';
 import toDynamicFormValues from '@components/DynamicForm/utils/toDynamicFormValues';
 import FormProvider from '@components/Form/FormProvider';
-import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
@@ -19,6 +19,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {DynamicFormListField} from '@src/types/onyx';
 
 import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
 
 import DynamicFormFields from './DynamicFormFields';
 
@@ -52,16 +53,20 @@ function DynamicFormListItemPage({currentPageName, allFields, values, currency,
     if (!page || !listField) {
         return null;
     }
+    // The flow's header stays above this page, so a spinner in the page is enough while the editor fills
     if (filledPageName !== currentPageName) {
-        return <FullscreenLoadingIndicator />;
+        return (
+            <View style={[styles.flex1, styles.fullScreenLoading]}>
+                <ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />
+            </View>
+        );
     }
     const sensitiveAnswers = item ? getListItemSensitiveAnswers(listField, item.id, values) : {};
     const keptAnswers = isSensitiveList ? {...item, ...sensitiveAnswers} : sensitiveAnswers;
     const withInputValues = (inputValues: unknown) => ({...keptAnswers, ...toDynamicFormValues(inputValues)});
     const itemLabel = getLocalizedText(translate, listField.itemLabelKey, listField.itemLabel);
     const addTitle = itemLabel ? translate('dynamicForm.addItem', {item: itemLabel}) : translate('common.add');
-    const itemTitle = item ? summarizeListItem(item, listField.itemFields, translate).title : '';
-    const title = itemTitle === '' ? addTitle : itemTitle;
+    const title = item ? summarizeListItem(item, listField.itemFields, translate, getListItemFallbackTitle(listField, translate)).title : addTitle;
 
     return (
         <FormProvider
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 7980ef22174b..7048b220eb4c 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -28,6 +28,7 @@ import getContentFields from './utils/getContentFields';
 import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
 import getPageTitle, {isPageShown} from './utils/getPageTitle';
 import getSubmittedAnswers from './utils/getSubmittedAnswers';
+import hasSensitiveAnswer from './utils/hasSensitiveAnswer';
 import isSensitiveField from './utils/isSensitiveField';
 import isSupportedField from './utils/isSupportedField';
 import {getListItemPageName, getListItems, getListItemSensitiveKey, getRemovedListItemSensitiveKeys, parseListItemPageName} from './utils/listItems';
@@ -228,8 +229,14 @@ function DynamicFormFlow({
         if (!listField) {
             return;
         }
+        const items = getListItems(values[listKey]);
+        // The add row is hidden once the list is full, but a stale link can still open the editor of a new entry
+        if (!itemID && listField.maxItems !== undefined && items.length >= listField.maxItems) {
+            closeListItemEditor(listKey);
+            return;
+        }
         const id = itemID ?? Str.guid();
-        const sensitiveKeys = new Set(listField.itemFields.filter(isSensitiveField).flatMap(getAnswerKeys));
+        const sensitiveKeys = new Set(listField.itemFields.filter(hasSensitiveAnswer).flatMap(getAnswerKeys));
         const item: DynamicFormListItem = {id};
         const sensitiveAnswers: DynamicFormValues = {};
         for (const [key, answer] of Object.entries(getSubmittedAnswers(listField.itemFields, itemValues))) {
@@ -239,7 +246,6 @@ function DynamicFormFlow({
                 item[key] = answer;
             }
         }
-        const items = getListItems(values[listKey]);
         const savedItems = itemID ? items.map((existing) => (existing.id === id ? item : existing)) : [...items, item];
         const saveListAnswer = isSensitiveField(listField) ? saveSensitiveAnswers : saveDraftAnswers;
         saveListAnswer(formID, {[listKey]: savedItems});
diff --git a/src/components/DynamicForm/renderers/listRenderer.tsx b/src/components/DynamicForm/renderers/listRenderer.tsx
index 1e99405f5776..902c7a84bdc3 100644
--- a/src/components/DynamicForm/renderers/listRenderer.tsx
+++ b/src/components/DynamicForm/renderers/listRenderer.tsx
@@ -1,5 +1,6 @@
 import ListFieldAdapter from '@components/DynamicForm/adapters/ListFieldAdapter';
 import getLocalizedText, {getFieldLabel} from '@components/DynamicForm/utils/getLocalizedText';
+import hasSensitiveAnswer from '@components/DynamicForm/utils/hasSensitiveAnswer';
 import isSensitiveField from '@components/DynamicForm/utils/isSensitiveField';
 import {getListItems} from '@components/DynamicForm/utils/listItems';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -22,7 +23,7 @@ const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField
                 InputComponent={ListFieldAdapter}
                 {...inputProps}
                 // Outside the flow sensitive entry answers stay in the list value, which must not reach the draft
-                shouldSaveDraft={inputProps.shouldSaveDraft && (!!onOpenListItemEditor || !field.itemFields.some(isSensitiveField))}
+                shouldSaveDraft={inputProps.shouldSaveDraft && (!!onOpenListItemEditor || !field.itemFields.some(hasSensitiveAnswer))}
                 valueType="listItems"
                 value={isMemoryList ? getListItems(values[field.key]) : undefined}
                 onItemsChange={isMemoryList ? (items: DynamicFormListItem[]) => onListItemsChange?.(field.key, items) : undefined}
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index b7819f33cce1..1623ed38d5d6 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -17,7 +17,7 @@ import isSensitiveField from './isSensitiveField';
 import isSupportedField from './isSupportedField';
 import {getListItems} from './listItems';
 import maskSensitiveValue from './maskSensitiveValue';
-import summarizeListItem from './summarizeListItem';
+import summarizeListItem, {getListItemFallbackTitle} from './summarizeListItem';
 
 /** One avatar row per list entry, which opens the entry. A readonly list gets plain rows that open nothing. */
 function getListItemRows(
@@ -27,7 +27,7 @@ function getListItemRows(
     onEditListItem: (listKey: string, itemID: string) => void,
 ): SummaryGroupRow[] {
     return getListItems(values[field.key]).map((item): SummaryGroupRow => {
-        const {title, description} = summarizeListItem(item, field.itemFields, translate);
+        const {title, description} = summarizeListItem(item, field.itemFields, translate, getListItemFallbackTitle(field, translate));
         if (field.readonly) {
             return {id: `${field.key}-${item.id}`, title, description, shouldShowRightIcon: false, onPress: noop, interactive: false};
         }
@@ -42,7 +42,7 @@ function getListItemRows(
     });
 }
 
-/** One section per shown page holding its visible answers, with each list entry as an avatar row and an empty list as a plain row. Tapping a row opens the page or entry to edit; readonly rows open nothing. */
+/** One section per shown page holding its visible answers, with each list entry as an avatar row and an empty list as a plain row. Tapping a row opens the page or entry to edit. Readonly rows open nothing. */
 function getConfirmationItems(
     pages: DynamicFormPage[],
     allFields: DynamicFormField[],
diff --git a/src/components/DynamicForm/utils/hasSensitiveAnswer.ts b/src/components/DynamicForm/utils/hasSensitiveAnswer.ts
new file mode 100644
index 000000000000..0cd13f5f5f18
--- /dev/null
+++ b/src/components/DynamicForm/utils/hasSensitiveAnswer.ts
@@ -0,0 +1,10 @@
+import type {DynamicFormField} from '@src/types/onyx';
+
+import isSensitiveField from './isSensitiveField';
+
+/** The field is sensitive, or is a list whose entries hold a sensitive answer at any depth, so its answer must stay out of the draft */
+function hasSensitiveAnswer(field: DynamicFormField): boolean {
+    return isSensitiveField(field) || (field.type === 'list' && field.itemFields.some(hasSensitiveAnswer));
+}
+
+export default hasSensitiveAnswer;
diff --git a/src/components/DynamicForm/utils/listItems.ts b/src/components/DynamicForm/utils/listItems.ts
index a3d1b8bb87d4..f0e77da270b7 100644
--- a/src/components/DynamicForm/utils/listItems.ts
+++ b/src/components/DynamicForm/utils/listItems.ts
@@ -3,7 +3,7 @@ import type {DynamicFormValues} from '@components/DynamicForm/types';
 import type {DynamicFormListField, DynamicFormListItem} from '@src/types/onyx';
 
 import getAnswerKeys from './getAnswerKeys';
-import isSensitiveField from './isSensitiveField';
+import hasSensitiveAnswer from './hasSensitiveAnswer';
 
 const PAGE_NAME_SEPARATOR = '~';
 const NEW_ITEM_ID = 'new';
@@ -44,7 +44,7 @@ function getListItems(value: unknown): DynamicFormListItem[] {
 function getListItemSensitiveAnswers(field: DynamicFormListField, itemID: string, values: DynamicFormValues): DynamicFormValues {
     return Object.fromEntries(
         field.itemFields
-            .filter(isSensitiveField)
+            .filter(hasSensitiveAnswer)
             .flatMap(getAnswerKeys)
             .flatMap((answerKey) => {
                 const answer = values[getListItemSensitiveKey(field.key, itemID, answerKey)];
@@ -55,7 +55,7 @@ function getListItemSensitiveAnswers(field: DynamicFormListField, itemID: string
 
 /** Memory keys of sensitive answers whose entry the user has removed from the list */
 function getRemovedListItemSensitiveKeys(field: DynamicFormListField, values: DynamicFormValues): string[] {
-    const sensitiveKeys = field.itemFields.filter(isSensitiveField).flatMap(getAnswerKeys);
+    const sensitiveKeys = field.itemFields.filter(hasSensitiveAnswer).flatMap(getAnswerKeys);
     const keptKeys = new Set(getListItems(values[field.key]).flatMap((item) => sensitiveKeys.map((answerKey) => getListItemSensitiveKey(field.key, item.id, answerKey))));
     return Object.keys(values).filter((key) => key.startsWith(`${field.key}${PAGE_NAME_SEPARATOR}`) && !keptKeys.has(key));
 }
diff --git a/src/components/DynamicForm/utils/summarizeListItem.ts b/src/components/DynamicForm/utils/summarizeListItem.ts
index 0074166bbe60..133bb472f999 100644
--- a/src/components/DynamicForm/utils/summarizeListItem.ts
+++ b/src/components/DynamicForm/utils/summarizeListItem.ts
@@ -1,8 +1,10 @@
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
-import type {DynamicFormField, DynamicFormListItem} from '@src/types/onyx';
+import type {DynamicFormField, DynamicFormListField, DynamicFormListItem} from '@src/types/onyx';
 
 import formatDynamicFieldValue from './formatDynamicFieldValue';
+import getLocalizedText, {getFieldLabel} from './getLocalizedText';
+import getVisibleFields from './getVisibleFields';
 import isSensitiveField from './isSensitiveField';
 
 const DESCRIPTION_ANSWER_LIMIT = 2;
@@ -10,9 +12,14 @@ const DESCRIPTION_ANSWER_LIMIT = 2;
 /** Long answers, such as a full address, would crowd the row, so they are left out of its description */
 const TYPES_LEFT_OUT_OF_DESCRIPTION = new Set<DynamicFormField['type']>(['date', 'address', 'country', 'file']);
 
-/** The leading run of text answers names the row, as first and last name do. Up to two short remaining answers describe it. */
-function summarizeListItem(item: DynamicFormListItem, itemFields: DynamicFormField[], translate: LocalizedTranslate): {title: string; description: string} {
-    const shownFields = itemFields.filter((field) => !isSensitiveField(field) && formatDynamicFieldValue(field, item, translate) !== '');
+/** The noun for one entry of the list, or the list's label, which names an entry whose answers give it no name */
+function getListItemFallbackTitle(field: DynamicFormListField, translate: LocalizedTranslate): string {
+    return getLocalizedText(translate, field.itemLabelKey, field.itemLabel) ?? getFieldLabel(field, translate);
+}
+
+/** The leading run of text answers names the row, as first and last name do. Up to two short remaining answers describe it. Hidden answers are left out, and an entry with no shown answer is named by `fallbackTitle`. */
+function summarizeListItem(item: DynamicFormListItem, itemFields: DynamicFormField[], translate: LocalizedTranslate, fallbackTitle: string): {title: string; description: string} {
+    const shownFields = getVisibleFields(itemFields, item).filter((field) => !isSensitiveField(field) && formatDynamicFieldValue(field, item, translate) !== '');
     const firstTextIndex = shownFields.findIndex((field) => field.type === 'text');
     const titleFields: DynamicFormField[] = [];
     for (const field of shownFields.slice(Math.max(firstTextIndex, 0))) {
@@ -25,7 +32,7 @@ function summarizeListItem(item: DynamicFormListItem, itemFields: DynamicFormFie
     if (titleFields.length === 0 && firstShownField) {
         titleFields.push(firstShownField);
     }
-    const title = titleFields.map((field) => formatDynamicFieldValue(field, item, translate)).join(' ');
+    const title = titleFields.map((field) => formatDynamicFieldValue(field, item, translate)).join(' ') || fallbackTitle;
     const description = shownFields
         .filter((field) => !titleFields.includes(field) && !TYPES_LEFT_OUT_OF_DESCRIPTION.has(field.type))
         .slice(0, DESCRIPTION_ANSWER_LIMIT)
@@ -35,3 +42,4 @@ function summarizeListItem(item: DynamicFormListItem, itemFields: DynamicFormFie
 }
 
 export default summarizeListItem;
+export {getListItemFallbackTitle};
diff --git a/src/stories/DynamicForm.stories.tsx b/src/stories/DynamicForm.stories.tsx
index e9c170793bce..d53185322027 100644
--- a/src/stories/DynamicForm.stories.tsx
+++ b/src/stories/DynamicForm.stories.tsx
@@ -347,14 +347,23 @@ type PresetName = keyof typeof PRESETS;
 
 const PRESET_NAMES = Object.keys(PRESETS).filter((name): name is PresetName => name in PRESETS);
 
-/** Seeds the draft after mount and reports once the write has landed, so the form mounts with the draft as a real page would */
+/** Seeds the draft after mount and reports once the write of these values has landed, so the form mounts with the draft as a real page would, also after the preset changes */
 function useSeededDraft(draftValues: Preset['draftValues']): boolean {
-    const [isSeeded, setIsSeeded] = useState(false);
+    const [seededDraftValues, setSeededDraftValues] = useState<Preset['draftValues']>();
     useEffect(() => {
+        let isCancelled = false;
         clearDraftValues(STORYBOOK_FORM_ID);
-        setDraftValues(STORYBOOK_FORM_ID, draftValues).then(() => setIsSeeded(true));
+        setDraftValues(STORYBOOK_FORM_ID, draftValues).then(() => {
+            if (isCancelled) {
+                return;
+            }
+            setSeededDraftValues(draftValues);
+        });
+        return () => {
+            isCancelled = true;
+        };
     }, [draftValues]);
-    return isSeeded;
+    return seededDraftValues === draftValues;
 }
 
 /** Every page on one screen, for looking at the renderer rather than the flow */
diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index 6e1141ff8251..a23986ed6900 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -158,14 +158,19 @@ type DynamicFormListField = DynamicFormFieldBase & {
     /** The noun for one entry, such as "owner", for the add row and the editor title */
     itemLabel?: string;
 
+    /** Translation of `itemLabel`, used instead of it when set */
     itemLabelKey?: TranslationPaths;
 
     /** Hint shown under the add row */
     addItemDescription?: string;
 
+    /** Translation of `addItemDescription`, used instead of it when set */
     addItemDescriptionKey?: TranslationPaths;
 
+    /** Fewest entries the list must hold to pass validation */
     minItems?: number;
+
+    /** Most entries the list can hold. The add row is hidden once it is reached. */
     maxItems?: number;
 };
 
diff --git a/tests/unit/components/DynamicForm/summarizeListItemTest.ts b/tests/unit/components/DynamicForm/summarizeListItemTest.ts
index 3bb3b79bc226..3655c585538b 100644
--- a/tests/unit/components/DynamicForm/summarizeListItemTest.ts
+++ b/tests/unit/components/DynamicForm/summarizeListItemTest.ts
@@ -19,7 +19,7 @@ describe('summarizeListItem', () => {
         const owner = {id: 'jane', firstName: 'Jane', lastName: 'Doe', ssn: '123456789', dateOfBirth: '1980-04-19', ownership: '40', role: 'CEO', title: 'Founder'};
 
         // When the entry is summarized
-        const summary = summarizeListItem(owner, itemFields, translateLocal);
+        const summary = summarizeListItem(owner, itemFields, translateLocal, 'Owner');
 
         // Then the name is the title, and the description holds the first two short answers, leaving out the SSN and the long date
         expect(summary).toEqual({title: 'Jane Doe', description: '40%, Chief executive'});
@@ -30,9 +30,43 @@ describe('summarizeListItem', () => {
         const itemFields: DynamicFormField[] = [{key: 'role', type: 'select', required: true, values: [{key: 'CEO', label: 'Chief executive'}]}];
 
         // When it is summarized
-        const summary = summarizeListItem({id: 'one', role: 'CEO'}, itemFields, translateLocal);
+        const summary = summarizeListItem({id: 'one', role: 'CEO'}, itemFields, translateLocal, 'Owner');
 
         // Then the choice names the row, so it is never left without a title
         expect(summary).toEqual({title: 'Chief executive', description: ''});
     });
+
+    it('names an entry whose shown answers are all sensitive by the fallback title', () => {
+        // Given an entry whose only answer is sensitive
+        const itemFields: DynamicFormField[] = [{key: 'ssn', type: 'text', required: true, sensitive: true}];
+
+        // When it is summarized
+        const summary = summarizeListItem({id: 'one', ssn: '123456789'}, itemFields, translateLocal, 'Owner');
+
+        // Then the fallback names the row, so its row and its Edit and Remove labels are never blank
+        expect(summary).toEqual({title: 'Owner', description: ''});
+    });
+
+    it('leaves out answers the entry now hides', () => {
+        // Given a company entry still holding the name it had while it was an individual
+        const itemFields: DynamicFormField[] = [
+            {
+                key: 'ownerType',
+                type: 'select',
+                required: true,
+                values: [
+                    {key: 'INDIVIDUAL', label: 'Individual'},
+                    {key: 'COMPANY', label: 'Company'},
+                ],
+            },
+            {key: 'firstName', type: 'text', required: true, showWhen: {key: 'ownerType', equals: ['INDIVIDUAL']}},
+            {key: 'companyName', type: 'text', required: true, showWhen: {key: 'ownerType', equals: ['COMPANY']}},
+        ];
+
+        // When it is summarized
+        const summary = summarizeListItem({id: 'acme', ownerType: 'COMPANY', firstName: 'Jane', companyName: 'Acme'}, itemFields, translateLocal, 'Owner');
+
+        // Then the hidden name is ignored, as validation and submission ignore it
+        expect(summary).toEqual({title: 'Acme', description: 'Company'});
+    });
 });

From 88b6cd0ae5502ec5350f0afce27586633cb15646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Musia=C5=82?= <jan.musial@swmansion.com>
Date: Wed, 14 Oct 2026 15:17:13 +0200
Subject: [PATCH 664/781] add new helper replaceWorkspaceAccount that
 consolidates the flow, fix old dot reset

---
 src/DelegateAccessHandler.tsx                 |  16 +-
 src/ONYXKEYS.ts                               |   4 +
 src/libs/Reauthentication.ts                  |   3 +-
 src/libs/actions/Delegate.ts                  | 303 +++++++++++-------
 .../Security/SecuritySettingsPage.tsx         |   2 +-
 tests/actions/DelegateTest.ts                 |  55 +++-
 tests/actions/SessionTest.ts                  |   3 +-
 7 files changed, 247 insertions(+), 139 deletions(-)

diff --git a/src/DelegateAccessHandler.tsx b/src/DelegateAccessHandler.tsx
index 22eb3734f3f2..697a05ed6c4f 100644
--- a/src/DelegateAccessHandler.tsx
+++ b/src/DelegateAccessHandler.tsx
@@ -3,14 +3,14 @@ import {useEffect, useRef} from 'react';
 import CONST from './CONST';
 import useIsLoadingAppRecovery from './hooks/useIsLoadingAppRecovery';
 import useOnyx from './hooks/useOnyx';
-import {disconnect} from './libs/actions/Delegate';
+import {disconnect, resumeSelfRemovalAsDelegate} from './libs/actions/Delegate';
 import Log from './libs/Log';
 import ONYXKEYS from './ONYXKEYS';
-import {accountIDSelector, emailSelector} from './selectors/Session';
+import {accountIDSelector, emailSelector, isDelegateSessionSelector} from './selectors/Session';
 
 /**
  * Component that does not render anything but isolates delegate-access–related Onyx subscriptions
- * (account, stashedCredentials, stashedSession, hasLoadedApp, isLoadingApp)
+ * (account, stashedCredentials, stashedSession, pendingSelfCopilotRemoval, hasLoadedApp, isLoadingApp)
  * from the root Expensify component so that changes to these keys do not
  * re-render the entire navigation tree.
  */
@@ -24,6 +24,8 @@ function DelegateAccessHandler() {
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const [sessionAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: accountIDSelector});
     const [sessionEmail] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
+    const [isDelegateSession] = useOnyx(ONYXKEYS.SESSION, {selector: isDelegateSessionSelector});
+    const [pendingSelfCopilotRemoval] = useOnyx(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL);
 
     useIsLoadingAppRecovery();
 
@@ -38,6 +40,14 @@ function DelegateAccessHandler() {
         disconnect({stashedCredentials, stashedSession});
     }, [account?.delegatedAccess?.delegates, account?.delegatedAccess?.delegate, stashedCredentials, stashedSession]);
 
+    // Finish a self-removal from a delegator's copilots that a kill interrupted
+    useEffect(() => {
+        if (!pendingSelfCopilotRemoval || !sessionAccountID) {
+            return;
+        }
+        resumeSelfRemovalAsDelegate({delegatorEmail: pendingSelfCopilotRemoval, isDelegateSession: !!isDelegateSession});
+    }, [pendingSelfCopilotRemoval, isDelegateSession, sessionAccountID]);
+
     // Log delegate mismatch after the app has loaded
     useEffect(() => {
         if (hasLoggedDelegateMismatchRef.current || !hasLoadedApp || isLoadingApp) {
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 68574f4d2581..1e7b2bece3cc 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -170,6 +170,9 @@ const ONYXKEYS = {
     SESSION: 'session',
     STASHED_SESSION: 'stashedSession',
 
+    /** Delegator the acting copilot is removing themselves from, kept until the removal is queued so a kill can't lose it */
+    PENDING_SELF_COPILOT_REMOVAL: 'pendingSelfCopilotRemoval',
+
     BETAS: 'betas',
     BETA_CONFIGURATION: 'betaConfiguration',
 
@@ -1709,6 +1712,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.SESSION]: OnyxTypes.Session;
     [ONYXKEYS.USER_METADATA]: OnyxTypes.UserMetadata;
     [ONYXKEYS.STASHED_SESSION]: OnyxTypes.Session;
+    [ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL]: string;
     [ONYXKEYS.BETAS]: OnyxTypes.Beta[];
     [ONYXKEYS.AGENT_RULE_SUGGESTIONS]: OnyxTypes.SuggestedAgentRule[];
     [ONYXKEYS.AGENT_TEMPLATES]: OnyxTypes.SuggestedAgent[];
diff --git a/src/libs/Reauthentication.ts b/src/libs/Reauthentication.ts
index a691aa0f13b0..4684d4f1a6f9 100644
--- a/src/libs/Reauthentication.ts
+++ b/src/libs/Reauthentication.ts
@@ -214,8 +214,7 @@ function reauthenticate(command = ''): Promise<ReauthenticationResult> {
 
     return hasReadRequiredDataFromStorage().then(() => {
         // While connected as a delegate, ONYXKEYS.CREDENTIALS is wiped by clearOnyxForDelegateTransition; the original user's creds live in stashedCredentials.
-        // ACCOUNT can lose the `delegate` field once the copilot's access is revoked, while SESSION still holds the revoked
-        // restricted token, so the token type also marks a delegate session. See Expensify/App#93458.
+        // ACCOUNT can lose `delegate` once access is revoked while SESSION still holds the restricted token
         const isDelegate =
             isDelegateTokenSession ||
             isConnectedAsDelegate({
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index e9e56dfdcbcb..18bc8befb373 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -21,7 +21,7 @@ import type {Delegate, DelegatedAccess, DelegateRole} from '@src/types/onyx/Acco
 import type Credentials from '@src/types/onyx/Credentials';
 import type Session from '@src/types/onyx/Session';
 
-import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxEntry, OnyxMultiSetInput, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import HybridAppModule from '@expensify/react-native-hybrid-app';
@@ -40,6 +40,7 @@ const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [
     ONYXKEYS.STASHED_SESSION,
     ONYXKEYS.HAS_LOADED_APP,
     ONYXKEYS.STASHED_CREDENTIALS,
+    ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL,
     ONYXKEYS.HYBRID_APP,
 
     // Otherwise it's wiped and refetched by OpenApp, letting the product-marketing window flash back in
@@ -62,9 +63,37 @@ const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [
     ONYXKEYS.PERSONAL_DETAILS_LIST,
 ];
 
-/** Atomically reset Onyx for a delegate-access transition. */
-function clearOnyxForDelegateTransition(): Promise<void> {
-    return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
+/** Atomically reset Onyx for a delegate-access transition. `extraSeeds` are written in the same step as the clear. */
+function clearOnyxForDelegateTransition(extraSeeds?: OnyxMultiSetInput): Promise<void> {
+    return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS, extraSeeds);
+}
+
+type LoadAccountAfterDelegateTransitionParams = {
+    /** Account to reinitialize Pusher for */
+    accountID: number | undefined;
+
+    /** Email to reinitialize Pusher for */
+    email: string | undefined;
+
+    /** Account to switch OldDot to, omitted to leave OldDot as is */
+    hybridAppAccount?: Parameters<typeof HybridAppModule.switchAccount>[0];
+};
+
+/**
+ * Loads the account after a delegate-access transition and syncs OldDot to it. Pusher is not awaited: on Android it can
+ * stall right after the transition's disconnect, which would block the switch. See Expensify/App#93458.
+ */
+function loadAccountAfterDelegateTransition({accountID, email, hybridAppAccount}: LoadAccountAfterDelegateTransitionParams): Promise<void> {
+    return openApp().then(() => {
+        requestPusherReinitialize({accountID, email}).catch((error: unknown) => {
+            Log.hmmm('[Delegate] Failed to reinitialize Pusher after a delegate-access transition', {error: ErrorUtils.getErrorMessage(error)});
+        });
+
+        if (!CONFIG.IS_HYBRID_APP || !hybridAppAccount) {
+            return;
+        }
+        HybridAppModule.switchAccount(hybridAppAccount);
+    });
 }
 
 type WithDelegatedAccess = {
@@ -116,19 +145,16 @@ type WithActivePolicyID = {
 type DisconnectParams = WithStashedCredentials & WithStashedSession;
 
 const DISCONNECT_RESULT = {
-    /** The server ended the copilot session and the original session was restored with fresh tokens */
+    /** Session ended, original session restored with fresh tokens */
     RESTORED: 'restored',
 
-    /** The server response was incomplete, so the original session was restored from the stash */
+    /** Incomplete response, original session restored from the stash */
     RESTORED_FROM_STASH: 'restoredFromStash',
 
-    /**
-     * The server ended the copilot session, but restoring the original session threw partway. SESSION is written first,
-     * so it most likely holds the original account already. If not, the next request reauthenticates with the stash.
-     */
+    /** Session ended but the restore threw partway. SESSION is written first, so it is most likely restored. */
     RESTORE_INTERRUPTED: 'restoreInterrupted',
 
-    /** The request failed, so the copilot session is still active */
+    /** Request failed, copilot session still active */
     FAILED: 'failed',
 } as const;
 
@@ -258,22 +284,20 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
                     Pusher.disconnect();
                     return clearOnyxForDelegateTransition();
                 })
-                .then(() => {
-                    return openApp()
-                        .then(() => requestPusherReinitialize({accountID: response.accountID, email: response.email}))
-                        .then(() => {
-                            if (!CONFIG.IS_HYBRID_APP || !policyID) {
-                                return true;
-                            }
-                            HybridAppModule.switchAccount({
-                                newDotCurrentAccountEmail: email,
-                                authToken: restrictedToken,
-                                policyID,
-                                accountID: String(session?.accountID ?? CONST.DEFAULT_NUMBER_ID),
-                            });
-                            return true;
-                        });
-                });
+                .then(() =>
+                    loadAccountAfterDelegateTransition({
+                        accountID: response.accountID,
+                        email: response.email,
+                        hybridAppAccount: policyID
+                            ? {
+                                  newDotCurrentAccountEmail: email,
+                                  authToken: restrictedToken,
+                                  policyID,
+                                  accountID: String(session?.accountID ?? CONST.DEFAULT_NUMBER_ID),
+                              }
+                            : undefined,
+                    }).then(() => true),
+                );
         })
         .catch((error) => {
             Log.alert('[Delegate] Error connecting as delegate', {error});
@@ -322,8 +346,7 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams): Pro
     ];
 
     // We need to access the authToken directly from the response to update the session
-    // The promise resolves to a DISCONNECT_RESULT once the flow settles, so callers can gate follow-up work that
-    // must run under the original user's identity (e.g. deleting the agent) on how the session was restored.
+    // Resolves to a DISCONNECT_RESULT so callers can gate work that must run as the original user (e.g. deleting the agent)
     // eslint-disable-next-line rulesdir/no-api-side-effects-method
     return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.DISCONNECT_AS_DELEGATE, {}, {optimisticData, successData, failureData}).then(
         (response) => {
@@ -372,7 +395,7 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams): Pro
                 return DISCONNECT_RESULT.RESTORE_INTERRUPTED;
             });
         },
-        // Only a failed request leaves the copilot session untouched. Errors thrown while restoring are handled above.
+        // Only a failed request leaves the copilot session active
         (error) => {
             Log.alert('[Delegate] Error disconnecting as a delegate', {error});
             return DISCONNECT_RESULT.FAILED;
@@ -719,78 +742,123 @@ function removeDelegator({email, delegatedAccess}: RemoveDelegateParams) {
 
 type RemoveSelfAsDelegateParams = WithStashedCredentials &
     WithStashedSession & {
-        /** Email of the delegator the copilot is currently acting as */
+        /** Delegator the copilot is acting as */
         delegatorEmail: string;
 
-        /** Email of the acting copilot, whose row shows the error when the copilot session cannot be ended */
+        /** Acting copilot, whose row shows the error if the session can't be ended */
         delegateEmail: string;
     };
 
-/**
- * Removes the acting copilot from the delegator's copilots. The original session is restored before the access is
- * revoked: revoking first invalidates the restricted token the app is running on, and killing the app before the
- * restore completes persists that revoked token in both NewDot and OldDot. See Expensify/App#93458.
- */
-function removeSelfAsDelegate({delegatorEmail, delegateEmail, stashedCredentials, stashedSession}: RemoveSelfAsDelegateParams) {
-    return disconnect({stashedCredentials, stashedSession}).then((disconnectResult) => {
-        // Restoring from the stash still returns the copilot to their own account, so only a failed request blocks the removal
-        if (disconnectResult === DISCONNECT_RESULT.FAILED) {
-            Log.alert('[Delegate] Unable to restore the original session, skipping copilot removal');
+// Set while removeSelfAsDelegate runs, so resuming a pending removal can't queue it twice
+let isRemovingSelfAsDelegate = false;
 
-            // The copilot is still acting as the delegator, so the error goes on their own row in the delegator's copilots list
-            Onyx.merge(ONYXKEYS.ACCOUNT, {
+/** Queues the restored copilot's removal from the delegator's copilots, clearing the pending removal with it */
+function queueSelfRemovalFromDelegator(delegatorEmail: string) {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT | typeof ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL>> = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
                 delegatedAccess: {
                     errorFields: {
-                        removeDelegate: {
-                            [delegateEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
+                        removeDelegator: {
+                            [delegatorEmail]: null,
                         },
                     },
                 },
-            });
-            return;
-        }
+            },
+        },
+    ];
 
-        const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: ONYXKEYS.ACCOUNT,
-                value: {
-                    delegatedAccess: {
-                        errorFields: {
-                            removeDelegator: {
-                                [delegatorEmail]: null,
-                            },
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    errorFields: {
+                        removeDelegator: {
+                            [delegatorEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
                         },
                     },
                 },
             },
-        ];
+        },
+    ];
 
-        const failureData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: ONYXKEYS.ACCOUNT,
-                value: {
+    const parameters: APIRemoveDelegatorParams = {delegatorEmail};
+
+    // The restored account's delegators aren't known here, so refetch them after the removal
+    API.write(WRITE_COMMANDS.REMOVE_DELEGATOR, parameters, {
+        optimisticData,
+        failureData,
+    });
+    openSecuritySettingsPage();
+}
+
+/**
+ * Removes the acting copilot from the delegator's copilots, restoring the original session first: revoking first
+ * invalidates the token the app runs on, and a kill before the restore persists it. See Expensify/App#93458.
+ * The removal is saved as pending first, so a kill before it is queued doesn't lose it.
+ */
+function removeSelfAsDelegate({delegatorEmail, delegateEmail, stashedCredentials, stashedSession}: RemoveSelfAsDelegateParams) {
+    isRemovingSelfAsDelegate = true;
+    return Onyx.set(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL, delegatorEmail)
+        .then(() => disconnect({stashedCredentials, stashedSession}))
+        .then((disconnectResult) => {
+            // Only a failed request leaves the copilot on the delegator's account
+            if (disconnectResult === DISCONNECT_RESULT.FAILED) {
+                Log.alert('[Delegate] Unable to restore the original session, skipping copilot removal');
+                Onyx.set(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL, null);
+
+                // Still acting as the delegator, so show the error on the copilot's own row
+                Onyx.merge(ONYXKEYS.ACCOUNT, {
                     delegatedAccess: {
                         errorFields: {
-                            removeDelegator: {
-                                [delegatorEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
+                            removeDelegate: {
+                                [delegateEmail]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
                             },
                         },
                     },
-                },
-            },
-        ];
-
-        const parameters: APIRemoveDelegatorParams = {delegatorEmail};
+                });
+                return;
+            }
 
-        // The delegators list of the restored account is not known here, so it is refreshed from the server once the removal is written
-        API.write(WRITE_COMMANDS.REMOVE_DELEGATOR, parameters, {
-            optimisticData,
-            failureData,
+            queueSelfRemovalFromDelegator(delegatorEmail);
+        })
+        .finally(() => {
+            isRemovingSelfAsDelegate = false;
         });
-        openSecuritySettingsPage();
-    });
+}
+
+type ResumeSelfRemovalAsDelegateParams = {
+    /** Delegator saved as pending by an interrupted removeSelfAsDelegate */
+    delegatorEmail: string;
+
+    /** Whether the session still holds the delegator's restricted token */
+    isDelegateSession: boolean;
+};
+
+/**
+ * Finishes a removeSelfAsDelegate a kill interrupted. Back on their own account, the copilot's removal is queued;
+ * still acting as the delegator, the restore never happened, so the removal counts as cancelled.
+ */
+function resumeSelfRemovalAsDelegate({delegatorEmail, isDelegateSession}: ResumeSelfRemovalAsDelegateParams) {
+    if (isRemovingSelfAsDelegate) {
+        return;
+    }
+
+    if (isDelegateSession) {
+        Onyx.set(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL, null);
+        return;
+    }
+
+    queueSelfRemovalFromDelegator(delegatorEmail);
 }
 
 function clearDelegateErrorsByField({email, fieldName, delegatedAccess}: ClearDelegateErrorsByFieldParams) {
@@ -941,55 +1009,41 @@ function restoreDelegateSession({authToken, encryptedAuthToken, accountID, email
     // Write SESSION before the clear: SESSION is in KEYS_TO_PRESERVE_DELEGATE_ACCESS, so clearing
     // preserves the value at clear time. If we cleared first, an interrupted flow would leave
     // SESSION holding the prior delegate-restricted auth token. See Expensify/App#80073.
-    return (
-        Onyx.set(ONYXKEYS.SESSION, {
-            ...(stashedSession ?? {}),
-            accountID,
-            email,
-            authToken,
-            encryptedAuthToken,
-            creationDate,
-        })
-            .then(() => {
-                NetworkStore.setAuthToken(authToken ?? null);
-                // Disconnect Pusher before the transition so it cannot keep pushing updates for the delegate
-                // account; it is reinitialized for the restored account after `openApp()`. See Expensify/App#93265.
-                Pusher.disconnect();
-                return clearOnyxForDelegateTransition();
-            })
-            .then(() => {
-                Onyx.set(ONYXKEYS.CREDENTIALS, {
+    return Onyx.set(ONYXKEYS.SESSION, {
+        ...(stashedSession ?? {}),
+        accountID,
+        email,
+        authToken,
+        encryptedAuthToken,
+        creationDate,
+    })
+        .then(() => {
+            NetworkStore.setAuthToken(authToken ?? null);
+            // Disconnect Pusher before the transition so it cannot keep pushing updates for the delegate
+            // account; it is reinitialized for the restored account after `openApp()`. See Expensify/App#93265.
+            Pusher.disconnect();
+
+            // Seeded with the clear: written after it, an interrupted restore would leave the session without credentials
+            return clearOnyxForDelegateTransition({
+                [ONYXKEYS.CREDENTIALS]: {
                     ...(stashedCredentials ?? {}),
                     accountID,
-                });
-                Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, {});
-                Onyx.set(ONYXKEYS.STASHED_SESSION, {});
-
-                NetworkStore.setIsAuthenticating(false);
-
-                return openApp();
-            })
-            // Reinitialize Pusher for the restored account so realtime updates resume on the correct session.
-            .then(() => {
-                // Not awaited: Pusher.init only resolves once the socket reports connected, which can stall right after the
-                // disconnect above (on Android), and the account switch below must not wait on it. See Expensify/App#93458.
-                requestPusherReinitialize({accountID, email}).catch((error: unknown) => {
-                    Log.hmmm('[Delegate] Failed to reinitialize Pusher after restoring the original session', {error: ErrorUtils.getErrorMessage(error)});
-                });
+                },
+                [ONYXKEYS.STASHED_CREDENTIALS]: {},
+                [ONYXKEYS.STASHED_SESSION]: {},
+            });
+        })
+        .then(() => {
+            NetworkStore.setIsAuthenticating(false);
 
-                // Sync the account switch to the classic mobile app experience of HybridApp; otherwise the
-                // two experiences disagree about which account is active after a reauth-driven restoration.
-                if (!CONFIG.IS_HYBRID_APP || !email || !authToken) {
-                    return;
-                }
-                HybridAppModule.switchAccount({
-                    newDotCurrentAccountEmail: email,
-                    authToken,
-                    policyID: '',
-                    accountID: '',
-                });
-            })
-    );
+            // Sync the account switch to the classic mobile app experience of HybridApp; otherwise the
+            // two experiences disagree about which account is active after a reauth-driven restoration.
+            return loadAccountAfterDelegateTransition({
+                accountID,
+                email,
+                hybridAppAccount: email && authToken ? {newDotCurrentAccountEmail: email, authToken, policyID: '', accountID: ''} : undefined,
+            });
+        });
 }
 
 function openSecuritySettingsPage() {
@@ -1010,6 +1064,7 @@ export {
     removeDelegate,
     removeDelegator,
     removeSelfAsDelegate,
+    resumeSelfRemovalAsDelegate,
     openSecuritySettingsPage,
     clearOnyxForDelegateTransition,
 };
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index a53a3c94e53a..67c12c082a69 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -227,7 +227,7 @@ function SecuritySettingsPage() {
                     // The DeleteAgent command must be issued by the agent's owner, but while copiloting the session is
                     // authenticated as the agent itself. So capture the agent's identity, end the copilot session
                     // (which restores the owner's session and auth token), and only then delete the agent as the
-                    // owner. Unless the server ended the session and restored the owner with fresh tokens, skip the delete.
+                    // owner. Skip the delete unless the owner was restored with fresh tokens.
                     const agentAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
                     const agentLogin = currentUserPersonalDetails.login;
                     const disconnectResult = await disconnect({stashedCredentials, stashedSession});
diff --git a/tests/actions/DelegateTest.ts b/tests/actions/DelegateTest.ts
index 0ef1e829cf0c..c2d87988c5d6 100644
--- a/tests/actions/DelegateTest.ts
+++ b/tests/actions/DelegateTest.ts
@@ -7,6 +7,7 @@ import {
     isConnectedAsDelegate,
     removeDelegate,
     removeSelfAsDelegate,
+    resumeSelfRemovalAsDelegate,
     updateDelegateRole,
 } from '@libs/actions/Delegate';
 import * as API from '@libs/API';
@@ -311,7 +312,7 @@ describe('actions/Delegate', () => {
         });
     });
 
-    // Each case stubs every API method the disconnect and removal flow calls, which this rule counts as chained API calls
+    // Stubbing the flow's API methods counts as chained API calls for this rule
     /* eslint-disable rulesdir/no-multiple-api-calls */
     describe('removeSelfAsDelegate', () => {
         afterEach(() => {
@@ -352,9 +353,14 @@ describe('actions/Delegate', () => {
             const stashedSession = {authToken: 'copilotAuthToken', email: 'copilot@test.com', accountID: 2};
             const stashedCredentials = {autoGeneratedLogin: 'copilotLogin', autoGeneratedPassword: 'copilotPassword'};
             await Onyx.set(ONYXKEYS.SESSION, {authToken: 'restrictedToken', email: 'delegator@test.com', accountID: 1, authTokenType: CONST.AUTH_TOKEN_TYPES.DELEGATE});
-            jest.spyOn(API, 'makeRequestWithSideEffects').mockImplementation(() =>
-                disconnectResponse instanceof Error ? Promise.reject(disconnectResponse) : Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS, ...disconnectResponse}),
-            );
+            let pendingRemovalAtDisconnect: string | undefined;
+            jest.spyOn(API, 'makeRequestWithSideEffects').mockImplementation(async () => {
+                pendingRemovalAtDisconnect = await getOnyxValue(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL);
+                if (disconnectResponse instanceof Error) {
+                    throw disconnectResponse;
+                }
+                return {jsonCode: CONST.JSON_CODE.SUCCESS, ...disconnectResponse};
+            });
             jest.spyOn(API, 'writeWithNoDuplicatesOpenAppConflictAction').mockImplementation(() => (shouldOpenAppFail ? Promise.reject(new Error('OpenApp failed')) : Promise.resolve()));
             const writeSpy = jest.spyOn(API, 'write').mockResolvedValue(undefined);
             const readSpy = jest.spyOn(API, 'read').mockImplementation(() => {});
@@ -363,19 +369,54 @@ describe('actions/Delegate', () => {
             await removeSelfAsDelegate({delegatorEmail: 'delegator@test.com', delegateEmail: 'copilot@test.com', stashedCredentials, stashedSession});
             await waitForBatchedUpdates();
 
-            // Then the access is revoked as the copilot only once they are back on their own account, so the app never runs on a revoked token
+            // Then the removal is saved as pending before the session is ended, so a kill mid-flow can't lose it
+            expect(pendingRemovalAtDisconnect).toBe('delegator@test.com');
+
+            // And the access is revoked only once the copilot is back on their own account, so the app never runs on a revoked token
             const removeDelegatorCalls = writeSpy.mock.calls.filter(([command]) => command === WRITE_COMMANDS.REMOVE_DELEGATOR);
             expect(removeDelegatorCalls).toHaveLength(shouldRemoveDelegator ? 1 : 0);
             await expect(getOnyxValue(ONYXKEYS.SESSION)).resolves.toEqual(expect.objectContaining(expectedSession));
             if (shouldRemoveDelegator) {
-                expect(removeDelegatorCalls.at(0)?.at(1)).toEqual({delegatorEmail: 'delegator@test.com'});
+                expect(writeSpy).toHaveBeenCalledWith(
+                    WRITE_COMMANDS.REMOVE_DELEGATOR,
+                    {delegatorEmail: 'delegator@test.com'},
+                    expect.objectContaining({optimisticData: expect.arrayContaining([{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL, value: null}])}),
+                );
                 expect(readSpy).toHaveBeenCalledWith(READ_COMMANDS.OPEN_SECURITY_SETTINGS_PAGE, null);
                 return;
             }
 
-            // And a failed restore leaves the copilot on the delegator's account with an error on their own row
+            // And a failed restore leaves the copilot on the delegator's account with an error on their own row and nothing pending
             const account = await getOnyxValue(ONYXKEYS.ACCOUNT);
             expect(account?.delegatedAccess?.errorFields?.removeDelegate?.['copilot@test.com']).toBeDefined();
+            await expect(getOnyxValue(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL)).resolves.toBeUndefined();
+        });
+    });
+
+    describe('resumeSelfRemovalAsDelegate', () => {
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
+        it.each([
+            ['queues the removal once the copilot is back on their own account', false, 1],
+            ['cancels the removal when the copilot is still acting as the delegator, as the restore never happened', true, 0],
+        ])('%s', async (_description, isDelegateSession, expectedRemoveDelegatorCalls) => {
+            // Given a self-removal that a kill interrupted after it was saved as pending
+            await Onyx.set(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL, 'delegator@test.com');
+            const writeSpy = jest.spyOn(API, 'write').mockResolvedValue(undefined);
+            jest.spyOn(API, 'read').mockImplementation(() => {});
+
+            // When the app starts again
+            resumeSelfRemovalAsDelegate({delegatorEmail: 'delegator@test.com', isDelegateSession});
+            await waitForBatchedUpdates();
+
+            // Then the removal is only completed when the copilot's own session was restored
+            const removeDelegatorCalls = writeSpy.mock.calls.filter(([command]) => command === WRITE_COMMANDS.REMOVE_DELEGATOR);
+            expect(removeDelegatorCalls).toHaveLength(expectedRemoveDelegatorCalls);
+            if (isDelegateSession) {
+                await expect(getOnyxValue(ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL)).resolves.toBeUndefined();
+            }
         });
     });
     /* eslint-enable rulesdir/no-multiple-api-calls */
diff --git a/tests/actions/SessionTest.ts b/tests/actions/SessionTest.ts
index 95f6dc16deea..f6dd569ac2a3 100644
--- a/tests/actions/SessionTest.ts
+++ b/tests/actions/SessionTest.ts
@@ -145,8 +145,7 @@ describe('Session', () => {
     });
 
     test('reauthenticate restores the original account with the stashed credentials when the delegate field is gone but SESSION still holds a delegate token', async () => {
-        // Given a copilot whose access was revoked: SESSION still holds the delegator's restricted token, ACCOUNT no longer
-        // has the `delegate` field, CREDENTIALS were wiped on connect and the copilot's own login lives only in the stash
+        // Given a revoked copilot: SESSION still holds the restricted token, ACCOUNT lost `delegate` and the copilot's login lives only in the stash
         const stashedCredentials = {login: 'copilot@expensify.com', autoGeneratedLogin: 'copilotAutoLogin', autoGeneratedPassword: 'copilotAutoPassword'};
         await Onyx.multiSet({
             [ONYXKEYS.SESSION]: {email: 'delegator@expensify.com', accountID: 1, authToken: 'revokedRestrictedToken', authTokenType: CONST.AUTH_TOKEN_TYPES.DELEGATE},

From c023bd535e256b9b1e8d77ec53844cfc3e5411c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Musia=C5=82?= <jan.musial@swmansion.com>
Date: Wed, 14 Oct 2026 15:25:32 +0200
Subject: [PATCH 665/781] mask copilot removel

---
 src/libs/ExportOnyxState/masking.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ExportOnyxState/masking.ts b/src/libs/ExportOnyxState/masking.ts
index 53f75e3dd24d..254a3b68f179 100644
--- a/src/libs/ExportOnyxState/masking.ts
+++ b/src/libs/ExportOnyxState/masking.ts
@@ -495,6 +495,7 @@ const onyxKeysToMaskFragileData = new Set<string>([
     ONYXKEYS.ONYX_UPDATES_FROM_SERVER,
     ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
     ONYXKEYS.PENDING_CONTACT_ACTION,
+    ONYXKEYS.PENDING_SELF_COPILOT_REMOVAL,
     ONYXKEYS.PERSISTED_ONGOING_REQUESTS,
     ONYXKEYS.PERSISTED_REQUESTS,
     ONYXKEYS.PERSONAL_BANK_ACCOUNT,

From 6c86ee76f3860e236b46f415766e79831b6ea857 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 14 Oct 2026 15:43:32 +0200
Subject: [PATCH 666/781] Improve comments and code readability, skip the
 rotation calculation when redundant

---
 src/components/Charts/LineChart/LineChartContent.tsx | 5 +++--
 src/components/Search/SearchChartView.tsx            | 1 +
 src/components/Search/chartGroupByConfig.ts          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index 0f2f46d38c59..a7a73da039fb 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -126,7 +126,8 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
         fontManager,
         fontSize: variables.iconSizeExtraSmall,
         tickSpacing,
-        labelAreaWidth: plotAreaWidth,
+        // Stepped labels never rotate, so a zero width makes this hook return early instead of computing a rotation
+        labelAreaWidth: labelSteps ? 0 : plotAreaWidth,
         firstTickLeftSpace: boundsLeft + domainPadding.left * paddingScale,
         lastTickRightSpace: chartWidth > 0 ? chartWidth - boundsRight + domainPadding.right * paddingScale : 0,
         measurements,
@@ -141,7 +142,6 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
         const pointXs = data.map((_, index) => (data.length > 1 ? firstPointX + (index * (lastPointX - firstPointX)) / (data.length - 1) : (firstPointX + lastPointX) / 2));
         const step = getAxisLabelStep({labelWidths, pointXs, steps: labelSteps, minGap: X_AXIS_LABEL_MIN_GAP});
         return {
-            ...rotatingLabelLayout,
             labelRotation: LABEL_ROTATIONS.HORIZONTAL,
             labelSkipInterval: step,
             truncatedLabelWidths: labelWidths,
@@ -149,6 +149,7 @@ function LineChartContentBody({data, series, isLoading, yAxisUnit, yAxisUnitPosi
             regularLabelMaxWidth: Infinity,
             firstLabelMaxWidth: Infinity,
             lastLabelMaxWidth: Infinity,
+            ellipsisWidth: measurements.ellipsisWidth,
         };
     })();
 
diff --git a/src/components/Search/SearchChartView.tsx b/src/components/Search/SearchChartView.tsx
index 300ab073bc5b..cce52f5be416 100644
--- a/src/components/Search/SearchChartView.tsx
+++ b/src/components/Search/SearchChartView.tsx
@@ -93,6 +93,7 @@ function SearchChartView({
     });
     const points = rows.map((row) => row.point);
 
+    // On narrow layout, a single step spanning the whole axis labels only the first and last points
     const labelSteps = shouldUseNarrowLayout && axisLabelSteps ? [Math.max(1, points.length - 1)] : axisLabelSteps;
 
     const handleItemPress = (dataPoint: ChartDataPoint, index: number) => {
diff --git a/src/components/Search/chartGroupByConfig.ts b/src/components/Search/chartGroupByConfig.ts
index 3dd3c944e5dc..2eed38fd9933 100644
--- a/src/components/Search/chartGroupByConfig.ts
+++ b/src/components/Search/chartGroupByConfig.ts
@@ -29,7 +29,7 @@ type ChartGroupByConfig = {
     /** Returns the line chart axis label, or undefined to fall back to `getShortLabel` */
     getLineChartLabel?: (item: GroupedItem) => string | undefined;
 
-    /** Intervals, in groups, the line chart may label its x-axis at; the smallest one that fits is used */
+    /** Intervals, in groups, the line chart may label its x-axis at. The smallest one that fits is used. */
     axisLabelSteps?: readonly number[];
 
     /** Builds the query fragment appended to the current query to drill into a group's transactions */

From 48dab2c8341563b5ed8c950ed78c9b5bf4b1c5b2 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Wed, 14 Oct 2026 16:00:10 +0200
Subject: [PATCH 667/781] Retry a prefetched 426 without the prefetchKey

---
 src/libs/HttpUtils.ts       | 12 +++++++-
 tests/unit/HttpUtilsTest.ts | 59 +++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index d4ad52b448b9..254a41a14e44 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -84,12 +84,14 @@ function processHTTPRequest<TKey extends OnyxKey>(
     method: RequestType = 'get',
     body: FormData | null = null,
     abortSignal: AbortSignal | undefined = undefined,
+    shouldSkipPrefetch = false,
 ): Promise<Response<TKey>> {
     const startTime = new Date().valueOf();
 
     const command = url.match(APICommandRegex)?.[1];
 
-    const {prefetchKey, prefetchHeaders} = preparePrefetchRequest(command);
+    const {prefetchKey, prefetchHeaders} = shouldSkipPrefetch ? {prefetchKey: undefined, prefetchHeaders: undefined} : preparePrefetchRequest(command);
+    let isPrefetchedResponse = false;
 
     const fetchParams: NonNullable<Parameters<typeof nitroFetch>[1]> = {
         // We hook requests to the same Controller signal, so we can cancel them all at once
@@ -125,6 +127,7 @@ function processHTTPRequest<TKey extends OnyxKey>(
             }
             if (response.headers) {
                 setLoadTestParameters(response.headers.get('X-Load-Test'));
+                isPrefetchedResponse = response.headers.get('nitroPrefetched') === 'true';
             }
 
             // We are calculating the skew to minimize the delay when posting the messages
@@ -240,6 +243,13 @@ function processHTTPRequest<TKey extends OnyxKey>(
                 alert('Too many auth writes', message);
             }
             if (response.jsonCode === CONST.JSON_CODE.UPDATE_REQUIRED) {
+                // A prefetched response can come from a body saved by the previous build, so it carries that build's appversion.
+                // https://github.com/Expensify/App/pull/103842 leaves appversion out of saved bodies, but bodies saved by older builds still have it.
+                // Retry without the prefetchKey, because nitro-fetch can serve the same cached response again for a few seconds.
+                if (isPrefetchedResponse) {
+                    return processHTTPRequest<TKey>(url, method, body, abortSignal, true);
+                }
+
                 // Trigger a modal and disable the app as the user needs to upgrade to the latest minimum version to continue
                 alertUser();
             }
diff --git a/tests/unit/HttpUtilsTest.ts b/tests/unit/HttpUtilsTest.ts
index 0b13894cc75a..ab6d4f2409e6 100644
--- a/tests/unit/HttpUtilsTest.ts
+++ b/tests/unit/HttpUtilsTest.ts
@@ -7,6 +7,28 @@ import Onyx from 'react-native-onyx';
 
 import HttpUtils from '../../src/libs/HttpUtils';
 
+const mockAlertUser = jest.fn<void, []>();
+const mockPreparePrefetchRequest = jest.fn(() => ({prefetchKey: undefined as string | undefined, prefetchHeaders: undefined as Record<string, string> | undefined}));
+
+jest.mock('@libs/actions/UpdateRequired', () => ({
+    alertUser: () => mockAlertUser(),
+}));
+jest.mock('@libs/Prefetch/preparePrefetchRequest', () => ({
+    __esModule: true,
+    default: () => mockPreparePrefetchRequest(),
+}));
+
+const RECONNECT_APP_PREFETCH_KEY = `${WRITE_COMMANDS.RECONNECT_APP}:1`;
+
+function mockUpdateRequiredResponse(isPrefetched: boolean) {
+    return {
+        ok: true,
+        status: 200,
+        headers: {get: (name: string) => (name === 'nitroPrefetched' && isPrefetched ? 'true' : null)},
+        json: () => Promise.resolve({jsonCode: CONST.JSON_CODE.UPDATE_REQUIRED}),
+    };
+}
+
 function mockFetchResponse(message: string, jsonCode: number = CONST.JSON_CODE.EXP_ERROR) {
     global.fetch = jest.fn().mockResolvedValue({
         ok: true,
@@ -24,6 +46,8 @@ beforeAll(() => {
 
 afterEach(() => {
     jest.restoreAllMocks();
+    mockAlertUser.mockClear();
+    mockPreparePrefetchRequest.mockClear();
 });
 
 describe('HttpUtils', () => {
@@ -67,4 +91,39 @@ describe('HttpUtils', () => {
             title: CONST.ERROR_TITLE.DUPLICATE_RECORD,
         });
     });
+
+    it('retries a prefetched 426 without the prefetchKey instead of showing Update Required', async () => {
+        // Given a startup prefetch that was sent with a body saved by the previous build, so the server answered 426,
+        // and a fresh request that the server accepts
+        mockPreparePrefetchRequest.mockReturnValueOnce({prefetchKey: RECONNECT_APP_PREFETCH_KEY, prefetchHeaders: {prefetchKey: RECONNECT_APP_PREFETCH_KEY}});
+        const responses = [mockUpdateRequiredResponse(true), {ok: true, status: 200, headers: {get: () => null}, json: () => Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS})}];
+        const requestHeaders: Array<HeadersInit | undefined> = [];
+        global.fetch = jest.fn().mockImplementation((_url: string, init: RequestInit) => {
+            requestHeaders.push(init.headers);
+            return Promise.resolve(responses.shift());
+        });
+
+        // When the new build sends ReconnectApp and gets the prefetched 426
+        const response = await HttpUtils.xhr(WRITE_COMMANDS.RECONNECT_APP, {});
+
+        // Then the request is sent again without the prefetchKey, so nitro-fetch can't serve the stale cached 426,
+        // and the app isn't blocked because the server accepted the current build
+        expect(requestHeaders).toEqual([{prefetchKey: RECONNECT_APP_PREFETCH_KEY}, undefined]);
+        expect(mockAlertUser).not.toHaveBeenCalled();
+        expect(response).toMatchObject({jsonCode: CONST.JSON_CODE.SUCCESS});
+    });
+
+    it('shows Update Required when the retry of a prefetched 426 also gets a 426', async () => {
+        // Given the installed build itself is below the server's minimum version, so both the prefetch and the retry get a 426
+        mockPreparePrefetchRequest.mockReturnValueOnce({prefetchKey: RECONNECT_APP_PREFETCH_KEY, prefetchHeaders: {prefetchKey: RECONNECT_APP_PREFETCH_KEY}});
+        const fetchMock = jest.fn().mockResolvedValueOnce(mockUpdateRequiredResponse(true)).mockResolvedValueOnce(mockUpdateRequiredResponse(false));
+        global.fetch = fetchMock;
+
+        // When ReconnectApp is sent
+        await HttpUtils.xhr(WRITE_COMMANDS.RECONNECT_APP, {});
+
+        // Then it is retried only once, because the second 426 came from the server, and the user is asked to update
+        expect(fetchMock).toHaveBeenCalledTimes(2);
+        expect(mockAlertUser).toHaveBeenCalledTimes(1);
+    });
 });

From 1b8f2cae7fb49d0c4867b58eeee2bd2627260f2c Mon Sep 17 00:00:00 2001
From: X Developer <ex.dev.work@gmail.com>
Date: Wed, 14 Oct 2026 16:07:22 +0200
Subject: [PATCH 668/781] Prevent receipt label from being selected

---
 src/components/ReceiptAudit.tsx          |  9 +++++-
 tests/ui/components/ReceiptAuditTest.tsx | 35 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/components/ReceiptAuditTest.tsx

diff --git a/src/components/ReceiptAudit.tsx b/src/components/ReceiptAudit.tsx
index 65ba7d02f18f..f0a3750ddf8a 100644
--- a/src/components/ReceiptAudit.tsx
+++ b/src/components/ReceiptAudit.tsx
@@ -3,6 +3,8 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import CONST from '@src/CONST';
+
 import React from 'react';
 import {View} from 'react-native';
 
@@ -40,7 +42,12 @@ function ReceiptAudit({notes, shouldShowAuditResult, hasReceiptUploadError = fal
     return (
         <View style={[styles.ph5, styles.mbn1]}>
             <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.textLabelSupporting]}>{translate('common.receipt')}</Text>
+                <Text
+                    style={[styles.textLabelSupporting, styles.userSelectNone]}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                >
+                    {translate('common.receipt')}
+                </Text>
                 {!!auditText && (
                     <>
                         <Text style={[styles.textLabelSupporting]}>{` • ${auditText}`}</Text>
diff --git a/tests/ui/components/ReceiptAuditTest.tsx b/tests/ui/components/ReceiptAuditTest.tsx
new file mode 100644
index 000000000000..65abce7b733c
--- /dev/null
+++ b/tests/ui/components/ReceiptAuditTest.tsx
@@ -0,0 +1,35 @@
+import {render, screen} from '@testing-library/react-native';
+
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import ReceiptAudit from '@components/ReceiptAudit';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+import {translateLocal} from '../../utils/TestHelper';
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: jest.fn(() => ({})),
+}));
+
+describe('ReceiptAudit', () => {
+    it('excludes the receipt label from browser and scraper selection', () => {
+        // Given a receipt audit label in an expense details row
+
+        // When the receipt audit is rendered
+        render(
+            <LocaleContextProvider>
+                <ReceiptAudit
+                    notes={[]}
+                    shouldShowAuditResult={false}
+                />
+            </LocaleContextProvider>,
+        );
+
+        // Then the label cannot be selected by the browser or included by SelectionScraper
+        const receiptLabel = screen.getByText(translateLocal('common.receipt'));
+        expect(receiptLabel).toHaveStyle({userSelect: 'none'});
+        expect(receiptLabel).toHaveProp('dataSet', {[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true});
+    });
+});

From d1f73febe9da546702146c10a773fe7f72b4a8bc Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 16:10:05 +0200
Subject: [PATCH 669/781] fix: show the question above a lone dynamic form
 field on a titled page

---
 contributingGuides/DYNAMIC_FORMS.md           |  2 +-
 .../DynamicForm/renderers/choiceRenderers.tsx |  9 ++++---
 .../DynamicForm/renderers/listRenderer.tsx    |  4 ++--
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 24 +++++++++++++++----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/contributingGuides/DYNAMIC_FORMS.md b/contributingGuides/DYNAMIC_FORMS.md
index fe606a2be608..6c76f5b8cbb0 100644
--- a/contributingGuides/DYNAMIC_FORMS.md
+++ b/contributingGuides/DYNAMIC_FORMS.md
@@ -102,7 +102,7 @@ Every type also takes:
 - `showWhen`: shown only while another answer is one of the listed values. A list answer counts when any chosen value matches. A field whose controlling field is hidden stays hidden.
 - `refreshOnChange`: see `onRefreshRequirements` above
 
-A choice or list field that is the only question on its page is drawn as the page itself, as an inline list, and the page title asks the question in place of its label. Fields it reveals, such as an "Other" description, do not count, so the layout stays put when they appear. On a page with several questions, every choice, tabs included, shows its question above it.
+A choice or list field that is the only question on its page is drawn as the page itself, as an inline list, with its question above it. A page without its own title takes the question as its title, so the label is not repeated below it. Fields it reveals, such as an "Other" description, do not count, so the layout stays put when they appear. On a page with several questions, every choice, tabs included, shows its question above it.
 
 `maxFileSize` comes from the field when the schema sets it, else from the `maxFileSize` the screen passes. With neither, files of any size are taken.
 
diff --git a/src/components/DynamicForm/renderers/choiceRenderers.tsx b/src/components/DynamicForm/renderers/choiceRenderers.tsx
index 757b60eef3f3..c793f86b85a9 100644
--- a/src/components/DynamicForm/renderers/choiceRenderers.tsx
+++ b/src/components/DynamicForm/renderers/choiceRenderers.tsx
@@ -29,7 +29,7 @@ function getChoiceOptionsList(choices: Choice[]): Record<string, string> {
     return Object.fromEntries(choices.map((choice) => [choice.value, choice.label]));
 }
 
-/** A lone choice field is the page itself: its options are listed inline, and the page title asks the question */
+/** A lone choice field is the page itself: its options are listed inline under its question, which a page without its own title shows as its title instead */
 function renderInlineChoice(
     label: string,
     choices: Choice[],
@@ -39,6 +39,7 @@ function renderInlineChoice(
     const listProps = {items: choices, isSearchable, searchInputLabel: label};
     return {
         isMenuRow: true,
+        labelAbove: 'heading',
         input: (
             <InputWrapper
                 InputComponent={InlineSelectionListAdapter}
@@ -54,7 +55,7 @@ function renderInlineChoice(
 function renderTabs(label: string, choices: Choice[], inputProps: DynamicFieldInputProps<string>, isLoneField: boolean): DynamicFieldInput {
     return {
         isMenuRow: false,
-        labelAbove: isLoneField ? undefined : 'prompt',
+        labelAbove: isLoneField ? 'heading' : 'prompt',
         input: (
             <InputWrapper
                 InputComponent={TabsAdapter}
@@ -136,7 +137,7 @@ const CHOICE_RENDERERS: Pick<DynamicFieldRendererMap, 'select' | 'radio' | 'mult
         }
         return {
             isMenuRow: true,
-            labelAbove: isLoneField ? undefined : 'prompt',
+            labelAbove: isLoneField ? 'heading' : 'prompt',
             input: (
                 <InputWrapper
                     InputComponent={RadioButtons}
@@ -169,6 +170,7 @@ const CHOICE_RENDERERS: Pick<DynamicFieldRendererMap, 'select' | 'radio' | 'mult
         if (isLoneField) {
             return {
                 isMenuRow: true,
+                labelAbove: 'heading',
                 input: (
                     <InputWrapper
                         InputComponent={CurrencyInlineListAdapter}
@@ -192,6 +194,7 @@ const CHOICE_RENDERERS: Pick<DynamicFieldRendererMap, 'select' | 'radio' | 'mult
         if (isLoneField) {
             return {
                 isMenuRow: true,
+                labelAbove: 'heading',
                 input: (
                     <InputWrapper
                         InputComponent={YesNoAdapter}
diff --git a/src/components/DynamicForm/renderers/listRenderer.tsx b/src/components/DynamicForm/renderers/listRenderer.tsx
index 902c7a84bdc3..75443c3d0cce 100644
--- a/src/components/DynamicForm/renderers/listRenderer.tsx
+++ b/src/components/DynamicForm/renderers/listRenderer.tsx
@@ -11,13 +11,13 @@ import React from 'react';
 
 import type {DynamicFieldRenderer} from './types';
 
-const renderList: DynamicFieldRenderer<'list'> = (field, {translate, isLoneField, values, onOpenListItemEditor, onListItemsChange, renderFields}, inputProps) => {
+const renderList: DynamicFieldRenderer<'list'> = (field, {translate, values, onOpenListItemEditor, onListItemsChange, renderFields}, inputProps) => {
     const itemLabel = getLocalizedText(translate, field.itemLabelKey, field.itemLabel);
     // A sensitive list is not drafted, so inside the flow its entries come from memory, which the editor page and a removal both update
     const isMemoryList = !!onOpenListItemEditor && isSensitiveField(field);
     return {
         isMenuRow: true,
-        labelAbove: isLoneField ? undefined : 'heading',
+        labelAbove: 'heading',
         input: (
             <InputWrapper
                 InputComponent={ListFieldAdapter}
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index 755eca38bfca..42e5e311d9f8 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -90,9 +90,10 @@ type RenderFieldsOptions = {
     currency?: string;
     maxFileSize?: number;
     onRefreshRequirements?: (inputID: string, value: unknown) => void;
+    isTitledByPage?: boolean;
 };
 
-function renderFields(content: DynamicFormContentItem[], values: DynamicFormValues = {}, {currency, maxFileSize, onRefreshRequirements}: RenderFieldsOptions = {}) {
+function renderFields(content: DynamicFormContentItem[], values: DynamicFormValues = {}, {currency, maxFileSize, onRefreshRequirements, isTitledByPage}: RenderFieldsOptions = {}) {
     mockInputWrapper.mockClear();
     render(
         <DynamicFormFields
@@ -101,6 +102,7 @@ function renderFields(content: DynamicFormContentItem[], values: DynamicFormValu
             currency={currency}
             maxFileSize={maxFileSize}
             onRefreshRequirements={onRefreshRequirements}
+            isTitledByPage={isTitledByPage}
         />,
     );
     return new Map(mockInputWrapper.mock.calls.map(([props]) => [props.inputID, props]));
@@ -600,11 +602,11 @@ describe('DynamicFormFields', () => {
         ['countryMultiselect', InlineSelectionListAdapter, {canSelectMultiple: true, valueType: 'stringList', isSearchable: true}],
         ['currency', CurrencyInlineListAdapter, {}],
     ] as const)('draws a %s field alone on its page as the page itself', (type, ExpectedInput, expectedProps) => {
-        // Given the only question on the page
+        // Given the only question on a page without its own title, so the page is titled after the question
         const field: DynamicFormField = {key: 'answer', label: 'The question', type, required: true};
 
         // When it renders
-        const rendered = renderFields([field]);
+        const rendered = renderFields([field], {}, {isTitledByPage: true});
 
         // Then the choice is drawn as the page itself, keeping its kind of answer, and the label is left to the page title instead of repeating it
         expect(rendered.get('answer')?.InputComponent).toBe(ExpectedInput);
@@ -612,6 +614,18 @@ describe('DynamicFormFields', () => {
         expect(screen.queryByText('The question')).not.toBeOnTheScreen();
     });
 
+    it.each(['select', 'multiselect', 'country', 'currency', 'boolean', 'radio', 'list'] as const)('shows the question above a lone %s field on a page with its own title', (type) => {
+        // Given the only question on a page whose own title, such as "Ownership", does not ask it
+        const field: DynamicFormField =
+            type === 'list' ? {key: 'answer', label: 'The question', type, required: true, itemFields: []} : {key: 'answer', label: 'The question', type, required: true};
+
+        // When it renders
+        renderFields([field]);
+
+        // Then the question is drawn as a heading above the answers, since nothing else on the page says what they answer
+        expect(screen.getByRole(CONST.ROLE.HEADING, {name: 'The question'})).toBeOnTheScreen();
+    });
+
     it('keeps a lone list as the page when it reveals a follow-up field', () => {
         // Given a source of wealth list whose "Other" answer reveals a description field
         const sourceOfWealth: DynamicFormField = {key: 'sourceOfWealth', type: 'select', required: true, values: [{key: 'SAVINGS'}, {key: 'OTHER'}]};
@@ -656,8 +670,8 @@ describe('DynamicFormFields', () => {
         };
         const companyName: DynamicFormField = {key: 'companyName', type: 'text', required: true, showWhen: {key: 'legalType', equals: ['BUSINESS']}};
 
-        // When it renders for a business recipient
-        const rendered = renderFields([legalType, companyName], {legalType: 'BUSINESS'});
+        // When it renders for a business recipient on a page without its own title
+        const rendered = renderFields([legalType, companyName], {legalType: 'BUSINESS'}, {isTitledByPage: true});
 
         // Then it is still a tab row rather than an inline list, since the schema asked for tabs, and the question is left to the page title
         expect(rendered.get('legalType')?.InputComponent).toBe(TabsAdapter);

From 4cedb0a19a0bbe6c9d0f3b766c9e34d3e250bc1b Mon Sep 17 00:00:00 2001
From: "cretadn22 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 14:14:26 +0000
Subject: [PATCH 670/781] Clear the Enable Global Reimbursement draft after
 success

The draft is shared across bank accounts, so values entered for one bank
account were prefilled when enabling Global Reimbursement for another.

Co-authored-by: cretadn22 <cretadn22@users.noreply.github.com>
---
 src/libs/actions/BankAccounts.ts  |  7 ++++-
 tests/actions/BankAccountsTest.ts | 45 ++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
index eed2dbb908e2..494cdb77db86 100644
--- a/src/libs/actions/BankAccounts.ts
+++ b/src/libs/actions/BankAccounts.ts
@@ -1242,7 +1242,7 @@ function sendReminderForCorpaySignerInformation(parameters: SendReminderForCorpa
 }
 
 function enableGlobalReimbursementsForUSDBankAccount(parameters: EnableGlobalReimbursementsForUSDBankAccountParams) {
-    const onyxData: OnyxData<typeof ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS> = {
+    const onyxData: OnyxData<typeof ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS | typeof ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT> = {
         optimisticData: [
             {
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -1262,6 +1262,11 @@ function enableGlobalReimbursementsForUSDBankAccount(parameters: EnableGlobalRei
                     isSuccess: true,
                 },
             },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT,
+                value: null,
+            },
         ],
         failureData: [
             {
diff --git a/tests/actions/BankAccountsTest.ts b/tests/actions/BankAccountsTest.ts
index f8b9d5a43dc8..37cb3529d727 100644
--- a/tests/actions/BankAccountsTest.ts
+++ b/tests/actions/BankAccountsTest.ts
@@ -1,4 +1,11 @@
-import {clearPersonalBankAccount, connectBankAccountWithPlaid, initiateBankAccountUnlock, openPersonalBankAccountSetupView, updateBankAccountName} from '@libs/actions/BankAccounts';
+import {
+    clearPersonalBankAccount,
+    connectBankAccountWithPlaid,
+    enableGlobalReimbursementsForUSDBankAccount,
+    initiateBankAccountUnlock,
+    openPersonalBankAccountSetupView,
+    updateBankAccountName,
+} from '@libs/actions/BankAccounts';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -328,6 +335,42 @@ describe('actions/BankAccounts', () => {
         });
     });
 
+    describe('enableGlobalReimbursementsForUSDBankAccount', () => {
+        test('clears the form draft after success so the next bank account does not reuse its values', async () => {
+            // Given a draft filled in while enabling Global Reimbursement for the first bank account
+            await Onyx.set(ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT, {
+                businessRegistrationIncorporationNumber: '123456789',
+                natureOfBusiness: 'retail',
+            });
+
+            // When the request succeeds
+            enableGlobalReimbursementsForUSDBankAccount({inputs: '{}', bankAccountID: 1234});
+            await waitForBatchedUpdates();
+
+            // Then the draft is cleared and the form reports success
+            TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.ENABLE_GLOBAL_REIMBURSEMENTS_FOR_USD_BANK_ACCOUNT, 1);
+            expect(await getOnyxValue(ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT)).toBeUndefined();
+            const form = await getOnyxValue(ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS);
+            expect(form?.isSuccess).toBe(true);
+        });
+
+        test('keeps the form draft when the request fails so the user can retry', async () => {
+            // Given a draft filled in for a bank account
+            await Onyx.set(ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT, {
+                businessRegistrationIncorporationNumber: '123456789',
+            });
+            mockFetch.fail?.();
+
+            // When the request fails
+            enableGlobalReimbursementsForUSDBankAccount({inputs: '{}', bankAccountID: 1234});
+            await waitForBatchedUpdates();
+
+            // Then the draft is kept
+            const draft = await getOnyxValue(ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS_DRAFT);
+            expect(draft?.businessRegistrationIncorporationNumber).toBe('123456789');
+        });
+    });
+
     describe('initiateBankAccountUnlock', () => {
         test('clears both pendingAction and isOptimisticAction on the Concierge unlock message after success', async () => {
             // Given an optimistic Concierge unlock message, as written when the user presses a locked bank account

From db6466092de13c1eb357fe7ebe6eb08666a926d1 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 16:19:00 +0200
Subject: [PATCH 671/781] fix: ask dynamic form booleans as Yes/No unless the
 schema asks for a checkbox

---
 contributingGuides/DYNAMIC_FORMS.md           |  2 +-
 .../DynamicForm/renderers/choiceRenderers.tsx |  4 ++--
 .../utils/getDynamicFieldErrors.ts            |  7 +++---
 src/stories/DynamicForm.stories.tsx           |  4 ++--
 src/types/onyx/DynamicFormField.ts            |  5 +++-
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 18 +++++++-------
 .../DynamicForm/getDynamicFieldErrorsTest.ts  | 24 ++++++++++---------
 7 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/contributingGuides/DYNAMIC_FORMS.md b/contributingGuides/DYNAMIC_FORMS.md
index 6c76f5b8cbb0..633b9484cba4 100644
--- a/contributingGuides/DYNAMIC_FORMS.md
+++ b/contributingGuides/DYNAMIC_FORMS.md
@@ -82,7 +82,7 @@ A page is shown while its own `showWhen` matches and it has a visible field; a p
 | `radio`              | `RadioButtons`                                                                                                                            | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
 | `multiselect`        | `PushRowWithModal` with checkboxes and a Save button                                                                                      | `values`, `dependsOn`                                                                                 |
 | `date`               | `DatePicker`                                                                                                                              | `rule: 'dateOfBirth'`                                                                                 |
-| `boolean`            | `CheckboxWithLabel`, which must be ticked when required. Alone on its page, Yes and No radio buttons, where No is an answer.              |                                                                                                       |
+| `boolean`            | Yes and No radio buttons, where No is an answer. With `presentation: 'checkbox'`, `CheckboxWithLabel`, which must be ticked when required. | `presentation: 'checkbox'`                                                                            |
 | `country`            | `CountryPicker`                                                                                                                           |                                                                                                       |
 | `countryMultiselect` | `PushRowWithModal` with every country                                                                                                     |                                                                                                       |
 | `currency`           | `CurrencyPicker`                                                                                                                          |                                                                                                       |
diff --git a/src/components/DynamicForm/renderers/choiceRenderers.tsx b/src/components/DynamicForm/renderers/choiceRenderers.tsx
index c793f86b85a9..f695779917dd 100644
--- a/src/components/DynamicForm/renderers/choiceRenderers.tsx
+++ b/src/components/DynamicForm/renderers/choiceRenderers.tsx
@@ -191,10 +191,10 @@ const CHOICE_RENDERERS: Pick<DynamicFieldRendererMap, 'select' | 'radio' | 'mult
         };
     },
     boolean: (field, {translate, isLoneField}, inputProps) => {
-        if (isLoneField) {
+        if (field.presentation !== 'checkbox') {
             return {
                 isMenuRow: true,
-                labelAbove: 'heading',
+                labelAbove: isLoneField ? 'heading' : 'prompt',
                 input: (
                     <InputWrapper
                         InputComponent={YesNoAdapter}
diff --git a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
index ba2fc6cc5362..83de65e1e972 100644
--- a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
+++ b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
@@ -27,7 +27,7 @@ import type {
 
 import getAddressInputKeys, {getAddressCountry, isStateAsked} from './getAddressInputKeys';
 import getFieldOptions from './getFieldOptions';
-import getVisibleFields, {getLoneField} from './getVisibleFields';
+import getVisibleFields from './getVisibleFields';
 import isSupportedField from './isSupportedField';
 import {getListItems, getListItemSensitiveAnswers} from './listItems';
 import logSchemaProblem from './logSchemaProblem';
@@ -215,12 +215,11 @@ function validateField<TType extends DynamicFormFieldType>(field: DynamicFormFie
 
 /**
  * Errors for the fields the user can see, keyed by draft key, in the shape FormProvider's `validate` returns.
- * `fields` must be exactly one page's fields, since the lone-field check has to match what the page renders. Pass the whole form as `allFields` when a `showWhen` can name a field on another page.
+ * Pass the whole form as `allFields` when a `showWhen` can name a field on another page.
  */
 function getDynamicFieldErrors(fields: DynamicFormSchemaField[], values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): Record<string, string> {
     const errors: Record<string, string> = {};
     const visibleFields = getVisibleFields(fields.filter(isSupportedField), values, allFields);
-    const loneField = getLoneField(visibleFields);
     for (const field of visibleFields) {
         if (field.readonly) {
             continue;
@@ -230,7 +229,7 @@ function getDynamicFieldErrors(fields: DynamicFormSchemaField[], values: Dynamic
                 addErrorMessage(errors, inputID, message);
             }
         }
-        if (!isAnswered(values[field.key], field.type === 'boolean' && field === loneField)) {
+        if (!isAnswered(values[field.key], field.type === 'boolean' && field.presentation !== 'checkbox')) {
             if (field.type === 'address' ? isAddressRequired(field, values) : field.required) {
                 addErrorMessage(errors, field.key, translate('common.error.fieldRequired'));
             }
diff --git a/src/stories/DynamicForm.stories.tsx b/src/stories/DynamicForm.stories.tsx
index d53185322027..57dcfc257c9a 100644
--- a/src/stories/DynamicForm.stories.tsx
+++ b/src/stories/DynamicForm.stories.tsx
@@ -131,7 +131,7 @@ const originalBankAccountFields: GroupedField[] = [
             {key: 'TRANSFER_WITHIN_COMPANY_OR_GROUP', label: 'Transfers within the company or group'},
         ],
     },
-    {key: 'isSourceOfFund', label: 'This source funds the account', group: 'Account holder details', type: 'boolean', required: false},
+    {key: 'isSourceOfFund', label: 'This source funds the account', group: 'Account holder details', type: 'boolean', required: false, presentation: 'checkbox'},
 ];
 
 const accountDetails: GroupedField[] = [
@@ -200,7 +200,7 @@ const accountHolder: GroupedField[] = [
     {key: 'address', label: 'Address', group: 'Account holder', type: 'address', required: true, rule: 'zipCode'},
     {key: 'operatingCountries', label: 'Countries you operate in', group: 'Account holder', type: 'countryMultiselect', required: true},
     {key: 'ownershipPercentage', label: 'Your ownership percentage', group: 'Account holder', type: 'percent', required: true},
-    {key: 'acceptTerms', label: 'I confirm the details above are correct', group: 'Account holder', type: 'boolean', required: true},
+    {key: 'acceptTerms', label: 'I confirm the details above are correct', group: 'Account holder', type: 'boolean', required: true, presentation: 'checkbox'},
 ];
 
 const businessInfo: GroupedField[] = [
diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index a23986ed6900..0a5fa5257b05 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -143,9 +143,12 @@ type DynamicFormCountryField = DynamicFormFieldBase & {
     type: 'country' | 'countryMultiselect';
 };
 
-/** A Yes/No question when it is the only question on its page, where No is an answer too. Among other fields, a checkbox that must be ticked when required. */
+/** A Yes/No question, where No is an answer too, or a checkbox that must be ticked when required */
 type DynamicFormBooleanField = DynamicFormFieldBase & {
     type: 'boolean';
+
+    /** `yesNo`, the default, asks a question that No answers. `checkbox` asks for consent, such as accepting terms, which only a tick gives. */
+    presentation?: 'yesNo' | 'checkbox';
 };
 
 /** Repeated entries, such as a company's owners, each answered with its own fields on an editor page */
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index 42e5e311d9f8..ce78ca052cec 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -117,7 +117,7 @@ const EXPECTED_INPUT_BY_TYPE: Record<DynamicFormFieldType, ComponentType<never>>
     select: ValuePicker,
     radio: RadioButtons,
     date: DatePicker,
-    boolean: CheckboxWithLabel,
+    boolean: YesNoAdapter,
     country: CountryPicker,
     currency: CurrencyPicker,
     address: AddressSearch,
@@ -694,18 +694,20 @@ describe('DynamicFormFields', () => {
         expect(lonePage.get('hasOtherOwners')?.accessibilityLabel).toBe('Does anyone else own 25% or more?');
     });
 
-    it('asks a lone boolean as Yes/No, and a boolean among other fields as a checkbox', () => {
-        // Given a consent boolean next to another question, and a boolean alone on its page
-        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true};
-        const isUSCitizen: DynamicFormField = {key: 'isUSCitizen', type: 'boolean', required: true};
+    it('asks a boolean as Yes/No wherever it sits, and as a checkbox only when the schema asks for one', () => {
+        // Given a question next to another field, the same question alone on its page, and a consent checkbox
+        const ownsQuarter: DynamicFormField = {key: 'ownsQuarter', label: 'Do you own 25% or more?', type: 'boolean', required: true};
+        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true, presentation: 'checkbox'};
 
         // When each renders
+        const sharedPage = renderFields([ownsQuarter, otherQuestion]);
+        const lonePage = renderFields([ownsQuarter]);
         const consent = renderFields([acceptTerms, otherQuestion]);
-        const question = renderFields([isUSCitizen]);
 
-        // Then the consent is a checkbox the user must tick, and the lone question offers No as an answer
+        // Then the question offers No as an answer on both pages, since how the fields are grouped into pages must not change what it asks, while the consent is a checkbox to tick
+        expect(sharedPage.get('ownsQuarter')?.InputComponent).toBe(YesNoAdapter);
+        expect(lonePage.get('ownsQuarter')?.InputComponent).toBe(YesNoAdapter);
         expect(consent.get('acceptTerms')?.InputComponent).toBe(CheckboxWithLabel);
-        expect(question.get('isUSCitizen')?.InputComponent).toBe(YesNoAdapter);
     });
 
     it('asks for the state only in countries the state picker covers', () => {
diff --git a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
index d2ea0e75f030..e53d2bbeaeaf 100644
--- a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
+++ b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
@@ -49,7 +49,7 @@ describe('getDynamicFieldErrors', () => {
 
     it('treats an unchecked checkbox as unanswered', () => {
         // Given a required consent checkbox left unchecked, next to another question
-        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true};
+        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true, presentation: 'checkbox'};
         const companyName: DynamicFormField = {key: 'companyName', type: 'text', required: false};
 
         // When the form is validated
@@ -354,20 +354,22 @@ describe('getDynamicFieldErrors', () => {
         expect(incompleteErrors).toEqual({phone: translateLocal('common.error.phoneNumber')});
     });
 
-    it('accepts No as the answer to a lone boolean, but not to a checkbox among other fields', () => {
-        // Given a required boolean alone on its page, asked as Yes/No, and a required checkbox next to another question
-        const hasOtherOwners: DynamicFormField = {key: 'hasOtherOwners', type: 'boolean', required: true};
-        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true};
+    it('accepts No as the answer to a Yes/No question wherever it sits, but not to a consent checkbox', () => {
+        // Given a required Yes/No question and a required consent checkbox, sharing a page with another question
+        const ownsQuarter: DynamicFormField = {key: 'ownsQuarter', type: 'boolean', required: true};
+        const acceptTerms: DynamicFormField = {key: 'acceptTerms', type: 'boolean', required: true, presentation: 'checkbox'};
         const fullName: DynamicFormField = {key: 'fullName', type: 'text', required: false};
 
-        // When the question is answered No or not at all, and the checkbox is left empty
-        const noErrors = getDynamicFieldErrors([hasOtherOwners], {hasOtherOwners: false}, translateLocal);
-        const unansweredErrors = getDynamicFieldErrors([hasOtherOwners], {hasOtherOwners: ''}, translateLocal);
+        // When the question is answered No, alone and among other fields, or not at all, and the checkbox is left empty
+        const loneNoErrors = getDynamicFieldErrors([ownsQuarter], {ownsQuarter: false}, translateLocal);
+        const sharedNoErrors = getDynamicFieldErrors([ownsQuarter, fullName], {ownsQuarter: false}, translateLocal);
+        const unansweredErrors = getDynamicFieldErrors([ownsQuarter, fullName], {ownsQuarter: ''}, translateLocal);
         const consentErrors = getDynamicFieldErrors([acceptTerms, fullName], {acceptTerms: false}, translateLocal);
 
-        // Then No answers the question, while an unanswered question and an empty checkbox are flagged
-        expect(noErrors).toEqual({});
-        expect(unansweredErrors).toEqual({hasOtherOwners: translateLocal('common.error.fieldRequired')});
+        // Then No answers the question however the page is grouped, while an unanswered question and an empty checkbox are flagged
+        expect(loneNoErrors).toEqual({});
+        expect(sharedNoErrors).toEqual({});
+        expect(unansweredErrors).toEqual({ownsQuarter: translateLocal('common.error.fieldRequired')});
         expect(consentErrors).toEqual({acceptTerms: translateLocal('common.error.fieldRequired')});
     });
 

From e444b98f1cde67e818750d7b14955c1fe3e498f5 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 16:36:03 +0200
Subject: [PATCH 672/781] fix: stop naming untitled dynamic form pages after
 their first field

---
 contributingGuides/DYNAMIC_FORMS.md           |  5 +-
 .../components/DynamicFormFields.tsx          |  8 +--
 .../components/DynamicFormFieldsPage.tsx      |  2 +-
 .../components/DynamicFormShell.tsx           |  2 +-
 src/components/DynamicForm/index.tsx          |  5 +-
 .../DynamicForm/utils/getConfirmationItems.ts |  4 +-
 .../DynamicForm/utils/getPageTitle.ts         | 21 +++++--
 src/stories/DynamicForm.stories.tsx           | 23 ++++----
 src/types/onyx/DynamicFormField.ts            |  5 ++
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 10 ++--
 .../DynamicForm/DynamicFormFlowTest.tsx       | 18 +++---
 .../DynamicForm/getConfirmationItemsTest.ts   | 20 +++++++
 .../components/DynamicForm/paginateTest.ts    | 57 +++++++++++++++++--
 13 files changed, 135 insertions(+), 45 deletions(-)

diff --git a/contributingGuides/DYNAMIC_FORMS.md b/contributingGuides/DYNAMIC_FORMS.md
index 633b9484cba4..22e4d41c1b24 100644
--- a/contributingGuides/DYNAMIC_FORMS.md
+++ b/contributingGuides/DYNAMIC_FORMS.md
@@ -68,7 +68,7 @@ When the schema is a flat `{fields}` list, the App builds the pages:
 - Other fields share a page, up to 4 in a row.
 - A field with `showWhen` joins the page of its controller and does not count toward that limit.
 
-A page is shown while its own `showWhen` matches and it has a visible field; a page that is not shown is skipped, and its fields are neither asked nor submitted. A page without a title is named after its only question, else after its first visible field. Page keys become route segments, so they are made URL-safe and unique, and `confirm` is reserved for the confirmation page.
+A page is shown while its own `showWhen` matches and it has a visible field; a page that is not shown is skipped, and its fields are neither asked nor submitted. A page without a title is headed by its only question: the field's `question` or `questionKey` when it has one, else its label. An untitled page with several questions has no headline and no section name on the confirmation page, since no one question names it. A label never names a confirmation section, since the label is already on the row below it. Page keys become route segments, so they are made URL-safe and unique, and `confirm` is reserved for the confirmation page.
 
 ## The field format
 
@@ -96,13 +96,14 @@ Every type also takes:
 
 - `key`: unique within the form, and the field's draft key. A field without one is left out and logged.
 - `label` or `labelKey`, and the same pair for `description`. A `*Key` is our translation and wins over the server's wording.
+- `question` or `questionKey`: the headline of an untitled page where this is the only question, such as "What's your account number?". Without one, that page is headed by the label, which a text input then repeats.
 - `required`. An optional address the user has started filling in is checked like a required one, so it is never sent in part.
 - `readonly`: shown as a row with its value, never edited or validated
 - `sensitive`: kept out of the form draft, see below
 - `showWhen`: shown only while another answer is one of the listed values. A list answer counts when any chosen value matches. A field whose controlling field is hidden stays hidden.
 - `refreshOnChange`: see `onRefreshRequirements` above
 
-A choice or list field that is the only question on its page is drawn as the page itself, as an inline list, with its question above it. A page without its own title takes the question as its title, so the label is not repeated below it. Fields it reveals, such as an "Other" description, do not count, so the layout stays put when they appear. On a page with several questions, every choice, tabs included, shows its question above it.
+A choice or list field that is the only question on its page is drawn as the page itself, as an inline list, with its question above it. A page without its own title takes the question as its headline, so the label is not repeated below it. Fields it reveals, such as an "Other" description, do not count, so the layout stays put when they appear. On a page with several questions, every choice, tabs included, shows its question above it.
 
 `maxFileSize` comes from the field when the schema sets it, else from the `maxFileSize` the screen passes. With neither, files of any size are taken.
 
diff --git a/src/components/DynamicForm/components/DynamicFormFields.tsx b/src/components/DynamicForm/components/DynamicFormFields.tsx
index 2a68e053ef34..eda8ab6f3789 100644
--- a/src/components/DynamicForm/components/DynamicFormFields.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFields.tsx
@@ -22,8 +22,8 @@ type DynamicFormFieldsProps = {
     /** The whole form when `content` is one page of it, since a field's `showWhen` can name a controller on another page */
     allFields?: DynamicFormField[];
 
-    /** The page's title is that question's label, so the label is not drawn again above its input. False when the page has its own title, since the label then still says what the inputs are for. */
-    isTitledByPage?: boolean;
+    /** The page's headline comes from its lone question, so that question's label is not drawn again above its input. False when the page has its own title, since the label then still says what the inputs are for. */
+    isLoneFieldInHeadline?: boolean;
 
     /** Currency of amount fields that let the user pick none */
     currency?: string;
@@ -49,7 +49,7 @@ function DynamicFormFields({
     content,
     values,
     allFields,
-    isTitledByPage = false,
+    isLoneFieldInHeadline = false,
     currency = CONST.CURRENCY.USD,
     maxFileSize,
     onRefreshRequirements,
@@ -85,7 +85,7 @@ function DynamicFormFields({
                 currency={currency}
                 maxFileSize={maxFileSize}
                 isLoneField={item === loneField}
-                shouldHideLabel={isTitledByPage && item === loneField}
+                shouldHideLabel={isLoneFieldInHeadline && item === loneField}
                 onRefreshRequirements={onRefreshRequirements}
                 onOpenListItemEditor={onOpenListItemEditor}
                 onListItemsChange={onListItemsChange}
diff --git a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
index 0c9db40f63e6..84db6032af4b 100644
--- a/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
+++ b/src/components/DynamicForm/components/DynamicFormFieldsPage.tsx
@@ -82,7 +82,7 @@ function DynamicFormFieldsPage({
                         <DynamicFormFields
                             content={page.content}
                             allFields={allFields}
-                            isTitledByPage={!hasOwnTitle}
+                            isLoneFieldInHeadline={!hasOwnTitle}
                             values={currentValues}
                             currency={currency}
                             maxFileSize={maxFileSize}
diff --git a/src/components/DynamicForm/components/DynamicFormShell.tsx b/src/components/DynamicForm/components/DynamicFormShell.tsx
index 354d5e6ba38f..176ceac06c93 100644
--- a/src/components/DynamicForm/components/DynamicFormShell.tsx
+++ b/src/components/DynamicForm/components/DynamicFormShell.tsx
@@ -19,7 +19,7 @@ type DynamicFormShellProps = {
     /** Called when the user presses the header's back button */
     onBackButtonPress: () => void;
 
-    /** Page names in order, for the step indicator */
+    /** Unique page keys in order, for the step indicator */
     stepNames: string[];
 
     /** Index of the highlighted step */
diff --git a/src/components/DynamicForm/index.tsx b/src/components/DynamicForm/index.tsx
index 7048b220eb4c..851ea83d86a2 100644
--- a/src/components/DynamicForm/index.tsx
+++ b/src/components/DynamicForm/index.tsx
@@ -26,7 +26,7 @@ import DynamicFormShell from './components/DynamicFormShell';
 import getAnswerKeys from './utils/getAnswerKeys';
 import getContentFields from './utils/getContentFields';
 import getDynamicFieldErrors from './utils/getDynamicFieldErrors';
-import getPageTitle, {isPageShown} from './utils/getPageTitle';
+import {isPageShown} from './utils/getPageTitle';
 import getSubmittedAnswers from './utils/getSubmittedAnswers';
 import hasSensitiveAnswer from './utils/hasSensitiveAnswer';
 import isSensitiveField from './utils/isSensitiveField';
@@ -291,7 +291,8 @@ function DynamicFormFlow({
 
     // An entry editor highlights its list's step, and the confirmation page the last one
     const stepPage = shownPages.find((page) => page.key === currentPageName) ?? (listItemPage && findListPage(listItemPage.listKey));
-    const stepNames = [...shownPages.map((page) => getPageTitle(page, values, translate, allFields)), ...(hasConfirmationPage ? [translate('common.confirm')] : [])];
+    // The indicator draws no names and keys its steps by them, so the unique page keys stand in for titles an untitled page does not have
+    const stepNames = [...shownPages.map((page) => page.key), ...(hasConfirmationPage ? [CONST.DYNAMIC_FORM.CONFIRMATION_PAGE_KEY] : [])];
     const stepPageIndex = stepPage ? shownPages.indexOf(stepPage) : -1;
     const stepIndex = stepPageIndex === -1 ? stepNames.length - 1 : stepPageIndex;
     // The shell swaps its root when the indicator toggles, which remounts the page. So `auto` decides once, from the answers the draft held on arrival, and keeps it while the user types.
diff --git a/src/components/DynamicForm/utils/getConfirmationItems.ts b/src/components/DynamicForm/utils/getConfirmationItems.ts
index 1623ed38d5d6..6117ad965157 100644
--- a/src/components/DynamicForm/utils/getConfirmationItems.ts
+++ b/src/components/DynamicForm/utils/getConfirmationItems.ts
@@ -11,7 +11,7 @@ import noop from 'lodash/noop';
 import formatDynamicFieldValue from './formatDynamicFieldValue';
 import getContentFields from './getContentFields';
 import {getFieldLabel} from './getLocalizedText';
-import getPageTitle, {isPageShown} from './getPageTitle';
+import {getPageSectionName, isPageShown} from './getPageTitle';
 import getVisibleFields from './getVisibleFields';
 import isSensitiveField from './isSensitiveField';
 import isSupportedField from './isSupportedField';
@@ -67,7 +67,7 @@ function getConfirmationItems(
         return [
             {
                 id: page.key,
-                name: getPageTitle(page, values, translate, allFields),
+                name: getPageSectionName(page, values, translate, allFields),
                 rows: fields.flatMap((field): SummaryGroupRow[] => {
                     const listItemRows = field.type === 'list' ? getListItemRows(field, values, translate, onEditListItem) : [];
                     if (listItemRows.length > 0) {
diff --git a/src/components/DynamicForm/utils/getPageTitle.ts b/src/components/DynamicForm/utils/getPageTitle.ts
index dd0bdffa3a45..7caeeda107cb 100644
--- a/src/components/DynamicForm/utils/getPageTitle.ts
+++ b/src/components/DynamicForm/utils/getPageTitle.ts
@@ -7,15 +7,24 @@ import getContentFields from './getContentFields';
 import getLocalizedText, {getFieldLabel} from './getLocalizedText';
 import {getLoneField, getVisibleContent, isFieldVisible} from './getVisibleFields';
 
-/** The page's own title, else the label of its lone question, else the label of its first visible field, so no step is ever blank */
-function getPageTitle(page: DynamicFormPage, values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): string {
+/** The page's own title, else the schema's wording of its lone question. A label never names a section, since the label is already on the question's row. */
+function getPageSectionName(page: DynamicFormPage, values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): string {
     const ownTitle = getLocalizedText(translate, page.titleKey, page.title);
     if (ownTitle) {
         return ownTitle;
     }
-    const visibleFields = getContentFields(getVisibleContent(page.content, values, allFields));
-    const field = getLoneField(visibleFields) ?? visibleFields.at(0);
-    return field ? getFieldLabel(field, translate) : '';
+    const loneField = getLoneField(getContentFields(getVisibleContent(page.content, values, allFields)));
+    return (loneField && getLocalizedText(translate, loneField.questionKey, loneField.question)) ?? '';
+}
+
+/** The page's section name, else the label of its lone question. An untitled page with several questions has no headline, since no one of them names the page. */
+function getPageTitle(page: DynamicFormPage, values: DynamicFormValues, translate: LocalizedTranslate, allFields?: DynamicFormField[]): string {
+    const sectionName = getPageSectionName(page, values, translate, allFields);
+    if (sectionName) {
+        return sectionName;
+    }
+    const loneField = getLoneField(getContentFields(getVisibleContent(page.content, values, allFields)));
+    return loneField ? getFieldLabel(loneField, translate) : '';
 }
 
 /** A page is shown when its own `showWhen` matches and it has a field to show. A page that is not shown is skipped, and its fields are not asked or submitted. */
@@ -27,4 +36,4 @@ function isPageShown(page: DynamicFormPage, values: DynamicFormValues, allFields
 }
 
 export default getPageTitle;
-export {isPageShown};
+export {getPageSectionName, isPageShown};
diff --git a/src/stories/DynamicForm.stories.tsx b/src/stories/DynamicForm.stories.tsx
index 57dcfc257c9a..c4e8ea2e0ef1 100644
--- a/src/stories/DynamicForm.stories.tsx
+++ b/src/stories/DynamicForm.stories.tsx
@@ -387,16 +387,19 @@ function SinglePage({fields, draftValues}: Preset) {
             style={defaultStyles.ph5}
         >
             {({inputValues}) =>
-                pages.map((page) => (
-                    <View key={page.key}>
-                        <Text style={[defaultStyles.textHeadlineLineHeightXXL, defaultStyles.mt5, defaultStyles.mb3]}>{getPageTitle(page, inputValues, translate, allFields)}</Text>
-                        <DynamicFormFields
-                            content={page.content}
-                            allFields={allFields}
-                            values={inputValues}
-                        />
-                    </View>
-                ))
+                pages.map((page) => {
+                    const title = getPageTitle(page, inputValues, translate, allFields);
+                    return (
+                        <View key={page.key}>
+                            {!!title && <Text style={[defaultStyles.textHeadlineLineHeightXXL, defaultStyles.mt5, defaultStyles.mb3]}>{title}</Text>}
+                            <DynamicFormFields
+                                content={page.content}
+                                allFields={allFields}
+                                values={inputValues}
+                            />
+                        </View>
+                    );
+                })
             }
         </FormProvider>
     );
diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index 0a5fa5257b05..a7d805ce48e7 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -51,6 +51,11 @@ type DynamicFormFieldBase = {
 
     descriptionKey?: TranslationPaths;
 
+    /** The headline of a page with no title of its own where this is the only question, such as "What's your account number?". It also names that page's section on the confirmation page. */
+    question?: string;
+
+    questionKey?: TranslationPaths;
+
     required: boolean;
 
     /** Never written to the form draft, for SSNs and account numbers */
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index ce78ca052cec..8fd0294b3b45 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -90,10 +90,10 @@ type RenderFieldsOptions = {
     currency?: string;
     maxFileSize?: number;
     onRefreshRequirements?: (inputID: string, value: unknown) => void;
-    isTitledByPage?: boolean;
+    isLoneFieldInHeadline?: boolean;
 };
 
-function renderFields(content: DynamicFormContentItem[], values: DynamicFormValues = {}, {currency, maxFileSize, onRefreshRequirements, isTitledByPage}: RenderFieldsOptions = {}) {
+function renderFields(content: DynamicFormContentItem[], values: DynamicFormValues = {}, {currency, maxFileSize, onRefreshRequirements, isLoneFieldInHeadline}: RenderFieldsOptions = {}) {
     mockInputWrapper.mockClear();
     render(
         <DynamicFormFields
@@ -102,7 +102,7 @@ function renderFields(content: DynamicFormContentItem[], values: DynamicFormValu
             currency={currency}
             maxFileSize={maxFileSize}
             onRefreshRequirements={onRefreshRequirements}
-            isTitledByPage={isTitledByPage}
+            isLoneFieldInHeadline={isLoneFieldInHeadline}
         />,
     );
     return new Map(mockInputWrapper.mock.calls.map(([props]) => [props.inputID, props]));
@@ -606,7 +606,7 @@ describe('DynamicFormFields', () => {
         const field: DynamicFormField = {key: 'answer', label: 'The question', type, required: true};
 
         // When it renders
-        const rendered = renderFields([field], {}, {isTitledByPage: true});
+        const rendered = renderFields([field], {}, {isLoneFieldInHeadline: true});
 
         // Then the choice is drawn as the page itself, keeping its kind of answer, and the label is left to the page title instead of repeating it
         expect(rendered.get('answer')?.InputComponent).toBe(ExpectedInput);
@@ -671,7 +671,7 @@ describe('DynamicFormFields', () => {
         const companyName: DynamicFormField = {key: 'companyName', type: 'text', required: true, showWhen: {key: 'legalType', equals: ['BUSINESS']}};
 
         // When it renders for a business recipient on a page without its own title
-        const rendered = renderFields([legalType, companyName], {legalType: 'BUSINESS'}, {isTitledByPage: true});
+        const rendered = renderFields([legalType, companyName], {legalType: 'BUSINESS'}, {isLoneFieldInHeadline: true});
 
         // Then it is still a tab row rather than an inline list, since the schema asked for tabs, and the question is left to the page title
         expect(rendered.get('legalType')?.InputComponent).toBe(TabsAdapter);
diff --git a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
index 0ac0d69d6b7a..e9e220d3d8ff 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFlowTest.tsx
@@ -260,25 +260,29 @@ describe('DynamicFormFlow', () => {
         mockStepWrapper.mockClear();
         await renderFlow({draft, layout: 'pages'});
 
-        // Then the default layout names every page and highlights the current one, and plain pages have no indicator
-        expect(autoLayout).toEqual(expect.objectContaining({stepNames: ['Personal details', 'Recipient', 'Company'], startStepIndex: 1}));
+        // Then the default layout has a step per page and highlights the current one, and plain pages have no indicator
+        expect(autoLayout).toEqual(expect.objectContaining({stepNames: ['personal-details', 'recipient', 'company'], startStepIndex: 1}));
         expect(mockStepWrapper).not.toHaveBeenCalled();
     });
 
-    it('names the step of a page with no title after its field', async () => {
-        // Given pages built from a flat list, which carry no title, shown with the stepper
+    it('keys the steps of pages with no title by their page keys', async () => {
+        // Given pages built from a flat list, which carry no title, where two pages ask several questions and so have no headline either
         const flowSchema: DynamicFormSchema = {
             fields: [
                 {key: 'home', type: 'address', required: true, label: 'Home address'},
+                {key: 'firstName', type: 'text', required: true, label: 'First name'},
+                {key: 'lastName', type: 'text', required: true, label: 'Last name'},
                 {key: 'work', type: 'address', required: true, label: 'Work address'},
+                {key: 'company', type: 'text', required: true, label: 'Company'},
+                {key: 'role', type: 'text', required: true, label: 'Role'},
             ],
         };
 
-        // When the flow renders
+        // When the flow renders with the stepper
         await renderFlow({flowSchema, layout: 'stepper', currentPageName: 'page-1'});
 
-        // Then no step is blank
-        expect(mockStepWrapper.mock.lastCall?.[0].stepNames).toEqual(['Home address', 'Work address']);
+        // Then every step has a distinct name, since the indicator keys its steps by them
+        expect(mockStepWrapper.mock.lastCall?.[0].stepNames).toEqual(['page-1', 'page-2', 'page-3', 'page-4']);
     });
 
     it('starts a new form on its first page that has something to ask', async () => {
diff --git a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
index bb0cdc45d2ae..8005d857d06f 100644
--- a/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
+++ b/tests/unit/components/DynamicForm/getConfirmationItemsTest.ts
@@ -58,6 +58,26 @@ describe('getConfirmationItems', () => {
         expect(groups.map((group) => group.id)).toEqual(['identity']);
     });
 
+    it('leaves the section of an untitled page with several questions unnamed', () => {
+        // Given a page the form built from a flat list, so it has no title, asking an account number and a currency
+        const untitledPages: DynamicFormPage[] = [
+            {
+                key: 'page-1',
+                content: [
+                    {key: 'accountNumber', type: 'text', required: true, label: 'Account number'},
+                    {key: 'currency', type: 'currency', required: true, label: 'Settlement currency'},
+                ],
+            },
+        ];
+
+        // When the confirmation sections are built
+        const [group] = getConfirmationItems(untitledPages, getAllFields(untitledPages), {accountNumber: '12345678', currency: 'GBP'}, translateLocal, jest.fn(), jest.fn());
+
+        // Then the section has no name, since naming it after its first answer would mislabel the others
+        expect(group.name).toBe('');
+        expect(group.rows.map((row) => row.id)).toEqual(['accountNumber', 'currency']);
+    });
+
     it('shows each list entry as its own row that opens the entry', () => {
         // Given a page with a list of directors holding one entry
         const directorsPages: DynamicFormPage[] = [
diff --git a/tests/unit/components/DynamicForm/paginateTest.ts b/tests/unit/components/DynamicForm/paginateTest.ts
index c690adc3eae6..a64f765a43b4 100644
--- a/tests/unit/components/DynamicForm/paginateTest.ts
+++ b/tests/unit/components/DynamicForm/paginateTest.ts
@@ -1,4 +1,4 @@
-import getPageTitle, {isPageShown} from '@components/DynamicForm/utils/getPageTitle';
+import getPageTitle, {getPageSectionName, isPageShown} from '@components/DynamicForm/utils/getPageTitle';
 import paginate, {getAllFields, getPages} from '@components/DynamicForm/utils/paginate';
 
 import type {DynamicFormField, DynamicFormPage, DynamicFormSchemaField, DynamicFormTextField} from '@src/types/onyx';
@@ -145,15 +145,62 @@ describe('getPageTitle', () => {
         expect(title).toBe('Alpha');
     });
 
-    it('falls back to the first visible field label when there are several questions', () => {
-        // Given an untitled page whose first field is hidden
+    it("prefers the lone question's wording over its label", () => {
+        // Given an untitled page whose only question has its wording as a question
+        const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Account number', question: "What's your account number?"})]};
+
+        // When its title is read
+        const title = getPageTitle(page, {}, translateLocal);
+
+        // Then the headline asks the question, so it does not repeat the input's label
+        expect(title).toBe("What's your account number?");
+    });
+
+    it('has no title when there are several questions', () => {
+        // Given an untitled page with several visible questions
         const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Alpha', showWhen: {key: 'z', equals: ['1']}}), text('b', {label: 'Beta'}), text('c', {label: 'Gamma'})]};
 
         // When its title is read
         const title = getPageTitle(page, {}, translateLocal);
 
-        // Then the title is the first field the user sees
-        expect(title).toBe('Beta');
+        // Then it is blank, since no one question names the page
+        expect(title).toBe('');
+    });
+});
+
+describe('getPageSectionName', () => {
+    it('uses the page title', () => {
+        // Given a titled page
+        const page: DynamicFormPage = {key: 'p', title: 'Bank details', content: [text('a', {label: 'Alpha'})]};
+
+        // When its section name is read
+        const name = getPageSectionName(page, {}, translateLocal);
+
+        // Then it is the page title
+        expect(name).toBe('Bank details');
+    });
+
+    it("uses the lone question's wording on an untitled page", () => {
+        // Given an untitled page whose only question has its wording
+        const page: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Account number', question: "What's your account number?"})]};
+
+        // When its section name is read
+        const name = getPageSectionName(page, {}, translateLocal);
+
+        // Then it is that wording
+        expect(name).toBe("What's your account number?");
+    });
+
+    it('never uses a label', () => {
+        // Given untitled pages with one question and with several, none with its wording
+        const lonePage: DynamicFormPage = {key: 'p', content: [text('a', {label: 'Account number'})]};
+        const sharedPage: DynamicFormPage = {key: 'q', content: [text('a', {label: 'Account number'}), text('b', {label: 'Settlement currency'})]};
+
+        // When their section names are read
+        const names = [getPageSectionName(lonePage, {}, translateLocal), getPageSectionName(sharedPage, {}, translateLocal)];
+
+        // Then both are blank, since the label is already on the row below and would only name one of several rows
+        expect(names).toEqual(['', '']);
     });
 });
 

From 6e17675b5628b5e7960330647296b57a3c22023d Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Wed, 14 Oct 2026 20:18:29 +0530
Subject: [PATCH 673/781] Keep the Find expense input visible with the keyboard
 open in landscape on Add existing expense

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../Tables/AddExistingExpenseTable/index.tsx  | 15 +++++++---
 src/pages/AddExistingExpense.tsx              | 28 +++++++++++++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/components/Tables/AddExistingExpenseTable/index.tsx b/src/components/Tables/AddExistingExpenseTable/index.tsx
index 15d5902fee76..72ef7960ceda 100644
--- a/src/components/Tables/AddExistingExpenseTable/index.tsx
+++ b/src/components/Tables/AddExistingExpenseTable/index.tsx
@@ -20,14 +20,22 @@ type UnreportedExpenseTableRowData = Transaction & TableData;
 
 type AddExistingExpenseTableProps = Pick<
     TableProps<UnreportedExpenseTableRowData, ExpenseTableColumnKey, ExpenseTableFilterKey>,
-    'onEndReached' | 'onEndReachedThreshold' | 'ListFooterComponent'
+    'onEndReached' | 'onEndReachedThreshold' | 'ListFooterComponent' | 'shouldFooterRenderAsLastRow'
 > & {
     data: UnreportedExpenseTableRowData[];
     selectedKeys: string[];
     onRowSelectionChange: (selectedRowKeys: string[]) => void;
 };
 
-function AddExistingExpenseTable({data, selectedKeys, onRowSelectionChange, onEndReached, onEndReachedThreshold, ListFooterComponent}: AddExistingExpenseTableProps) {
+function AddExistingExpenseTable({
+    data,
+    selectedKeys,
+    onRowSelectionChange,
+    onEndReached,
+    onEndReachedThreshold,
+    ListFooterComponent,
+    shouldFooterRenderAsLastRow,
+}: AddExistingExpenseTableProps) {
     const {translate, localeCompare} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
 
@@ -123,8 +131,7 @@ function AddExistingExpenseTable({data, selectedKeys, onRowSelectionChange, onEn
             shouldAlwaysEnableSelection
             // Expenses are confirmed in one batch, so searching or filtering must not drop what is already picked.
             shouldPreserveSelectionOnSearchAndFilter
-            // The skeleton appended while the next page loads continues the rows, so it draws the bottom corners.
-            shouldFooterRenderAsLastRow
+            shouldFooterRenderAsLastRow={shouldFooterRenderAsLastRow}
             selectedKeys={selectedKeys}
             onRowSelectionChange={onRowSelectionChange}
             initialSortColumn="date"
diff --git a/src/pages/AddExistingExpense.tsx b/src/pages/AddExistingExpense.tsx
index b9ce3a383a96..f484c12c8b6d 100644
--- a/src/pages/AddExistingExpense.tsx
+++ b/src/pages/AddExistingExpense.tsx
@@ -1,4 +1,5 @@
 import AddExistingExpenseFooter from '@components/AddExistingExpenseFooter';
+import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard';
 import EmptyStateComponent from '@components/EmptyStateComponent';
 import FixedFooter from '@components/FixedFooter';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -15,6 +16,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
+import useShouldFooterBeInsideList from '@hooks/useShouldFooterBeInsideList';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {fetchUnreportedExpenses} from '@libs/actions/UnreportedExpenses';
@@ -69,6 +71,7 @@ function AddExistingExpense({route}: AddExistingExpensePageType) {
     const [allOpenReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: openExpenseReportIDsSelector});
     const [openReportDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT, {selector: openExpenseReportIDsSelector});
     const isInLandscapeMode = useIsInLandscapeMode();
+    const shouldFooterBeInsideList = useShouldFooterBeInsideList();
     const styles = useThemeStyles();
 
     const transactionsSelector = useCallback(
@@ -199,10 +202,12 @@ function AddExistingExpense({route}: AddExistingExpensePageType) {
             testID="NewChatSelectorPage"
             focusTrapSettings={{active: false}}
         >
-            <HeaderWithBackButton
-                title={translate('iou.addExistingExpense')}
-                onBackButtonPress={Navigation.goBack}
-            />
+            <CollapsibleHeaderOnKeyboard>
+                <HeaderWithBackButton
+                    title={translate('iou.addExistingExpense')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+            </CollapsibleHeaderOnKeyboard>
             <View style={styles.flex1}>
                 <AddExistingExpenseTable
                     data={unreportedExpenses}
@@ -210,10 +215,21 @@ function AddExistingExpense({route}: AddExistingExpensePageType) {
                     onRowSelectionChange={onRowSelectionChange}
                     onEndReached={fetchMoreUnreportedTransactions}
                     onEndReachedThreshold={0.75}
-                    ListFooterComponent={paginationFooterContent}
+                    ListFooterComponent={
+                        shouldFooterBeInsideList ? (
+                            <>
+                                {paginationFooterContent}
+                                {footerContent}
+                            </>
+                        ) : (
+                            paginationFooterContent
+                        )
+                    }
+                    // The skeleton appended while the next page loads continues the rows, so it draws the bottom corners.
+                    shouldFooterRenderAsLastRow={!!paginationFooterContent}
                 />
             </View>
-            {footerContent}
+            {!shouldFooterBeInsideList && footerContent}
         </ScreenWrapper>
     );
 }

From c56c0d5380d97d7534449be321f516ee5633d955 Mon Sep 17 00:00:00 2001
From: Mukher <mshakhriyorov8@gmail.com>
Date: Wed, 14 Oct 2026 19:49:23 +0500
Subject: [PATCH 674/781] Note that upstream declined a fix for the Skia sizing
 patch

The upstream issue was closed as an app concern and neither upstream PR
is the fix, so the patch stays across Skia upgrades.
---
 patches/@shopify/react-native-skia/details.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/@shopify/react-native-skia/details.md b/patches/@shopify/react-native-skia/details.md
index b4741c128c44..d09ae410b58d 100644
--- a/patches/@shopify/react-native-skia/details.md
+++ b/patches/@shopify/react-native-skia/details.md
@@ -156,9 +156,9 @@
     Untransformed canvases keep the previous ratio, so nothing else changes.
     ```
 
-- Upstream PR/issue:
+- Upstream PR/issue: https://github.com/Shopify/react-native-skia/issues/4084 was closed as not a Skia bug: the maintainer considers a canvas painted under a CSS transform an app concern, and said neither https://github.com/Shopify/react-native-skia/pull/4085 (this approach) nor https://github.com/Shopify/react-native-skia/pull/4105 (an opt-in pixelDensity prop) is the way to fix it. No upstream fix is planned, so this patch has to be carried across Skia upgrades unless the charts stop being fitted with a transform.
 - E/App issue: https://github.com/Expensify/App/issues/95221
-- PR introducing patch:
+- PR introducing patch: https://github.com/Expensify/App/pull/101291
 
 ### [@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch](@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch)
 

From 00bf5e78e28a5dbca90d352b0061cef18c13a80a Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Wed, 14 Oct 2026 16:52:48 +0200
Subject: [PATCH 675/781] fix: align dynamic form select threshold, add flat
 schema story and document schema fields

---
 contributingGuides/DYNAMIC_FORMS.md           |  2 +-
 src/CONST/index.ts                            |  2 +-
 .../DynamicForm/renderers/choiceRenderers.tsx |  9 ++-
 src/stories/DynamicForm.stories.tsx           | 58 +++++++++++++++----
 src/types/onyx/DynamicFormField.ts            | 37 ++++++++++++
 .../DynamicForm/DynamicFormFieldsTest.tsx     | 12 ++++
 6 files changed, 102 insertions(+), 18 deletions(-)

diff --git a/contributingGuides/DYNAMIC_FORMS.md b/contributingGuides/DYNAMIC_FORMS.md
index 22e4d41c1b24..6ffae2d5ea1c 100644
--- a/contributingGuides/DYNAMIC_FORMS.md
+++ b/contributingGuides/DYNAMIC_FORMS.md
@@ -78,7 +78,7 @@ A page is shown while its own `showWhen` matches and it has a visible field; a p
 | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
 | `text`               | `TextInput`                                                                                                                               | `regex`, `minLength`, `maxLength`, `example`, `keyboard`, `multiline`, `rule: 'legalName' \| 'phone'` |
 | `number`             | `TextInput` with the numeric keyboard                                                                                                     | `regex`, `minLength`, `maxLength`, `example`                                                          |
-| `select`             | `ValuePicker`, or `PushRowWithModal` above 8 options                                                                                      | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
+| `select`             | `ValuePicker`, or `PushRowWithModal` above 10 options                                                                                     | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
 | `radio`              | `RadioButtons`                                                                                                                            | `values`, `dependsOn`, `presentation: 'tabs'`                                                         |
 | `multiselect`        | `PushRowWithModal` with checkboxes and a Save button                                                                                      | `values`, `dependsOn`                                                                                 |
 | `date`               | `DatePicker`                                                                                                                              | `rule: 'dateOfBirth'`                                                                                 |
diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 2b42939ff377..7c83ee2cd074 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -971,7 +971,7 @@ const CONST = {
         FILE_LIMIT: 1,
     },
     DYNAMIC_FORM: {
-        /** A select with more options than this sits on its own page, since it opens a searchable list */
+        /** A select with more options than this opens a searchable list, so it sits on its own page */
         LARGE_SELECT_MIN_OPTIONS: 10,
 
         /** Most questions sharing a page when pages are built from a flat list of fields */
diff --git a/src/components/DynamicForm/renderers/choiceRenderers.tsx b/src/components/DynamicForm/renderers/choiceRenderers.tsx
index f695779917dd..749726ba79f4 100644
--- a/src/components/DynamicForm/renderers/choiceRenderers.tsx
+++ b/src/components/DynamicForm/renderers/choiceRenderers.tsx
@@ -13,6 +13,8 @@ import type {Choice} from '@components/RadioButtons';
 import RadioButtons from '@components/RadioButtons';
 import ValuePicker from '@components/ValuePicker';
 
+import CONST from '@src/CONST';
+
 import React from 'react';
 
 import type {DynamicFieldInput, DynamicFieldInputProps, DynamicFieldRenderer, DynamicFieldRendererMap} from './types';
@@ -22,9 +24,6 @@ type InlineChoiceOptions = {
     isSearchable: boolean;
 };
 
-/** Above this many options a choice opens a searchable list instead of showing every option at once */
-const LONG_CHOICE_LIST_THRESHOLD = 8;
-
 function getChoiceOptionsList(choices: Choice[]): Record<string, string> {
     return Object.fromEntries(choices.map((choice) => [choice.value, choice.label]));
 }
@@ -71,7 +70,7 @@ const renderMultiChoice: DynamicFieldRenderer<'multiselect' | 'countryMultiselec
     const label = getFieldLabel(field, translate);
     const choices = getFieldChoices(field, values, translate);
     if (isLoneField) {
-        return renderInlineChoice(label, choices, inputProps, {canSelectMultiple: true, isSearchable: choices.length > LONG_CHOICE_LIST_THRESHOLD});
+        return renderInlineChoice(label, choices, inputProps, {canSelectMultiple: true, isSearchable: choices.length > CONST.DYNAMIC_FORM.LARGE_SELECT_MIN_OPTIONS});
     }
     return {
         isMenuRow: true,
@@ -95,7 +94,7 @@ const CHOICE_RENDERERS: Pick<DynamicFieldRendererMap, 'select' | 'radio' | 'mult
     select: (field, {values, translate, isLoneField}, inputProps) => {
         const label = getFieldLabel(field, translate);
         const choices = getFieldChoices(field, values, translate);
-        const isLong = choices.length > LONG_CHOICE_LIST_THRESHOLD;
+        const isLong = choices.length > CONST.DYNAMIC_FORM.LARGE_SELECT_MIN_OPTIONS;
         if (field.presentation === 'tabs') {
             return renderTabs(label, choices, inputProps, isLoneField);
         }
diff --git a/src/stories/DynamicForm.stories.tsx b/src/stories/DynamicForm.stories.tsx
index c4e8ea2e0ef1..30b0ec1534a4 100644
--- a/src/stories/DynamicForm.stories.tsx
+++ b/src/stories/DynamicForm.stories.tsx
@@ -34,8 +34,11 @@ const FLOW_ROUTE_PREFIX = 'settings/wallet/add-bank-account';
 /** A fixture field with the title of the page it is asked on */
 type GroupedField = DynamicFormSchemaField & {group: string};
 
-/** Each run of fields sharing a group becomes one page titled by it, as the server sends pages */
-function toSchema(fields: GroupedField[]): DynamicFormSchema {
+/** Each run of fields sharing a group becomes one page titled by it, as the server sends pages. A flat schema drops the groups and lets the form build untitled pages. */
+function toSchema(fields: GroupedField[], isFlat = false): DynamicFormSchema {
+    if (isFlat) {
+        return {fields: fields.map(({group, ...field}) => field)};
+    }
     const pages: DynamicFormPage[] = [];
     for (const {group, ...field} of fields) {
         const lastPage = pages.at(-1);
@@ -54,6 +57,9 @@ type Preset = {
 
     /** Answers seeded into the form draft before the first render */
     draftValues: Record<string, string | boolean | string[] | DynamicFormListItem[]>;
+
+    /** Sends the fields as a flat `{fields}` schema, ignoring `group`, so the form paginates them itself */
+    isFlat?: boolean;
 };
 
 /** A bank account form spread over several pages */
@@ -304,6 +310,16 @@ const PRESETS = {
         fields: [...accountDetails, ...accountHolder],
         draftValues: {legalType: 'PRIVATE', numberOfEmployees: '25'},
     },
+    flatFields: {
+        // The address is alone on its page, so its question heads that page
+        fields: [
+            ...accountDetails,
+            ...accountHolder.map((field) => (field.key === 'address' ? {...field, question: "What's your home address?"} : field)),
+            {key: 'ownsQuarter', label: 'Do you own 25% or more?', group: 'Account holder', type: 'boolean', required: true},
+        ],
+        draftValues: {legalType: 'PRIVATE', numberOfEmployees: '25'},
+        isFlat: true,
+    },
     businessOnboarding: {
         fields: [...businessInfo, ...dueDiligence, owners],
         draftValues: {legalBusinessName: 'Boulder Development Inc.'},
@@ -367,11 +383,12 @@ function useSeededDraft(draftValues: Preset['draftValues']): boolean {
 }
 
 /** Every page on one screen, for looking at the renderer rather than the flow */
-function SinglePage({fields, draftValues}: Preset) {
+function SinglePage({fields, draftValues, isFlat}: Preset) {
     const {translate} = useLocalize();
     const isDraftReady = useSeededDraft(draftValues);
     // List entries are edited on flow pages, so this screen leaves lists out
-    const pages = getPages(toSchema(fields.filter((field) => field.type !== 'list')));
+    const pageFields = fields.filter((field) => field.type !== 'list');
+    const pages = getPages(toSchema(pageFields, isFlat));
     const allFields = getAllFields(pages);
 
     if (!isDraftReady) {
@@ -414,7 +431,7 @@ type FlowProps = Preset & {
 };
 
 /** The whole flow on a story-owned route stack: pages, resume, the entry editor pages and the confirmation are all clickable */
-function Flow({fields, draftValues, layout, confirmation, resetKey}: FlowProps) {
+function Flow({fields, draftValues, isFlat, layout, confirmation, resetKey}: FlowProps) {
     const isDraftReady = useSeededDraft(draftValues);
     if (!isDraftReady) {
         return <View />;
@@ -429,7 +446,7 @@ function Flow({fields, draftValues, layout, confirmation, resetKey}: FlowProps)
             routePrefix={FLOW_ROUTE_PREFIX}
         >
             <DynamicFormFlow
-                schema={toSchema(fields)}
+                schema={toSchema(fields, isFlat)}
                 formID={STORYBOOK_FORM_ID}
                 headerTitle="Add bank account"
                 confirmationTitle="Let’s double check that everything looks right"
@@ -450,12 +467,13 @@ type FlowStoryProps = Pick<FlowProps, 'layout' | 'confirmation'> & {
 };
 
 function FlowFromPreset({preset, layout, confirmation}: FlowStoryProps) {
-    const {fields, draftValues} = PRESETS[preset];
+    const presetValues: Preset = PRESETS[preset];
     return (
         <Flow
             resetKey={preset}
-            fields={fields}
-            draftValues={draftValues}
+            fields={presetValues.fields}
+            draftValues={presetValues.draftValues}
+            isFlat={presetValues.isFlat}
             layout={layout}
             confirmation={confirmation}
         />
@@ -499,7 +517,7 @@ type PlaygroundProps = Preset & {
 };
 
 /** Editable schema: pick a preset, then change the field JSON in the Controls panel and watch the form follow */
-function Playground({preset, fields, draftValues, layout}: PlaygroundProps) {
+function Playground({preset, fields, draftValues, isFlat, layout}: PlaygroundProps) {
     const [, updateArgs] = useArgs();
     useEffect(() => {
         updateArgs(PRESETS[preset]);
@@ -513,6 +531,7 @@ function Playground({preset, fields, draftValues, layout}: PlaygroundProps) {
                 key={resetKey}
                 fields={schema}
                 draftValues={draftValues ?? {}}
+                isFlat={isFlat}
             />
         );
     }
@@ -521,6 +540,7 @@ function Playground({preset, fields, draftValues, layout}: PlaygroundProps) {
             resetKey={resetKey}
             fields={schema}
             draftValues={draftValues ?? {}}
+            isFlat={isFlat}
             layout="auto"
             confirmation="auto"
         />
@@ -537,6 +557,7 @@ PlaygroundStory.argTypes = {
     preset: {options: PRESET_NAMES, control: {type: 'select'}},
     fields: {control: {type: 'object'}},
     draftValues: {control: {type: 'object'}},
+    isFlat: {control: {type: 'boolean'}},
     layout: {options: ['flow', 'single'], control: {type: 'radio'}},
 };
 
@@ -544,6 +565,7 @@ const AllFieldTypes: StoryFn<Preset> = SinglePage.bind({});
 AllFieldTypes.args = {fields: [...accountDetails, ...accountHolder, ...businessInfo], draftValues: {legalType: 'BUSINESS', legalBusinessName: 'Boulder Development Inc.'}};
 
 const BankAccount = presetFlowStory('bankAccount');
+const FlatFields = presetFlowStory('flatFields');
 const BusinessOnboarding = presetFlowStory('businessOnboarding');
 const OwnersList = presetFlowStory('owners');
 const LoneMultiselect = presetFlowStory('loneMultiselect');
@@ -554,4 +576,18 @@ const AmountWithCurrency = presetFlowStory('amountWithCurrency');
 const UnknownType = presetFlowStory('unknownType');
 
 export default story;
-export {FlowStory, PlaygroundStory, AllFieldTypes, BankAccount, BusinessOnboarding, OwnersList, LoneMultiselect, YesNoQuestion, LoneCountry, LoneCurrency, AmountWithCurrency, UnknownType};
+export {
+    FlowStory,
+    PlaygroundStory,
+    AllFieldTypes,
+    BankAccount,
+    FlatFields,
+    BusinessOnboarding,
+    OwnersList,
+    LoneMultiselect,
+    YesNoQuestion,
+    LoneCountry,
+    LoneCurrency,
+    AmountWithCurrency,
+    UnknownType,
+};
diff --git a/src/types/onyx/DynamicFormField.ts b/src/types/onyx/DynamicFormField.ts
index a7d805ce48e7..c79faf501381 100644
--- a/src/types/onyx/DynamicFormField.ts
+++ b/src/types/onyx/DynamicFormField.ts
@@ -7,7 +7,10 @@ import type {InputModeOptions} from 'react-native';
 
 /** Met while the answer to `key` is one of `equals` */
 type DynamicFormCondition = {
+    /** Key of the field whose answer is checked */
     key: string;
+
+    /** Answers that meet the condition. A boolean answer matches as `'true'` or `'false'`, and a list answer matches when any chosen value is listed. */
     equals: string[];
 };
 
@@ -19,11 +22,13 @@ type DynamicFormHeading = {
     /** The schema author's wording, shown when there is no titleKey */
     title?: string;
 
+    /** Translation of `title`, used instead of it when set */
     titleKey?: TranslationPaths;
 
     /** The schema author's wording, shown when there is no descriptionKey */
     description?: string;
 
+    /** Translation of `description`, used instead of it when set */
     descriptionKey?: TranslationPaths;
 
     /** Hides the title only. The fields after it still show, since a heading marks a place rather than containing fields. */
@@ -44,18 +49,22 @@ type DynamicFormFieldBase = {
     /** The schema author's wording, shown when there is no labelKey */
     label?: string;
 
+    /** Translation of `label`, used instead of it when set */
     labelKey?: TranslationPaths;
 
     /** Supporting text, such as which format is accepted */
     description?: string;
 
+    /** Translation of `description`, used instead of it when set */
     descriptionKey?: TranslationPaths;
 
     /** The headline of a page with no title of its own where this is the only question, such as "What's your account number?". It also names that page's section on the confirmation page. */
     question?: string;
 
+    /** Translation of `question`, used instead of it when set */
     questionKey?: TranslationPaths;
 
+    /** The form cannot move on until the field is answered */
     required: boolean;
 
     /** Never written to the form draft, for SSNs and account numbers */
@@ -73,19 +82,28 @@ type DynamicFormFieldBase = {
 
 /** Free text, checked by regex, length and an optional named rule */
 type DynamicFormTextField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'text';
+
+    /** Pattern the answer must match, anchored by the schema when the whole answer must fit. An invalid pattern is reported and skipped, so it never blocks the user. */
     regex?: string;
+
+    /** Fewest characters the answer can have */
     minLength?: number;
+
+    /** Most characters the answer can have. The input stops taking more. */
     maxLength?: number;
 
     /** Sample value, shown as a hint and in the format error */
     example?: string;
 
+    /** Keyboard the input opens. Without it, `rule: 'phone'` opens the phone keyboard and a digits-only `regex` the numeric one. */
     keyboard?: Extract<InputModeOptions, 'email' | 'tel' | 'url' | 'numeric'>;
 
     /** Grows with its content, for descriptions */
     multiline?: boolean;
 
+    /** A named check on top of the others: `legalName` for a person's legal name, `phone` for an international phone number */
     rule?: 'legalName' | 'phone';
 };
 
@@ -94,7 +112,10 @@ type DynamicFormNumberField = DynamicFormFieldBase & Pick<DynamicFormTextField,
 
 /** One answer out of a list of options */
 type DynamicFormChoiceField = DynamicFormFieldBase & {
+    /** `select` picks from a dropdown or a searchable list, `radio` shows every option as a radio button */
     type: 'select' | 'radio';
+
+    /** The options to pick from */
     values?: DynamicFormFieldOption[];
 
     /** Draw the options as a segmented tab row, for the few-option switch that decides which fields follow */
@@ -102,7 +123,10 @@ type DynamicFormChoiceField = DynamicFormFieldBase & {
 
     /** Options picked by another answer, keyed by that answer's value. Takes the place of `values`. */
     dependsOn?: {
+        /** Key of the field whose answer picks the options */
         key: string;
+
+        /** The options for each answer of that field. An answer missing here leaves no options. */
         valuesBy: Record<string, DynamicFormFieldOption[]>;
     };
 };
@@ -112,12 +136,16 @@ type DynamicFormMultiChoiceField = DynamicFormFieldBase & Pick<DynamicFormChoice
 
 /** A calendar date, stored as yyyy-MM-dd */
 type DynamicFormDateField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'date';
+
+    /** `dateOfBirth` takes only a past date within the allowed age range */
     rule?: 'dateOfBirth';
 };
 
 /** A postal address. The street is the field's value, and the other parts are stored under `<key>.<part>`. */
 type DynamicFormAddressField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'address';
 
     /** Checks the zip against the format of the chosen country */
@@ -126,6 +154,7 @@ type DynamicFormAddressField = DynamicFormFieldBase & {
 
 /** Uploaded documents */
 type DynamicFormFileField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'file';
 
     /** One file when not set */
@@ -137,6 +166,7 @@ type DynamicFormFileField = DynamicFormFieldBase & {
 
 /** A money amount */
 type DynamicFormAmountField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'amount';
 
     /** Draft key of the currency the user picks next to the amount. Without it the currency is fixed by the screen. */
@@ -145,11 +175,13 @@ type DynamicFormAmountField = DynamicFormFieldBase & {
 
 /** One country, or any number of countries, picked from every country the App knows */
 type DynamicFormCountryField = DynamicFormFieldBase & {
+    /** `country` picks one country, `countryMultiselect` any number of them */
     type: 'country' | 'countryMultiselect';
 };
 
 /** A Yes/No question, where No is an answer too, or a checkbox that must be ticked when required */
 type DynamicFormBooleanField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'boolean';
 
     /** `yesNo`, the default, asks a question that No answers. `checkbox` asks for consent, such as accepting terms, which only a tick gives. */
@@ -158,6 +190,7 @@ type DynamicFormBooleanField = DynamicFormFieldBase & {
 
 /** Repeated entries, such as a company's owners, each answered with its own fields on an editor page */
 type DynamicFormListField = DynamicFormFieldBase & {
+    /** Tells the field types apart */
     type: 'list';
 
     /** The fields of one entry */
@@ -184,6 +217,7 @@ type DynamicFormListField = DynamicFormFieldBase & {
 
 /** Types that need nothing beyond the common properties */
 type DynamicFormPlainField = DynamicFormFieldBase & {
+    /** `currency` picks a currency code, `percent` takes a percentage from 1 to 100 */
     type: 'currency' | 'percent';
 };
 
@@ -204,7 +238,10 @@ type DynamicFormField =
 
 /** One entry of a list field: its answers keyed by item field key, and an `id` made on the device to key the entry's row and editor page */
 type DynamicFormListItem = {
+    /** Made on the device when the entry is added, and keys the entry's row, editor page and sensitive answers */
     id: string;
+
+    /** The entry's answers, keyed by item field key */
     [fieldKey: string]: FormValue | undefined;
 };
 
diff --git a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
index 8fd0294b3b45..8b0438eedf0f 100644
--- a/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
+++ b/tests/unit/components/DynamicForm/DynamicFormFieldsTest.tsx
@@ -268,6 +268,18 @@ describe('DynamicFormFields', () => {
         expect(Object.keys(rendered.get('industry')?.optionsList ?? {})).toHaveLength(options.length);
     });
 
+    it('keeps a select as a picker up to the number of options a shared page takes', () => {
+        // Given a select with as many options as pagination still lets share a page, next to another question
+        const options = Array.from({length: CONST.DYNAMIC_FORM.LARGE_SELECT_MIN_OPTIONS}, (_, index) => ({key: `option${index}`, label: `Option ${index}`}));
+        const accountType: DynamicFormField = {key: 'accountType', label: 'Account type', type: 'select', required: true, values: options};
+
+        // When the fields render
+        const rendered = renderFields([accountType, otherQuestion]);
+
+        // Then it stays a picker, since a searchable list is kept for selects that pagination puts on their own page
+        expect(rendered.get('accountType')?.InputComponent).toBe(ValuePicker);
+    });
+
     it('hints a text field with its example when it has no description', () => {
         // Given a text field with an example and no description
         const accountNumber: DynamicFormField = {key: 'accountNumber', type: 'text', required: true, example: '12345678'};

From 7fb1cb177c513a049103aac5435c0650ff8ca728 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Wed, 14 Oct 2026 20:23:22 +0530
Subject: [PATCH 676/781] Let the time picker and spreadsheet import pages
 scroll so Save and Choose file stay reachable in landscape

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ImportSpreadsheet.tsx | 53 +++++++++++++++-------------
 src/components/TimeModalPicker.tsx   | 10 ++++--
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx
index 0eadf12bd75a..ea11f5046a3a 100644
--- a/src/components/ImportSpreadsheet.tsx
+++ b/src/components/ImportSpreadsheet.tsx
@@ -33,6 +33,7 @@ import HeaderWithBackButton from './HeaderWithBackButton';
 import ImageSVG from './ImageSVG';
 import RenderHTML from './RenderHTML';
 import ScreenWrapper from './ScreenWrapper';
+import ScrollView from './ScrollView';
 import Text from './Text';
 
 type ImportSpreadsheetProps = {
@@ -285,33 +286,35 @@ function ImportSpreadsheet({backTo, goTo, shouldForceReplaceNavigation = false,
                             }}
                         />
 
-                        <View style={[styles.flex1, styles.uploadFileView, styles.uploadFileViewBorderWidth(isSmallScreenWidth)]}>
-                            {!(isDraggingOver ?? isDraggingOver) && desktopView}
+                        <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}>
+                            <View style={[styles.flex1, styles.uploadFileView, styles.uploadFileViewBorderWidth(isSmallScreenWidth)]}>
+                                {!(isDraggingOver ?? isDraggingOver) && desktopView}
 
-                            <DragAndDropConsumer
-                                onDrop={(e) => {
-                                    const file = e?.dataTransfer?.files[0];
-                                    if (!file || isReadingFile) {
-                                        return;
-                                    }
-                                    readFile(file);
-                                }}
-                            >
-                                <View style={[styles.fileDropOverlay, styles.w100, styles.h100, styles.justifyContentCenter, styles.alignItemsCenter]}>
-                                    <View style={[styles.pAbsolute, styles.fileUploadImageWrapper(fileTopPosition)]}>
-                                        <ImageSVG
-                                            src={icons.SpreadsheetComputer}
-                                            contentFit="contain"
-                                            style={styles.mb4}
-                                            width={CONST.IMPORT_SPREADSHEET.ICON_WIDTH}
-                                            height={CONST.IMPORT_SPREADSHEET.ICON_HEIGHT}
-                                        />
-                                        <Text style={[styles.textFileUpload]}>{translate('common.dropTitle')}</Text>
-                                        <Text style={[styles.subTextFileUpload, styles.themeTextColor]}>{translate('common.dropMessage')}</Text>
+                                <DragAndDropConsumer
+                                    onDrop={(e) => {
+                                        const file = e?.dataTransfer?.files[0];
+                                        if (!file || isReadingFile) {
+                                            return;
+                                        }
+                                        readFile(file);
+                                    }}
+                                >
+                                    <View style={[styles.fileDropOverlay, styles.w100, styles.h100, styles.justifyContentCenter, styles.alignItemsCenter]}>
+                                        <View style={[styles.pAbsolute, styles.fileUploadImageWrapper(fileTopPosition)]}>
+                                            <ImageSVG
+                                                src={icons.SpreadsheetComputer}
+                                                contentFit="contain"
+                                                style={styles.mb4}
+                                                width={CONST.IMPORT_SPREADSHEET.ICON_WIDTH}
+                                                height={CONST.IMPORT_SPREADSHEET.ICON_HEIGHT}
+                                            />
+                                            <Text style={[styles.textFileUpload]}>{translate('common.dropTitle')}</Text>
+                                            <Text style={[styles.subTextFileUpload, styles.themeTextColor]}>{translate('common.dropMessage')}</Text>
+                                        </View>
                                     </View>
-                                </View>
-                            </DragAndDropConsumer>
-                        </View>
+                                </DragAndDropConsumer>
+                            </View>
+                        </ScrollView>
                     </View>
                 </DragAndDropProvider>
             )}
diff --git a/src/components/TimeModalPicker.tsx b/src/components/TimeModalPicker.tsx
index 9c0078fafab2..c7ee63ce6f36 100644
--- a/src/components/TimeModalPicker.tsx
+++ b/src/components/TimeModalPicker.tsx
@@ -6,14 +6,15 @@ import DateUtils from '@libs/DateUtils';
 import CONST from '@src/CONST';
 
 import type {ComponentRef, ForwardedRef} from 'react';
+import type {View} from 'react-native';
 
 import React, {useState} from 'react';
-import {View} from 'react-native';
 
 import HeaderWithBackButton from './HeaderWithBackButton';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 import Modal from './Modal';
 import ScreenWrapper from './ScreenWrapper';
+import ScrollView from './ScrollView';
 import TimePicker from './TimePicker/TimePicker';
 
 type TimeModalPickerProps = {
@@ -75,13 +76,16 @@ function TimeModalPicker({value, errorText, label, onInputChange = () => {}, ref
                         title={label}
                         onBackButtonPress={hidePickerModal}
                     />
-                    <View style={styles.flex1}>
+                    <ScrollView
+                        style={styles.flex1}
+                        contentContainerStyle={styles.flexGrow1}
+                    >
                         <TimePicker
                             defaultValue={value}
                             onSubmit={updateInput}
                             shouldValidateFutureTime={false}
                         />
-                    </View>
+                    </ScrollView>
                 </ScreenWrapper>
             </Modal>
         </>

From 08171c6b787a0370a849ad132708d8cdf7e96d87 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 14 Oct 2026 10:53:48 -0400
Subject: [PATCH 677/781] Stop syncing the test-staging route on deploy

wrangler looks up the zone before syncing routes, which the CI deploy token cannot do, so the deploy job failed after the Worker was already live. The route stays in place in Cloudflare; wrangler only replaces routes when some are configured.
---
 web/cloudflare-worker/README.md      | 4 ++--
 web/cloudflare-worker/wrangler.jsonc | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/cloudflare-worker/README.md b/web/cloudflare-worker/README.md
index 240e22d88fcd..7cbb1b0cefdd 100644
--- a/web/cloudflare-worker/README.md
+++ b/web/cloudflare-worker/README.md
@@ -107,11 +107,11 @@ The script diffs status, caching and security headers for a fixed set of paths.
 
 | Environment | Worker | Route | CSP |
 | --- | --- | --- | --- |
-| `test-staging` | `test-staging-new-expensify-assets` | `test-staging.new.expensify.com/*` | Staging |
+| `test-staging` | `test-staging-new-expensify-assets` | `test-staging.new.expensify.com/*` (managed in Cloudflare, not in `wrangler.jsonc`) | Staging |
 | `staging` | `staging-new-expensify-assets` | None until switchover, then `staging.new.expensify.com/*` | Staging |
 | `production` | `new-expensify-assets` | None until switchover, then `new.expensify.com/*` | Production |
 
-`test-staging` serves a staging build on a hostname nobody else uses. Every staging deploy also deploys the same build there (the `webDeployTestStaging` job in `.github/workflows/deploy.yml`), using `CLOUDFLARE_WORKERS_DEPLOY_TOKEN`, which can only edit this Worker. A failure there does not fail the staging deploy. To deploy it by hand, put a staging build in `dist/` and run:
+`test-staging` serves a staging build on a hostname nobody else uses. Every staging deploy also deploys the same build there (the `webDeployTestStaging` job in `.github/workflows/deploy.yml`), using `CLOUDFLARE_WORKERS_DEPLOY_TOKEN`, which can only edit this Worker. That token can't read zones, so the route isn't in `wrangler.jsonc`: wrangler would try to sync it and fail. A failure there does not fail the staging deploy. To deploy it by hand, put a staging build in `dist/` and run:
 
 ```bash
 npx wrangler deploy --env test-staging
diff --git a/web/cloudflare-worker/wrangler.jsonc b/web/cloudflare-worker/wrangler.jsonc
index 4a96b6d90679..611081288528 100644
--- a/web/cloudflare-worker/wrangler.jsonc
+++ b/web/cloudflare-worker/wrangler.jsonc
@@ -28,9 +28,10 @@
     },
     "env": {
         // Serves a staging build on a hostname nobody else uses, so it can be deployed and tested independently.
+        // Its route (test-staging.new.expensify.com/*) is managed in Cloudflare, not here: syncing routes needs zone
+        // access, and the CI deploy token can only edit this Worker.
         "test-staging": {
             "name": "test-staging-new-expensify-assets",
-            "routes": [{"pattern": "test-staging.new.expensify.com/*", "zone_name": "expensify.com"}],
             "vars": {
                 "ENVIRONMENT": "staging",
             },

From 37732e21bd048f5bab57267b0792f78a49a2df03 Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 15:07:54 +0000
Subject: [PATCH 678/781] Restore moved expenses to the carousel when the move
 request fails

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/libs/actions/Transaction.ts               | 32 ++++++++++++-----
 .../actions/TransactionThreadNavigation.ts    | 35 +++++++++++++------
 tests/actions/TransactionTest.ts              | 16 +++++++++
 .../TransactionThreadNavigationTest.ts        | 34 +++++++++++++-----
 4 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index ce7c21bc10ee..a61d2435c64b 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -90,7 +90,7 @@ import lodashClone from 'lodash/clone';
 import Onyx from 'react-native-onyx';
 
 import {getSearchOnyxUpdate} from './IOU/SearchUpdate';
-import {removeActiveTransactionIDsForReport} from './TransactionThreadNavigation';
+import {getRemoveActiveTransactionIDsForReportOnyxData} from './TransactionThreadNavigation';
 
 type SaveWaypointProps = {
     transactionID: string;
@@ -2142,13 +2142,22 @@ function getChangeTransactionsReportOnyxData({
 }
 
 /**
- * Drops moved expenses from a carousel seeded from the report they left, so its arrows stop paging to them.
+ * Builds the Onyx updates that drop moved expenses from a carousel seeded from the report they left, so its arrows stop
+ * paging to them. They go in the move's optimistic and failure data, so a failed move puts the expenses back.
  * Every move goes through `changeTransactionsReport`, so doing it here covers all entry points at once.
  */
-function removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID: Record<string, string[]> | undefined) {
+function getMovedTransactionsCarouselOnyxData(movedTransactionIDsByOldReportID: Record<string, string[]> | undefined) {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>> = [];
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>> = [];
     for (const [oldReportID, transactionIDs] of Object.entries(movedTransactionIDsByOldReportID ?? {})) {
-        removeActiveTransactionIDsForReport(transactionIDs, oldReportID);
+        const carouselOnyxData = getRemoveActiveTransactionIDsForReportOnyxData(transactionIDs, oldReportID);
+        if (!carouselOnyxData) {
+            continue;
+        }
+        optimisticData.push(...carouselOnyxData.optimisticData);
+        failureData.push(...carouselOnyxData.failureData);
     }
+    return {optimisticData, failureData};
 }
 
 function changeTransactionsReport(props: ChangeTransactionsReportProps) {
@@ -2202,8 +2211,12 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
             hash: props.hash,
         };
 
-        API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, queryParameters, {optimisticData, successData, failureData});
-        removeMovedTransactionsFromCarousel(loadedTransactionsOnyxData?.movedTransactionIDsByOldReportID);
+        const carouselOnyxData = getMovedTransactionsCarouselOnyxData(loadedTransactionsOnyxData?.movedTransactionIDsByOldReportID);
+        API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, queryParameters, {
+            optimisticData: [...optimisticData, ...carouselOnyxData.optimisticData],
+            successData,
+            failureData: [...failureData, ...carouselOnyxData.failureData],
+        });
         return;
     }
 
@@ -2235,14 +2248,15 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
         }),
     };
 
+    const carouselOnyxData = getMovedTransactionsCarouselOnyxData(movedTransactionIDsByOldReportID);
+
     // The all-matching path above already returned after its own API.write, so only one of the two writes ever runs
     // eslint-disable-next-line rulesdir/no-multiple-api-calls
     API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, parameters, {
-        optimisticData,
+        optimisticData: [...optimisticData, ...carouselOnyxData.optimisticData],
         successData,
-        failureData,
+        failureData: [...failureData, ...carouselOnyxData.failureData],
     });
-    removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID);
 }
 
 /**
diff --git a/src/libs/actions/TransactionThreadNavigation.ts b/src/libs/actions/TransactionThreadNavigation.ts
index 82fbf8c0756f..d037e89f9062 100644
--- a/src/libs/actions/TransactionThreadNavigation.ts
+++ b/src/libs/actions/TransactionThreadNavigation.ts
@@ -2,6 +2,8 @@ import type {TransactionThreadNavigationDescriptor} from '@libs/TransactionThrea
 
 import ONYXKEYS from '@src/ONYXKEYS';
 
+import type {OnyxUpdate} from 'react-native-onyx';
+
 import Onyx from 'react-native-onyx';
 
 /**
@@ -201,36 +203,49 @@ function clearActiveTransactionIDsForSource(source: string) {
     return clearActiveTransactionIDs();
 }
 
+type RemoveActiveTransactionIDsOnyxData = {
+    optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>>;
+    failureData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>>;
+};
+
 /**
- * Takes expenses that just left `reportID` out of a carousel seeded from that report.
+ * Builds the Onyx updates that take expenses leaving `reportID` out of a carousel seeded from that report.
  *
  * A report-scoped carousel lists the report's own expenses, so an expense moved or removed from the report no longer
  * belongs in it. Leaving it there kept the arrows on the report's header after it dropped to one expense, and
  * stepping to the moved expense opened it in its new home (for example the self-DM). Carousels from other screens,
  * such as search results, legitimately span several reports and are left alone.
+ *
+ * The updates ride along with the move request, so a failed move puts the expense back into the carousel together
+ * with putting it back into the report. The owner is kept even when the list empties, so it can still clear a list
+ * that a failed move restored.
  */
-function removeActiveTransactionIDsForReport(transactionIDs: string[], reportID: string | undefined) {
+function getRemoveActiveTransactionIDsForReportOnyxData(transactionIDs: string[], reportID: string | undefined): RemoveActiveTransactionIDsOnyxData | undefined {
     if (!lastSetIDs?.length || !transactionIDs.length || !reportID) {
-        return Promise.resolve();
+        return undefined;
     }
 
     const reportSources = new Set<string>([CAROUSEL_SOURCE.report(reportID), CAROUSEL_SOURCE.reportRow(reportID), CAROUSEL_SOURCE.reportPreview(reportID)]);
     if (!lastSetSource || !reportSources.has(lastSetSource)) {
-        return Promise.resolve();
+        return undefined;
     }
 
     const removedIDs = new Set(transactionIDs);
     const remainingIDs = lastSetIDs.filter((transactionID) => !removedIDs.has(transactionID));
     if (remainingIDs.length === lastSetIDs.length) {
-        return Promise.resolve();
+        return undefined;
     }
 
+    const previousIDs = lastSetIDs;
+
     // One expense left is nothing to page through.
-    if (remainingIDs.length < 2) {
-        return clearActiveTransactionIDs();
-    }
+    const nextIDs = remainingIDs.length < 2 ? null : remainingIDs;
+    lastSetIDs = nextIDs;
 
-    return setActiveTransactionIDs(remainingIDs, {source: lastSetSource, snapshotHash: lastSetSnapshotHash ?? undefined, descriptors: lastSetDescriptors ?? undefined});
+    return {
+        optimisticData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, value: nextIDs}],
+        failureData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, value: previousIDs}],
+    };
 }
 
 /**
@@ -253,7 +268,7 @@ export {
     setActiveTransactionIDs,
     clearActiveTransactionIDs,
     clearActiveTransactionIDsForSource,
-    removeActiveTransactionIDsForReport,
+    getRemoveActiveTransactionIDsForReportOnyxData,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts
index a932314899fd..825d7c9111e4 100644
--- a/tests/actions/TransactionTest.ts
+++ b/tests/actions/TransactionTest.ts
@@ -643,6 +643,22 @@ describe('actions/Transaction', () => {
                 expect(carouselTransactionIDs).toEqual(transactionIDs.slice(1));
             });
 
+            it('puts the expense back into the carousel when the move fails', async () => {
+                // Given a carousel seeded by opening an expense row in the source report
+                await setActiveTransactionIDs(transactionIDs, {source: CAROUSEL_SOURCE.reportRow(sourceReport.reportID)});
+                await waitForBatchedUpdates();
+
+                // When one of the report's expenses is moved but the request fails, which returns the expense to the report
+                const mockFetch = getGlobalFetchMock();
+                mockFetch.fail();
+                global.fetch = mockFetch;
+                await moveFirstTransactionToDestination();
+
+                // Then the expense is back in the carousel too, so the report's arrows page through it again
+                const carouselTransactionIDs = await getOnyxValue(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+                expect(carouselTransactionIDs).toEqual(transactionIDs);
+            });
+
             it('leaves a carousel seeded from another source untouched', async () => {
                 // Given a carousel seeded from search results, which legitimately spans several reports
                 await setActiveTransactionIDs(transactionIDs, {source: CAROUSEL_SOURCE.search(12345)});
diff --git a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
index 3e1f8fc3b452..1df5d51c5537 100644
--- a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
+++ b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
@@ -4,7 +4,7 @@ import {
     clearActiveTransactionIDsForSource,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
-    removeActiveTransactionIDsForReport,
+    getRemoveActiveTransactionIDsForReportOnyxData,
     setActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
 } from '@libs/actions/TransactionThreadNavigation';
@@ -286,17 +286,20 @@ describe('TransactionThreadNavigation carousel ownership', () => {
      * report left it in the report's carousel, so the report kept its arrows and stepping to the removed expense
      * opened the self-DM.
      */
-    describe('removeActiveTransactionIDsForReport', () => {
+    describe('getRemoveActiveTransactionIDsForReportOnyxData', () => {
         it('clears a report row carousel that drops to one expense', async () => {
             // Given an expense opened from report B's list, seeding the carousel with both of B's expenses
-            await setActiveTransactionIDs(REPORT_B_IDS, {source: CAROUSEL_SOURCE.reportRow('B')});
+            const reportRowSource = CAROUSEL_SOURCE.reportRow('B');
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: reportRowSource});
 
             // When one of them is removed from report B
-            await removeActiveTransactionIDsForReport(['B1'], 'B');
+            await Onyx.update(getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'B')?.optimisticData ?? []);
 
             // Then there is nothing left to page through, so the carousel is cleared and no arrows show
-            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: null, snapshotHash: null});
             expect((await readCarouselFromOnyx()).ids).toBeUndefined();
+
+            // And the report row still owns it, so it can clear a list a failed move restores
+            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: reportRowSource, snapshotHash: null});
         });
 
         it('keeps paging through the expenses still on the report', async () => {
@@ -304,21 +307,35 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             await setActiveTransactionIDs(['B1', 'B2', 'B3'], {source: REPORT_SOURCE});
 
             // When one expense moves to another report
-            await removeActiveTransactionIDsForReport(['B2'], 'B');
+            await Onyx.update(getRemoveActiveTransactionIDsForReportOnyxData(['B2'], 'B')?.optimisticData ?? []);
 
             // Then the other two stay in the carousel under the same owner
             expect(getActiveTransactionIDs()).toEqual({ids: ['B1', 'B3'], descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
             expect((await readCarouselFromOnyx()).ids).toEqual(['B1', 'B3']);
         });
 
+        it('restores the expense when the move fails', async () => {
+            // Given report B's own carousel with three expenses, one of which was just moved out
+            await setActiveTransactionIDs(['B1', 'B2', 'B3'], {source: REPORT_SOURCE});
+            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B2'], 'B');
+            await Onyx.update(onyxData?.optimisticData ?? []);
+
+            // When the move request fails, which returns the expense to report B
+            await Onyx.update(onyxData?.failureData ?? []);
+
+            // Then the expense is back in the carousel, so the arrows page through it again
+            expect((await readCarouselFromOnyx()).ids).toEqual(['B1', 'B2', 'B3']);
+        });
+
         it('leaves a search carousel alone, since it spans several reports', async () => {
             // Given a carousel seeded from the Spend page, which holds expenses from reports A and B
             await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
 
             // When an expense is removed from report B
-            await removeActiveTransactionIDsForReport(['B1'], 'B');
+            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'B');
 
             // Then the search carousel is untouched, because the expense is still one of its results
+            expect(onyxData).toBeUndefined();
             expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
         });
 
@@ -327,9 +344,10 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
 
             // When an expense leaves a different report
-            await removeActiveTransactionIDsForReport(['B1'], 'A');
+            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'A');
 
             // Then report B's carousel is untouched
+            expect(onyxData).toBeUndefined();
             expect(getActiveTransactionIDs()).toEqual({ids: REPORT_B_IDS, descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
         });
     });

From 4ed1f37b21b92186692f59f66e540584910fdda0 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 15:30:17 +0000
Subject: [PATCH 679/781] Update Mobile-Expensify submodule to 7b114fa

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index a62bb2829c36..7b114fac24e4 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit a62bb2829c366ada7113e92bd29eddb8a25b4e97
+Subproject commit 7b114fac24e4a28701357a7ea37c3e9091c5b312

From 7ab79943dbb2fc02cc2c1c457b5146b28aa16889 Mon Sep 17 00:00:00 2001
From: Chuck Dries <chuck@expensify.com>
Date: Wed, 14 Oct 2026 11:41:54 -0400
Subject: [PATCH 680/781] Remove useless Onyx.connect causing lint failures

---
 tests/unit/ReportUtilsGetIconsTest.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/unit/ReportUtilsGetIconsTest.ts b/tests/unit/ReportUtilsGetIconsTest.ts
index 5edd49674bfb..9f20280483bf 100644
--- a/tests/unit/ReportUtilsGetIconsTest.ts
+++ b/tests/unit/ReportUtilsGetIconsTest.ts
@@ -124,9 +124,6 @@ beforeAll(() => {
             ...FAKE_POLICIES,
         },
     });
-    // @ts-expect-error Until we add NVP_PRIVATE_DOMAINS to ONYXKEYS, we need to mock it here
-
-    Onyx.connect({key: ONYXKEYS.NVP_PRIVATE_DOMAINS, callback: () => {}});
 });
 
 describe('getIcons', () => {

From e55d3756d8f65921aa64c2b5388a12c778092a11 Mon Sep 17 00:00:00 2001
From: Carlos Miceli <carlosmiceli@expensify.com>
Date: Wed, 14 Oct 2026 13:11:08 -0300
Subject: [PATCH 681/781] fix: allow empty last name after workspace join

Last name is optional in personal details, so requiring it after joining a workspace traps users on the workspace list even though the join succeeds.
---
 .../BaseOnboardingWorkspaces.tsx              |  2 +-
 tests/ui/WorkspaceOnboarding.tsx              | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
index 9429a15ed586..3831fb29c6f5 100644
--- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
+++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
@@ -157,7 +157,7 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
         setOnboardingAdminsChatReportID();
         setOnboardingPolicyID(policy.policyID);
 
-        if (isJoiningCompanyWorkspace && (!onboardingPersonalDetails?.firstName.trim() || !onboardingPersonalDetails.lastName.trim())) {
+        if (isJoiningCompanyWorkspace && !onboardingPersonalDetails?.firstName.trim()) {
             Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(), {forceReplace: true});
             return;
         }
diff --git a/tests/ui/WorkspaceOnboarding.tsx b/tests/ui/WorkspaceOnboarding.tsx
index 7d0b8c2560ef..bd1f9254dcd0 100644
--- a/tests/ui/WorkspaceOnboarding.tsx
+++ b/tests/ui/WorkspaceOnboarding.tsx
@@ -709,6 +709,40 @@ describe('OnboardingWorkspaces Page', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    it('should complete onboarding after joining when only the required first name is present', async () => {
+        // Given a Join Workspace user who supplied the required first name and left the optional last name blank.
+        const policyID = 'joined-policy-id';
+        await TestHelper.signInWithTestUser();
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_PERSONAL_DETAILS_FORM, {firstName: 'Test', lastName: ''});
+            await Onyx.set(ONYXKEYS.JOINABLE_POLICIES, {
+                [policyID]: {
+                    policyID,
+                    policyName: 'Joined workspace',
+                    policyOwner: 'owner@example.com',
+                    employeeCount: 1,
+                    hasPendingAccess: false,
+                    automaticJoiningEnabled: true,
+                    policyType: CONST.POLICY.TYPE.CORPORATE,
+                },
+            });
+        });
+        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: ''});
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user joins the workspace.
+        fireEvent.press(screen.getByText(TestHelper.translateLocal('workspace.workspaceList.joinNow')));
+
+        // Then onboarding completes instead of trying to reopen the personal-details step.
+        expect(mockCompleteOnboarding).toHaveBeenCalledTimes(1);
+        expect(navigate).not.toHaveBeenCalledWith(ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(), {forceReplace: true});
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
     it('should finish the marked Join Workspace flow when the merged account has a different persisted intent', async () => {
         // Given a merge resumed from a Join Workspace task while the target account still persists a different intent.
         const dismissModalWithReport = jest.spyOn(Navigation, 'dismissModalWithReport').mockImplementation(() => {});

From 123d57b352e2800b2a068868ab7bde89a32cea0b Mon Sep 17 00:00:00 2001
From: "Eskalifer1 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 16:13:23 +0000
Subject: [PATCH 682/781] Trim the carousel directly instead of through the
 move's Onyx data

The failure rollback could write the old list back after the expense's header
had already cleared it, leaving an orphaned list that blocks the single-expense
redirect. It also left the module state trimmed while Onyx was restored, so a
retry skipped the trim. Write Onyx and the module state together instead.

Co-authored-by: Eskalifer1 <Eskalifer1@users.noreply.github.com>
---
 src/libs/actions/Transaction.ts               | 34 +++++----------
 .../actions/TransactionThreadNavigation.ts    | 42 ++++++-------------
 tests/actions/TransactionTest.ts              |  7 ++--
 .../TransactionThreadNavigationTest.ts        | 38 ++++++++---------
 4 files changed, 43 insertions(+), 78 deletions(-)

diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index a61d2435c64b..2b7e8a53407b 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -90,7 +90,7 @@ import lodashClone from 'lodash/clone';
 import Onyx from 'react-native-onyx';
 
 import {getSearchOnyxUpdate} from './IOU/SearchUpdate';
-import {getRemoveActiveTransactionIDsForReportOnyxData} from './TransactionThreadNavigation';
+import {removeActiveTransactionIDsForReport} from './TransactionThreadNavigation';
 
 type SaveWaypointProps = {
     transactionID: string;
@@ -2142,22 +2142,13 @@ function getChangeTransactionsReportOnyxData({
 }
 
 /**
- * Builds the Onyx updates that drop moved expenses from a carousel seeded from the report they left, so its arrows stop
- * paging to them. They go in the move's optimistic and failure data, so a failed move puts the expenses back.
- * Every move goes through `changeTransactionsReport`, so doing it here covers all entry points at once.
+ * Drops moved expenses from a carousel seeded from the report they left. Every move goes through
+ * `changeTransactionsReport`, so doing it here covers all entry points at once.
  */
-function getMovedTransactionsCarouselOnyxData(movedTransactionIDsByOldReportID: Record<string, string[]> | undefined) {
-    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>> = [];
-    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>> = [];
+function removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID: Record<string, string[]> | undefined) {
     for (const [oldReportID, transactionIDs] of Object.entries(movedTransactionIDsByOldReportID ?? {})) {
-        const carouselOnyxData = getRemoveActiveTransactionIDsForReportOnyxData(transactionIDs, oldReportID);
-        if (!carouselOnyxData) {
-            continue;
-        }
-        optimisticData.push(...carouselOnyxData.optimisticData);
-        failureData.push(...carouselOnyxData.failureData);
+        removeActiveTransactionIDsForReport(transactionIDs, oldReportID);
     }
-    return {optimisticData, failureData};
 }
 
 function changeTransactionsReport(props: ChangeTransactionsReportProps) {
@@ -2211,12 +2202,8 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
             hash: props.hash,
         };
 
-        const carouselOnyxData = getMovedTransactionsCarouselOnyxData(loadedTransactionsOnyxData?.movedTransactionIDsByOldReportID);
-        API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, queryParameters, {
-            optimisticData: [...optimisticData, ...carouselOnyxData.optimisticData],
-            successData,
-            failureData: [...failureData, ...carouselOnyxData.failureData],
-        });
+        API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, queryParameters, {optimisticData, successData, failureData});
+        removeMovedTransactionsFromCarousel(loadedTransactionsOnyxData?.movedTransactionIDsByOldReportID);
         return;
     }
 
@@ -2248,15 +2235,14 @@ function changeTransactionsReport(props: ChangeTransactionsReportProps) {
         }),
     };
 
-    const carouselOnyxData = getMovedTransactionsCarouselOnyxData(movedTransactionIDsByOldReportID);
-
     // The all-matching path above already returned after its own API.write, so only one of the two writes ever runs
     // eslint-disable-next-line rulesdir/no-multiple-api-calls
     API.write(WRITE_COMMANDS.CHANGE_TRANSACTIONS_REPORT, parameters, {
-        optimisticData: [...optimisticData, ...carouselOnyxData.optimisticData],
+        optimisticData,
         successData,
-        failureData: [...failureData, ...carouselOnyxData.failureData],
+        failureData,
     });
+    removeMovedTransactionsFromCarousel(movedTransactionIDsByOldReportID);
 }
 
 /**
diff --git a/src/libs/actions/TransactionThreadNavigation.ts b/src/libs/actions/TransactionThreadNavigation.ts
index d037e89f9062..226885d42762 100644
--- a/src/libs/actions/TransactionThreadNavigation.ts
+++ b/src/libs/actions/TransactionThreadNavigation.ts
@@ -2,8 +2,6 @@ import type {TransactionThreadNavigationDescriptor} from '@libs/TransactionThrea
 
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import type {OnyxUpdate} from 'react-native-onyx';
-
 import Onyx from 'react-native-onyx';
 
 /**
@@ -203,49 +201,33 @@ function clearActiveTransactionIDsForSource(source: string) {
     return clearActiveTransactionIDs();
 }
 
-type RemoveActiveTransactionIDsOnyxData = {
-    optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>>;
-    failureData: Array<OnyxUpdate<typeof ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS>>;
-};
-
 /**
- * Builds the Onyx updates that take expenses leaving `reportID` out of a carousel seeded from that report.
- *
- * A report-scoped carousel lists the report's own expenses, so an expense moved or removed from the report no longer
- * belongs in it. Leaving it there kept the arrows on the report's header after it dropped to one expense, and
- * stepping to the moved expense opened it in its new home (for example the self-DM). Carousels from other screens,
- * such as search results, legitimately span several reports and are left alone.
- *
- * The updates ride along with the move request, so a failed move puts the expense back into the carousel together
- * with putting it back into the report. The owner is kept even when the list empties, so it can still clear a list
- * that a failed move restored.
+ * Drops expenses that left `reportID` from a carousel seeded from that report, so its arrows stop paging to them.
+ * Carousels from other screens, such as search results, span several reports and are left alone.
  */
-function getRemoveActiveTransactionIDsForReportOnyxData(transactionIDs: string[], reportID: string | undefined): RemoveActiveTransactionIDsOnyxData | undefined {
+function removeActiveTransactionIDsForReport(transactionIDs: string[], reportID: string | undefined) {
     if (!lastSetIDs?.length || !transactionIDs.length || !reportID) {
-        return undefined;
+        return Promise.resolve();
     }
 
     const reportSources = new Set<string>([CAROUSEL_SOURCE.report(reportID), CAROUSEL_SOURCE.reportRow(reportID), CAROUSEL_SOURCE.reportPreview(reportID)]);
     if (!lastSetSource || !reportSources.has(lastSetSource)) {
-        return undefined;
+        return Promise.resolve();
     }
 
     const removedIDs = new Set(transactionIDs);
     const remainingIDs = lastSetIDs.filter((transactionID) => !removedIDs.has(transactionID));
     if (remainingIDs.length === lastSetIDs.length) {
-        return undefined;
+        return Promise.resolve();
     }
 
-    const previousIDs = lastSetIDs;
-
     // One expense left is nothing to page through.
-    const nextIDs = remainingIDs.length < 2 ? null : remainingIDs;
-    lastSetIDs = nextIDs;
+    if (remainingIDs.length < 2) {
+        return clearActiveTransactionIDs();
+    }
 
-    return {
-        optimisticData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, value: nextIDs}],
-        failureData: [{onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, value: previousIDs}],
-    };
+    lastSetIDs = remainingIDs;
+    return Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, remainingIDs);
 }
 
 /**
@@ -268,7 +250,7 @@ export {
     setActiveTransactionIDs,
     clearActiveTransactionIDs,
     clearActiveTransactionIDsForSource,
-    getRemoveActiveTransactionIDsForReportOnyxData,
+    removeActiveTransactionIDsForReport,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts
index 825d7c9111e4..9671d275c89b 100644
--- a/tests/actions/TransactionTest.ts
+++ b/tests/actions/TransactionTest.ts
@@ -643,7 +643,7 @@ describe('actions/Transaction', () => {
                 expect(carouselTransactionIDs).toEqual(transactionIDs.slice(1));
             });
 
-            it('puts the expense back into the carousel when the move fails', async () => {
+            it('does not write the carousel back when the move fails', async () => {
                 // Given a carousel seeded by opening an expense row in the source report
                 await setActiveTransactionIDs(transactionIDs, {source: CAROUSEL_SOURCE.reportRow(sourceReport.reportID)});
                 await waitForBatchedUpdates();
@@ -654,9 +654,10 @@ describe('actions/Transaction', () => {
                 global.fetch = mockFetch;
                 await moveFirstTransactionToDestination();
 
-                // Then the expense is back in the carousel too, so the report's arrows page through it again
+                // Then the failure leaves the carousel alone, because by the time it lands the screen that owned the list
+                // may already have cleared it, and writing it back would leave an orphaned list that nothing clears
                 const carouselTransactionIDs = await getOnyxValue(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
-                expect(carouselTransactionIDs).toEqual(transactionIDs);
+                expect(carouselTransactionIDs).toEqual(transactionIDs.slice(1));
             });
 
             it('leaves a carousel seeded from another source untouched', async () => {
diff --git a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
index 1df5d51c5537..e8dfd0e9506e 100644
--- a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
+++ b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
@@ -4,7 +4,7 @@ import {
     clearActiveTransactionIDsForSource,
     disownActiveTransactionIDs,
     getActiveTransactionIDs,
-    getRemoveActiveTransactionIDsForReportOnyxData,
+    removeActiveTransactionIDsForReport,
     setActiveTransactionIDs,
     shouldRefreshActiveTransactionIDs,
 } from '@libs/actions/TransactionThreadNavigation';
@@ -286,20 +286,17 @@ describe('TransactionThreadNavigation carousel ownership', () => {
      * report left it in the report's carousel, so the report kept its arrows and stepping to the removed expense
      * opened the self-DM.
      */
-    describe('getRemoveActiveTransactionIDsForReportOnyxData', () => {
+    describe('removeActiveTransactionIDsForReport', () => {
         it('clears a report row carousel that drops to one expense', async () => {
             // Given an expense opened from report B's list, seeding the carousel with both of B's expenses
-            const reportRowSource = CAROUSEL_SOURCE.reportRow('B');
-            await setActiveTransactionIDs(REPORT_B_IDS, {source: reportRowSource});
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: CAROUSEL_SOURCE.reportRow('B')});
 
             // When one of them is removed from report B
-            await Onyx.update(getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'B')?.optimisticData ?? []);
+            await removeActiveTransactionIDsForReport(['B1'], 'B');
 
             // Then there is nothing left to page through, so the carousel is cleared and no arrows show
             expect((await readCarouselFromOnyx()).ids).toBeUndefined();
-
-            // And the report row still owns it, so it can clear a list a failed move restores
-            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: reportRowSource, snapshotHash: null});
+            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: null, snapshotHash: null});
         });
 
         it('keeps paging through the expenses still on the report', async () => {
@@ -307,24 +304,23 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             await setActiveTransactionIDs(['B1', 'B2', 'B3'], {source: REPORT_SOURCE});
 
             // When one expense moves to another report
-            await Onyx.update(getRemoveActiveTransactionIDsForReportOnyxData(['B2'], 'B')?.optimisticData ?? []);
+            await removeActiveTransactionIDsForReport(['B2'], 'B');
 
             // Then the other two stay in the carousel under the same owner
             expect(getActiveTransactionIDs()).toEqual({ids: ['B1', 'B3'], descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
             expect((await readCarouselFromOnyx()).ids).toEqual(['B1', 'B3']);
         });
 
-        it('restores the expense when the move fails', async () => {
-            // Given report B's own carousel with three expenses, one of which was just moved out
+        it('trims again on a later move, since the module state matches Onyx', async () => {
+            // Given report B's own carousel with three expenses, one of which was already moved out
             await setActiveTransactionIDs(['B1', 'B2', 'B3'], {source: REPORT_SOURCE});
-            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B2'], 'B');
-            await Onyx.update(onyxData?.optimisticData ?? []);
+            await removeActiveTransactionIDsForReport(['B2'], 'B');
 
-            // When the move request fails, which returns the expense to report B
-            await Onyx.update(onyxData?.failureData ?? []);
+            // When a second expense moves out of report B
+            await removeActiveTransactionIDsForReport(['B3'], 'B');
 
-            // Then the expense is back in the carousel, so the arrows page through it again
-            expect((await readCarouselFromOnyx()).ids).toEqual(['B1', 'B2', 'B3']);
+            // Then the carousel is cleared, so the arrows don't come back for the last expense
+            expect((await readCarouselFromOnyx()).ids).toBeUndefined();
         });
 
         it('leaves a search carousel alone, since it spans several reports', async () => {
@@ -332,11 +328,11 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
 
             // When an expense is removed from report B
-            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'B');
+            await removeActiveTransactionIDsForReport(['B1'], 'B');
 
             // Then the search carousel is untouched, because the expense is still one of its results
-            expect(onyxData).toBeUndefined();
             expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+            expect((await readCarouselFromOnyx()).ids).toEqual(SPEND_PAGE_IDS);
         });
 
         it("leaves another report's carousel alone", async () => {
@@ -344,11 +340,11 @@ describe('TransactionThreadNavigation carousel ownership', () => {
             await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
 
             // When an expense leaves a different report
-            const onyxData = getRemoveActiveTransactionIDsForReportOnyxData(['B1'], 'A');
+            await removeActiveTransactionIDsForReport(['B1'], 'A');
 
             // Then report B's carousel is untouched
-            expect(onyxData).toBeUndefined();
             expect(getActiveTransactionIDs()).toEqual({ids: REPORT_B_IDS, descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
+            expect((await readCarouselFromOnyx()).ids).toEqual(REPORT_B_IDS);
         });
     });
 });

From 26f15668fd0187325651f25418b14a59ccaf88fc Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 16:25:19 +0000
Subject: [PATCH 683/781] Clear the onboarding work email error when pressing
 Back to the intent list

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 .../BaseOnboardingWorkEmail.tsx               |  6 ++-
 tests/ui/WorkEmailOnboardingNavigation.tsx    | 54 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 15b314007c43..329d746e509c 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -362,7 +362,11 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW
             {/* This screen normally opens onboarding, so there is nothing to go back to unless the intent list sent us here. */}
             <OnboardingHeader
                 shouldShowBackButton={isJoiningCompanyWorkspace && !isConciergeTaskFlow}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute())}
+                onBackButtonPress={() => {
+                    // Clear any work email error so the purpose screen doesn't render it without its translation params.
+                    clearOnboardingMergeAccountBlocked();
+                    Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute());
+                }}
                 shouldShowCloseButton={isConciergeTaskFlow}
                 onCloseButtonPress={onboardingValues?.isMergingAccountBlocked ? handleConciergeTaskErrorConfirm : returnToOriginReport}
             />
diff --git a/tests/ui/WorkEmailOnboardingNavigation.tsx b/tests/ui/WorkEmailOnboardingNavigation.tsx
index 3c777bdcd92b..f246d87a36ad 100644
--- a/tests/ui/WorkEmailOnboardingNavigation.tsx
+++ b/tests/ui/WorkEmailOnboardingNavigation.tsx
@@ -367,6 +367,60 @@ describe('Onboarding work email navigation', () => {
         });
     });
 
+    it('should clear the work email error when Back is pressed so the intent list does not show it', async () => {
+        await TestHelper.signInWithTestUser();
+
+        // Given AddWorkEmail failed with the domain-controlled error while joining a company workspace
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                isMergingAccountBlocked: true,
+            });
+            await Onyx.merge(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.mergeBlockScreen.domainControlledSubtitle');
+            await Onyx.merge(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithPurpose);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user presses Back instead of confirming the blocked screen
+        await waitFor(() => {
+            expect(screen.getByLabelText(TestHelper.translateLocal('common.back'))).toBeOnTheScreen();
+        });
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]);
+        });
+
+        // Then the error is cleared, because the intent list translates it without the work email and would show
+        // "undefined is a domain controlled login"
+        let errorMessageTranslationKey: OnyxEntry<string>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
+            callback: (value) => {
+                errorMessageTranslationKey = value ?? undefined;
+            },
+        });
+        expect(errorMessageTranslationKey).toBeFalsy();
+
+        let onboardingValues: OnyxEntry<Onboarding>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.NVP_ONBOARDING,
+            callback: (value) => {
+                onboardingValues = value;
+            },
+        });
+        expect(onboardingValues?.isMergingAccountBlocked).toBe(false);
+    });
+
     it('should keep Back working on a later visit to Join a workspace after the merge', async () => {
         await TestHelper.signInWithTestUser();
 

From f63475a0a324029cbd9f8bc90efff994c0d69c42 Mon Sep 17 00:00:00 2001
From: Sergei Sharabai <105950333+sharabai@users.noreply.github.com>
Date: Wed, 14 Oct 2026 18:38:15 +0200
Subject: [PATCH 684/781] Size the bar hit area from the predicted layout

---
 src/components/Charts/BarChart/VerticalBarChartContent.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index bfaac47883d5..73ecb16dac75 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -102,9 +102,6 @@ function VerticalBarChartCanvas({data, series, yAxisUnit, yAxisUnitPosition = 'l
     });
 
     const handleChartBoundsChange = (bounds: ChartBounds) => {
-        const domainWidth = bounds.right - bounds.left;
-        const {barWidth, gap} = getBarLayout(domainWidth, data.length);
-        barHitHalfWidth.set(barWidth > 0 ? barWidth / 2 + gap * BAR_HIT_GAP_RATIO : 0);
         plotTop.set(bounds.top);
         plotBottom.set(bounds.bottom);
         yZero.set(0);
@@ -132,6 +129,7 @@ function VerticalBarChartCanvas({data, series, yAxisUnit, yAxisUnitPosition = 'l
     });
 
     const handleScaleChange = (xScale: Scale, yScale: Scale) => {
+        barHitHalfWidth.set(barLayout.barWidth > 0 ? barLayout.barWidth / 2 + barLayout.gap * BAR_HIT_GAP_RATIO : 0);
         yZero.set(yScale(0));
         updateTickPositions(xScale, data.length);
         setPointPositions(

From d9dd5d00316d9d7789d4f6bf5dede33330ca1363 Mon Sep 17 00:00:00 2001
From: "Joseph Kaufman (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 16:46:20 +0000
Subject: [PATCH 685/781] Update help docs for pending Plaid card transactions

Co-authored-by: Joseph Kaufman <joekaufmanexpensify@users.noreply.github.com>
---
 .../Reconcile-Company-Card-Expenses.md          |  2 +-
 .../reports/Report-Approvals.md                 |  4 ++--
 .../Assign-Company-Cards.md                     |  1 +
 .../Connect-Personal-Cards.md                   |  2 ++
 ...-up-a-Direct-Connection-for-Company-Cards.md | 17 ++++++++++++++++-
 ...Company-Card-Connection-Across-Workspaces.md |  1 +
 .../reports-and-expenses/Approve-Expenses.md    |  2 +-
 .../Create-and-Submit-Reports.md                |  4 ++--
 8 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/docs/articles/expensify-classic/connect-credit-cards/Reconcile-Company-Card-Expenses.md b/docs/articles/expensify-classic/connect-credit-cards/Reconcile-Company-Card-Expenses.md
index 19b1ed1d8b83..c3aa80b9b295 100644
--- a/docs/articles/expensify-classic/connect-credit-cards/Reconcile-Company-Card-Expenses.md
+++ b/docs/articles/expensify-classic/connect-credit-cards/Reconcile-Company-Card-Expenses.md
@@ -94,5 +94,5 @@ Only Domain Admins can access the Reconciliation tool.
    - Amount
    - Last four digits of the card number
 
-**Note: Only posted transactions will be imported.**
+**Note: Only posted transactions will be imported, except for cards connected through Plaid. Plaid cards also import pending transactions, which are marked as pending until they post.**
 
diff --git a/docs/articles/expensify-classic/reports/Report-Approvals.md b/docs/articles/expensify-classic/reports/Report-Approvals.md
index 1af13e89bf83..e6d41e32b1ab 100644
--- a/docs/articles/expensify-classic/reports/Report-Approvals.md
+++ b/docs/articles/expensify-classic/reports/Report-Approvals.md
@@ -263,7 +263,7 @@ Only **Domain Admins** have access.
    - Amount
    - The last four digits of the card
 
-**Note:** Only posted credit card transactions will import.
+**Note:** Only posted credit card transactions will import, except for cards connected through Plaid. Plaid cards also import pending transactions, which are marked as pending until they post.
 
 
 No. Concierge Receipt Audit is automatically enabled for all Control plan workspaces and cannot be turned off.
@@ -282,7 +282,7 @@ Use the **Reconciliation tool** to find missing expenses:
   - Amount  
   - Last four digits of the card number
 
-**Note:** Only **posted transactions** will be imported.
+**Note:** Only **posted transactions** will be imported, except for cards connected through Plaid. Plaid cards also import pending transactions, which are marked as pending until they post.
 
 ## Can admins delete expenses on behalf of members?
 
diff --git a/docs/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards.md b/docs/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards.md
index 29403cce3bac..aa5d5e5eff58 100644
--- a/docs/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards.md
+++ b/docs/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards.md
@@ -41,6 +41,7 @@ If you haven’t set up a company card feed yet, learn how to set one up:
 ## What happens after you assign company cards
 
 - Posted transactions from the assigned card import automatically into the member's account as expenses.
+- If the card is connected through Plaid, pending transactions also import and are marked as pending until they post. [Learn which connections import pending transactions](/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards#do-pending-transactions-import-from-a-direct-connection).
 - Expensify imports transactions from the **Transaction start date** onward.
 - The imported company card expenses are added to reports and submitted according to workspace rules.
 
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
index 6ba11d39b978..024f46fb59b8 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
@@ -30,6 +30,8 @@ Anyone with an Expensify account can connect up to two personal cards for free.
 
 Once your card is connected, it will appear under **Cards** in the **Wallet**, and transactions will begin importing automatically.
 
+If your card is connected through Plaid, pending transactions also import. They're marked as pending and update automatically when they post. Cards connected through your bank's secure login (oAuth) import transactions after they post.
+
 ---
 
 ## What to do if you see a company card warning
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards.md b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards.md
index fe63c007544a..e3002e7f5c76 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards.md
@@ -1,7 +1,7 @@
 ---
 title: Set up a Direct Connection for Company Cards
 description: Learn how to connect a company card account using a direct connection so its cards can be assigned to workspace members and their transactions imported into Expensify.
-keywords: [New Expensify, set up direct company card connection, connect company cards Expensify, direct connection Expensify, direct feed Expensify, Plaid company cards]
+keywords: [New Expensify, set up direct company card connection, connect company cards Expensify, direct connection Expensify, direct feed Expensify, Plaid company cards, pending company card transactions, Plaid pending transactions]
 internalScope: Audience is workspace admins and card admins. Covers connecting a company card account using a direct connection or Plaid. Does not cover assigning cards, managing cards, or troubleshooting connections.
 retrievalIntent: How to set up a direct connection to a bank or card provider for company cards.
 contentType: task
@@ -48,6 +48,7 @@ To set up a direct connection, you must:
 
 - Cards with recent expenses appear as a list and can be assigned to workspace members.
 - After a card is assigned, posted transactions import into the assigned member's account automatically as expenses.
+- If the card is connected through Plaid, pending transactions also import. They're marked as pending until they post. [Learn which connections import pending transactions](#do-pending-transactions-import-from-a-direct-connection).
 
 [Learn how to assign company cards](/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards).
 
@@ -92,6 +93,20 @@ If you're still unable to connect to your bank, you can [import company card tra
 
 Yes, direct connections can be shared across workspaces. [Learn how to share a company card connection across workspaces](/articles/new-expensify/connect-credit-cards/connect-company-cards/Share-a-Company-Card-Connection-Across-Workspaces).
 
+## Do pending transactions import from a direct connection?
+
+Pending transactions import only for cards connected through Plaid (the **Other** option in the bank list). Cards connected to any other bank in the list import transactions after they post, which typically takes 1–3 business days.
+
+When a pending transaction imports:
+
+- It's marked as pending until it posts.
+- It updates automatically when the transaction posts.
+- It's removed if the bank cancels the transaction or it doesn't post.
+
+A report can't be submitted or approved while every expense on it is pending.
+
+If you delete a pending expense, the transaction may import again after it posts.
+
 ## Can I import debit card transactions?
 
 Yes, debit card transactions can be imported by following the same steps for setting up a direct connection for company cards.
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Share-a-Company-Card-Connection-Across-Workspaces.md b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Share-a-Company-Card-Connection-Across-Workspaces.md
index 8b429d92725c..d86370751e60 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Share-a-Company-Card-Connection-Across-Workspaces.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Share-a-Company-Card-Connection-Across-Workspaces.md
@@ -52,6 +52,7 @@ To share a company card connection, you must:
 
 - Individual cards appear as a list and can be assigned to workspace members.
 - After a card is assigned, posted transactions import into the assigned member's account automatically as expenses.
+- If the card is connected through Plaid, pending transactions also import and are marked as pending until they post. [Learn which connections import pending transactions](/articles/new-expensify/connect-credit-cards/connect-company-cards/Set-up-a-Direct-Connection-for-Company-Cards#do-pending-transactions-import-from-a-direct-connection).
 
 [Learn how to assign company cards](/articles/new-expensify/connect-credit-cards/configure-and-manage-company-cards/Assign-Company-Cards).
 
diff --git a/docs/articles/new-expensify/reports-and-expenses/Approve-Expenses.md b/docs/articles/new-expensify/reports-and-expenses/Approve-Expenses.md
index eb0f3ddc1f7d..6af9bfc99e0d 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Approve-Expenses.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Approve-Expenses.md
@@ -168,7 +168,7 @@ The outdated row is removed from the report. The expense itself is not deleted 
 # FAQ
 
 ## Why can't I action a pending expense? 
-Expensify Card expenses show as pending until the merchant posts them. This can take 1–3 business days. Hotel or rental car holds may take longer (up to 31 days for hotels). Only posted expenses can be approved. 
+Expensify Card expenses, and expenses from cards connected through Plaid, show as pending until the merchant posts them. This can take 1–3 business days. Hotel or rental car holds may take longer (up to 31 days for hotels). Only posted expenses can be approved. 
 
 ## Why can’t I see Bypass approvers?
 Only Workspace admins can bypass the prescribed approval workflow. If **Prevent Self-Approval** is enabled, an admin cannot bypass approvals to approve their own report. 
diff --git a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
index cc0b8a686ee0..2f2f4bbef412 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
@@ -229,9 +229,9 @@ Unsubmitted reports will remain in your Open reports section. You can go back an
 
 The **Submit** button only appears once your report includes at least one valid expense. If the report has already been submitted, the button will no longer be visible. If your workspace has no approval workflow, the button will say **Mark as done** instead of **Submit**.
 
-## Why can’t I submit a report with pending Expensify Card transactions?
+## Why can’t I submit a report with pending card transactions?
 
-If all transactions on your report are pending Expensify Card transactions, the report can't be submitted yet. The **Submit** button won't appear, and the report isn't counted in your **Submit** to-do. Pending transactions may take a few days to post. After at least one transaction has posted, the **Submit** button appears again and you can submit the report.
+If all transactions on your report are pending card transactions, the report can't be submitted yet. This applies to the Expensify Card and to company or personal cards connected through Plaid. The **Submit** button won't appear, and the report isn't counted in your **Submit** to-do. Pending transactions may take a few days to post. After at least one transaction has posted, the **Submit** button appears again and you can submit the report.
 
 ## What happens to held expenses when I submit a report?
 

From 6eb4e9a27813b52b191fa4af9614cd37f5f783ff Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 16:50:44 +0000
Subject: [PATCH 686/781] Auto-tighten eslint-seatbelt baseline

---
 config/eslint/eslint.seatbelt.tsv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 968073a518b3..1e06d3ddeb34 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -848,7 +848,7 @@
 "../../src/libs/Navigation/helpers/dynamicRoutesUtils/getDynamicRouteAdaptedState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Navigation/helpers/dynamicRoutesUtils/getDynamicRouteQueryParams.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Navigation/helpers/dynamicRoutesUtils/getPathWithoutDynamicSuffix.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/libs/Navigation/helpers/getAdaptedStateFromPath.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
+"../../src/libs/Navigation/helpers/getAdaptedStateFromPath.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/libs/Navigation/helpers/getOnboardingRouteFromScreen.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/Navigation/helpers/getParamsFromRoute.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/Navigation/helpers/getPathFromState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
@@ -914,7 +914,7 @@
 "../../src/libs/ReportTitleUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/getPolicy"	27
 "../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	16
-"../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/translateLocal"	8
+"../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/translateLocal"	7
 "../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	31
 "../../src/libs/ReportUtils.ts"	"rulesdir/no-onyx-connect"	13
 "../../src/libs/sanitizeLogParams.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2

From ddb90450fdc07cd154608b2da84d41a91d33f230 Mon Sep 17 00:00:00 2001
From: "Joseph Kaufman (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 17:13:57 +0000
Subject: [PATCH 687/781] Clarify that Submit still shows for pending-only
 reports and opens an error modal

Co-authored-by: Joseph Kaufman <joekaufmanexpensify@users.noreply.github.com>
---
 .../reports-and-expenses/Create-and-Submit-Reports.md           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
index 2f2f4bbef412..305e9d198803 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
@@ -231,7 +231,7 @@ The **Submit** button only appears once your report includes at least one valid
 
 ## Why can’t I submit a report with pending card transactions?
 
-If all transactions on your report are pending card transactions, the report can't be submitted yet. This applies to the Expensify Card and to company or personal cards connected through Plaid. The **Submit** button won't appear, and the report isn't counted in your **Submit** to-do. Pending transactions may take a few days to post. After at least one transaction has posted, the **Submit** button appears again and you can submit the report.
+If all transactions on your report are pending card transactions, the report can't be submitted yet. This applies to the Expensify Card and to company or personal cards connected through Plaid. The **Submit** button still appears, but if you select it, a message explains that the report can't be submitted because all transactions are pending. The report also isn't counted in your **Submit** to-do. Pending transactions may take a few days to post. After at least one transaction has posted, you can submit the report.
 
 ## What happens to held expenses when I submit a report?
 

From d1b739a6c187d36b71a40fa1ef334351e250ce5a Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 17:14:19 +0000
Subject: [PATCH 688/781] Pass the work email when the purpose page translates
 merge-block errors

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 .../BaseOnboardingPurpose.tsx                 | 16 +++++++++++++-
 tests/ui/OnboardingPurpose.tsx                | 21 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 40858a9131c5..bd66c16d645a 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -32,6 +32,7 @@ import {clearOnboardingMergeAccountBlocked, setOnboardingErrorMessage, setOnboar
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm';
 import type {OnboardingPurpose} from '@src/types/onyx';
 import getEmptyArray from '@src/types/utils/getEmptyArray';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
@@ -86,6 +87,8 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
     const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID);
     const [adminsChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${onboardingAdminsChatReportID}`);
     const [personalDetailsForm] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_PERSONAL_DETAILS_FORM);
+    const [workEmailForm] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM);
+    const workEmail = workEmailForm?.[INPUT_IDS.ONBOARDING_WORK_EMAIL];
     const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
@@ -220,6 +223,17 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
     const onboardingLocalRef = useRef<TOnboardingRef>(null);
     useImperativeHandle(isFocused ? OnboardingRefManager.ref : onboardingLocalRef, () => ({handleOuterClick}), [handleOuterClick]);
 
+    const getErrorMessage = () => {
+        if (!onboardingErrorMessage) {
+            return undefined;
+        }
+        // These merge-block messages interpolate the work email, so translate them with the email explicitly.
+        if (onboardingErrorMessage === 'onboarding.mergeBlockScreen.domainControlledSubtitle' || onboardingErrorMessage === 'onboarding.mergeBlockScreen.validatedPublicDomainSubtitle') {
+            return translate(onboardingErrorMessage, workEmail);
+        }
+        return translate(onboardingErrorMessage);
+    };
+
     if (isLoadingOnyxValue(onboardingErrorMessageResult)) {
         return null;
     }
@@ -250,7 +264,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
                 </View>
             </ScrollView>
             <View style={[styles.w100, styles.mb5, styles.mh0, paddingHorizontal]}>
-                <FormHelpMessage message={onboardingErrorMessage ? translate(onboardingErrorMessage) : undefined} />
+                <FormHelpMessage message={getErrorMessage()} />
             </View>
         </ScreenWrapper>
     );
diff --git a/tests/ui/OnboardingPurpose.tsx b/tests/ui/OnboardingPurpose.tsx
index 80b19514c7aa..ceda8a077186 100644
--- a/tests/ui/OnboardingPurpose.tsx
+++ b/tests/ui/OnboardingPurpose.tsx
@@ -226,6 +226,27 @@ describe('OnboardingPurpose Page', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    it('should show the work email in a domain-controlled error that reaches the purpose page', async () => {
+        // Given a domain-controlled merge error left behind by the work email step, with the email still in the form
+        const workEmail = 'tester@applause.expensifail.com';
+        await TestHelper.signInWithTestUser(1, 'test@gmail.com');
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {onboardingWorkEmail: workEmail});
+            await Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.mergeBlockScreen.domainControlledSubtitle');
+        });
+
+        // When the purpose page renders that error
+        const {unmount} = renderOnboardingPurposePage(SCREENS.ONBOARDING.PURPOSE, {backTo: ''});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the message names the work email instead of "undefined", because the key interpolates the email
+        expect(screen.getByText(TestHelper.translateLocal('onboarding.mergeBlockScreen.domainControlledSubtitle', workEmail))).toBeOnTheScreen();
+        expect(screen.queryByText(/undefined is a domain controlled login/)).not.toBeOnTheScreen();
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
     it('should navigate to personal details page when user selects EMPLOYER and is from public domain', async () => {
         await TestHelper.signInWithTestUser();
 

From b9d701d81a4e62404755fd63553bd95c6affd178 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:29:31 -0700
Subject: [PATCH 689/781] fix(report): use shared onyx data type

---
 src/libs/actions/Report/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 32ec8c6d3db9..9494c9f9fb09 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -224,6 +224,7 @@ import CONFIG from '@src/CONFIG';
 import type {OnboardingAccounting} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxData} from '@src/types/onyx/Request';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/NewRoomForm';
@@ -4897,10 +4898,7 @@ function isNoSupportRepAvailableResponse(response: {jsonCode?: number | string;
 function openSupportTicket(resolvedSupportTicketReportID?: string) {
     const newSupportTicketReportID = resolvedSupportTicketReportID ? undefined : generateReportID();
     const parameters: CreateSupportTicketParams = resolvedSupportTicketReportID ? {resolvedSupportTicketReportID, idempotencyKey: Str.guid()} : {newSupportTicketReportID};
-    const onyxData: {
-        optimisticData?: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT>>;
-        failureData?: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT>>;
-    } = newSupportTicketReportID
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_METADATA> = newSupportTicketReportID
         ? {
               optimisticData: [
                   {

From f68d4beb3a35c9e1945881c71d8b0130d9a66f0d Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:32:41 -0700
Subject: [PATCH 690/781] fix(support): stack survey feedback controls

---
 .../ReportActionItem/SupportTicketSurvey.tsx  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/ReportActionItem/SupportTicketSurvey.tsx b/src/components/ReportActionItem/SupportTicketSurvey.tsx
index 4af75ac2c326..8ffdd21d53a9 100644
--- a/src/components/ReportActionItem/SupportTicketSurvey.tsx
+++ b/src/components/ReportActionItem/SupportTicketSurvey.tsx
@@ -59,19 +59,15 @@ function SupportTicketSurvey({action, report, reportID}: SupportTicketSurveyProp
     }
 
     return (
-        <View style={[styles.chatItemMessage, styles.flexRow, styles.flexWrap, styles.alignItemsCenter]}>
-            <Text style={[styles.textSupporting, styles.flexShrink1]}>{translate('supportTicket.surveyPrompt')}</Text>
+        <View style={styles.chatItemMessage}>
+            <Text style={styles.textSupporting}>{translate('supportTicket.surveyPrompt')}</Text>
             {canRateSurvey && (
-                <View style={styles.ml1}>
-                    <ConciergeFeedbackPrompt
-                        action={action}
-                        reportID={reportID}
-                        shouldShowPrompt={false}
-                        shouldPersistAfterRating
-                        shouldShowTooltips={false}
-                        shouldRenderInline
-                    />
-                </View>
+                <ConciergeFeedbackPrompt
+                    action={action}
+                    reportID={reportID}
+                    shouldShowPrompt={false}
+                    shouldPersistAfterRating
+                />
             )}
         </View>
     );

From 98eaa391d532734f84e1dcc983fc97587a4703d0 Mon Sep 17 00:00:00 2001
From: "Joseph Kaufman (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 17:33:50 +0000
Subject: [PATCH 691/781] State the pending-transaction submission rule without
 describing button visibility

Co-authored-by: Joseph Kaufman <joekaufmanexpensify@users.noreply.github.com>
---
 .../reports-and-expenses/Create-and-Submit-Reports.md           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
index 305e9d198803..d7d4cb2a50f2 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md
@@ -231,7 +231,7 @@ The **Submit** button only appears once your report includes at least one valid
 
 ## Why can’t I submit a report with pending card transactions?
 
-If all transactions on your report are pending card transactions, the report can't be submitted yet. This applies to the Expensify Card and to company or personal cards connected through Plaid. The **Submit** button still appears, but if you select it, a message explains that the report can't be submitted because all transactions are pending. The report also isn't counted in your **Submit** to-do. Pending transactions may take a few days to post. After at least one transaction has posted, you can submit the report.
+If all transactions on a report are pending, the report can’t be submitted yet. This applies to Expensify Card transactions and to company or personal cards connected through Plaid. You can submit the report once at least one transaction posts.
 
 ## What happens to held expenses when I submit a report?
 

From 36ec9f3f74673d03379e3e0d431eaac675c1ff30 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:35:31 -0700
Subject: [PATCH 692/781] style(report): sort onyx data import

---
 src/libs/actions/Report/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 9494c9f9fb09..8ab475c25cea 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -224,7 +224,6 @@ import CONFIG from '@src/CONFIG';
 import type {OnboardingAccounting} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {OnyxData} from '@src/types/onyx/Request';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/NewRoomForm';
@@ -264,6 +263,7 @@ import type {CurrentUserPersonalDetails, Timezone} from '@src/types/onyx/Persona
 import type {ConnectionName} from '@src/types/onyx/Policy';
 import type {NotificationPreference, Participants, Participant as ReportParticipant, RoomVisibility, WriteCapability} from '@src/types/onyx/Report';
 import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
+import type {OnyxData} from '@src/types/onyx/Request';
 import type {SearchResultDataType} from '@src/types/onyx/SearchResults';
 import type {FileObject} from '@src/types/utils/Attachment';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';

From 178dc4e21df5e39f4c505f7beb2ff3b8f6678bda Mon Sep 17 00:00:00 2001
From: "Joseph Kaufman (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 17:41:22 +0000
Subject: [PATCH 693/781] Note that pending Plaid card transactions can
 auto-merge with SmartScanned receipts

Co-authored-by: Joseph Kaufman <joekaufmanexpensify@users.noreply.github.com>
---
 .../reports-and-expenses/Why-Expenses-Duplicate.md        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/articles/new-expensify/reports-and-expenses/Why-Expenses-Duplicate.md b/docs/articles/new-expensify/reports-and-expenses/Why-Expenses-Duplicate.md
index 5dd2c097d3c4..c14c4fb2ee4d 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Why-Expenses-Duplicate.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Why-Expenses-Duplicate.md
@@ -35,14 +35,14 @@ Expensify automatically merges a SmartScanned receipt with a matching card trans
 - The transaction dates match
 - The currencies match or fall within the allowed foreign exchange tolerance
 - Only one possible match exists
-- The card transaction posts within seven days of the receipt being SmartScanned
+- The card transaction posts within seven days of the receipt being SmartScanned. For cards connected through Plaid, the pending transaction can merge before it posts.
 
 **Expenses will not automatically merge if:** 
 
 - The receipt was not SmartScanned or SmartScan did not complete
-- Expense details were edited before the card transaction posted
+- Expense details were edited before the card transaction posted (or, for cards connected through Plaid, before the pending transaction imported)
 - The amount, date, or currency differs beyond tolerance
-- The card transaction posts after seven days
+- The card transaction posts after seven days (or, for cards connected through Plaid, the pending transaction imports after seven days)
 - The foreign exchange difference exceeds five percent
 - The receipt is already matched to another expense
 - Both expenses are card transactions
@@ -94,7 +94,7 @@ If both expenses are card transactions, they cannot be merged. Instead, [delete
 This happens when the receipt and card transaction did not merge into a single expense. This is usually due to differences in amount, date, currency, or timing.
 
 ## Why didn’t my receipt merge with my card transaction? 
-SmartScan requires a close match in amount, date, and currency. If those details differ, or if the card transaction has not posted within seven days, the expenses will not merge automatically.
+SmartScan requires a close match in amount, date, and currency. If those details differ, or if the card transaction has not posted within seven days (for cards connected through Plaid, imported as pending within seven days), the expenses will not merge automatically.
 
 ## Can uploading the same receipt twice create duplicates?
 

From 1bcda5d9c29be46f59531d20ab2e45acc4fd09c5 Mon Sep 17 00:00:00 2001
From: "Carlos Miceli (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 17:44:51 +0000
Subject: [PATCH 694/781] Let Android back leave onboarding work email when the
 intent list opened it

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
---
 .../BaseOnboardingWorkEmail.tsx               |  6 +-
 .../OnboardingWorkEmail/index.native.tsx      |  9 ++-
 tests/ui/WorkEmailOnboardingNativeBack.tsx    | 77 ++++++++++++++++++-
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 15b314007c43..2a8522c5c7c1 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -362,7 +362,11 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW
             {/* This screen normally opens onboarding, so there is nothing to go back to unless the intent list sent us here. */}
             <OnboardingHeader
                 shouldShowBackButton={isJoiningCompanyWorkspace && !isConciergeTaskFlow}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute())}
+                onBackButtonPress={() => {
+                    // Clear any work email error so it doesn't follow the user back to the intent list.
+                    clearOnboardingMergeAccountBlocked();
+                    Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute());
+                }}
                 shouldShowCloseButton={isConciergeTaskFlow}
                 onCloseButtonPress={onboardingValues?.isMergingAccountBlocked ? handleConciergeTaskErrorConfirm : returnToOriginReport}
             />
diff --git a/src/pages/OnboardingWorkEmail/index.native.tsx b/src/pages/OnboardingWorkEmail/index.native.tsx
index b43a629125a2..b64770644601 100644
--- a/src/pages/OnboardingWorkEmail/index.native.tsx
+++ b/src/pages/OnboardingWorkEmail/index.native.tsx
@@ -9,9 +9,16 @@ import type {OnboardingWorkEmailProps} from './types';
 import BaseOnboardingWorkEmail from './BaseOnboardingWorkEmail';
 
 function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
+    const {index: routeIndex} = props.navigation.getState();
+
     // To block android native back button behavior
     useFocusEffect(
         useCallback(() => {
+            // We don't want to block the back button if this is not the first route, e.g. when the intent list sent us here
+            if (routeIndex !== 0) {
+                return;
+            }
+
             // Return true to indicate that the back button press is handled here
             const backAction = () => {
                 setOnboardingErrorMessage('onboarding.purpose.errorBackButton');
@@ -21,7 +28,7 @@ function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
             const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
 
             return () => backHandler.remove();
-        }, []),
+        }, [routeIndex]),
     );
     return (
         <BaseOnboardingWorkEmail
diff --git a/tests/ui/WorkEmailOnboardingNativeBack.tsx b/tests/ui/WorkEmailOnboardingNativeBack.tsx
index 68464ebcdc7a..b7aa08d2e804 100644
--- a/tests/ui/WorkEmailOnboardingNativeBack.tsx
+++ b/tests/ui/WorkEmailOnboardingNativeBack.tsx
@@ -28,7 +28,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import type {HardwareBackPressEvent} from 'react-native/Libraries/Utilities/BackHandler';
 
 import {PortalProvider} from '@gorhom/portal';
-import {NavigationContainer} from '@react-navigation/native';
+import {NavigationContainer, StackActions} from '@react-navigation/native';
 import React from 'react';
 import {BackHandler, View} from 'react-native';
 import Onyx from 'react-native-onyx';
@@ -322,4 +322,79 @@ describe('Onboarding work email validation (Android system back)', () => {
             expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
         });
     });
+
+    it('should swallow a system back press and show the error when work email is the first onboarding screen', async () => {
+        // Given work email is the only onboarding route, which is where a public-domain account starts onboarding
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When Android's system back button is pressed
+        const consumed = pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the press is consumed so it cannot pop the onboarding modal, and the user is told to finish setup
+        expect(consumed).toBe(true);
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL]);
+        let errorMessage: OnyxEntry<string>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
+            callback: (value) => {
+                errorMessage = value ?? undefined;
+            },
+        });
+        expect(errorMessage).toBe('onboarding.purpose.errorBackButton');
+    });
+
+    it('should let a system back press through when the join workspace intent opened work email', async () => {
+        // Given the intent list sent the user to work email after they picked "Join my company workspace", so there
+        // is a real screen behind this one
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Push work email after mount like the intent list does, so its back handler subscribes after the
+        // NavigationContainer's one and gets the press first, as it does in the app
+        act(() => {
+            navigationRef.dispatch(StackActions.push(SCREENS.ONBOARDING.WORK_EMAIL));
+        });
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.WORK_EMAIL]);
+
+        // When Android's system back button is pressed
+        pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then no handler swallows it, the onboarding stack pops as normal, and no error is left behind
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+        });
+        let errorMessage: OnyxEntry<string>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
+            callback: (value) => {
+                errorMessage = value ?? undefined;
+            },
+        });
+        expect(errorMessage).toBeUndefined();
+    });
 });

From a7e3407635d268370ac2558e67430dd584953d99 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:54:26 -0700
Subject: [PATCH 695/781] fix(support): show selected survey reaction bubble

---
 .../ReportActionItem/SupportTicketSurvey.tsx  |  1 +
 .../ConciergeFeedbackPrompt.tsx               | 49 +++++++++++++------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/components/ReportActionItem/SupportTicketSurvey.tsx b/src/components/ReportActionItem/SupportTicketSurvey.tsx
index 8ffdd21d53a9..58053c77a38b 100644
--- a/src/components/ReportActionItem/SupportTicketSurvey.tsx
+++ b/src/components/ReportActionItem/SupportTicketSurvey.tsx
@@ -67,6 +67,7 @@ function SupportTicketSurvey({action, report, reportID}: SupportTicketSurveyProp
                     reportID={reportID}
                     shouldShowPrompt={false}
                     shouldPersistAfterRating
+                    shouldRenderSelectedReactionBubble
                 />
             )}
         </View>
diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index ffa5b4e2724a..c95b7e7bd56f 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -1,6 +1,7 @@
 import type {Emoji} from '@assets/emojis/types';
 
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import EmojiReactionBubble from '@components/Reactions/EmojiReactionBubble';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip/PopoverAnchorTooltip';
@@ -47,6 +48,9 @@ type ConciergeFeedbackPromptProps = {
 
     /** Whether to place only the thumbs inline with surrounding content */
     shouldRenderInline?: boolean;
+
+    /** Whether a selected thumb should use the standard selected reaction bubble */
+    shouldRenderSelectedReactionBubble?: boolean;
 };
 
 /** A reaction can be stored under the emoji name or under its hexcode, so both keys are read */
@@ -90,28 +94,39 @@ type ConciergeFeedbackThumbProps = {
 
     /** Whether the current user selected this rating */
     isSelected: boolean;
+
+    /** Whether a selected thumb should use the standard selected reaction bubble */
+    shouldRenderSelectedReactionBubble: boolean;
 };
 
-function ConciergeFeedbackThumb({emoji, label, accessibilityLabel, onPress, shouldShowTooltip, isSelected}: ConciergeFeedbackThumbProps) {
+function ConciergeFeedbackThumb({emoji, label, accessibilityLabel, onPress, shouldShowTooltip, isSelected, shouldRenderSelectedReactionBubble}: ConciergeFeedbackThumbProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const theme = useTheme();
 
-    const thumb = (
-        <PressableWithFeedback
-            style={[styles.conciergeFeedbackThumb, isSelected && StyleUtils.getBackgroundColorStyle(theme.reactionActiveBackground), styles.userSelectNone]}
-            hoverStyle={styles.conciergeFeedbackThumbHovered}
-            pressStyle={styles.conciergeFeedbackThumbHovered}
-            onPress={onPress}
-            accessibilityLabel={accessibilityLabel}
-            role={CONST.ROLE.BUTTON}
-            pressDimmingValue={1}
-            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
-            sentryLabel={CONST.SENTRY_LABEL.CONCIERGE_FEEDBACK.THUMB}
-        >
-            <Text style={styles.conciergeFeedbackThumbEmoji}>{emoji.code}</Text>
-        </PressableWithFeedback>
-    );
+    const thumb =
+        isSelected && shouldRenderSelectedReactionBubble ? (
+            <EmojiReactionBubble
+                emojiCodes={[emoji.code]}
+                count={1}
+                hasUserReacted
+                onPress={onPress}
+            />
+        ) : (
+            <PressableWithFeedback
+                style={[styles.conciergeFeedbackThumb, isSelected && StyleUtils.getBackgroundColorStyle(theme.reactionActiveBackground), styles.userSelectNone]}
+                hoverStyle={styles.conciergeFeedbackThumbHovered}
+                pressStyle={styles.conciergeFeedbackThumbHovered}
+                onPress={onPress}
+                accessibilityLabel={accessibilityLabel}
+                role={CONST.ROLE.BUTTON}
+                pressDimmingValue={1}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                sentryLabel={CONST.SENTRY_LABEL.CONCIERGE_FEEDBACK.THUMB}
+            >
+                <Text style={styles.conciergeFeedbackThumbEmoji}>{emoji.code}</Text>
+            </PressableWithFeedback>
+        );
 
     return shouldShowTooltip ? <Tooltip text={label}>{thumb}</Tooltip> : thumb;
 }
@@ -123,6 +138,7 @@ function ConciergeFeedbackPrompt({
     shouldPersistAfterRating = false,
     shouldShowTooltips = true,
     shouldRenderInline = false,
+    shouldRenderSelectedReactionBubble = false,
 }: ConciergeFeedbackPromptProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -166,6 +182,7 @@ function ConciergeFeedbackPrompt({
             onPress={callFunctionIfActionIsAllowed(() => rate(emoji))}
             shouldShowTooltip={shouldShowTooltips}
             isSelected={isSelected}
+            shouldRenderSelectedReactionBubble={shouldRenderSelectedReactionBubble}
         />
     );
 

From 0fec3e22642df34637ed5cdfdfcaffdafad845cb Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:56:05 -0700
Subject: [PATCH 696/781] fix(support): hide unselected survey reaction

---
 .../actionContents/ConciergeFeedbackPrompt.tsx      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index c95b7e7bd56f..b827756dc71c 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -51,6 +51,9 @@ type ConciergeFeedbackPromptProps = {
 
     /** Whether a selected thumb should use the standard selected reaction bubble */
     shouldRenderSelectedReactionBubble?: boolean;
+
+    /** Whether to hide the unselected thumb after the user rates the action */
+    shouldHideUnselectedThumbAfterRating?: boolean;
 };
 
 /** A reaction can be stored under the emoji name or under its hexcode, so both keys are read */
@@ -139,6 +142,7 @@ function ConciergeFeedbackPrompt({
     shouldShowTooltips = true,
     shouldRenderInline = false,
     shouldRenderSelectedReactionBubble = false,
+    shouldHideUnselectedThumbAfterRating = false,
 }: ConciergeFeedbackPromptProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -172,7 +176,10 @@ function ConciergeFeedbackPrompt({
         toggleEmojiReaction(reportID, action, emoji, reactions, preferredSkinTone, currentUserAccountID, reportActions, true, true, emoji.name === thumbsUp.name ? thumbsDown : thumbsUp);
     };
 
-    const hasRated = hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID) || hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID);
+    const hasReactedWithThumbsUp = hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID);
+    const hasReactedWithThumbsDown = hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID);
+    const hasRated = hasReactedWithThumbsUp || hasReactedWithThumbsDown;
+    const shouldHideUnselectedThumbs = shouldHideUnselectedThumbAfterRating && hasRated;
 
     const getFeedbackThumb = (emoji: Emoji, isSelected: boolean) => (
         <ConciergeFeedbackThumb
@@ -188,8 +195,8 @@ function ConciergeFeedbackPrompt({
 
     const feedbackThumbs = (
         <View style={styles.flexRow}>
-            {getFeedbackThumb(thumbsUp, hasReactedWithEmoji(thumbsUp, reactions, currentUserAccountID))}
-            {getFeedbackThumb(thumbsDown, hasReactedWithEmoji(thumbsDown, reactions, currentUserAccountID))}
+            {(!shouldHideUnselectedThumbs || hasReactedWithThumbsUp) && getFeedbackThumb(thumbsUp, hasReactedWithThumbsUp)}
+            {(!shouldHideUnselectedThumbs || hasReactedWithThumbsDown) && getFeedbackThumb(thumbsDown, hasReactedWithThumbsDown)}
         </View>
     );
 

From 3554a90d281d216a150598073416e1736e5fe3d1 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:56:30 -0700
Subject: [PATCH 697/781] fix(support): retain only selected survey feedback

---
 src/components/ReportActionItem/SupportTicketSurvey.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ReportActionItem/SupportTicketSurvey.tsx b/src/components/ReportActionItem/SupportTicketSurvey.tsx
index 58053c77a38b..c4bead1477c2 100644
--- a/src/components/ReportActionItem/SupportTicketSurvey.tsx
+++ b/src/components/ReportActionItem/SupportTicketSurvey.tsx
@@ -68,6 +68,7 @@ function SupportTicketSurvey({action, report, reportID}: SupportTicketSurveyProp
                     shouldShowPrompt={false}
                     shouldPersistAfterRating
                     shouldRenderSelectedReactionBubble
+                    shouldHideUnselectedThumbAfterRating
                 />
             )}
         </View>

From 05ac47502412515bc7ef518fffef091d7183a7d0 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 10:57:59 -0700
Subject: [PATCH 698/781] style(support): space selected survey reaction

---
 .../inbox/report/actionContents/ConciergeFeedbackPrompt.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index b827756dc71c..cc8888ab63a6 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -211,7 +211,7 @@ function ConciergeFeedbackPrompt({
 
     if (shouldPersistAfterRating && hasRated) {
         return (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mt2]}>
                 {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
                 {feedbackThumbs}
             </View>

From 8e973d93150769b7000c14da4918cbfe5d26c000 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 11:01:42 -0700
Subject: [PATCH 699/781] fix(support): stack survey acknowledgement

---
 .../inbox/report/actionContents/ConciergeFeedbackPrompt.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index cc8888ab63a6..5961b7fa8c74 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -211,7 +211,7 @@ function ConciergeFeedbackPrompt({
 
     if (shouldPersistAfterRating && hasRated) {
         return (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mt2]}>
+            <View style={[styles.flexColumn, styles.alignItemsStart, styles.gap2, styles.mt2]}>
                 {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
                 {feedbackThumbs}
             </View>

From 40b0917ab8435b61cc3ac645e98426096e48a7a6 Mon Sep 17 00:00:00 2001
From: Joseph Kaufman <54866469+joekaufmanexpensify@users.noreply.github.com>
Date: Wed, 14 Oct 2026 14:18:15 -0400
Subject: [PATCH 700/781] Improve clarity on connecting personal cards

Clarified the connection process for bank accounts and updated wording for transaction imports.
---
 .../Connect-Personal-Cards.md                                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
index 024f46fb59b8..17f47f5b2997 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards.md
@@ -24,13 +24,13 @@ Anyone with an Expensify account can connect up to two personal cards for free.
 2. Tap **Add personal card**.
 3. Select your country from the country selector.
 4. If you selected **United States**, choose your bank from the bank selector.
-   - If your bank is listed, you'll be prompted to connect via your bank's secure login (oAuth).
+   - If your bank is listed, you'll be prompted to directly connect via your bank's secure login.
    - If your bank is not listed, select **Other** to connect via Plaid.
 5. Follow the prompts to log into your bank and authorize the connection.
 
 Once your card is connected, it will appear under **Cards** in the **Wallet**, and transactions will begin importing automatically.
 
-If your card is connected through Plaid, pending transactions also import. They're marked as pending and update automatically when they post. Cards connected through your bank's secure login (oAuth) import transactions after they post.
+If your card is connected through Plaid, pending transactions also import. They're marked as pending and update automatically when they post. Cards connected directly through your bank's secure login import transactions after they post.
 
 ---
 

From 826d78c8fb446c124b90e082f8db29094ad9b598 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 11:23:24 -0700
Subject: [PATCH 701/781] fix(support): refine survey feedback layout

---
 .../ReportActionItem/SupportTicketSurvey.tsx  |  8 +++----
 src/languages/de.ts                           |  2 ++
 src/languages/el.ts                           |  2 ++
 src/languages/en.ts                           |  2 ++
 src/languages/es.ts                           |  2 ++
 src/languages/fr.ts                           |  2 ++
 src/languages/it.ts                           |  2 ++
 src/languages/ja.ts                           |  2 ++
 src/languages/nl.ts                           |  2 ++
 src/languages/pl.ts                           |  2 ++
 src/languages/pt-BR.ts                        |  2 ++
 src/languages/zh-hans.ts                      |  2 ++
 .../ConciergeFeedbackPrompt.tsx               | 24 ++++++++++++++++---
 13 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/components/ReportActionItem/SupportTicketSurvey.tsx b/src/components/ReportActionItem/SupportTicketSurvey.tsx
index c4bead1477c2..7f90b4ba03d2 100644
--- a/src/components/ReportActionItem/SupportTicketSurvey.tsx
+++ b/src/components/ReportActionItem/SupportTicketSurvey.tsx
@@ -1,5 +1,3 @@
-import Text from '@components/Text';
-
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -60,13 +58,15 @@ function SupportTicketSurvey({action, report, reportID}: SupportTicketSurveyProp
 
     return (
         <View style={styles.chatItemMessage}>
-            <Text style={styles.textSupporting}>{translate('supportTicket.surveyPrompt')}</Text>
             {canRateSurvey && (
                 <ConciergeFeedbackPrompt
                     action={action}
                     reportID={reportID}
-                    shouldShowPrompt={false}
+                    promptText={translate('supportTicket.surveyPrompt')}
                     shouldPersistAfterRating
+                    positiveTooltipText={translate('supportTicket.great')}
+                    negativeTooltipText={translate('supportTicket.poor')}
+                    shouldRenderInline
                     shouldRenderSelectedReactionBubble
                     shouldHideUnselectedThumbAfterRating
                 />
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 5020db12fd10..eb3c86b2cc35 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9993,6 +9993,8 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         fallbackTitle: 'Support-Ticket',
         resolved: 'Dieses Support-Ticket ist gelöst.',
         surveyPrompt: 'Wie war Ihre Erfahrung mit dem Support?',
+        great: 'Großartig',
+        poor: 'Schlecht',
         reopenTicket: 'Ticket erneut öffnen',
     },
     statementPage: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 5b45dce6c4f6..7febd4d2a858 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -10174,6 +10174,8 @@ ${reportName}`,
         fallbackTitle: 'Αίτημα υποστήριξης',
         resolved: 'Αυτό το αίτημα υποστήριξης επιλύθηκε.',
         surveyPrompt: 'Πώς ήταν η εμπειρία σας με την υποστήριξη;',
+        great: 'Εξαιρετική',
+        poor: 'Κακή',
         reopenTicket: 'Επανέναρξη αιτήματος',
     },
     statementPage: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c165dc875607..58ea837b4e2a 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -10190,6 +10190,8 @@ const translations = {
         fallbackTitle: 'Support ticket',
         resolved: 'This support ticket is resolved.',
         surveyPrompt: 'How was your support experience?',
+        great: 'Great',
+        poor: 'Poor',
         reopenTicket: 'Reopen ticket',
     },
     statementPage: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fcf7f9908696..e83e5a4760ad 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9812,6 +9812,8 @@ ${reportName}`,
         fallbackTitle: 'Ticket de soporte',
         resolved: 'Este ticket de soporte está resuelto.',
         surveyPrompt: '¿Cómo fue tu experiencia con el soporte?',
+        great: 'Excelente',
+        poor: 'Mala',
         reopenTicket: 'Reabrir ticket',
     },
     statementPage: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 628b06a67eea..2fdbe7534af8 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -10019,6 +10019,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         fallbackTitle: 'Ticket d’assistance',
         resolved: 'Ce ticket d’assistance est résolu.',
         surveyPrompt: 'Comment s’est passée votre expérience avec l’assistance ?',
+        great: 'Excellente',
+        poor: 'Mauvaise',
         reopenTicket: 'Rouvrir le ticket',
     },
     statementPage: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 22f706e49ffd..a38e3eedcc50 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9946,6 +9946,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         fallbackTitle: 'Ticket di supporto',
         resolved: 'Questo ticket di assistenza è risolto.',
         surveyPrompt: 'Com’è stata la tua esperienza con l’assistenza?',
+        great: 'Ottima',
+        poor: 'Scarsa',
         reopenTicket: 'Riapri ticket',
     },
     statementPage: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index a865475011d6..44be39857247 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9803,6 +9803,8 @@ ${reportName}`,
         fallbackTitle: 'サポートチケット',
         resolved: 'このサポートチケットは解決済みです。',
         surveyPrompt: 'サポートの対応はいかがでしたか？',
+        great: '素晴らしい',
+        poor: '悪い',
         reopenTicket: 'チケットを再開',
     },
     statementPage: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index a80f9d5709ab..3a03bcaf168e 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9912,6 +9912,8 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         fallbackTitle: 'Supportticket',
         resolved: 'Dit supportticket is opgelost.',
         surveyPrompt: 'Hoe was je ervaring met de ondersteuning?',
+        great: 'Geweldig',
+        poor: 'Slecht',
         reopenTicket: 'Ticket opnieuw openen',
     },
     statementPage: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index a97262aa05bc..3f0daf88b8dd 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9923,6 +9923,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         fallbackTitle: 'Zgłoszenie do pomocy technicznej',
         resolved: 'To zgłoszenie do pomocy technicznej zostało rozwiązane.',
         surveyPrompt: 'Jak oceniasz swoje doświadczenie ze wsparciem?',
+        great: 'Świetne',
+        poor: 'Słabe',
         reopenTicket: 'Otwórz zgłoszenie ponownie',
     },
     statementPage: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 31602ff2127e..c72215d0628d 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9910,6 +9910,8 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         fallbackTitle: 'Chamado de suporte',
         resolved: 'Este chamado de suporte foi resolvido.',
         surveyPrompt: 'Como foi sua experiência com o suporte?',
+        great: 'Ótima',
+        poor: 'Ruim',
         reopenTicket: 'Reabrir chamado',
     },
     statementPage: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index cb0b7ca26c71..68e0e9a9a97a 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9542,6 +9542,8 @@ ${reportName}`,
         fallbackTitle: '支持工单',
         resolved: '此支持工单已解决。',
         surveyPrompt: '您对支持服务的体验如何？',
+        great: '很好',
+        poor: '很差',
         reopenTicket: '重新打开工单',
     },
     statementPage: {
diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index 5961b7fa8c74..8091ecaedeee 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -40,12 +40,21 @@ type ConciergeFeedbackPromptProps = {
     /** Whether to show the generic feedback prompt alongside the thumbs */
     shouldShowPrompt?: boolean;
 
+    /** Custom prompt text shown alongside the thumbs */
+    promptText?: string;
+
     /** Whether the thumbs should remain available after the user rates the action */
     shouldPersistAfterRating?: boolean;
 
     /** Whether hovering a thumb should show its tooltip */
     shouldShowTooltips?: boolean;
 
+    /** Tooltip text for the positive feedback option */
+    positiveTooltipText?: string;
+
+    /** Tooltip text for the negative feedback option */
+    negativeTooltipText?: string;
+
     /** Whether to place only the thumbs inline with surrounding content */
     shouldRenderInline?: boolean;
 
@@ -138,8 +147,11 @@ function ConciergeFeedbackPrompt({
     action,
     reportID,
     shouldShowPrompt = true,
+    promptText,
     shouldPersistAfterRating = false,
     shouldShowTooltips = true,
+    positiveTooltipText,
+    negativeTooltipText,
     shouldRenderInline = false,
     shouldRenderSelectedReactionBubble = false,
     shouldHideUnselectedThumbAfterRating = false,
@@ -184,7 +196,7 @@ function ConciergeFeedbackPrompt({
     const getFeedbackThumb = (emoji: Emoji, isSelected: boolean) => (
         <ConciergeFeedbackThumb
             emoji={emoji}
-            label={translate(emoji.name === thumbsUp.name ? 'common.yes' : 'common.no')}
+            label={emoji.name === thumbsUp.name ? (positiveTooltipText ?? translate('common.yes')) : (negativeTooltipText ?? translate('common.no'))}
             accessibilityLabel={translate(emoji.name === thumbsUp.name ? 'concierge.feedback.useful' : 'concierge.feedback.notUseful')}
             onPress={callFunctionIfActionIsAllowed(() => rate(emoji))}
             shouldShowTooltip={shouldShowTooltips}
@@ -212,6 +224,7 @@ function ConciergeFeedbackPrompt({
     if (shouldPersistAfterRating && hasRated) {
         return (
             <View style={[styles.flexColumn, styles.alignItemsStart, styles.gap2, styles.mt2]}>
+                {shouldRenderInline && shouldShowPrompt && <Text style={styles.textSupporting}>{promptText ?? translate('concierge.feedback.prompt')}</Text>}
                 {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
                 {feedbackThumbs}
             </View>
@@ -219,7 +232,12 @@ function ConciergeFeedbackPrompt({
     }
 
     if (shouldRenderInline) {
-        return feedbackThumbs;
+        return (
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+                {shouldShowPrompt && <Text style={[styles.textSupporting, styles.flexShrink1]}>{promptText ?? translate('concierge.feedback.prompt')}</Text>}
+                {feedbackThumbs}
+            </View>
+        );
     }
 
     return (
@@ -227,7 +245,7 @@ function ConciergeFeedbackPrompt({
             layout="horizontal"
             style={styles.alignItemsCenter}
         >
-            {shouldShowPrompt && <Text style={[styles.textLabelSupporting, styles.flexShrink1]}>{translate('concierge.feedback.prompt')}</Text>}
+            {shouldShowPrompt && <Text style={[styles.textLabelSupporting, styles.flexShrink1]}>{promptText ?? translate('concierge.feedback.prompt')}</Text>}
             {feedbackThumbs}
         </ActionableItemButtons>
     );

From 5c550a267bc261678a7a109e5942698da14e9fda Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 11:36:16 -0700
Subject: [PATCH 702/781] style(support): compact survey feedback spacing

---
 .../inbox/report/actionContents/ConciergeFeedbackPrompt.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index 8091ecaedeee..020bc17f9ea7 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -223,7 +223,7 @@ function ConciergeFeedbackPrompt({
 
     if (shouldPersistAfterRating && hasRated) {
         return (
-            <View style={[styles.flexColumn, styles.alignItemsStart, styles.gap2, styles.mt2]}>
+            <View style={[styles.flexColumn, styles.alignItemsStart, styles.gap2, shouldRenderInline ? styles.mtn1 : styles.mt2]}>
                 {shouldRenderInline && shouldShowPrompt && <Text style={styles.textSupporting}>{promptText ?? translate('concierge.feedback.prompt')}</Text>}
                 {isDisplayedThankMessage && <Text style={styles.textLabelSupporting}>{translate('concierge.feedback.thanks')}</Text>}
                 {feedbackThumbs}
@@ -233,7 +233,7 @@ function ConciergeFeedbackPrompt({
 
     if (shouldRenderInline) {
         return (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mtn1, styles.mbn1]}>
                 {shouldShowPrompt && <Text style={[styles.textSupporting, styles.flexShrink1]}>{promptText ?? translate('concierge.feedback.prompt')}</Text>}
                 {feedbackThumbs}
             </View>

From aecf52f447afa3fdadf86737de1f503240de89ca Mon Sep 17 00:00:00 2001
From: "Carlos Miceli (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 18:56:04 +0000
Subject: [PATCH 703/781] Clear work email errors on Android back to the intent
 list

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
---
 src/pages/OnboardingWorkEmail/index.native.tsx | 16 +++++++++-------
 tests/ui/WorkEmailOnboardingNativeBack.tsx     | 11 +++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/index.native.tsx b/src/pages/OnboardingWorkEmail/index.native.tsx
index b64770644601..693c128fc7f3 100644
--- a/src/pages/OnboardingWorkEmail/index.native.tsx
+++ b/src/pages/OnboardingWorkEmail/index.native.tsx
@@ -1,4 +1,4 @@
-import {setOnboardingErrorMessage} from '@userActions/Welcome';
+import {clearOnboardingMergeAccountBlocked, setOnboardingErrorMessage} from '@userActions/Welcome';
 
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback} from 'react';
@@ -14,13 +14,15 @@ function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
     // To block android native back button behavior
     useFocusEffect(
         useCallback(() => {
-            // We don't want to block the back button if this is not the first route, e.g. when the intent list sent us here
-            if (routeIndex !== 0) {
-                return;
-            }
-
-            // Return true to indicate that the back button press is handled here
             const backAction = () => {
+                // We don't want to block the back button if this is not the first route, e.g. when the intent list sent us here.
+                // Clear any work email error like the header back button does, and return false so navigation still pops the screen.
+                if (routeIndex !== 0) {
+                    clearOnboardingMergeAccountBlocked();
+                    return false;
+                }
+
+                // Return true to indicate that the back button press is handled here
                 setOnboardingErrorMessage('onboarding.purpose.errorBackButton');
                 return true;
             };
diff --git a/tests/ui/WorkEmailOnboardingNativeBack.tsx b/tests/ui/WorkEmailOnboardingNativeBack.tsx
index 5c1e74529e9f..fbc58850f49e 100644
--- a/tests/ui/WorkEmailOnboardingNativeBack.tsx
+++ b/tests/ui/WorkEmailOnboardingNativeBack.tsx
@@ -425,6 +425,15 @@ describe('Onboarding work email validation (Android system back)', () => {
 
         expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.WORK_EMAIL]);
 
+        // Given adding the work email failed, leaving errors that the intent list would render if they followed the user back
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {isMergingAccountBlocked: true});
+            await Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.purpose.errorBackButton');
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {errors: {error: 'Work email error'}});
+        });
+
+        await waitForBatchedUpdatesWithAct();
+
         // When Android's system back button is pressed
         pressHardwareBack();
 
@@ -442,5 +451,7 @@ describe('Onboarding work email validation (Android system back)', () => {
             },
         });
         expect(errorMessage).toBeUndefined();
+        expect((await getOnboardingValues())?.isMergingAccountBlocked).toBe(false);
+        expect((await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM))?.errors).toBeFalsy();
     });
 });

From 803a690a77fb6e146154207bacee5c962b9ff449 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 12:00:16 -0700
Subject: [PATCH 704/781] fix(concierge): preserve feedback acknowledgement
 timing

---
 .../ConciergeFeedbackPrompt.tsx               | 20 +++++++-----
 tests/ui/ReportActionItemTest.tsx             | 32 +++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
index 020bc17f9ea7..e879160ebb9b 100644
--- a/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
+++ b/src/pages/inbox/report/actionContents/ConciergeFeedbackPrompt.tsx
@@ -172,16 +172,20 @@ function ConciergeFeedbackPrompt({
 
     // Either rating starts the acknowledgement window, and the zero fallback keeps an unanswered survey undefined.
     const latestReactionTimestamp = Math.max(thumbsUpReactedAt ?? 0, thumbsDownReactedAt ?? 0) || undefined;
-    // Regular Concierge feedback keeps its existing thumbs-up-only acknowledgement, while surveys acknowledge either rating.
-    const acknowledgementTimestamp = shouldPersistAfterRating ? latestReactionTimestamp : thumbsUpReactedAt;
 
-    // The reaction that was already there when this row mounted is an old rating, so only a reaction that lands while the row is open is acknowledged
-    const [mountedWithAcknowledgementTimestamp] = useState(acknowledgementTimestamp);
+    // Regular Concierge feedback preserves its debounced thumbs-up acknowledgement.
+    const [mountedWithThumbsUpReactedAt] = useState(thumbsUpReactedAt);
+    const hasJustReactedWithThumbsUp = thumbsUpReactedAt !== undefined && thumbsUpReactedAt !== mountedWithThumbsUpReactedAt;
+    const hasSettledAfterThumbsUpReaction = useDebouncedValue(hasJustReactedWithThumbsUp, THANKS_VISIBLE_DURATION_MS);
+    const isRegularThankMessageDisplayed = hasJustReactedWithThumbsUp && !hasSettledAfterThumbsUpReaction;
 
-    // The debounced timestamp catches up once the window has passed, and a new reaction restarts that window.
-    const debouncedAcknowledgementTimestamp = useDebouncedValue(acknowledgementTimestamp, THANKS_VISIBLE_DURATION_MS);
-    const isDisplayedThankMessage =
-        acknowledgementTimestamp !== undefined && acknowledgementTimestamp !== mountedWithAcknowledgementTimestamp && acknowledgementTimestamp !== debouncedAcknowledgementTimestamp;
+    // A survey accepts either rating, so its acknowledgement restarts when the selected reaction changes.
+    const [mountedWithLatestReactionTimestamp] = useState(latestReactionTimestamp);
+    const debouncedLatestReactionTimestamp = useDebouncedValue(latestReactionTimestamp, THANKS_VISIBLE_DURATION_MS);
+    const isSurveyThankMessageDisplayed =
+        latestReactionTimestamp !== undefined && latestReactionTimestamp !== mountedWithLatestReactionTimestamp && latestReactionTimestamp !== debouncedLatestReactionTimestamp;
+
+    const isDisplayedThankMessage = shouldPersistAfterRating ? isSurveyThankMessageDisplayed : isRegularThankMessageDisplayed;
 
     const rate = (emoji: Emoji) => {
         // Skin tone is ignored on compare so a user whose preferred tone changed toggles their existing reaction instead of adding a second one
diff --git a/tests/ui/ReportActionItemTest.tsx b/tests/ui/ReportActionItemTest.tsx
index 6212a44f8585..b55b26eb8891 100644
--- a/tests/ui/ReportActionItemTest.tsx
+++ b/tests/ui/ReportActionItemTest.tsx
@@ -3609,6 +3609,12 @@ describe('ReportActionItem', () => {
             });
         }
 
+        async function clearReactions(action: ReportAction) {
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`, {});
+            });
+        }
+
         it('shows the acknowledgement in a second copy of the chat that did not take the press', async () => {
             // The side panel and the central pane each mount their own copy, and the reaction is what they share
             const action = createConciergeComment();
@@ -3626,6 +3632,32 @@ describe('ReportActionItem', () => {
             expect(screen.queryByText(prompt())).not.toBeOnTheScreen();
         });
 
+        it('does not show the acknowledgement again when thumbs-up is added shortly after being removed', async () => {
+            jest.useFakeTimers();
+
+            try {
+                const action = createConciergeComment();
+                renderItemWithAction(action, true);
+                await waitForBatchedUpdatesWithAct();
+
+                await reactWithThumbsUp(action, '2025-07-12 09:03:18.000');
+                expect(screen.getByText(translateLocal('concierge.feedback.thanks'))).toBeOnTheScreen();
+
+                await act(async () => {
+                    jest.advanceTimersByTime(4000);
+                });
+                expect(screen.queryByText(translateLocal('concierge.feedback.thanks'))).not.toBeOnTheScreen();
+
+                await clearReactions(action);
+                expect(screen.getByText(prompt())).toBeOnTheScreen();
+
+                await reactWithThumbsUp(action, '2025-07-12 09:03:19.000');
+                expect(screen.queryByText(translateLocal('concierge.feedback.thanks'))).not.toBeOnTheScreen();
+            } finally {
+                jest.useRealTimers();
+            }
+        });
+
         it('does not acknowledge a rating that was already there when the chat was opened', async () => {
             const action = createConciergeComment();
             await reactWithThumbsUp(action, DateUtils.getDBTime());

From 9ef3c3a699283cfcdfa3c3b4af17467a851c6298 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Thu, 15 Oct 2026 02:24:34 +0700
Subject: [PATCH 705/781] Show empty state instead of No results when default
 view hides all rows

---
 src/components/Table/TableBody.tsx            |  7 +++-
 .../TableEmptyStates/TableNoResultsState.tsx  |  5 ++-
 tests/ui/TableTest.tsx                        | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 9a4db2f7aead..faa96b4da20f 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -164,6 +164,7 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
         noResultsStateElement,
         tableListMetadata,
         isEmptyResult,
+        isDefaultViewEmpty,
         scrollWidth,
         tableWidth,
     } = useTableContext<TableData>();
@@ -337,8 +338,10 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
         </View>
     );
 
-    const emptyStateContent =
-        tableListMetadata.hasPageHeader && isEmptyResult ? (noResultsStateElement ?? EmptyResultComponent) : (emptyStateElement ?? renderListComponent(ListEmptyComponent));
+    // When the default view hides every row (e.g. all workspaces are archived), no search or filter is active,
+    // so show the empty state rather than "No results".
+    const shouldShowNoResultsState = tableListMetadata.hasPageHeader && isEmptyResult && !isDefaultViewEmpty;
+    const emptyStateContent = shouldShowNoResultsState ? (noResultsStateElement ?? EmptyResultComponent) : (emptyStateElement ?? renderListComponent(ListEmptyComponent));
     const footerElement = renderListComponent(ListFooterComponent);
     // Consumer footer flex growth is useful below normal rows, but inside the combined empty-state
     // footer it can expand over the page header. Preserve the remaining style while disabling growth.
diff --git a/src/components/Table/TableEmptyStates/TableNoResultsState.tsx b/src/components/Table/TableEmptyStates/TableNoResultsState.tsx
index 60a93ca4a2c6..30c49a66fe35 100644
--- a/src/components/Table/TableEmptyStates/TableNoResultsState.tsx
+++ b/src/components/Table/TableEmptyStates/TableNoResultsState.tsx
@@ -21,10 +21,11 @@ type TableNoResultsStateProps = Omit<GenericEmptyStateComponentProps, 'headerMed
 export default function TableNoResultsState(emptyStateProps: TableNoResultsStateProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isEmptyResult, tableListMetadata} = useTableContext();
+    const {isEmptyResult, isDefaultViewEmpty, tableListMetadata} = useTableContext();
     const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']);
 
-    if (!isEmptyResult) {
+    // The default view hiding every row is not a search/filter result, so the empty state handles it instead.
+    if (!isEmptyResult || isDefaultViewEmpty) {
         return null;
     }
 
diff --git a/tests/ui/TableTest.tsx b/tests/ui/TableTest.tsx
index c736f3b23654..78829d9b5676 100644
--- a/tests/ui/TableTest.tsx
+++ b/tests/ui/TableTest.tsx
@@ -2584,6 +2584,44 @@ describe('Table', () => {
             expect(screen.queryByTestId('row-2')).toBeNull();
             expect(screen.getByTestId('generic-empty-state')).toBeTruthy();
         });
+
+        it('renders the empty state instead of "No results" when a page-header table hides every row by default', () => {
+            // Given a page-header table (like the Workspaces list) whose default filter hides every row, with both
+            // a no-results state and an empty state declared
+            const props = createDefaultProps();
+            const data: TestItem[] = [
+                {keyForList: '1', id: '1', name: 'Archived A', category: 'archived', value: 1},
+                {keyForList: '2', id: '2', name: 'Archived B', category: 'archived', value: 2},
+            ];
+
+            // When the table renders with no search or filter selected
+            render(
+                <Table<TestItem, TestColumnKey>
+                    data={data}
+                    columns={props.columns}
+                    renderItem={props.renderItem}
+                    keyExtractor={props.keyExtractor}
+                    filters={statusFilterConfig}
+                    isItemInFilter={isItemInStatusFilter}
+                >
+                    <Table.ListHeader>
+                        <Text testID="table-header-component">Page header</Text>
+                    </Table.ListHeader>
+                    <Table.NoResultsState />
+                    <Table.EmptyState title="No workspaces" />
+                    <Table.Header />
+                    <Table.Body />
+                </Table>,
+            );
+
+            // Then the empty state shows inside the list with the page header still visible, because the user did
+            // not search or filter, so "No results found" would be misleading
+            expect(screen.getByTestId('flash-list')).toBeTruthy();
+            expect(screen.getByTestId('table-header-component')).toBeTruthy();
+            expect(screen.getAllByTestId('generic-empty-state')).toHaveLength(1);
+            expect(screen.getByText('No workspaces')).toBeTruthy();
+            expect(screen.queryByText('common.noResultsFound')).toBeNull();
+        });
     });
 
     describe('immediate filter', () => {

From db56fb9d149db23f025e709a4f221da0a518940a Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 12:34:04 -0700
Subject: [PATCH 706/781] test(report): cover support ticket cleanup

---
 tests/actions/SupportTicketTest.ts | 40 ++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 08544cd8adf2..1677429fa9a6 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -11,6 +11,9 @@ import ONYXKEYS from '@src/ONYXKEYS';
 
 import Onyx from 'react-native-onyx';
 
+import getOnyxValue from '../utils/getOnyxValue';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
 jest.mock('@libs/API');
 jest.mock('@libs/Navigation/helpers/getReportRouteForCurrentContext');
 jest.mock('@libs/Navigation/Navigation');
@@ -26,7 +29,13 @@ const mockGenerateReportID = jest.mocked(generateReportID);
 const newSupportTicketReportID = 'optimisticSupportTicketReportID';
 
 describe('actions/Report', () => {
-    beforeEach(() => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
         mockMakeRequestWithSideEffects.mockResolvedValue({jsonCode: CONST.JSON_CODE.SUCCESS});
         mockGetReportRouteForCurrentContext.mockReturnValue(`r/${newSupportTicketReportID}`);
         mockGenerateReportID.mockReturnValue(newSupportTicketReportID);
@@ -80,9 +89,12 @@ describe('actions/Report', () => {
     });
 
     it('removes the pending report when the request fails before receiving a response', async () => {
-        // Given a request that fails before the API can apply its failure data
+        // Given an optimistic support ticket in Onyx and a request that fails before the API can apply its failure data
         const networkError = new Error('Network request failed');
-        const onyxUpdateSpy = jest.spyOn(Onyx, 'update').mockResolvedValue(undefined);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`, {
+            reportID: newSupportTicketReportID,
+            type: CONST.REPORT.TYPE.SUPPORT_TICKET,
+        });
         mockMakeRequestWithSideEffects.mockRejectedValueOnce(networkError);
 
         // When the customer asks to talk to a human
@@ -90,13 +102,21 @@ describe('actions/Report', () => {
 
         // Then the App removes the pending report and preserves the request failure
         await expect(request).rejects.toBe(networkError);
-        expect(onyxUpdateSpy).toHaveBeenCalledWith([
-            {
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                value: null,
-            },
-        ]);
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+    });
+
+    it('does not update Onyx when reopening a support ticket fails', async () => {
+        // Given a resolved ticket and a failed reassignment request
+        const resolvedSupportTicketReportID = 'resolvedSupportTicketReportID';
+        const networkError = new Error('Network request failed');
+        const onyxUpdateSpy = jest.spyOn(Onyx, 'update');
+        mockMakeRequestWithSideEffects.mockRejectedValueOnce(networkError);
+
+        // When the customer reopens the ticket
+        await expect(openSupportTicket(resolvedSupportTicketReportID)).rejects.toBe(networkError);
+
+        // Then no optimistic report exists to remove
+        expect(onyxUpdateSpy).not.toHaveBeenCalled();
     });
 
     it('navigates to a newly reassigned support ticket', async () => {

From ffcde7a43f5e487a0ad5a3acb4733f5a0262e277 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 19:50:32 +0000
Subject: [PATCH 707/781] Update Mobile-Expensify submodule to 5d6cc5d

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 7b114fac24e4..5d6cc5dcd9e2 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 7b114fac24e4a28701357a7ea37c3e9091c5b312
+Subproject commit 5d6cc5dcd9e2c658977bb67599cf5e24b0943c79

From c9610b3e148046e00360970a8ac9c75ae9160903 Mon Sep 17 00:00:00 2001
From: "Yuwen Memon (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 20:10:38 +0000
Subject: [PATCH 708/781] Update NS0068 help articles with new Created From
 field guidance

Co-authored-by: Yuwen Memon <yuwenmemon@users.noreply.github.com>
---
 .../Export-Errors/NS0068-Export-Error.md      | 54 +++++++++----
 .../Export-Errors/NS0068-Export-Error.md      | 77 +++++++++++--------
 2 files changed, 84 insertions(+), 47 deletions(-)

diff --git a/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md b/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
index 39bd550f1bad..d8a66b720cf8 100644
--- a/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
+++ b/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
@@ -1,17 +1,21 @@
 ---
 title: NS0068 Export Error in NetSuite Integration
-description: Learn how to fix the NS0068 export error in NetSuite when the Created From field is not visible on the preferred transaction form.
-keywords: NS0068, NetSuite Created From field not visible, permission to set value Created From, NetSuite transaction form visibility, Expensify Card journal entry error, Expensify NetSuite export error, Workspace Admin
-internalScope: Audience is Workspace Admins using the NetSuite integration. Covers fixing the NS0068 export error caused by the Created From field not being visible on the preferred NetSuite form. Does not cover other NetSuite error codes.
+description: Learn how to fix the NS0068 export error in NetSuite when Expensify can't set the Created From field (custbody_createdfrom_expensify) during export.
+keywords: NS0068, NetSuite Created From field not visible, custbody_createdfrom_expensify, permission to set value Created From, Transaction Body Fields NetSuite, NetSuite transaction form visibility, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite export error, Workspace Admin
+internalScope: Audience is Workspace Admins using the NetSuite integration. Covers fixing the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the preferred form, not being editable by the Expensify role, or missing from NetSuite. Does not cover other NetSuite error codes.
 ---
 
+<!-- cspell:ignore custbody createdfrom -->
+
 # NS0068 Export Error in NetSuite Integration
 
 If you see the error:
 
-NS0068: You do not have permission to set value for element — 'Created From'.
+NS0068: NetSuite won't let Expensify set the 'Created From' field (custbody_createdfrom_expensify).
+
+This means NetSuite is blocking Expensify from setting the **Created From** field during export.
 
-This means the **Created From** field is not visible on the preferred transaction form in NetSuite.
+The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. It is added to NetSuite by the **Expensify Connect bundle**.
 
 ---
 
@@ -19,8 +23,10 @@ This means the **Created From** field is not visible on the preferred transactio
 
 The NS0068 error occurs when:
 
+- The **Created From** field does not apply to the record type you're exporting to (for example, vendor bills, expense reports, or journal entries).
 - The **Created From** field is hidden on the preferred export form.
-- The form does not allow the integration to populate the Created From field.
+- The role used by the Expensify connection can't edit the **Created From** field.
+- The **Created From** field is missing because the **Expensify Connect bundle** is not installed or is out of date.
 - Expensify Card transactions are exported as journal entries and the Journal Entry form does not show the Created From field.
 
 Expensify must be able to write to the Created From field during export.
@@ -29,6 +35,21 @@ Expensify must be able to write to the Created From field during export.
 
 ## How to Fix the NS0068 Export Error
 
+### Check the Created From Field Settings
+
+1. Log in to **NetSuite** as an Administrator.
+2. Go to **Customization**.
+3. Select **Lists, Records, & Fields**.
+4. Click **Transaction Body Fields**.
+5. Open the field with the ID **custbody_createdfrom_expensify**.
+6. On the **Applies To** tab, confirm the field applies to the record type you're exporting to.
+7. On the **Access** tab, confirm the role used by the Expensify connection has **Edit** access to the field.
+8. Save the field.
+
+If you can't find **custbody_createdfrom_expensify**, update or reinstall the **Expensify Connect bundle** in NetSuite before continuing.
+
+---
+
 ### If Exporting Vendor Bills or Standard Transactions
 
 1. Log in to **NetSuite** as an Administrator.
@@ -54,14 +75,15 @@ Then in Expensify:
 ### If Exporting Expensify Card Transactions as Journal Entries
 
 1. Log in to **NetSuite**.
-2. Go to **Customization**.
-3. Select **Forms**.
-4. Click **Transaction Forms**.
-5. Click **Edit** next to the preferred **Journal Entry** form.
-6. Go to **Screen Fields**.
-7. Open the **Main** tab.
-8. Ensure the **Created From** field is marked as **Show**.
-9. Save the form.
+2. Confirm **custbody_createdfrom_expensify** applies to journal entries, using the steps in **Check the Created From Field Settings** above.
+3. Go to **Customization**.
+4. Select **Forms**.
+5. Click **Transaction Forms**.
+6. Click **Edit** next to the preferred **Journal Entry** form.
+7. Go to **Screen Fields**.
+8. Open the **Main** tab.
+9. Ensure the **Created From** field is marked as **Show**.
+10. Save the form.
 
 Then in Expensify:
 
@@ -78,8 +100,8 @@ Then in Expensify:
 
 ## Does NS0068 Mean My Integration Is Broken?
 
-No. This error is caused by form visibility settings in NetSuite.
+No. This error is caused by the Created From field settings, form visibility, or role access in NetSuite.
 
 ## Do I Need to Reconnect NetSuite?
 
-No. Updating the form settings and running **Sync** is typically sufficient.
+No. Updating the field and form settings and running **Sync** is typically sufficient. If the field is missing, update or reinstall the Expensify Connect bundle first.
diff --git a/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md b/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
index ae03aac56e27..4e5540cf2d8c 100644
--- a/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
+++ b/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
@@ -1,19 +1,21 @@
 ---
 title: NS0068 Export Error in NetSuite Integration
-description: Learn what the NS0068 export error means and how to make the Created From field visible on NetSuite transaction forms before exporting.
-keywords: NS0068, NetSuite Created From field error, permission to set Created From NetSuite, transaction form visibility NetSuite, Expensify Card journal entry error, Expensify NetSuite integration, Workspace Admin
-internalScope: Audience is Workspace Admins using the NetSuite integration. Covers resolving the NS0068 export error caused by the Created From field not being visible on NetSuite transaction forms. Does not cover role permission or token configuration issues.
+description: Learn what the NS0068 export error means and how to configure the Created From field (custbody_createdfrom_expensify) in NetSuite so Expensify can set it during export.
+keywords: NS0068, NetSuite Created From field error, custbody_createdfrom_expensify, permission to set Created From NetSuite, Transaction Body Fields NetSuite, transaction form visibility NetSuite, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite integration, Workspace Admin
+internalScope: Audience is Workspace Admins using the NetSuite integration. Covers resolving the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the preferred form, not being editable by the Expensify role, or missing from NetSuite. Does not cover token configuration issues.
 ---
 
+<!-- cspell:ignore custbody createdfrom -->
+
 # NS0068 Export Error in NetSuite Integration
 
 If you see the error:
 
-NS0068 Export Error: You do not have permission to set value for element — 'Created From'.
+NS0068 Export Error: NetSuite won't let Expensify set the 'Created From' field (custbody_createdfrom_expensify).
 
-This means the **Created From** field is not visible on the preferred export form in NetSuite.
+This means NetSuite is blocking Expensify from setting the **Created From** field during export.
 
-The Workspace must be able to access and populate the Created From field during export.
+The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. It is added to NetSuite by the **Expensify Connect bundle**.
 
 ---
 
@@ -21,31 +23,42 @@ The Workspace must be able to access and populate the Created From field during
 
 The NS0068 error typically occurs when:
 
-- The **Created From** field is hidden on the NetSuite transaction form used for exports.
-- The preferred transaction form does not allow the field to be displayed.
-- NetSuite blocks the integration from setting the field value because it is not visible.
-
-If the field is hidden, NetSuite prevents the integration from setting its value and the export fails.
+- The **Created From** field does not apply to the record type you're exporting to (for example, vendor bills, expense reports, or journal entries).
+- The **Created From** field is hidden on the transaction form marked as **Preferred** for your export type.
+- The role used by the Expensify connection can't edit the **Created From** field.
+- The **Created From** field is missing from NetSuite because the **Expensify Connect bundle** is not installed or is out of date.
 
-This is a transaction form visibility issue, not a role permission or token configuration issue.
+If any of these apply, NetSuite prevents the integration from setting the field value and the export fails.
 
 ---
 
 ## How to Fix the NS0068 Export Error
 
-Follow the steps below to make the Created From field visible.
+Follow the steps below to check the field setup, form visibility, and role access in NetSuite.
 
 ---
 
-## Make the Created From Field Visible in NetSuite
+## Check the Created From Field Settings in NetSuite
 
 1. Log in to NetSuite as an administrator.
-2. Go to **Customization > Forms > Transaction Forms**.
-3. Locate the transaction form marked as **Preferred** for your export type.
-4. Click **Edit**.
-5. Locate the **Created From** field.
-6. Ensure the field is marked as **Show**.
-7. Click **Save**.
+2. Go to **Customization > Lists, Records, & Fields > Transaction Body Fields**.
+3. Open the field with the ID **custbody_createdfrom_expensify**.
+4. On the **Applies To** tab, confirm the field applies to the record type you're exporting to.
+5. On the **Access** tab, confirm the role used by the Expensify connection has **Edit** access to the field.
+6. Click **Save**.
+
+If you can't find **custbody_createdfrom_expensify**, [update the Expensify Connect bundle](https://help.expensify.com/articles/new-expensify/connections/netsuite/Update-Expensify-Connect-Bundle-in-NetSuite), or reinstall it, before continuing.
+
+---
+
+## Make the Created From Field Visible on the Preferred Form
+
+1. Go to **Customization > Forms > Transaction Forms**.
+2. Locate the transaction form marked as **Preferred** for your export type.
+3. Click **Edit**.
+4. Locate the **Created From** field.
+5. Ensure the field is marked as **Show**.
+6. Click **Save**.
 
 Confirm the field is visible on the preferred form before proceeding.
 
@@ -53,7 +66,7 @@ Confirm the field is visible on the preferred form before proceeding.
 
 ## Sync the Workspace in Expensify
 
-After updating the form:
+After updating NetSuite:
 
 On web:
 
@@ -78,19 +91,21 @@ On mobile:
 1. Open the report.
 2. Retry exporting to NetSuite.
 
-If the Created From field is visible on the preferred form, the export should complete successfully.
+If the Created From field applies to your export type, is visible on the preferred form, and is editable by the Expensify role, the export should complete successfully.
 
 ---
 
 # Additional Steps for Expensify Card Journal Entries
 
-If you are exporting **Expensify Card transactions as journal entries**, confirm the Created From field is visible on the journal entry form.
+If you are exporting **Expensify Card transactions as journal entries**, confirm the Created From field is set up for journal entries.
 
-1. Go to **Customization > Forms > Transaction Forms**.
-2. Click **Edit** next to the preferred journal entry form.
-3. Go to **Screen Fields > Main**.
-4. Confirm **Created From** is marked as **Show**.
-5. Click **Save**.
+1. Go to **Customization > Lists, Records, & Fields > Transaction Body Fields** and open **custbody_createdfrom_expensify**.
+2. On the **Applies To** tab, confirm the field applies to journal entries, then click **Save**.
+3. Go to **Customization > Forms > Transaction Forms**.
+4. Click **Edit** next to the preferred journal entry form.
+5. Go to **Screen Fields > Main**.
+6. Confirm **Created From** is marked as **Show**.
+7. Click **Save**.
 
 Then return to the Workspace and select **Sync Now** before retrying the export.
 
@@ -100,12 +115,12 @@ Then return to the Workspace and select **Sync Now** before retrying the export.
 
 ## Does the NS0068 Export Error Affect All Export Types?
 
-It affects exports using a transaction form where the Created From field is hidden.
+It affects any export type where the Created From field doesn't apply to the record, is hidden on the preferred form, or isn't editable by the Expensify role.
 
 ## Do I Need NetSuite Admin Access to Fix the NS0068 Export Error?
 
-Yes. Updating transaction form field visibility requires NetSuite administrator permissions.
+Yes. Updating custom field settings and transaction form visibility requires NetSuite administrator permissions.
 
 ## Do I Need to Reconnect the Integration?
 
-No. Making the Created From field visible and selecting **Sync Now** is typically sufficient.
+No. Updating the Created From field settings and selecting **Sync Now** is typically sufficient. If the field is missing, update or reinstall the Expensify Connect bundle first.

From 079c8c96d3cc073a6ac014464bfba673d8a814e5 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 20:20:51 +0000
Subject: [PATCH 709/781] Update Mobile-Expensify submodule to 721a306

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 5d6cc5dcd9e2..721a306874d5 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 5d6cc5dcd9e2c658977bb67599cf5e24b0943c79
+Subproject commit 721a306874d56225db761ce67429a8fee35dfb6a

From 0a90839842f34e8c645258d85f595012279535e8 Mon Sep 17 00:00:00 2001
From: "Fitsum Abebe (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 20:21:19 +0000
Subject: [PATCH 710/781] Run the header back logic on Android back from
 onboarding work email

Android back now uses the header's check (join intent, not the Concierge task flow) instead of the route index, and goes back to the intent list the same way. This keeps the user in onboarding after a cold start, when work email is the only route.

Co-authored-by: Fitsum Abebe <FitseTLT@users.noreply.github.com>
---
 .../BaseOnboardingWorkEmail.tsx               | 35 ++++++++--
 .../OnboardingWorkEmail/index.native.tsx      | 29 +-------
 tests/ui/WorkEmailOnboardingNativeBack.tsx    | 66 ++++++++++++++++---
 3 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 74b567b1432c..06737981d18d 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -11,6 +11,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 
+import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -303,6 +304,31 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW
         handleMergingAccountBlockedConfirm = handleRegularJoinWorkspaceErrorConfirm;
     }
 
+    // This screen normally opens onboarding, so there is nothing to go back to unless the intent list sent us here.
+    // The intent stays saved across a cold start, so check it instead of the route index.
+    const canGoBackToPurpose = isJoiningCompanyWorkspace && !isConciergeTaskFlow;
+
+    const goBackToPurpose = () => {
+        // Clear any work email error so the purpose screen doesn't render it without its translation params.
+        clearOnboardingMergeAccountBlocked();
+        // Pops to the intent list when it's in the stack, or replaces this screen with it, so the user stays in onboarding.
+        Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute());
+    };
+
+    const handleAndroidBackPress = () => {
+        if (canGoBackToPurpose) {
+            goBackToPurpose();
+            return true;
+        }
+
+        // Otherwise there is no earlier step, so keep the press from closing onboarding and tell the user to finish setup.
+        setOnboardingErrorMessage('onboarding.purpose.errorBackButton');
+        return true;
+    };
+
+    // Android's system back runs the same logic as the header back button.
+    useAndroidBackButtonHandler(handleAndroidBackPress);
+
     const shouldRenderOfflineFeedback = useCallback((errorTranslation: string) => {
         if (
             errorTranslation !== 'onboarding.workEmail2FAError' &&
@@ -371,14 +397,9 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW
             testID="BaseOnboardingWorkEmail"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
-            {/* This screen normally opens onboarding, so there is nothing to go back to unless the intent list sent us here. */}
             <OnboardingHeader
-                shouldShowBackButton={isJoiningCompanyWorkspace && !isConciergeTaskFlow}
-                onBackButtonPress={() => {
-                    // Clear any work email error so the purpose screen doesn't render it without its translation params.
-                    clearOnboardingMergeAccountBlocked();
-                    Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute());
-                }}
+                shouldShowBackButton={canGoBackToPurpose}
+                onBackButtonPress={goBackToPurpose}
                 shouldShowCloseButton={isConciergeTaskFlow}
                 onCloseButtonPress={onboardingValues?.isMergingAccountBlocked ? handleConciergeTaskErrorConfirm : returnToOriginReport}
             />
diff --git a/src/pages/OnboardingWorkEmail/index.native.tsx b/src/pages/OnboardingWorkEmail/index.native.tsx
index 693c128fc7f3..bec1f099003b 100644
--- a/src/pages/OnboardingWorkEmail/index.native.tsx
+++ b/src/pages/OnboardingWorkEmail/index.native.tsx
@@ -1,37 +1,10 @@
-import {clearOnboardingMergeAccountBlocked, setOnboardingErrorMessage} from '@userActions/Welcome';
-
-import {useFocusEffect} from '@react-navigation/native';
-import React, {useCallback} from 'react';
-import {BackHandler} from 'react-native';
+import React from 'react';
 
 import type {OnboardingWorkEmailProps} from './types';
 
 import BaseOnboardingWorkEmail from './BaseOnboardingWorkEmail';
 
 function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
-    const {index: routeIndex} = props.navigation.getState();
-
-    // To block android native back button behavior
-    useFocusEffect(
-        useCallback(() => {
-            const backAction = () => {
-                // We don't want to block the back button if this is not the first route, e.g. when the intent list sent us here.
-                // Clear any work email error like the header back button does, and return false so navigation still pops the screen.
-                if (routeIndex !== 0) {
-                    clearOnboardingMergeAccountBlocked();
-                    return false;
-                }
-
-                // Return true to indicate that the back button press is handled here
-                setOnboardingErrorMessage('onboarding.purpose.errorBackButton');
-                return true;
-            };
-
-            const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
-
-            return () => backHandler.remove();
-        }, [routeIndex]),
-    );
     return (
         <BaseOnboardingWorkEmail
             shouldUseNativeStyles
diff --git a/tests/ui/WorkEmailOnboardingNativeBack.tsx b/tests/ui/WorkEmailOnboardingNativeBack.tsx
index fbc58850f49e..8e02443968ac 100644
--- a/tests/ui/WorkEmailOnboardingNativeBack.tsx
+++ b/tests/ui/WorkEmailOnboardingNativeBack.tsx
@@ -64,11 +64,20 @@ function OnboardingPersonalDetailsStub() {
     return <View testID="onboarding-personal-details-stub" />;
 }
 
+// Stands in for the intent list; only whether back lands on it matters.
+function OnboardingPurposeStub() {
+    return <View testID="onboarding-purpose-stub" />;
+}
+
 // The native (`index.native.tsx`) screens are imported directly: only those register the hardware back handler under
 // test, and Jest resolves the web `index.tsx` for a bare `@pages/...` import.
 function OnboardingModalNavigator() {
     return (
         <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.PURPOSE}
+                component={OnboardingPurposeStub}
+            />
             <OnboardingStack.Screen
                 name={SCREENS.ONBOARDING.WORK_EMAIL}
                 component={OnboardingWorkEmail}
@@ -400,9 +409,9 @@ describe('Onboarding work email validation (Android system back)', () => {
         expect(errorMessage).toBe('onboarding.purpose.errorBackButton');
     });
 
-    it('should let a system back press through when the join workspace intent opened work email', async () => {
-        // Given the intent list sent the user to work email after they picked "Join my company workspace", so there
-        // is a real screen behind this one
+    it('should go back to the intent list when the join workspace intent opened work email', async () => {
+        // Given the intent list sent the user to work email after they picked "Join my company workspace", so the
+        // intent list is behind this screen
         await TestHelper.signInWithTestUser();
 
         await act(async () => {
@@ -411,7 +420,7 @@ describe('Onboarding work email validation (Android system back)', () => {
             await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
         });
 
-        renderOnboardingStack([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+        renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE]);
 
         await waitForBatchedUpdatesWithAct();
 
@@ -423,7 +432,7 @@ describe('Onboarding work email validation (Android system back)', () => {
 
         await waitForBatchedUpdatesWithAct();
 
-        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.WORK_EMAIL]);
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL]);
 
         // Given adding the work email failed, leaving errors that the intent list would render if they followed the user back
         await act(async () => {
@@ -435,13 +444,14 @@ describe('Onboarding work email validation (Android system back)', () => {
         await waitForBatchedUpdatesWithAct();
 
         // When Android's system back button is pressed
-        pressHardwareBack();
+        const consumed = pressHardwareBack();
 
         await waitForBatchedUpdatesWithAct();
 
-        // Then no handler swallows it, the onboarding stack pops as normal, and no error is left behind
+        // Then the screen handles the press like the header back button: it returns to the intent list and no error is left behind
+        expect(consumed).toBe(true);
         await waitFor(() => {
-            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]);
         });
         let errorMessage: OnyxEntry<string>;
         await TestHelper.getOnyxData({
@@ -454,4 +464,44 @@ describe('Onboarding work email validation (Android system back)', () => {
         expect((await getOnboardingValues())?.isMergingAccountBlocked).toBe(false);
         expect((await getOnyxValue(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM))?.errors).toBeFalsy();
     });
+
+    it('should replace work email with the intent list when the join workspace intent is saved but work email is the only route', async () => {
+        // Given the user picked "Join my company workspace" and then reopened the app, which rebuilds the onboarding
+        // stack with work email as its only route
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL]);
+
+        // When Android's system back button is pressed
+        const consumed = pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the press is handled here so it cannot close the onboarding modal, and the intent list replaces work
+        // email, matching the header back button
+        expect(consumed).toBe(true);
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]);
+        });
+
+        // Then the "finish setup" error is not shown, because the user had somewhere to go back to
+        let errorMessage: OnyxEntry<string>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
+            callback: (value) => {
+                errorMessage = value ?? undefined;
+            },
+        });
+        expect(errorMessage).toBeUndefined();
+    });
 });

From 3ab7afe9a13bc81040dedd33bc14d5061b415a6e Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 13:28:12 -0700
Subject: [PATCH 711/781] test(concierge): preserve feedback acknowledgement
 timers

---
 tests/ui/ReportActionItemTest.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/ui/ReportActionItemTest.tsx b/tests/ui/ReportActionItemTest.tsx
index b55b26eb8891..c1ec5a1bc33e 100644
--- a/tests/ui/ReportActionItemTest.tsx
+++ b/tests/ui/ReportActionItemTest.tsx
@@ -3604,8 +3604,8 @@ describe('ReportActionItem', () => {
 
         async function reactWithThumbsUp(action: ReportAction, timestamp: string) {
             await act(async () => {
-                await Onyx.merge(ONYXKEYS.SESSION, {accountID: ACTOR_ACCOUNT_ID});
-                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`, buildThumbsUpReaction(timestamp));
+                await Onyx.set(ONYXKEYS.SESSION, {accountID: ACTOR_ACCOUNT_ID});
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`, buildThumbsUpReaction(timestamp));
             });
         }
 
@@ -3636,10 +3636,12 @@ describe('ReportActionItem', () => {
             jest.useFakeTimers();
 
             try {
+                // Given an unrated Concierge reply, the customer can leave feedback.
                 const action = createConciergeComment();
                 renderItemWithAction(action, true);
                 await waitForBatchedUpdatesWithAct();
 
+                // When the customer rates it, acknowledge their feedback for four seconds.
                 await reactWithThumbsUp(action, '2025-07-12 09:03:18.000');
                 expect(screen.getByText(translateLocal('concierge.feedback.thanks'))).toBeOnTheScreen();
 
@@ -3651,6 +3653,7 @@ describe('ReportActionItem', () => {
                 await clearReactions(action);
                 expect(screen.getByText(prompt())).toBeOnTheScreen();
 
+                // Then restoring the rating immediately does not repeat the acknowledgement.
                 await reactWithThumbsUp(action, '2025-07-12 09:03:19.000');
                 expect(screen.queryByText(translateLocal('concierge.feedback.thanks'))).not.toBeOnTheScreen();
             } finally {

From ee932370941b5e7df91378721d22e8d1f8a5f7d5 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Mon, 12 Oct 2026 12:02:07 -0700
Subject: [PATCH 712/781] fix(rules): reject a generated rule of another rule
 type

---
 .../workspace/rules/DescribeRuleModal.tsx     |   9 +-
 src/types/onyx/GeneratedRule.ts               |   3 +
 tests/ui/DescribeRuleModalTest.tsx            | 202 ++++++++++++++++++
 3 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/DescribeRuleModalTest.tsx

diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 89762fb17839..8df9647d37be 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -71,6 +71,7 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const generatedRuleID = generatedRule?.generationID;
     const generatedRuleState = generatedRule?.state;
+    const generatedRuleType = generatedRule?.ruleType;
     const generatedRuleValues = generatedRule?.rule;
     const inputLabel = translate('workspace.rules.newRule.describeRuleInputLabel');
 
@@ -89,9 +90,15 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             clearGeneratedRule();
             return;
         }
+        // Concierge picks the rule type itself. It can answer with a rule type other than the one this editor asked for.
+        if (generatedRuleType !== ruleType) {
+            setNewRulePromptError(CONST.GENERATED_RULE.STATE.UNSUPPORTED);
+            clearGeneratedRule();
+            return;
+        }
         onRuleGenerated(withPolicyCategory(generatedRuleValues ?? {}, policyCategories));
         close();
-    }, [close, generatedRuleID, generatedRuleState, generatedRuleValues, onRuleGenerated, policyCategories]);
+    }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, onRuleGenerated, policyCategories, ruleType]);
 
     useEffect(() => {
         if (!isVisible || !newRulePromptForm?.isLoading || pendingGenerationIDRef.current) {
diff --git a/src/types/onyx/GeneratedRule.ts b/src/types/onyx/GeneratedRule.ts
index f7543798f047..fd156e2388a0 100644
--- a/src/types/onyx/GeneratedRule.ts
+++ b/src/types/onyx/GeneratedRule.ts
@@ -20,6 +20,9 @@ type GeneratedRule = {
     /** The outcome of the generation attempt */
     state: GeneratedRuleState;
 
+    /** The rule type the description was mapped to */
+    ruleType?: GeneratedRuleType;
+
     /** The form values to seed the rule draft with */
     rule?: GeneratedRuleValues;
 };
diff --git a/tests/ui/DescribeRuleModalTest.tsx b/tests/ui/DescribeRuleModalTest.tsx
new file mode 100644
index 000000000000..0a2f84071357
--- /dev/null
+++ b/tests/ui/DescribeRuleModalTest.tsx
@@ -0,0 +1,202 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import * as API from '@libs/API';
+import type {GenerateRuleParams} from '@libs/API/parameters';
+import {WRITE_COMMANDS} from '@libs/API/types';
+
+import DescribeRuleModal from '@pages/workspace/rules/DescribeRuleModal';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {GeneratedRule} from '@src/types/onyx';
+import type {GeneratedRuleType} from '@src/types/onyx/GeneratedRule';
+
+import type * as ReactNavigationNative from '@react-navigation/native';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import {translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+let mockPrompt = '';
+
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation = jest.requireActual<typeof ReactNavigationNative>('@react-navigation/native');
+    return {
+        ...actualNavigation,
+        useFocusEffect: (callback: () => void) => {
+            callback();
+        },
+    };
+});
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string) => key,
+    })),
+);
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({isSmallScreenWidth: false, shouldUseNarrowLayout: false})));
+jest.mock('@hooks/useThemeStyles', () =>
+    jest.fn(
+        () =>
+            new Proxy(
+                {},
+                {
+                    get: () => ({}),
+                },
+            ),
+    ),
+);
+jest.mock('@components/Text', () => {
+    const ReactModule = jest.requireActual<typeof React>('react');
+    const {Text} = jest.requireActual<{Text: React.ComponentType<{children?: React.ReactNode}>}>('react-native');
+    return ({children}: {children: React.ReactNode}) => ReactModule.createElement(Text, null, children);
+});
+jest.mock(
+    '@components/Modal',
+    () =>
+        ({isVisible, children}: {isVisible: boolean; children: React.ReactNode}) =>
+            isVisible ? children : null,
+);
+jest.mock('@components/Form/InputWrapper', () => () => null);
+jest.mock('@components/Form/FormProvider', () => {
+    const ReactModule = jest.requireActual<typeof React>('react');
+    const {Pressable, Text} = jest.requireActual<{
+        Pressable: React.ComponentType<{accessibilityLabel?: string; onPress?: () => void; children?: React.ReactNode}>;
+        Text: React.ComponentType<{children?: React.ReactNode}>;
+    }>('react-native');
+    return ({children, onSubmit, submitButtonText}: {children: React.ReactNode; onSubmit: (values: {prompt: string}) => void; submitButtonText: string}) =>
+        ReactModule.createElement(
+            ReactModule.Fragment,
+            null,
+            children,
+            ReactModule.createElement(
+                Pressable,
+                {accessibilityLabel: submitButtonText, onPress: () => onSubmit({prompt: mockPrompt})},
+                ReactModule.createElement(Text, null, submitButtonText),
+            ),
+        );
+});
+
+const POLICY_ID = 'policy1';
+
+type WriteSpy = jest.SpiedFunction<typeof API.write>;
+
+function isGenerateRuleParams(parameters: unknown): parameters is GenerateRuleParams {
+    return typeof parameters === 'object' && parameters !== null && 'generationID' in parameters && 'prompt' in parameters;
+}
+
+async function renderFlagForReviewModal(onRuleGenerated: jest.Mock, onClose: jest.Mock) {
+    render(
+        <DescribeRuleModal
+            isVisible
+            onClose={onClose}
+            policyID={POLICY_ID}
+            ruleType={CONST.GENERATED_RULE.RULE_TYPE.FLAG_FOR_REVIEW}
+            onRuleGenerated={onRuleGenerated}
+        />,
+    );
+    await waitForBatchedUpdatesWithAct();
+}
+
+/** Submits the prompt through the modal and returns the generationID of the GenerateRule request */
+function describeRule(writeSpy: WriteSpy, prompt: string): string {
+    mockPrompt = prompt;
+    fireEvent.press(screen.getByLabelText('common.next'));
+    const parameters = writeSpy.mock.calls.find(([command]) => command === WRITE_COMMANDS.GENERATE_RULE)?.at(1);
+    if (!isGenerateRuleParams(parameters)) {
+        throw new Error('The describe modal did not request GenerateRule');
+    }
+    return parameters.generationID;
+}
+
+async function answerGeneration(answer: GeneratedRule) {
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.GENERATED_RULE, answer);
+    });
+    await waitForBatchedUpdatesWithAct();
+}
+
+async function getPromptErrors() {
+    const form = await getOnyxValue(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM);
+    return Object.values(form?.errors ?? {});
+}
+
+describe('DescribeRuleModal', () => {
+    let writeSpy: WriteSpy;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockPrompt = '';
+        writeSpy = jest.spyOn(API, 'write').mockImplementation(() => Promise.resolve());
+    });
+
+    afterEach(async () => {
+        writeSpy.mockRestore();
+        await act(async () => {
+            await Onyx.clear();
+        });
+    });
+
+    it('gives the generated values to the editor and closes when the answer has the rule type of the editor', async () => {
+        // Given the flag for review editor asked for a rule
+        const onRuleGenerated = jest.fn();
+        const onClose = jest.fn();
+        await renderFlagForReviewModal(onRuleGenerated, onClose);
+        const generationID = describeRule(writeSpy, 'Flag expenses over $500');
+
+        // When Concierge answers with a flag for review rule
+        await answerGeneration({
+            generationID,
+            state: CONST.GENERATED_RULE.STATE.RULE,
+            ruleType: CONST.GENERATED_RULE.RULE_TYPE.FLAG_FOR_REVIEW,
+            rule: {maxExpenseAmount: '500'},
+        });
+
+        // Then the editor gets the values and the modal closes, because the editor can show them
+        expect(onRuleGenerated).toHaveBeenCalledWith({maxExpenseAmount: '500'});
+        expect(onClose).toHaveBeenCalled();
+    });
+
+    it.each([
+        {description: 'another rule type', generatedRuleType: CONST.GENERATED_RULE.RULE_TYPE.RESTRICT_CARD_SPEND},
+        {description: 'no rule type', generatedRuleType: undefined},
+    ])('shows the unsupported error and stays open when the answer has $description', async ({generatedRuleType}: {generatedRuleType: GeneratedRuleType | undefined}) => {
+        // Given the flag for review editor asked for a rule
+        const onRuleGenerated = jest.fn();
+        const onClose = jest.fn();
+        await renderFlagForReviewModal(onRuleGenerated, onClose);
+        const generationID = describeRule(writeSpy, 'Block retail purchases on all cards');
+
+        // When Concierge answers with a rule that is not a flag for review rule
+        await answerGeneration({
+            generationID,
+            state: CONST.GENERATED_RULE.STATE.RULE,
+            ruleType: generatedRuleType,
+            rule: {merchantNames: ['Walmart']},
+        });
+
+        // Then the editor does not get the values, because they would replace its form with the fields of another rule type
+        expect(onRuleGenerated).not.toHaveBeenCalled();
+        expect(onClose).not.toHaveBeenCalled();
+        expect(await getPromptErrors()).toEqual([translateLocal('workspace.rules.newRule.promptErrors.unsupported')]);
+        expect(await getOnyxValue(ONYXKEYS.GENERATED_RULE)).toBeUndefined();
+    });
+
+    it('shows the error of an answer that is not a rule', async () => {
+        // Given the flag for review editor asked for a rule
+        const onRuleGenerated = jest.fn();
+        const onClose = jest.fn();
+        await renderFlagForReviewModal(onRuleGenerated, onClose);
+        const generationID = describeRule(writeSpy, 'asdf qwerty zxcv');
+
+        // When Concierge answers that the description is unintelligible
+        await answerGeneration({generationID, state: CONST.GENERATED_RULE.STATE.UNINTELLIGIBLE});
+
+        // Then the modal shows the unintelligible error, because the rule type check applies only to a rule answer
+        expect(onRuleGenerated).not.toHaveBeenCalled();
+        expect(onClose).not.toHaveBeenCalled();
+        expect(await getPromptErrors()).toEqual([translateLocal('workspace.rules.newRule.promptErrors.unintelligible')]);
+    });
+});

From 7a12f5f189177b0a7562f9126f1a494503bba071 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 20:43:36 +0000
Subject: [PATCH 713/781] Update version to 9.5.9-1

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1e2ae1792635..d46e331cc78c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050900
-        versionName "9.5.9-0"
+        versionCode 1009050901
+        versionName "9.5.9-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fe48fd5b6740..59b836c9b220 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.0</string>
+	<string>9.5.9.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index cb1eb32d576d..014041ab93a8 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.0</string>
+	<string>9.5.9.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index d003273820b7..df49eadc0625 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.0</string>
+	<string>9.5.9.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 31e8c0b6a645..5e9b46731c13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-0",
+  "version": "9.5.9-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.9-0",
+      "version": "9.5.9-1",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 828a2394a256..2de9b07868c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-0",
+  "version": "9.5.9-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From f4ecc5a63d12ff9beee95ada1d8de2429180e982 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 20:43:37 +0000
Subject: [PATCH 714/781] Update Mobile-Expensify submodule version to 9.5.9-1

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 721a306874d5..ef32984fc009 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 721a306874d56225db761ce67429a8fee35dfb6a
+Subproject commit ef32984fc0091a867c96e488362daf78acfc3fa9

From b77fcc0574e206d45308a5f9603bb38ded02680f Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 13:43:53 -0700
Subject: [PATCH 715/781] fix(support): render pending tickets without fetching
 early

---
 src/libs/actions/Report/index.ts       | 19 ++++++++++-
 src/pages/inbox/ReportFetchHandler.tsx | 11 +++---
 tests/actions/SupportTicketTest.ts     | 47 +++++++++++++++++++++++++-
 tests/unit/ReportFetchHandlerTest.tsx  | 40 ++++++++++++++++++++++
 tests/unit/ReportNameUtilsTest.ts      | 11 ++++++
 5 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 8ab475c25cea..7c8ea2075630 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4904,7 +4904,19 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
                   {
                       onyxMethod: Onyx.METHOD.MERGE,
                       key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                      value: {type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                      value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                  },
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                      value: {isOptimisticReport: true},
+                  },
+              ],
+              successData: [
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                      value: {isOptimisticReport: false},
                   },
               ],
               failureData: [
@@ -4913,6 +4925,11 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
                       key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
                       value: null,
                   },
+                  {
+                      onyxMethod: Onyx.METHOD.SET,
+                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                      value: null,
+                  },
               ],
           }
         : {};
diff --git a/src/pages/inbox/ReportFetchHandler.tsx b/src/pages/inbox/ReportFetchHandler.tsx
index 7b250efc7157..54e41fc4d2ad 100644
--- a/src/pages/inbox/ReportFetchHandler.tsx
+++ b/src/pages/inbox/ReportFetchHandler.tsx
@@ -190,9 +190,8 @@ function ReportFetchHandler() {
 
         // isPendingCreationFromRoute means reportIDFromRoute is a client-generated ID that doesn't exist
         // on the server yet. Calling openReport for it would 403 and show the not-found page instead.
-        // Once the real submit creates the report under this ID, reportOnyx?.reportID becomes truthy
-        // and normal fetching resumes.
-        if (isPendingCreationFromRoute && !reportOnyx?.reportID) {
+        // Wait until the report exists locally and is no longer optimistic before fetching it.
+        if (isPendingCreationFromRoute && (!reportOnyx?.reportID || reportMetadata.isOptimisticReport)) {
             return;
         }
 
@@ -387,15 +386,15 @@ function ReportFetchHandler() {
         navigation.setParams({secureKey: undefined});
     }, [secureKeyFromRoute, reportIDFromRoute, report?.reportID, report?.errorFields?.notFound, navigation]);
 
-    // isPendingCreation is only needed before the report exists. Clear it from the route params once it
+    // isPendingCreation is only needed before the report exists on the server. Clear it from the route params once it
     // does, so a copied URL, restored navigation state, or reload doesn't carry the stale flag and skip
     // fetching again later.
     useEffect(() => {
-        if (!isPendingCreationFromRoute || !reportOnyx?.reportID) {
+        if (!isPendingCreationFromRoute || !reportOnyx?.reportID || reportMetadata.isOptimisticReport) {
             return;
         }
         navigation.setParams({isPendingCreation: undefined});
-    }, [isPendingCreationFromRoute, reportOnyx?.reportID, navigation]);
+    }, [isPendingCreationFromRoute, reportOnyx?.reportID, reportMetadata.isOptimisticReport, navigation]);
 
     // A restored or shared route can carry isPendingCreation with no submit behind it. The owning submit writes the
     // report row within the dismiss transition budget (about 2s) after this screen gains focus, so a focused screen
diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 1677429fa9a6..7375a4f9e99e 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -66,7 +66,19 @@ describe('actions/Report', () => {
                     {
                         onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                        value: {type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                        value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                    },
+                    {
+                        onyxMethod: Onyx.METHOD.MERGE,
+                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                        value: {isOptimisticReport: true},
+                    },
+                ],
+                successData: [
+                    {
+                        onyxMethod: Onyx.METHOD.MERGE,
+                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                        value: {isOptimisticReport: false},
                     },
                 ],
                 failureData: [
@@ -75,6 +87,11 @@ describe('actions/Report', () => {
                         key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
                         value: null,
                     },
+                    {
+                        onyxMethod: Onyx.METHOD.SET,
+                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                        value: null,
+                    },
                 ],
             },
         );
@@ -95,6 +112,7 @@ describe('actions/Report', () => {
             reportID: newSupportTicketReportID,
             type: CONST.REPORT.TYPE.SUPPORT_TICKET,
         });
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`, {isOptimisticReport: true});
         mockMakeRequestWithSideEffects.mockRejectedValueOnce(networkError);
 
         // When the customer asks to talk to a human
@@ -103,6 +121,33 @@ describe('actions/Report', () => {
         // Then the App removes the pending report and preserves the request failure
         await expect(request).rejects.toBe(networkError);
         await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+    });
+
+    it.each([CONST.JSON_CODE.SUCCESS, CONST.JSON_CODE.EXP_ERROR])('settles the optimistic ticket after server response %s', async (jsonCode) => {
+        // Given a new ticket whose creation response applies the API's success or failure updates
+        mockMakeRequestWithSideEffects.mockImplementationOnce(async (_command, _parameters, onyxData) => {
+            await Onyx.update(onyxData?.optimisticData ?? []);
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toEqual({
+                reportID: newSupportTicketReportID,
+                type: CONST.REPORT.TYPE.SUPPORT_TICKET,
+            });
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toEqual({isOptimisticReport: true});
+            await Onyx.update((jsonCode === CONST.JSON_CODE.SUCCESS ? onyxData?.successData : onyxData?.failureData) ?? []);
+            return {jsonCode};
+        });
+
+        // When the server accepts or rejects the creation request
+        await openSupportTicket();
+
+        // Then a successful ticket can be fetched, while a rejected ticket leaves no optimistic data behind
+        if (jsonCode === CONST.JSON_CODE.SUCCESS) {
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toEqual({isOptimisticReport: false});
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toMatchObject({reportID: newSupportTicketReportID});
+        } else {
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+        }
     });
 
     it('does not update Onyx when reopening a support ticket fails', async () => {
diff --git a/tests/unit/ReportFetchHandlerTest.tsx b/tests/unit/ReportFetchHandlerTest.tsx
index 6372602d5bd3..74319fc7176a 100644
--- a/tests/unit/ReportFetchHandlerTest.tsx
+++ b/tests/unit/ReportFetchHandlerTest.tsx
@@ -120,6 +120,46 @@ describe('ReportFetchHandler', () => {
         expect(mockOpenReport).not.toHaveBeenCalled();
     });
 
+    it.each([false, true])('keeps an optimistic support ticket pending without fetching it when offline is %s', async (isOffline) => {
+        // Given a support ticket that can render locally but has not been created on the server
+        mockIsOffline = isOffline;
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.SUPPORT_TICKET});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: true});
+        await waitForBatchedUpdates();
+
+        // When the customer opens the pending ticket
+        renderHandler();
+        await waitForBatchedUpdates();
+
+        // Then the client neither requests a nonexistent report nor releases the pending route
+        expect(mockOpenReport).not.toHaveBeenCalled();
+        expect(mockSetParams).not.toHaveBeenCalledWith({isPendingCreation: undefined});
+    });
+
+    it('resumes fetching after the server creates an optimistic support ticket', async () => {
+        // Given a mounted support ticket waiting for creation
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.SUPPORT_TICKET});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: true});
+        await waitForBatchedUpdates();
+        const {rerender} = renderHandler();
+        await waitForBatchedUpdates();
+        expect(mockOpenReport).not.toHaveBeenCalled();
+        expect(mockSetParams).not.toHaveBeenCalledWith({isPendingCreation: undefined});
+
+        // When creation succeeds, the pending route can be released
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: false});
+        await waitForBatchedUpdates();
+        expect(mockSetParams).toHaveBeenCalledWith({isPendingCreation: undefined});
+        setRouteParams({reportID: REPORT_ID});
+        rerender(<HandlerTree isInPreloadedTab={false} />);
+        await waitForBatchedUpdates();
+
+        // Then fetching the server-created report is safe
+        expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
+    });
+
     it('expires a stale isPendingCreation flag when the focused screen never receives a report row', async () => {
         // Given a restored route that still carries isPendingCreation but has no submit writing the report
         setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
diff --git a/tests/unit/ReportNameUtilsTest.ts b/tests/unit/ReportNameUtilsTest.ts
index 9ae674d6c75c..b3a92392e7eb 100644
--- a/tests/unit/ReportNameUtilsTest.ts
+++ b/tests/unit/ReportNameUtilsTest.ts
@@ -208,6 +208,17 @@ describe('ReportNameUtils', () => {
     });
 
     describe('computeReportName - support tickets', () => {
+        test('shows the support ticket title before server details arrive', () => {
+            // Given a support ticket that exists only optimistically
+            const supportTicket = {reportID: 'supportTicketReportID', type: CONST.REPORT.TYPE.SUPPORT_TICKET};
+
+            // When its name is displayed before creation completes
+            const name = computeReportName(supportTicket);
+
+            // Then the customer sees a support ticket title without needing participant details
+            expect(name).toBe('Support ticket');
+        });
+
         test('uses the support rep login when their display name is unavailable', () => {
             const supportTicket = createMock<Report>({
                 reportID: 'supportTicketReportID',

From e09ed77b8cc257bf492b6b0cc7547e2116b944b0 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 13:52:53 -0700
Subject: [PATCH 716/781] fix(support): set the optimistic guard before the
 report id

---
 src/libs/actions/Report/index.ts   | 11 +++----
 tests/actions/SupportTicketTest.ts | 48 ++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 7c8ea2075630..59957ff7fd18 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4901,15 +4901,16 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
     const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_METADATA> = newSupportTicketReportID
         ? {
               optimisticData: [
+                  // Set the fetch guard before publishing the report ID; merges can wait on storage reads.
                   {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                      value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                      onyxMethod: Onyx.METHOD.SET,
+                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                      value: {isOptimisticReport: true},
                   },
                   {
                       onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                      value: {isOptimisticReport: true},
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                      value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
                   },
               ],
               successData: [
diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 7375a4f9e99e..9115ebced154 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -64,14 +64,14 @@ describe('actions/Report', () => {
             {
                 optimisticData: [
                     {
-                        onyxMethod: Onyx.METHOD.MERGE,
-                        key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
-                        value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
+                        onyxMethod: Onyx.METHOD.SET,
+                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                        value: {isOptimisticReport: true},
                     },
                     {
                         onyxMethod: Onyx.METHOD.MERGE,
-                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                        value: {isOptimisticReport: true},
+                        key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+                        value: {reportID: newSupportTicketReportID, type: CONST.REPORT.TYPE.SUPPORT_TICKET},
                     },
                 ],
                 successData: [
@@ -105,6 +105,44 @@ describe('actions/Report', () => {
         expect(mockNavigate).toHaveBeenCalledTimes(1);
     });
 
+    it('marks a new ticket optimistic before publishing its report ID', async () => {
+        // Given a screen observing a ticket that has not been created on the server
+        let isOptimisticReport = false;
+        const reportStates: boolean[] = [];
+        // Observe both keys independently, as the report screen does while creation is pending.
+        const metadataConnection = Onyx.connectWithoutView({
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+            callback: (metadata) => {
+                isOptimisticReport = !!metadata?.isOptimisticReport;
+            },
+        });
+        const reportConnection = Onyx.connectWithoutView({
+            key: `${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`,
+            callback: (report) => {
+                if (!report?.reportID) {
+                    return;
+                }
+                reportStates.push(isOptimisticReport);
+            },
+        });
+        await waitForBatchedUpdates();
+        mockMakeRequestWithSideEffects.mockImplementationOnce(async (_command, _parameters, onyxData) => {
+            await Onyx.update(onyxData?.optimisticData ?? []);
+        });
+
+        try {
+            // When optimistic updates make the pending ticket visible
+            await openSupportTicket();
+            await waitForBatchedUpdates();
+
+            // Then the report ID is never observable without its fetch guard
+            expect(reportStates).toEqual([true]);
+        } finally {
+            Onyx.disconnect(reportConnection);
+            Onyx.disconnect(metadataConnection);
+        }
+    });
+
     it('removes the pending report when the request fails before receiving a response', async () => {
         // Given an optimistic support ticket in Onyx and a request that fails before the API can apply its failure data
         const networkError = new Error('Network request failed');

From 2403f6727718e20a455805bcd301a094dd194cee Mon Sep 17 00:00:00 2001
From: "Abdelrahman Khattab (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 14 Oct 2026 21:05:48 +0000
Subject: [PATCH 717/781] Flush a pending scroll-to-bottom on list content size
 change instead of on the next frame

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>
---
 src/hooks/useReportActionsScroll.ts          | 16 +-----------
 src/pages/inbox/report/ReportActionsList.tsx |  1 +
 tests/ui/ReportActionsListTest.tsx           | 17 ++++++++++++
 tests/unit/useReportActionsScrollTest.tsx    | 27 --------------------
 4 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index eef062777d87..dfcd02207383 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -113,7 +113,7 @@ type UseReportActionsScrollResult = {
 
     scrollToActionBadgeTarget: () => void;
 
-    /** Completes a live-tail scroll-to-bottom once the list has laid out; call on every list layout */
+    /** Completes a live-tail scroll-to-bottom once the list has laid out; call on every list layout and content size change */
     flushPendingScrollToBottom: () => void;
 
     /** Whether the list should be pinned to the visual top (transaction thread / money request) */
@@ -412,20 +412,6 @@ function useReportActionsScroll({
         completeLiveTailPruneAfterScrollToBottom();
     };
 
-    const flushPendingScrollToBottomFromEffect = useEffectEvent(() => flushPendingScrollToBottom());
-
-    // In an aligned-to-top report (expense, invoice, transaction thread), the list's onLayout is not enough to flush a
-    // pending scroll: a new comment changes the content size, not the layout size, so onLayout may never fire. Regular
-    // chats don't need this, because their first scrollToBottom already lands. Flush on the next frame so this effect
-    // doesn't chain a synchronous setState.
-    useEffect(() => {
-        if (!shouldBeAlignedToTop || !isScrollToBottomEnabled) {
-            return;
-        }
-        const frame = requestAnimationFrame(() => flushPendingScrollToBottomFromEffect());
-        return () => cancelAnimationFrame(frame);
-    }, [shouldBeAlignedToTop, isScrollToBottomEnabled]);
-
     // Data is ready at the moment FlashList finishes its first render.
     const onLoad = () => {
         if (shouldDisablePillTracking) {
diff --git a/src/pages/inbox/report/ReportActionsList.tsx b/src/pages/inbox/report/ReportActionsList.tsx
index e240e744651e..c19330f2baa4 100644
--- a/src/pages/inbox/report/ReportActionsList.tsx
+++ b/src/pages/inbox/report/ReportActionsList.tsx
@@ -530,6 +530,7 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
                     onLoad={onLoad}
                     onContentSizeChange={() => {
                         trackVerticalScrolling(undefined);
+                        flushPendingScrollToBottom();
                     }}
                 />
             </ReportActionsListPaddingView>
diff --git a/tests/ui/ReportActionsListTest.tsx b/tests/ui/ReportActionsListTest.tsx
index 9b5234228c42..d4b59a15a428 100644
--- a/tests/ui/ReportActionsListTest.tsx
+++ b/tests/ui/ReportActionsListTest.tsx
@@ -160,6 +160,7 @@ type MockInvertedFlashListProps = {
     data?: OnyxTypes.ReportAction[];
     extraData?: unknown;
     renderItem?: (info: {item: OnyxTypes.ReportAction; index: number}) => React.ReactElement | null;
+    onContentSizeChange?: () => void;
 };
 
 const mockInvertedFlashList: jest.MockedFunction<(props: MockInvertedFlashListProps) => null> = jest.requireMock('@components/FlashList/InvertedFlashList');
@@ -830,6 +831,22 @@ describe('ReportActionsList (body)', () => {
         });
     });
 
+    describe('Pending scroll-to-bottom', () => {
+        it('flushes a pending scroll-to-bottom when the list content size changes', () => {
+            // Given the list is rendered
+            mockUseNetwork.mockReturnValue({isOffline: false});
+            renderReportActionsList();
+
+            // When the list content size changes, as it does once FlashList lays out a newly sent comment. In an
+            // aligned-to-top report this is the only list event that follows, because onLayout does not fire.
+            getCapturedListProps()?.onContentSizeChange?.();
+
+            // Then the pending scroll-to-bottom is flushed, so the list lands on the new comment
+            const scrollHookResult = mockUseReportActionsScroll.mock.results.at(-1)?.value as {flushPendingScrollToBottom: jest.Mock};
+            expect(scrollHookResult.flushPendingScrollToBottom).toHaveBeenCalledTimes(1);
+        });
+    });
+
     describe('Concierge Side Panel', () => {
         const CONCIERGE_REPORT_ID = '123';
         const CURRENT_USER_ACCOUNT_ID = 100;
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index e165349e8f12..c3e78bccf919 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -433,33 +433,6 @@ describe('useReportActionsScroll', () => {
             expect(mockSetIsScrollToBottomEnabled).toHaveBeenCalledWith(false);
             expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
         });
-
-        it('flushes a pending scroll-to-bottom without waiting for a list layout event in an aligned-to-top report', async () => {
-            // Given an expense report, and the live-tail hook asked for a scroll to bottom, as it does after the user sends a comment
-            mockIsMoneyRequestReport = true;
-            mockIsScrollToBottomEnabled = true;
-
-            // When the hook renders and no list onLayout follows, because a new comment changes content size, not layout size
-            await renderScroll();
-
-            // Then the pending scroll is still flushed once, and the request is cleared
-            expect(mockScrollToBottom).toHaveBeenCalledTimes(1);
-            expect(mockSetIsScrollToBottomEnabled).toHaveBeenCalledWith(false);
-            expect(mockCompleteLiveTailPrune).toHaveBeenCalledTimes(1);
-        });
-
-        it('leaves a pending scroll-to-bottom to the list layout event in a regular chat', async () => {
-            // Given a regular chat, and the live-tail hook asked for a scroll to bottom
-            mockIsScrollToBottomEnabled = true;
-
-            // When the hook renders
-            await renderScroll();
-
-            // Then nothing flushes on the next frame, because the first scrollToBottom in a regular chat already lands
-            expect(mockScrollToBottom).not.toHaveBeenCalled();
-            expect(mockSetIsScrollToBottomEnabled).not.toHaveBeenCalled();
-            expect(mockCompleteLiveTailPrune).not.toHaveBeenCalled();
-        });
     });
 
     describe('onLoad', () => {

From ce7e6df2a8fad1bdeddb5485b2a7465bb1668ad2 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 15:18:55 -0700
Subject: [PATCH 718/781] fix(support): release pending ticket guards after
 reload

---
 src/libs/actions/Report/index.ts       | 15 +++---
 src/pages/inbox/ReportFetchHandler.tsx | 11 ++--
 src/types/onyx/ReportLoadingState.ts   |  3 ++
 tests/actions/SupportTicketTest.ts     | 70 ++++++++++++++++----------
 tests/unit/ReportFetchHandlerTest.tsx  | 33 ++++++++++--
 5 files changed, 91 insertions(+), 41 deletions(-)

diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 59957ff7fd18..0a284ebd4dd5 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -4898,14 +4898,15 @@ function isNoSupportRepAvailableResponse(response: {jsonCode?: number | string;
 function openSupportTicket(resolvedSupportTicketReportID?: string) {
     const newSupportTicketReportID = resolvedSupportTicketReportID ? undefined : generateReportID();
     const parameters: CreateSupportTicketParams = resolvedSupportTicketReportID ? {resolvedSupportTicketReportID, idempotencyKey: Str.guid()} : {newSupportTicketReportID};
-    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_METADATA> = newSupportTicketReportID
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE> = newSupportTicketReportID
         ? {
               optimisticData: [
-                  // Set the fetch guard before publishing the report ID; merges can wait on storage reads.
+                  // The request does not survive reloads, so its fetch guard must stay in RAM.
+                  // Set it before publishing the report ID; merges can wait on storage reads.
                   {
                       onyxMethod: Onyx.METHOD.SET,
-                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                      value: {isOptimisticReport: true},
+                      key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
+                      value: {isCreatingSupportTicket: true},
                   },
                   {
                       onyxMethod: Onyx.METHOD.MERGE,
@@ -4916,8 +4917,8 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
               successData: [
                   {
                       onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                      value: {isOptimisticReport: false},
+                      key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
+                      value: {isCreatingSupportTicket: false},
                   },
               ],
               failureData: [
@@ -4928,7 +4929,7 @@ function openSupportTicket(resolvedSupportTicketReportID?: string) {
                   },
                   {
                       onyxMethod: Onyx.METHOD.SET,
-                      key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                      key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
                       value: null,
                   },
               ],
diff --git a/src/pages/inbox/ReportFetchHandler.tsx b/src/pages/inbox/ReportFetchHandler.tsx
index 54e41fc4d2ad..ff189b4b44e0 100644
--- a/src/pages/inbox/ReportFetchHandler.tsx
+++ b/src/pages/inbox/ReportFetchHandler.tsx
@@ -77,6 +77,7 @@ const defaultReportMetadata = {
 
 const defaultReportLoadingState = {
     hasOnceLoadedReportActions: false,
+    isCreatingSupportTicket: false,
     isLoadingInitialReportActions: true,
     isLoadingOlderReportActions: false,
     hasLoadingOlderReportActionsError: false,
@@ -129,6 +130,7 @@ function ReportFetchHandler() {
     const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportOnyx?.chatReportID}`);
     const [reportMetadata = defaultReportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportIDFromRoute}`);
     const [reportLoadingState = defaultReportLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${reportIDFromRoute}`);
+    const isPendingReportCreation = !!reportMetadata.isOptimisticReport || !!reportLoadingState.isCreatingSupportTicket;
     const isReportActionsLoaded = useIsReportActionsLoaded(reportIDFromRoute);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
@@ -191,7 +193,7 @@ function ReportFetchHandler() {
         // isPendingCreationFromRoute means reportIDFromRoute is a client-generated ID that doesn't exist
         // on the server yet. Calling openReport for it would 403 and show the not-found page instead.
         // Wait until the report exists locally and is no longer optimistic before fetching it.
-        if (isPendingCreationFromRoute && (!reportOnyx?.reportID || reportMetadata.isOptimisticReport)) {
+        if (isPendingCreationFromRoute && (!reportOnyx?.reportID || isPendingReportCreation)) {
             return;
         }
 
@@ -388,13 +390,14 @@ function ReportFetchHandler() {
 
     // isPendingCreation is only needed before the report exists on the server. Clear it from the route params once it
     // does, so a copied URL, restored navigation state, or reload doesn't carry the stale flag and skip
-    // fetching again later.
+    // fetching again later. A support-ticket request is lost on reload, so its RAM-only guard also resets
+    // and lets OpenReport discover whether the server created the ticket.
     useEffect(() => {
-        if (!isPendingCreationFromRoute || !reportOnyx?.reportID || reportMetadata.isOptimisticReport) {
+        if (!isPendingCreationFromRoute || !reportOnyx?.reportID || isPendingReportCreation) {
             return;
         }
         navigation.setParams({isPendingCreation: undefined});
-    }, [isPendingCreationFromRoute, reportOnyx?.reportID, reportMetadata.isOptimisticReport, navigation]);
+    }, [isPendingCreationFromRoute, reportOnyx?.reportID, isPendingReportCreation, navigation]);
 
     // A restored or shared route can carry isPendingCreation with no submit behind it. The owning submit writes the
     // report row within the dismiss transition budget (about 2s) after this screen gains focus, so a focused screen
diff --git a/src/types/onyx/ReportLoadingState.ts b/src/types/onyx/ReportLoadingState.ts
index dea1e5985bc9..bf033bb8ca71 100644
--- a/src/types/onyx/ReportLoadingState.ts
+++ b/src/types/onyx/ReportLoadingState.ts
@@ -18,6 +18,9 @@ type ReportLoadingState = {
     /** Flag to check if the initial report actions fetch is in flight */
     isLoadingInitialReportActions?: boolean;
 
+    /** Whether a support-ticket creation request is in flight in this session */
+    isCreatingSupportTicket?: boolean;
+
     /** Whether participants private notes are being currently loaded */
     isLoadingPrivateNotes?: boolean;
 
diff --git a/tests/actions/SupportTicketTest.ts b/tests/actions/SupportTicketTest.ts
index 9115ebced154..1796bdc2bc42 100644
--- a/tests/actions/SupportTicketTest.ts
+++ b/tests/actions/SupportTicketTest.ts
@@ -65,8 +65,8 @@ describe('actions/Report', () => {
                 optimisticData: [
                     {
                         onyxMethod: Onyx.METHOD.SET,
-                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                        value: {isOptimisticReport: true},
+                        key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
+                        value: {isCreatingSupportTicket: true},
                     },
                     {
                         onyxMethod: Onyx.METHOD.MERGE,
@@ -77,8 +77,8 @@ describe('actions/Report', () => {
                 successData: [
                     {
                         onyxMethod: Onyx.METHOD.MERGE,
-                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-                        value: {isOptimisticReport: false},
+                        key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
+                        value: {isCreatingSupportTicket: false},
                     },
                 ],
                 failureData: [
@@ -89,7 +89,7 @@ describe('actions/Report', () => {
                     },
                     {
                         onyxMethod: Onyx.METHOD.SET,
-                        key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
+                        key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
                         value: null,
                     },
                 ],
@@ -107,13 +107,13 @@ describe('actions/Report', () => {
 
     it('marks a new ticket optimistic before publishing its report ID', async () => {
         // Given a screen observing a ticket that has not been created on the server
-        let isOptimisticReport = false;
+        let isCreatingSupportTicket = false;
         const reportStates: boolean[] = [];
         // Observe both keys independently, as the report screen does while creation is pending.
-        const metadataConnection = Onyx.connectWithoutView({
-            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`,
-            callback: (metadata) => {
-                isOptimisticReport = !!metadata?.isOptimisticReport;
+        const loadingStateConnection = Onyx.connectWithoutView({
+            key: `${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`,
+            callback: (loadingState) => {
+                isCreatingSupportTicket = !!loadingState?.isCreatingSupportTicket;
             },
         });
         const reportConnection = Onyx.connectWithoutView({
@@ -122,7 +122,7 @@ describe('actions/Report', () => {
                 if (!report?.reportID) {
                     return;
                 }
-                reportStates.push(isOptimisticReport);
+                reportStates.push(isCreatingSupportTicket);
             },
         });
         await waitForBatchedUpdates();
@@ -139,7 +139,7 @@ describe('actions/Report', () => {
             expect(reportStates).toEqual([true]);
         } finally {
             Onyx.disconnect(reportConnection);
-            Onyx.disconnect(metadataConnection);
+            Onyx.disconnect(loadingStateConnection);
         }
     });
 
@@ -150,7 +150,7 @@ describe('actions/Report', () => {
             reportID: newSupportTicketReportID,
             type: CONST.REPORT.TYPE.SUPPORT_TICKET,
         });
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`, {isOptimisticReport: true});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`, {isCreatingSupportTicket: true});
         mockMakeRequestWithSideEffects.mockRejectedValueOnce(networkError);
 
         // When the customer asks to talk to a human
@@ -159,33 +159,49 @@ describe('actions/Report', () => {
         // Then the App removes the pending report and preserves the request failure
         await expect(request).rejects.toBe(networkError);
         await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+    });
+
+    it('keeps the report and releases its fetch guard after creation succeeds', async () => {
+        // Given a new ticket whose server response applies the API's success updates
+        mockMakeRequestWithSideEffects.mockImplementationOnce(async (_command, _parameters, onyxData) => {
+            await Onyx.update(onyxData?.optimisticData ?? []);
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`)).resolves.toEqual({isCreatingSupportTicket: true});
+            await Onyx.update(onyxData?.successData ?? []);
+            return {jsonCode: CONST.JSON_CODE.SUCCESS};
+        });
+
+        // When the server accepts the creation request
+        await openSupportTicket();
+
+        // Then the ticket remains available and can be fetched
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`)).resolves.toEqual({isCreatingSupportTicket: false});
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toEqual({
+            reportID: newSupportTicketReportID,
+            type: CONST.REPORT.TYPE.SUPPORT_TICKET,
+        });
         await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toBeUndefined();
     });
 
-    it.each([CONST.JSON_CODE.SUCCESS, CONST.JSON_CODE.EXP_ERROR])('settles the optimistic ticket after server response %s', async (jsonCode) => {
-        // Given a new ticket whose creation response applies the API's success or failure updates
+    it('removes the pending report and loading state when the server rejects creation', async () => {
+        // Given a new ticket whose server response applies the API's failure updates
         mockMakeRequestWithSideEffects.mockImplementationOnce(async (_command, _parameters, onyxData) => {
             await Onyx.update(onyxData?.optimisticData ?? []);
             await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toEqual({
                 reportID: newSupportTicketReportID,
                 type: CONST.REPORT.TYPE.SUPPORT_TICKET,
             });
-            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toEqual({isOptimisticReport: true});
-            await Onyx.update((jsonCode === CONST.JSON_CODE.SUCCESS ? onyxData?.successData : onyxData?.failureData) ?? []);
-            return {jsonCode};
+            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`)).resolves.toEqual({isCreatingSupportTicket: true});
+            await Onyx.update(onyxData?.failureData ?? []);
+            return {jsonCode: CONST.JSON_CODE.EXP_ERROR};
         });
 
-        // When the server accepts or rejects the creation request
+        // When the server rejects the creation request
         await openSupportTicket();
 
-        // Then a successful ticket can be fetched, while a rejected ticket leaves no optimistic data behind
-        if (jsonCode === CONST.JSON_CODE.SUCCESS) {
-            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toEqual({isOptimisticReport: false});
-            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toMatchObject({reportID: newSupportTicketReportID});
-        } else {
-            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
-            await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${newSupportTicketReportID}`)).resolves.toBeUndefined();
-        }
+        // Then neither the pending ticket nor its fetch guard remains
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${newSupportTicketReportID}`)).resolves.toBeUndefined();
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${newSupportTicketReportID}`)).resolves.toBeUndefined();
     });
 
     it('does not update Onyx when reopening a support ticket fails', async () => {
diff --git a/tests/unit/ReportFetchHandlerTest.tsx b/tests/unit/ReportFetchHandlerTest.tsx
index 74319fc7176a..2bcb4a55d360 100644
--- a/tests/unit/ReportFetchHandlerTest.tsx
+++ b/tests/unit/ReportFetchHandlerTest.tsx
@@ -125,7 +125,7 @@ describe('ReportFetchHandler', () => {
         mockIsOffline = isOffline;
         setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
         await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.SUPPORT_TICKET});
-        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: true});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {isCreatingSupportTicket: true});
         await waitForBatchedUpdates();
 
         // When the customer opens the pending ticket
@@ -141,7 +141,7 @@ describe('ReportFetchHandler', () => {
         // Given a mounted support ticket waiting for creation
         setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
         await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.SUPPORT_TICKET});
-        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: true});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {isCreatingSupportTicket: true});
         await waitForBatchedUpdates();
         const {rerender} = renderHandler();
         await waitForBatchedUpdates();
@@ -149,7 +149,7 @@ describe('ReportFetchHandler', () => {
         expect(mockSetParams).not.toHaveBeenCalledWith({isPendingCreation: undefined});
 
         // When creation succeeds, the pending route can be released
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: false});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {isCreatingSupportTicket: false});
         await waitForBatchedUpdates();
         expect(mockSetParams).toHaveBeenCalledWith({isPendingCreation: undefined});
         setRouteParams({reportID: REPORT_ID});
@@ -160,6 +160,33 @@ describe('ReportFetchHandler', () => {
         expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
     });
 
+    it.each([false, true])('recovers a pending support ticket after reloading while offline is %s', async (isOffline) => {
+        // Given a pending ticket whose creation request belongs to the current app session
+        mockIsOffline = isOffline;
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.SUPPORT_TICKET});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {isCreatingSupportTicket: true});
+        await waitForBatchedUpdates();
+        const {unmount} = renderHandler();
+        await waitForBatchedUpdates();
+        expect(mockOpenReport).not.toHaveBeenCalled();
+
+        // When the app reloads, the report and URL survive but RAM-only state and the in-flight request do not
+        unmount();
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, null);
+        await waitForBatchedUpdates();
+        const {rerender} = renderHandler();
+        await waitForBatchedUpdates();
+
+        // Then the stale route is released and the report can resolve to server content or not-found once online
+        expect(mockSetParams).toHaveBeenCalledWith({isPendingCreation: undefined});
+        mockIsOffline = false;
+        setRouteParams({reportID: REPORT_ID});
+        rerender(<HandlerTree isInPreloadedTab={false} />);
+        await waitForBatchedUpdates();
+        expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
+    });
+
     it('expires a stale isPendingCreation flag when the focused screen never receives a report row', async () => {
         // Given a restored route that still carries isPendingCreation but has no submit writing the report
         setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});

From e3092294dfdaac54574f07f7655e39dc4e3536ca Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Wed, 14 Oct 2026 15:56:38 -0700
Subject: [PATCH 719/781] test(search): return Onyx metadata from
 SearchColumnsPage useOnyx mock

usePolicyForMovingExpenses now reads the load status that useOnyx
returns for the policy collection, and passes it to isLoadingOnyxValue.
The SearchColumnsPage test mocked useOnyx to return only the value, so
the metadata was undefined and the test crashed on main with
"Cannot read properties of undefined (reading 'status')".

Return a loaded status from the mock, as the real hook does.
---
 tests/ui/SearchColumnsPageTest.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ui/SearchColumnsPageTest.tsx b/tests/ui/SearchColumnsPageTest.tsx
index 5c8b96f9eaea..d0719828f7a2 100644
--- a/tests/ui/SearchColumnsPageTest.tsx
+++ b/tests/ui/SearchColumnsPageTest.tsx
@@ -38,7 +38,7 @@ describe('SearchColumnsPage', () => {
         }
 
         const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : undefined]);
+        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : undefined, {status: 'loaded'}]);
         mockGetRootState.mockReturnValue({
             routes: [{name: NAVIGATORS.TAB_NAVIGATOR, params: {screen: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, params: {screen: SCREENS.SEARCH.ROOT, params: {q: input}}}}],
         });

From 91660886453e5bc13a64534c148a1f452092b6e2 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 14 Oct 2026 15:57:18 -0700
Subject: [PATCH 720/781] fix(support): ignore persisted pending metadata

---
 src/pages/inbox/ReportFetchHandler.tsx | 2 +-
 tests/unit/ReportFetchHandlerTest.tsx  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/inbox/ReportFetchHandler.tsx b/src/pages/inbox/ReportFetchHandler.tsx
index ff189b4b44e0..ff7b6840976e 100644
--- a/src/pages/inbox/ReportFetchHandler.tsx
+++ b/src/pages/inbox/ReportFetchHandler.tsx
@@ -130,7 +130,7 @@ function ReportFetchHandler() {
     const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportOnyx?.chatReportID}`);
     const [reportMetadata = defaultReportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportIDFromRoute}`);
     const [reportLoadingState = defaultReportLoadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${reportIDFromRoute}`);
-    const isPendingReportCreation = !!reportMetadata.isOptimisticReport || !!reportLoadingState.isCreatingSupportTicket;
+    const isPendingReportCreation = !!reportLoadingState.isCreatingSupportTicket;
     const isReportActionsLoaded = useIsReportActionsLoaded(reportIDFromRoute);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
diff --git a/tests/unit/ReportFetchHandlerTest.tsx b/tests/unit/ReportFetchHandlerTest.tsx
index 2bcb4a55d360..7b96e63efda2 100644
--- a/tests/unit/ReportFetchHandlerTest.tsx
+++ b/tests/unit/ReportFetchHandlerTest.tsx
@@ -171,8 +171,10 @@ describe('ReportFetchHandler', () => {
         await waitForBatchedUpdates();
         expect(mockOpenReport).not.toHaveBeenCalled();
 
-        // When the app reloads, the report and URL survive but RAM-only state and the in-flight request do not
+        // When the app reloads, the report, URL, and stale persisted metadata survive.
+        // RAM-only state and the in-flight request do not.
         unmount();
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${REPORT_ID}`, {isOptimisticReport: true});
         await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, null);
         await waitForBatchedUpdates();
         const {rerender} = renderHandler();

From d6846a01b518e59bcc14219a8898229b20a36fa5 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 23:22:33 +0000
Subject: [PATCH 721/781] Update version to 9.5.9-2

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index d46e331cc78c..e99091dd6d37 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050901
-        versionName "9.5.9-1"
+        versionCode 1009050902
+        versionName "9.5.9-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 59b836c9b220..3c347b9bba57 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.1</string>
+	<string>9.5.9.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 014041ab93a8..35a77f177610 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.1</string>
+	<string>9.5.9.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index df49eadc0625..f29d1f38f0d4 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.1</string>
+	<string>9.5.9.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 5e9b46731c13..f03139f5bbcc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-1",
+  "version": "9.5.9-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.9-1",
+      "version": "9.5.9-2",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 2de9b07868c9..6718e82c6a75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-1",
+  "version": "9.5.9-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 8f70fe64834b4ec76a48b58d64fea4990d61b72b Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 14 Oct 2026 23:22:33 +0000
Subject: [PATCH 722/781] Update Mobile-Expensify submodule version to 9.5.9-2

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index ef32984fc009..9c0c13f6df15 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit ef32984fc0091a867c96e488362daf78acfc3fa9
+Subproject commit 9c0c13f6df15ffffc515dd4cfae482064241fbef

From 1489fb930faaeaf89878c67ea6a9931eaea24cf3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 00:08:46 +0000
Subject: [PATCH 723/781] Update version to 9.5.9-3

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e99091dd6d37..aa9cf850f832 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050902
-        versionName "9.5.9-2"
+        versionCode 1009050903
+        versionName "9.5.9-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3c347b9bba57..fefc08e41b3a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.2</string>
+	<string>9.5.9.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 35a77f177610..288dbb799066 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.2</string>
+	<string>9.5.9.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index f29d1f38f0d4..fcc836770bb3 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.2</string>
+	<string>9.5.9.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index f03139f5bbcc..dadafe87d443 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-2",
+  "version": "9.5.9-3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.9-2",
+      "version": "9.5.9-3",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 6718e82c6a75..7ff3cc7e5749 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-2",
+  "version": "9.5.9-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 192cf1e415b663ad70b11f68416e84918549f2d3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 00:08:46 +0000
Subject: [PATCH 724/781] Update Mobile-Expensify submodule version to 9.5.9-3

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 9c0c13f6df15..b4f818310a60 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 9c0c13f6df15ffffc515dd4cfae482064241fbef
+Subproject commit b4f818310a60e4e3d7b1057c8f0e75f413a83f1b

From 7c13b8e5009ef48f206f7ba4321b80ab3d4376d1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 00:10:50 +0000
Subject: [PATCH 725/781] Update version to 9.5.9-4

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index aa9cf850f832..8a24c18c5e2a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050903
-        versionName "9.5.9-3"
+        versionCode 1009050904
+        versionName "9.5.9-4"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fefc08e41b3a..43ceca2dc4d6 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.3</string>
+	<string>9.5.9.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 288dbb799066..20d42fe8fcd9 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.3</string>
+	<string>9.5.9.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index fcc836770bb3..29f934ce340a 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.9</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.3</string>
+	<string>9.5.9.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index dadafe87d443..aeae67497526 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-3",
+  "version": "9.5.9-4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.9-3",
+      "version": "9.5.9-4",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 7ff3cc7e5749..3c8b2785ac90 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-3",
+  "version": "9.5.9-4",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 978256f76c52166632cad31f12447ec4d3035740 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 00:10:50 +0000
Subject: [PATCH 726/781] Update Mobile-Expensify submodule version to 9.5.9-4

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index b4f818310a60..595f5c8f516c 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit b4f818310a60e4e3d7b1057c8f0e75f413a83f1b
+Subproject commit 595f5c8f516c7d28f8c412e2658bfd489b0cbba7

From 55d7333612f0fd0c1acda516fe25254496194d60 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Wed, 14 Oct 2026 17:40:13 -0700
Subject: [PATCH 727/781] docs(netsuite): apply NS0068 article review and
 accuracy fixes

---
 .../Export-Errors/NS0068-Export-Error.md      | 95 ++++++++-----------
 .../Export-Errors/NS0068-Export-Error.md      | 84 +++++++---------
 2 files changed, 75 insertions(+), 104 deletions(-)

diff --git a/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md b/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
index d8a66b720cf8..754345740a96 100644
--- a/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
+++ b/docs/articles/expensify-classic/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
@@ -1,8 +1,8 @@
 ---
 title: NS0068 Export Error in NetSuite Integration
 description: Learn how to fix the NS0068 export error in NetSuite when Expensify can't set the Created From field (custbody_createdfrom_expensify) during export.
-keywords: NS0068, NetSuite Created From field not visible, custbody_createdfrom_expensify, permission to set value Created From, Transaction Body Fields NetSuite, NetSuite transaction form visibility, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite export error, Workspace Admin
-internalScope: Audience is Workspace Admins using the NetSuite integration. Covers fixing the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the preferred form, not being editable by the Expensify role, or missing from NetSuite. Does not cover other NetSuite error codes.
+keywords: NS0068, NetSuite Created From field not visible, custbody_createdfrom_expensify, permission to set value Created From, Transaction Body Fields NetSuite, NetSuite transaction form visibility, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite export error, workspace admin
+internalScope: Audience is workspace admins using the NetSuite integration. Covers fixing the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the export form, not being editable by the Expensify role, or missing from NetSuite. Does not cover other NetSuite error codes.
 ---
 
 <!-- cspell:ignore custbody createdfrom -->
@@ -15,93 +15,76 @@ NS0068: NetSuite won't let Expensify set the 'Created From' field (custbody_crea
 
 This means NetSuite is blocking Expensify from setting the **Created From** field during export.
 
-The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. It is added to NetSuite by the **Expensify Connect bundle**.
+The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. The **Expensify Connect bundle** adds it to NetSuite.
 
 ---
 
-## Why the NS0068 Export Error Happens in NetSuite
+## Why the NS0068 export error happens in NetSuite
 
 The NS0068 error occurs when:
 
-- The **Created From** field does not apply to the record type you're exporting to (for example, vendor bills, expense reports, or journal entries).
+- The **Created From** field does not apply to the record type you're exporting to (vendor bills, expense reports, or journal entries).
 - The **Created From** field is hidden on the preferred export form.
 - The role used by the Expensify connection can't edit the **Created From** field.
 - The **Created From** field is missing because the **Expensify Connect bundle** is not installed or is out of date.
-- Expensify Card transactions are exported as journal entries and the Journal Entry form does not show the Created From field.
+- Expensify Card transactions are exported as journal entries and the journal entry form does not show the Created From field.
 
 Expensify must be able to write to the Created From field during export.
 
 ---
 
-## How to Fix the NS0068 Export Error
+## How to check the Created From field settings in NetSuite
 
-### Check the Created From Field Settings
+1. Log in to **NetSuite** as an administrator.
+2. Go to **Customization > Lists, Records, & Fields > Transaction Body Fields**.
+3. Open the field with the ID **custbody_createdfrom_expensify**.
+4. On the **Applies To** tab, confirm the option for your export type is selected: **Purchase** for vendor bills, **Expense Report** for expense reports, or **Journal** for journal entries.
+5. On the **Access** tab, confirm **Default Access Level** is **Edit**. If the **Role** list includes the role used by the Expensify connection, such as **Expensify Integration**, confirm its access level is also **Edit**.
+6. Select **Save**.
 
-1. Log in to **NetSuite** as an Administrator.
-2. Go to **Customization**.
-3. Select **Lists, Records, & Fields**.
-4. Click **Transaction Body Fields**.
-5. Open the field with the ID **custbody_createdfrom_expensify**.
-6. On the **Applies To** tab, confirm the field applies to the record type you're exporting to.
-7. On the **Access** tab, confirm the role used by the Expensify connection has **Edit** access to the field.
-8. Save the field.
-
-If you can't find **custbody_createdfrom_expensify**, update or reinstall the **Expensify Connect bundle** in NetSuite before continuing.
+If you can't find **custbody_createdfrom_expensify**, install or update the Expensify Connect bundle in NetSuite before continuing. [Learn how to install the Expensify Connect bundle in NetSuite](/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite).
 
 ---
 
-### If Exporting Vendor Bills or Standard Transactions
+## How to show the Created From field on vendor bill and expense report forms
+
+1. Log in to **NetSuite** as an administrator.
+2. Go to **Customization > Forms > Transaction Forms**.
+3. Select **Edit** next to the form marked as **Preferred** for the export type. If you set a custom form ID for this export type in New Expensify, edit that form instead.
+4. Go to **Screen Fields > Main**.
+5. Confirm the **Created From** field is marked as **Show**.
+6. Select **Save**.
 
-1. Log in to **NetSuite** as an Administrator.
-2. Go to **Customization**.
-3. Select **Forms**.
-4. Click **Transaction Forms**.
-5. Click **Edit** next to the form marked as **Preferred** for the export type.
-6. Locate the **Created From** field.
-7. Ensure the field is marked as **Show**.
-8. Save the form.
+---
 
-Then in Expensify:
+## How to show the Created From field on Expensify Card journal entry forms
 
-1. Go to **Settings**.
-2. Select **Workspaces**.
-3. Select your Workspace.
-4. Click **Accounting**.
-5. Click **Sync**.
-6. Retry exporting the report.
+1. Log in to **NetSuite** as an administrator.
+2. Confirm **custbody_createdfrom_expensify** applies to journal entries, using the steps in **How to check the Created From field settings in NetSuite** above.
+3. Go to **Customization > Forms > Transaction Forms**.
+4. Select **Edit** next to the preferred **Journal Entry** form.
+5. Go to **Screen Fields > Main**.
+6. Confirm the **Created From** field is marked as **Show**.
+7. Select **Save**.
 
 ---
 
-### If Exporting Expensify Card Transactions as Journal Entries
-
-1. Log in to **NetSuite**.
-2. Confirm **custbody_createdfrom_expensify** applies to journal entries, using the steps in **Check the Created From Field Settings** above.
-3. Go to **Customization**.
-4. Select **Forms**.
-5. Click **Transaction Forms**.
-6. Click **Edit** next to the preferred **Journal Entry** form.
-7. Go to **Screen Fields**.
-8. Open the **Main** tab.
-9. Ensure the **Created From** field is marked as **Show**.
-10. Save the form.
+## How to sync NetSuite and retry the export
 
-Then in Expensify:
+After updating NetSuite:
 
-1. Go to **Settings**.
-2. Select **Workspaces**.
-3. Select your Workspace.
-4. Click **Accounting**.
-5. Click **Sync**.
-6. Retry exporting the report.
+1. Go to **Settings > Workspaces > [workspace name] > Accounting**.
+2. Select **Sync Now**.
+3. Retry exporting the report.
 
 ---
 
 # FAQ
 
-## Does NS0068 Mean My Integration Is Broken?
+## Does NS0068 mean my integration is broken?
 
 No. This error is caused by the Created From field settings, form visibility, or role access in NetSuite.
 
-## Do I Need to Reconnect NetSuite?
+## Do I need to reconnect NetSuite?
 
-No. Updating the field and form settings and running **Sync** is typically sufficient. If the field is missing, update or reinstall the Expensify Connect bundle first.
+No. Updating the field and form settings and selecting **Sync Now** is typically sufficient. If the field is missing, install or update the Expensify Connect bundle first.
diff --git a/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md b/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
index 4e5540cf2d8c..6f19e7d253bb 100644
--- a/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
+++ b/docs/articles/new-expensify/connections/netsuite/Troubleshooting/Export-Errors/NS0068-Export-Error.md
@@ -1,8 +1,8 @@
 ---
 title: NS0068 Export Error in NetSuite Integration
 description: Learn what the NS0068 export error means and how to configure the Created From field (custbody_createdfrom_expensify) in NetSuite so Expensify can set it during export.
-keywords: NS0068, NetSuite Created From field error, custbody_createdfrom_expensify, permission to set Created From NetSuite, Transaction Body Fields NetSuite, transaction form visibility NetSuite, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite integration, Workspace Admin
-internalScope: Audience is Workspace Admins using the NetSuite integration. Covers resolving the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the preferred form, not being editable by the Expensify role, or missing from NetSuite. Does not cover token configuration issues.
+keywords: NS0068, NetSuite Created From field error, custbody_createdfrom_expensify, permission to set Created From NetSuite, Transaction Body Fields NetSuite, transaction form visibility NetSuite, custom form ID NetSuite, Expensify Connect bundle, Expensify Card journal entry error, Expensify NetSuite integration, workspace admin
+internalScope: Audience is workspace admins using the NetSuite integration. Covers resolving the NS0068 export error caused by the Created From field (custbody_createdfrom_expensify) not applying to the export record type, being hidden on the export form, not being editable by the Expensify role, or missing from NetSuite. Does not cover token configuration issues.
 ---
 
 <!-- cspell:ignore custbody createdfrom -->
@@ -15,16 +15,16 @@ NS0068 Export Error: NetSuite won't let Expensify set the 'Created From' field (
 
 This means NetSuite is blocking Expensify from setting the **Created From** field during export.
 
-The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. It is added to NetSuite by the **Expensify Connect bundle**.
+The **Created From** field is a custom transaction body field with the ID `custbody_createdfrom_expensify`. The **Expensify Connect bundle** adds it to NetSuite.
 
 ---
 
-## Why the NS0068 Export Error Happens in NetSuite
+## Why the NS0068 export error happens in NetSuite
 
 The NS0068 error typically occurs when:
 
-- The **Created From** field does not apply to the record type you're exporting to (for example, vendor bills, expense reports, or journal entries).
-- The **Created From** field is hidden on the transaction form marked as **Preferred** for your export type.
+- The **Created From** field does not apply to the record type you're exporting to (vendor bills, expense reports, or journal entries).
+- The **Created From** field is hidden on the transaction form Expensify uses for your export type.
 - The role used by the Expensify connection can't edit the **Created From** field.
 - The **Created From** field is missing from NetSuite because the **Expensify Connect bundle** is not installed or is out of date.
 
@@ -32,95 +32,83 @@ If any of these apply, NetSuite prevents the integration from setting the field
 
 ---
 
-## How to Fix the NS0068 Export Error
+## How to fix the NS0068 export error
 
 Follow the steps below to check the field setup, form visibility, and role access in NetSuite.
 
 ---
 
-## Check the Created From Field Settings in NetSuite
+## How to check the Created From field settings in NetSuite
 
 1. Log in to NetSuite as an administrator.
 2. Go to **Customization > Lists, Records, & Fields > Transaction Body Fields**.
 3. Open the field with the ID **custbody_createdfrom_expensify**.
-4. On the **Applies To** tab, confirm the field applies to the record type you're exporting to.
-5. On the **Access** tab, confirm the role used by the Expensify connection has **Edit** access to the field.
-6. Click **Save**.
+4. On the **Applies To** tab, confirm the option for your export type is selected: **Purchase** for vendor bills, **Expense Report** for expense reports, or **Journal** for journal entries.
+5. On the **Access** tab, confirm **Default Access Level** is **Edit**. If the **Role** list includes the role used by the Expensify connection, such as **Expensify Integration**, confirm its access level is also **Edit**.
+6. Select **Save**.
 
-If you can't find **custbody_createdfrom_expensify**, [update the Expensify Connect bundle](https://help.expensify.com/articles/new-expensify/connections/netsuite/Update-Expensify-Connect-Bundle-in-NetSuite), or reinstall it, before continuing.
+If you can't find **custbody_createdfrom_expensify**, update or reinstall the Expensify Connect bundle before continuing. [Learn how to update the Expensify Connect bundle in NetSuite](/articles/new-expensify/connections/netsuite/Update-Expensify-Connect-Bundle-in-NetSuite).
 
 ---
 
-## Make the Created From Field Visible on the Preferred Form
+## How to make the Created From field visible on the export form
 
-1. Go to **Customization > Forms > Transaction Forms**.
-2. Locate the transaction form marked as **Preferred** for your export type.
-3. Click **Edit**.
-4. Locate the **Created From** field.
-5. Ensure the field is marked as **Show**.
-6. Click **Save**.
+Expensify exports with the transaction form marked as **Preferred** in NetSuite. If you set a custom form under **Workspaces > [workspace name] > Accounting > Advanced > Custom form ID**, Expensify uses that form instead.
 
-Confirm the field is visible on the preferred form before proceeding.
+1. Go to **Customization > Forms > Transaction Forms**.
+2. Locate the transaction form Expensify uses for your export type.
+3. Select **Edit**.
+4. Go to **Screen Fields > Main**.
+5. Confirm the **Created From** field is marked as **Show**.
+6. Select **Save**.
 
 ---
 
-## Sync the Workspace in Expensify
+## How to sync the workspace in Expensify
 
 After updating NetSuite:
 
-On web:
-
-1. Go to the navigation tabs on the left and select **Workspaces**.
-2. Select your Workspace.
-3. Click **Accounting**.
-4. Click the three-dot menu next to the NetSuite connection.
-5. Click **Sync Now**.
-
-On mobile:
-
-1. Tap the navigation tabs on the bottom and select **Workspaces**.
-2. Select your Workspace.
-3. Tap **Accounting**.
-4. Tap the three-dot menu next to the NetSuite connection.
-5. Tap **Sync Now**.
+1. In the navigation tabs (on the left on web, on the bottom on mobile), select **Workspaces > [workspace name] > Accounting**.
+2. Select **More (⋮)** next to the NetSuite connection.
+3. Select **Sync now**.
 
 ---
 
-## Retry the Export
+## How to retry the export
 
 1. Open the report.
 2. Retry exporting to NetSuite.
 
-If the Created From field applies to your export type, is visible on the preferred form, and is editable by the Expensify role, the export should complete successfully.
+If the Created From field applies to your export type, is visible on the export form, and is editable by the Expensify role, the export should complete successfully.
 
 ---
 
-# Additional Steps for Expensify Card Journal Entries
+## How to fix the NS0068 export error for Expensify Card journal entries
 
 If you are exporting **Expensify Card transactions as journal entries**, confirm the Created From field is set up for journal entries.
 
 1. Go to **Customization > Lists, Records, & Fields > Transaction Body Fields** and open **custbody_createdfrom_expensify**.
-2. On the **Applies To** tab, confirm the field applies to journal entries, then click **Save**.
+2. On the **Applies To** tab, confirm **Journal** is selected, then select **Save**.
 3. Go to **Customization > Forms > Transaction Forms**.
-4. Click **Edit** next to the preferred journal entry form.
+4. Select **Edit** next to the preferred journal entry form.
 5. Go to **Screen Fields > Main**.
 6. Confirm **Created From** is marked as **Show**.
-7. Click **Save**.
+7. Select **Save**.
 
-Then return to the Workspace and select **Sync Now** before retrying the export.
+Then sync the workspace in Expensify before retrying the export.
 
 ---
 
 # FAQ
 
-## Does the NS0068 Export Error Affect All Export Types?
+## Does the NS0068 export error affect all export types?
 
-It affects any export type where the Created From field doesn't apply to the record, is hidden on the preferred form, or isn't editable by the Expensify role.
+It affects any export type where the Created From field doesn't apply to the record, is hidden on the export form, or isn't editable by the Expensify role.
 
-## Do I Need NetSuite Admin Access to Fix the NS0068 Export Error?
+## Do I need NetSuite admin access to fix the NS0068 export error?
 
 Yes. Updating custom field settings and transaction form visibility requires NetSuite administrator permissions.
 
-## Do I Need to Reconnect the Integration?
+## Do I need to reconnect the integration?
 
-No. Updating the Created From field settings and selecting **Sync Now** is typically sufficient. If the field is missing, update or reinstall the Expensify Connect bundle first.
+No. Updating the Created From field settings and selecting **Sync now** is typically sufficient. If the field is missing, update or reinstall the Expensify Connect bundle first.

From aa8c3e4e1e839965a1be23f92f396e9ce8852546 Mon Sep 17 00:00:00 2001
From: "huult (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 03:51:31 +0000
Subject: [PATCH 728/781] Move DOM focus to the search input when ArrowUp
 leaves the invite list, and clarify the TextInput onPress JSDoc

Co-authored-by: huult <huult@users.noreply.github.com>
---
 .../BaseSelectionListWithSections.tsx         |  6 +++
 .../SelectionList/components/TextInput.tsx    |  2 +-
 .../hooks/useSelectionListKeyboardFocus.ts    |  9 +++++
 .../useSelectionListKeyboardFocus.test.ts     | 40 +++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
index 6c993d361991..e43ca335501f 100644
--- a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -125,10 +125,16 @@ function BaseSelectionListWithSectionsImpl({
         announceProgrammaticScroll: () => listRef.current?.announceProgrammaticScroll(),
         setShouldDisableHoverStyle,
         shouldAllowArrowUpToSearchInput,
+        onArrowUpToSearchInput: focusSearchInputFromList,
     });
 
     const {innerTextInputRef, isTextInputFocusedRef, focusTextInput, textInputKeyPress} = useSelectionListTextInput(setHasKeyBeenPressed);
 
+    // A Tab-focused row keeps DOM focus after ArrowUp clears the focused index, so move it back to the search input
+    function focusSearchInputFromList() {
+        focusTextInput();
+    }
+
     const getFocusedItem = useCallback((): ListItem | undefined => {
         if (focusedIndex < 0 || focusedIndex >= flattenedData.length) {
             return;
diff --git a/src/components/SelectionList/components/TextInput.tsx b/src/components/SelectionList/components/TextInput.tsx
index d6cf0864a713..591820f50008 100644
--- a/src/components/SelectionList/components/TextInput.tsx
+++ b/src/components/SelectionList/components/TextInput.tsx
@@ -38,7 +38,7 @@ type TextInputProps = {
     /** Callback function called when the text input is submitted */
     onSubmit?: () => void;
 
-    /** Callback function called when the text input is pressed */
+    /** Lets a list clear its focused row on press, so plain Enter in the search input reaches the confirm button instead of toggling a row */
     onPress?: () => void;
 
     onKeyPress?: (event: TextInputKeyPressEvent) => void;
diff --git a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
index 62b8561cc370..6220fba212bd 100644
--- a/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
+++ b/src/components/SelectionList/hooks/useSelectionListKeyboardFocus.ts
@@ -23,6 +23,9 @@ type UseSelectionListKeyboardFocusParams = {
 
     /** Whether ArrowUp from the first row moves to index -1 (the search input) instead of wrapping to the last row */
     shouldAllowArrowUpToSearchInput?: boolean;
+
+    /** Called when ArrowUp leaves the first row for the search input, so DOM focus can follow */
+    onArrowUpToSearchInput?: () => void;
 };
 
 type UseSelectionListKeyboardFocusResult = {
@@ -46,6 +49,7 @@ function useSelectionListKeyboardFocus({
     announceProgrammaticScroll,
     setShouldDisableHoverStyle,
     shouldAllowArrowUpToSearchInput = false,
+    onArrowUpToSearchInput,
 }: UseSelectionListKeyboardFocusParams): UseSelectionListKeyboardFocusResult {
     const hasKeyBeenPressed = useRef(false);
     const [isKeyboardNavigating, setIsKeyboardNavigating] = useState(false);
@@ -76,6 +80,11 @@ function useSelectionListKeyboardFocus({
         disabledIndexes,
         isActive,
         onFocusedIndexChange: (index, shouldScrollHint) => {
+            // Only an arrow-key move sets shouldScrollHint, so a press on the search input (which already holds focus) is skipped
+            if (shouldAllowArrowUpToSearchInput && shouldScrollHint && index < 0) {
+                onArrowUpToSearchInput?.();
+            }
+
             if (!shouldScrollHint || !shouldScrollToFocusedIndex) {
                 return;
             }
diff --git a/tests/unit/components/SelectionList/useSelectionListKeyboardFocus.test.ts b/tests/unit/components/SelectionList/useSelectionListKeyboardFocus.test.ts
index 79c1feab1d42..87b604d3f277 100644
--- a/tests/unit/components/SelectionList/useSelectionListKeyboardFocus.test.ts
+++ b/tests/unit/components/SelectionList/useSelectionListKeyboardFocus.test.ts
@@ -29,6 +29,8 @@ type Overrides = {
     shouldScrollToFocusedIndex?: boolean;
     shouldDebounceScrolling?: boolean;
     initialFocusedIndex?: number;
+    shouldAllowArrowUpToSearchInput?: boolean;
+    onArrowUpToSearchInput?: () => void;
 };
 
 function renderKeyboardFocus(overrides: Overrides = {}) {
@@ -100,6 +102,44 @@ describe('useSelectionListKeyboardFocus', () => {
         });
     });
 
+    describe('onArrowUpToSearchInput', () => {
+        it('is called when ArrowUp moves the focused index to the search input', () => {
+            // Given a list that lets ArrowUp leave the first row for the search input
+            const onArrowUpToSearchInput = jest.fn();
+            renderKeyboardFocus({shouldAllowArrowUpToSearchInput: true, onArrowUpToSearchInput});
+
+            // When an arrow-key move sets the focused index to -1
+            capturedConfig.onFocusedIndexChange?.(-1, true);
+
+            // Then the list is told to move DOM focus to the search input, since a Tab-focused row would otherwise keep it
+            expect(onArrowUpToSearchInput).toHaveBeenCalledTimes(1);
+        });
+
+        it('is not called when the focused index is cleared without an arrow key', () => {
+            // Given a list that lets ArrowUp leave the first row for the search input
+            const onArrowUpToSearchInput = jest.fn();
+            renderKeyboardFocus({shouldAllowArrowUpToSearchInput: true, onArrowUpToSearchInput});
+
+            // When the focused index is cleared externally, for example by pressing the search input
+            capturedConfig.onFocusedIndexChange?.(-1, false);
+
+            // Then focus is left alone, because the search input already holds it
+            expect(onArrowUpToSearchInput).not.toHaveBeenCalled();
+        });
+
+        it('is not called when the list does not opt in', () => {
+            // Given a list that keeps the default ArrowUp behavior
+            const onArrowUpToSearchInput = jest.fn();
+            renderKeyboardFocus({onArrowUpToSearchInput});
+
+            // When an arrow-key move sets the focused index to -1
+            capturedConfig.onFocusedIndexChange?.(-1, true);
+
+            // Then DOM focus is not moved, preserving existing behavior for other lists
+            expect(onArrowUpToSearchInput).not.toHaveBeenCalled();
+        });
+    });
+
     describe('onArrowUpDownCallback', () => {
         it('disables hover styling and announces a programmatic scroll', () => {
             const {setShouldDisableHoverStyle, announceProgrammaticScroll} = renderKeyboardFocus();

From 9ee12e103640fac711c98d5e0a768d7ef5d39200 Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 04:55:22 +0000
Subject: [PATCH 729/781] Move PolicyUtils approval and payment helpers into
 approvals.ts and payments.ts

Phase 7 of the PolicyUtils split. Pure move: no renames, signature changes, or behavior changes. Callers stay on @libs/PolicyUtils through export *.

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 src/libs/PolicyUtils/approvals.ts            | 454 +++++++++++++++
 src/libs/PolicyUtils/index.ts                | 547 +------------------
 src/libs/PolicyUtils/payments.ts             | 111 ++++
 tests/actions/IOU/SplitReportTotalsTest.ts   |   2 +
 tests/unit/ReportSecondaryActionUtilsTest.ts |   2 +
 5 files changed, 576 insertions(+), 540 deletions(-)
 create mode 100644 src/libs/PolicyUtils/approvals.ts
 create mode 100644 src/libs/PolicyUtils/payments.ts

diff --git a/src/libs/PolicyUtils/approvals.ts b/src/libs/PolicyUtils/approvals.ts
new file mode 100644
index 000000000000..860ef968e67f
--- /dev/null
+++ b/src/libs/PolicyUtils/approvals.ts
@@ -0,0 +1,454 @@
+/**
+ * Approval mode, the default approver, approval workflow rules, and who a report submits or forwards to.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import type {PersonalDetailsByLogin} from '@components/PersonalDetailsByLoginProvider';
+
+import {getCategoryApproverRule} from '@libs/CategoryUtils';
+import {getHRAdvancedModeFinalApprover} from '@libs/merge/HRUtils';
+import {getAccountIDsByLogins} from '@libs/PersonalDetailsUtils';
+import {isApprovalWorkflowRule, isRuleFilterComparison} from '@libs/RuleUtils';
+import {getAllSortedTransactions, getCategory, getTag} from '@libs/TransactionUtils';
+import {isValidAccountRoute} from '@libs/ValidationUtils';
+
+import CONST from '@src/CONST';
+import type {OnyxInputOrEntry, Policy, Report} from '@src/types/onyx';
+import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {ApprovalRule} from '@src/types/onyx/Policy';
+import type Rule from '@src/types/onyx/Rule';
+import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {isPolicyApprover} from './permissions';
+import {isGroupPolicy} from './policyType';
+import {getTagApproverRule} from './rules';
+import {isSubmitAndClose} from './workflows';
+
+/** The report facts an approval workflow rule is matched against. */
+type ApprovalWorkflowContext = {
+    /** Email of the member who submitted the report. */
+    submitterEmail: string;
+
+    /** Email of the approver the report is currently with. Empty when the report has not been approved yet. */
+    currentApproverEmail?: string;
+
+    /** Total of the report, in the backend (cents) amount the rules' `amount` filters are written in. */
+    reportTotal: number;
+};
+
+/** The outcome of matching a report against the policy's approval workflow rules. */
+type ApprovalWorkflowRuleMatch = {
+    /** Email the matched rule forwards the report to. Undefined when the rule finalizes the report instead. */
+    forwardsTo?: string;
+};
+
+/**
+ * Returns true when the user is both a submitter and an approver, mirroring the Submit/Approve suggested-search eligibility in
+ * `getSuggestedSearchesVisibility` (SearchUIUtils): a submitter is a member of any group workspace, and an approver is a member of a
+ * group workspace with a non-optional approval flow whom `isPolicyApprover` recognizes (named approver or someone reports submit/forward to).
+ */
+function isSubmitterAndApprover(policies: OnyxCollection<Policy> | null | undefined, currentUserEmail: string | undefined): boolean {
+    if (!policies || !currentUserEmail) {
+        return false;
+    }
+    let isSubmitter = false;
+    let isApprover = false;
+    for (const policy of Object.values(policies)) {
+        if (!policy) {
+            continue;
+        }
+        isSubmitter = isSubmitter || isGroupPolicy(policy);
+        if (!isApprover) {
+            const hasApprovalFlow = isGroupPolicy(policy) && !!policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+            isApprover = hasApprovalFlow && isPolicyApprover(policy, currentUserEmail);
+        }
+        if (isSubmitter && isApprover) {
+            return true;
+        }
+    }
+    return false;
+}
+
+function isControlOnAdvancedApprovalMode(policy: OnyxInputOrEntry<Policy>): boolean {
+    return policy?.type === CONST.POLICY.TYPE.CORPORATE && getApprovalWorkflow(policy) === CONST.POLICY.APPROVAL_MODE.ADVANCED;
+}
+
+function getApprovalWorkflow(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
+    if (policy?.type === CONST.POLICY.TYPE.PERSONAL) {
+        return CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    }
+
+    return policy?.approvalMode ?? CONST.POLICY.APPROVAL_MODE.ADVANCED;
+}
+
+function getDefaultApprover(policy: OnyxEntry<Policy>): string {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    return policy?.approver || policy?.owner || '';
+}
+
+/**
+ * Whether the policy has at least one custom approval workflow. A workflow is considered custom when either:
+ * - the default workflow was modified by changing its first approver or adding an "Approves to" user, or
+ * - a new workflow was created (a member submits to an approver other than the default approver).
+ */
+function hasCustomApprovalWorkflow(policy: OnyxEntry<Policy>): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    const defaultApprover = getDefaultApprover(policy);
+
+    // The default workflow's first approver was changed away from the workspace owner.
+    if (!!policy.approver && !!policy.owner && policy.approver !== policy.owner) {
+        return true;
+    }
+
+    const employees = policy.employeeList ?? {};
+
+    // The default approver forwards approvals to someone, i.e. an "Approves to" user was added,
+    // either unconditionally (forwardsTo) or above an approval limit (overLimitForwardsTo).
+    const defaultApproverEmployee = employees[defaultApprover];
+    if (!!defaultApprover && (!!defaultApproverEmployee?.forwardsTo || !!defaultApproverEmployee?.overLimitForwardsTo)) {
+        return true;
+    }
+
+    // A new workflow exists when a member submits to an approver other than the default approver.
+    return Object.values(employees).some(
+        (employee) => employee?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!employee?.submitsTo && employee.submitsTo !== defaultApprover,
+    );
+}
+
+function getRuleApprovers(policy: OnyxEntry<Policy>, expenseReport: OnyxEntry<Report>) {
+    const categoryApprovers: string[] = [];
+    const tagApprovers: string[] = [];
+    const allReportTransactions = getAllSortedTransactions(expenseReport?.reportID);
+
+    // Before submitting to their `submitsTo` (in a policy on Advanced Approvals), submit to category/tag approvers.
+    // Category approvers are prioritized, then tag approvers.
+    for (let i = 0; i < allReportTransactions.length; i++) {
+        const transaction = allReportTransactions.at(i);
+        const tag = getTag(transaction);
+        const category = getCategory(transaction);
+        const categoryApprover = getCategoryApproverRule(policy?.rules?.approvalRules ?? [], category)?.approver;
+        const tagApprover = getTagApproverRule(policy, tag)?.approver;
+        if (categoryApprover) {
+            categoryApprovers.push(categoryApprover);
+        }
+
+        if (tagApprover) {
+            tagApprovers.push(tagApprover);
+        }
+    }
+
+    // Return the unique approvers list
+    return [...new Set([...categoryApprovers, ...tagApprovers])];
+}
+
+function getFirstRuleApprover(approvalRules: ApprovalRule[], expenseReport: OnyxEntry<Report>, ownerLogin: string | undefined) {
+    // Pre-build a lookup map of { category: { value → approver }, tag: { value → approver } }
+    // from the policy's approval rules so that each transaction's category/tag can be resolved in O(1).
+    const rulesMap: Record<'category' | 'tag', Record<string, string>> = {
+        category: {},
+        tag: {},
+    };
+
+    for (let i = 0; i < approvalRules.length; i++) {
+        const rule = approvalRules.at(i);
+        if (!rule) {
+            continue;
+        }
+        for (let j = 0; j < rule.applyWhen.length; j++) {
+            const applyWhen = rule.applyWhen.at(j);
+            if (applyWhen?.condition !== CONST.POLICY.RULE_CONDITIONS.MATCHES) {
+                continue;
+            }
+            if (applyWhen.field === CONST.POLICY.FIELDS.CATEGORY || applyWhen.field === CONST.POLICY.FIELDS.TAG) {
+                rulesMap[applyWhen.field][applyWhen.value] = rule.approver;
+            }
+        }
+    }
+
+    if (isEmptyObject(rulesMap.category) && isEmptyObject(rulesMap.tag)) {
+        return '';
+    }
+
+    const allReportTransactions = getAllSortedTransactions(expenseReport?.reportID);
+
+    if (!allReportTransactions.length) {
+        return '';
+    }
+
+    let firstCategoryApprover = '';
+    let firstTagApprover = '';
+
+    for (let i = 0; i < allReportTransactions.length; i++) {
+        const transaction = allReportTransactions.at(i);
+        const category = getCategory(transaction);
+        const categoryApprover = rulesMap.category[category];
+
+        // Category approvers take strict priority over tag approvers.
+        // Break immediately on the first match so we don't keep scanning transactions unnecessarily.
+        if (categoryApprover && categoryApprover !== ownerLogin) {
+            firstCategoryApprover = categoryApprover;
+            break;
+        }
+
+        // Only look for a tag approver if we haven't found one yet — no need to re-check on subsequent transactions.
+        if (!firstTagApprover) {
+            const tag = getTag(transaction);
+            const tagApprover = rulesMap.tag[tag];
+
+            if (tagApprover && tagApprover !== ownerLogin) {
+                firstTagApprover = tagApprover;
+            }
+        }
+    }
+
+    return firstCategoryApprover || firstTagApprover;
+}
+
+function matchesApprovalWorkflowEmailComparison(node: RuleFilterComparison, email: string | undefined): boolean {
+    const expectedEmails = (Array.isArray(node.right) ? node.right : [node.right]).map((value) => String(value).toLowerCase());
+    const isMatch = !!email && expectedEmails.includes(email.toLowerCase());
+    return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO ? !isMatch : isMatch;
+}
+
+function matchesApprovalWorkflowAmountComparison(node: RuleFilterComparison, amount: number): boolean {
+    const expectedAmount = typeof node.right === 'number' ? node.right : Number(node.right);
+    if (Number.isNaN(expectedAmount)) {
+        return false;
+    }
+
+    switch (node.operator) {
+        case CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO:
+            return amount === expectedAmount;
+        case CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO:
+            return amount !== expectedAmount;
+        case CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN:
+            return amount > expectedAmount;
+        case CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO:
+            return amount >= expectedAmount;
+        case CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN:
+            return amount < expectedAmount;
+        case CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO:
+            return amount <= expectedAmount;
+        default:
+            return false;
+    }
+}
+
+function evaluateApprovalWorkflowFilter(node: RuleFilterNode, context: ApprovalWorkflowContext): boolean {
+    if (!isRuleFilterComparison(node)) {
+        const left = evaluateApprovalWorkflowFilter(node.left, context);
+        const right = evaluateApprovalWorkflowFilter(node.right, context);
+        return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.OR ? left || right : left && right;
+    }
+
+    switch (node.left) {
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM:
+            return matchesApprovalWorkflowEmailComparison(node, context.submitterEmail);
+
+        // A report with no current approver has not been approved by anybody yet, so a rule based on who
+        // approved it last cannot apply.
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.TO:
+            return !!context.currentApproverEmail && matchesApprovalWorkflowEmailComparison(node, context.currentApproverEmail);
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT:
+            return matchesApprovalWorkflowAmountComparison(node, Math.abs(context.reportTotal));
+
+        default:
+            return false;
+    }
+}
+
+/**
+ * True when every condition in the rule's filter tree is true for `context`.
+ */
+function evaluateApprovalWorkflowRule(rule: ApprovalWorkflowRule, context: ApprovalWorkflowContext): boolean {
+    return evaluateApprovalWorkflowFilter(rule.filters, context);
+}
+
+/**
+ * Check the policy's approval workflow rules to determine where the report goes next.
+ */
+function getForwardsToFromRules(policy: OnyxEntry<Policy>, context: ApprovalWorkflowContext, rules: OnyxCollection<Rule>): ApprovalWorkflowRuleMatch | undefined {
+    if (!policy?.id || !context.submitterEmail) {
+        return undefined;
+    }
+
+    const trigger = context.currentApproverEmail ? CONST.RULES.TRIGGERS.REPORT_APPROVE : CONST.RULES.TRIGGERS.REPORT_SUBMIT;
+
+    // Sort by Onyx key so the rule picked stays the same across evaluations when more than one matches (which should not happen).
+    const ruleKeys = Object.keys(rules ?? {}).sort();
+    for (const ruleKey of ruleKeys) {
+        const rule = rules?.[ruleKey];
+        if (!rule || rule.scope !== CONST.RULES.SCOPE.POLICY || rule.scopeID !== policy.id || rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            continue;
+        }
+        if (!isApprovalWorkflowRule(rule) || !Object.values(rule.triggers ?? {}).includes(trigger)) {
+            continue;
+        }
+        if (!evaluateApprovalWorkflowRule(rule, context)) {
+            continue;
+        }
+
+        return {forwardsTo: Object.values(rule.actions ?? {}).find((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)?.approver};
+    }
+
+    return undefined;
+}
+
+function getManagerAccountEmail(policy: OnyxEntry<Policy>, ownerLogin: string | undefined, rules: OnyxCollection<Rule>, reportTotal = 0): string {
+    const ruleMatch = getForwardsToFromRules(policy, {submitterEmail: ownerLogin ?? '', reportTotal}, rules);
+    if (ruleMatch) {
+        return ruleMatch.forwardsTo ?? '';
+    }
+
+    const defaultApprover = getDefaultApprover(policy);
+
+    // For policy using the optional or basic workflow, the manager is the policy default approver.
+    if (([CONST.POLICY.APPROVAL_MODE.OPTIONAL, CONST.POLICY.APPROVAL_MODE.BASIC] as Array<ValueOf<typeof CONST.POLICY.APPROVAL_MODE>>).includes(getApprovalWorkflow(policy))) {
+        return defaultApprover;
+    }
+
+    const employee = policy?.employeeList?.[ownerLogin ?? ''];
+    if (!employee && !defaultApprover) {
+        return '';
+    }
+
+    return employee?.submitsTo ?? defaultApprover ?? '';
+}
+
+function getManagerAccountID(policy: OnyxEntry<Policy>, ownerLogin: string | undefined, rules: OnyxCollection<Rule>, reportTotal = 0) {
+    const managerEmail = getManagerAccountEmail(policy, ownerLogin, rules, reportTotal);
+    return managerEmail ? (getAccountIDsByLogins([managerEmail]).at(0) ?? -1) : -1;
+}
+
+/**
+ * Returns the email the expense report should submit to per workspace approval config
+ * (approval rules, employee submitsTo, or default approver for basic/optional workflows).
+ */
+function getSubmitToEmail(
+    policy: OnyxEntry<Policy>,
+    expenseReport: OnyxEntry<Report>,
+    ownerLogin: string | undefined,
+    rules: OnyxCollection<Rule>,
+    shouldFallBackWhenManagerIsNotMember = false,
+): string {
+    const approvalRules = policy?.rules?.approvalRules;
+
+    if (!isSubmitAndClose(policy) && approvalRules?.length) {
+        const ruleApprover = getFirstRuleApprover(approvalRules, expenseReport, ownerLogin);
+        if (ruleApprover) {
+            return ruleApprover;
+        }
+    }
+
+    const ruleMatch = getForwardsToFromRules(policy, {submitterEmail: ownerLogin ?? '', reportTotal: expenseReport?.total ?? 0}, rules);
+    if (ruleMatch) {
+        return ruleMatch.forwardsTo ?? '';
+    }
+
+    const managerEmail = getManagerAccountEmail(policy, ownerLogin, rules, expenseReport?.total ?? 0);
+
+    // Falls back to the default approver when the manager is unavailable.
+    if (shouldFallBackWhenManagerIsNotMember && managerEmail && !policy?.employeeList?.[managerEmail] && !getHRAdvancedModeFinalApprover(policy)) {
+        return getDefaultApprover(policy);
+    }
+
+    return managerEmail;
+}
+
+/**
+ * Returns the accountID to whom the given expenseReport submits reports to in the given Policy.
+ */
+function getSubmitToAccountID(
+    policy: OnyxEntry<Policy>,
+    expenseReport: OnyxEntry<Report>,
+    ownerLogin: string | undefined,
+    rules: OnyxCollection<Rule>,
+    shouldFallBackWhenManagerIsNotMember = false,
+): number {
+    const submitToEmail = getSubmitToEmail(policy, expenseReport, ownerLogin, rules, shouldFallBackWhenManagerIsNotMember);
+    return submitToEmail ? (getAccountIDsByLogins([submitToEmail]).at(0) ?? CONST.DEFAULT_NUMBER_ID) : CONST.DEFAULT_NUMBER_ID;
+}
+
+function getSubmitReportManagerAccountID(
+    policy: OnyxEntry<Policy>,
+    expenseReport: OnyxEntry<Report>,
+    submitterLogin: string | undefined,
+    rules: OnyxCollection<Rule>,
+    personalDetailsByLogins: PersonalDetailsByLogin,
+): number | undefined {
+    const approvalRules = policy?.rules?.approvalRules;
+    const ruleApprover = !isSubmitAndClose(policy) && approvalRules?.length ? getFirstRuleApprover(approvalRules, expenseReport, submitterLogin) : '';
+    const hasReliablePolicyRoute =
+        ([CONST.POLICY.APPROVAL_MODE.OPTIONAL, CONST.POLICY.APPROVAL_MODE.BASIC] as Array<ValueOf<typeof CONST.POLICY.APPROVAL_MODE>>).includes(getApprovalWorkflow(policy)) ||
+        !!ruleApprover ||
+        !!policy?.employeeList?.[submitterLogin ?? ''];
+
+    if (!hasReliablePolicyRoute) {
+        return undefined;
+    }
+
+    const submitToEmail = getSubmitToEmail(policy, expenseReport, submitterLogin, rules, true);
+    const submitToAccountID = submitToEmail ? personalDetailsByLogins[submitToEmail]?.accountID : undefined;
+    if (submitToAccountID === undefined || !isValidAccountRoute(submitToAccountID)) {
+        return undefined;
+    }
+
+    return submitToAccountID;
+}
+
+/**
+ * Returns the email of the account to forward the report to depending on the approver's approval limit.
+ * Used for advanced approval mode only.
+ *
+ * `submitterEmail` is needed to consult the workspace's approval workflow rules, which describe each hop in
+ * terms of who submitted the report as well as who is approving it. Without it only the legacy employeeList
+ * forwardsTo/overLimitForwardsTo is considered.
+ */
+function getForwardsToAccount(policy: OnyxEntry<Policy>, employeeEmail: string, reportTotal: number, rules: OnyxCollection<Rule>, submitterEmail?: string): string {
+    const ruleMatch = submitterEmail ? getForwardsToFromRules(policy, {submitterEmail, currentApproverEmail: employeeEmail, reportTotal}, rules) : undefined;
+    if (ruleMatch) {
+        return ruleMatch.forwardsTo ?? '';
+    }
+
+    if (!isControlOnAdvancedApprovalMode(policy)) {
+        return '';
+    }
+
+    const employee = policy?.employeeList?.[employeeEmail];
+    if (!employee) {
+        return '';
+    }
+
+    const positiveReportTotal = Math.abs(reportTotal);
+    if (employee.approvalLimit && employee.overLimitForwardsTo && positiveReportTotal > employee.approvalLimit) {
+        return employee.overLimitForwardsTo;
+    }
+    return employee.forwardsTo ?? '';
+}
+
+function getWorkflowApprovalsUnavailable(policy: OnyxEntry<Policy>) {
+    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL || !!policy?.errorFields?.approvalMode;
+}
+
+export {
+    isSubmitterAndApprover,
+    getApprovalWorkflow,
+    getDefaultApprover,
+    hasCustomApprovalWorkflow,
+    getRuleApprovers,
+    evaluateApprovalWorkflowRule,
+    getForwardsToFromRules,
+    getManagerAccountEmail,
+    getManagerAccountID,
+    getSubmitToEmail,
+    getSubmitToAccountID,
+    getSubmitReportManagerAccountID,
+    getForwardsToAccount,
+    getWorkflowApprovalsUnavailable,
+};
diff --git a/src/libs/PolicyUtils/index.ts b/src/libs/PolicyUtils/index.ts
index 93817cd0593a..7242705ff5eb 100644
--- a/src/libs/PolicyUtils/index.ts
+++ b/src/libs/PolicyUtils/index.ts
@@ -2,32 +2,25 @@ import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleCon
 import type {PersonalDetailsByLogin} from '@components/PersonalDetailsByLoginProvider';
 
 import {getBankAccountFromID} from '@libs/actions/BankAccounts';
-import {getCategoryApproverRule} from '@libs/CategoryUtils';
 import isTeachersUnitePolicyID from '@libs/isTeachersUnitePolicyID';
 import {getHRAdvancedModeFinalApprover} from '@libs/merge/HRUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getIsOffline} from '@libs/NetworkState';
-import {getAccountIDsByLogins} from '@libs/PersonalDetailsUtils';
-import {isApprovalWorkflowRule, isRuleFilterComparison} from '@libs/RuleUtils';
-import {getAllSortedTransactions, getCategory, getTag} from '@libs/TransactionUtils';
 import {generateAccountID} from '@libs/UserUtils';
-import {isPublicDomain, isValidAccountRoute} from '@libs/ValidationUtils';
+import {isPublicDomain} from '@libs/ValidationUtils';
 import {getEffectiveWorkArrangement} from '@libs/WorkArrangementUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PolicyType} from '@src/types/form/WorkspaceConfirmationForm';
-import type {Card, OnyxInputOrEntry, PersonalDetailsList, Policy, PolicyEmployeeList, Report, TravelSettings} from '@src/types/onyx';
-import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
-import type {ApprovalRule, CommuterExclusions} from '@src/types/onyx/Policy';
+import type {Card, OnyxInputOrEntry, PersonalDetailsList, Policy, PolicyEmployeeList, TravelSettings} from '@src/types/onyx';
+import type {CommuterExclusions} from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
-import type Rule from '@src/types/onyx/Rule';
-import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
 import type {WorkspaceTravelSettings} from '@src/types/onyx/TravelSettings';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import type {NullishDeep, OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import {Str} from 'expensify-common';
@@ -35,10 +28,8 @@ import {Str} from 'expensify-common';
 import {hasAccountingConnections} from './connections';
 import {getPerDiemCustomUnit, isPerDiemEligiblePolicy} from './customUnits';
 import {isTimeTrackingEnabled} from './features';
-import {canEditWorkspaceSettings, canMemberWrite, getPolicyRole, isPolicyAdmin, isPolicyApprover, isPolicyOwner, isPolicyUser} from './permissions';
+import {canEditWorkspaceSettings, canMemberWrite, getPolicyRole, isPolicyAdmin, isPolicyOwner, isPolicyUser} from './permissions';
 import {isArchivedPolicy, isCollectPolicy, isControlPolicy, isGroupPolicy, isPaidGroupPolicy, isSubmitPolicy} from './policyType';
-import {getTagApproverRule} from './rules';
-import {isSubmitAndClose} from './workflows';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
@@ -49,24 +40,6 @@ type WorkspaceDetails = {
     name: string;
 };
 
-/** The report facts an approval workflow rule is matched against. */
-type ApprovalWorkflowContext = {
-    /** Email of the member who submitted the report. */
-    submitterEmail: string;
-
-    /** Email of the approver the report is currently with. Empty when the report has not been approved yet. */
-    currentApproverEmail?: string;
-
-    /** Total of the report, in the backend (cents) amount the rules' `amount` filters are written in. */
-    reportTotal: number;
-};
-
-/** The outcome of matching a report against the policy's approval workflow rules. */
-type ApprovalWorkflowRuleMatch = {
-    /** Email the matched rule forwards the report to. Undefined when the rule finalizes the report instead. */
-    forwardsTo?: string;
-};
-
 /**
  * Returns true if the policy has no fieldList or its fieldList is empty.
  */
@@ -228,69 +201,6 @@ function isPolicyMemberWithoutPendingDelete(currentUserLogin: string | undefined
     return !!policyEmployee && policyEmployee.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
 
-/**
- * Resolve the email of the workspace's Authorized Payer (reimburser), matching the canonical resolution used across the app.
- * Returns undefined when reimbursement is disabled or no payer can be resolved.
- */
-function getReimburserEmail(policy: OnyxEntry<Policy>): string | undefined {
-    if (!policy) {
-        return undefined;
-    }
-
-    const reimbursementChoice = getReimbursementChoice(policy);
-    const isAutoReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
-    const isManualReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
-
-    // Reimbursement is disabled for this workspace.
-    if (!isAutoReimbursement && !isManualReimbursement) {
-        return undefined;
-    }
-
-    return policy.reimburser ?? policy.achAccount?.reimburser ?? (isManualReimbursement ? policy.owner : undefined);
-}
-
-/**
- * Payer fields to merge into the successData of an ownership transfer. The backend keeps the former payer when the
- * workspace has a bank account, so only reassign when there is none and the outgoing owner is the resolved payer.
- */
-function getOwnerChangePayerSuccessData(policy: OnyxEntry<Policy>, newOwnerLogin: string): NullishDeep<Policy> {
-    if (!policy || policy.achAccount?.bankAccountID || getReimburserEmail(policy) !== policy.owner) {
-        return {};
-    }
-
-    return {
-        ...(policy.reimburser ? {reimburser: newOwnerLogin} : {}),
-        ...(policy.achAccount?.reimburser ? {achAccount: {reimburser: newOwnerLogin}} : {}),
-    };
-}
-
-function isPolicyPayer(policy: OnyxEntry<Policy>, currentUserLogin: string | undefined): boolean {
-    if (!policy) {
-        return false;
-    }
-
-    const isAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
-    const reimbursementChoice = getReimbursementChoice(policy);
-    const isAutoReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
-    const isManualReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
-
-    // Reimbursement is disabled for this workspace.
-    if (!isAutoReimbursement && !isManualReimbursement) {
-        return false;
-    }
-
-    const reimburserEmail = getReimburserEmail(policy);
-
-    // No designated reimburser means any workspace admin can pay.
-    if (!reimburserEmail) {
-        return isAdmin;
-    }
-
-    const canPayOnPolicy = isAdmin || (!!currentUserLogin && canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_PAYMENTS));
-
-    return canPayOnPolicy && currentUserLogin === reimburserEmail;
-}
-
 /** Check if the passed employee holds an active Expensify Card on the policy, as reported by the backend in the policy's employeeList */
 function hasActiveExpensifyCard(policy: OnyxEntry<Policy>, employeeLogin: string) {
     const primaryLogin = policy?.primaryLoginsInvited?.[employeeLogin];
@@ -636,62 +546,6 @@ function tryNavigateToControlPolicyUpgrade(policy: OnyxEntry<Policy>, upgradeFea
     return true;
 }
 
-/**
- * Resolves a workspace's reimbursement choice to one of the three values in `CONST.POLICY.REIMBURSEMENT_CHOICES`.
- * Comparing the raw field instead makes a workspace reporting a deprecated value look like it has reimbursement
- * disabled, which hides Pay on its approved reports.
- */
-function getReimbursementChoice(policy: OnyxInputOrEntry<Policy>): ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES> | undefined {
-    switch (policy?.reimbursementChoice) {
-        case CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO:
-            return CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-        case CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL:
-            return CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
-        default:
-            return policy?.reimbursementChoice;
-    }
-}
-
-function arePaymentsEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
-    return getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-}
-
-/** Whether the workspace has everything auto-pay approved reports needs: workflows, direct reimbursements, and a business bank account. */
-function isAutoPayApprovedReportsAvailable(policy: OnyxInputOrEntry<Policy>): boolean {
-    return !!policy?.areWorkflowsEnabled && getReimbursementChoice(policy) === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && !!policy?.achAccount?.bankAccountID;
-}
-
-/**
- * Returns true when the user is both a submitter and an approver, mirroring the Submit/Approve suggested-search eligibility in
- * `getSuggestedSearchesVisibility` (SearchUIUtils): a submitter is a member of any group workspace, and an approver is a member of a
- * group workspace with a non-optional approval flow whom `isPolicyApprover` recognizes (named approver or someone reports submit/forward to).
- */
-function isSubmitterAndApprover(policies: OnyxCollection<Policy> | null | undefined, currentUserEmail: string | undefined): boolean {
-    if (!policies || !currentUserEmail) {
-        return false;
-    }
-    let isSubmitter = false;
-    let isApprover = false;
-    for (const policy of Object.values(policies)) {
-        if (!policy) {
-            continue;
-        }
-        isSubmitter = isSubmitter || isGroupPolicy(policy);
-        if (!isApprover) {
-            const hasApprovalFlow = isGroupPolicy(policy) && !!policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
-            isApprover = hasApprovalFlow && isPolicyApprover(policy, currentUserEmail);
-        }
-        if (isSubmitter && isApprover) {
-            return true;
-        }
-    }
-    return false;
-}
-
-function isControlOnAdvancedApprovalMode(policy: OnyxInputOrEntry<Policy>): boolean {
-    return policy?.type === CONST.POLICY.TYPE.CORPORATE && getApprovalWorkflow(policy) === CONST.POLICY.APPROVAL_MODE.ADVANCED;
-}
-
 /** Whether the user can add a category to the workspace straight from an expense's category picker */
 function canCreateCategoryInSitu(policy: OnyxEntry<Policy>, login?: string) {
     return canEditWorkspaceSettings(policy, login) && !hasAccountingConnections(policy) && !!policy?.areCategoriesEnabled;
@@ -701,19 +555,6 @@ function goBackFromInvalidPolicy() {
     Navigation.goBack(ROUTES.WORKSPACES_LIST.route);
 }
 
-function getApprovalWorkflow(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
-    if (policy?.type === CONST.POLICY.TYPE.PERSONAL) {
-        return CONST.POLICY.APPROVAL_MODE.OPTIONAL;
-    }
-
-    return policy?.approvalMode ?? CONST.POLICY.APPROVAL_MODE.ADVANCED;
-}
-
-function getDefaultApprover(policy: OnyxEntry<Policy>): string {
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    return policy?.approver || policy?.owner || '';
-}
-
 /**
  * Whether an approver email points at someone who is no longer on the workspace. The owner always counts as a member,
  * and HR advanced (manager) mode is excluded, because its final approver doesn't have to be a workspace member.
@@ -722,357 +563,6 @@ function isNonMemberApprover(policy: OnyxEntry<Policy>, approverEmail: string |
     return !!approverEmail && !isPolicyMember(policy, approverEmail) && !getHRAdvancedModeFinalApprover(policy);
 }
 
-/**
- * Whether the policy has at least one custom approval workflow. A workflow is considered custom when either:
- * - the default workflow was modified by changing its first approver or adding an "Approves to" user, or
- * - a new workflow was created (a member submits to an approver other than the default approver).
- */
-function hasCustomApprovalWorkflow(policy: OnyxEntry<Policy>): boolean {
-    if (!policy) {
-        return false;
-    }
-
-    const defaultApprover = getDefaultApprover(policy);
-
-    // The default workflow's first approver was changed away from the workspace owner.
-    if (!!policy.approver && !!policy.owner && policy.approver !== policy.owner) {
-        return true;
-    }
-
-    const employees = policy.employeeList ?? {};
-
-    // The default approver forwards approvals to someone, i.e. an "Approves to" user was added,
-    // either unconditionally (forwardsTo) or above an approval limit (overLimitForwardsTo).
-    const defaultApproverEmployee = employees[defaultApprover];
-    if (!!defaultApprover && (!!defaultApproverEmployee?.forwardsTo || !!defaultApproverEmployee?.overLimitForwardsTo)) {
-        return true;
-    }
-
-    // A new workflow exists when a member submits to an approver other than the default approver.
-    return Object.values(employees).some(
-        (employee) => employee?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!employee?.submitsTo && employee.submitsTo !== defaultApprover,
-    );
-}
-
-function getRuleApprovers(policy: OnyxEntry<Policy>, expenseReport: OnyxEntry<Report>) {
-    const categoryApprovers: string[] = [];
-    const tagApprovers: string[] = [];
-    const allReportTransactions = getAllSortedTransactions(expenseReport?.reportID);
-
-    // Before submitting to their `submitsTo` (in a policy on Advanced Approvals), submit to category/tag approvers.
-    // Category approvers are prioritized, then tag approvers.
-    for (let i = 0; i < allReportTransactions.length; i++) {
-        const transaction = allReportTransactions.at(i);
-        const tag = getTag(transaction);
-        const category = getCategory(transaction);
-        const categoryApprover = getCategoryApproverRule(policy?.rules?.approvalRules ?? [], category)?.approver;
-        const tagApprover = getTagApproverRule(policy, tag)?.approver;
-        if (categoryApprover) {
-            categoryApprovers.push(categoryApprover);
-        }
-
-        if (tagApprover) {
-            tagApprovers.push(tagApprover);
-        }
-    }
-
-    // Return the unique approvers list
-    return [...new Set([...categoryApprovers, ...tagApprovers])];
-}
-
-function getFirstRuleApprover(approvalRules: ApprovalRule[], expenseReport: OnyxEntry<Report>, ownerLogin: string | undefined) {
-    // Pre-build a lookup map of { category: { value → approver }, tag: { value → approver } }
-    // from the policy's approval rules so that each transaction's category/tag can be resolved in O(1).
-    const rulesMap: Record<'category' | 'tag', Record<string, string>> = {
-        category: {},
-        tag: {},
-    };
-
-    for (let i = 0; i < approvalRules.length; i++) {
-        const rule = approvalRules.at(i);
-        if (!rule) {
-            continue;
-        }
-        for (let j = 0; j < rule.applyWhen.length; j++) {
-            const applyWhen = rule.applyWhen.at(j);
-            if (applyWhen?.condition !== CONST.POLICY.RULE_CONDITIONS.MATCHES) {
-                continue;
-            }
-            if (applyWhen.field === CONST.POLICY.FIELDS.CATEGORY || applyWhen.field === CONST.POLICY.FIELDS.TAG) {
-                rulesMap[applyWhen.field][applyWhen.value] = rule.approver;
-            }
-        }
-    }
-
-    if (isEmptyObject(rulesMap.category) && isEmptyObject(rulesMap.tag)) {
-        return '';
-    }
-
-    const allReportTransactions = getAllSortedTransactions(expenseReport?.reportID);
-
-    if (!allReportTransactions.length) {
-        return '';
-    }
-
-    let firstCategoryApprover = '';
-    let firstTagApprover = '';
-
-    for (let i = 0; i < allReportTransactions.length; i++) {
-        const transaction = allReportTransactions.at(i);
-        const category = getCategory(transaction);
-        const categoryApprover = rulesMap.category[category];
-
-        // Category approvers take strict priority over tag approvers.
-        // Break immediately on the first match so we don't keep scanning transactions unnecessarily.
-        if (categoryApprover && categoryApprover !== ownerLogin) {
-            firstCategoryApprover = categoryApprover;
-            break;
-        }
-
-        // Only look for a tag approver if we haven't found one yet — no need to re-check on subsequent transactions.
-        if (!firstTagApprover) {
-            const tag = getTag(transaction);
-            const tagApprover = rulesMap.tag[tag];
-
-            if (tagApprover && tagApprover !== ownerLogin) {
-                firstTagApprover = tagApprover;
-            }
-        }
-    }
-
-    return firstCategoryApprover || firstTagApprover;
-}
-
-function matchesApprovalWorkflowEmailComparison(node: RuleFilterComparison, email: string | undefined): boolean {
-    const expectedEmails = (Array.isArray(node.right) ? node.right : [node.right]).map((value) => String(value).toLowerCase());
-    const isMatch = !!email && expectedEmails.includes(email.toLowerCase());
-    return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO ? !isMatch : isMatch;
-}
-
-function matchesApprovalWorkflowAmountComparison(node: RuleFilterComparison, amount: number): boolean {
-    const expectedAmount = typeof node.right === 'number' ? node.right : Number(node.right);
-    if (Number.isNaN(expectedAmount)) {
-        return false;
-    }
-
-    switch (node.operator) {
-        case CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO:
-            return amount === expectedAmount;
-        case CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO:
-            return amount !== expectedAmount;
-        case CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN:
-            return amount > expectedAmount;
-        case CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO:
-            return amount >= expectedAmount;
-        case CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN:
-            return amount < expectedAmount;
-        case CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO:
-            return amount <= expectedAmount;
-        default:
-            return false;
-    }
-}
-
-function evaluateApprovalWorkflowFilter(node: RuleFilterNode, context: ApprovalWorkflowContext): boolean {
-    if (!isRuleFilterComparison(node)) {
-        const left = evaluateApprovalWorkflowFilter(node.left, context);
-        const right = evaluateApprovalWorkflowFilter(node.right, context);
-        return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.OR ? left || right : left && right;
-    }
-
-    switch (node.left) {
-        case CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM:
-            return matchesApprovalWorkflowEmailComparison(node, context.submitterEmail);
-
-        // A report with no current approver has not been approved by anybody yet, so a rule based on who
-        // approved it last cannot apply.
-        case CONST.SEARCH.SYNTAX_FILTER_KEYS.TO:
-            return !!context.currentApproverEmail && matchesApprovalWorkflowEmailComparison(node, context.currentApproverEmail);
-        case CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT:
-            return matchesApprovalWorkflowAmountComparison(node, Math.abs(context.reportTotal));
-
-        default:
-            return false;
-    }
-}
-
-/**
- * True when every condition in the rule's filter tree is true for `context`.
- */
-function evaluateApprovalWorkflowRule(rule: ApprovalWorkflowRule, context: ApprovalWorkflowContext): boolean {
-    return evaluateApprovalWorkflowFilter(rule.filters, context);
-}
-
-/**
- * Check the policy's approval workflow rules to determine where the report goes next.
- */
-function getForwardsToFromRules(policy: OnyxEntry<Policy>, context: ApprovalWorkflowContext, rules: OnyxCollection<Rule>): ApprovalWorkflowRuleMatch | undefined {
-    if (!policy?.id || !context.submitterEmail) {
-        return undefined;
-    }
-
-    const trigger = context.currentApproverEmail ? CONST.RULES.TRIGGERS.REPORT_APPROVE : CONST.RULES.TRIGGERS.REPORT_SUBMIT;
-
-    // Sort by Onyx key so the rule picked stays the same across evaluations when more than one matches (which should not happen).
-    const ruleKeys = Object.keys(rules ?? {}).sort();
-    for (const ruleKey of ruleKeys) {
-        const rule = rules?.[ruleKey];
-        if (!rule || rule.scope !== CONST.RULES.SCOPE.POLICY || rule.scopeID !== policy.id || rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
-            continue;
-        }
-        if (!isApprovalWorkflowRule(rule) || !Object.values(rule.triggers ?? {}).includes(trigger)) {
-            continue;
-        }
-        if (!evaluateApprovalWorkflowRule(rule, context)) {
-            continue;
-        }
-
-        return {forwardsTo: Object.values(rule.actions ?? {}).find((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)?.approver};
-    }
-
-    return undefined;
-}
-
-function getManagerAccountEmail(policy: OnyxEntry<Policy>, ownerLogin: string | undefined, rules: OnyxCollection<Rule>, reportTotal = 0): string {
-    const ruleMatch = getForwardsToFromRules(policy, {submitterEmail: ownerLogin ?? '', reportTotal}, rules);
-    if (ruleMatch) {
-        return ruleMatch.forwardsTo ?? '';
-    }
-
-    const defaultApprover = getDefaultApprover(policy);
-
-    // For policy using the optional or basic workflow, the manager is the policy default approver.
-    if (([CONST.POLICY.APPROVAL_MODE.OPTIONAL, CONST.POLICY.APPROVAL_MODE.BASIC] as Array<ValueOf<typeof CONST.POLICY.APPROVAL_MODE>>).includes(getApprovalWorkflow(policy))) {
-        return defaultApprover;
-    }
-
-    const employee = policy?.employeeList?.[ownerLogin ?? ''];
-    if (!employee && !defaultApprover) {
-        return '';
-    }
-
-    return employee?.submitsTo ?? defaultApprover ?? '';
-}
-
-function getManagerAccountID(policy: OnyxEntry<Policy>, ownerLogin: string | undefined, rules: OnyxCollection<Rule>, reportTotal = 0) {
-    const managerEmail = getManagerAccountEmail(policy, ownerLogin, rules, reportTotal);
-    return managerEmail ? (getAccountIDsByLogins([managerEmail]).at(0) ?? -1) : -1;
-}
-
-/**
- * Returns the email the expense report should submit to per workspace approval config
- * (approval rules, employee submitsTo, or default approver for basic/optional workflows).
- */
-function getSubmitToEmail(
-    policy: OnyxEntry<Policy>,
-    expenseReport: OnyxEntry<Report>,
-    ownerLogin: string | undefined,
-    rules: OnyxCollection<Rule>,
-    shouldFallBackWhenManagerIsNotMember = false,
-): string {
-    const approvalRules = policy?.rules?.approvalRules;
-
-    if (!isSubmitAndClose(policy) && approvalRules?.length) {
-        const ruleApprover = getFirstRuleApprover(approvalRules, expenseReport, ownerLogin);
-        if (ruleApprover) {
-            return ruleApprover;
-        }
-    }
-
-    const ruleMatch = getForwardsToFromRules(policy, {submitterEmail: ownerLogin ?? '', reportTotal: expenseReport?.total ?? 0}, rules);
-    if (ruleMatch) {
-        return ruleMatch.forwardsTo ?? '';
-    }
-
-    const managerEmail = getManagerAccountEmail(policy, ownerLogin, rules, expenseReport?.total ?? 0);
-
-    // Falls back to the default approver when the manager is unavailable.
-    if (shouldFallBackWhenManagerIsNotMember && managerEmail && !policy?.employeeList?.[managerEmail] && !getHRAdvancedModeFinalApprover(policy)) {
-        return getDefaultApprover(policy);
-    }
-
-    return managerEmail;
-}
-
-/**
- * Returns the accountID to whom the given expenseReport submits reports to in the given Policy.
- */
-function getSubmitToAccountID(
-    policy: OnyxEntry<Policy>,
-    expenseReport: OnyxEntry<Report>,
-    ownerLogin: string | undefined,
-    rules: OnyxCollection<Rule>,
-    shouldFallBackWhenManagerIsNotMember = false,
-): number {
-    const submitToEmail = getSubmitToEmail(policy, expenseReport, ownerLogin, rules, shouldFallBackWhenManagerIsNotMember);
-    return submitToEmail ? (getAccountIDsByLogins([submitToEmail]).at(0) ?? CONST.DEFAULT_NUMBER_ID) : CONST.DEFAULT_NUMBER_ID;
-}
-
-function getSubmitReportManagerAccountID(
-    policy: OnyxEntry<Policy>,
-    expenseReport: OnyxEntry<Report>,
-    submitterLogin: string | undefined,
-    rules: OnyxCollection<Rule>,
-    personalDetailsByLogins: PersonalDetailsByLogin,
-): number | undefined {
-    const approvalRules = policy?.rules?.approvalRules;
-    const ruleApprover = !isSubmitAndClose(policy) && approvalRules?.length ? getFirstRuleApprover(approvalRules, expenseReport, submitterLogin) : '';
-    const hasReliablePolicyRoute =
-        ([CONST.POLICY.APPROVAL_MODE.OPTIONAL, CONST.POLICY.APPROVAL_MODE.BASIC] as Array<ValueOf<typeof CONST.POLICY.APPROVAL_MODE>>).includes(getApprovalWorkflow(policy)) ||
-        !!ruleApprover ||
-        !!policy?.employeeList?.[submitterLogin ?? ''];
-
-    if (!hasReliablePolicyRoute) {
-        return undefined;
-    }
-
-    const submitToEmail = getSubmitToEmail(policy, expenseReport, submitterLogin, rules, true);
-    const submitToAccountID = submitToEmail ? personalDetailsByLogins[submitToEmail]?.accountID : undefined;
-    if (submitToAccountID === undefined || !isValidAccountRoute(submitToAccountID)) {
-        return undefined;
-    }
-
-    return submitToAccountID;
-}
-
-/**
- * Returns the email of the account to forward the report to depending on the approver's approval limit.
- * Used for advanced approval mode only.
- *
- * `submitterEmail` is needed to consult the workspace's approval workflow rules, which describe each hop in
- * terms of who submitted the report as well as who is approving it. Without it only the legacy employeeList
- * forwardsTo/overLimitForwardsTo is considered.
- */
-function getForwardsToAccount(policy: OnyxEntry<Policy>, employeeEmail: string, reportTotal: number, rules: OnyxCollection<Rule>, submitterEmail?: string): string {
-    const ruleMatch = submitterEmail ? getForwardsToFromRules(policy, {submitterEmail, currentApproverEmail: employeeEmail, reportTotal}, rules) : undefined;
-    if (ruleMatch) {
-        return ruleMatch.forwardsTo ?? '';
-    }
-
-    if (!isControlOnAdvancedApprovalMode(policy)) {
-        return '';
-    }
-
-    const employee = policy?.employeeList?.[employeeEmail];
-    if (!employee) {
-        return '';
-    }
-
-    const positiveReportTotal = Math.abs(reportTotal);
-    if (employee.approvalLimit && employee.overLimitForwardsTo && positiveReportTotal > employee.approvalLimit) {
-        return employee.overLimitForwardsTo;
-    }
-    return employee.forwardsTo ?? '';
-}
-
-/**
- * Returns the accountID of the policy reimburser, if not available returns -1.
- */
-function getReimburserAccountID(policy: OnyxEntry<Policy>): number {
-    const reimburserEmail = policy?.achAccount?.reimburser ?? policy?.owner ?? '';
-    return reimburserEmail ? (getAccountIDsByLogins([reimburserEmail]).at(0) ?? -1) : -1;
-}
-
 function getAdminEmployees(policy: OnyxEntry<Policy>): PolicyEmployee[] {
     if (!policy?.employeeList) {
         return [];
@@ -1172,10 +662,6 @@ function getDomainNameForPolicy(policyID?: string): string {
     return `${CONST.EXPENSIFY_POLICY_DOMAIN}${policyID.toLowerCase()}${CONST.EXPENSIFY_POLICY_DOMAIN_EXTENSION}`;
 }
 
-function getWorkflowApprovalsUnavailable(policy: OnyxEntry<Policy>) {
-    return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL || !!policy?.errorFields?.approvalMode;
-}
-
 function getUserFriendlyWorkspaceType(workspaceType: ValueOf<typeof CONST.POLICY.TYPE>, translate: LocalizedTranslate) {
     switch (workspaceType) {
         case CONST.POLICY.TYPE.CORPORATE:
@@ -1494,13 +980,6 @@ export {
     canUnarchivePolicy,
     isPolicyMember,
     isMemberInHomeAndOfficeWorkspace,
-    isPolicyPayer,
-    getReimburserEmail,
-    getOwnerChangePayerSuccessData,
-    arePaymentsEnabled,
-    isAutoPayApprovedReportsAvailable,
-    getReimbursementChoice,
-    isSubmitterAndApprover,
     shouldShowPolicy,
     getActiveAdminWorkspaces,
     hasActiveAdminWorkspaces,
@@ -1515,38 +994,24 @@ export {
     sortWorkspacesBySelected,
     goBackWhenEnableFeature,
     navigateToExpensifyCardPage,
-    getDefaultApprover,
     isNonMemberApprover,
-    hasCustomApprovalWorkflow,
-    getApprovalWorkflow,
-    getReimburserAccountID,
     hasOnlyPersonalPolicies,
     getGroupPaidPolicies,
     getGroupPoliciesWhereReportCanBeCreated,
     getDefaultChatEnabledPolicy,
     getDefaultChatEnabledPolicySelection,
-    getForwardsToAccount,
-    getForwardsToFromRules,
-    evaluateApprovalWorkflowRule,
-    getSubmitToAccountID,
-    getSubmitReportManagerAccountID,
     getDomainNameForPolicy,
-    getWorkflowApprovalsUnavailable,
     getUserFriendlyWorkspaceType,
     getDefaultWorkspacePlanType,
     isPolicyAccessible,
     hasOtherControlWorkspaces,
     shouldBlockWorkspaceDeletionForInvoicifyUser,
-    getManagerAccountEmail,
-    getSubmitToEmail,
-    getRuleApprovers,
     canModifyPlan,
     getAdminsPrivateEmailDomains,
     getMostFrequentEmailDomain,
     getPolicyIDFromDomainName,
     getPolicyForAssignedCard,
     getDescriptionForPolicyDomainCard,
-    getManagerAccountID,
     getActiveEmployeeWorkspaces,
     isPolicyMemberWithoutPendingDelete,
     getActivePoliciesWithExpenseChatAndPerDiemEnabled,
@@ -1579,5 +1044,7 @@ export * from './rules';
 export * from './features';
 export * from './workflows';
 export * from './errors';
+export * from './approvals';
+export * from './payments';
 
 export type {MemberEmailsToAccountIDs};
diff --git a/src/libs/PolicyUtils/payments.ts b/src/libs/PolicyUtils/payments.ts
new file mode 100644
index 000000000000..866a3a4098fb
--- /dev/null
+++ b/src/libs/PolicyUtils/payments.ts
@@ -0,0 +1,111 @@
+/**
+ * The workspace reimburser and payer, the reimbursement choice, and auto-pay availability.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import {getAccountIDsByLogins} from '@libs/PersonalDetailsUtils';
+
+import CONST from '@src/CONST';
+import type {OnyxInputOrEntry, Policy} from '@src/types/onyx';
+
+import type {NullishDeep, OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {canMemberWrite} from './permissions';
+
+/**
+ * Resolve the email of the workspace's Authorized Payer (reimburser), matching the canonical resolution used across the app.
+ * Returns undefined when reimbursement is disabled or no payer can be resolved.
+ */
+function getReimburserEmail(policy: OnyxEntry<Policy>): string | undefined {
+    if (!policy) {
+        return undefined;
+    }
+
+    const reimbursementChoice = getReimbursementChoice(policy);
+    const isAutoReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+    const isManualReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+
+    // Reimbursement is disabled for this workspace.
+    if (!isAutoReimbursement && !isManualReimbursement) {
+        return undefined;
+    }
+
+    return policy.reimburser ?? policy.achAccount?.reimburser ?? (isManualReimbursement ? policy.owner : undefined);
+}
+
+/**
+ * Payer fields to merge into the successData of an ownership transfer. The backend keeps the former payer when the
+ * workspace has a bank account, so only reassign when there is none and the outgoing owner is the resolved payer.
+ */
+function getOwnerChangePayerSuccessData(policy: OnyxEntry<Policy>, newOwnerLogin: string): NullishDeep<Policy> {
+    if (!policy || policy.achAccount?.bankAccountID || getReimburserEmail(policy) !== policy.owner) {
+        return {};
+    }
+
+    return {
+        ...(policy.reimburser ? {reimburser: newOwnerLogin} : {}),
+        ...(policy.achAccount?.reimburser ? {achAccount: {reimburser: newOwnerLogin}} : {}),
+    };
+}
+
+function isPolicyPayer(policy: OnyxEntry<Policy>, currentUserLogin: string | undefined): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    const isAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
+    const reimbursementChoice = getReimbursementChoice(policy);
+    const isAutoReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+    const isManualReimbursement = reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+
+    // Reimbursement is disabled for this workspace.
+    if (!isAutoReimbursement && !isManualReimbursement) {
+        return false;
+    }
+
+    const reimburserEmail = getReimburserEmail(policy);
+
+    // No designated reimburser means any workspace admin can pay.
+    if (!reimburserEmail) {
+        return isAdmin;
+    }
+
+    const canPayOnPolicy = isAdmin || (!!currentUserLogin && canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_PAYMENTS));
+
+    return canPayOnPolicy && currentUserLogin === reimburserEmail;
+}
+
+/**
+ * Resolves a workspace's reimbursement choice to one of the three values in `CONST.POLICY.REIMBURSEMENT_CHOICES`.
+ * Comparing the raw field instead makes a workspace reporting a deprecated value look like it has reimbursement
+ * disabled, which hides Pay on its approved reports.
+ */
+function getReimbursementChoice(policy: OnyxInputOrEntry<Policy>): ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES> | undefined {
+    switch (policy?.reimbursementChoice) {
+        case CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO:
+            return CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+        case CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL:
+            return CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+        default:
+            return policy?.reimbursementChoice;
+    }
+}
+
+function arePaymentsEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
+    return getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+}
+
+/** Whether the workspace has everything auto-pay approved reports needs: workflows, direct reimbursements, and a business bank account. */
+function isAutoPayApprovedReportsAvailable(policy: OnyxInputOrEntry<Policy>): boolean {
+    return !!policy?.areWorkflowsEnabled && getReimbursementChoice(policy) === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && !!policy?.achAccount?.bankAccountID;
+}
+
+/**
+ * Returns the accountID of the policy reimburser, if not available returns -1.
+ */
+function getReimburserAccountID(policy: OnyxEntry<Policy>): number {
+    const reimburserEmail = policy?.achAccount?.reimburser ?? policy?.owner ?? '';
+    return reimburserEmail ? (getAccountIDsByLogins([reimburserEmail]).at(0) ?? -1) : -1;
+}
+
+export {getReimburserEmail, getOwnerChangePayerSuccessData, isPolicyPayer, getReimbursementChoice, arePaymentsEnabled, isAutoPayApprovedReportsAvailable, getReimburserAccountID};
diff --git a/tests/actions/IOU/SplitReportTotalsTest.ts b/tests/actions/IOU/SplitReportTotalsTest.ts
index 765dd9eb4c60..81f26b8ef4f9 100644
--- a/tests/actions/IOU/SplitReportTotalsTest.ts
+++ b/tests/actions/IOU/SplitReportTotalsTest.ts
@@ -96,6 +96,8 @@ jest.mock('@libs/PolicyUtils', () => ({
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/policyType'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/permissions'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/workflows'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/approvals'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/payments'),
     isPaidGroupPolicy: jest.fn().mockReturnValue(true),
     isPolicyOwner: jest.fn().mockImplementation((policy?: OnyxEntry<Policy>, currentUserAccountID?: number) => !!currentUserAccountID && policy?.ownerAccountID === currentUserAccountID),
 }));
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 0e214ffb5b74..8204022dee4f 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -115,6 +115,8 @@ jest.mock('@libs/PolicyUtils', () => ({
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/policyType'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/permissions'),
     ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/workflows'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/approvals'),
+    ...jest.requireActual<Record<string, unknown>>('@libs/PolicyUtils/payments'),
     isPreferredExporter: jest.fn().mockReturnValue(true),
     hasAccountingConnections: jest.fn().mockReturnValue(true),
     isPolicyAdmin: jest.fn().mockReturnValue(true),

From f95a96278dc3fad074e741b8b049cdc4a8cea8d4 Mon Sep 17 00:00:00 2001
From: Linh <vovanlinh29546@gmail.com>
Date: Thu, 15 Oct 2026 11:59:51 +0700
Subject: [PATCH 730/781] Rename allTransactions to moneyReportTransactions

---
 .../MoneyReportHeaderSecondaryActions.tsx           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
index feaae4fe94c3..ea2554c1086e 100644
--- a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
+++ b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
@@ -156,7 +156,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
     const {transactions: reportTransactions, violations} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID);
     // While offline, keep pending-delete transactions so a queued-for-delete expense still counts as a real transaction until the delete syncs.
     const nonPendingDeleteTransactions = Object.values(reportTransactions).filter((t) => isOffline || t.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-    const allTransactions = Object.values(reportTransactions);
+    const moneyReportTransactions = Object.values(reportTransactions);
     const singleTransaction = nonPendingDeleteTransactions.length === 1 ? nonPendingDeleteTransactions.at(0) : undefined;
     const [originalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(singleTransaction?.comment?.originalTransactionID)}`);
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
@@ -173,7 +173,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
     const shouldCalculateTotals = useSearchShouldCalculateTotals(currentSearchKey, true);
 
     const isInvoiceReport = isInvoiceReportUtil(moneyRequestReport);
-    const isAnyTransactionOnHold = hasHeldExpensesReportUtils(allTransactions);
+    const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyReportTransactions);
     const existingB2BInvoiceReport = useParticipantsInvoiceReport(activePolicyID, CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS, chatReport?.policyID);
     const getChatReportActions = usePayChatReportActions(chatReport, existingB2BInvoiceReport);
 
@@ -209,7 +209,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
                 paymentMethodType: type,
                 chatReport,
                 invoiceReport: moneyRequestReport,
-                invoiceReportTransactions: allTransactions,
+                invoiceReportTransactions: moneyReportTransactions,
                 introSelected,
                 currentUserAccountIDParam: accountID,
                 currentUserEmailParam: email ?? '',
@@ -235,7 +235,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
                 paymentType: type,
                 chatReport,
                 iouReport: moneyRequestReport,
-                iouReportTransactions: allTransactions,
+                iouReportTransactions: moneyReportTransactions,
                 introSelected,
                 currentUserAccountID: accountID,
                 currentUserLogin: currentUserLogin ?? '',
@@ -285,9 +285,10 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
         !canIOUBePaid &&
         canIOUBePaidAction(moneyRequestReport, chatReport, policy, bankAccountList, currentUserLogin ?? '', accountID, undefined, true, isChatReportArchived, invoiceReceiverPolicy);
     const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
-    const hasOnlyPendingTransactions = allTransactions.length > 0 && allTransactions.every((t) => isPending(t));
+    const hasOnlyPendingTransactions = moneyReportTransactions.length > 0 && moneyReportTransactions.every((t) => isPending(t));
     const shouldShowApproveButton =
-        (canApproveIOU(moneyRequestReport, policy, reportMetadata, currentUserPersonalDetails.accountID, allTransactions) && !hasOnlyPendingTransactions) || isApprovedAnimationRunning;
+        (canApproveIOU(moneyRequestReport, policy, reportMetadata, currentUserPersonalDetails.accountID, moneyReportTransactions) && !hasOnlyPendingTransactions) ||
+        isApprovedAnimationRunning;
     const isApproveDisabled = shouldShowApproveButton && !isAllowedToApproveExpenseReport(moneyRequestReport);
 
     const totalAmount = getTotalAmountForIOUReportPreviewButton(moneyRequestReport, policy, CONST.REPORT.PRIMARY_ACTIONS.PAY, nonPendingDeleteTransactions, convertToDisplayString);

From 2b50def9a8f7a5d841a97fc0fe4d0a39f15cc7f7 Mon Sep 17 00:00:00 2001
From: "Maruf Sharifi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 06:35:27 +0000
Subject: [PATCH 731/781] Revert merge conflict resolution that dropped this
 PR's changes

Merge commit 423c9549d7 resolved the conflicts in favor of main and removed the PR's
changes. This reapplies 93a3994982 on top of the merge so main's changes are kept.

Co-authored-by: Maruf Sharifi <marufsharifi@users.noreply.github.com>
---
 src/hooks/useSidebarOrderedReports.tsx      | 22 +++++
 tests/unit/useSidebarOrderedReportsTest.tsx | 89 +++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/src/hooks/useSidebarOrderedReports.tsx b/src/hooks/useSidebarOrderedReports.tsx
index 80dd9483a600..a2f168aba8a3 100644
--- a/src/hooks/useSidebarOrderedReports.tsx
+++ b/src/hooks/useSidebarOrderedReports.tsx
@@ -8,6 +8,7 @@ import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ValueOf} from 'type-fest';
 
@@ -231,6 +232,26 @@ function SidebarOrderedReportsContextProvider({
         // Rather than falling through to a full scan of all reports, recheck only the already-displayed reports.
         let effectiveUpdatedReports = updatedReports.length === 0 && hasCachedReports ? Object.keys(currentReportsToDisplay) : updatedReports;
 
+        // A report can be filtered out before its derived attributes are ready (e.g. a new DM that arrives before its
+        // expense preview). It is then not displayed, so the fallback above never rechecks it. Also recheck reports whose
+        // visibility-related attributes changed. Compare fields, not references: derived writes recreate every entry,
+        // so a reference diff would bring back a full scan. Skip the first hydration for the same reason.
+        if (hasCachedReports && reportAttributes !== prevReportAttributes && !isEmptyObject(prevReportAttributes)) {
+            const reportsToUpdate = new Set(effectiveUpdatedReports);
+            for (const [reportID, attributes] of Object.entries(reportAttributes ?? {})) {
+                const prevAttributes = prevReportAttributes[reportID];
+                if (
+                    !prevAttributes ||
+                    attributes.requiresAttention !== prevAttributes.requiresAttention ||
+                    attributes.isEmpty !== prevAttributes.isEmpty ||
+                    attributes.brickRoadStatus !== prevAttributes.brickRoadStatus
+                ) {
+                    reportsToUpdate.add(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+                }
+            }
+            effectiveUpdatedReports = Array.from(reportsToUpdate);
+        }
+
         // When guide personal details hydrate after the reports collection, guideAccountIDs changes but
         // getUpdatedReports() returns no report keys. Re-evaluate all reports so domain rooms previously
         // filtered out can appear in the LHN.
@@ -290,6 +311,7 @@ function SidebarOrderedReportsContextProvider({
         transactionViolations,
         reportNameValuePairs,
         reportAttributes,
+        prevReportAttributes,
         reportsDrafts,
         isOffline,
         clearCacheDummyCounter,
diff --git a/tests/unit/useSidebarOrderedReportsTest.tsx b/tests/unit/useSidebarOrderedReportsTest.tsx
index 25a233e49436..6818a6d1a926 100644
--- a/tests/unit/useSidebarOrderedReportsTest.tsx
+++ b/tests/unit/useSidebarOrderedReportsTest.tsx
@@ -10,6 +10,7 @@ import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report, ReportAttributesDerivedValue} from '@src/types/onyx';
+import type {ReportAttributes} from '@src/types/onyx/DerivedValues';
 
 import type {OnyxMultiSetInput} from 'react-native-onyx';
 
@@ -542,4 +543,92 @@ describe('useSidebarOrderedReports', () => {
         const callForReport2 = mockSidebarUtils.updateReportsToDisplayInLHN.mock.calls.find((call) => call[0]?.updatedReportsKeys.includes(`${ONYXKEYS.COLLECTION.REPORT}2`));
         expect(callForReport2?.[0]?.updatedReportsKeys).toEqual([`${ONYXKEYS.COLLECTION.REPORT}2`]);
     });
+
+    describe('reportAttributes changes', () => {
+        const createReportAttributes = (attributes: Partial<ReportAttributes> = {}): ReportAttributes => ({
+            reportName: 'Chat',
+            isEmpty: false,
+            brickRoadStatus: undefined,
+            requiresAttention: false,
+            reportErrors: {},
+            ...attributes,
+        });
+
+        const displayedReportID = '1';
+        const newDMReportID = '2';
+
+        // Renders the LHN with one displayed report and a new DM that is filtered out because its attributes are not ready yet.
+        const renderWithExcludedReport = async () => {
+            const displayedReports = createMockReports({
+                report1: {reportName: 'Chat A'},
+            });
+            // The LHN cache is keyed by the report's Onyx key
+            mockSidebarUtils.getReportsToDisplayInLHN.mockReturnValue({[`${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`]: displayedReports[displayedReportID]});
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockImplementation(({displayedReports: reports}) => reports);
+
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`, displayedReports[displayedReportID]);
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {reports: {[displayedReportID]: createReportAttributes()}, locale: 'en'});
+            });
+
+            renderHook(() => useSidebarOrderedReports(), {
+                wrapper: TestWrapper,
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            await act(async () => {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`, {reportID: newDMReportID, type: CONST.REPORT.TYPE.CHAT} as Report);
+            });
+            await waitForBatchedUpdatesWithAct();
+        };
+
+        const getUpdatedReportsKeys = () => mockSidebarUtils.updateReportsToDisplayInLHN.mock.calls.flatMap((call) => call[0]?.updatedReportsKeys ?? []);
+
+        it('should recheck a report that is not displayed when its attributes make it require attention', async () => {
+            // Given the LHN cache is built and a new DM was filtered out before its attributes were calculated
+            await renderWithExcludedReport();
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockClear();
+
+            // When the derived attributes later mark the DM as requiring attention, with no change to the report itself
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {[displayedReportID]: createReportAttributes(), [newDMReportID]: createReportAttributes({requiresAttention: true})},
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the DM is rechecked, so it can be added to the LHN without a full rebuild, and the displayed report is still
+            // rechecked with the new attributes by the existing fallback
+            expect(getUpdatedReportsKeys()).toEqual(expect.arrayContaining([`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`, `${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`]));
+        });
+
+        it('should not recheck a report when its attributes are recreated with the same visibility fields', async () => {
+            // Given the DM already has attributes that keep it out of the LHN
+            await renderWithExcludedReport();
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {[displayedReportID]: createReportAttributes(), [newDMReportID]: createReportAttributes({isEmpty: true})},
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+            mockSidebarUtils.updateReportsToDisplayInLHN.mockClear();
+
+            // When the derived value is written again with new objects but the same visibility fields
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+                    reports: {
+                        [displayedReportID]: createReportAttributes({reportName: 'Renamed'}),
+                        [newDMReportID]: createReportAttributes({isEmpty: true, reportName: 'Renamed'}),
+                    },
+                    locale: 'en',
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the hidden DM is not rechecked, which keeps reportAttributes writes from triggering a full scan
+            expect(getUpdatedReportsKeys()).not.toContain(`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`);
+        });
+    });
 });

From cf4b40bb1fffec8f1a1f8befbafcb6cfc67ad81e Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Thu, 15 Oct 2026 08:42:48 +0200
Subject: [PATCH 732/781] fix: name the dynamic form list entry an error
 belongs to

---
 .../DynamicForm/utils/getDynamicFieldErrors.ts    | 15 +++++++++------
 src/languages/de.ts                               |  1 +
 src/languages/el.ts                               |  1 +
 src/languages/en.ts                               |  1 +
 src/languages/es.ts                               |  1 +
 src/languages/fr.ts                               |  1 +
 src/languages/it.ts                               |  1 +
 src/languages/ja.ts                               |  1 +
 src/languages/nl.ts                               |  1 +
 src/languages/pl.ts                               |  1 +
 src/languages/pt-BR.ts                            |  1 +
 src/languages/zh-hans.ts                          |  1 +
 .../DynamicForm/getDynamicFieldErrorsTest.ts      | 10 ++++++----
 13 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
index 83de65e1e972..de0bfcb55b61 100644
--- a/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
+++ b/src/components/DynamicForm/utils/getDynamicFieldErrors.ts
@@ -31,6 +31,7 @@ import getVisibleFields from './getVisibleFields';
 import isSupportedField from './isSupportedField';
 import {getListItems, getListItemSensitiveAnswers} from './listItems';
 import logSchemaProblem from './logSchemaProblem';
+import summarizeListItem, {getListItemFallbackTitle} from './summarizeListItem';
 
 /** Checks a field the user has answered. Unanswered fields only get the required check. */
 type FieldValidator<TType extends DynamicFormFieldType> = (field: DynamicFormFieldOfType<TType>, values: DynamicFormValues, translate: LocalizedTranslate) => string[];
@@ -102,7 +103,7 @@ function getMultiChoiceErrors(field: DynamicFormFieldOfType<'multiselect' | 'cou
     return !hasNonStringEntry && keys.every((key) => offeredKeys.has(key)) ? [] : [translate('dynamicForm.error.invalidOption')];
 }
 
-/** The list shows one error, so the first entry with a problem names it. The flow keeps sensitive answers in memory apart from their entry, so one lost with the memory is asked for again. */
+/** The list shows one error, so the first entry with a problem gives it, prefixed by the entry title so the user knows which one to open. The flow keeps sensitive answers in memory apart from their entry, so one lost with the memory is asked for again. */
 function getListErrors(field: DynamicFormListField, values: DynamicFormValues, translate: LocalizedTranslate): string[] {
     const items = getListItems(values[field.key]);
     const messages: string[] = [];
@@ -112,11 +113,13 @@ function getListErrors(field: DynamicFormListField, values: DynamicFormValues, t
     if (field.maxItems !== undefined && items.length > field.maxItems) {
         messages.push(translate('dynamicForm.error.tooManyItems', {max: field.maxItems}));
     }
-    const firstItemError = items
-        .map((item) => Object.values(getDynamicFieldErrors(field.itemFields, {...item, ...getListItemSensitiveAnswers(field, item.id, values)}, translate)).at(0))
-        .find(Boolean);
-    if (firstItemError) {
-        messages.push(firstItemError);
+    const fallbackTitle = getListItemFallbackTitle(field, translate);
+    for (const item of items) {
+        const error = Object.values(getDynamicFieldErrors(field.itemFields, {...item, ...getListItemSensitiveAnswers(field, item.id, values)}, translate)).at(0);
+        if (error) {
+            messages.push(translate('dynamicForm.error.itemError', {item: summarizeListItem(item, field.itemFields, translate, fallbackTitle).title, error}));
+            break;
+        }
     }
     return messages;
 }
diff --git a/src/languages/de.ts b/src/languages/de.ts
index f92faf6b461f..f3849a05e0dc 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -4068,6 +4068,7 @@ ${amount} für ${merchant} – ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Gib einen Wert zwischen ${min} und ${max} ein`,
             tooFewItems: ({min}: {min: number}) => `Füge mindestens ${min} hinzu`,
             tooManyItems: ({max}: {max: number}) => `Füge höchstens ${max} hinzu`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `${item} hinzufügen`,
         removeItemTitle: ({item}: {item: string}) => `${item} entfernen?`,
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 8e5cf83235cb..bea141c8f367 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -4116,6 +4116,7 @@ ${amount} για ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Εισαγάγετε μια τιμή μεταξύ ${min} και ${max}`,
             tooFewItems: ({min}: {min: number}) => `Προσθέστε τουλάχιστον ${min}`,
             tooManyItems: ({max}: {max: number}) => `Προσθέστε το πολύ ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Προσθήκη ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Αφαίρεση ${item};`,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c2e20ec9d0c8..d0260e386b12 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4232,6 +4232,7 @@ const translations = {
             outOfRange: ({min, max}: {min: number; max: number}) => `Enter a value between ${min} and ${max}`,
             tooFewItems: ({min}: {min: number}) => `Add at least ${min}`,
             tooManyItems: ({max}: {max: number}) => `Add at most ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Add ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Remove ${item}?`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b5a38cc81e66..85ca137dd420 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3979,6 +3979,7 @@ ${amount} para ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Introduce un valor entre ${min} y ${max}`,
             tooFewItems: ({min}: {min: number}) => `Añade al menos ${min}`,
             tooManyItems: ({max}: {max: number}) => `Añade como máximo ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Añadir ${item}`,
         removeItemTitle: ({item}: {item: string}) => `¿Eliminar ${item}?`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 72ffa40c1a21..d996645a6123 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -4075,6 +4075,7 @@ ${amount} pour ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Saisissez une valeur entre ${min} et ${max}`,
             tooFewItems: ({min}: {min: number}) => `Ajoutez au moins ${min}`,
             tooManyItems: ({max}: {max: number}) => `Ajoutez au plus ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item} : ${error}`,
         },
         addItem: ({item}: {item: string}) => `Ajouter ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Supprimer ${item} ?`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 488db402f139..1bc7feabfa3d 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -4046,6 +4046,7 @@ ${amount} per ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Inserisci un valore tra ${min} e ${max}`,
             tooFewItems: ({min}: {min: number}) => `Aggiungi almeno ${min}`,
             tooManyItems: ({max}: {max: number}) => `Aggiungi al massimo ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Aggiungi ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Rimuovere ${item}?`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 129bd3995252..7d4b01691044 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -4014,6 +4014,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             outOfRange: ({min, max}: {min: number; max: number}) => `${min}から${max}の間の値を入力してください`,
             tooFewItems: ({min}: {min: number}) => `${min}件以上追加してください`,
             tooManyItems: ({max}: {max: number}) => `${max}件以内で追加してください`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}：${error}`,
         },
         addItem: ({item}: {item: string}) => `${item}を追加`,
         removeItemTitle: ({item}: {item: string}) => `${item}を削除しますか？`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c24e0b76d7be..7281e46a0d95 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -4048,6 +4048,7 @@ ${amount} voor ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Voer een waarde in tussen ${min} en ${max}`,
             tooFewItems: ({min}: {min: number}) => `Voeg er minimaal ${min} toe`,
             tooManyItems: ({max}: {max: number}) => `Voeg er maximaal ${max} toe`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `${item} toevoegen`,
         removeItemTitle: ({item}: {item: string}) => `${item} verwijderen?`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 2c1c1b9f124f..6c0f2af82994 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -4080,6 +4080,7 @@ ${amount} dla ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Wprowadź wartość od ${min} do ${max}`,
             tooFewItems: ({min}: {min: number}) => `Dodaj co najmniej ${min}`,
             tooManyItems: ({max}: {max: number}) => `Dodaj maksymalnie ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Dodaj ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Usunąć ${item}?`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 7df01e137152..8d32976dc8c6 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -4035,6 +4035,7 @@ ${amount} para ${merchant} - ${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `Insira um valor entre ${min} e ${max}`,
             tooFewItems: ({min}: {min: number}) => `Adicione pelo menos ${min}`,
             tooManyItems: ({max}: {max: number}) => `Adicione no máximo ${max}`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}: ${error}`,
         },
         addItem: ({item}: {item: string}) => `Adicionar ${item}`,
         removeItemTitle: ({item}: {item: string}) => `Remover ${item}?`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 0b2a1edd4f79..1cf987ea4544 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -3922,6 +3922,7 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             outOfRange: ({min, max}: {min: number; max: number}) => `请输入 ${min} 到 ${max} 之间的值`,
             tooFewItems: ({min}: {min: number}) => `至少添加 ${min} 项`,
             tooManyItems: ({max}: {max: number}) => `最多添加 ${max} 项`,
+            itemError: ({item, error}: {item: string; error: string}) => `${item}：${error}`,
         },
         addItem: ({item}: {item: string}) => `添加${item}`,
         removeItemTitle: ({item}: {item: string}) => `移除${item}？`,
diff --git a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
index e53d2bbeaeaf..e7c3219ff6f3 100644
--- a/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
+++ b/tests/unit/components/DynamicForm/getDynamicFieldErrorsTest.ts
@@ -379,6 +379,7 @@ describe('getDynamicFieldErrors', () => {
             key: 'directors',
             type: 'list',
             required: true,
+            itemLabel: 'director',
             minItems: 2,
             itemFields: [
                 {key: 'firstName', type: 'text', required: true},
@@ -390,9 +391,10 @@ describe('getDynamicFieldErrors', () => {
         const emptyErrors = getDynamicFieldErrors([directors], {directors: []}, translateLocal);
         const shortErrors = getDynamicFieldErrors([directors], {directors: [{id: 'jane', firstName: ''}]}, translateLocal);
 
-        // Then the empty list is required, and the short list shows both the size and the entry's first problem, its missing name
+        // Then the empty list is required, and the short list shows both the size and the entry's first problem, its missing name, under the item noun since the entry has no name to show
+        const missingNameError = translateLocal('dynamicForm.error.itemError', {item: 'director', error: translateLocal('common.error.fieldRequired')});
         expect(emptyErrors).toEqual({directors: translateLocal('common.error.fieldRequired')});
-        expect(shortErrors).toEqual({directors: `${translateLocal('dynamicForm.error.tooFewItems', {min: 2})}\n${translateLocal('common.error.fieldRequired')}`});
+        expect(shortErrors).toEqual({directors: `${translateLocal('dynamicForm.error.tooFewItems', {min: 2})}\n${missingNameError}`});
     });
 
     it('asks again for a sensitive entry answer the memory no longer holds', () => {
@@ -412,8 +414,8 @@ describe('getDynamicFieldErrors', () => {
         const keptErrors = getDynamicFieldErrors([directors], {...draftValues, [getListItemSensitiveKey('directors', 'jane', 'ssn')]: '123456789'}, translateLocal);
         const lostErrors = getDynamicFieldErrors([directors], draftValues, translateLocal);
 
-        // Then the list passes while the SSN is kept, and asks for it once it is lost, so a director is never submitted without one
+        // Then the list passes while the SSN is kept, and asks for it once it is lost, naming Jane so the user knows which entry to open, so a director is never submitted without one
         expect(keptErrors).toEqual({});
-        expect(lostErrors).toEqual({directors: translateLocal('common.error.fieldRequired')});
+        expect(lostErrors).toEqual({directors: translateLocal('dynamicForm.error.itemError', {item: 'Jane', error: translateLocal('common.error.fieldRequired')})});
     });
 });

From 4e3d79fd89fc7ec3a0ff5d35669630e9665b4ea5 Mon Sep 17 00:00:00 2001
From: "Maruf Sharifi (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 06:45:09 +0000
Subject: [PATCH 733/781] Drop LHN recheck logic now handled by
 getReportAttributesUpdates on main

Co-authored-by: Maruf Sharifi <marufsharifi@users.noreply.github.com>
---
 src/hooks/useSidebarOrderedReports.tsx      | 22 -------------
 tests/unit/useSidebarOrderedReportsTest.tsx | 34 ++-------------------
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/src/hooks/useSidebarOrderedReports.tsx b/src/hooks/useSidebarOrderedReports.tsx
index a2f168aba8a3..80dd9483a600 100644
--- a/src/hooks/useSidebarOrderedReports.tsx
+++ b/src/hooks/useSidebarOrderedReports.tsx
@@ -8,7 +8,6 @@ import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {ValueOf} from 'type-fest';
 
@@ -232,26 +231,6 @@ function SidebarOrderedReportsContextProvider({
         // Rather than falling through to a full scan of all reports, recheck only the already-displayed reports.
         let effectiveUpdatedReports = updatedReports.length === 0 && hasCachedReports ? Object.keys(currentReportsToDisplay) : updatedReports;
 
-        // A report can be filtered out before its derived attributes are ready (e.g. a new DM that arrives before its
-        // expense preview). It is then not displayed, so the fallback above never rechecks it. Also recheck reports whose
-        // visibility-related attributes changed. Compare fields, not references: derived writes recreate every entry,
-        // so a reference diff would bring back a full scan. Skip the first hydration for the same reason.
-        if (hasCachedReports && reportAttributes !== prevReportAttributes && !isEmptyObject(prevReportAttributes)) {
-            const reportsToUpdate = new Set(effectiveUpdatedReports);
-            for (const [reportID, attributes] of Object.entries(reportAttributes ?? {})) {
-                const prevAttributes = prevReportAttributes[reportID];
-                if (
-                    !prevAttributes ||
-                    attributes.requiresAttention !== prevAttributes.requiresAttention ||
-                    attributes.isEmpty !== prevAttributes.isEmpty ||
-                    attributes.brickRoadStatus !== prevAttributes.brickRoadStatus
-                ) {
-                    reportsToUpdate.add(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
-                }
-            }
-            effectiveUpdatedReports = Array.from(reportsToUpdate);
-        }
-
         // When guide personal details hydrate after the reports collection, guideAccountIDs changes but
         // getUpdatedReports() returns no report keys. Re-evaluate all reports so domain rooms previously
         // filtered out can appear in the LHN.
@@ -311,7 +290,6 @@ function SidebarOrderedReportsContextProvider({
         transactionViolations,
         reportNameValuePairs,
         reportAttributes,
-        prevReportAttributes,
         reportsDrafts,
         isOffline,
         clearCacheDummyCounter,
diff --git a/tests/unit/useSidebarOrderedReportsTest.tsx b/tests/unit/useSidebarOrderedReportsTest.tsx
index 6818a6d1a926..006d9540b713 100644
--- a/tests/unit/useSidebarOrderedReportsTest.tsx
+++ b/tests/unit/useSidebarOrderedReportsTest.tsx
@@ -598,37 +598,9 @@ describe('useSidebarOrderedReports', () => {
             });
             await waitForBatchedUpdatesWithAct();
 
-            // Then the DM is rechecked, so it can be added to the LHN without a full rebuild, and the displayed report is still
-            // rechecked with the new attributes by the existing fallback
-            expect(getUpdatedReportsKeys()).toEqual(expect.arrayContaining([`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`, `${ONYXKEYS.COLLECTION.REPORT}${displayedReportID}`]));
-        });
-
-        it('should not recheck a report when its attributes are recreated with the same visibility fields', async () => {
-            // Given the DM already has attributes that keep it out of the LHN
-            await renderWithExcludedReport();
-            await act(async () => {
-                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
-                    reports: {[displayedReportID]: createReportAttributes(), [newDMReportID]: createReportAttributes({isEmpty: true})},
-                    locale: 'en',
-                });
-            });
-            await waitForBatchedUpdatesWithAct();
-            mockSidebarUtils.updateReportsToDisplayInLHN.mockClear();
-
-            // When the derived value is written again with new objects but the same visibility fields
-            await act(async () => {
-                await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
-                    reports: {
-                        [displayedReportID]: createReportAttributes({reportName: 'Renamed'}),
-                        [newDMReportID]: createReportAttributes({isEmpty: true, reportName: 'Renamed'}),
-                    },
-                    locale: 'en',
-                });
-            });
-            await waitForBatchedUpdatesWithAct();
-
-            // Then the hidden DM is not rechecked, which keeps reportAttributes writes from triggering a full scan
-            expect(getUpdatedReportsKeys()).not.toContain(`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`);
+            // Then only the DM is rechecked, so it can be added to the LHN without a full rebuild. The displayed report's
+            // attributes did not change, so it is not rechecked
+            expect(getUpdatedReportsKeys()).toEqual([`${ONYXKEYS.COLLECTION.REPORT}${newDMReportID}`]);
         });
     });
 });

From cdbdd1b387965e315be49793d55eb77aad65a174 Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 08:21:17 +0000
Subject: [PATCH 734/781] Add getApprovalWorkflow, getDefaultApprover, and
 getRuleApprovers tests and group approval and payment tests

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 tests/unit/PolicyUtilsTest.ts | 1793 ++++++++++++++++++---------------
 1 file changed, 977 insertions(+), 816 deletions(-)

diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index 844b6a98fa99..32fcca369e68 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -28,11 +28,13 @@ import {
     getActivePoliciesWithExpenseChatAndPerDiemEnabled,
     getAllTaxRates,
     getAllTaxRatesNamesAndValues,
+    getApprovalWorkflow,
     getConnectedIntegration,
     getConnectionExporters,
     getCurrentTaxID,
     getCustomUnitsForDuplication,
     getDefaultChatEnabledPolicy,
+    getDefaultApprover,
     getDefaultChatEnabledPolicySelection,
     getDefaultTimeTrackingRate,
     getDefaultWorkspacePlanType,
@@ -63,6 +65,7 @@ import {
     getReimbursementChoice,
     isPolicyPayer,
     getReimburserEmail,
+    getRuleApprovers,
     getSubmitReportManagerAccountID,
     getSubmitToAccountID,
     getSubmitToEmail,
@@ -1349,206 +1352,264 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('getSubmitToAccountID', () => {
+    describe('shouldShowPolicy', () => {
         beforeEach(() => {
-            wrapOnyxWithWaitForBatchedUpdates(Onyx);
-            Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            global.fetch = TestHelper.getGlobalFetchMock();
+            return Onyx.clear().then(waitForBatchedUpdates);
         });
-        afterEach(async () => {
-            await Onyx.clear();
-            await waitForBatchedUpdatesWithAct();
+        it('should return false', () => {
+            // Given an archived paid policy.
+            const policy = {
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                role: '',
+            };
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The empty role deliberately models malformed persisted policy data.
+            const result = shouldShowPolicy(policy as unknown as Parameters<typeof shouldShowPolicy>[0], false, CARLOS_EMAIL);
+            // The result should be false since it is an archived paid policy.
+            expect(result).toBe(false);
         });
-        describe('Has no rule approver', () => {
-            it('should return the policy approver/owner if the policy use the basic workflow', () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.TEAM,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: employeeAccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(ownerAccountID);
+        it('should return true', () => {
+            // Given a paid policy.
+            const policy = createMock<OnyxEntry<Policy>>({...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null});
+            const result = shouldShowPolicy(policy, false, CARLOS_EMAIL);
+            // The result should be true, since it is an active paid policy.
+            expect(result).toBe(true);
+        });
+        it('should return false', () => {
+            // Given a control workspace which is pending delete.
+            const policy = createMock<OnyxEntry<Policy>>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
             });
-            it('should return the policy approver/owner if the policy use the optional workflow', () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.TEAM,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: employeeAccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(ownerAccountID);
+            const result = shouldShowPolicy(policy, false, CARLOS_EMAIL);
+            // The result should be false since it is a policy which is pending deletion.
+            expect(result).toEqual(false);
+        });
+        it('hides an archived policy by default', () => {
+            const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null, archivedDate: '2024-01-01'};
+            const result = shouldShowPolicy(policy as OnyxEntry<Policy>, false, CARLOS_EMAIL);
+            expect(result).toBe(false);
+        });
+        it('shows an archived policy when includeArchivedPolicy is true', () => {
+            const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null, archivedDate: '2024-01-01'};
+            const result = shouldShowPolicy(policy as OnyxEntry<Policy>, false, CARLOS_EMAIL, true);
+            expect(result).toBe(true);
+        });
+    });
+
+    describe('approvals', () => {
+        describe('getApprovalWorkflow', () => {
+            it('should return the optional approval mode for a personal policy', () => {
+                // Given a personal policy that has the advanced approval mode stored on it
+                const policy = createMock<Policy>({type: CONST.POLICY.TYPE.PERSONAL, approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED});
+
+                // When the approval workflow is read
+                // Then it is optional, because personal policies never require approval
+                expect(getApprovalWorkflow(policy)).toBe(CONST.POLICY.APPROVAL_MODE.OPTIONAL);
             });
-            it('should return the employee submitsTo if the policy use the advance workflow', () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    employeeList,
-                    type: CONST.POLICY.TYPE.CORPORATE,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: employeeAccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(adminAccountID);
+
+            it('should return the approval mode set on a group policy', () => {
+                // Given a group policy that uses the basic approval mode
+                const policy = createMock<Policy>({type: CONST.POLICY.TYPE.TEAM, approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC});
+
+                // When the approval workflow is read
+                // Then the policy's own approval mode is returned
+                expect(getApprovalWorkflow(policy)).toBe(CONST.POLICY.APPROVAL_MODE.BASIC);
+            });
+
+            it('should default to the advanced approval mode when a group policy has no approval mode', () => {
+                // Given a group policy without an approval mode
+                const policy = createMock<Policy>({type: CONST.POLICY.TYPE.CORPORATE});
+
+                // When the approval workflow is read
+                // Then it falls back to advanced approvals
+                expect(getApprovalWorkflow(policy)).toBe(CONST.POLICY.APPROVAL_MODE.ADVANCED);
+            });
+
+            it('should default to the advanced approval mode when the policy is undefined', () => {
+                // Given no policy
+                // When the approval workflow is read
+                // Then it falls back to advanced approvals
+                expect(getApprovalWorkflow(undefined)).toBe(CONST.POLICY.APPROVAL_MODE.ADVANCED);
             });
         });
-        describe('Has category/tag approver', () => {
-            it('should return the first category approver if has any transaction category match with category approver rule', async () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.CORPORATE,
-                    employeeList,
-                    rules,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: employeeAccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                const transaction1: Transaction = {
-                    ...createRandomTransaction(0),
-                    category: 'cat1',
-                    reportID: expenseReport.reportID,
-                };
-                const transaction2: Transaction = {
-                    ...createRandomTransaction(1),
-                    category: '',
-                    reportID: expenseReport.reportID,
-                };
-                const transactionData: TransactionCollectionDataSet = {
-                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
-                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
-                };
-                await Onyx.multiSet({...transactionData});
-                expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(categoryApprover1AccountID);
+
+        describe('getDefaultApprover', () => {
+            it('should return the policy approver when one is set', () => {
+                // Given a policy whose approver is someone other than the owner
+                const policy = createMock<Policy>({approver: approverEmail, owner: 'owner@test.com'});
+
+                // When the default approver is read
+                // Then the approver wins over the owner
+                expect(getDefaultApprover(policy)).toBe(approverEmail);
+            });
+
+            it('should fall back to the policy owner when there is no approver', () => {
+                // Given a policy with an owner but no approver
+                const policy = createMock<Policy>({owner: 'owner@test.com'});
+
+                // When the default approver is read
+                // Then the owner is used
+                expect(getDefaultApprover(policy)).toBe('owner@test.com');
+            });
+
+            it('should fall back to the policy owner when the approver is an empty string', () => {
+                // Given a policy whose approver was cleared to an empty string
+                const policy = createMock<Policy>({approver: '', owner: 'owner@test.com'});
+
+                // When the default approver is read
+                // Then the empty approver is skipped and the owner is used
+                expect(getDefaultApprover(policy)).toBe('owner@test.com');
+            });
+
+            it('should return an empty string when the policy has no approver or owner', () => {
+                // Given a policy with neither an approver nor an owner, and no policy at all
+                const policy = createMock<Policy>({});
+
+                // When the default approver is read
+                // Then there is no one to fall back to
+                expect(getDefaultApprover(policy)).toBe('');
+                expect(getDefaultApprover(undefined)).toBe('');
+            });
+        });
+
+        describe('getRuleApprovers', () => {
+            const policy = createMock<Policy>({type: CONST.POLICY.TYPE.CORPORATE, rules});
+            const expenseReport: Report = {
+                ...createRandomReport(0, undefined),
+                type: CONST.REPORT.TYPE.EXPENSE,
+            };
+
+            beforeEach(() => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+            });
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
             });
-            it('should return default approver if rule approver is submitter and prevent self approval is enabled', async () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.CORPORATE,
-                    employeeList,
-                    rules,
-                    preventSelfApproval: true,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: categoryApprover1AccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                const transaction: Transaction = {
-                    ...createRandomTransaction(0),
-                    category: 'cat1',
-                    reportID: expenseReport.reportID,
-                    tag: '',
-                };
 
+            it('should return no approvers when the report has no transactions', () => {
+                // Given an expense report with no transactions in Onyx
+                // When the rule approvers are read
+                // Then there is no transaction to match a rule against
+                expect(getRuleApprovers(policy, expenseReport)).toEqual([]);
+            });
+
+            it('should return no approvers when the policy has no approval rules', async () => {
+                // Given a report whose transaction has a category and tag, on a policy without approval rules
+                const transaction: Transaction = {...createRandomTransaction(0), category: 'cat1', tag: 'tag1', reportID: expenseReport.reportID};
                 await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction);
-                expect(getSubmitToAccountID(policy, expenseReport, categoryApprover1Email, undefined)).toBe(adminAccountID);
+
+                // When the rule approvers are read
+                // Then nothing matches, because there are no rules
+                expect(getRuleApprovers(createMock<Policy>({type: CONST.POLICY.TYPE.CORPORATE}), expenseReport)).toEqual([]);
             });
-            it('should return the category approver of the first transaction sorted by created if we have many transaction categories match with the category approver rule', async () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.CORPORATE,
-                    employeeList,
-                    rules,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: employeeAccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                const transaction1: Transaction = {
-                    ...createRandomTransaction(0),
-                    category: 'cat1',
-                    created: testDate,
-                    reportID: expenseReport.reportID,
-                };
-                const transaction2: Transaction = {
-                    ...createRandomTransaction(1),
-                    category: 'cat2',
-                    created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
-                    reportID: expenseReport.reportID,
-                };
+
+            it('should put category approvers before tag approvers', async () => {
+                // Given an earlier transaction that only matches a tag rule and a later one that only matches a category rule
+                const tagTransaction: Transaction = {...createRandomTransaction(0), category: '', tag: 'tag1', created: '2025-01-01', reportID: expenseReport.reportID};
+                const categoryTransaction: Transaction = {...createRandomTransaction(1), category: 'cat1', tag: '', created: '2025-01-02', reportID: expenseReport.reportID};
                 const transactionData: TransactionCollectionDataSet = {
-                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
-                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${tagTransaction.transactionID}`]: tagTransaction,
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${categoryTransaction.transactionID}`]: categoryTransaction,
                 };
                 await Onyx.multiSet({...transactionData});
-                expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(categoryApprover2AccountID);
+
+                // When the rule approvers are read
+                // Then the category approver comes first even though its transaction is newer, because category approvers are prioritized
+                expect(getRuleApprovers(policy, expenseReport)).toEqual(['categoryapprover1@test.com', 'tagapprover1@test.com']);
             });
-            it('should return the first rule approver who is not the current submitter', async () => {
-                const policy: Policy = {
-                    ...createRandomPolicy(0),
-                    approver: 'owner@test.com',
-                    owner: 'owner@test.com',
-                    type: CONST.POLICY.TYPE.CORPORATE,
-                    employeeList,
-                    rules,
-                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-                };
-                const expenseReport: Report = {
-                    ...createRandomReport(0, undefined),
-                    ownerAccountID: categoryApprover1AccountID,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-                const transaction1: Transaction = {
-                    ...createRandomTransaction(0),
-                    category: 'cat1',
-                    reportID: expenseReport.reportID,
-                    tag: '',
-                    created: DateUtils.subtractMillisecondsFromDateTime(testDate, 2),
-                };
 
-                const transaction2: Transaction = {
-                    ...createRandomTransaction(1),
-                    category: 'cat3',
-                    reportID: expenseReport.reportID,
-                    tag: '',
-                    created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
+            it('should order approvers of the same kind by transaction created date', async () => {
+                // Given two transactions matching different category rules, where the cat2 transaction is the newer one
+                const newerTransaction: Transaction = {...createRandomTransaction(0), category: 'cat2', tag: '', created: '2025-01-02', reportID: expenseReport.reportID};
+                const olderTransaction: Transaction = {...createRandomTransaction(1), category: 'cat1', tag: '', created: '2025-01-01', reportID: expenseReport.reportID};
+                const transactionData: TransactionCollectionDataSet = {
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${newerTransaction.transactionID}`]: newerTransaction,
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${olderTransaction.transactionID}`]: olderTransaction,
                 };
+                await Onyx.multiSet({...transactionData});
 
-                const transaction3: Transaction = {
-                    ...createRandomTransaction(2),
-                    category: '',
-                    reportID: expenseReport.reportID,
-                    tag: 'tag1',
-                    created: testDate,
-                };
+                // When the rule approvers are read
+                // Then the approver of the older transaction comes first
+                expect(getRuleApprovers(policy, expenseReport)).toEqual(['categoryapprover1@test.com', 'categoryapprover2@test.com']);
+            });
 
+            it('should return each approver only once', async () => {
+                // Given two transactions whose categories (cat1 and cat3) both route to the same approver
+                const transaction1: Transaction = {...createRandomTransaction(0), category: 'cat1', tag: '', created: '2025-01-01', reportID: expenseReport.reportID};
+                const transaction2: Transaction = {...createRandomTransaction(1), category: 'cat3', tag: '', created: '2025-01-02', reportID: expenseReport.reportID};
                 const transactionData: TransactionCollectionDataSet = {
                     [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
                     [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
-                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction3.transactionID}`]: transaction3,
                 };
                 await Onyx.multiSet({...transactionData});
 
-                expect(getSubmitToAccountID(policy, expenseReport, categoryApprover1Email, undefined)).toBe(tagApprover1AccountID);
+                // When the rule approvers are read
+                // Then the shared approver is listed once
+                expect(getRuleApprovers(policy, expenseReport)).toEqual(['categoryapprover1@test.com']);
+            });
+        });
+
+        describe('getSubmitToAccountID', () => {
+            beforeEach(() => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+                Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            });
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
+            });
+            describe('Has no rule approver', () => {
+                it('should return the policy approver/owner if the policy use the basic workflow', () => {
+                    const policy: Policy = {
+                        ...createRandomPolicy(0),
+                        approver: 'owner@test.com',
+                        owner: 'owner@test.com',
+                        type: CONST.POLICY.TYPE.TEAM,
+                        approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+                    };
+                    const expenseReport: Report = {
+                        ...createRandomReport(0, undefined),
+                        ownerAccountID: employeeAccountID,
+                        type: CONST.REPORT.TYPE.EXPENSE,
+                    };
+                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(ownerAccountID);
+                });
+                it('should return the policy approver/owner if the policy use the optional workflow', () => {
+                    const policy: Policy = {
+                        ...createRandomPolicy(0),
+                        approver: 'owner@test.com',
+                        owner: 'owner@test.com',
+                        type: CONST.POLICY.TYPE.TEAM,
+                        approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                    };
+                    const expenseReport: Report = {
+                        ...createRandomReport(0, undefined),
+                        ownerAccountID: employeeAccountID,
+                        type: CONST.REPORT.TYPE.EXPENSE,
+                    };
+                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(ownerAccountID);
+                });
+                it('should return the employee submitsTo if the policy use the advance workflow', () => {
+                    const policy: Policy = {
+                        ...createRandomPolicy(0),
+                        approver: 'owner@test.com',
+                        owner: 'owner@test.com',
+                        employeeList,
+                        type: CONST.POLICY.TYPE.CORPORATE,
+                        approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                    };
+                    const expenseReport: Report = {
+                        ...createRandomReport(0, undefined),
+                        ownerAccountID: employeeAccountID,
+                        type: CONST.REPORT.TYPE.EXPENSE,
+                    };
+                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(adminAccountID);
+                });
             });
-            describe('Has no transaction match with the category approver rule', () => {
-                it('should return the first tag approver if has any transaction tag match with with the tag approver rule ', async () => {
+            describe('Has category/tag approver', () => {
+                it('should return the first category approver if has any transaction category match with category approver rule', async () => {
                     const policy: Policy = {
                         ...createRandomPolicy(0),
                         approver: 'owner@test.com',
@@ -1565,16 +1626,12 @@ describe('PolicyUtils', () => {
                     };
                     const transaction1: Transaction = {
                         ...createRandomTransaction(0),
-                        category: '',
-                        tag: 'tag1',
-                        created: testDate,
+                        category: 'cat1',
                         reportID: expenseReport.reportID,
                     };
                     const transaction2: Transaction = {
                         ...createRandomTransaction(1),
                         category: '',
-                        tag: '',
-                        created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
                         reportID: expenseReport.reportID,
                     };
                     const transactionData: TransactionCollectionDataSet = {
@@ -1582,9 +1639,35 @@ describe('PolicyUtils', () => {
                         [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
                     };
                     await Onyx.multiSet({...transactionData});
-                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(tagApprover1AccountID);
+                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(categoryApprover1AccountID);
+                });
+                it('should return default approver if rule approver is submitter and prevent self approval is enabled', async () => {
+                    const policy: Policy = {
+                        ...createRandomPolicy(0),
+                        approver: 'owner@test.com',
+                        owner: 'owner@test.com',
+                        type: CONST.POLICY.TYPE.CORPORATE,
+                        employeeList,
+                        rules,
+                        preventSelfApproval: true,
+                        approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                    };
+                    const expenseReport: Report = {
+                        ...createRandomReport(0, undefined),
+                        ownerAccountID: categoryApprover1AccountID,
+                        type: CONST.REPORT.TYPE.EXPENSE,
+                    };
+                    const transaction: Transaction = {
+                        ...createRandomTransaction(0),
+                        category: 'cat1',
+                        reportID: expenseReport.reportID,
+                        tag: '',
+                    };
+
+                    await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction);
+                    expect(getSubmitToAccountID(policy, expenseReport, categoryApprover1Email, undefined)).toBe(adminAccountID);
                 });
-                it('should return the tag approver of the first transaction sorted by created if we have many transaction tags match with the tag approver rule', async () => {
+                it('should return the category approver of the first transaction sorted by created if we have many transaction categories match with the category approver rule', async () => {
                     const policy: Policy = {
                         ...createRandomPolicy(0),
                         approver: 'owner@test.com',
@@ -1601,15 +1684,13 @@ describe('PolicyUtils', () => {
                     };
                     const transaction1: Transaction = {
                         ...createRandomTransaction(0),
-                        category: '',
-                        tag: 'tag1',
+                        category: 'cat1',
                         created: testDate,
                         reportID: expenseReport.reportID,
                     };
                     const transaction2: Transaction = {
                         ...createRandomTransaction(1),
-                        category: '',
-                        tag: 'tag2',
+                        category: 'cat2',
                         created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
                         reportID: expenseReport.reportID,
                     };
@@ -1618,499 +1699,577 @@ describe('PolicyUtils', () => {
                         [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
                     };
                     await Onyx.multiSet({...transactionData});
-                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(tagApprover2AccountID);
+                    expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(categoryApprover2AccountID);
                 });
-            });
-        });
-    });
-    describe('getSubmitReportManagerAccountID', () => {
-        beforeEach(() => {
-            wrapOnyxWithWaitForBatchedUpdates(Onyx);
-            Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-        });
-        afterEach(async () => {
-            await Onyx.clear();
-            await waitForBatchedUpdatesWithAct();
-        });
-        it('should return undefined for an advanced policy where the submitter is missing from the employee list, even if the report has a valid managerID', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                approver: 'owner@test.com',
-                owner: 'owner@test.com',
-                // The submitter isn't in the employee list, which is the case for reports migrated from Expensify Classic.
-                employeeList: {},
-                type: CONST.POLICY.TYPE.CORPORATE,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const expenseReport: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-                // The stale Classic-era manager stamped on the migrated report.
-                managerID: categoryApprover1AccountID,
-                type: CONST.REPORT.TYPE.EXPENSE,
-            };
-            expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBeUndefined();
-        });
-        it('should return the known approver accountID when the policy route is reliable', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                approver: 'owner@test.com',
-                owner: 'owner@test.com',
-                employeeList,
-                type: CONST.POLICY.TYPE.CORPORATE,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const expenseReport: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-                managerID: categoryApprover1AccountID,
-                type: CONST.REPORT.TYPE.EXPENSE,
-            };
-            expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(adminAccountID);
+                it('should return the first rule approver who is not the current submitter', async () => {
+                    const policy: Policy = {
+                        ...createRandomPolicy(0),
+                        approver: 'owner@test.com',
+                        owner: 'owner@test.com',
+                        type: CONST.POLICY.TYPE.CORPORATE,
+                        employeeList,
+                        rules,
+                        approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                    };
+                    const expenseReport: Report = {
+                        ...createRandomReport(0, undefined),
+                        ownerAccountID: categoryApprover1AccountID,
+                        type: CONST.REPORT.TYPE.EXPENSE,
+                    };
+                    const transaction1: Transaction = {
+                        ...createRandomTransaction(0),
+                        category: 'cat1',
+                        reportID: expenseReport.reportID,
+                        tag: '',
+                        created: DateUtils.subtractMillisecondsFromDateTime(testDate, 2),
+                    };
+
+                    const transaction2: Transaction = {
+                        ...createRandomTransaction(1),
+                        category: 'cat3',
+                        reportID: expenseReport.reportID,
+                        tag: '',
+                        created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
+                    };
+
+                    const transaction3: Transaction = {
+                        ...createRandomTransaction(2),
+                        category: '',
+                        reportID: expenseReport.reportID,
+                        tag: 'tag1',
+                        created: testDate,
+                    };
+
+                    const transactionData: TransactionCollectionDataSet = {
+                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
+                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
+                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction3.transactionID}`]: transaction3,
+                    };
+                    await Onyx.multiSet({...transactionData});
+
+                    expect(getSubmitToAccountID(policy, expenseReport, categoryApprover1Email, undefined)).toBe(tagApprover1AccountID);
+                });
+                describe('Has no transaction match with the category approver rule', () => {
+                    it('should return the first tag approver if has any transaction tag match with with the tag approver rule ', async () => {
+                        const policy: Policy = {
+                            ...createRandomPolicy(0),
+                            approver: 'owner@test.com',
+                            owner: 'owner@test.com',
+                            type: CONST.POLICY.TYPE.CORPORATE,
+                            employeeList,
+                            rules,
+                            approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                        };
+                        const expenseReport: Report = {
+                            ...createRandomReport(0, undefined),
+                            ownerAccountID: employeeAccountID,
+                            type: CONST.REPORT.TYPE.EXPENSE,
+                        };
+                        const transaction1: Transaction = {
+                            ...createRandomTransaction(0),
+                            category: '',
+                            tag: 'tag1',
+                            created: testDate,
+                            reportID: expenseReport.reportID,
+                        };
+                        const transaction2: Transaction = {
+                            ...createRandomTransaction(1),
+                            category: '',
+                            tag: '',
+                            created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
+                            reportID: expenseReport.reportID,
+                        };
+                        const transactionData: TransactionCollectionDataSet = {
+                            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
+                            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
+                        };
+                        await Onyx.multiSet({...transactionData});
+                        expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(tagApprover1AccountID);
+                    });
+                    it('should return the tag approver of the first transaction sorted by created if we have many transaction tags match with the tag approver rule', async () => {
+                        const policy: Policy = {
+                            ...createRandomPolicy(0),
+                            approver: 'owner@test.com',
+                            owner: 'owner@test.com',
+                            type: CONST.POLICY.TYPE.CORPORATE,
+                            employeeList,
+                            rules,
+                            approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                        };
+                        const expenseReport: Report = {
+                            ...createRandomReport(0, undefined),
+                            ownerAccountID: employeeAccountID,
+                            type: CONST.REPORT.TYPE.EXPENSE,
+                        };
+                        const transaction1: Transaction = {
+                            ...createRandomTransaction(0),
+                            category: '',
+                            tag: 'tag1',
+                            created: testDate,
+                            reportID: expenseReport.reportID,
+                        };
+                        const transaction2: Transaction = {
+                            ...createRandomTransaction(1),
+                            category: '',
+                            tag: 'tag2',
+                            created: DateUtils.subtractMillisecondsFromDateTime(testDate, 1),
+                            reportID: expenseReport.reportID,
+                        };
+                        const transactionData: TransactionCollectionDataSet = {
+                            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
+                            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
+                        };
+                        await Onyx.multiSet({...transactionData});
+                        expect(getSubmitToAccountID(policy, expenseReport, employeeEmail, undefined)).toBe(tagApprover2AccountID);
+                    });
+                });
+            });
         });
-        it('should return undefined instead of a generated accountID when the approver is missing from personal details', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                approver: 'owner@test.com',
-                owner: 'owner@test.com',
-                employeeList: {
-                    [employeeEmail]: {
-                        email: employeeEmail,
-                        role: 'user',
-                        submitsTo: 'unknown@test.com',
-                    },
-                    // The approver is still a policy member, so the submit-to route stays put instead of falling back to the default approver.
-                    'unknown@test.com': {
-                        email: 'unknown@test.com',
-                        role: 'user',
+        describe('getSubmitReportManagerAccountID', () => {
+            beforeEach(() => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+                Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            });
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
+            });
+            it('should return undefined for an advanced policy where the submitter is missing from the employee list, even if the report has a valid managerID', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    approver: 'owner@test.com',
+                    owner: 'owner@test.com',
+                    // The submitter isn't in the employee list, which is the case for reports migrated from Expensify Classic.
+                    employeeList: {},
+                    type: CONST.POLICY.TYPE.CORPORATE,
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const expenseReport: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                    // The stale Classic-era manager stamped on the migrated report.
+                    managerID: categoryApprover1AccountID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+                expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBeUndefined();
+            });
+            it('should return the known approver accountID when the policy route is reliable', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    approver: 'owner@test.com',
+                    owner: 'owner@test.com',
+                    employeeList,
+                    type: CONST.POLICY.TYPE.CORPORATE,
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const expenseReport: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                    managerID: categoryApprover1AccountID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+                expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(adminAccountID);
+            });
+            it('should return undefined instead of a generated accountID when the approver is missing from personal details', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    approver: 'owner@test.com',
+                    owner: 'owner@test.com',
+                    employeeList: {
+                        [employeeEmail]: {
+                            email: employeeEmail,
+                            role: 'user',
+                            submitsTo: 'unknown@test.com',
+                        },
+                        // The approver is still a policy member, so the submit-to route stays put instead of falling back to the default approver.
+                        'unknown@test.com': {
+                            email: 'unknown@test.com',
+                            role: 'user',
+                        },
                     },
-                },
-                type: CONST.POLICY.TYPE.CORPORATE,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const expenseReport: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-                managerID: categoryApprover1AccountID,
-                type: CONST.REPORT.TYPE.EXPENSE,
-            };
-            expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBeUndefined();
-        });
-    });
-    describe('shouldShowPolicy', () => {
-        beforeEach(() => {
-            global.fetch = TestHelper.getGlobalFetchMock();
-            return Onyx.clear().then(waitForBatchedUpdates);
-        });
-        it('should return false', () => {
-            // Given an archived paid policy.
-            const policy = {
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
-                role: '',
-            };
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The empty role deliberately models malformed persisted policy data.
-            const result = shouldShowPolicy(policy as unknown as Parameters<typeof shouldShowPolicy>[0], false, CARLOS_EMAIL);
-            // The result should be false since it is an archived paid policy.
-            expect(result).toBe(false);
-        });
-        it('should return true', () => {
-            // Given a paid policy.
-            const policy = createMock<OnyxEntry<Policy>>({...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null});
-            const result = shouldShowPolicy(policy, false, CARLOS_EMAIL);
-            // The result should be true, since it is an active paid policy.
-            expect(result).toBe(true);
-        });
-        it('should return false', () => {
-            // Given a control workspace which is pending delete.
-            const policy = createMock<OnyxEntry<Policy>>({
-                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    type: CONST.POLICY.TYPE.CORPORATE,
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const expenseReport: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                    managerID: categoryApprover1AccountID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+                expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBeUndefined();
             });
-            const result = shouldShowPolicy(policy, false, CARLOS_EMAIL);
-            // The result should be false since it is a policy which is pending deletion.
-            expect(result).toEqual(false);
-        });
-        it('hides an archived policy by default', () => {
-            const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null, archivedDate: '2024-01-01'};
-            const result = shouldShowPolicy(policy as OnyxEntry<Policy>, false, CARLOS_EMAIL);
-            expect(result).toBe(false);
         });
-        it('shows an archived policy when includeArchivedPolicy is true', () => {
-            const policy = {...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE), pendingAction: null, archivedDate: '2024-01-01'};
-            const result = shouldShowPolicy(policy as OnyxEntry<Policy>, false, CARLOS_EMAIL, true);
-            expect(result).toBe(true);
-        });
-    });
 
-    describe('getManagerAccountID', () => {
-        beforeEach(() => {
-            wrapOnyxWithWaitForBatchedUpdates(Onyx);
-            Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-        });
-        afterEach(async () => {
-            await Onyx.clear();
-            await waitForBatchedUpdatesWithAct();
-        });
+        describe('getManagerAccountID', () => {
+            beforeEach(() => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+                Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            });
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
+            });
 
-        it('should return default approver for personal workspaces', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                type: CONST.POLICY.TYPE.PERSONAL,
-                approver: categoryApprover1Email,
-            };
-            const result = getManagerAccountID(policy, '', undefined);
+            it('should return default approver for personal workspaces', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    type: CONST.POLICY.TYPE.PERSONAL,
+                    approver: categoryApprover1Email,
+                };
+                const result = getManagerAccountID(policy, '', undefined);
 
-            expect(result).toBe(categoryApprover1AccountID);
-        });
+                expect(result).toBe(categoryApprover1AccountID);
+            });
 
-        it('should return -1 if there is no employee or default approver', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                type: CONST.POLICY.TYPE.TEAM,
-                approvalMode: undefined,
-                approver: undefined,
-                owner: '',
-            };
+            it('should return -1 if there is no employee or default approver', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    type: CONST.POLICY.TYPE.TEAM,
+                    approvalMode: undefined,
+                    approver: undefined,
+                    owner: '',
+                };
 
-            const result = getManagerAccountID(policy, '', undefined);
+                const result = getManagerAccountID(policy, '', undefined);
 
-            expect(result).toBe(-1);
-        });
+                expect(result).toBe(-1);
+            });
 
-        it('should return submitsTo account ID', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                type: CONST.POLICY.TYPE.TEAM,
-                approvalMode: undefined,
-                employeeList: {
-                    [employeeEmail]: {
-                        email: employeeEmail,
-                        submitsTo: adminEmail,
+            it('should return submitsTo account ID', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    type: CONST.POLICY.TYPE.TEAM,
+                    approvalMode: undefined,
+                    employeeList: {
+                        [employeeEmail]: {
+                            email: employeeEmail,
+                            submitsTo: adminEmail,
+                        },
                     },
-                },
-            };
+                };
 
-            const result = getManagerAccountID(policy, employeeEmail, undefined);
+                const result = getManagerAccountID(policy, employeeEmail, undefined);
 
-            expect(result).toBe(adminAccountID);
-        });
+                expect(result).toBe(adminAccountID);
+            });
 
-        it('should return submitsTo email from workspace approval config', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                type: CONST.POLICY.TYPE.TEAM,
-                approvalMode: undefined,
-                employeeList: {
-                    [adminEmail]: {
-                        email: adminEmail,
-                    },
-                    [employeeEmail]: {
-                        email: employeeEmail,
-                        submitsTo: adminEmail,
+            it('should return submitsTo email from workspace approval config', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    type: CONST.POLICY.TYPE.TEAM,
+                    approvalMode: undefined,
+                    employeeList: {
+                        [adminEmail]: {
+                            email: adminEmail,
+                        },
+                        [employeeEmail]: {
+                            email: employeeEmail,
+                            submitsTo: adminEmail,
+                        },
                     },
-                },
-            };
-            const report: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-            };
+                };
+                const report: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                };
 
-            expect(getSubmitToEmail(policy, report, employeeEmail, undefined)).toBe(adminEmail);
-        });
+                expect(getSubmitToEmail(policy, report, employeeEmail, undefined)).toBe(adminEmail);
+            });
 
-        it('should return the default approver', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                type: CONST.POLICY.TYPE.TEAM,
-                approvalMode: undefined,
-                approver: categoryApprover1Email,
-            };
+            it('should return the default approver', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    type: CONST.POLICY.TYPE.TEAM,
+                    approvalMode: undefined,
+                    approver: categoryApprover1Email,
+                };
 
-            const result = getManagerAccountID(policy, '', undefined);
+                const result = getManagerAccountID(policy, '', undefined);
 
-            expect(result).toBe(categoryApprover1AccountID);
+                expect(result).toBe(categoryApprover1AccountID);
+            });
         });
-    });
 
-    describe('approval workflow rules', () => {
-        const policyID = 'RULES_POLICY_1';
-        const submitFilter = {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [employeeEmail]};
+        describe('approval workflow rules', () => {
+            const policyID = 'RULES_POLICY_1';
+            const submitFilter = {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [employeeEmail]};
 
-        const buildRule = (rule: ApprovalWorkflowRule): Rule => ({...rule, scope: CONST.RULES.SCOPE.POLICY, scopeID: policyID});
+            const buildRule = (rule: ApprovalWorkflowRule): Rule => ({...rule, scope: CONST.RULES.SCOPE.POLICY, scopeID: policyID});
 
-        const submitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
-            filters: submitFilter,
-            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
-        };
+            const submitRule: ApprovalWorkflowRule = {
+                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
+                filters: submitFilter,
+                actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
+            };
 
-        // After the admin approves, an under-limit report continues to the approver and an over-limit one is
-        // escalated to the category approver instead.
-        const underLimitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
-            filters: {
-                operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
-                left: submitFilter,
-                right: {
+            // After the admin approves, an under-limit report continues to the approver and an over-limit one is
+            // escalated to the category approver instead.
+            const underLimitRule: ApprovalWorkflowRule = {
+                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
+                filters: {
                     operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
-                    left: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: adminEmail},
-                    right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
+                    left: submitFilter,
+                    right: {
+                        operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
+                        left: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: adminEmail},
+                        right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
+                    },
                 },
-            },
-            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: approverEmail}},
-        };
-        const overLimitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
-            filters: {
-                operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
-                left: submitFilter,
-                right: {
+                actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: approverEmail}},
+            };
+            const overLimitRule: ApprovalWorkflowRule = {
+                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
+                filters: {
                     operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
-                    left: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: adminEmail},
-                    right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
+                    left: submitFilter,
+                    right: {
+                        operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
+                        left: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: adminEmail},
+                        right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
+                    },
                 },
-            },
-            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: categoryApprover1Email}},
-        };
-        const terminalRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
-            filters: {
-                operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
-                left: submitFilter,
-                right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: approverEmail},
-            },
-            actions: {'1': {name: CONST.RULES.ACTIONS.APPROVE_REPORT}},
-        };
-
-        // A workspace whose employeeList still points somewhere else, so a rule-driven answer is distinguishable
-        // from the legacy fallback.
-        const policy: Policy = {
-            ...createRandomPolicy(0),
-            id: policyID,
-            type: CONST.POLICY.TYPE.CORPORATE,
-            approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            approver: categoryApprover1Email,
-            employeeList: {
-                [employeeEmail]: {email: employeeEmail, submitsTo: categoryApprover1Email},
-            },
-        };
-
-        const rulesCollection: OnyxCollection<Rule> = {
-            [`${ONYXKEYS.COLLECTION.RULE}1`]: buildRule(submitRule),
-            [`${ONYXKEYS.COLLECTION.RULE}2`]: buildRule(underLimitRule),
-            [`${ONYXKEYS.COLLECTION.RULE}3`]: buildRule(overLimitRule),
-            [`${ONYXKEYS.COLLECTION.RULE}4`]: buildRule(terminalRule),
-        };
-
-        beforeEach(async () => {
-            wrapOnyxWithWaitForBatchedUpdates(Onyx);
-            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}1` as const, buildRule(submitRule));
-            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}2` as const, buildRule(underLimitRule));
-            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}3` as const, buildRule(overLimitRule));
-            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}4` as const, buildRule(terminalRule));
-            await waitForBatchedUpdatesWithAct();
-        });
-        afterEach(async () => {
-            await Onyx.clear();
-            await waitForBatchedUpdatesWithAct();
-        });
+                actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: categoryApprover1Email}},
+            };
+            const terminalRule: ApprovalWorkflowRule = {
+                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
+                filters: {
+                    operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
+                    left: submitFilter,
+                    right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: approverEmail},
+                },
+                actions: {'1': {name: CONST.RULES.ACTIONS.APPROVE_REPORT}},
+            };
 
-        describe('evaluateApprovalWorkflowRule', () => {
-            it('matches the submit rule for a submitter it covers', () => {
-                expect(evaluateApprovalWorkflowRule(submitRule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(true);
-            });
+            // A workspace whose employeeList still points somewhere else, so a rule-driven answer is distinguishable
+            // from the legacy fallback.
+            const policy: Policy = {
+                ...createRandomPolicy(0),
+                id: policyID,
+                type: CONST.POLICY.TYPE.CORPORATE,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                approver: categoryApprover1Email,
+                employeeList: {
+                    [employeeEmail]: {email: employeeEmail, submitsTo: categoryApprover1Email},
+                },
+            };
 
-            it('does not match the submit rule for another submitter', () => {
-                expect(evaluateApprovalWorkflowRule(submitRule, {submitterEmail: adminEmail, reportTotal: 0})).toBe(false);
-            });
+            const rulesCollection: OnyxCollection<Rule> = {
+                [`${ONYXKEYS.COLLECTION.RULE}1`]: buildRule(submitRule),
+                [`${ONYXKEYS.COLLECTION.RULE}2`]: buildRule(underLimitRule),
+                [`${ONYXKEYS.COLLECTION.RULE}3`]: buildRule(overLimitRule),
+                [`${ONYXKEYS.COLLECTION.RULE}4`]: buildRule(terminalRule),
+            };
 
-            it('does not match a rule gated on the current approver when the report has none', () => {
-                expect(evaluateApprovalWorkflowRule(underLimitRule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
+            beforeEach(async () => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+                await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}1` as const, buildRule(submitRule));
+                await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}2` as const, buildRule(underLimitRule));
+                await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}3` as const, buildRule(overLimitRule));
+                await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}4` as const, buildRule(terminalRule));
+                await waitForBatchedUpdatesWithAct();
             });
-
-            it('splits on the report total, comparing the absolute amount', () => {
-                const context = {submitterEmail: employeeEmail, currentApproverEmail: adminEmail};
-                expect(evaluateApprovalWorkflowRule(underLimitRule, {...context, reportTotal: -5000})).toBe(true);
-                expect(evaluateApprovalWorkflowRule(overLimitRule, {...context, reportTotal: -5000})).toBe(false);
-                expect(evaluateApprovalWorkflowRule(underLimitRule, {...context, reportTotal: -20000})).toBe(false);
-                expect(evaluateApprovalWorkflowRule(overLimitRule, {...context, reportTotal: -20000})).toBe(true);
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
             });
 
-            const buildAmountRule = (operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, right: number): ApprovalWorkflowRule => ({
-                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
-                filters: {operator, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right},
-                actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
-            });
+            describe('evaluateApprovalWorkflowRule', () => {
+                it('matches the submit rule for a submitter it covers', () => {
+                    expect(evaluateApprovalWorkflowRule(submitRule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(true);
+                });
 
-            it.each([
-                ['eq matches an exact amount', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 5000, -5000, true],
-                ['eq rejects a different amount', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 5000, -6000, false],
-                ['neq rejects an exact amount', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, 5000, -5000, false],
-                ['neq matches a different amount', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, 5000, -6000, true],
-                ['gt rejects an equal amount', CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN, 5000, -5000, false],
-                ['gt matches a strictly greater amount', CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN, 5000, -5001, true],
-                ['lte matches an equal amount', CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO, 5000, -5000, true],
-                ['lte rejects a greater amount', CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO, 5000, -5001, false],
-            ])('%s', (_description, operator, right, reportTotal, expected) => {
-                expect(evaluateApprovalWorkflowRule(buildAmountRule(operator, right), {submitterEmail: employeeEmail, reportTotal})).toBe(expected);
-            });
+                it('does not match the submit rule for another submitter', () => {
+                    expect(evaluateApprovalWorkflowRule(submitRule, {submitterEmail: adminEmail, reportTotal: 0})).toBe(false);
+                });
 
-            it('does not match an amount filter whose right side is not numeric', () => {
-                const rule = buildAmountRule(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, Number('not-a-number'));
-                expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
-            });
+                it('does not match a rule gated on the current approver when the report has none', () => {
+                    expect(evaluateApprovalWorkflowRule(underLimitRule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
+                });
 
-            it('does not match an amount filter using an operator this client does not understand', () => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The unrecognized operator is the scenario under test (a future backend operator this client predates).
-                const rule = buildAmountRule('unsupportedOperator' as ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, 5000);
-                expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
-            });
+                it('splits on the report total, comparing the absolute amount', () => {
+                    const context = {submitterEmail: employeeEmail, currentApproverEmail: adminEmail};
+                    expect(evaluateApprovalWorkflowRule(underLimitRule, {...context, reportTotal: -5000})).toBe(true);
+                    expect(evaluateApprovalWorkflowRule(overLimitRule, {...context, reportTotal: -5000})).toBe(false);
+                    expect(evaluateApprovalWorkflowRule(underLimitRule, {...context, reportTotal: -20000})).toBe(false);
+                    expect(evaluateApprovalWorkflowRule(overLimitRule, {...context, reportTotal: -20000})).toBe(true);
+                });
 
-            it('does not match a filter on a field this client does not understand', () => {
-                const rule: ApprovalWorkflowRule = {
+                const buildAmountRule = (operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, right: number): ApprovalWorkflowRule => ({
                     triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
-                    filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: 'unsupportedField', right: employeeEmail},
+                    filters: {operator, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right},
                     actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
-                };
-                expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(false);
-            });
+                });
 
-            it('matches an OR filter when either side matches', () => {
-                const rule: ApprovalWorkflowRule = {
-                    triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
-                    filters: {
-                        operator: CONST.SEARCH.SYNTAX_OPERATORS.OR,
-                        left: submitFilter,
-                        right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [adminEmail]},
-                    },
-                    actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
-                };
+                it.each([
+                    ['eq matches an exact amount', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 5000, -5000, true],
+                    ['eq rejects a different amount', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 5000, -6000, false],
+                    ['neq rejects an exact amount', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, 5000, -5000, false],
+                    ['neq matches a different amount', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, 5000, -6000, true],
+                    ['gt rejects an equal amount', CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN, 5000, -5000, false],
+                    ['gt matches a strictly greater amount', CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN, 5000, -5001, true],
+                    ['lte matches an equal amount', CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO, 5000, -5000, true],
+                    ['lte rejects a greater amount', CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO, 5000, -5001, false],
+                ])('%s', (_description, operator, right, reportTotal, expected) => {
+                    expect(evaluateApprovalWorkflowRule(buildAmountRule(operator, right), {submitterEmail: employeeEmail, reportTotal})).toBe(expected);
+                });
 
-                // Only the left side matches this submitter, but OR only needs one side.
-                expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(true);
-                // Neither side names this submitter.
-                expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: guideEmail, reportTotal: 0})).toBe(false);
-            });
-        });
+                it('does not match an amount filter whose right side is not numeric', () => {
+                    const rule = buildAmountRule(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, Number('not-a-number'));
+                    expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
+                });
 
-        describe('getForwardsToFromRules', () => {
-            it('returns the first approver from the submit rule', () => {
-                expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, reportTotal: -5000}, rulesCollection)).toEqual({forwardsTo: adminEmail});
-            });
+                it('does not match an amount filter using an operator this client does not understand', () => {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The unrecognized operator is the scenario under test (a future backend operator this client predates).
+                    const rule = buildAmountRule('unsupportedOperator' as ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, 5000);
+                    expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: -5000})).toBe(false);
+                });
 
-            it('returns the next approver from the matching approve rule', () => {
-                expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: adminEmail, reportTotal: -5000}, rulesCollection)).toEqual({
-                    forwardsTo: approverEmail,
+                it('does not match a filter on a field this client does not understand', () => {
+                    const rule: ApprovalWorkflowRule = {
+                        triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
+                        filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: 'unsupportedField', right: employeeEmail},
+                        actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
+                    };
+                    expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(false);
                 });
-                expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: adminEmail, reportTotal: -20000}, rulesCollection)).toEqual({
-                    forwardsTo: categoryApprover1Email,
+
+                it('matches an OR filter when either side matches', () => {
+                    const rule: ApprovalWorkflowRule = {
+                        triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
+                        filters: {
+                            operator: CONST.SEARCH.SYNTAX_OPERATORS.OR,
+                            left: submitFilter,
+                            right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [adminEmail]},
+                        },
+                        actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
+                    };
+
+                    // Only the left side matches this submitter, but OR only needs one side.
+                    expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(true);
+                    // Neither side names this submitter.
+                    expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: guideEmail, reportTotal: 0})).toBe(false);
                 });
             });
 
-            it('matches with no forwardsTo when the rule finalizes the report', () => {
-                expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: approverEmail, reportTotal: -5000}, rulesCollection)).toEqual({
-                    forwardsTo: undefined,
+            describe('getForwardsToFromRules', () => {
+                it('returns the first approver from the submit rule', () => {
+                    expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, reportTotal: -5000}, rulesCollection)).toEqual({forwardsTo: adminEmail});
                 });
-            });
 
-            it('returns undefined when no rule covers the submitter', () => {
-                expect(getForwardsToFromRules(policy, {submitterEmail: guideEmail, reportTotal: -5000}, rulesCollection)).toBeUndefined();
-            });
+                it('returns the next approver from the matching approve rule', () => {
+                    expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: adminEmail, reportTotal: -5000}, rulesCollection)).toEqual({
+                        forwardsTo: approverEmail,
+                    });
+                    expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: adminEmail, reportTotal: -20000}, rulesCollection)).toEqual({
+                        forwardsTo: categoryApprover1Email,
+                    });
+                });
+
+                it('matches with no forwardsTo when the rule finalizes the report', () => {
+                    expect(getForwardsToFromRules(policy, {submitterEmail: employeeEmail, currentApproverEmail: approverEmail, reportTotal: -5000}, rulesCollection)).toEqual({
+                        forwardsTo: undefined,
+                    });
+                });
+
+                it('returns undefined when no rule covers the submitter', () => {
+                    expect(getForwardsToFromRules(policy, {submitterEmail: guideEmail, reportTotal: -5000}, rulesCollection)).toBeUndefined();
+                });
 
-            it('ignores rules belonging to another workspace', () => {
-                expect(getForwardsToFromRules({...policy, id: 'OTHER_POLICY'}, {submitterEmail: employeeEmail, reportTotal: -5000}, rulesCollection)).toBeUndefined();
+                it('ignores rules belonging to another workspace', () => {
+                    expect(getForwardsToFromRules({...policy, id: 'OTHER_POLICY'}, {submitterEmail: employeeEmail, reportTotal: -5000}, rulesCollection)).toBeUndefined();
+                });
             });
-        });
 
-        it('getManagerAccountID prefers the rules over the employee submitsTo', () => {
-            expect(getManagerAccountID(policy, employeeEmail, rulesCollection)).toBe(adminAccountID);
-        });
+            it('getManagerAccountID prefers the rules over the employee submitsTo', () => {
+                expect(getManagerAccountID(policy, employeeEmail, rulesCollection)).toBe(adminAccountID);
+            });
 
-        it('getForwardsToAccount follows the rules for the next hop', () => {
-            expect(getForwardsToAccount(policy, adminEmail, -5000, rulesCollection, employeeEmail)).toBe(approverEmail);
-            expect(getForwardsToAccount(policy, adminEmail, -20000, rulesCollection, employeeEmail)).toBe(categoryApprover1Email);
-            expect(getForwardsToAccount(policy, approverEmail, -5000, rulesCollection, employeeEmail)).toBe('');
-        });
+            it('getForwardsToAccount follows the rules for the next hop', () => {
+                expect(getForwardsToAccount(policy, adminEmail, -5000, rulesCollection, employeeEmail)).toBe(approverEmail);
+                expect(getForwardsToAccount(policy, adminEmail, -20000, rulesCollection, employeeEmail)).toBe(categoryApprover1Email);
+                expect(getForwardsToAccount(policy, approverEmail, -5000, rulesCollection, employeeEmail)).toBe('');
+            });
 
-        it('getApprovalChain walks the whole rule chain', () => {
-            const report: Report = {...createRandomReport(0, undefined), policyID, ownerAccountID: employeeAccountID, total: -5000};
-            expect(getApprovalChain(policy, report, employeeEmail, rulesCollection)).toEqual([adminEmail, approverEmail]);
-        });
+            it('getApprovalChain walks the whole rule chain', () => {
+                const report: Report = {...createRandomReport(0, undefined), policyID, ownerAccountID: employeeAccountID, total: -5000};
+                expect(getApprovalChain(policy, report, employeeEmail, rulesCollection)).toEqual([adminEmail, approverEmail]);
+            });
 
-        it('getSubmitToEmail keeps the rules approver when that approver has no employeeList entry', () => {
-            const report: Report = {...createRandomReport(0, undefined), policyID, ownerAccountID: employeeAccountID, total: -5000};
-            expect(getSubmitToEmail(policy, report, employeeEmail, rulesCollection, true)).toBe(adminEmail);
+            it('getSubmitToEmail keeps the rules approver when that approver has no employeeList entry', () => {
+                const report: Report = {...createRandomReport(0, undefined), policyID, ownerAccountID: employeeAccountID, total: -5000};
+                expect(getSubmitToEmail(policy, report, employeeEmail, rulesCollection, true)).toBe(adminEmail);
+            });
         });
-    });
 
-    describe('getSubmitReportManagerAccountID', () => {
-        beforeEach(() => {
-            wrapOnyxWithWaitForBatchedUpdates(Onyx);
-            Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
-        });
-        afterEach(async () => {
-            await Onyx.clear();
-            await waitForBatchedUpdatesWithAct();
-        });
-        it('should return the default approver if the employee submitsTo is no longer a policy member and the policy use the advance workflow', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                approver: 'owner@test.com',
-                owner: 'owner@test.com',
-                employeeList: {
-                    'owner@test.com': {
-                        email: 'owner@test.com',
-                        role: 'admin',
-                        submitsTo: '',
-                    },
-                    [employeeEmail]: {
-                        email: employeeEmail,
-                        role: 'user',
-                        submitsTo: 'removed-approver@test.com',
-                    },
-                },
-                type: CONST.POLICY.TYPE.CORPORATE,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const expenseReport: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-                type: CONST.REPORT.TYPE.EXPENSE,
-            };
-            expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(ownerAccountID);
-        });
-        it('should keep the submitsTo approver that is not a policy member when the policy uses HR advanced (manager) mode', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                approver: 'owner@test.com',
-                owner: 'owner@test.com',
-                employeeList: {
-                    'owner@test.com': {
-                        email: 'owner@test.com',
-                        role: 'admin',
-                        submitsTo: '',
-                    },
-                    [employeeEmail]: {
-                        email: employeeEmail,
-                        role: 'user',
-                        submitsTo: adminEmail,
+        describe('getSubmitReportManagerAccountID', () => {
+            beforeEach(() => {
+                wrapOnyxWithWaitForBatchedUpdates(Onyx);
+                Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            });
+            afterEach(async () => {
+                await Onyx.clear();
+                await waitForBatchedUpdatesWithAct();
+            });
+            it('should return the default approver if the employee submitsTo is no longer a policy member and the policy use the advance workflow', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    approver: 'owner@test.com',
+                    owner: 'owner@test.com',
+                    employeeList: {
+                        'owner@test.com': {
+                            email: 'owner@test.com',
+                            role: 'admin',
+                            submitsTo: '',
+                        },
+                        [employeeEmail]: {
+                            email: employeeEmail,
+                            role: 'user',
+                            submitsTo: 'removed-approver@test.com',
+                        },
                     },
-                },
-                connections: {
-                    [CONST.POLICY.CONNECTIONS.NAME.GUSTO]: {
-                        config: {approvalMode: CONST.GUSTO.APPROVAL_MODE.MANAGER, finalApprover: 'owner@test.com'},
+                    type: CONST.POLICY.TYPE.CORPORATE,
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const expenseReport: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+                expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(ownerAccountID);
+            });
+            it('should keep the submitsTo approver that is not a policy member when the policy uses HR advanced (manager) mode', () => {
+                const policy: Policy = {
+                    ...createRandomPolicy(0),
+                    approver: 'owner@test.com',
+                    owner: 'owner@test.com',
+                    employeeList: {
+                        'owner@test.com': {
+                            email: 'owner@test.com',
+                            role: 'admin',
+                            submitsTo: '',
+                        },
+                        [employeeEmail]: {
+                            email: employeeEmail,
+                            role: 'user',
+                            submitsTo: adminEmail,
+                        },
                     },
-                } as Policy['connections'],
-                type: CONST.POLICY.TYPE.CORPORATE,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
-            };
-            const expenseReport: Report = {
-                ...createRandomReport(0, undefined),
-                ownerAccountID: employeeAccountID,
-                type: CONST.REPORT.TYPE.EXPENSE,
-            };
-            expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(adminAccountID);
+                    connections: {
+                        [CONST.POLICY.CONNECTIONS.NAME.GUSTO]: {
+                            config: {approvalMode: CONST.GUSTO.APPROVAL_MODE.MANAGER, finalApprover: 'owner@test.com'},
+                        },
+                    } as Policy['connections'],
+                    type: CONST.POLICY.TYPE.CORPORATE,
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                };
+                const expenseReport: Report = {
+                    ...createRandomReport(0, undefined),
+                    ownerAccountID: employeeAccountID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+                expect(getSubmitReportManagerAccountID(policy, expenseReport, employeeEmail, undefined, personalDetailsByLogins)).toBe(adminAccountID);
+            });
         });
     });
 
@@ -2998,270 +3157,272 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('getReimburserEmail', () => {
-        it('should return undefined when reimbursement is disabled', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
-                reimburser: 'reimburser@example.com',
-                achAccount: {reimburser: 'ach@example.com'},
-                owner: 'owner@example.com',
+    describe('payments', () => {
+        describe('getReimburserEmail', () => {
+            it('should return undefined when reimbursement is disabled', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+                    reimburser: 'reimburser@example.com',
+                    achAccount: {reimburser: 'ach@example.com'},
+                    owner: 'owner@example.com',
+                });
+                expect(getReimburserEmail(policy)).toBeUndefined();
             });
-            expect(getReimburserEmail(policy)).toBeUndefined();
-        });
 
-        it('should resolve the payer for manual (indirect) reimbursement from achAccount.reimburser', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                achAccount: {reimburser: 'ach@example.com'},
-                owner: 'owner@example.com',
+            it('should resolve the payer for manual (indirect) reimbursement from achAccount.reimburser', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    achAccount: {reimburser: 'ach@example.com'},
+                    owner: 'owner@example.com',
+                });
+                expect(getReimburserEmail(policy)).toBe('ach@example.com');
             });
-            expect(getReimburserEmail(policy)).toBe('ach@example.com');
-        });
 
-        it('should prefer policy.reimburser over achAccount.reimburser', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
-                reimburser: 'reimburser@example.com',
-                achAccount: {reimburser: 'ach@example.com'},
+            it('should prefer policy.reimburser over achAccount.reimburser', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                    reimburser: 'reimburser@example.com',
+                    achAccount: {reimburser: 'ach@example.com'},
+                });
+                expect(getReimburserEmail(policy)).toBe('reimburser@example.com');
             });
-            expect(getReimburserEmail(policy)).toBe('reimburser@example.com');
-        });
 
-        it('should fall back to the owner for manual reimbursement when no reimburser is set', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                owner: 'owner@example.com',
+            it('should fall back to the owner for manual reimbursement when no reimburser is set', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    owner: 'owner@example.com',
+                });
+                expect(getReimburserEmail(policy)).toBe('owner@example.com');
             });
-            expect(getReimburserEmail(policy)).toBe('owner@example.com');
-        });
 
-        it('should not fall back to the owner for auto reimbursement when no reimburser is set', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
-                owner: 'owner@example.com',
+            it('should not fall back to the owner for auto reimbursement when no reimburser is set', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                    owner: 'owner@example.com',
+                });
+                expect(getReimburserEmail(policy)).toBeUndefined();
             });
-            expect(getReimburserEmail(policy)).toBeUndefined();
-        });
 
-        it('should resolve the payer for deprecated manual reimbursement', () => {
-            // Given a workspace on Indirect reimbursement that reports the deprecated value and names no payer
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                owner: 'owner@example.com',
+            it('should resolve the payer for deprecated manual reimbursement', () => {
+                // Given a workspace on Indirect reimbursement that reports the deprecated value and names no payer
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    owner: 'owner@example.com',
+                });
+
+                // When the payer is resolved
+                const reimburserEmail = getReimburserEmail(policy);
+
+                // Then it falls back to the owner, because the deprecated value means Indirect just like the plain one
+                expect(reimburserEmail).toBe('owner@example.com');
             });
 
-            // When the payer is resolved
-            const reimburserEmail = getReimburserEmail(policy);
+            it('should return undefined when deprecated reimbursement is disabled', () => {
+                // Given a workspace that reports the deprecated disabled value but still names a payer
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+                    reimburser: 'reimburser@example.com',
+                    owner: 'owner@example.com',
+                });
 
-            // Then it falls back to the owner, because the deprecated value means Indirect just like the plain one
-            expect(reimburserEmail).toBe('owner@example.com');
-        });
+                // When the payer is resolved
+                const reimburserEmail = getReimburserEmail(policy);
 
-        it('should return undefined when deprecated reimbursement is disabled', () => {
-            // Given a workspace that reports the deprecated disabled value but still names a payer
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
-                reimburser: 'reimburser@example.com',
-                owner: 'owner@example.com',
+                // Then nobody is returned, because a disabled workspace has no payer no matter who is named on it
+                expect(reimburserEmail).toBeUndefined();
             });
+        });
 
-            // When the payer is resolved
-            const reimburserEmail = getReimburserEmail(policy);
+        describe('getReimbursementChoice', () => {
+            it('should return undefined when there is no policy', () => {
+                // Given no policy, which happens while a workspace is still loading
 
-            // Then nobody is returned, because a disabled workspace has no payer no matter who is named on it
-            expect(reimburserEmail).toBeUndefined();
-        });
-    });
+                // When the choice is resolved
+                const choice = getReimbursementChoice(undefined);
 
-    describe('getReimbursementChoice', () => {
-        it('should return undefined when there is no policy', () => {
-            // Given no policy, which happens while a workspace is still loading
+                // Then nothing is returned, so callers fall back to their own defaults instead of guessing a choice
+                expect(choice).toBeUndefined();
+            });
 
-            // When the choice is resolved
-            const choice = getReimbursementChoice(undefined);
+            it('should return undefined when the policy has no choice', () => {
+                // Given a workspace that reports no reimbursement choice at all
+                const policy = createMock<Policy>({id: '1'});
 
-            // Then nothing is returned, so callers fall back to their own defaults instead of guessing a choice
-            expect(choice).toBeUndefined();
-        });
+                // When the choice is resolved
+                const choice = getReimbursementChoice(policy);
+
+                // Then nothing is returned, because an absent choice must stay absent rather than become a real value
+                expect(choice).toBeUndefined();
+            });
 
-        it('should return undefined when the policy has no choice', () => {
-            // Given a workspace that reports no reimbursement choice at all
-            const policy = createMock<Policy>({id: '1'});
+            it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL])(
+                'should pass through the current value %s',
+                (choice) => {
+                    // Given a workspace on one of the three values the app already understands
+                    const policy = createMock<Policy>({id: '1', reimbursementChoice: choice});
 
-            // When the choice is resolved
-            const choice = getReimbursementChoice(policy);
+                    // When the choice is resolved
+                    const resolvedChoice = getReimbursementChoice(policy);
 
-            // Then nothing is returned, because an absent choice must stay absent rather than become a real value
-            expect(choice).toBeUndefined();
-        });
+                    // Then it is returned untouched, so resolving cannot change the meaning of a workspace that was already correct
+                    expect(resolvedChoice).toBe(choice);
+                },
+            );
 
-        it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL])(
-            'should pass through the current value %s',
-            (choice) => {
-                // Given a workspace on one of the three values the app already understands
-                const policy = createMock<Policy>({id: '1', reimbursementChoice: choice});
+            it.each([
+                [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO],
+                [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL],
+            ])('should resolve %s to %s', (deprecatedChoice, expectedChoice) => {
+                // Given a workspace that reports a deprecated value
+                const policy = createMock<Policy>({id: '1', reimbursementChoice: deprecatedChoice});
 
                 // When the choice is resolved
                 const resolvedChoice = getReimbursementChoice(policy);
 
-                // Then it is returned untouched, so resolving cannot change the meaning of a workspace that was already correct
-                expect(resolvedChoice).toBe(choice);
-            },
-        );
+                // Then it becomes the plain value it means, so every comparison downstream treats the workspace correctly
+                expect(resolvedChoice).toBe(expectedChoice);
+            });
 
-        it.each([
-            [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO],
-            [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL],
-        ])('should resolve %s to %s', (deprecatedChoice, expectedChoice) => {
-            // Given a workspace that reports a deprecated value
-            const policy = createMock<Policy>({id: '1', reimbursementChoice: deprecatedChoice});
+            it('should not resolve a value that merely starts with the deprecated prefix', () => {
+                // Given a workspace on an unknown value that only shares the deprecated prefix
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The value outside the type is the scenario under test.
+                const policy = createMock<Policy>({id: '1', reimbursementChoice: 'deprecated_reimburseSomethingElse' as Policy['reimbursementChoice']});
 
-            // When the choice is resolved
-            const resolvedChoice = getReimbursementChoice(policy);
+                // When the choice is resolved
+                const resolvedChoice = getReimbursementChoice(policy);
 
-            // Then it becomes the plain value it means, so every comparison downstream treats the workspace correctly
-            expect(resolvedChoice).toBe(expectedChoice);
+                // Then it is passed through, because matching on the prefix would silently invent a meaning for a value we do not know
+                expect(resolvedChoice).toBe('deprecated_reimburseSomethingElse');
+            });
         });
 
-        it('should not resolve a value that merely starts with the deprecated prefix', () => {
-            // Given a workspace on an unknown value that only shares the deprecated prefix
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- The value outside the type is the scenario under test.
-            const policy = createMock<Policy>({id: '1', reimbursementChoice: 'deprecated_reimburseSomethingElse' as Policy['reimbursementChoice']});
+        describe('arePaymentsEnabled', () => {
+            it.each([
+                [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES, true],
+                [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, true],
+                [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, false],
+                [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, true],
+                [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, false],
+            ])('should return %s -> %s', (choice, expected) => {
+                // Given a workspace on one of the current or deprecated values
+                const policy = createMock<Policy>({id: '1', reimbursementChoice: choice});
 
-            // When the choice is resolved
-            const resolvedChoice = getReimbursementChoice(policy);
+                // When payments availability is checked
+                const paymentsEnabled = arePaymentsEnabled(policy);
 
-            // Then it is passed through, because matching on the prefix would silently invent a meaning for a value we do not know
-            expect(resolvedChoice).toBe('deprecated_reimburseSomethingElse');
+                // Then only a disabled workspace turns payments off, whichever of the two values it reports
+                expect(paymentsEnabled).toBe(expected);
+            });
         });
-    });
 
-    describe('arePaymentsEnabled', () => {
-        it.each([
-            [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES, true],
-            [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, true],
-            [CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, false],
-            [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, true],
-            [CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, false],
-        ])('should return %s -> %s', (choice, expected) => {
-            // Given a workspace on one of the current or deprecated values
-            const policy = createMock<Policy>({id: '1', reimbursementChoice: choice});
+        describe('isPolicyPayer', () => {
+            // The owner is the payer under Indirect reimbursement, so both values have to resolve to the same payer.
+            it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL])(
+                'should treat the owner as the payer for %s',
+                (choice) => {
+                    // Given an owner who administers a workspace on Indirect reimbursement
+                    const policy = createMock<Policy>({
+                        id: '1',
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        reimbursementChoice: choice,
+                        owner: 'owner@example.com',
+                    });
+
+                    // When they are checked against the workspace
+                    const isPayer = isPolicyPayer(policy, 'owner@example.com');
+
+                    // Then they can pay, so the deprecated value does not strip an owner of the Pay button
+                    expect(isPayer).toBe(true);
+                },
+            );
+
+            it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO])(
+                'should treat nobody as the payer for %s',
+                (choice) => {
+                    // Given an owner who administers a workspace with reimbursement disabled
+                    const policy = createMock<Policy>({
+                        id: '1',
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        reimbursementChoice: choice,
+                        owner: 'owner@example.com',
+                    });
 
-            // When payments availability is checked
-            const paymentsEnabled = arePaymentsEnabled(policy);
+                    // When they are checked against the workspace
+                    const isPayer = isPolicyPayer(policy, 'owner@example.com');
 
-            // Then only a disabled workspace turns payments off, whichever of the two values it reports
-            expect(paymentsEnabled).toBe(expected);
+                    // Then not even the owner can pay, so resolving the deprecated value does not hand out Pay where it was switched off
+                    expect(isPayer).toBe(false);
+                },
+            );
         });
-    });
 
-    describe('isPolicyPayer', () => {
-        // The owner is the payer under Indirect reimbursement, so both values have to resolve to the same payer.
-        it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL, CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL])(
-            'should treat the owner as the payer for %s',
-            (choice) => {
-                // Given an owner who administers a workspace on Indirect reimbursement
+        describe('getOwnerChangePayerSuccessData', () => {
+            it('should reassign policy.reimburser when the outgoing owner is the payer', () => {
                 const policy = createMock<Policy>({
                     id: '1',
-                    role: CONST.POLICY.ROLE.ADMIN,
-                    reimbursementChoice: choice,
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    reimburser: 'owner@example.com',
                     owner: 'owner@example.com',
                 });
 
-                // When they are checked against the workspace
-                const isPayer = isPolicyPayer(policy, 'owner@example.com');
-
-                // Then they can pay, so the deprecated value does not strip an owner of the Pay button
-                expect(isPayer).toBe(true);
-            },
-        );
+                expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({reimburser: 'new@example.com'});
+            });
 
-        it.each([CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO, CONST.POLICY.DEPRECATED_REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO])(
-            'should treat nobody as the payer for %s',
-            (choice) => {
-                // Given an owner who administers a workspace with reimbursement disabled
+            it('should reassign achAccount.reimburser when that is where the payer is stored', () => {
                 const policy = createMock<Policy>({
                     id: '1',
-                    role: CONST.POLICY.ROLE.ADMIN,
-                    reimbursementChoice: choice,
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    achAccount: {reimburser: 'owner@example.com'},
                     owner: 'owner@example.com',
                 });
 
-                // When they are checked against the workspace
-                const isPayer = isPolicyPayer(policy, 'owner@example.com');
-
-                // Then not even the owner can pay, so resolving the deprecated value does not hand out Pay where it was switched off
-                expect(isPayer).toBe(false);
-            },
-        );
-    });
-
-    describe('getOwnerChangePayerSuccessData', () => {
-        it('should reassign policy.reimburser when the outgoing owner is the payer', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                reimburser: 'owner@example.com',
-                owner: 'owner@example.com',
+                expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({achAccount: {reimburser: 'new@example.com'}});
             });
 
-            expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({reimburser: 'new@example.com'});
-        });
+            it('should not reassign when the workspace has a bank account, because the backend keeps the former payer', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    reimburser: 'owner@example.com',
+                    achAccount: {bankAccountID: 1234, reimburser: 'owner@example.com'},
+                    owner: 'owner@example.com',
+                });
 
-        it('should reassign achAccount.reimburser when that is where the payer is stored', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                achAccount: {reimburser: 'owner@example.com'},
-                owner: 'owner@example.com',
+                expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
             });
 
-            expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({achAccount: {reimburser: 'new@example.com'}});
-        });
+            it('should not reassign when someone other than the outgoing owner is the payer', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+                    reimburser: 'payer@example.com',
+                    owner: 'owner@example.com',
+                });
 
-        it('should not reassign when the workspace has a bank account, because the backend keeps the former payer', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                reimburser: 'owner@example.com',
-                achAccount: {bankAccountID: 1234, reimburser: 'owner@example.com'},
-                owner: 'owner@example.com',
+                expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
             });
 
-            expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
-        });
+            it('should not reassign when reimbursement is disabled', () => {
+                const policy = createMock<Policy>({
+                    id: '1',
+                    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+                    reimburser: 'owner@example.com',
+                    owner: 'owner@example.com',
+                });
 
-        it('should not reassign when someone other than the outgoing owner is the payer', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
-                reimburser: 'payer@example.com',
-                owner: 'owner@example.com',
+                expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
             });
 
-            expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
-        });
-
-        it('should not reassign when reimbursement is disabled', () => {
-            const policy = createMock<Policy>({
-                id: '1',
-                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
-                reimburser: 'owner@example.com',
-                owner: 'owner@example.com',
+            it('should return no payer fields for an undefined policy', () => {
+                expect(getOwnerChangePayerSuccessData(undefined, 'new@example.com')).toEqual({});
             });
-
-            expect(getOwnerChangePayerSuccessData(policy, 'new@example.com')).toEqual({});
-        });
-
-        it('should return no payer fields for an undefined policy', () => {
-            expect(getOwnerChangePayerSuccessData(undefined, 'new@example.com')).toEqual({});
         });
     });
 

From 04d0420a8e7984fd9c135ac8dae22ee274db52a0 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 08:31:31 +0000
Subject: [PATCH 735/781] Match the TimePicker landscape layout to the amount
 page

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/components/TimePicker/TimePicker.tsx | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx
index 3e027311d873..1feb29272dd7 100644
--- a/src/components/TimePicker/TimePicker.tsx
+++ b/src/components/TimePicker/TimePicker.tsx
@@ -705,11 +705,14 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
         }
     };
 
+    // In landscape, the AM/PM buttons match the currency and Flip buttons on the amount page
     const renderedAmPmButtons = (
-        <View style={styles.timePickerSwitcherContainer}>
+        <View style={isInLandscapeMode ? [styles.flexRow, styles.justifyContentCenter, styles.gap2] : styles.timePickerSwitcherContainer}>
             <Button
                 enableHapticFeedback
                 innerStyles={styleForAM}
+                style={isInLandscapeMode && styles.minWidth18}
+                contentContainerStyle={isInLandscapeMode && styles.justifyContentCenter}
                 size={CONST.BUTTON_SIZE.SMALL}
                 onLongPress={() => {}}
                 onPress={() => {
@@ -722,7 +725,9 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
             </Button>
             <Button
                 enableHapticFeedback
-                innerStyles={[styleForPM, styles.ml1]}
+                innerStyles={[styleForPM, !isInLandscapeMode && styles.ml1]}
+                style={isInLandscapeMode && styles.minWidth18}
+                contentContainerStyle={isInLandscapeMode && styles.justifyContentCenter}
                 size={CONST.BUTTON_SIZE.SMALL}
                 onLongPress={() => {}}
                 onPress={() => {
@@ -739,7 +744,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
     const renderedInputs = (
         <View
             nativeID={AMOUNT_VIEW_ID}
-            style={[styles.flexRow, !isInLandscapeMode && styles.w100, styles.justifyContentCenter, styles.timePickerInputsContainer, styles.mb2]}
+            style={[styles.flexRow, styles.justifyContentCenter, styles.timePickerInputsContainer, isInLandscapeMode ? styles.alignItemsCenter : [styles.w100, styles.mb2]]}
         >
             <AmountTextInput
                 placeholder={numberFormat(0)}
@@ -850,7 +855,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
             size={isExtraSmallScreenHeight ? CONST.BUTTON_SIZE.MEDIUM : CONST.BUTTON_SIZE.LARGE}
-            style={[styles.mb5, styles.mh5]}
+            style={isInLandscapeMode ? [styles.w100, canUseTouchScreen ? styles.mt5 : styles.mt0] : [styles.mb5, styles.mh5]}
             onPress={handleSubmit}
         >
             <Button.KeyboardShortcut />
@@ -858,8 +863,8 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
         </Button>
     );
 
-    // In landscape there isn't enough height to stack the inputs, number pad and Save button, so place the inputs next to
-    // the number pad inside a ScrollView and keep the Save button pinned below it.
+    // In landscape there isn't enough height to stack the inputs, number pad and Save button, so use the same layout as the
+    // amount page (NumberWithSymbolForm): inputs and AM/PM buttons next to the number pad, with the Save button pinned below.
     if (isInLandscapeMode) {
         return (
             <View style={styles.flex1}>
@@ -869,8 +874,14 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                 >
                     <View style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.numberWithSymbolFormInputContainerLandscape]}>
                         {renderedInputs}
-                        {renderedErrorMessage}
                         {renderedAmPmButtons}
+                        {isError && (
+                            <FormHelpMessage
+                                style={[styles.ph5, styles.w100]}
+                                isError
+                                message={errorMessage}
+                            />
+                        )}
                     </View>
                     {canUseTouchScreen && (
                         <View
@@ -881,7 +892,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                         </View>
                     )}
                 </ScrollView>
-                {renderedSaveButton}
+                <View style={[styles.w100, styles.justifyContentEnd, styles.pageWrapper, styles.pt0]}>{renderedSaveButton}</View>
             </View>
         );
     }

From 33820e654b2cd6321b67b3649dba2bd44daae023 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 11:47:09 +0200
Subject: [PATCH 736/781] chore: post-merge fixes

---
 src/pages/Insights/InsightsDashboard.tsx | 1 -
 src/pages/home/HomePage.tsx              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index 035f95269627..aa6072496dcc 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -130,7 +130,6 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
         <ScrollView
             style={styles.insightsDashboardScrollView}
             onScroll={triggerScrollEvent}
-            contentContainerStyle={[styles.flexGrow1, pageGutter, styles.pb5]}
             {...scrollProps}
             addBottomSafeAreaPadding
         >
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index e15e44867918..40cfdf7197e3 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -162,7 +162,6 @@ function HomePage() {
                         style={styles.homePageScrollView}
                         {...tabRootScrollProps}
                         onScroll={triggerScrollEvent}
-                        contentContainerStyle={[styles.homePageContentContainer, pageGutter]}
                         addBottomSafeAreaPadding
                         keyboardShouldPersistTaps="handled"
                     >

From a7fe68701c88d99bcf4ca42afd36213ab771661f Mon Sep 17 00:00:00 2001
From: "nkdengineer (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 09:50:55 +0000
Subject: [PATCH 737/781] Explain the prefer-nullish-coalescing disable in
 getDefaultApprover

Co-authored-by: nkdengineer <nkdengineer@users.noreply.github.com>
---
 src/libs/PolicyUtils/approvals.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/PolicyUtils/approvals.ts b/src/libs/PolicyUtils/approvals.ts
index 860ef968e67f..28fcccc0cb17 100644
--- a/src/libs/PolicyUtils/approvals.ts
+++ b/src/libs/PolicyUtils/approvals.ts
@@ -85,6 +85,7 @@ function getApprovalWorkflow(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.PO
 }
 
 function getDefaultApprover(policy: OnyxEntry<Policy>): string {
+    // We intentionally use || here so an empty-string approver falls back to the owner. ?? would keep the empty string.
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     return policy?.approver || policy?.owner || '';
 }

From a3e01fdc818ffa02510fac5aabda563f3bc1df00 Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Thu, 15 Oct 2026 17:14:07 +0700
Subject: [PATCH 738/781] fix blockers related to join workspace

---
 src/libs/actions/Welcome/index.ts             |  11 +-
 .../BaseOnboardingPrivateDomain.tsx           |   6 +-
 .../BaseOnboardingWorkEmail.tsx               |   5 +-
 tests/ui/WorkEmailOnboardingNavigation.tsx    | 102 ++++++++++++++++++
 4 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
index ef7a69b3499f..de53ddb61c37 100644
--- a/src/libs/actions/Welcome/index.ts
+++ b/src/libs/actions/Welcome/index.ts
@@ -108,8 +108,13 @@ function updateOnboardingValuesAndNavigation(onboardingValues: Onboarding | unde
     });
 }
 
-async function clearOnboardingShouldValidate(onboardingValues: Onboarding | undefined) {
-    await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {...onboardingValues, shouldValidate: undefined});
+async function resetOnboardingWorkEmailValidation(onboardingValues: Onboarding | undefined) {
+    await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {
+        ...onboardingValues,
+        shouldValidate: undefined,
+        isMergeAccountStepCompleted: undefined,
+        isMergeAccountStepSkipped: undefined,
+    });
 }
 
 function setOnboardingShouldValidate(shouldValidate: boolean) {
@@ -312,7 +317,7 @@ export {
     createJoinWorkspaceOnboardingContent,
     setOnboardingShouldValidate,
     updateOnboardingValuesAndNavigation,
-    clearOnboardingShouldValidate,
+    resetOnboardingWorkEmailValidation,
     setOnboardingUserReportedIntegration,
     setOnboardingAccountingEnabled,
     setOnboardingInterestedFeaturesMap,
diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
index fda0d3c4b487..66bfc500c97a 100644
--- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
+++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
@@ -108,13 +108,13 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
     }, [email]);
 
     const handleBackButtonPress = useCallback(() => {
-        if (onboardingValues?.shouldValidate === false) {
+        const backTo = route.params?.backTo as Route | undefined;
+        if (onboardingValues?.shouldValidate === false && backTo !== ROUTES.ONBOARDING_PURPOSE.getRoute()) {
             updateOnboardingValuesAndNavigation(onboardingValues);
             return;
         }
 
-        const routeToNavigate = (route.params?.backTo as Route) ?? ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute();
-        Navigation.goBack(routeToNavigate);
+        Navigation.goBack(backTo ?? ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute());
     }, [route.params?.backTo, onboardingValues]);
 
     const navigateToNextOnboardingStep = useCallback(
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 74b567b1432c..0a87926ed754 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -32,8 +32,8 @@ import {AddWorkEmail} from '@userActions/Session';
 import {
     addWorkEmailFormError,
     clearOnboardingMergeAccountBlocked,
-    clearOnboardingShouldValidate,
     clearWorkEmailFormErrors,
+    resetOnboardingWorkEmailValidation,
     setOnboardingErrorMessage,
     setOnboardingMergeAccountStepValue,
     setOnboardingMergingAccountBlocked,
@@ -242,12 +242,13 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW
 
             // AddWorkEmail already made this the account's login, and resending it would merge the account into itself.
             if (sessionEmail && submittedWorkEmail.toLowerCase() === sessionEmail.toLowerCase()) {
+                setHasSubmittedWorkEmail(true);
                 setOnboardingShouldValidate(false);
                 return;
             }
 
             // The form's onSubmit must stay synchronous, so chain off the Onyx write instead of awaiting it.
-            clearOnboardingShouldValidate(onboardingValues).then(() => {
+            resetOnboardingWorkEmailValidation(onboardingValues).then(() => {
                 setHasSubmittedWorkEmail(true);
                 AddWorkEmail(submittedWorkEmail, addWorkEmailTaskReport);
             });
diff --git a/tests/ui/WorkEmailOnboardingNavigation.tsx b/tests/ui/WorkEmailOnboardingNavigation.tsx
index f246d87a36ad..355bc61c5810 100644
--- a/tests/ui/WorkEmailOnboardingNavigation.tsx
+++ b/tests/ui/WorkEmailOnboardingNavigation.tsx
@@ -11,10 +11,12 @@ import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
 
 import {AddWorkEmail, MergeIntoAccountAndLogin} from '@libs/actions/Session';
 import HttpUtils from '@libs/HttpUtils';
+import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
 
+import OnboardingPrivateDomain from '@pages/OnboardingPrivateDomain';
 import OnboardingWorkEmail from '@pages/OnboardingWorkEmail';
 import OnboardingWorkEmailValidation from '@pages/OnboardingWorkEmailValidation';
 import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
@@ -23,6 +25,7 @@ import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {Onboarding, Response as OnyxResponse} from '@src/types/onyx';
 
@@ -121,6 +124,18 @@ function OnboardingModalNavigatorWithPurpose() {
                 name={SCREENS.ONBOARDING.WORK_EMAIL}
                 component={OnboardingWorkEmail}
             />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                component={OnboardingWorkEmailValidation}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.PRIVATE_DOMAIN}
+                component={OnboardingPrivateDomain}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
+                component={OnboardingPersonalDetailsStub}
+            />
         </OnboardingStack.Navigator>
     );
 }
@@ -421,6 +436,93 @@ describe('Onboarding work email navigation', () => {
         expect(onboardingValues?.isMergingAccountBlocked).toBe(false);
     });
 
+    it('should reopen magic code after skipping an existing work email and submitting it again', async () => {
+        // Given a public-domain user joining a workspace with an existing work account
+        await TestHelper.signInWithTestUser(1, 'test@gmail.com');
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+        });
+        renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithPurpose);
+        await waitForBatchedUpdatesWithAct();
+
+        const restoreXhr = mockResponseOnce({shouldValidate: true});
+        try {
+            fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), workEmail);
+            fireEvent.press(screen.getByText(TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')));
+            await waitForBatchedUpdatesWithAct();
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+            // When they skip validation, return to the intent list, and submit the same email on a new visit
+            fireEvent.press(screen.getByText(TestHelper.translateLocal('common.skip')));
+            await waitForBatchedUpdatesWithAct();
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+            act(() => Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute()));
+            await waitForBatchedUpdatesWithAct();
+            act(() => Navigation.navigate(ROUTES.ONBOARDING_WORK_EMAIL.getRoute()));
+            await waitForBatchedUpdatesWithAct();
+            fireEvent.press(screen.getByText(TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')));
+            await waitForBatchedUpdatesWithAct();
+
+            // Then stale completion flags must not immediately skip the newly opened validation screen
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+            expect(screen.queryByTestId('onboarding-personal-details-stub')).not.toBeOnTheScreen();
+        } finally {
+            restoreXhr();
+        }
+    });
+
+    it('should resume primary work email validation after going back and resubmitting', async () => {
+        // Given a work email that became the unvalidated primary login on the first AddWorkEmail request
+        await TestHelper.signInWithTestUser(1, workEmail);
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: false});
+            await Onyx.set(ONYXKEYS.LOGINS, {[workEmail]: {validatedDate: ''}});
+        });
+        renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithPurpose);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the same primary email is submitted, including with different casing
+        fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), workEmail.toUpperCase());
+        fireEvent.press(screen.getByText(TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it opens validation, and Back still restores the work-email form for another submission
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.PRIVATE_DOMAIN]);
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+        await waitForBatchedUpdatesWithAct();
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL]);
+        fireEvent.press(screen.getByText(TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')));
+        await waitForBatchedUpdatesWithAct();
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.PRIVATE_DOMAIN]);
+    });
+
+    it('should return directly to purpose when private-domain validation was opened from the intent list', async () => {
+        // Given an unvalidated private-domain user whose earlier direct add left shouldValidate false
+        await TestHelper.signInWithTestUser(1, workEmail);
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false, shouldValidate: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE);
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: false});
+            await Onyx.set(ONYXKEYS.LOGINS, {[workEmail]: {validatedDate: ''}});
+        });
+        renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE], OnboardingModalNavigatorWithPurpose);
+        await waitForBatchedUpdatesWithAct();
+        act(() => Navigation.navigate(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(ROUTES.ONBOARDING_PURPOSE.getRoute())));
+        await waitForBatchedUpdatesWithAct();
+
+        // When Back is pressed on the screen reached directly from Join my company workspace
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it returns to the actual origin without inserting a work-email screen
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]);
+        expect(screen.getByTestId('onboarding-purpose-stub')).toBeOnTheScreen();
+    });
+
     it('should keep Back working on a later visit to Join a workspace after the merge', async () => {
         await TestHelper.signInWithTestUser();
 

From f059363d3dc9108e1904739fd299852f4eed502d Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 13:12:53 +0200
Subject: [PATCH 739/781] fix: broken insets on offline state

---
 .../LHNOptionsList/LHNOptionsList.tsx         |  2 +-
 .../useTabRootScrollProps/index.android.tsx   | 13 +++++++
 .../useTabRootScrollProps/index.ios.tsx       | 35 +++++++++++++++++++
 .../useTabRootScrollProps/index.native.tsx    | 13 -------
 .../useTabRootScrollProps/index.tsx           | 11 +++---
 .../useTabRootScrollProps/types.ts            | 12 +++++++
 src/components/Search/index.tsx               |  4 ++-
 src/pages/Insights/InsightsDashboard.tsx      |  6 +++-
 src/pages/Search/EmptySearchView.tsx          |  4 ++-
 src/pages/home/HomePage.tsx                   |  2 +-
 src/pages/inbox/sidebar/SidebarLinks.tsx      |  4 ++-
 tests/ui/WorkspaceInitialPageTest.tsx         |  1 +
 12 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.android.tsx
 create mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.ios.tsx
 delete mode 100644 src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 5b48576d3f3e..7ca6a3d66b80 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -46,7 +46,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const [personalDetails] = useAllPersonalDetails();
 
     const styles = useThemeStyles();
-    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles, true);
+    const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles, {hasBottomSafeAreaPadding: true});
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.android.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.android.tsx
new file mode 100644
index 000000000000..3a8b5817efe6
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.android.tsx
@@ -0,0 +1,13 @@
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import type TabRootScrollProps from './types';
+
+/**
+ * A tab root screen reserves the row of Material's bar below its content, with the offline indicator laid out above
+ * it, so neither covers the list and the content container keeps its style.
+ */
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps {
+    return {contentContainerStyle: style};
+}
+
+export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.ios.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.ios.tsx
new file mode 100644
index 000000000000..5e49f3363807
--- /dev/null
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.ios.tsx
@@ -0,0 +1,35 @@
+import useTabBarCoveredHeight from '@components/Navigation/TabBarBottomContent/useTabBarCoveredHeight';
+
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
+import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import type TabRootScrollProps from './types';
+import type {TabRootScrollOptions} from './types';
+
+/**
+ * UIKit insets the end of a list past the translucent UITabBar that the content runs under, but not past the offline
+ * indicator laid over the content above the bar, so the list ends with room for it. UIKit's inset leaves the layout of
+ * the content alone, so content that fills the list and is laid out in it, like a centered empty state, would sit
+ * partly under the bar; it pads past the bar itself instead.
+ */
+function useTabRootScrollProps(
+    style?: StyleProp<ViewStyle>,
+    {hasBottomSafeAreaPadding = false, hasOfflineIndicatorPadding = false, fillsVisibleArea = false}: TabRootScrollOptions = {},
+): TabRootScrollProps {
+    const tabBarCoveredHeight = useTabBarCoveredHeight();
+    const {paddingBottom: safeAreaPaddingBottom} = useSafeAreaPaddings(true);
+    const isCoveredByTabBar = tabBarCoveredHeight > 0;
+    const coveredHeightPadding = hasBottomSafeAreaPadding ? tabBarCoveredHeight - safeAreaPaddingBottom : tabBarCoveredHeight;
+
+    const contentContainerStyle = useBottomSafeSafeAreaPaddingStyle({
+        style,
+        addOfflineIndicatorBottomSafeAreaPadding: isCoveredByTabBar && !hasOfflineIndicatorPadding,
+        additionalPaddingBottom: isCoveredByTabBar && fillsVisibleArea ? coveredHeightPadding : 0,
+    });
+
+    return {contentContainerStyle, contentInsetAdjustmentBehavior: fillsVisibleArea ? 'never' : 'automatic'};
+}
+
+export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
deleted file mode 100644
index 65aaa5912a7a..000000000000
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.native.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import type {StyleProp, ViewStyle} from 'react-native';
-
-import type TabRootScrollProps from './types';
-
-/**
- * UIKit insets the end of the list past the translucent iOS tab bar that the content runs under, and Android reserves
- * the bar's row below the content, so the content container keeps its style.
- */
-function useTabRootScrollProps(style?: StyleProp<ViewStyle>): TabRootScrollProps {
-    return {contentContainerStyle: style, contentInsetAdjustmentBehavior: 'automatic'};
-}
-
-export default useTabRootScrollProps;
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
index c75a5c774fc8..48c6212dd36d 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/index.tsx
@@ -6,18 +6,19 @@ import variables from '@styles/variables';
 import type {StyleProp, ViewStyle} from 'react-native';
 
 import type TabRootScrollProps from './types';
+import type {TabRootScrollOptions} from './types';
 
 /**
- * The content of a narrow tab root screen runs under the floating tab bar, so a list's content container ends with
- * room for the bar, letting its last row scroll out from under it. A list that already adds the bottom safe area
- * passes `hasBottomSafeAreaPadding`, so the safe area is not added twice.
+ * The content of a narrow tab root screen runs under the floating tab bar and the offline indicator laid over it, so a
+ * list's content container ends with room for both, letting its last row scroll out from under them. A list that
+ * already adds the bottom safe area or the offline indicator's room says so, so neither is added twice.
  */
-function useTabRootScrollProps(style?: StyleProp<ViewStyle>, hasBottomSafeAreaPadding = false): TabRootScrollProps {
+function useTabRootScrollProps(style?: StyleProp<ViewStyle>, {hasBottomSafeAreaPadding = false, hasOfflineIndicatorPadding = false}: TabRootScrollOptions = {}): TabRootScrollProps {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const insetStyle = useBottomSafeSafeAreaPaddingStyle({
         style,
         addBottomSafeAreaPadding: !hasBottomSafeAreaPadding,
-        addOfflineIndicatorBottomSafeAreaPadding: false,
+        addOfflineIndicatorBottomSafeAreaPadding: !hasOfflineIndicatorPadding,
         additionalPaddingBottom: variables.floatingTabBarHeight + variables.floatingTabBarBottomInset,
     });
 
diff --git a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
index 61dc387fad90..8dbd16a0f580 100644
--- a/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
+++ b/src/components/Navigation/TabBarBottomContent/useTabRootScrollProps/types.ts
@@ -2,4 +2,16 @@ import type {ScrollViewProps} from 'react-native';
 
 type TabRootScrollProps = Pick<ScrollViewProps, 'contentContainerStyle' | 'contentInsetAdjustmentBehavior'>;
 
+type TabRootScrollOptions = {
+    /** The list already ends with the bottom safe area */
+    hasBottomSafeAreaPadding?: boolean;
+
+    /** The list already ends with room for the offline indicator, as a ScrollView with `addBottomSafeAreaPadding` does */
+    hasOfflineIndicatorPadding?: boolean;
+
+    /** The content container grows to the height of the list and lays its content out in it, as a centered empty state does */
+    fillsVisibleArea?: boolean;
+};
+
 export default TabRootScrollProps;
+export type {TabRootScrollOptions};
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index b439cae7cbf0..2d60aeb3551d 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,5 +1,6 @@
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
@@ -159,6 +160,7 @@ function Search({
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth, shouldUseNarrowLayout, isLargeScreenWidth, isInLandscapeMode} = useResponsiveLayout();
     const styles = useThemeStyles();
+    const chartTabRootScrollProps = useTabRootScrollProps(styles.flexGrow1, {fillsVisibleArea: true});
     const navigation = useNavigation<PlatformStackNavigationProp<SearchFullscreenNavigatorParamList>>();
     const isFocused = useIsFocused();
 
@@ -1424,7 +1426,7 @@ function Search({
             <SearchScopeProvider>
                 <Animated.ScrollView
                     style={styles.flex1}
-                    contentContainerStyle={styles.flexGrow1}
+                    {...chartTabRootScrollProps}
                     onScroll={onSearchListScroll}
                     onLayout={onLayoutChart}
                     scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index aa6072496dcc..4fcc46f8a3aa 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -70,7 +70,11 @@ function InsightsDashboardContent({state, headlineChart, supportingCharts, filte
     const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
     const triggerScrollEvent = useScrollEventEmitter();
     const isEmptyState = state === INSIGHTS_DASHBOARD_STATE.NO_EXPENSES || state === INSIGHTS_DASHBOARD_STATE.EMPTY;
-    const scrollProps = useTabRootScrollProps(isEmptyState ? [styles.flexGrow1, styles.flexShrink0] : [styles.flexGrow1, pageGutter, styles.pb5], true);
+    const scrollProps = useTabRootScrollProps(isEmptyState ? [styles.flexGrow1, styles.flexShrink0] : [styles.flexGrow1, pageGutter, styles.pb5], {
+        hasBottomSafeAreaPadding: true,
+        hasOfflineIndicatorPadding: true,
+        fillsVisibleArea: isEmptyState,
+    });
 
     const didRequestFail = state === INSIGHTS_DASHBOARD_STATE.ERROR || state === INSIGHTS_DASHBOARD_STATE.STALE;
 
diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx
index 3392b5e910b2..0ea285962af0 100644
--- a/src/pages/Search/EmptySearchView.tsx
+++ b/src/pages/Search/EmptySearchView.tsx
@@ -1,6 +1,7 @@
 import BookTravelButton from '@components/BookTravelButton';
 import GenericEmptyStateComponent from '@components/EmptyStateComponent/GenericEmptyStateComponent';
 import type {EmptyStateButton, HeaderMedia} from '@components/EmptyStateComponent/types';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import {SearchScopeProvider} from '@components/Search/SearchScopeProvider';
 import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
@@ -139,6 +140,7 @@ function EmptySearchViewContent({
     const timezone = useCurrentTimezone();
     const styles = useThemeStyles();
     const isInLandscapeMode = useIsInLandscapeMode();
+    const tabRootScrollProps = useTabRootScrollProps([styles.flexGrow1, styles.flexShrink0, contentContainerStyle], {fillsVisibleArea: true});
 
     const illustrations = useMemoizedLazyIllustrations(['EmptyStateTravel']);
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
@@ -421,7 +423,7 @@ function EmptySearchViewContent({
     return (
         <Animated.ScrollView
             showsVerticalScrollIndicator={false}
-            contentContainerStyle={[styles.flexGrow1, styles.flexShrink0, contentContainerStyle]}
+            {...tabRootScrollProps}
             scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
             onScroll={onScroll}
         >
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 40cfdf7197e3..edfa2a4176ca 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -48,7 +48,7 @@ function HomePage() {
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
     const tabRootScreenWrapperProps = useTabRootScreenWrapperProps(NAVIGATION_TABS.HOME);
-    const tabRootScrollProps = useTabRootScrollProps([styles.homePageContentContainer, pageGutter], true);
+    const tabRootScrollProps = useTabRootScrollProps([styles.homePageContentContainer, pageGutter], {hasBottomSafeAreaPadding: true, hasOfflineIndicatorPadding: true});
     const {translate} = useLocalize();
     const triggerScrollEvent = useScrollEventEmitter();
     useDocumentTitle(translate('common.home'));
diff --git a/src/pages/inbox/sidebar/SidebarLinks.tsx b/src/pages/inbox/sidebar/SidebarLinks.tsx
index 6af8512410a8..00189aa18cfc 100644
--- a/src/pages/inbox/sidebar/SidebarLinks.tsx
+++ b/src/pages/inbox/sidebar/SidebarLinks.tsx
@@ -1,5 +1,6 @@
 import LHNEmptyState from '@components/LHNOptionsList/LHNEmptyState';
 import LHNOptionsList from '@components/LHNOptionsList/LHNOptionsList';
+import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/useTabRootScrollProps';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 
 import useOnyx from '@hooks/useOnyx';
@@ -82,6 +83,7 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
     const contentContainerStyles = StyleSheet.flatten([styles.pt2, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]);
 
     const shouldShowEmptyLHN = optionListItems.length === 0;
+    const {contentContainerStyle: emptyLHNStyle} = useTabRootScrollProps([styles.flex1, isInLandscapeMode ? styles.pv4 : styles.emptyLHNWrapper], {fillsVisibleArea: true});
 
     // Show the loading skeleton only while report data is loading AND the entire LHN report set is empty
     // (e.g. switching accounts/delegate sessions or re-authenticating after an Onyx clear, where openApp() repopulates reports).
@@ -93,7 +95,7 @@ function SidebarLinks({insets, optionListItems, hasReportData, priorityMode = CO
         <View style={[styles.flex1, styles.h100]}>
             <View style={[styles.pRelative, styles.flex1]}>
                 {shouldShowEmptyLHN ? (
-                    <View style={[styles.flex1, isInLandscapeMode ? styles.pv4 : styles.emptyLHNWrapper]}>
+                    <View style={emptyLHNStyle}>
                         <LHNEmptyState />
                     </View>
                 ) : (
diff --git a/tests/ui/WorkspaceInitialPageTest.tsx b/tests/ui/WorkspaceInitialPageTest.tsx
index be251e800ca6..693b4ecb8146 100644
--- a/tests/ui/WorkspaceInitialPageTest.tsx
+++ b/tests/ui/WorkspaceInitialPageTest.tsx
@@ -68,6 +68,7 @@ jest.mock('@components/BlockingViews/FullPageNotFoundView', () => (props: {child
 jest.mock('@components/HeaderWithBackButton', () => jest.fn());
 jest.mock('@components/HighlightableMenuItem', () => jest.fn());
 jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScreenWrapperProps', () => () => ({}));
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
 jest.mock(
     '@components/OfflineWithFeedback',
     () =>

From 6def640b9192cee23e07bc8e4584253934157bab Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 13:21:55 +0200
Subject: [PATCH 740/781] fix: move offline state to the top

---
 src/pages/Search/SearchPageNarrow/index.tsx | 5 ++++-
 src/styles/index.ts                         | 5 +++++
 src/styles/variables.ts                     | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchPageNarrow/index.tsx b/src/pages/Search/SearchPageNarrow/index.tsx
index 28e04ea561cf..2fde215162e1 100644
--- a/src/pages/Search/SearchPageNarrow/index.tsx
+++ b/src/pages/Search/SearchPageNarrow/index.tsx
@@ -410,7 +410,10 @@ function SearchPageNarrow({
                                 </>
                             )}
                         </View>
-                        <View onLayout={(event) => setFooterHeight(event.nativeEvent.layout.height)}>
+                        <View
+                            style={styles.searchFooterZIndexStyle}
+                            onLayout={(event) => setFooterHeight(event.nativeEvent.layout.height)}
+                        >
                             <SearchSelectionFooter
                                 searchResults={searchResults}
                                 style={styles.tabRootFooter(tabBarCoveredHeight)}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index fa6bc04e8254..79d58695bd3a 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -7077,6 +7077,7 @@ const dynamicStyles = (theme: ThemeColors) =>
                 right: 0,
                 bottom: footerHeight,
                 left: 0,
+                zIndex: variables.searchFooterZIndex,
                 backgroundColor: theme.appBG,
             }) satisfies ViewStyle,
 
@@ -7724,6 +7725,10 @@ const plainStyles = (theme: ThemeColors) =>
             zIndex: variables.searchTopBarZIndex,
         },
 
+        searchFooterZIndexStyle: {
+            zIndex: variables.searchFooterZIndex,
+        },
+
         getWidgetContainerTitleStyle: (color: string) =>
             ({
                 ...textVariants.textStrong,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 90264b1b31c5..46f3b556dfea 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -484,6 +484,8 @@ export default {
     searchListContentMarginTop: 120,
     searchListContentWithFiltersMarginTop: 164,
     searchTopBarZIndex: 9,
+    // Above the search page header (zIndex 10), whose top bar floats over the list and reaches the footer when the screen is short.
+    searchFooterZIndex: 11,
 
     searchAutocompleteInputSkeletonHeight: 8,
     searchAutocompleteInputSkeletonWidth: 145,

From 4da67c72adda5933655534a9071efc95cab390ad Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Thu, 15 Oct 2026 18:23:49 +0700
Subject: [PATCH 741/781] add comment

---
 .../OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
index 66bfc500c97a..afb793632f04 100644
--- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
+++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
@@ -109,6 +109,8 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
 
     const handleBackButtonPress = useCallback(() => {
         const backTo = route.params?.backTo as Route | undefined;
+        // When this screen was opened directly from the intent list (backTo is the purpose route), go straight
+        // back there instead of running the work-email restore path, which would insert a work-email screen.
         if (onboardingValues?.shouldValidate === false && backTo !== ROUTES.ONBOARDING_PURPOSE.getRoute()) {
             updateOnboardingValuesAndNavigation(onboardingValues);
             return;

From 26cfdc5447917dbc5257d9d916cf5ca41c083ca6 Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Thu, 15 Oct 2026 18:50:35 +0700
Subject: [PATCH 742/781] fix review

---
 src/libs/actions/Welcome/OnboardingFlow.ts |  5 ++-
 tests/unit/OnboardingFlowTest.ts           | 47 ++++++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
index 42bcb7d03af8..29275a7037d2 100644
--- a/src/libs/actions/Welcome/OnboardingFlow.ts
+++ b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -144,8 +144,11 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
             CONST.ONBOARDING_CHOICES.TRACK_PERSONAL,
         ]);
     }
+    // A successful direct add can leave the account's public-domain flag stale until the next account update.
+    const shouldResumePrivateDomainValidation = currentOnboardingValues?.shouldValidate === false && initialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route);
+
     // A validated account has no reason to be on the onboarding "add work email" screen.
-    if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted && !isAccountValidated) {
+    if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted && !isAccountValidated && !shouldResumePrivateDomainValidation) {
         return `/${ROUTES.ONBOARDING_WORK_EMAIL.route}`;
     }
 
diff --git a/tests/unit/OnboardingFlowTest.ts b/tests/unit/OnboardingFlowTest.ts
index 68988e7f0425..9509b981f763 100644
--- a/tests/unit/OnboardingFlowTest.ts
+++ b/tests/unit/OnboardingFlowTest.ts
@@ -6,6 +6,7 @@ import navigationRef from '@libs/Navigation/navigationRef';
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type * as NativeNavigation from '@react-navigation/native';
@@ -21,6 +22,8 @@ describe('OnboardingFlow', () => {
     beforeAll(() => IntlStore.load(CONST.LOCALES.EN));
 
     describe('getOnboardingInitialPath', () => {
+        const savedPrivateDomainPath = `/${ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(ROUTES.ONBOARDING_WORK_EMAIL.getRoute())}`;
+
         it('should return the onboarding fallback path when the last visited path is null', () => {
             const params: GetOnboardingInitialPathParamsType = {
                 isUserFromPublicDomain: false,
@@ -190,8 +193,7 @@ describe('OnboardingFlow', () => {
         });
 
         it('should not redirect away from a private-domain URL for a public-domain unvalidated user', () => {
-            // Mirrors the BaseOnboardingPrivateDomain screen-level guard: an unvalidated public-domain user who just
-            // submitted a work email may land here while isFromPublicDomain is stale. They must keep the private-domain step.
+            // Given an unvalidated user submitted a work email while isFromPublicDomain is still stale
             const params: GetOnboardingInitialPathParamsType = {
                 isUserFromPublicDomain: true,
                 hasAccessiblePolicies: true,
@@ -209,10 +211,49 @@ describe('OnboardingFlow', () => {
                 onboardingValues: undefined,
                 isAccountValidated: false,
             };
+
+            // When onboarding resumes after a refresh
             const path = getOnboardingInitialPath(params);
-            expect(path).not.toBe('/onboarding/purpose');
+
+            // Then it preserves the private-domain validation step
+            expect(path).toBe('/onboarding/private-domain');
         });
 
+        it.each([
+            {shouldValidate: false, isAccountValidated: false, expectedPath: savedPrivateDomainPath},
+            {shouldValidate: undefined, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
+            {shouldValidate: true, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
+            {shouldValidate: false, isAccountValidated: true, expectedPath: '/onboarding/purpose'},
+        ])(
+            'resumes at $expectedPath after resetting merge flags with shouldValidate=$shouldValidate and validated=$isAccountValidated',
+            ({shouldValidate, isAccountValidated, expectedPath}) => {
+                // Given a previously skipped work email was resubmitted, clearing its merge flags, while the domain flag is stale
+                const onboardingValues = {
+                    hasCompletedGuidedSetupFlow: false,
+                    signupQualifier: CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL,
+                    isMergeAccountStepCompleted: undefined,
+                    isMergeAccountStepSkipped: undefined,
+                    shouldValidate,
+                };
+                const params: GetOnboardingInitialPathParamsType = {
+                    isUserFromPublicDomain: true,
+                    isAccountValidated,
+                    hasAccessiblePolicies: false,
+                    onboardingValuesParam: onboardingValues,
+                    onboardingValues,
+                    currentOnboardingPurposeSelected: CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE,
+                    currentOnboardingCompanySize: undefined,
+                    onboardingInitialPath: savedPrivateDomainPath,
+                };
+
+                // When refreshing restores the saved onboarding route
+                const path = getOnboardingInitialPath(params);
+
+                // Then only a successful direct add for an unvalidated account resumes the exact validation route
+                expect(path).toBe(expectedPath);
+            },
+        );
+
         it('should not redirect away from a work-email-validation URL for a public-domain user', () => {
             const params: GetOnboardingInitialPathParamsType = {
                 isUserFromPublicDomain: true,

From cffdf5d2739e2babb3025858348fd0933569ee80 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:13:04 +0200
Subject: [PATCH 743/781] fix: make tabs take as much space as they need

---
 .../NavigationTabBar/InboxTabButton.tsx       |  2 +-
 .../NavigationTabBar/InsightsTabButton.tsx    |  2 +-
 .../NavigationTabBar/SearchTabButton.tsx      |  2 +-
 .../NavigationTabBar/WorkspacesTabButton.tsx  |  2 +-
 .../Navigation/NavigationTabBar/index.tsx     |  2 +-
 .../inbox/sidebar/NavigationTabBarAvatar.tsx  |  2 +-
 src/styles/index.ts                           | 20 +++++++++++++++----
 src/styles/variables.ts                       |  4 ++++
 8 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
index 3902325f5668..9f7fb4fe2015 100644
--- a/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InboxTabButton.tsx
@@ -233,7 +233,7 @@ function InboxTabButton({selectedTab, isWideLayout}: InboxTabButtonProps) {
             role={CONST.ROLE.TAB}
             accessibilityLabel={accessibilityLabel}
             accessibilityState={{selected: selectedTab === NAVIGATION_TABS.INBOX}}
-            wrapperStyle={styles.flex1}
+            wrapperStyle={styles.navigationTabBarSlot}
             style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
         >
diff --git a/src/components/Navigation/NavigationTabBar/InsightsTabButton.tsx b/src/components/Navigation/NavigationTabBar/InsightsTabButton.tsx
index 19d2e6ecb5dd..0042091fab77 100644
--- a/src/components/Navigation/NavigationTabBar/InsightsTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/InsightsTabButton.tsx
@@ -67,7 +67,7 @@ function InsightsTabButton({selectedTab, isWideLayout}: InsightsTabButtonProps)
             role={CONST.ROLE.TAB}
             accessibilityLabel={translate('common.insights')}
             accessibilityState={{selected: isSelected}}
-            wrapperStyle={styles.flex1}
+            wrapperStyle={styles.navigationTabBarSlot}
             style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INSIGHTS}
         >
diff --git a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
index 6cb649aca30f..274dabf14b6e 100644
--- a/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/SearchTabButton.tsx
@@ -77,7 +77,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
             role={CONST.ROLE.TAB}
             accessibilityLabel={translate('common.spend')}
             accessibilityState={searchAccessibilityState}
-            wrapperStyle={styles.flex1}
+            wrapperStyle={styles.navigationTabBarSlot}
             style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
         >
diff --git a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
index f996c54f0522..507ec3a3239a 100644
--- a/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
+++ b/src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx
@@ -61,7 +61,7 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
             role={CONST.ROLE.TAB}
             accessibilityLabel={`${translate('common.workspacesTabTitle')}${workspacesTabIndicatorStatus ? `. ${translate('common.yourReviewIsRequired')}` : ''}`}
             accessibilityState={workspacesAccessibilityState}
-            wrapperStyle={styles.flex1}
+            wrapperStyle={styles.navigationTabBarSlot}
             style={styles.navigationTabBarItem}
             sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.WORKSPACES}
         >
diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 432f205cd96f..0f988d857280 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -161,7 +161,7 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     onPress={navigateToNewDotHome}
                     role={CONST.ROLE.TAB}
                     accessibilityLabel={translate('common.home')}
-                    wrapperStyle={styles.flex1}
+                    wrapperStyle={styles.navigationTabBarSlot}
                     style={styles.navigationTabBarItem}
                     sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.HOME}
                 >
diff --git a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
index 6699d926b7f5..f308c8706689 100644
--- a/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
+++ b/src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
@@ -37,7 +37,7 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
             onPress={onPress}
             accessibilityLabel={`${translate('initialSettingsPage.account')}, ${translate('sidebarScreen.buttonMySettings')}. ${status ? `${translate('common.yourReviewIsRequired')}.` : ''}`}
             role={CONST.ROLE.TAB}
-            wrapperStyle={styles.flex1}
+            wrapperStyle={shouldUseNarrowLayout ? styles.navigationTabBarSlot : styles.flex1}
             accessibilityState={accountAccessibilityState}
             aria-selected={accountAccessibilityState.selected}
             style={({hovered}) => [style, !shouldUseNarrowLayout && hovered && styles.navigationTabBarItemHovered]}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 79d58695bd3a..5da7bddb6d58 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -767,7 +767,13 @@ const staticStyles = (theme: ThemeColors) =>
 
         // Only the mobile web bar uses this; iOS and Android draw native tab bars.
         navigationTabBarContainer: {
-            flexDirection: 'row',
+            // Grows every tab by the same amount until its label fits, then shares what is left between them, so a long
+            // label gets the room it needs and, once the labels no longer all fit, the long ones truncate to the same
+            // width while the short ones keep theirs.
+            display: 'grid',
+            gridTemplateColumns: `repeat(${variables.floatingTabBarTabCount}, minmax(0, auto))`,
+            // react-native-web defaults alignContent to flex-start, which would leave the row at its content's height.
+            alignContent: 'stretch',
             height: variables.floatingTabBarHeight,
             marginHorizontal: variables.floatingTabBarHorizontalInset,
             borderRadius: variables.componentBorderRadiusCircle,
@@ -782,6 +788,11 @@ const staticStyles = (theme: ThemeColors) =>
             overflow: 'hidden',
         },
 
+        // A grid item is otherwise never narrower than its label, so the label could not truncate.
+        navigationTabBarSlot: {
+            minWidth: 0,
+        },
+
         // Stretches every tab to its slot, so a long label truncates inside the slot instead of spilling into its neighbors.
         navigationTabBarItemNarrow: {
             alignSelf: 'stretch',
@@ -813,10 +824,11 @@ const staticStyles = (theme: ThemeColors) =>
             alignItems: 'center',
         },
 
-        // Lets the floating bar's avatar overflow the glyph box evenly above and below, so its label lines up
-        // with the labels of the icons next to it and its centre with theirs.
+        // Sits the avatar's bottom edge where the glyphs next to it end, inside their box, and lets its extra height
+        // reach above the box, so its label lines up with theirs and is the same distance from the avatar.
         navigationTabBarAvatar: {
-            marginVertical: (variables.iconFloatingTabBar - variables.avatarFloatingTabBar) / 2,
+            marginTop: variables.iconFloatingTabBar - variables.avatarFloatingTabBar - variables.floatingTabBarGlyphBottomInset,
+            marginBottom: variables.floatingTabBarGlyphBottomInset,
         },
 
         navigationTabBarFABItem: {
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 46f3b556dfea..b4220e670890 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -38,6 +38,8 @@ export default {
     // Space between a label's truncation edge and its tab's edge, so a neighbor's selected pill never reaches the label.
     floatingTabBarLabelInset: 8,
     floatingTabBarBottomInset: 8,
+    // Home, Inbox, Spend and Workspaces, with Insights or Account as the fifth.
+    floatingTabBarTabCount: 5,
     // styles.p3 (12) on each side of the DebugTabView row plus the View button (componentSizeNormal).
     debugTabViewHeight: 64,
     contentHeaderHeight: getValueUsingPixelRatio(72, 100),
@@ -110,6 +112,8 @@ export default {
     iconFloatingTabBar: 20,
     /** Account avatar size in the floating tab bar. */
     avatarFloatingTabBar: avatarSizes.avatarSizeXSmall,
+    // The tab glyphs are drawn about this far above the bottom of their box.
+    floatingTabBarGlyphBottomInset: 1,
     /** Glyph size in the iOS native tab bar. */
     iconNativeTabBarIOS: 22,
     /** Account avatar size in the iOS native tab bar. */

From ad21395d8629627e90f97415fcd413222b4d3456 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:24:16 +0200
Subject: [PATCH 744/781] fix: make the tab layout inline in portrait

---
 .../NativeTabNavigator/tabIconRasterizer.ts   | 67 +++++++++++++++----
 .../useNativeTabBarOptions/index.android.ts   |  1 +
 .../useNativeTabBarOptions/index.ios.ts       | 17 ++++-
 src/styles/variables.ts                       |  6 +-
 4 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
index baeb69da5aaa..0eb625077854 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/tabIconRasterizer.ts
@@ -17,6 +17,8 @@ type TabIconLayout = {
     glyphSize: number;
     /** Side of the account avatar's box. */
     avatarSize: number;
+    /** Whether the label is drawn under the glyph or beside it, as UIKit lays out a tab in landscape. */
+    direction: 'stacked' | 'inline';
 };
 
 type TabIconLabel = {
@@ -133,18 +135,59 @@ function drawStatusDot(canvas: SkCanvas, right: number, top: number, scale: numb
     paint.dispose();
 }
 
+type TabIconFrame = {
+    canvasWidth: number;
+    canvasHeight: number;
+    contentLeft: number;
+    contentTop: number;
+    labelLeft: number;
+    labelTop: number;
+};
+
+/**
+ * With a label, every tab gives its glyph or avatar a box as big as the avatar, so glyphs and the avatar share a centre
+ * and every label starts at the same place: under that box, or beside it in landscape.
+ */
+function getTabIconFrame(layout: TabIconLayout, contentSize: number, labelGap: number, labelWidth: number, labelHeight: number, hasLabel: boolean, scale: number): TabIconFrame {
+    const boxSize = hasLabel ? Math.max(layout.glyphSize, layout.avatarSize) * scale : contentSize;
+
+    if (layout.direction === 'inline') {
+        const canvasHeight = Math.ceil(Math.max(boxSize, labelHeight));
+        return {
+            canvasWidth: Math.ceil(boxSize + (hasLabel ? labelGap + labelWidth : 0)),
+            canvasHeight,
+            contentLeft: (boxSize - contentSize) / 2,
+            contentTop: (canvasHeight - contentSize) / 2,
+            labelLeft: boxSize + labelGap,
+            labelTop: (canvasHeight - labelHeight) / 2,
+        };
+    }
+
+    const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
+    const labelTop = (boxSize + layout.glyphSize * scale) / 2 + labelGap;
+    return {
+        canvasWidth,
+        canvasHeight: Math.ceil(hasLabel ? labelTop + labelHeight : boxSize),
+        contentLeft: (canvasWidth - contentSize) / 2,
+        contentTop: (boxSize - contentSize) / 2,
+        labelLeft: (canvasWidth - labelWidth) / 2,
+        labelTop,
+    };
+}
+
 function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, label}: TabIconParams): NativeBottomTabIcon | undefined {
     const scale = PixelRatio.get();
     const contentSize = (avatar ? layout.avatarSize : layout.glyphSize) * scale;
-    // With a label, every tab shares one row as tall as the avatar, so glyphs and the avatar share a centre and
-    // every label lands at the same height.
-    const rowSize = label ? Math.max(layout.glyphSize, layout.avatarSize) * scale : contentSize;
-    const labelTop = (rowSize + layout.glyphSize * scale) / 2 + (label?.gap ?? 0) * scale;
     const paragraph = label ? makeLabelParagraph(label, scale) : undefined;
-    const labelWidth = paragraph?.getLongestLine() ?? 0;
-    const labelHeight = paragraph?.getHeight() ?? 0;
-    const canvasWidth = Math.ceil(Math.max(contentSize, labelWidth));
-    const canvasHeight = Math.ceil(label ? labelTop + labelHeight : rowSize);
+    const {canvasWidth, canvasHeight, contentLeft, contentTop, labelLeft, labelTop} = getTabIconFrame(
+        layout,
+        contentSize,
+        (label?.gap ?? 0) * scale,
+        paragraph?.getLongestLine() ?? 0,
+        paragraph?.getHeight() ?? 0,
+        !!label,
+        scale,
+    );
 
     const surface = Skia.Surface.Make(canvasWidth, canvasHeight);
     if (!surface) {
@@ -153,8 +196,6 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
     }
 
     const canvas = surface.getCanvas();
-    const contentLeft = (canvasWidth - contentSize) / 2;
-    const contentTop = (rowSize - contentSize) / 2;
     if (avatar) {
         drawCircularImage(canvas, avatar.image, contentLeft, contentTop, contentSize);
     } else {
@@ -164,7 +205,7 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
         drawStatusDot(canvas, contentLeft + contentSize, contentTop, scale, dotColor);
     }
     if (paragraph) {
-        paragraph.paint(canvas, (canvasWidth - labelWidth) / 2, labelTop);
+        paragraph.paint(canvas, labelLeft, labelTop);
         paragraph.dispose();
     }
 
@@ -187,8 +228,8 @@ function drawTabIcon(layout: TabIconLayout, {name, color, avatar, dotColor, labe
  */
 function getTabIcon(layout: TabIconLayout, params: TabIconParams): NativeBottomTabIcon | undefined {
     const {name, color, avatar, dotColor, label} = params;
-    // The layout and the label's font are fixed per platform, so they are left out of the key.
-    const key = [name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, label?.maxWidth].join('|');
+    // The label's font is fixed per platform, so it is left out of the key.
+    const key = [layout.direction, name, avatar?.uri ?? color, dotColor, label?.text, label?.color, label?.isBold, label?.maxWidth].join('|');
     if (iconCache.has(key)) {
         return iconCache.get(key);
     }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
index 296c291b2a63..d439553f17ae 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.android.ts
@@ -24,6 +24,7 @@ const getFloatingButtonsBottom = (bottomInset: number) => variables.androidNativ
 const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconBottomBar,
     avatarSize: variables.iconBottomBar,
+    direction: 'stacked',
 };
 
 function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels}: NativeTabBarOptionsParams) {
diff --git a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
index fc210e7c1ed5..81627df46fd6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
+++ b/src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabBarOptions/index.ios.ts
@@ -1,3 +1,4 @@
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
@@ -22,6 +23,14 @@ const TAB_ICON_LAYOUT: TabIconLayout = {
     glyphSize: variables.iconNativeTabBarIOS,
     // A circle reads smaller than a glyph of the same box, so the avatar is drawn a little larger than the glyphs.
     avatarSize: variables.avatarNativeTabBarIOS,
+    direction: 'stacked',
+};
+
+/** A phone in landscape gives the bar too little height for a stacked tab, so UIKit lays its own tabs out this way. */
+const LANDSCAPE_TAB_ICON_LAYOUT: TabIconLayout = {
+    glyphSize: variables.iconNativeTabBarIOSLandscape,
+    avatarSize: variables.avatarNativeTabBarIOSLandscape,
+    direction: 'inline',
 };
 
 /**
@@ -33,9 +42,13 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
     const theme = useTheme();
     const avatar = useTabAvatarImage(isAccountAvatarShown);
     const {windowWidth} = useWindowDimensions();
+    const {isInLandscapeMode} = useResponsiveLayout();
+    const tabIconLayout = isInLandscapeMode ? LANDSCAPE_TAB_ICON_LAYOUT : TAB_ICON_LAYOUT;
     // One of the tabs never has a bar item, so the bar splits its width between the others.
     const barItemCount = Object.keys(tabLabels).length - 1;
-    const labelMaxWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount - variables.iosNativeTabBarLabelInset;
+    const itemWidth = (windowWidth - 2 * variables.iosNativeTabBarHorizontalInset) / barItemCount - variables.iosNativeTabBarLabelInset;
+    // In landscape the label shares the item's width with the glyph's box beside it.
+    const labelMaxWidth = isInLandscapeMode ? itemWidth - tabIconLayout.avatarSize - variables.nativeTabIconLabelGap : itemWidth;
 
     const screenOptions: NativeBottomTabNavigationOptions = {
         // The labels are drawn into the icons.
@@ -51,7 +64,7 @@ function useNativeTabBarOptions({shouldShowNativeTabBar, isAccountAvatarShown, d
     };
 
     const getTabOptions = (name: NativeTabName): NativeBottomTabNavigationOptions => ({
-        tabBarIcon: getTabBarIcon(TAB_ICON_LAYOUT, (isSelected) => ({
+        tabBarIcon: getTabBarIcon(tabIconLayout, (isSelected) => ({
             name,
             color: isSelected ? theme.iconMenu : theme.icon,
             avatar: name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR ? avatar : undefined,
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index b4220e670890..d5f2c5c514a1 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -118,11 +118,15 @@ export default {
     iconNativeTabBarIOS: 22,
     /** Account avatar size in the iOS native tab bar. */
     avatarNativeTabBarIOS: 26,
+    /** Glyph size in the iOS native tab bar in landscape, where UIKit lays the label beside a smaller icon. */
+    iconNativeTabBarIOSLandscape: 18,
+    /** Account avatar size in the iOS native tab bar in landscape. */
+    avatarNativeTabBarIOSLandscape: 21,
     /** Radius of the status dot drawn into a native tab bar icon. */
     nativeTabIconDotRadius: 4,
     /** Width of the ring cut out of a native tab bar icon around its status dot, as the JS tab bar's dot border does. */
     nativeTabIconDotCutout: 2,
-    /** Gap between the glyph and the label drawn under it in an iOS native tab bar icon. */
+    /** Gap between the glyph and the label drawn under it, or beside it in landscape, in an iOS native tab bar icon. */
     nativeTabIconLabelGap: 6,
     /** Space between the screen edge and the first tab of the iOS 26 floating tab bar. */
     iosNativeTabBarHorizontalInset: 25,

From 60f8c14f4b6a872c34b569854b64acfaec5c472f Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:34:22 +0200
Subject: [PATCH 745/781] test: add useTabRootScrollProps mock

---
 tests/unit/SidebarLinksTest.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/SidebarLinksTest.tsx b/tests/unit/SidebarLinksTest.tsx
index 07fde6da432d..9c0758fef3f1 100644
--- a/tests/unit/SidebarLinksTest.tsx
+++ b/tests/unit/SidebarLinksTest.tsx
@@ -28,6 +28,7 @@ jest.mock('@hooks/useResponsiveLayout', () => ({
     default: () => ({shouldUseNarrowLayout: mockShouldUseNarrowLayout, isInLandscapeMode: false}),
 }));
 
+jest.mock('@components/Navigation/TabBarBottomContent/useTabRootScrollProps', () => () => ({}));
 jest.mock('@hooks/useThemeStyles', () => ({__esModule: true, default: () => ({})}));
 jest.mock('@hooks/useStyleUtils', () => ({__esModule: true, default: () => ({getSafeAreaMargins: () => ({marginBottom: 0})})}));
 jest.mock('@hooks/useSidebarOrderedReports', () => ({useSidebarOrderedReportsActions: () => ({setStickyReportID: jest.fn()})}));

From 799dacfe9a8ff5636e9fe27c2d50ec5100754987 Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Thu, 15 Oct 2026 19:58:33 +0700
Subject: [PATCH 746/781] fix latest comment

---
 src/libs/actions/Welcome/OnboardingFlow.ts |  6 +--
 tests/unit/OnboardingFlowTest.ts           | 46 +++++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
index 29275a7037d2..0a50edcdc43e 100644
--- a/src/libs/actions/Welcome/OnboardingFlow.ts
+++ b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -144,11 +144,11 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
             CONST.ONBOARDING_CHOICES.TRACK_PERSONAL,
         ]);
     }
-    // A successful direct add can leave the account's public-domain flag stale until the next account update.
-    const shouldResumePrivateDomainValidation = currentOnboardingValues?.shouldValidate === false && initialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route);
+    // Preserve onboarding progress after a direct add while the public domain flag is stale.
+    const shouldResumeOnboardingAfterDirectAdd = currentOnboardingValues?.shouldValidate === false && state?.routes?.at(-1)?.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR;
 
     // A validated account has no reason to be on the onboarding "add work email" screen.
-    if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted && !isAccountValidated && !shouldResumePrivateDomainValidation) {
+    if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted && !isAccountValidated && !shouldResumeOnboardingAfterDirectAdd) {
         return `/${ROUTES.ONBOARDING_WORK_EMAIL.route}`;
     }
 
diff --git a/tests/unit/OnboardingFlowTest.ts b/tests/unit/OnboardingFlowTest.ts
index 9509b981f763..8e71267e8d38 100644
--- a/tests/unit/OnboardingFlowTest.ts
+++ b/tests/unit/OnboardingFlowTest.ts
@@ -219,14 +219,16 @@ describe('OnboardingFlow', () => {
             expect(path).toBe('/onboarding/private-domain');
         });
 
-        it.each([
-            {shouldValidate: false, isAccountValidated: false, expectedPath: savedPrivateDomainPath},
-            {shouldValidate: undefined, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
-            {shouldValidate: true, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
-            {shouldValidate: false, isAccountValidated: true, expectedPath: '/onboarding/purpose'},
-        ])(
-            'resumes at $expectedPath after resetting merge flags with shouldValidate=$shouldValidate and validated=$isAccountValidated',
-            ({shouldValidate, isAccountValidated, expectedPath}) => {
+        it.each(
+            [savedPrivateDomainPath, `/${ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute()}`, `/${ROUTES.ONBOARDING_PURPOSE.getRoute()}`].flatMap((savedPath) => [
+                {savedPath, shouldValidate: false, isAccountValidated: false, expectedPath: savedPath},
+                {savedPath, shouldValidate: undefined, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
+                {savedPath, shouldValidate: true, isAccountValidated: false, expectedPath: '/onboarding/work-email'},
+                {savedPath, shouldValidate: false, isAccountValidated: true, expectedPath: savedPath === savedPrivateDomainPath ? '/onboarding/purpose' : savedPath},
+            ]),
+        )(
+            'resumes $savedPath at $expectedPath after resetting merge flags with shouldValidate=$shouldValidate and validated=$isAccountValidated',
+            ({savedPath, shouldValidate, isAccountValidated, expectedPath}) => {
                 // Given a previously skipped work email was resubmitted, clearing its merge flags, while the domain flag is stale
                 const onboardingValues = {
                     hasCompletedGuidedSetupFlow: false,
@@ -243,17 +245,41 @@ describe('OnboardingFlow', () => {
                     onboardingValues,
                     currentOnboardingPurposeSelected: CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE,
                     currentOnboardingCompanySize: undefined,
-                    onboardingInitialPath: savedPrivateDomainPath,
+                    onboardingInitialPath: savedPath,
                 };
 
                 // When refreshing restores the saved onboarding route
                 const path = getOnboardingInitialPath(params);
 
-                // Then only a successful direct add for an unvalidated account resumes the exact validation route
+                // Then a successful direct add preserves validation and downstream progress, while pending retries still require work email
                 expect(path).toBe(expectedPath);
             },
         );
 
+        it.each(['/', '/r/123'])('does not bypass work email for a non-onboarding saved path %s after a direct add', (savedPath) => {
+            // Given a direct-add result with a stale public-domain flag, but no saved onboarding progress
+            const params: GetOnboardingInitialPathParamsType = {
+                isUserFromPublicDomain: true,
+                isAccountValidated: false,
+                hasAccessiblePolicies: false,
+                onboardingValuesParam: {
+                    hasCompletedGuidedSetupFlow: false,
+                    signupQualifier: CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL,
+                    shouldValidate: false,
+                },
+                onboardingValues: undefined,
+                currentOnboardingPurposeSelected: CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE,
+                currentOnboardingCompanySize: undefined,
+                onboardingInitialPath: savedPath,
+            };
+
+            // When choosing the initial onboarding step
+            const path = getOnboardingInitialPath(params);
+
+            // Then unrelated routes do not count as saved onboarding progress
+            expect(path).toBe('/onboarding/work-email');
+        });
+
         it('should not redirect away from a work-email-validation URL for a public-domain user', () => {
             const params: GetOnboardingInitialPathParamsType = {
                 isUserFromPublicDomain: true,

From c8a26aaa71b9347149a1537f5b30b713417b49e4 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 13:07:59 +0000
Subject: [PATCH 747/781] Update Mobile-Expensify submodule to 99a878c

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 595f5c8f516c..99a878c6f6e1 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 595f5c8f516c7d28f8c412e2658bfd489b0cbba7
+Subproject commit 99a878c6f6e193c31d6fc79323f8825e31cb89e0

From cdeeb73a424b1b6114c23cc35aa3537de15326e9 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 13:40:04 +0000
Subject: [PATCH 748/781] Auto-tighten eslint-seatbelt baseline

---
 config/eslint/eslint.seatbelt.tsv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 60c927bec03f..896c0400bb46 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -154,7 +154,6 @@
 "../../src/components/DragAndDrop/Provider/index.tsx"	"react-hooks/refs"	6
 "../../src/components/DraggableList/SortableItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/DropZone/DropZoneWrapper.tsx"	"react-hooks/refs"	1
-"../../src/components/DynamicForm/components/DynamicFormFieldRow.tsx"	"@typescript-eslint/no-deprecated/MenuItemWithTopDescription"	1
 "../../src/components/EditableCell/usePopoverEditState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/EmojiPicker/CategoryShortcutButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/EmojiPicker/EmojiPicker.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2

From e2807e8acbe1308c7b9b4061cbf255d2d5d1a9fb Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 13:43:52 +0000
Subject: [PATCH 749/781] Update Mobile-Expensify submodule to bf0a8d8

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 99a878c6f6e1..bf0a8d8ae17f 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 99a878c6f6e193c31d6fc79323f8825e31cb89e0
+Subproject commit bf0a8d8ae17f82ceed8ce8b5fb1b9362b70b034d

From d60a0476018ef842066d1670af4f742054506d4d Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:50:49 +0100
Subject: [PATCH 750/781] add emptyStateButtons param

---
 src/components/Tables/AgentsTable/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index 47b9996163be..835e04641fec 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -1,3 +1,4 @@
+import type {EmptyStateButton} from '@components/EmptyStateComponent/types';
 import RenderHTML from '@components/RenderHTML';
 import type {CompareItemsCallback, IsItemInSearchCallback, TableColumn, TableData, TableHandle} from '@components/Table';
 import Table, {composeTableListHeader} from '@components/Table';
@@ -48,6 +49,9 @@ type AgentsTableProps = {
     ref?: React.Ref<TableHandle<AgentRowData, AgentsTableColumnKey, string>> | undefined;
     agents: AgentRowData[];
 
+    /** Buttons to display on empty view */
+    emptyStateButtons?: EmptyStateButton[];
+
     /** Content rendered above the table header inside the scrollable list */
     headerComponent?: React.ReactElement;
 
@@ -63,7 +67,7 @@ type AgentsTableProps = {
     onRowSelectionChange: (selectedRowKeys: string[]) => void;
 };
 
-export default function AgentsTable({ref, agents, headerComponent, canSelectAgents, selectedKeys, shouldShowRoleColumn, onRowSelectionChange}: AgentsTableProps) {
+export default function AgentsTable({ref, agents, emptyStateButtons, headerComponent, canSelectAgents, selectedKeys, shouldShowRoleColumn, onRowSelectionChange}: AgentsTableProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
@@ -162,6 +166,7 @@ export default function AgentsTable({ref, agents, headerComponent, canSelectAgen
                         <RenderHTML html={translate('agentsPage.emptyAgents.subtitle')} />
                     </View>
                 }
+                buttons={emptyStateButtons}
             />
             <Table.NoResultsState />
             <Table.Header />

From 86c151a8bc5b73cf9acc6fa066c3d2cbfbd70fa3 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:57:59 +0100
Subject: [PATCH 751/781] add canWriteAgents guard before displaying the add
 button

---
 src/pages/workspace/WorkspaceAgentsPage.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index 1e8e483a68f2..e5ec36b0bc5a 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -3,6 +3,7 @@ import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import RenderHTML from '@components/RenderHTML';
 import AgentsTable from '@components/Tables/AgentsTable';
 
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLayoutSpacing from '@hooks/useLayoutSpacing';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -18,6 +19,7 @@ import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import {canMemberWrite} from '@libs/PolicyUtils';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
 
@@ -36,6 +38,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const policy = usePolicy(route.params.policyID);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
     const {pageGutter} = useLayoutSpacing();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBetaEnabled} = usePermissions();
@@ -48,11 +51,12 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     const hasAgents = agents.length > 0;
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? canSelectMultiple : selectedAgentKeys.length > 0;
+    const canWriteAgents = canMemberWrite(policy, currentUserLogin ?? '', CONST.POLICY.POLICY_FEATURE.AGENTS);
 
     useWorkspaceDocumentTitle(policy?.name, 'agentsPage.title');
 
     // The new agent functionality will be added after CreateCompanyAgent is exposed
-    const newAgentButton = null;
+    const newAgentButton = canWriteAgents ? null : null;
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {

From a71b43035d03137d66b0518d428a50694cb49b45 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:01:17 +0100
Subject: [PATCH 752/781] use display add button in header only if we have
 agents

---
 src/pages/settings/Agents/AgentsPage.tsx    | 4 ++--
 src/pages/workspace/WorkspaceAgentsPage.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 71d8257240c9..892e03ace411 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -43,7 +43,7 @@ function AgentsPage() {
 
     useDocumentTitle(translate('agentsPage.title'));
 
-    const newAgentButton = (
+    const newAgentButton = hasAgents ? (
         <Button
             variant="success"
             onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
@@ -51,7 +51,7 @@ function AgentsPage() {
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
         </Button>
-    );
+    ) : null;
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index e5ec36b0bc5a..a4b9bd02f82e 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -56,7 +56,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
     useWorkspaceDocumentTitle(policy?.name, 'agentsPage.title');
 
     // The new agent functionality will be added after CreateCompanyAgent is exposed
-    const newAgentButton = canWriteAgents ? null : null;
+    const newAgentButton = canWriteAgents && hasAgents ? null : null;
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {

From 6cee2c51d533490036452dd73c237698d25a3906 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:02:02 +0100
Subject: [PATCH 753/781] mend

use display add button in header only if we have agents
---
 src/hooks/useAgents.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index ee322551ddf7..087f515d9605 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -60,6 +60,8 @@ function useAgents() {
         if (!agent) {
             return [];
         }
+        return [];
+
         const accountID = Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length));
         const details = personalDetailsList?.[accountID];
         if (!details) {

From 30aa2d78c227968b4a1a03d0093bbcb097f5a6a6 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:07:40 +0100
Subject: [PATCH 754/781] add empty state buttons

---
 src/pages/settings/Agents/AgentsPage.tsx    | 11 ++++++++++-
 src/pages/workspace/WorkspaceAgentsPage.tsx |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 892e03ace411..978dc7440f28 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -45,13 +45,21 @@ function AgentsPage() {
 
     const newAgentButton = hasAgents ? (
         <Button
-            variant="success"
+            variant={CONST.BUTTON_VARIANT.SUCCESS}
             onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute()))}
         >
             <Button.Icon src={icons.Plus} />
             <Button.Text>{translate('agentsPage.newAgent')}</Button.Text>
         </Button>
     ) : null;
+    const emptyStateButtons = [
+        {
+            icon: icons.Plus,
+            buttonText: translate('agentsPage.newAgent'),
+            buttonVariant: CONST.BUTTON_VARIANT.SUCCESS,
+            buttonAction: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.AGENT_NEW.getRoute())),
+        },
+    ];
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {
@@ -128,6 +136,7 @@ function AgentsPage() {
                 canSelectAgents
                 selectedKeys={selectedAgentKeys}
                 onRowSelectionChange={setSelectedAgents}
+                emptyStateButtons={emptyStateButtons}
             />
         </ScreenWrapper>
     );
diff --git a/src/pages/workspace/WorkspaceAgentsPage.tsx b/src/pages/workspace/WorkspaceAgentsPage.tsx
index a4b9bd02f82e..99ed2e585757 100644
--- a/src/pages/workspace/WorkspaceAgentsPage.tsx
+++ b/src/pages/workspace/WorkspaceAgentsPage.tsx
@@ -57,6 +57,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
 
     // The new agent functionality will be added after CreateCompanyAgent is exposed
     const newAgentButton = canWriteAgents && hasAgents ? null : null;
+    const emptyStateButtons = canWriteAgents ? [] : undefined;
 
     const bulkActionsButtonOptions: Array<DropdownOption<DeepValueOf<typeof CONST.AGENTS.BULK_ACTION_TYPES>>> = [
         {
@@ -129,6 +130,7 @@ function WorkspaceAgentsPage({route}: WorkspaceAgentsPageProps) {
                     selectedKeys={selectedAgentKeys}
                     onRowSelectionChange={setSelectedAgents}
                     shouldShowRoleColumn
+                    emptyStateButtons={emptyStateButtons}
                 />
             </WorkspacePageWithSections>
         </AccessOrNotFoundWrapper>

From ce383d0dc46c5199ef14e525f157306268c96946 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:09:21 +0100
Subject: [PATCH 755/781] revert unrelated change

---
 src/hooks/useAgents.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useAgents.ts b/src/hooks/useAgents.ts
index 087f515d9605..ee322551ddf7 100644
--- a/src/hooks/useAgents.ts
+++ b/src/hooks/useAgents.ts
@@ -60,8 +60,6 @@ function useAgents() {
         if (!agent) {
             return [];
         }
-        return [];
-
         const accountID = Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length));
         const details = personalDetailsList?.[accountID];
         if (!details) {

From 77fbd510da87916ac98d16a101686aba3002ec9f Mon Sep 17 00:00:00 2001
From: "Akinwale Ariwodola (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 14:35:05 +0000
Subject: [PATCH 756/781] Add INT133 help article for inactive Sage Intacct web
 services user

Co-authored-by: Akinwale Ariwodola <akinwale@users.noreply.github.com>
---
 .../INT133-Sync-Error.md                      | 70 +++++++++++++++++
 .../Sync-Errors/INT133-Sync-Error.md          | 70 +++++++++++++++++
 .../INT133-Sync-Error.md                      | 75 +++++++++++++++++++
 .../Sync-Errors/INT133-Sync-Error.md          | 75 +++++++++++++++++++
 4 files changed, 290 insertions(+)
 create mode 100644 docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
 create mode 100644 docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
 create mode 100644 docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
 create mode 100644 docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md

diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
new file mode 100644
index 000000000000..759cee3d9083
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
@@ -0,0 +1,70 @@
+---
+title: INT133 Sync Error in Sage Intacct Integration
+description: Learn what the INT133 sync error means in Sage Intacct and how to reactivate the web services user to restore your connection.
+keywords: INT133, Sage Intacct inactive user, xmlgateway_expensify inactive, Sage Intacct web services user inactive, Expensify Sage Intacct sync error, PL04000076, Workspace Admin
+internalScope: Audience is Workspace Admins using the Sage Intacct integration. Covers resolving the INT133 sync error caused by an inactive Sage Intacct web services user. Does not cover incorrect credentials or Sender ID errors (see INT122).
+---
+
+# INT133 Sync Error in Sage Intacct Integration
+
+If you see the error:
+
+INT133 Sync Error: The Sage Intacct web services user is inactive. Please reactivate the user in Sage Intacct and attempt sync again.
+
+This means Sage Intacct rejected the connection because the web services user is set to **Inactive**, preventing the sync from completing.
+
+---
+
+## Why the INT133 Sync Error Happens in Sage Intacct
+
+The INT133 error typically indicates:
+
+- The `xmlgateway_expensify` web services user was deactivated in Sage Intacct.
+- An administrator changed the user's status to **Inactive** during a user cleanup or license review.
+- The web services user that was used to connect the Workspace is no longer in use.
+
+Reentering the same credentials will not fix this error. The user must be reactivated in Sage Intacct first.
+
+---
+
+## How to Fix the INT133 Sync Error
+
+This issue must be resolved in Sage Intacct and then retried in Expensify.
+
+### Reactivate the Web Services User in Sage Intacct
+
+1. Log in to Sage Intacct as an administrator.
+2. Go to **Company > Web Services Users**.
+3. Locate the **xmlgateway_expensify** web services user.
+4. Click **Edit**.
+5. Change the **Status** to **Active**.
+6. Click **Save**.
+
+If the web services user was deleted or can't be reactivated, create a new web services user and reconnect the Workspace with the new credentials.
+
+---
+
+### Retry the Sync in Expensify
+
+1. Go to **Settings > Workspaces**.
+2. Select your Workspace.
+3. Click **Accounting**.
+4. Click **Sync Now**.
+
+Confirm the sync completes successfully.
+
+---
+
+# FAQ
+
+## Do I Need Sage Intacct Admin Access?
+
+Yes. Changing the status of a web services user requires administrator permissions in Sage Intacct.
+
+## Do I Need to Reenter My Credentials?
+
+Not usually. If you reactivate the same web services user, the existing credentials will work. If you create a new web services user, enter the new credentials in Expensify.
+
+## Does INT133 Mean the Integration Is Disconnected?
+
+Not necessarily. The connection settings are kept, but Sage Intacct rejects every sync until the web services user is active again.
diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
new file mode 100644
index 000000000000..759cee3d9083
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
@@ -0,0 +1,70 @@
+---
+title: INT133 Sync Error in Sage Intacct Integration
+description: Learn what the INT133 sync error means in Sage Intacct and how to reactivate the web services user to restore your connection.
+keywords: INT133, Sage Intacct inactive user, xmlgateway_expensify inactive, Sage Intacct web services user inactive, Expensify Sage Intacct sync error, PL04000076, Workspace Admin
+internalScope: Audience is Workspace Admins using the Sage Intacct integration. Covers resolving the INT133 sync error caused by an inactive Sage Intacct web services user. Does not cover incorrect credentials or Sender ID errors (see INT122).
+---
+
+# INT133 Sync Error in Sage Intacct Integration
+
+If you see the error:
+
+INT133 Sync Error: The Sage Intacct web services user is inactive. Please reactivate the user in Sage Intacct and attempt sync again.
+
+This means Sage Intacct rejected the connection because the web services user is set to **Inactive**, preventing the sync from completing.
+
+---
+
+## Why the INT133 Sync Error Happens in Sage Intacct
+
+The INT133 error typically indicates:
+
+- The `xmlgateway_expensify` web services user was deactivated in Sage Intacct.
+- An administrator changed the user's status to **Inactive** during a user cleanup or license review.
+- The web services user that was used to connect the Workspace is no longer in use.
+
+Reentering the same credentials will not fix this error. The user must be reactivated in Sage Intacct first.
+
+---
+
+## How to Fix the INT133 Sync Error
+
+This issue must be resolved in Sage Intacct and then retried in Expensify.
+
+### Reactivate the Web Services User in Sage Intacct
+
+1. Log in to Sage Intacct as an administrator.
+2. Go to **Company > Web Services Users**.
+3. Locate the **xmlgateway_expensify** web services user.
+4. Click **Edit**.
+5. Change the **Status** to **Active**.
+6. Click **Save**.
+
+If the web services user was deleted or can't be reactivated, create a new web services user and reconnect the Workspace with the new credentials.
+
+---
+
+### Retry the Sync in Expensify
+
+1. Go to **Settings > Workspaces**.
+2. Select your Workspace.
+3. Click **Accounting**.
+4. Click **Sync Now**.
+
+Confirm the sync completes successfully.
+
+---
+
+# FAQ
+
+## Do I Need Sage Intacct Admin Access?
+
+Yes. Changing the status of a web services user requires administrator permissions in Sage Intacct.
+
+## Do I Need to Reenter My Credentials?
+
+Not usually. If you reactivate the same web services user, the existing credentials will work. If you create a new web services user, enter the new credentials in Expensify.
+
+## Does INT133 Mean the Integration Is Disconnected?
+
+Not necessarily. The connection settings are kept, but Sage Intacct rejects every sync until the web services user is active again.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
new file mode 100644
index 000000000000..31d1b2972561
--- /dev/null
+++ b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
@@ -0,0 +1,75 @@
+---
+title: INT133 Sync Error in Sage Intacct Integration
+description: Learn what the INT133 sync error means and how to reactivate the Sage Intacct web services user to restore the connection.
+keywords: INT133, Sage Intacct inactive user, xmlgateway_expensify inactive, Sage Intacct web services user inactive, Sage Intacct sync authentication failure, PL04000076, Workspace Admin
+internalScope: Audience is Workspace Admins managing the Sage Intacct integration. Covers resolving the INT133 sync error caused by an inactive Sage Intacct web services user. Does not cover incorrect credentials or Sender ID errors (see INT122).
+---
+
+# INT133 Sync Error in Sage Intacct Integration
+
+If you see the error:
+
+INT133 Sync Error: The Sage Intacct web services user is inactive. Please reactivate the user in Sage Intacct and attempt sync again.
+
+This means Sage Intacct rejected the connection because the web services user is set to **Inactive**.
+
+When the web services user is inactive, syncing and exports will not work.
+
+---
+
+## Why the INT133 Sync Error Happens in Sage Intacct
+
+The INT133 error typically occurs when:
+
+- The **xmlgateway_expensify** web services user was deactivated in Sage Intacct.
+- An administrator changed the user's status to **Inactive** during a user cleanup or license review.
+- The web services user that was used to connect the Workspace is no longer in use.
+
+Reentering the same credentials will not fix this error. The user must be reactivated in Sage Intacct first.
+
+---
+
+## How to Fix the INT133 Sync Error
+
+Follow the steps below to reactivate the web services user and restore the connection.
+
+---
+
+## Reactivate the Web Services User in Sage Intacct
+
+1. Log in to Sage Intacct as an administrator.
+2. Go to **Company > Web Services Users**.
+3. Locate the **xmlgateway_expensify** web services user.
+4. Click **Edit**.
+5. Change the **Status** to **Active**.
+6. Click **Save**.
+
+If the web services user was deleted or can't be reactivated, create a new web services user and reconnect the Workspace with the new credentials.
+
+---
+
+## Retry the Sync
+
+After reactivating the web services user:
+
+1. Go to **Workspaces > [Workspace Name] > Accounting**.
+2. Select **Sync Now**.
+3. Confirm the sync completes successfully.
+
+If the web services user is active, the sync should complete without errors.
+
+---
+
+# FAQ
+
+## Do I Need Sage Intacct Admin Access to Fix This?
+
+Yes. Changing the status of a web services user requires administrator permissions in Sage Intacct.
+
+## Do I Need to Reenter My Credentials?
+
+Not usually. If you reactivate the same web services user, the existing credentials will work. If you create a new web services user, enter the new credentials in the Workspace.
+
+## Does This Error Affect Exports?
+
+Yes. Exports and other integration features will not work until the web services user is active again.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
new file mode 100644
index 000000000000..31d1b2972561
--- /dev/null
+++ b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
@@ -0,0 +1,75 @@
+---
+title: INT133 Sync Error in Sage Intacct Integration
+description: Learn what the INT133 sync error means and how to reactivate the Sage Intacct web services user to restore the connection.
+keywords: INT133, Sage Intacct inactive user, xmlgateway_expensify inactive, Sage Intacct web services user inactive, Sage Intacct sync authentication failure, PL04000076, Workspace Admin
+internalScope: Audience is Workspace Admins managing the Sage Intacct integration. Covers resolving the INT133 sync error caused by an inactive Sage Intacct web services user. Does not cover incorrect credentials or Sender ID errors (see INT122).
+---
+
+# INT133 Sync Error in Sage Intacct Integration
+
+If you see the error:
+
+INT133 Sync Error: The Sage Intacct web services user is inactive. Please reactivate the user in Sage Intacct and attempt sync again.
+
+This means Sage Intacct rejected the connection because the web services user is set to **Inactive**.
+
+When the web services user is inactive, syncing and exports will not work.
+
+---
+
+## Why the INT133 Sync Error Happens in Sage Intacct
+
+The INT133 error typically occurs when:
+
+- The **xmlgateway_expensify** web services user was deactivated in Sage Intacct.
+- An administrator changed the user's status to **Inactive** during a user cleanup or license review.
+- The web services user that was used to connect the Workspace is no longer in use.
+
+Reentering the same credentials will not fix this error. The user must be reactivated in Sage Intacct first.
+
+---
+
+## How to Fix the INT133 Sync Error
+
+Follow the steps below to reactivate the web services user and restore the connection.
+
+---
+
+## Reactivate the Web Services User in Sage Intacct
+
+1. Log in to Sage Intacct as an administrator.
+2. Go to **Company > Web Services Users**.
+3. Locate the **xmlgateway_expensify** web services user.
+4. Click **Edit**.
+5. Change the **Status** to **Active**.
+6. Click **Save**.
+
+If the web services user was deleted or can't be reactivated, create a new web services user and reconnect the Workspace with the new credentials.
+
+---
+
+## Retry the Sync
+
+After reactivating the web services user:
+
+1. Go to **Workspaces > [Workspace Name] > Accounting**.
+2. Select **Sync Now**.
+3. Confirm the sync completes successfully.
+
+If the web services user is active, the sync should complete without errors.
+
+---
+
+# FAQ
+
+## Do I Need Sage Intacct Admin Access to Fix This?
+
+Yes. Changing the status of a web services user requires administrator permissions in Sage Intacct.
+
+## Do I Need to Reenter My Credentials?
+
+Not usually. If you reactivate the same web services user, the existing credentials will work. If you create a new web services user, enter the new credentials in the Workspace.
+
+## Does This Error Affect Exports?
+
+Yes. Exports and other integration features will not work until the web services user is active again.

From 538eded443ff0746432a697f45505d4864078d9c Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:47:05 +0100
Subject: [PATCH 757/781] disable max-lines lint on Navigation/types.ts

---
 src/libs/Navigation/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index c34d87c011c2..1ef4c6f0fa8f 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
 import type {MultifactorAuthenticationPromptType} from '@components/MultifactorAuthentication/config/types';
 import type {SearchQueryString} from '@components/Search/types';
 

From 6807d3ac8c3666dd0554f1c45f274b5838991d7f Mon Sep 17 00:00:00 2001
From: "Akinwale Ariwodola (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 14:52:22 +0000
Subject: [PATCH 758/781] Update Sage Intacct web services user navigation path
 in INT133 articles

Co-authored-by: Akinwale Ariwodola <akinwale@users.noreply.github.com>
---
 .../Authentication-and-Login-errors/INT133-Sync-Error.md        | 2 +-
 .../Troubleshooting/Sync-Errors/INT133-Sync-Error.md            | 2 +-
 .../Authentication-and-Login-errors/INT133-Sync-Error.md        | 2 +-
 .../Troubleshooting/Sync-Errors/INT133-Sync-Error.md            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
index 759cee3d9083..fd62cd6ec6db 100644
--- a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
@@ -34,7 +34,7 @@ This issue must be resolved in Sage Intacct and then retried in Expensify.
 ### Reactivate the Web Services User in Sage Intacct
 
 1. Log in to Sage Intacct as an administrator.
-2. Go to **Company > Web Services Users**.
+2. Go to **Company > Admin > Web Services users**.
 3. Locate the **xmlgateway_expensify** web services user.
 4. Click **Edit**.
 5. Change the **Status** to **Active**.
diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
index 759cee3d9083..fd62cd6ec6db 100644
--- a/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
@@ -34,7 +34,7 @@ This issue must be resolved in Sage Intacct and then retried in Expensify.
 ### Reactivate the Web Services User in Sage Intacct
 
 1. Log in to Sage Intacct as an administrator.
-2. Go to **Company > Web Services Users**.
+2. Go to **Company > Admin > Web Services users**.
 3. Locate the **xmlgateway_expensify** web services user.
 4. Click **Edit**.
 5. Change the **Status** to **Active**.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
index 31d1b2972561..321331f5b379 100644
--- a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
+++ b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Authentication-and-Login-errors/INT133-Sync-Error.md
@@ -38,7 +38,7 @@ Follow the steps below to reactivate the web services user and restore the conne
 ## Reactivate the Web Services User in Sage Intacct
 
 1. Log in to Sage Intacct as an administrator.
-2. Go to **Company > Web Services Users**.
+2. Go to **Company > Admin > Web Services users**.
 3. Locate the **xmlgateway_expensify** web services user.
 4. Click **Edit**.
 5. Change the **Status** to **Active**.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
index 31d1b2972561..321331f5b379 100644
--- a/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
+++ b/docs/articles/new-expensify/connections/sage-intacct/Troubleshooting/Sync-Errors/INT133-Sync-Error.md
@@ -38,7 +38,7 @@ Follow the steps below to reactivate the web services user and restore the conne
 ## Reactivate the Web Services User in Sage Intacct
 
 1. Log in to Sage Intacct as an administrator.
-2. Go to **Company > Web Services Users**.
+2. Go to **Company > Admin > Web Services users**.
 3. Locate the **xmlgateway_expensify** web services user.
 4. Click **Edit**.
 5. Change the **Status** to **Active**.

From 2a7555eca3fd43908c7174c6b788e3ea9bcd7478 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Thu, 15 Oct 2026 11:00:26 -0400
Subject: [PATCH 759/781] Document OIDC workflow permissions

---
 .github/workflows/buildAndroid.yml         | 1 +
 .github/workflows/buildIOS.yml             | 1 +
 .github/workflows/deploy.yml               | 3 +++
 .github/workflows/remote-build-android.yml | 2 ++
 .github/workflows/remote-build-ios.yml     | 2 ++
 .github/workflows/testBuild.yml            | 1 +
 .github/workflows/testBuildOnPush.yml      | 1 +
 7 files changed, 11 insertions(+)

diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index 6a50c5be23b5..8bdba2f7e5f3 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -158,6 +158,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          # Match the 6h job timeout because Rock does not refresh credentials before uploading
           role-duration-seconds: 21600
           aws-region: us-east-1
 
diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml
index 327fe6a75434..c79ca9aec984 100644
--- a/.github/workflows/buildIOS.yml
+++ b/.github/workflows/buildIOS.yml
@@ -239,6 +239,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          # Match the 6h job timeout because Rock does not refresh credentials before uploading
           role-duration-seconds: 21600
           aws-region: us-east-1
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 63ace45e33ef..ea6d403ec235 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -201,6 +201,7 @@ jobs:
   androidBuild:
     name: Build Android HybridApp
     needs: [prep]
+    # Preserve the default token scopes while adding OIDC access for the called workflow
     permissions: write-all
     if: ${{ fromJSON(needs.prep.outputs.SHOULD_BUILD_NATIVE) }}
     uses: ./.github/workflows/buildAndroid.yml
@@ -430,6 +431,7 @@ jobs:
   iosBuild:
     name: Build iOS HybridApp
     needs: [prep]
+    # Preserve the default token scopes while adding OIDC access for the called workflow
     permissions: write-all
     if: ${{ fromJSON(needs.prep.outputs.SHOULD_BUILD_NATIVE) }}
     uses: ./.github/workflows/buildIOS.yml
@@ -705,6 +707,7 @@ jobs:
     name: Deploy Web to S3
     needs: [prep, webBuild, buildStorybook]
     if: ${{ always() && needs.webBuild.result == 'success' }}
+    # Preserve the default token scopes while adding OIDC access
     permissions: write-all
     runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml
index 34af4119761e..e24ff55b08b6 100644
--- a/.github/workflows/remote-build-android.yml
+++ b/.github/workflows/remote-build-android.yml
@@ -47,6 +47,7 @@ jobs:
 
   build:
     needs: [prep, resolveRefs]
+    # Preserve the default token scopes while adding OIDC access
     permissions: write-all
     runs-on: ${{ github.repository_owner == 'Expensify' && 'blacksmith-16vcpu-ubuntu-2404' || 'blacksmith-2vcpu-ubuntu-2404' }}
     strategy:
@@ -85,6 +86,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          # Match the 6h job timeout because Rock does not refresh credentials before uploading
           role-duration-seconds: 21600
           aws-region: us-east-1
 
diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 1bd31521e7d8..f246dcf43b0d 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -47,6 +47,7 @@ jobs:
 
   build:
     needs: [prep, resolveRefs]
+    # Preserve the default token scopes while adding OIDC access
     permissions: write-all
     runs-on: ${{ github.repository_owner == 'Expensify' && 'blacksmith-12vcpu-macos-latest' || 'macos-latest' }}
     strategy:
@@ -97,6 +98,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::949552126497:role/app-rock-cache-gh-actions
           role-session-name: gh-${{ github.run_id }}-${{ github.run_attempt }}
+          # Match the 6h job timeout because Rock does not refresh credentials before uploading
           role-duration-seconds: 21600
           aws-region: us-east-1
 
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index b42d6fa5ad35..a29336e8684b 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -63,6 +63,7 @@ jobs:
 
   buildApps:
     needs: [prep, resolveRefs]
+    # Preserve the default token scopes while adding OIDC access for the called workflow
     permissions: write-all
     uses: ./.github/workflows/buildAdHoc.yml
     with:
diff --git a/.github/workflows/testBuildOnPush.yml b/.github/workflows/testBuildOnPush.yml
index 068960e457b4..286e2acfc44c 100644
--- a/.github/workflows/testBuildOnPush.yml
+++ b/.github/workflows/testBuildOnPush.yml
@@ -70,6 +70,7 @@ jobs:
 
   buildApps:
     needs: [prep]
+    # Preserve the default token scopes while adding OIDC access for the called workflow
     permissions: write-all
     uses: ./.github/workflows/buildAdHoc.yml
     with:

From eb2ea7949f1e4923f250811665b61b0a1ce84fa7 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 15:38:36 +0000
Subject: [PATCH 760/781] Update Mobile-Expensify submodule to f5d0668

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index bf0a8d8ae17f..f5d0668a2455 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit bf0a8d8ae17f82ceed8ce8b5fb1b9362b70b034d
+Subproject commit f5d0668a245544f6631b28ee527ad99c70a842d7

From 8740a280739cab7269b8ad9803032606ac137e0f Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 15:41:03 +0000
Subject: [PATCH 761/781] Allow TimePicker inputs to focus in native landscape
 mode

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/components/AmountTextInput.tsx       | 2 +-
 src/components/TimePicker/TimePicker.tsx | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
index 9da049afcd37..c88c15b213ae 100644
--- a/src/components/AmountTextInput.tsx
+++ b/src/components/AmountTextInput.tsx
@@ -47,7 +47,7 @@ type AmountTextInputProps = {
 
     /** Component to render on the right hand side of the input - only shown if clear button is not rendered */
     rightHandSideComponent?: React.ReactNode;
-} & Pick<BaseTextInputProps, 'autoFocus' | 'autoGrowExtraSpace' | 'containerStyles' | 'submitBehavior' | 'ref' | 'onFocus' | 'onBlur' | 'disabled' | 'accessibilityLabel'>;
+} & Pick<BaseTextInputProps, 'autoFocus' | 'autoGrowExtraSpace' | 'containerStyles' | 'submitBehavior' | 'ref' | 'onFocus' | 'onBlur' | 'disabled' | 'accessibilityLabel' | 'shouldAllowFocusInLandscapeMode'>;
 
 function AmountTextInput({
     formattedAmount,
diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx
index 1feb29272dd7..44e8447d4e8c 100644
--- a/src/components/TimePicker/TimePicker.tsx
+++ b/src/components/TimePicker/TimePicker.tsx
@@ -764,6 +764,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                 touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
                 selection={selectionHour}
                 testID="hourInput"
+                shouldAllowFocusInLandscapeMode
             />
             <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
             <AmountTextInput
@@ -788,6 +789,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                 touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
                 selection={selectionMinute}
                 testID="minuteInput"
+                shouldAllowFocusInLandscapeMode
             />
             {showFullFormat && (
                 <>
@@ -811,6 +813,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                         touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
                         selection={selectionSecond}
                         testID="secondInput"
+                        shouldAllowFocusInLandscapeMode
                     />
                     <Text style={[styles.timePickerSemiDot, showFullFormat && [styles.textXXLarge, {height: undefined}]]}>{CONST.COLON}</Text>
                     <AmountTextInput
@@ -835,6 +838,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                         touchableInputWrapperStyle={!showFullFormat && styles.timePickerHeight100}
                         selection={selectionMillisecond}
                         testID="millisecondInput"
+                        shouldAllowFocusInLandscapeMode
                     />
                 </>
             )}

From 1fee3d8abf7bfaa45b9ce6c3c29540389967b709 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 15:43:28 +0000
Subject: [PATCH 762/781] Update Mobile-Expensify submodule to 194a6be

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index f5d0668a2455..194a6be946c5 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit f5d0668a245544f6631b28ee527ad99c70a842d7
+Subproject commit 194a6be946c5dec128cf7990a5939f9a954cfff9

From 9fab5c46d6b3101c73de7ada5df7b1d6e1200fe5 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 15:49:26 +0000
Subject: [PATCH 763/781] Fix: Wrap long Pick type in AmountTextInput to
 satisfy Oxfmt

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/components/AmountTextInput.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
index c88c15b213ae..926c78acd9ea 100644
--- a/src/components/AmountTextInput.tsx
+++ b/src/components/AmountTextInput.tsx
@@ -47,7 +47,10 @@ type AmountTextInputProps = {
 
     /** Component to render on the right hand side of the input - only shown if clear button is not rendered */
     rightHandSideComponent?: React.ReactNode;
-} & Pick<BaseTextInputProps, 'autoFocus' | 'autoGrowExtraSpace' | 'containerStyles' | 'submitBehavior' | 'ref' | 'onFocus' | 'onBlur' | 'disabled' | 'accessibilityLabel' | 'shouldAllowFocusInLandscapeMode'>;
+} & Pick<
+    BaseTextInputProps,
+    'autoFocus' | 'autoGrowExtraSpace' | 'containerStyles' | 'submitBehavior' | 'ref' | 'onFocus' | 'onBlur' | 'disabled' | 'accessibilityLabel' | 'shouldAllowFocusInLandscapeMode'
+>;
 
 function AmountTextInput({
     formattedAmount,

From d77d1c3721165755f90f19c502de3abaecac413e Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 16:36:42 +0000
Subject: [PATCH 764/781] Update version to 9.5.10-0

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 4 ++--
 ios/NotificationServiceExtension/Info.plist | 4 ++--
 ios/ShareViewController/Info.plist          | 4 ++--
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8a24c18c5e2a..88223c139e23 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009050904
-        versionName "9.5.9-4"
+        versionCode 1009051000
+        versionName "9.5.10-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 43ceca2dc4d6..c349dc5d3d69 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.9</string>
+	<string>9.5.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.4</string>
+	<string>9.5.10.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 20d42fe8fcd9..8aea13d13b50 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.9</string>
+	<string>9.5.10</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.4</string>
+	<string>9.5.10.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index 29f934ce340a..b4964ddcea2c 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.9</string>
+	<string>9.5.10</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.9.4</string>
+	<string>9.5.10.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index aeae67497526..8873693acad1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-4",
+  "version": "9.5.10-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.9-4",
+      "version": "9.5.10-0",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 3c8b2785ac90..820a79125aeb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.9-4",
+  "version": "9.5.10-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From a3d62cc65bc6be59cb15374a89d7de827b94793e Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 16:36:42 +0000
Subject: [PATCH 765/781] Update Mobile-Expensify submodule version to 9.5.10-0

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 194a6be946c5..0c4b36fc35cf 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 194a6be946c5dec128cf7990a5939f9a954cfff9
+Subproject commit 0c4b36fc35cf9aab536658596a457458b39fe027

From 198b7a031e039b1e0cd70af5b8ca9573775dbca0 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 17:02:26 +0000
Subject: [PATCH 766/781] Auto-tighten eslint-seatbelt baseline

---
 config/eslint/eslint.seatbelt.tsv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 66ff091e16fd..52691e339eef 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -830,7 +830,6 @@
 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/SettingsSplitNavigator.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/libs/Navigation/AppNavigator/Navigators/TabNavigator.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Navigation/AppNavigator/routerExtensions/addPushParamsRouterExtension.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4

From 03b6d2460a5763a2ab8bc3f89b9cd4f916552d8b Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 18:29:41 +0000
Subject: [PATCH 767/781] Render Merchant chip popup controls directly so they
 size to content on native

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../AdvancedFilters/MerchantFilterContent.tsx |  9 +--
 .../FilterDropdowns/MerchantFilterPopup.tsx   | 72 ++++++++++++------
 src/libs/SearchQueryUtils.ts                  | 11 +++
 tests/ui/MerchantFilterPopupTest.tsx          | 75 +++++++++++++++++++
 tests/unit/Search/SearchQueryUtilsTest.ts     | 30 ++++++++
 5 files changed, 168 insertions(+), 29 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
index badf05abfa88..3252c8e34650 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -5,8 +5,9 @@ import MerchantMatchTypeSelector from '@components/Search/FilterComponents/Merch
 
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getMerchantFilterFormValues} from '@libs/SearchQueryUtils';
+
 import CONST from '@src/CONST';
-import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import type {StyleProp, ViewStyle} from 'react-native';
@@ -69,11 +70,7 @@ function MerchantFilterContent({
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
 
     const updateMerchantFilter = (newValue: string | undefined, newIsNegated: boolean) => {
-        onChange({
-            [FILTER_KEYS.MERCHANT]: newIsNegated ? undefined : newValue,
-            [FILTER_KEYS.MERCHANT_NOT]: newIsNegated ? newValue : undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: newIsNegated ? undefined : merchantOperator,
-        });
+        onChange(getMerchantFilterFormValues(newValue, newIsNegated, merchantOperator));
     };
 
     // A negated Merchant filter always uses the not-equal operator, so the match type is hidden.
diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index 33b6faed72d1..97af4af6e4ae 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -1,18 +1,22 @@
 /**
  * Edits the Merchant filter value and match type from its search filter chip.
  */
-import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
+import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
+import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
+import TextInput from '@components/TextInput';
 
-import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getMerchantFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
-import type CONST from '@src/CONST';
+import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
-import React from 'react';
+import React, {useState} from 'react';
+import {View} from 'react-native';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
@@ -31,36 +35,58 @@ type MerchantFilterPopupProps = {
     updateFilterForm: (value: Partial<SearchAdvancedFiltersForm>) => void;
 };
 
+// The controls are rendered directly in BasePopup, like TextFilterPopup, because the popover sizes to its content.
+// The advanced filters page content uses a flex ScrollView, which collapses to zero height in a content-sized popover on native.
 function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
-    const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
-    const applySentryLabel = `Search-FilterPopupApply-${baseFilterKey}`;
 
-    const applyChanges = (newValues: Partial<SearchAdvancedFiltersForm>) => {
-        updateFilterForm(newValues);
+    const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
+    const [isNegated, setIsNegated] = useState(initialIsNegated);
+    const [value, setValue] = useState(initialValue);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+
+    const error = useTextFilterValidation(baseFilterKey, value);
+
+    const applyChanges = () => {
+        if (error) {
+            return;
+        }
+        updateFilterForm(getMerchantFilterFormValues(value, isNegated, merchantOperator));
         closeOverlay();
     };
 
-    // The content renders its own padded Apply button, so the popup only provides the label and the spacing ActionButtons would add.
     return (
         <BasePopup
             label={label}
-            shouldShowActionButtons={false}
-            style={styles.pb0}
-            onApply={closeOverlay}
-            applySentryLabel={applySentryLabel}
+            onApply={applyChanges}
+            applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+            shouldSubmitOnEnter
         >
-            <MerchantFilterContent
+            <NegatableFilter
                 baseFilterKey={baseFilterKey}
-                value={value}
                 isNegated={isNegated}
-                merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
-                buttonText={translate('common.apply')}
-                sentryLabel={applySentryLabel}
-                buttonStyles={styles.mt2}
-                onChange={applyChanges}
-            />
+                onNegationChange={setIsNegated}
+            >
+                <TextInput
+                    placeholder={label}
+                    value={value}
+                    errorText={error}
+                    hasError={!!error}
+                    onChangeText={setValue}
+                    accessibilityLabel={label}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.ph5]}
+                />
+            </NegatableFilter>
+            {/* A negated Merchant filter always uses the not-equal operator, so the match type is hidden. */}
+            {!isNegated && (
+                <View style={styles.mt5}>
+                    <MerchantMatchTypeSelector
+                        value={merchantOperator}
+                        onChange={setMerchantOperator}
+                    />
+                </View>
+            )}
         </BasePopup>
     );
 }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 5f3f9868ec96..a6fb18b658c4 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -3115,6 +3115,16 @@ function getFilterFormValues<K extends ListFilterContentProps['baseFilterKey'] |
     return update;
 }
 
+/**
+ * Builds the Merchant filter form values. A negated Merchant filter always uses the not-equal operator, so its match type is cleared.
+ */
+function getMerchantFilterFormValues(value: string | undefined, isNegated: boolean, merchantOperator: MerchantMatchType): Partial<SearchAdvancedFiltersForm> {
+    return {
+        ...getFilterFormValues(CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, value, isNegated),
+        [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? undefined : merchantOperator,
+    };
+}
+
 /**
  * Checks whether a query still matches a default query: it contains all of the default query's filter keys and has the same type.
  * Used to detect when a query no longer represents a given default/suggested search (e.g. a filter was removed).
@@ -3217,6 +3227,7 @@ export {
     isFilterNegatable,
     removeNegation,
     getFilterFormValues,
+    getMerchantFilterFormValues,
     getFilterFromQuery,
     getValidLastQuery,
     doesQueryMatchDefaultFilterKeysAndType,
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
index 78f6ef3e97b9..ed9e48bf23dc 100644
--- a/tests/ui/MerchantFilterPopupTest.tsx
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -39,4 +39,79 @@ describe('MerchantFilterPopup', () => {
         });
         expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
+
+    it('renders the input and match type options in the popup', () => {
+        // Given a Merchant chip popup with a stored filter
+        render(
+            <NavigationContainer>
+                <MerchantFilterPopup
+                    baseFilterKey={FILTER_KEYS.MERCHANT}
+                    values={{[FILTER_KEYS.MERCHANT]: 'I'}}
+                    label="common.merchant"
+                    closeOverlay={jest.fn()}
+                    updateFilterForm={jest.fn()}
+                />
+            </NavigationContainer>,
+        );
+
+        // Then the input and both match types render inside the popup, because the popover sizes to its content and must not collapse them
+        expect(screen.getByDisplayValue('I')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.equalTo')).toBeOnTheScreen();
+    });
+
+    it('applies the selected match type', () => {
+        // Given a Merchant chip popup with a stored Contains filter
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterPopup
+                    baseFilterKey={FILTER_KEYS.MERCHANT}
+                    values={{[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}}
+                    label="common.merchant"
+                    closeOverlay={jest.fn()}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
+
+        // When the user selects Equal to and applies the filter
+        fireEvent.press(screen.getByText('search.filters.merchant.equalTo'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        // Then the popup submits the Equal to match type
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+
+    it('hides the match type and clears it when the filter is negated', () => {
+        // Given a Merchant chip popup with a stored Equal to filter
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterPopup
+                    baseFilterKey={FILTER_KEYS.MERCHANT}
+                    values={{[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}}
+                    label="common.merchant"
+                    closeOverlay={jest.fn()}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
+
+        // When the user negates the filter and applies it
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        // Then the match type is hidden and cleared, because a negated Merchant filter always uses the not-equal operator
+        expect(screen.queryByText('search.filters.merchant.equalTo')).not.toBeOnTheScreen();
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: undefined,
+        });
+    });
 });
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index f94025165124..5492620b2e4f 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -24,6 +24,7 @@ import {
     getFilterDisplayValue,
     getFilterFormValues,
     getFilterFromQuery,
+    getMerchantFilterFormValues,
     getFooterSelectionFromQuery,
     getQueryWithFooterSelection,
     getQueryWithoutFooterSelections,
@@ -61,6 +62,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Connections} from '@src/types/onyx/Policy';
@@ -5368,6 +5370,34 @@ describe('SearchQueryUtils', () => {
         });
     });
 
+    describe('getMerchantFilterFormValues', () => {
+        it('keeps the match type when not negated', () => {
+            // Given a Merchant filter that is not negated
+            // When the form values are built
+            const result = getMerchantFilterFormValues('coffee', false, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+
+            // Then the match type is kept, because it decides between Contains and Equal to
+            expect(result).toEqual({
+                [FILTER_KEYS.MERCHANT]: 'coffee',
+                [FILTER_KEYS.MERCHANT_NOT]: undefined,
+                [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            });
+        });
+
+        it('clears the match type when negated', () => {
+            // Given a negated Merchant filter
+            // When the form values are built
+            const result = getMerchantFilterFormValues('coffee', true, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+
+            // Then the match type is cleared, because a negated Merchant filter always uses the not-equal operator
+            expect(result).toEqual({
+                [FILTER_KEYS.MERCHANT]: undefined,
+                [FILTER_KEYS.MERCHANT_NOT]: 'coffee',
+                [FILTER_KEYS.MERCHANT_OPERATOR]: undefined,
+            });
+        });
+    });
+
     describe('getFilterFromQuery', () => {
         test('returns all comma-separated values for a non-negated filter', () => {
             const queryJSON = buildSearchQueryJSON('type:expense policyID:123,456');

From 49008aeb8d10eb23565cd98e4dda22e464548c19 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Thu, 15 Oct 2026 12:23:25 -0700
Subject: [PATCH 768/781] feat(settings): remove beta gate for human support

---
 src/pages/settings/HelpPage/HelpPage.tsx | 30 ++++++++++--------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/pages/settings/HelpPage/HelpPage.tsx b/src/pages/settings/HelpPage/HelpPage.tsx
index f9a2870b5b26..97a6d58d298b 100644
--- a/src/pages/settings/HelpPage/HelpPage.tsx
+++ b/src/pages/settings/HelpPage/HelpPage.tsx
@@ -13,7 +13,6 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useOpenConciergeAnywhere from '@hooks/useOpenConciergeAnywhere';
-import usePermissions from '@hooks/usePermissions';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
 import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -65,7 +64,6 @@ function HelpPage() {
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const {openConciergeAnywhere} = useOpenConciergeAnywhere();
-    const {isBetaEnabled} = usePermissions();
     const {isOffline} = useNetwork();
 
     const openSupportTicketOrConcierge = () => {
@@ -212,22 +210,20 @@ function HelpPage() {
         sentryLabel: CONST.SENTRY_LABEL.SETTINGS_HELP.HELP_DOCS,
     };
 
-    const talkToAHumanItem = isBetaEnabled(CONST.BETAS.SUPPORT_TICKET)
-        ? {
-              key: 'initialSettingsPage.talkToAHuman',
-              title: translate('initialSettingsPage.talkToAHuman'),
-              description: translate('initialSettingsPage.helpPage.talkToAHumanDescription'),
-              icon: icons.ChatBubbles,
-              iconType: CONST.ICON_TYPE_ICON,
-              onPress: openSupportTicketOrConcierge,
-              isDisabled: isOffline,
-              shouldShowRightIcon: true,
-              wrapperStyle: [styles.sectionMenuItemTopDescription],
-              sentryLabel: CONST.SENTRY_LABEL.SETTINGS_HELP.SUPPORT_TICKET,
-          }
-        : null;
+    const talkToAHumanItem = {
+        key: 'initialSettingsPage.talkToAHuman',
+        title: translate('initialSettingsPage.talkToAHuman'),
+        description: translate('initialSettingsPage.helpPage.talkToAHumanDescription'),
+        icon: icons.ChatBubbles,
+        iconType: CONST.ICON_TYPE_ICON,
+        onPress: openSupportTicketOrConcierge,
+        isDisabled: isOffline,
+        shouldShowRightIcon: true,
+        wrapperStyle: [styles.sectionMenuItemTopDescription],
+        sentryLabel: CONST.SENTRY_LABEL.SETTINGS_HELP.SUPPORT_TICKET,
+    };
 
-    const moreResourcesItems = [...(hasActiveItem ? [] : [conciergeItem]), ...(talkToAHumanItem ? [talkToAHumanItem] : []), helpSiteItem];
+    const moreResourcesItems = [...(hasActiveItem ? [] : [conciergeItem]), talkToAHumanItem, helpSiteItem];
 
     useEffect(() => {
         openHelpPage();

From b58ad96d39f455dcacb9f8c501d024706bf10ba8 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 20:03:22 +0000
Subject: [PATCH 769/781] Update version to 9.5.10-1

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 ios/ShareViewController/Info.plist          | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 88223c139e23..c87a3ea66604 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009051000
-        versionName "9.5.10-0"
+        versionCode 1009051001
+        versionName "9.5.10-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c349dc5d3d69..64a11cc04ec0 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.0</string>
+	<string>9.5.10.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 8aea13d13b50..7db2d7630729 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.10</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.0</string>
+	<string>9.5.10.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index b4964ddcea2c..087e1c0bbc46 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.5.10</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.0</string>
+	<string>9.5.10.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 8873693acad1..abfbeed51cc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.10-0",
+  "version": "9.5.10-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.10-0",
+      "version": "9.5.10-1",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 820a79125aeb..282bebb240a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.10-0",
+  "version": "9.5.10-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From b9a952165248cf929e8f2b6840a679429d57cd25 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 20:03:22 +0000
Subject: [PATCH 770/781] Update Mobile-Expensify submodule version to 9.5.10-1

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 0c4b36fc35cf..218a41d7d25a 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 0c4b36fc35cf9aab536658596a457458b39fe027
+Subproject commit 218a41d7d25af8bad817456f5d900aee13771405

From 98bbd8fa3821a29c54c19d418880910d9bb74b03 Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 20:12:40 +0000
Subject: [PATCH 771/781] Keep Merchant chip popup controls scrollable when
 they don't fit, such as in landscape

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../FilterDropdowns/MerchantFilterPopup.tsx   | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index 97af4af6e4ae..60cd109cc337 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -1,12 +1,15 @@
 /**
  * Edits the Merchant filter value and match type from its search filter chip.
  */
+import ScrollView from '@components/ScrollView';
 import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import TextInput from '@components/TextInput';
 
+import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {getMerchantFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
@@ -37,8 +40,11 @@ type MerchantFilterPopupProps = {
 
 // The controls are rendered directly in BasePopup, like TextFilterPopup, because the popover sizes to its content.
 // The advanced filters page content uses a flex ScrollView, which collapses to zero height in a content-sized popover on native.
+// A content-sized ScrollView under a max height keeps the controls reachable when they don't fit, for example in landscape.
 function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
     const styles = useThemeStyles();
+    const {windowHeight} = useWindowDimensions();
+    const isInLandscapeMode = useIsInLandscapeMode();
 
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
@@ -60,33 +66,36 @@ function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, cl
             label={label}
             onApply={applyChanges}
             applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+            style={[styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode)]}
             shouldSubmitOnEnter
         >
-            <NegatableFilter
-                baseFilterKey={baseFilterKey}
-                isNegated={isNegated}
-                onNegationChange={setIsNegated}
-            >
-                <TextInput
-                    placeholder={label}
-                    value={value}
-                    errorText={error}
-                    hasError={!!error}
-                    onChangeText={setValue}
-                    accessibilityLabel={label}
-                    role={CONST.ROLE.PRESENTATION}
-                    containerStyles={[styles.ph5]}
-                />
-            </NegatableFilter>
-            {/* A negated Merchant filter always uses the not-equal operator, so the match type is hidden. */}
-            {!isNegated && (
-                <View style={styles.mt5}>
-                    <MerchantMatchTypeSelector
-                        value={merchantOperator}
-                        onChange={setMerchantOperator}
+            <ScrollView keyboardShouldPersistTaps="handled">
+                <NegatableFilter
+                    baseFilterKey={baseFilterKey}
+                    isNegated={isNegated}
+                    onNegationChange={setIsNegated}
+                >
+                    <TextInput
+                        placeholder={label}
+                        value={value}
+                        errorText={error}
+                        hasError={!!error}
+                        onChangeText={setValue}
+                        accessibilityLabel={label}
+                        role={CONST.ROLE.PRESENTATION}
+                        containerStyles={[styles.ph5]}
                     />
-                </View>
-            )}
+                </NegatableFilter>
+                {/* A negated Merchant filter always uses the not-equal operator, so the match type is hidden. */}
+                {!isNegated && (
+                    <View style={styles.mt5}>
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    </View>
+                )}
+            </ScrollView>
         </BasePopup>
     );
 }

From c107795b72f05de05e97e7d3952e65ef726a1aa9 Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 20:29:51 +0000
Subject: [PATCH 772/781] Let the Merchant chip popup ScrollView shrink so
 Apply stays visible

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../Search/FilterDropdowns/MerchantFilterPopup.tsx        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index 60cd109cc337..6c6535839653 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -40,7 +40,8 @@ type MerchantFilterPopupProps = {
 
 // The controls are rendered directly in BasePopup, like TextFilterPopup, because the popover sizes to its content.
 // The advanced filters page content uses a flex ScrollView, which collapses to zero height in a content-sized popover on native.
-// A content-sized ScrollView under a max height keeps the controls reachable when they don't fit, for example in landscape.
+// A content-sized ScrollView (flexShrink1, not flex1) under a max height only shrinks and scrolls when the controls don't fit,
+// for example in landscape or with the keyboard open, so the Apply button stays visible.
 function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
     const styles = useThemeStyles();
     const {windowHeight} = useWindowDimensions();
@@ -69,7 +70,10 @@ function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, cl
             style={[styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode)]}
             shouldSubmitOnEnter
         >
-            <ScrollView keyboardShouldPersistTaps="handled">
+            <ScrollView
+                style={styles.flexShrink1}
+                keyboardShouldPersistTaps="handled"
+            >
                 <NegatableFilter
                     baseFilterKey={baseFilterKey}
                     isNegated={isNegated}

From 68e0b13fd7a95ce8c8ca1f2ad5d66e2e768dc5dd Mon Sep 17 00:00:00 2001
From: "truph01 (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 15 Oct 2026 20:50:01 +0000
Subject: [PATCH 773/781] Cap the Merchant chip popup above the keyboard so
 Apply stays visible

Co-authored-by: truph01 <truph01@users.noreply.github.com>
---
 .../Search/FilterDropdowns/MerchantFilterPopup.tsx    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index 6c6535839653..0aa56da3d8ab 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -8,9 +8,12 @@ import useTextFilterValidation from '@components/Search/hooks/useTextFilterValid
 import TextInput from '@components/TextInput';
 
 import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
+import useKeyboardState from '@hooks/useKeyboardState';
+import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
+import {BOTTOM_SHEET_TOP_PADDING} from '@libs/getBottomSheetHeight';
 import {getMerchantFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
@@ -46,6 +49,12 @@ function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, cl
     const styles = useThemeStyles();
     const {windowHeight} = useWindowDimensions();
     const isInLandscapeMode = useIsInLandscapeMode();
+    const {isKeyboardActive, keyboardActiveHeight} = useKeyboardState();
+    const {paddingTop: safeAreaTop} = useSafeAreaPaddings(true);
+
+    // The popover avoids the keyboard by padding its bottom, so while the keyboard is open only the room above it is available.
+    const {maxHeight: popoverMaxHeight} = styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode);
+    const maxHeight = isKeyboardActive ? Math.min(popoverMaxHeight, windowHeight - keyboardActiveHeight - safeAreaTop - BOTTOM_SHEET_TOP_PADDING) : popoverMaxHeight;
 
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
@@ -67,7 +76,7 @@ function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, cl
             label={label}
             onApply={applyChanges}
             applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
-            style={[styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode)]}
+            style={[{maxHeight}]}
             shouldSubmitOnEnter
         >
             <ScrollView

From 17311dd2304fb5e18d3cc751c2d926ef42d50f1d Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 21:08:37 +0000
Subject: [PATCH 774/781] Update version to 9.5.11-0

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 4 ++--
 ios/NotificationServiceExtension/Info.plist | 4 ++--
 ios/ShareViewController/Info.plist          | 4 ++--
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index c87a3ea66604..f91e1f3b4383 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009051001
-        versionName "9.5.10-1"
+        versionCode 1009051100
+        versionName "9.5.11-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 64a11cc04ec0..52d33b8b2c37 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.10</string>
+	<string>9.5.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.1</string>
+	<string>9.5.11.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 7db2d7630729..09a7c9084b25 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.10</string>
+	<string>9.5.11</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.1</string>
+	<string>9.5.11.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index 087e1c0bbc46..fc264a430ea6 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.10</string>
+	<string>9.5.11</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.10.1</string>
+	<string>9.5.11.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index abfbeed51cc2..450df461ab92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.10-1",
+  "version": "9.5.11-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.10-1",
+      "version": "9.5.11-0",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 282bebb240a6..85c8950a3e25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.10-1",
+  "version": "9.5.11-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 8bf7ec10f0fc6d00c3109204625f44504dc93485 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 21:08:37 +0000
Subject: [PATCH 775/781] Update Mobile-Expensify submodule version to 9.5.11-0

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 218a41d7d25a..8db2e2f0cc76 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 218a41d7d25af8bad817456f5d900aee13771405
+Subproject commit 8db2e2f0cc7676acc6cf5a24e9a9e7ba7e04e2b4

From 44ff6357c6a51968219e3bf833bef97660da9682 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 21:35:10 +0000
Subject: [PATCH 776/781] Auto-tighten eslint-seatbelt baseline

---
 config/eslint/eslint.seatbelt.tsv | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 96af4bae696d..7be147cfcd32 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -14,7 +14,6 @@
 "../../.github/actions/javascript/failureNotifier/failureNotifier.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../.github/actions/javascript/formatCodeCovComment/formatCodeCovComment.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../.github/actions/javascript/getAndroidRolloutPercentage/getAndroidRolloutPercentage.ts"	"rulesdir/no-default-id-values"	1
-"../../.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../.github/actions/javascript/getPullRequestIncrementalChanges/getPullRequestIncrementalChanges.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
@@ -84,7 +83,6 @@
 "../../src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx"	"react-hooks/refs"	1
 "../../src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/AutoCompleteSuggestions/index.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/components/AutoSubmitModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/AutoUpdateTime.tsx"	"@typescript-eslint/no-deprecated/MenuItemWithTopDescription"	1
 "../../src/components/AvatarCropModal/AvatarCropView.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
 "../../src/components/AvatarCropModal/AvatarCropView.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	1
@@ -121,7 +119,6 @@
 "../../src/components/Composer/implementation/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Composer/implementation/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/Composer/implementation/index.tsx"	"react-hooks/set-state-in-effect"	2
-"../../src/components/ConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ConfirmModal.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/components/ConnectionLayout.tsx"	"no-restricted-imports"	1
 "../../src/components/ConnectToMergeFlow/index.ios.tsx"	"no-restricted-imports"	1
@@ -155,7 +152,6 @@
 "../../src/components/DraggableList/SortableItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/DropZone/DropZoneWrapper.tsx"	"react-hooks/refs"	1
 "../../src/components/EditableCell/usePopoverEditState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/components/EmojiPicker/CategoryShortcutButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/EmojiPicker/EmojiPicker.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/EmojiPicker/EmojiPicker.tsx"	"react-hooks/refs"	3
 "../../src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -1246,14 +1242,14 @@
 "../../src/pages/SetDefaultWorkspacePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"react-hooks/refs"	1
-"../../src/pages/settings/Agents/DynamicAddAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/AgentsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicAddAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/DynamicEditAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/DynamicNewAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditAgentAvatarPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Agents/Fields/DynamicEditPromptPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Agents/DynamicNewAgentPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AppDownloadLinks.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Copilot/CopilotPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Copilot/CopilotPage.tsx"	"no-restricted-imports"	1

From e38e11d813134cb3dc53a4cc598d97df24562b29 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 21:39:55 +0000
Subject: [PATCH 777/781] Update version to 9.5.12-0

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 4 ++--
 ios/NotificationServiceExtension/Info.plist | 4 ++--
 ios/ShareViewController/Info.plist          | 4 ++--
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f91e1f3b4383..adee017af7f6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009051100
-        versionName "9.5.11-0"
+        versionCode 1009051200
+        versionName "9.5.12-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 52d33b8b2c37..fb952548093e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.11</string>
+	<string>9.5.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.11.0</string>
+	<string>9.5.12.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 09a7c9084b25..1400a9e0b310 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.11</string>
+	<string>9.5.12</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.11.0</string>
+	<string>9.5.12.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index fc264a430ea6..f5d8b19ab43b 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.11</string>
+	<string>9.5.12</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.11.0</string>
+	<string>9.5.12.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
index 450df461ab92..a2bb430fc1df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.5.11-0",
+  "version": "9.5.12-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.5.11-0",
+      "version": "9.5.12-0",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 85c8950a3e25..5ebd25830977 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.5.11-0",
+  "version": "9.5.12-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From fbd1b55b11b1bda6eb009001e9cbae38a0ff9fcb Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 21:39:55 +0000
Subject: [PATCH 778/781] Update Mobile-Expensify submodule version to 9.5.12-0

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 8db2e2f0cc76..ceee3007b862 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 8db2e2f0cc7676acc6cf5a24e9a9e7ba7e04e2b4
+Subproject commit ceee3007b8629e47896449531de8a39e910042c1

From e658897455c1884a03d2cb24ff07bd556f20ff8b Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 15 Oct 2026 22:41:07 +0000
Subject: [PATCH 779/781] Update Mobile-Expensify submodule to 5525450

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index ceee3007b862..552545018fe1 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit ceee3007b8629e47896449531de8a39e910042c1
+Subproject commit 552545018fe13d715bfe91638702566aa22f463d

From 6b9c866fd8e9f92db28ed3d3f38664bdff1fede4 Mon Sep 17 00:00:00 2001
From: Hubert Sosinski <hubert.sosinski@callstack.com>
Date: Fri, 16 Oct 2026 12:17:42 +0200
Subject: [PATCH 780/781] Scope LHN row report names and personal details to
 the row

---
 .../LHNOptionsList/LHNOptionsList.tsx         |   8 +-
 .../OptionRowLHN/OptionRowLHNData.tsx         |  40 ++++-
 src/components/LHNOptionsList/types.ts        |   4 -
 src/selectors/ReportAttributes.ts             |  14 +-
 .../SidebarLinksWritePath.perf-test.tsx       | 164 ++++++++++++++++++
 5 files changed, 204 insertions(+), 26 deletions(-)
 create mode 100644 tests/perf-test/SidebarLinksWritePath.perf-test.tsx

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 178a810a657b..cb6115d4a55e 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -2,7 +2,6 @@ import useTabRootScrollProps from '@components/Navigation/TabBarBottomContent/us
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 
 import useNetwork from '@hooks/useNetwork';
-import useOnyx from '@hooks/useOnyx';
 import usePrevious from '@hooks/usePrevious';
 import useScrollEventEmitter from '@hooks/useScrollEventEmitter';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -12,14 +11,12 @@ import getPlatform from '@libs/getPlatform';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report} from '@src/types/onyx';
 
 import type {FlashListProps, FlashListRef} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 
 import {useRoute} from '@react-navigation/native';
-import {reportNamesSelector} from '@selectors/ReportAttributes';
 import {FlashList} from '@shopify/flash-list';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef} from 'react';
 import {StyleSheet, View} from 'react-native';
@@ -39,8 +36,6 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const {isOffline} = useNetwork();
     const flashListRef = useRef<FlashListRef<Report>>(null);
     const route = useRoute();
-    const [reportNames] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {selector: reportNamesSelector});
-
     const styles = useThemeStyles();
     const tabRootScrollProps = useTabRootScrollProps(contentContainerStyles, {hasBottomSafeAreaPadding: true});
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
@@ -72,7 +67,6 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 <OptionRowLHNData
                     reportID={item.reportID}
                     fullReport={item}
-                    reportNames={reportNames}
                     viewMode={optionMode}
                     isOptionFocused={!shouldDisableFocusOptions}
                     onSelectRow={onSelectRow}
@@ -81,7 +75,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 />
             );
         },
-        [reportNames, optionMode, shouldDisableFocusOptions, onSelectRow, onLayoutItem],
+        [optionMode, shouldDisableFocusOptions, onSelectRow, onLayoutItem],
     );
 
     const extraData = useMemo(() => [data.length, optionMode, isOffline], [data.length, optionMode, isOffline]);
diff --git a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
index f13d3a2c34ff..d704eab8322b 100644
--- a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
@@ -1,5 +1,4 @@
 import type {OptionRowLHNDataProps} from '@components/LHNOptionsList/types';
-import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import useReportPreviewSenderID from '@components/ReportActionAvatars/useReportPreviewSenderID';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
@@ -8,30 +7,40 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useGetExpensifyCardFromReportAction from '@hooks/useGetExpensifyCardFromReportAction';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import {useReportAttributesByID} from '@hooks/useReportAttributes';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {getLastVisibleActionIncludingTransactionThread, getOriginalMessage, isActionableTrackExpense, isInviteOrRemovedAction} from '@libs/ReportActionsUtils';
-import {canUserPerformWriteAction as canUserPerformWriteActionUtil, shouldShowMarkAsDone} from '@libs/ReportUtils';
+import {
+    getIOUReportIDFromReportActionPreview,
+    getLastVisibleActionIncludingTransactionThread,
+    getOriginalMessage,
+    isActionableTrackExpense,
+    isInviteOrRemovedAction,
+} from '@libs/ReportActionsUtils';
+import {canUserPerformWriteAction as canUserPerformWriteActionUtil, parseMovedTransactionReportIDs, shouldShowMarkAsDone} from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';
 
 import CONST from '@src/CONST';
 import {getMovedReportID} from '@src/libs/ModifiedExpenseMessage';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportActions as ReportActionsType} from '@src/types/onyx';
-import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
+import type {PersonalDetailsList, Report, ReportActions as ReportActionsType} from '@src/types/onyx';
+import type {ReportAttributesDerivedValue, VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 
 import type {ViewStyle} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {reportNamesByIDsSelector} from '@selectors/ReportAttributes';
 import React, {useCallback, useMemo} from 'react';
 import {StyleSheet, View} from 'react-native';
 
 import OptionRowLHN from './OptionRowLHN';
 
+const EMPTY_PERSONAL_DETAILS: PersonalDetailsList = {};
+
 /*
  * This component gets the data from onyx for the actual
  * OptionRowLHN component.
@@ -42,14 +51,13 @@ function invoiceReceiverPolicyIDSelector(report: OnyxEntry<Report>): string | un
     return report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : undefined;
 }
 
-function OptionRowLHNData({isOptionFocused = false, fullReport, reportNames, viewMode = 'default', reportID, ...propsToForward}: OptionRowLHNDataProps) {
+function OptionRowLHNData({isOptionFocused = false, fullReport, viewMode = 'default', reportID, ...propsToForward}: OptionRowLHNDataProps) {
     const styles = useThemeStyles();
     const {currentReportID: currentReportIDValue} = useCurrentReportIDState();
     const isReportFocused = isOptionFocused && currentReportIDValue === reportID;
     const {translate, localeCompare, dateFnsLocale, formatPhoneNumber} = useLocalize();
     const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const {login, accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
-    const personalDetails = usePersonalDetails();
 
     const reportAttributes = useReportAttributesByID(reportID);
     const [oneTransactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportAttributes?.oneTransactionThreadReportID)}`);
@@ -133,6 +141,22 @@ function OptionRowLHNData({isOptionFocused = false, fullReport, reportNames, vie
 
     const [movedFromReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.FROM)}`);
     const [movedToReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.TO)}`);
+    const {fromReportID: movedFromReportID, displayReportID: movedDisplayReportID} = lastAction
+        ? parseMovedTransactionReportIDs(lastAction)
+        : {fromReportID: undefined, displayReportID: undefined};
+    const reportNameIDs = [reportID, lastActionReportID ? String(lastActionReportID) : undefined, movedFromReportID, movedDisplayReportID, getIOUReportIDFromReportActionPreview(lastAction)];
+    const [reportNames] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
+        selector: (attributes: OnyxEntry<ReportAttributesDerivedValue>) => reportNamesByIDsSelector(attributes, reportNameIDs),
+    });
+
+    const [personalDetails] = usePersonalDetailsByIDs([
+        ...Object.keys(fullReport?.participants ?? {}).map(Number),
+        fullReport?.ownerAccountID,
+        fullReport?.managerID,
+        fullReport?.lastActorAccountID,
+        lastAction?.actorAccountID,
+        currentUserAccountID,
+    ]);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fullReport?.policyID}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
@@ -157,7 +181,7 @@ function OptionRowLHNData({isOptionFocused = false, fullReport, reportNames, vie
         reportAttributes,
         oneTransactionThreadReport,
         reportNameValuePairs,
-        personalDetails: personalDetails ?? {},
+        personalDetails: personalDetails ?? EMPTY_PERSONAL_DETAILS,
         policy,
         parentReportAction,
         conciergeReportID,
diff --git a/src/components/LHNOptionsList/types.ts b/src/components/LHNOptionsList/types.ts
index 4743687bf34d..583b4f8c286e 100644
--- a/src/components/LHNOptionsList/types.ts
+++ b/src/components/LHNOptionsList/types.ts
@@ -1,7 +1,6 @@
 import type CONST from '@src/CONST';
 import type {OptionData} from '@src/libs/ReportUtils';
 import type {Report} from '@src/types/onyx';
-import type {ReportNamesDerivedValue} from '@src/types/onyx/DerivedValues';
 
 import type {ComponentRef, RefObject} from 'react';
 import type {LayoutChangeEvent, StyleProp, View, ViewStyle} from 'react-native';
@@ -38,9 +37,6 @@ type OptionRowLHNDataProps = {
     fullReport: OnyxEntry<Report>;
     reportID: string;
 
-    /** Names of all reports, for the alternate text of rows whose last action points at another report */
-    reportNames: ReportNamesDerivedValue | undefined;
-
     /** Toggle between compact and default view */
     viewMode?: OptionMode;
 
diff --git a/src/selectors/ReportAttributes.ts b/src/selectors/ReportAttributes.ts
index 7d8f390afd8b..ac784f1e0271 100644
--- a/src/selectors/ReportAttributes.ts
+++ b/src/selectors/ReportAttributes.ts
@@ -19,16 +19,16 @@ const reportNameSelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>,
 
 const reportIsEmptySelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>, reportID: string | undefined) => (reportID ? attributes?.reports?.[reportID]?.isEmpty : undefined);
 
-const reportNamesSelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>): ReportNamesDerivedValue | undefined => {
-    if (!attributes?.reports) {
-        return undefined;
-    }
+const reportNamesByIDsSelector = (attributes: OnyxEntry<ReportAttributesDerivedValue>, reportIDs: Array<string | undefined>): ReportNamesDerivedValue => {
     const reportNames: ReportNamesDerivedValue = {};
-    for (const [reportID, reportAttributes] of Object.entries(attributes.reports)) {
-        reportNames[reportID] = {reportName: reportAttributes.reportName};
+    for (const reportID of reportIDs) {
+        const reportName = reportNameSelector(attributes, reportID);
+        if (reportID && reportName !== undefined) {
+            reportNames[reportID] = {reportName};
+        }
     }
     return reportNames;
 };
 
-export {reportNameSelector, reportIsEmptySelector, reportNamesSelector};
+export {reportNameSelector, reportIsEmptySelector, reportNamesByIDsSelector};
 export default reportByIDsSelector;
diff --git a/tests/perf-test/SidebarLinksWritePath.perf-test.tsx b/tests/perf-test/SidebarLinksWritePath.perf-test.tsx
new file mode 100644
index 000000000000..1101d982c033
--- /dev/null
+++ b/tests/perf-test/SidebarLinksWritePath.perf-test.tsx
@@ -0,0 +1,164 @@
+import {render, screen} from '@testing-library/react-native';
+
+import {setHasRadio} from '@libs/NetworkState';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ReportCollectionDataSet} from '@src/types/onyx/Report';
+
+import Onyx from 'react-native-onyx';
+import {measureAsyncFunction, measureRenders} from 'reassure';
+
+import * as LHNTestUtils from '../utils/LHNTestUtils';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
+
+jest.mock('@libs/Permissions');
+jest.mock('../../src/libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    isActiveRoute: jest.fn(),
+    getTopmostReportId: jest.fn(),
+    getActiveRoute: jest.fn(),
+    getTopmostReportActionId: jest.fn(),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    isDisplayedInModal: jest.fn(() => false),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+}));
+jest.mock('../../src/libs/Navigation/navigationRef', () => ({
+    getState: () => ({
+        routes: [{name: 'Report'}],
+    }),
+    getRootState: () => ({
+        routes: [],
+    }),
+    addListener: () => () => {},
+    isReady: () => true,
+}));
+
+jest.mock('@react-navigation/native');
+
+const WRITES_PER_SCENARIO = 10;
+const OFFSCREEN_ROOM_ID = '999999101';
+const OFFSCREEN_ROOM_KEY = `${ONYXKEYS.COLLECTION.REPORT}${OFFSCREEN_ROOM_ID}` as const;
+const OUTSIDE_ACCOUNT_ID = 999999;
+
+function buildReports(count: number): ReportCollectionDataSet {
+    return Object.fromEntries(
+        Array.from({length: count}, (_, index) => {
+            const report = {
+                ...LHNTestUtils.getFakeReport([1, 2], 1, true),
+                lastMessageText: 'hey',
+                lastVisibleActionCreated: `2025-01-01 00:00:${String(index % 60).padStart(2, '0')}.${String(index % 1000).padStart(3, '0')}`,
+            };
+            return [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report];
+        }),
+    );
+}
+
+describe.each([500, 5000])('SidebarLinks write path with %i reports', (reportCount) => {
+    const reports = buildReports(reportCount);
+    const firstReportKey = `${ONYXKEYS.COLLECTION.REPORT}${Object.values(reports).at(59)?.reportID}` as const;
+
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        });
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        require('@userActions/OnyxDerived').default();
+    });
+
+    beforeEach(async () => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
+        setHasRadio(true);
+        await TestHelper.signInWithTestUser(1, 'email1@test.com', undefined, undefined, 'One');
+        await waitForBatchedUpdates();
+
+        // Given many reports sorted by recent activity and a room older than all of them, so it sits below the rendered window
+        await Onyx.multiSet({
+            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+            [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+            [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.DEFAULT,
+            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
+            [OFFSCREEN_ROOM_KEY]: {
+                ...LHNTestUtils.getFakeReport([1, 2], 1, false),
+                reportID: OFFSCREEN_ROOM_ID,
+                chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
+                reportName: '#offscreen',
+                lastVisibleActionCreated: '2020-01-01 00:00:00.000',
+            },
+            ...reports,
+        });
+        await waitForBatchedUpdates();
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    test('should re-render when a report below the rendered window is renamed', async () => {
+        let run = 0;
+        const scenario = async () => {
+            await screen.findByTestId('lhn-options-list');
+
+            // When a room no visible row shows gets a new name
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(OFFSCREEN_ROOM_KEY, {reportName: `#offscreen-${run}-${index}`});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        };
+
+        // Then reassure measures what the rename costs the visible rows
+        await measureRenders(<LHNTestUtils.MockedSidebarLinks />, {scenario});
+    });
+
+    test('should take wall time to write one visible report', async () => {
+        // Given a mounted LHN, so the measurement covers subscribers, selectors, comparisons and renders together
+        render(<LHNTestUtils.MockedSidebarLinks />);
+        await screen.findByTestId('lhn-options-list');
+        let run = 0;
+
+        // When one visible report gets a field update that does not change the order
+        await measureAsyncFunction(async () => {
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(firstReportKey, {lastMessageText: `hey ${run}-${index}`});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        });
+    });
+
+    test('should take wall time to rename a report below the rendered window', async () => {
+        render(<LHNTestUtils.MockedSidebarLinks />);
+        await screen.findByTestId('lhn-options-list');
+        let run = 0;
+
+        // When a room no visible row shows gets a new name
+        await measureAsyncFunction(async () => {
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(OFFSCREEN_ROOM_KEY, {reportName: `#offscreen-${run}-${index}`});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        });
+    });
+
+    test('should take wall time to write personal details of a user outside the list', async () => {
+        render(<LHNTestUtils.MockedSidebarLinks />);
+        await screen.findByTestId('lhn-options-list');
+        let run = 0;
+
+        // When a user who is in no LHN report changes their display name
+        await measureAsyncFunction(async () => {
+            for (let index = 0; index < WRITES_PER_SCENARIO; index++) {
+                await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[OUTSIDE_ACCOUNT_ID]: {accountID: OUTSIDE_ACCOUNT_ID, displayName: `Outside ${run}-${index}`}});
+                await waitForBatchedUpdates();
+            }
+            run++;
+        });
+    });
+});

From 7ea35d10d8394782b62a2cddbcd0ac0c721667a2 Mon Sep 17 00:00:00 2001
From: Hubert Sosinski <hubert.sosinski@callstack.com>
Date: Fri, 16 Oct 2026 12:49:13 +0200
Subject: [PATCH 781/781] Cover all accounts and reports read by LHN rows, fix
 SidebarOrderTest ordering

---
 .../OptionRowLHN/OptionRowLHNData.tsx         | 66 ++++++++++++++++---
 src/libs/SidebarUtils.ts                      |  1 -
 tests/unit/SidebarOrderTest.ts                | 25 +++++--
 3 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
index d704eab8322b..2b95e67b1a7e 100644
--- a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
@@ -15,9 +15,14 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {
     getIOUReportIDFromReportActionPreview,
     getLastVisibleActionIncludingTransactionThread,
+    getLastVisibleAction,
     getOriginalMessage,
+    getReportActionActorAccountID,
+    isActionableJoinRequest,
+    isActionableMentionWhisper,
     isActionableTrackExpense,
     isInviteOrRemovedAction,
+    isMoneyRequestAction,
 } from '@libs/ReportActionsUtils';
 import {canUserPerformWriteAction as canUserPerformWriteActionUtil, parseMovedTransactionReportIDs, shouldShowMarkAsDone} from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';
@@ -25,7 +30,7 @@ import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import {getMovedReportID} from '@src/libs/ModifiedExpenseMessage';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Report, ReportActions as ReportActionsType} from '@src/types/onyx';
+import type {PersonalDetailsList, Report, ReportAction, ReportActions as ReportActionsType} from '@src/types/onyx';
 import type {ReportAttributesDerivedValue, VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 
@@ -41,15 +46,42 @@ import OptionRowLHN from './OptionRowLHN';
 
 const EMPTY_PERSONAL_DETAILS: PersonalDetailsList = {};
 
+function invoiceReceiverPolicyIDSelector(report: OnyxEntry<Report>): string | undefined {
+    return report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : undefined;
+}
+
+function invoiceReceiverAccountIDSelector(report: OnyxEntry<Report>): number | undefined {
+    return report?.invoiceReceiver && 'accountID' in report.invoiceReceiver ? report.invoiceReceiver.accountID : undefined;
+}
+
+function getActionAccountIDs(action: OnyxEntry<ReportAction>): Array<number | undefined> {
+    if (!action) {
+        return [];
+    }
+    const accountIDs = [action.actorAccountID, getReportActionActorAccountID(action, undefined, undefined)];
+    if (isActionableJoinRequest(action)) {
+        accountIDs.push(getOriginalMessage(action)?.accountID);
+    }
+    if (isActionableMentionWhisper(action)) {
+        accountIDs.push(...(getOriginalMessage(action)?.inviteeAccountIDs ?? []));
+    }
+    return accountIDs;
+}
+
+function getActionReportIDs(action: OnyxEntry<ReportAction>): Array<string | undefined> {
+    if (!action) {
+        return [];
+    }
+    const {fromReportID, displayReportID} = parseMovedTransactionReportIDs(action);
+    return [fromReportID, displayReportID, getIOUReportIDFromReportActionPreview(action)];
+}
+
 /*
  * This component gets the data from onyx for the actual
  * OptionRowLHN component.
  * OptionRowLHN is auto-memoized by React Compiler, so it will
  * only re-render when the inputs derived from this wrapper change.
  */
-function invoiceReceiverPolicyIDSelector(report: OnyxEntry<Report>): string | undefined {
-    return report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : undefined;
-}
 
 function OptionRowLHNData({isOptionFocused = false, fullReport, viewMode = 'default', reportID, ...propsToForward}: OptionRowLHNDataProps) {
     const styles = useThemeStyles();
@@ -141,20 +173,36 @@ function OptionRowLHNData({isOptionFocused = false, fullReport, viewMode = 'defa
 
     const [movedFromReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.FROM)}`);
     const [movedToReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.TO)}`);
-    const {fromReportID: movedFromReportID, displayReportID: movedDisplayReportID} = lastAction
-        ? parseMovedTransactionReportIDs(lastAction)
-        : {fromReportID: undefined, displayReportID: undefined};
-    const reportNameIDs = [reportID, lastActionReportID ? String(lastActionReportID) : undefined, movedFromReportID, movedDisplayReportID, getIOUReportIDFromReportActionPreview(lastAction)];
+
+    // getLastMessageTextForReport swaps an IOU CREATE/TRACK last action of a one-transaction report for the report's own last action
+    const ownLastAction =
+        oneTransactionThreadReportID && isMoneyRequestAction(lastAction)
+            ? getLastVisibleAction(reportID, canUserPerformWrite, {}, {[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]: reportActions ?? undefined}, visibleReportActionsData)
+            : undefined;
+    const reportNameIDs = [reportID, lastActionReportID ? String(lastActionReportID) : undefined, ...getActionReportIDs(lastAction), ...getActionReportIDs(ownLastAction)];
     const [reportNames] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {
         selector: (attributes: OnyxEntry<ReportAttributesDerivedValue>) => reportNamesByIDsSelector(attributes, reportNameIDs),
     });
 
+    const isInvoice = fullReport?.type === CONST.REPORT.TYPE.INVOICE;
+    const [invoiceChatReceiverAccountID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(isInvoice ? fullReport?.chatReportID : undefined)}`, {
+        selector: invoiceReceiverAccountIDSelector,
+    });
+    const parentReportActionActorAccountID = getReportActionActorAccountID(parentReportAction, fullReport, fullReport);
+
     const [personalDetails] = usePersonalDetailsByIDs([
         ...Object.keys(fullReport?.participants ?? {}).map(Number),
         fullReport?.ownerAccountID,
         fullReport?.managerID,
         fullReport?.lastActorAccountID,
-        lastAction?.actorAccountID,
+        parentReportAction?.actorAccountID,
+        parentReportActionActorAccountID,
+        invoiceReceiverAccountIDSelector(fullReport),
+        invoiceChatReceiverAccountID,
+        ...getActionAccountIDs(lastAction),
+        ...getActionAccountIDs(ownLastAction),
+        CONST.ACCOUNT_ID.CONCIERGE,
+        CONST.ACCOUNT_ID.NOTIFICATIONS,
         currentUserAccountID,
     ]);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fullReport?.policyID}`);
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index b332834fda39..4bf0a1485c12 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -974,7 +974,6 @@ function getOptionData({
             rawReportName: report.reportName,
             hasDerivedEntry: !!derivedEntry,
             derivedReportName: derivedEntry?.reportName,
-            derivedCount: reportAttributesDerived ? Object.keys(reportAttributesDerived).length : 0,
         });
     }
 
diff --git a/tests/unit/SidebarOrderTest.ts b/tests/unit/SidebarOrderTest.ts
index 0b1399f36ce2..c21d5f59384f 100644
--- a/tests/unit/SidebarOrderTest.ts
+++ b/tests/unit/SidebarOrderTest.ts
@@ -60,6 +60,20 @@ jest.mock('@src/components/ReportActionAvatars', () => {
     };
 });
 
+// FlashList keeps a row's rendered children when only its index changes, so the index-based testID can go stale after a reorder. The cell's own index prop is always current.
+type RenderedElement = ReturnType<typeof screen.queryAllByLabelText>[number];
+
+function getDisplayNamesInListOrder() {
+    const getCellIndex = (element: RenderedElement) => {
+        let current: RenderedElement | null = element;
+        while (current && typeof current.props.index !== 'number') {
+            current = current.parent;
+        }
+        return typeof current?.props.index === 'number' ? current.props.index : Number.MAX_SAFE_INTEGER;
+    };
+    return screen.queryAllByLabelText('Chat member display names').sort((first, second) => getCellIndex(first) - getCellIndex(second));
+}
+
 describe('Sidebar', () => {
     beforeAll(() => {
         Onyx.init({
@@ -361,13 +375,12 @@ describe('Sidebar', () => {
                     // Then the order of the reports should be 1 > 3 > 2
                     //                                         ^--- (1 goes to the front and pushes other two down)
                     .then(() => {
-                        const firstElement = screen.queryByTestId('DisplayNames-0');
-                        const secondElement = screen.queryByTestId('DisplayNames-1');
-                        const thirdElement = screen.queryByTestId('DisplayNames-2');
+                        const displayNames = getDisplayNamesInListOrder();
 
-                        expect(firstElement).toHaveTextContent('Email Two');
-                        expect(secondElement).toHaveTextContent('Email Four');
-                        expect(thirdElement).toHaveTextContent('Email Three');
+                        expect(displayNames).toHaveLength(3);
+                        expect(displayNames.at(0)).toHaveTextContent('Email Two');
+                        expect(displayNames.at(1)).toHaveTextContent('Email Four');
+                        expect(displayNames.at(2)).toHaveTextContent('Email Three');
                     })
             );
         });